Reject a daemon-excluded destination.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 6da1138..47b2980 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -214,7 +214,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
        int sargc = 0;
        char *p, *modname;
 
-       assert(argc > 0);
+       assert(argc > 0 && *argv != NULL);
 
        if (**argv == '/') {
                rprintf(FERROR,
@@ -505,7 +505,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                if ((p = strstr(module_dir, "/./")) != NULL) {
                        *p = '\0';
                        p += 2;
-               } else if ((p = strdup("/")) == NULL)
+               } else if ((p = strdup("/")) == NULL) /* MEMORY LEAK */
                        out_of_memory("rsync_module");
        }
 
@@ -691,7 +691,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                munge_symlinks = !use_chroot || module_dirlen;
        if (munge_symlinks) {
                STRUCT_STAT st;
-               if (stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) {
+               if (do_stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) {
                        rprintf(FLOG, "Symlink munging is unsupported when a %s directory exists.\n",
                                SYMLINK_PREFIX);
                        io_printf(f_out, "@ERROR: daemon security issue -- contact admin\n", name);