X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6cdc6b13443c7b760d136bafd5253ef1ddf7f3cd..4f6325c362b7b7e35e6728bb5c101e9ab5215092:/loadparm.c

diff --git a/loadparm.c b/loadparm.c
index 0ddbc61a..24ef7c67 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -98,6 +98,7 @@ typedef struct
 {
 	char *motd_file;
 	char *lock_file;
+	char *log_file;
 	int syslog_facility;
 	int max_connections;
 	char *socket_options;
@@ -231,6 +232,7 @@ static struct parm_struct parm_table[] =
   {"lock file",        P_STRING,  P_GLOBAL, &Globals.lock_file,    NULL,   0},
   {"syslog facility",  P_ENUM,    P_GLOBAL, &Globals.syslog_facility, enum_facilities,0},
   {"socket options",   P_STRING,  P_GLOBAL, &Globals.socket_options,NULL,  0},
+  {"log file",         P_STRING,  P_GLOBAL, &Globals.log_file,      NULL,  0},
 
   {"name",             P_STRING,  P_LOCAL,  &sDefault.name,        NULL,   0},
   {"comment",          P_STRING,  P_LOCAL,  &sDefault.comment,     NULL,   0},
@@ -295,6 +297,7 @@ static void init_locals(void)
 
 FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file)
 FN_GLOBAL_STRING(lp_lock_file, &Globals.lock_file)
+FN_GLOBAL_STRING(lp_log_file, &Globals.log_file)
 FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
 FN_GLOBAL_INTEGER(lp_max_connections, &Globals.max_connections)
 FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
@@ -329,7 +332,7 @@ initialise a service to the defaults
 ***************************************************************************/
 static void init_service(service *pservice)
 {
-	bzero((char *)pservice,sizeof(service));
+	memset((char *)pservice,0,sizeof(service));
 	copy_service(pservice,&sDefault);
 }
 
@@ -366,12 +369,7 @@ static int add_a_service(service *pservice, char *name)
 
   i = iNumServices;
 
-  if (ServicePtrs) {
-	  ServicePtrs = (service **)realloc(ServicePtrs,
-					    sizeof(service *)*num_to_alloc);
-  } else {
-	  ServicePtrs = (service **)malloc(sizeof(service *)*num_to_alloc);
-  }
+  ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc);
 
   if (ServicePtrs)
 	  pSERVICE(iNumServices) = (service *)malloc(sizeof(service));