only call openlog once

fix a segv in loadparm.c

diff --git a/loadparm.c b/loadparm.c
index d22bef8..a66f520 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -221,13 +221,12 @@ initialise a service to the defaults
 ***************************************************************************/
 static void init_service(service *pservice)
 {
 ***************************************************************************/
 static void init_service(service *pservice)
 {

-  bzero((char *)pservice,sizeof(service));
-  copy_service(pservice,&sDefault);
+       bzero((char *)pservice,sizeof(service));
+       copy_service(pservice,&sDefault);

 }
 
 static void string_set(char **s, char *v)
 {
 }
 
 static void string_set(char **s, char *v)
 {

-       if (*s) free(*s);

        if (!v) {
                *s = NULL;
                return;
        if (!v) {
                *s = NULL;
                return;

diff --git a/log.c b/log.c
index e047d96..ebf796b 100644 (file)
--- a/log.c
+++ b/log.c
@@ -31,14 +31,6 @@ void rprintf(int fd, const char *format, ...)
        int len;
        FILE *f=NULL;
        extern int am_daemon;
        int len;
        FILE *f=NULL;
        extern int am_daemon;

-       
-       if (am_daemon) {
-#ifdef LOG_DAEMON
-               openlog("rsyncd", LOG_PID, LOG_DAEMON);
-#else /* for old systems that have no facility codes. */
-               openlog("rsyncd", LOG_PID);
-#endif
-       }

 
        va_start(ap, format);
 
 
        va_start(ap, format);
 


@@ -51,11 +43,23 @@ void rprintf(int fd, const char *format, ...)
 
        if (len < 0) exit_cleanup(1);
 
 
        if (len < 0) exit_cleanup(1);
 

+       if (len > sizeof(buf)-1) exit_cleanup(1);
+

        buf[len] = 0;
 
        if (am_daemon) {
        buf[len] = 0;
 
        if (am_daemon) {

+               static int initialised;

                int priority = LOG_INFO;
                if (fd == FERROR) priority = LOG_WARNING;
                int priority = LOG_INFO;
                if (fd == FERROR) priority = LOG_WARNING;

+
+               if (!initialised) {
+                       initialised = 1;
+#ifdef LOG_DAEMON
+                       openlog("rsyncd", LOG_PID, LOG_DAEMON);
+#else
+                       openlog("rsyncd", LOG_PID);
+#endif
+               }

                
                syslog(priority, "%s", buf);
                return;
                
                syslog(priority, "%s", buf);
                return;