A couple parsing improvements and a new test case added to

[rsync/rsync-patches.git] / rsyncd-perm.diff

diff --git a/rsyncd-perm.diff b/rsyncd-perm.diff
index 77db7d3..f73d0f1 100644 (file)
--- a/rsyncd-perm.diff
+++ b/rsyncd-perm.diff
@@ -1,4 +1,4 @@
---- orig/loadparm.c    2005-09-16 20:36:31
+--- orig/loadparm.c    2005-09-19 17:21:10
 +++ loadparm.c 2005-09-16 20:41:11
 @@ -140,6 +140,10 @@ typedef struct
        char *temp_dir;
@@ -11,18 +11,18 @@
        int max_connections;
        int max_verbosity;
        int timeout;
-@@ -180,6 +184,10 @@ static service sDefault =
-  /* temp_dir */               NULL,
-  /* uid */                    NOBODY_USER,
+@@ -183,6 +187,10 @@ static service sDefault =
+  /* temp_dir; */              NULL,
+  /* uid; */                   NOBODY_USER,
  
-+ /* create_mask */            CHMOD_BITS,
-+ /* directory_mask */         CHMOD_BITS,
-+ /* force_create_mode */      0,
-+ /* force_directory_mode */   0,
-  /* max_connections */                0,
-  /* max_verbosity */          1,
-  /* timeout */                        0,
-@@ -284,10 +292,14 @@ static struct parm_struct parm_table[] =
++ /* create_mask; */           CHMOD_BITS,
++ /* directory_mask; */                CHMOD_BITS,
++ /* force_create_mode; */     0,
++ /* force_directory_mode; */  0,
+  /* max_connections; */               0,
+  /* max_verbosity; */         1,
+  /* timeout; */                       0,
+@@ -287,10 +295,14 @@ static struct parm_struct parm_table[] =
  
   {"auth users",        P_STRING, P_LOCAL, &sDefault.auth_users,        NULL,0},
   {"comment",           P_STRING, P_LOCAL, &sDefault.comment,           NULL,0},
@@ -37,7 +37,7 @@
   {"gid",               P_STRING, P_LOCAL, &sDefault.gid,               NULL,0},
   {"hosts allow",       P_STRING, P_LOCAL, &sDefault.hosts_allow,       NULL,0},
   {"hosts deny",        P_STRING, P_LOCAL, &sDefault.hosts_deny,        NULL,0},
-@@ -394,6 +406,10 @@ FN_LOCAL_STRING(lp_secrets_file, secrets
+@@ -397,6 +409,10 @@ FN_LOCAL_STRING(lp_secrets_file, secrets
  FN_LOCAL_STRING(lp_temp_dir, temp_dir)
  FN_LOCAL_STRING(lp_uid, uid)