Fixed a failing hunk.

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index b8c6b81..f4e8d30 100644 (file)
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/flist.c
 +++ new/flist.c
-@@ -1193,7 +1193,8 @@ struct file_struct *make_file(const char
+@@ -1183,7 +1183,8 @@ struct file_struct *make_file(const char
        }
  #endif
  
@@ -22,7 +22,7 @@ To use this patch, run these commands for a successful build:
        F_PATHNAME(file) = pathname;
 --- old/generator.c
 +++ new/generator.c
-@@ -627,7 +627,8 @@ int unchanged_file(char *fn, struct file
+@@ -626,7 +626,8 @@ int unchanged_file(char *fn, struct file
           of the file time to determine whether to sync */
        if (always_checksum > 0 && S_ISREG(st->st_mode)) {
                char sum[MAX_DIGEST_LEN];
@@ -155,7 +155,7 @@ To use this patch, run these commands for a successful build:
 +}
 --- old/xattrs.c
 +++ new/xattrs.c
-@@ -32,6 +32,8 @@ extern int read_only;
+@@ -33,6 +33,8 @@ extern int read_only;
  extern int list_only;
  extern int preserve_xattrs;
  extern int checksum_seed;
@@ -164,18 +164,18 @@ To use this patch, run these commands for a successful build:
  
  #define RSYNC_XAL_INITIAL 5
  #define RSYNC_XAL_LIST_INITIAL 100
-@@ -63,6 +65,8 @@ extern int checksum_seed;
- #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
- 
+@@ -66,6 +68,8 @@ extern int checksum_seed;
  #define XSTAT_ATTR RSYNC_PREFIX "%stat"
+ #define XACC_ACL_ATTR RSYNC_PREFIX "%aacl"
+ #define XDEF_ACL_ATTR RSYNC_PREFIX "%dacl"
 +#define MD4_ATTR RSYNC_PREFIX "%md4"
 +#define MD5_ATTR RSYNC_PREFIX "%md5"
  
  typedef struct {
        char *datum, *name;
-@@ -797,6 +801,39 @@ int set_xattr(const char *fname, const s
-       return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
+@@ -825,6 +829,39 @@ int del_def_xattr_acl(const char *fname)
  }
+ #endif
  
 +int get_sum_xattr(const char *fname, STRUCT_STAT *stp, char *sum)
 +{

diff --git a/slp.diff b/slp.diff
index 6a7a37c..ebe9bdb 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -41,7 +41,7 @@ and we can't honor that request.
  
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -876,6 +876,13 @@ int daemon_main(void)
+@@ -927,6 +927,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do inet_ntop on the
         * local address??? */
  
@@ -52,9 +52,9 @@ and we can't honor that request.
 +      }
 +#endif
 +
-       if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
-               char pidbuf[16];
-               int fd;
+       start_accept_loop(rsync_port, start_daemon);
+       return -1;
+ }
 --- old/configure.in
 +++ new/configure.in
 @@ -641,6 +641,29 @@ if test $rsync_cv_can_hardlink_special =
@@ -89,7 +89,7 @@ and we can't honor that request.
  #include <sys/types.h>
 --- old/loadparm.c
 +++ new/loadparm.c
-@@ -110,6 +110,9 @@ typedef struct
+@@ -111,6 +111,9 @@ typedef struct
        char *socket_options;
  
        int rsync_port;
@@ -99,7 +99,7 @@ and we can't honor that request.
  } global;
  
  static global Globals;
-@@ -295,6 +298,9 @@ static struct parm_struct parm_table[] =
+@@ -296,6 +299,9 @@ static struct parm_struct parm_table[] =
   {"motd file",         P_STRING, P_GLOBAL,&Globals.motd_file,          NULL,0},
   {"pid file",          P_STRING, P_GLOBAL,&Globals.pid_file,           NULL,0},
   {"port",              P_INTEGER,P_GLOBAL,&Globals.rsync_port,         NULL,0},
@@ -109,7 +109,7 @@ and we can't honor that request.
   {"socket options",    P_STRING, P_GLOBAL,&Globals.socket_options,     NULL,0},
  
   {"auth users",        P_STRING, P_LOCAL, &sDefault.auth_users,        NULL,0},
-@@ -386,6 +392,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
+@@ -387,6 +393,9 @@ FN_GLOBAL_STRING(lp_pid_file, &Globals.p
  FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
  
  FN_GLOBAL_INTEGER(lp_rsync_port, &Globals.rsync_port)
@@ -121,7 +121,7 @@ and we can't honor that request.
  FN_LOCAL_STRING(lp_comment, comment)
 --- old/main.c
 +++ new/main.c
-@@ -1099,6 +1099,18 @@ static int start_client(int argc, char *
+@@ -1125,6 +1125,18 @@ static int start_client(int argc, char *
  
        if (!read_batch) { /* for read_batch, NO source is specified */
                char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -138,11 +138,11 @@ and we can't honor that request.
 +              }
 +
                if (path) { /* source is remote */
-                       char *dummy1;
-                       int dummy2;
+                       char *dummy_host;
+                       int dummy_port = 0;
 --- old/options.c
 +++ new/options.c
-@@ -220,6 +220,7 @@ static void print_rsync_version(enum log
+@@ -221,6 +221,7 @@ static void print_rsync_version(enum log
        char const *links = "no ";
        char const *iconv = "no ";
        char const *ipv6 = "no ";
@@ -150,7 +150,7 @@ and we can't honor that request.
        STRUCT_STAT *dumstat;
  
  #if SUBPROTOCOL_VERSION != 0
-@@ -249,6 +250,9 @@ static void print_rsync_version(enum log
+@@ -250,6 +251,9 @@ static void print_rsync_version(enum log
  #ifdef ICONV_OPTION
        iconv = "";
  #endif
@@ -160,7 +160,7 @@ and we can't honor that request.
  
        rprintf(f, "%s  version %s  protocol version %d%s\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
-@@ -262,8 +266,8 @@ static void print_rsync_version(enum log
+@@ -263,8 +267,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);
@@ -223,7 +223,7 @@ and we can't honor that request.
  enddit()
  
  
-@@ -564,6 +573,7 @@ use chroot = no
+@@ -565,6 +574,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid
@@ -233,7 +233,7 @@ and we can't honor that request.
          path = /var/ftp/pub
 --- old/socket.c
 +++ new/socket.c
-@@ -501,6 +501,16 @@ void start_accept_loop(int port, int (*f
+@@ -502,6 +502,16 @@ void start_accept_loop(int port, int (*f
  {
        fd_set deffds;
        int *sp, maxfd, i;
@@ -250,7 +250,7 @@ and we can't honor that request.
  
  #ifdef HAVE_SIGACTION
        sigact.sa_flags = SA_NOCLDSTOP;
-@@ -529,14 +539,25 @@ void start_accept_loop(int port, int (*f
+@@ -530,14 +540,25 @@ void start_accept_loop(int port, int (*f
                        maxfd = sp[i];
        }
  
@@ -276,7 +276,7 @@ and we can't honor that request.
  
                /* close log file before the potentially very long select so
                 * file can be trimmed by another process instead of growing
-@@ -548,8 +569,18 @@ void start_accept_loop(int port, int (*f
+@@ -549,8 +570,18 @@ void start_accept_loop(int port, int (*f
  #else
                fds = deffds;
  #endif