Fixed failing hunks.

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

diff --git a/slp.diff b/slp.diff
index 214c0f8..192a397 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)
@@ -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 ";
+@@ -205,6 +205,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
+@@ -233,6 +234,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -161,14 +161,14 @@ and we can't honor that request.
        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
+@@ -243,8 +248,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());