Updated patches to work with the current trunk.

[rsync/rsync-patches.git] / group-auth.diff

diff --git a/group-auth.diff b/group-auth.diff
index 0764dfe..f478946 100644 (file)
--- a/group-auth.diff
+++ b/group-auth.diff
@@ -11,7 +11,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 3b8f8192227b14e708bf535072485e50f4362270
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/authenticate.c b/authenticate.c
 --- a/authenticate.c
 +++ b/authenticate.c
@@ -244,7 +244,7 @@ diff --git a/authenticate.c b/authenticate.c
 +                      if (group_match >= 0)
 +                              break;
 +#else
-+                      rprintf(FLOG, "This computer doesn't support getgrouplist(), so no @group authorization is possible.\n");
++                      rprintf(FLOG, "your computer doesn't support getgrouplist(), so no @group authorization is possible.\n");
 +#endif
 +              }
        }
@@ -308,7 +308,7 @@ diff --git a/authenticate.c b/authenticate.c
 diff --git a/clientserver.c b/clientserver.c
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -546,6 +546,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -545,6 +545,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                return -1;
        }
  
@@ -316,7 +316,7 @@ diff --git a/clientserver.c b/clientserver.c
        auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
  
        if (!auth_user) {
-@@ -556,9 +557,6 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -555,9 +556,6 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
  
        module_id = i;
  
@@ -374,7 +374,7 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 +
 +verb(  auth users = joe:deny @guest:deny admin:rw @rsync:ro susan )
 +
-+In the auth above, user joe will be denied access no matter what.  Any user
++In the above rule, user joe will be denied access no matter what.  Any user
 +that is in the group "guest" is also denied access.  The user "admin" gets
 +access in read/write mode, even if the admin user is in group rsync (because
 +the admin user-matching rule is before the rsync group-matching rule).