Updated to apply cleanly.

[rsync/rsync-patches.git] / acls.diff

diff --git a/acls.diff b/acls.diff
index 81f8bd8..92526d8 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -8,7 +8,7 @@ After applying this patch, run these commands for a successful build:
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
-+++ Makefile.in        18 Jun 2004 17:21:45 -0000
++++ Makefile.in        30 Jun 2004 00:04:05 -0000
 @@ -25,7 +25,7 @@ VERSION=@VERSION@
  .SUFFIXES:
  .SUFFIXES: .c .o
@@ -28,7 +28,7 @@ After applying this patch, run these commands for a successful build:
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ acls.c     18 Jun 2004 17:21:45 -0000
++++ acls.c     30 Jun 2004 00:04:05 -0000
 @@ -0,0 +1,1119 @@
 +/* -*- c-file-style: "linux" -*-
 +   Copyright (C) Andrew Tridgell 1996
@@ -1150,7 +1150,7 @@ After applying this patch, run these commands for a successful build:
 +
 +#endif /* SUPPORT_ACLS */
 --- backup.c   10 Jun 2004 16:43:52 -0000      1.32
-+++ backup.c   18 Jun 2004 17:21:45 -0000
++++ backup.c   30 Jun 2004 00:04:05 -0000
 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
                        } else {
                                do_lchown(fullpath, st.st_uid, st.st_gid);
@@ -1177,7 +1177,7 @@ After applying this patch, run these commands for a successful build:
  
        if (verbose > 1)
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196
-+++ configure.in       18 Jun 2004 17:21:45 -0000
++++ configure.in       30 Jun 2004 00:04:05 -0000
 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi
@@ -1266,7 +1266,7 @@ After applying this patch, run these commands for a successful build:
  AC_OUTPUT
  
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
-+++ flist.c    18 Jun 2004 17:21:46 -0000
++++ flist.c    30 Jun 2004 00:04:06 -0000
 @@ -945,6 +945,8 @@ void send_file_name(int f, struct file_l
  
        if (!file)
@@ -1305,9 +1305,9 @@ After applying this patch, run these commands for a successful build:
        if (f != -1) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:21:46 -0000
-@@ -345,6 +345,10 @@ void recv_generator(char *fname, struct 
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:04:06 -0000
+@@ -343,6 +343,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && f_out != -1)
                        rprintf(FINFO,"%s/\n",fname);
@@ -1319,7 +1319,7 @@ After applying this patch, run these commands for a successful build:
        }
  
 --- mkproto.awk        1 Jan 2004 21:10:50 -0000       1.6
-+++ mkproto.awk        18 Jun 2004 17:21:46 -0000
++++ mkproto.awk        30 Jun 2004 00:04:06 -0000
 @@ -58,7 +58,7 @@ BEGIN {
    next;
  }
@@ -1329,8 +1329,8 @@ After applying this patch, run these commands for a successful build:
    next;
  }
  
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:21:46 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:04:06 -0000
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -1428,7 +1428,7 @@ After applying this patch, run these commands for a successful build:
                argstr[x++] = 'o';
        if (preserve_gid)
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
-+++ rsync.c    18 Jun 2004 17:21:46 -0000
++++ rsync.c    30 Jun 2004 00:04:06 -0000
 @@ -204,6 +204,14 @@ int set_perms(char *fname,struct file_st
        }
  #endif
@@ -1445,7 +1445,7 @@ After applying this patch, run these commands for a successful build:
                if (updated)
                        rprintf(FINFO,"%s\n",fname);
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
-+++ rsync.h    18 Jun 2004 17:21:47 -0000
++++ rsync.h    30 Jun 2004 00:04:06 -0000
 @@ -538,6 +538,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
@@ -1488,7 +1488,7 @@ After applying this patch, run these commands for a successful build:
  
  /* We have replacement versions of these if they're missing. */
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   18 Jun 2004 17:21:47 -0000
++++ rsync.yo   30 Jun 2004 00:04:07 -0000
 @@ -296,6 +296,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
   -H, --hard-links            preserve hard links
@@ -1510,7 +1510,7 @@ After applying this patch, run these commands for a successful build:
  destination file to be the same as the source file.  On most systems,
  only the super-user can set file ownership.  By default, the preservation
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ smb_acls.h 18 Jun 2004 17:21:47 -0000
++++ smb_acls.h 30 Jun 2004 00:04:07 -0000
 @@ -0,0 +1,277 @@
 +/* 
 +   Unix SMB/Netbios implementation.
@@ -1790,7 +1790,7 @@ After applying this patch, run these commands for a successful build:
 +#endif /* No ACLs. */
 +#endif /* _SMB_ACLS_H */
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ sysacls.c  18 Jun 2004 17:21:48 -0000
++++ sysacls.c  30 Jun 2004 00:04:08 -0000
 @@ -0,0 +1,3117 @@
 +/*
 +   Unix SMB/Netbios implementation.
@@ -4910,7 +4910,7 @@ After applying this patch, run these commands for a successful build:
 +
 +#endif /* No ACLs. */
 --- uidlist.c  28 Apr 2004 17:31:31 -0000      1.24
-+++ uidlist.c  18 Jun 2004 17:21:48 -0000
++++ uidlist.c  30 Jun 2004 00:04:08 -0000
 @@ -34,6 +34,7 @@
  extern int verbose;
  extern int preserve_uid;