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

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/common/misc
In directory parlweb1:/tmp/cvs-serv8308/src/common/misc

Modified Files:
      Tag: cu-security-branch
	server-config.c 
Log Message:
more work to allow robust security to be disabled


Index: server-config.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/misc/server-config.c,v
diff -p -u -r1.106.8.14 -r1.106.8.15
--- server-config.c	21 May 2010 21:38:15 -0000	1.106.8.14
+++ server-config.c	8 Jun 2010 15:55:08 -0000	1.106.8.15
@@ -1037,6 +1037,7 @@ int PINT_parse_config(
         return 1;
     }
 
+#ifdef ENABLE_SECURITY
     if (server_alias_name && !config_s->keystore_path)
     {
         gossip_err("Configuration file error. No keystore path specified.\n");
@@ -1049,6 +1050,7 @@ int PINT_parse_config(
                    "specified.\n");
         return 1;
     }
+#endif /* ENABLE_SECURITY */
 
     return 0;
 }