Fixed failing hunks.

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

diff --git a/slp.diff b/slp.diff
index 214c0f8..90a86a0 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -23,7 +23,7 @@ and we can't honor that request.
  INSTALLMAN=@INSTALL@
 @@ -36,7 +38,7 @@ OBJS1=flist.o rsync.o generator.o receiv
  OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \
-       fileio.o batch.o clientname.o chmod.o acls.o
+       fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
  OBJS3=progress.o pipe.o
 -DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
 +DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o $(SLPOBJ)
@@ -57,7 +57,7 @@ and we can't honor that request.
                int fd;
 --- old/configure.in
 +++ new/configure.in
-@@ -624,6 +624,29 @@ if test $rsync_cv_can_hardlink_special =
+@@ -625,6 +625,29 @@ if test $rsync_cv_can_hardlink_special =
      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
  fi
  
@@ -121,7 +121,7 @@ and we can't honor that request.
  FN_LOCAL_STRING(lp_comment, comment)
 --- old/main.c
 +++ new/main.c
-@@ -1075,6 +1075,18 @@ static int start_client(int argc, char *
+@@ -1076,6 +1076,18 @@ static int start_client(int argc, char *
  
        if (!read_batch) { /* for read_batch, NO source is specified */
                shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -142,15 +142,15 @@ and we can't honor that request.
                        int dummy2;
 --- old/options.c
 +++ new/options.c
-@@ -202,6 +202,7 @@ static void print_rsync_version(enum log
-       char const *acls = "no ";
+@@ -206,6 +206,7 @@ static void print_rsync_version(enum log
+       char const *xattrs = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
 +      char const *slp = "no ";
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -228,6 +229,10 @@ static void print_rsync_version(enum log
+@@ -234,6 +235,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -158,23 +158,23 @@ and we can't honor that request.
 +      slp = "";
 +#endif
 +
-       rprintf(f, "%s  version %s  protocol version %d\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -238,8 +243,8 @@ static void print_rsync_version(enum log
+       if (SUBPROTOCOL_VERSION)
+               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
+       else
+@@ -250,8 +255,8 @@ static void print_rsync_version(enum log
                (int)(sizeof (int64) * 8));
        rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
                got_socketpair, hardlinks, links, ipv6, have_inplace);
--      rprintf(f, "    %sappend, %sACLs\n",
--              have_inplace, acls);
-+      rprintf(f, "    %sappend, %sACLs, %sSLP\n",
-+              have_inplace, acls, slp);
+-      rprintf(f, "    %sappend, %sACLs, %sxattrs\n",
+-              have_inplace, acls, xattrs);
++      rprintf(f, "    %sappend, %sACLs, %sxattrs, %sSLP\n",
++              have_inplace, acls, xattrs, slp);
  
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
 --- old/rsync.h
 +++ new/rsync.h
-@@ -174,6 +174,9 @@
+@@ -179,6 +179,9 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
        ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))