Fixed some failing hunks.

[rsync/rsync-patches.git] / ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 5db88ae..022e234 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -10,7 +10,7 @@ After applying this patch, run these commands for a successful build:
 
 See the file "instructions" (after applying this patch) for more info.
 
---- orig/Makefile.in   2005-07-07 23:11:07
+--- orig/Makefile.in   2005-11-07 04:29:00
 +++ Makefile.in        2005-09-23 15:59:02
 @@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
  ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
@@ -19,9 +19,9 @@ See the file "instructions" (after applying this patch) for more info.
 -      main.o checksum.o match.o syscall.o log.o backup.o
 +      main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
-       fileio.o batch.o clientname.o
+       fileio.o batch.o clientname.o chmod.o
  OBJS3=progress.o pipe.o
---- orig/cleanup.c     2005-03-05 18:58:38
+--- orig/cleanup.c     2005-11-10 16:58:36
 +++ cleanup.c  2005-09-23 15:59:19
 @@ -23,6 +23,7 @@
  
@@ -46,10 +46,10 @@ See the file "instructions" (after applying this patch) for more info.
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c        2005-09-15 18:09:14
+--- orig/clientserver.c        2005-10-24 21:04:44
 +++ clientserver.c     2005-09-23 15:59:36
-@@ -349,6 +349,9 @@ static int rsync_module(int f_in, int f_
-                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
+@@ -369,6 +369,9 @@ static int rsync_module(int f_in, int f_
+                  XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
  
        log_init();
 +#ifdef HAVE_LIBODBC
@@ -57,8 +57,8 @@ See the file "instructions" (after applying this patch) for more info.
 +#endif
  
  #ifdef HAVE_PUTENV
-       s = lp_prexfer_exec(i);
-@@ -535,6 +538,9 @@ static int rsync_module(int f_in, int f_
+       if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
+@@ -592,6 +595,9 @@ static int rsync_module(int f_in, int f_
                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);
@@ -1046,9 +1046,9 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_BOOL(lp_list, list)
---- orig/log.c 2005-06-10 21:33:28
+--- orig/log.c 2005-10-26 16:49:08
 +++ log.c      2005-09-23 16:01:13
-@@ -84,7 +84,7 @@ struct {
+@@ -86,7 +86,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1057,9 +1057,9 @@ See the file "instructions" (after applying this patch) for more info.
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2005-09-16 16:38:53
+--- orig/main.c        2005-11-12 20:13:05
 +++ main.c     2005-09-23 16:01:22
-@@ -139,6 +139,9 @@ static void handle_stats(int f)
+@@ -159,6 +159,9 @@ static void handle_stats(int f)
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
@@ -1069,7 +1069,7 @@ See the file "instructions" (after applying this patch) for more info.
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2005-09-16 05:41:02
+--- orig/receiver.c    2005-11-10 16:58:36
 +++ receiver.c 2005-09-24 17:57:43
 @@ -175,6 +175,10 @@ static int get_tmpname(char *fnametmp, c
        if (maxname < 1) {