[Pvfs2-cvs] commit by nlmills in pvfs2/src/common/misc: server-config.c

[CVS commit program]

Update of /anoncvs/pvfs2/src/common/misc
In directory parlweb1:/tmp/cvs-serv9505/src/common/misc

Modified Files:
      Tag: cu-security-branch
	server-config.c 
Log Message:
improved configuration and error handling. fixed bug in server startup.


Index: server-config.c
===================================================================
RCS file: /anoncvs/pvfs2/src/common/misc/server-config.c,v
diff -p -u -r1.106.8.2 -r1.106.8.3
--- server-config.c	22 May 2008 15:38:13 -0000	1.106.8.2
+++ server-config.c	22 May 2008 18:12:07 -0000	1.106.8.3
@@ -1031,6 +1031,23 @@ int PINT_parse_config(
                    "No PerfUpdateInterval specified.\n");
         return 1;
     }
+
+#ifndef SECURITY_ENCRYPTION_NONE
+
+    if (!config_s->keystore_path)
+    {
+        gossip_err("Configuration file error. No keystore path specified.\n");
+        return 1;
+    }
+
+    if (!config_s->serverkey_path)
+    {
+        gossip_err("Configuration file error. No server key path "
+                   "specified.\n");
+        return 1;
+    }
+
+#endif /* SECURITY_ENCRYPTION_NONE */
     
     return 0;
 }