From a30f8abd9a89dd8384a7285481b92960c092efdb Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 19 Aug 2004 17:07:24 +0000
Subject: [PATCH] - Fixed an instruction in the opening comments. - Fixed a
 FIXME in options.c.

---
 acls.diff | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/acls.diff b/acls.diff
index 4ef0ddf..07de128 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1,13 +1,13 @@
 After applying this patch, run these commands for a successful build:
 
     autoconf
-    automake
+    autoheader
     ./configure --with-acl-support
     make proto
     make
 
 
---- orig/Makefile.in	2004-08-09 21:07:09
+--- orig/Makefile.in	2004-08-13 07:18:58
 +++ Makefile.in	2004-07-03 20:11:58
 @@ -25,7 +25,7 @@ VERSION=@VERSION@
  .SUFFIXES:
@@ -1176,7 +1176,7 @@ After applying this patch, run these commands for a successful build:
  	free(file);
  
  	if (verbose > 1)
---- orig/configure.in	2004-08-02 21:56:58
+--- orig/configure.in	2004-08-13 07:18:59
 +++ configure.in	2004-07-03 20:11:58
 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
@@ -1265,7 +1265,7 @@ After applying this patch, run these commands for a successful build:
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
---- orig/flist.c	2004-08-11 23:42:23
+--- orig/flist.c	2004-08-12 18:34:38
 +++ flist.c	2004-07-03 20:11:58
 @@ -944,6 +944,8 @@ void send_file_name(int f, struct file_l
  
@@ -1329,8 +1329,8 @@ After applying this patch, run these commands for a successful build:
    next;
  }
  
---- orig/options.c	2004-08-11 23:42:23
-+++ options.c	2004-07-15 16:53:42
+--- orig/options.c	2004-08-12 18:34:38
++++ options.c	2004-08-19 16:58:00
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -1386,7 +1386,7 @@ After applying this patch, run these commands for a successful build:
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
-@@ -620,6 +628,31 @@ int parse_arguments(int *argc, const cha
+@@ -620,6 +628,24 @@ int parse_arguments(int *argc, const cha
  			return 0;
  #endif
  
@@ -1400,16 +1400,9 @@ After applying this patch, run these commands for a successful build:
 + 			 * restrict group and other access in the presence
 + 			 * of any more restrictive ACLs, but this is safe
 +			 * for now */
-+			/* FIXME: Don't say "server" if this is
-+			 * happening on the client. */
-+			/* FIXME: Why do we have the duplicated
-+			 * rprintf?  Everybody who gets this message
-+			 * ought to send it to the client and also to
-+			 * the logs. */
 +			snprintf(err_buf,sizeof(err_buf),
 +                                 "ACLs are not supported on this %s\n",
 +				 am_server ? "server" : "client");
-+			rprintf(FERROR,"ERROR: ACLs not supported on this platform\n");
 +			return 0;
 +#endif /* SUPPORT_ACLS */
 +			break;
@@ -1418,7 +1411,7 @@ After applying this patch, run these commands for a successful build:
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off (opt-BASE is its index). */
-@@ -932,6 +965,8 @@ void server_options(char **args,int *arg
+@@ -932,6 +958,8 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
@@ -1487,9 +1480,9 @@ After applying this patch, run these commands for a successful build:
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo	2004-08-11 17:26:27
+--- orig/rsync.yo	2004-08-19 16:30:47
 +++ rsync.yo	2004-07-03 20:11:58
-@@ -297,6 +297,7 @@ verb(
+@@ -326,6 +326,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
   -H, --hard-links            preserve hard links
   -p, --perms                 preserve permissions
@@ -1497,7 +1490,7 @@ After applying this patch, run these commands for a successful build:
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
-@@ -549,6 +550,11 @@ source file's permissions and the umask 
+@@ -578,6 +579,11 @@ source file's permissions and the umask 
  other files (including updated files) retain their existing permissions
  (which is the same behavior as other file-copy utilities, such as cp).
  
-- 
2.34.1