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

[CVS commit program]

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

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


Index: pvfs2-server.c
===================================================================
RCS file: /anoncvs/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.251.2.2 -r1.251.2.3
--- pvfs2-server.c	19 May 2008 21:57:05 -0000	1.251.2.2
+++ pvfs2-server.c	22 May 2008 18:12:08 -0000	1.251.2.3
@@ -207,11 +207,12 @@ int main(int argc, char **argv)
     /* code to handle older two config file format */
 
     ret = PINT_parse_config(&server_config, fs_conf, s_server_options.server_alias);
-    if (ret < 0)
+    if (ret)
     {
         gossip_err("Error: Please check your config files.\n");
         gossip_err("Error: Server aborting.\n");
         free(s_server_options.server_alias);
+        ret = -PVFS_EINVAL;
         goto server_shutdown;
     }