added "log file" option for those systems with broken syslog (like

[rsync/rsync.git] / loadparm.c

diff --git a/loadparm.c b/loadparm.c
index a302f46..24ef7c6 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -47,7 +47,6 @@
 #define BOOL int
 #define False 0
 #define True 1
-#define Realloc realloc
 #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2)))
 #define strequal(a,b) (strcasecmp(a,b)==0)
 #define BOOLSTR(b) ((b) ? "Yes" : "No")
@@ -99,6 +98,7 @@ typedef struct
 {
        char *motd_file;
        char *lock_file;
+       char *log_file;
        int syslog_facility;
        int max_connections;
        char *socket_options;
@@ -232,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},
@@ -296,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)
@@ -330,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);
 }
 
@@ -368,6 +370,7 @@ static int add_a_service(service *pservice, char *name)
   i = iNumServices;
 
   ServicePtrs = (service **)Realloc(ServicePtrs,sizeof(service *)*num_to_alloc);
+
   if (ServicePtrs)
          pSERVICE(iNumServices) = (service *)malloc(sizeof(service));