You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2018/01/12 10:19:00 UTC
directory-kerby git commit: Fixing a few typos
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 5c613f306 -> 7b30a96ee
Fixing a few typos
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/7b30a96e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/7b30a96e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/7b30a96e
Branch: refs/heads/trunk
Commit: 7b30a96ee798cb74ef8f797754b297db59ce2f70
Parents: 5c613f3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jan 12 10:18:53 2018 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jan 12 10:18:53 2018 +0000
----------------------------------------------------------------------
.../main/java/org/apache/kerby/has/server/HasServer.java | 9 +++++++--
.../java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java | 8 ++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7b30a96e/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
index ed65103..e14e619 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/HasServer.java
@@ -280,11 +280,16 @@ public class HasServer {
String confDirPath = args[1];
String workDirPath = args[2];
File confDir = new File(confDirPath);
+ if (!confDir.exists()) {
+ System.err.println("The conf-dir is invalid or does not exist");
+ System.exit(3);
+ }
File workDir = new File(workDirPath);
- if (!confDir.exists() || !workDir.exists()) {
- LOG.error("Invalid or not exist conf-dir or work-dir");
+ if (!workDir.exists()) {
+ System.err.println("The work-dir is invalid or does not exist");
System.exit(3);
}
+
try {
server = new HasServer(confDir);
} catch (KrbException e) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7b30a96e/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
index df7caa6..6c8e72e 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
@@ -72,9 +72,13 @@ public class KerbyKdcServer extends KdcServer {
String confDirPath = args[1];
String workDirPath = args[2];
File confDir = new File(confDirPath);
+ if (!confDir.exists()) {
+ System.err.println("The conf-dir is invalid or does not exist");
+ System.exit(3);
+ }
File workDir = new File(workDirPath);
- if (!confDir.exists() || !workDir.exists()) {
- System.err.println("Invalid or not exist conf-dir or work-dir");
+ if (!workDir.exists()) {
+ System.err.println("The work-dir is invalid or does not exist");
System.exit(3);
}