Updated to apply cleanly.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index f72c04a..400247d 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -88,7 +88,7 @@ This patch adds the following options:
     automatically generates unique IDs).  Defaults to True.
 
 
---- orig/Makefile.in   2004-07-04 08:59:17
+--- orig/Makefile.in   2004-08-09 21:07:09
 +++ Makefile.in        2004-07-03 20:22:18
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
@@ -99,9 +99,9 @@ This patch adds the following options:
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
---- orig/cleanup.c     2004-07-20 21:36:07
+--- orig/cleanup.c     2004-07-29 16:08:03
 +++ cleanup.c  2004-07-03 20:22:18
-@@ -138,8 +138,12 @@ void _exit_cleanup(int code, const char 
+@@ -139,8 +139,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
        }
  
@@ -115,9 +115,9 @@ This patch adds the following options:
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c        2004-07-17 15:20:05
+--- orig/clientserver.c        2004-08-02 02:29:16
 +++ clientserver.c     2004-07-03 20:22:18
-@@ -316,6 +316,9 @@ static int rsync_module(int f_in, int f_
+@@ -322,6 +322,9 @@ static int rsync_module(int f_in, int f_
        exclude_path_prefix = NULL;
  
        log_init();
@@ -127,7 +127,7 @@ This patch adds the following options:
  
        if (use_chroot) {
                /*
-@@ -434,6 +437,9 @@ static int rsync_module(int f_in, int f_
+@@ -440,6 +443,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);
@@ -137,7 +137,7 @@ This patch adds the following options:
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
---- orig/configure.in  2004-07-16 20:07:22
+--- orig/configure.in  2004-08-02 21:56:58
 +++ configure.in       2004-07-03 20:22:18
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
@@ -148,7 +148,7 @@ This patch adds the following options:
  
  AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
  
-@@ -465,6 +467,14 @@ then
+@@ -466,6 +468,14 @@ then
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -612,7 +612,7 @@ This patch adds the following options:
 +              rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
 +      }
 +}
---- orig/loadparm.c    2004-05-21 08:43:10
+--- orig/loadparm.c    2004-07-31 16:41:04
 +++ loadparm.c 2004-07-03 20:22:18
 @@ -123,6 +123,17 @@ typedef struct
        BOOL list;
@@ -697,9 +697,9 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2004-07-19 17:14:44
+--- orig/main.c        2004-08-05 18:24:21
 +++ main.c     2004-07-03 20:22:18
-@@ -134,6 +134,9 @@ static void report(int f)
+@@ -136,6 +136,9 @@ static void report(int f)
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
@@ -709,9 +709,9 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2004-07-20 21:36:07
+--- orig/receiver.c    2004-08-03 15:34:32
 +++ receiver.c 2004-07-20 21:47:47
-@@ -512,6 +512,9 @@ int recv_files(int f_in, struct file_lis
+@@ -545,6 +545,9 @@ int recv_files(int f_in, struct file_lis
                                       fname, fd2, file->length);
  
                log_recv(file, &initial_stats);
@@ -721,9 +721,9 @@ This patch adds the following options:
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2004-07-20 21:36:08
+--- orig/sender.c      2004-08-03 15:34:32
 +++ sender.c   2004-07-15 02:37:48
-@@ -230,6 +230,9 @@ void send_files(struct file_list *flist,
+@@ -234,6 +234,9 @@ void send_files(struct file_list *flist,
  
                match_sums(f_out, s, mbuf, st.st_size);
                log_send(file, &initial_stats);