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

CVS commit program cvs at parl.clemson.edu
Fri May 23 16:45:13 EDT 2008


Update of /projects/cvsroot/pvfs2-1/src/server
In directory parlweb1:/tmp/cvs-serv17969/src/server

Modified Files:
	pvfs2-server.c 
Log Message:
patch from Nick Mills to make server error out (rather than just log
messages) if configuration file is invalid


Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/server/pvfs2-server.c,v
diff -p -u -r1.253 -r1.254
--- pvfs2-server.c	6 Apr 2008 23:11:54 -0000	1.253
+++ pvfs2-server.c	23 May 2008 20:45:13 -0000	1.254
@@ -206,11 +206,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;
     }
 



More information about the Pvfs2-cvs mailing list