initialize config.cvs_port to zero, overwriting by default 2401, when not otherwise specified

2 files changed, 2 insertions, 3 deletions

diff --git a/cvs_pserver.c b/cvs_pserver.c
index 59c449cf1..fdadbf6ef 100644
--- a/cvs_pserver.c
+++ b/cvs_pserver.c
@@ -45,7 +45,8 @@ cvs_pserver_connect(FILE **send, FILE **recv)
   char buf[128]; /* we only need to read something like I LOVE YOU
 		  * or some kind of error message (E,M)
 		  */
-  *send = *recv = tcpip_connect(config.cvs_hostname, config.cvs_port);
+  *send = *recv = tcpip_connect(config.cvs_hostname,
+				config.cvs_port ? config.cvs_port : 2401);
 
   if(! *send) 
     /* tcpip connection couldn't be brought up, tcpip_connect spit out a 
diff --git a/cvsfs.c b/cvsfs.c
index 3237cff39..5001511b0 100644
--- a/cvsfs.c
+++ b/cvsfs.c
@@ -122,9 +122,7 @@ main(int argc, char **argv)
   /* reset configuration structure to sane defaults */
   memset(&config, 0, sizeof(config));
   config.cvs_mode = PSERVER;
-  config.cvs_port = 2401;
   config.cvs_username = "anonymous";
-  config.cvs_password = NULL;
 
   /* parse command line parameters, first things first. */
   argp_parse(&argp, argc, argv, 0, 0, 0);