A few minor changes, including better push_dir()/pop_dir() verbosity.

diff --git a/clientserver.c b/clientserver.c
index 5baad1a..2d7c28f 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -480,9 +480,6 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        /* TODO: Perhaps take a list of gids, and make them into the
         * supplementary groups. */
 
-       /* We do a push_dir() without actually calling chdir() in order
-        * to make sure that the module's path is absolute.  After this
-        * check, module_dir will be set to an absolute path. */
        module_dir = lp_path(i);
        if (use_chroot) {
                if ((p = strstr(module_dir, "/./")) != NULL) {
@@ -492,6 +489,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        out_of_memory("rsync_module");
        }
 
+       /* We do a push_dir() that doesn't actually call chdir()
+        * just to make a relative path absolute. */
        strlcpy(line, curr_dir, sizeof line);
        if (!push_dir(module_dir, 1))
                goto chdir_failed;

diff --git a/loadparm.c b/loadparm.c
index c1749b7..8b3e9f7 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -327,8 +327,8 @@ static struct parm_struct parm_table[] =
  {"max connections",   P_INTEGER,P_LOCAL, &sDefault.max_connections,   NULL,0},
  {"max verbosity",     P_INTEGER,P_LOCAL, &sDefault.max_verbosity,     NULL,0},
  {"munge symlinks",    P_BOOL,   P_LOCAL, &sDefault.munge_symlinks,    NULL,0},
- {"numeric ids",       P_BOOL,   P_LOCAL, &sDefault.numeric_ids,       NULL,0},
  {"name",              P_STRING, P_LOCAL, &sDefault.name,              NULL,0},
+ {"numeric ids",       P_BOOL,   P_LOCAL, &sDefault.numeric_ids,       NULL,0},
  {"outgoing chmod",    P_STRING, P_LOCAL, &sDefault.outgoing_chmod,    NULL,0},
  {"path",              P_PATH,   P_LOCAL, &sDefault.path,              NULL,0},
 #ifdef HAVE_PUTENV

diff --git a/util.c b/util.c
index 5dd6ead..03f4054 100644 (file)
--- a/util.c
+++ b/util.c
@@ -895,8 +895,8 @@ int push_dir(const char *dir, int set_path_only)
                curr_dir_depth = count_dir_elements(curr_dir + module_dirlen);
        }
 
-       if (verbose >= 5)
-               rprintf(FINFO, "[%s] dir is now %s\n", who_am_i(), curr_dir);
+       if (verbose >= 5 && !set_path_only)
+               rprintf(FINFO, "[%s] push_dir(%s)\n", who_am_i(), curr_dir);
 
        return 1;
 }
@@ -916,6 +916,9 @@ int pop_dir(const char *dir)
        if (sanitize_paths)
                curr_dir_depth = count_dir_elements(curr_dir + module_dirlen);
 
+       if (verbose >= 5)
+               rprintf(FINFO, "[%s] pop_dir(%s)\n", who_am_i(), curr_dir);
+
        return 1;
 }