Make sure we complain if -A is specified and ACL support wasn't

compiled in.

diff --git a/acls.diff b/acls.diff
index 07de128..e42435f 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -27,9 +27,9 @@ After applying this patch, run these commands for a successful build:
  OBJS3=progress.o pipe.o
  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 \
---- orig/acls.c        2004-06-30 00:04:05
-+++ acls.c     2004-06-30 00:04:05
-@@ -0,0 +1,1119 @@
+--- orig/acls.c        2004-08-19 17:09:41
++++ acls.c     2004-08-19 17:09:41
+@@ -0,0 +1,1117 @@
 +/* -*- c-file-style: "linux" -*-
 +   Copyright (C) Andrew Tridgell 1996
 +   Copyright (C) Paul Mackerras 1996
@@ -53,7 +53,7 @@ After applying this patch, run these commands for a successful build:
 +
 +#include "rsync.h"
 +
-+#ifdef SUPPORT_ACLS
++#if SUPPORT_ACLS
 +
 +extern int preserve_acls;
 +extern int am_root;
@@ -1146,8 +1146,6 @@ After applying this patch, run these commands for a successful build:
 +      set_acl_id(gid);
 +}
 +
-+
-+
 +#endif /* SUPPORT_ACLS */
 --- orig/backup.c      2004-07-26 06:19:04
 +++ backup.c   2004-07-03 20:11:58
@@ -1330,7 +1328,7 @@ After applying this patch, run these commands for a successful build:
  }
  
 --- orig/options.c     2004-08-12 18:34:38
-+++ options.c  2004-08-19 16:58:00
++++ options.c  2004-08-19 17:15:17
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -1382,7 +1380,7 @@ After applying this patch, run these commands for a successful build:
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links", 0, POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
-+  {"acls",            'A', POPT_ARG_NONE,   &preserve_acls, 0, 0, 0 },
++  {"acls",            'A', POPT_ARG_NONE,   0,              'A', 0, 0 },
    {"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 },