Updated to apply cleanly.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 43f07a6..4aeede1 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-11-03 11:56:03
+--- orig/Makefile.in   2004-11-02 16:47:15
 +++ 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,10 +99,10 @@ 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     2005-02-07 20:41:56
+--- orig/cleanup.c     2005-03-05 18:58:38
 +++ cleanup.c  2004-07-03 20:22:18
-@@ -142,8 +142,12 @@ void _exit_cleanup(int code, const char 
-                       code = RERR_VANISHED;
+@@ -144,8 +144,12 @@ void _exit_cleanup(int code, const char 
+                       code = RERR_PARTIAL;
        }
  
 -      if (code)
@@ -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        2005-02-07 20:41:56
+--- orig/clientserver.c        2005-05-19 08:52:42
 +++ clientserver.c     2004-07-03 20:22:18
-@@ -344,6 +344,9 @@ static int rsync_module(int f_in, int f_
+@@ -346,6 +346,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
  
        log_init();
@@ -127,7 +127,7 @@ This patch adds the following options:
  
        if (use_chroot) {
                /*
-@@ -466,6 +469,9 @@ static int rsync_module(int f_in, int f_
+@@ -468,6 +471,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  2005-01-28 23:01:08
+--- orig/configure.in  2005-05-13 22:24:18
 +++ 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])
  
-@@ -524,6 +526,14 @@ then
+@@ -535,6 +537,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    2005-01-25 00:53:58
+--- orig/loadparm.c    2005-02-19 17:38:51
 +++ loadparm.c 2004-07-03 20:22:18
 @@ -125,6 +125,17 @@ typedef struct
        BOOL list;
@@ -686,9 +686,9 @@ This patch adds the following options:
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
---- orig/log.c 2005-02-07 20:41:56
+--- orig/log.c 2005-04-15 07:08:03
 +++ log.c      2004-07-03 20:22:18
-@@ -75,7 +75,7 @@ struct {
+@@ -84,7 +84,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -697,9 +697,9 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2005-02-07 20:41:56
+--- orig/main.c        2005-05-12 07:51:58
 +++ main.c     2004-07-03 20:22:18
-@@ -134,6 +134,9 @@ static void report(int f)
+@@ -144,6 +144,9 @@ static void handle_stats(int f)
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
@@ -709,24 +709,24 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2005-02-11 10:53:14
-+++ receiver.c 2004-07-20 21:47:47
-@@ -505,6 +505,9 @@ int recv_files(int f_in, struct file_lis
-                                      fname, fd2, file->length);
+--- orig/receiver.c    2005-04-14 01:53:12
++++ receiver.c 2005-03-05 00:31:00
+@@ -640,6 +640,9 @@ int recv_files(int f_in, struct file_lis
  
-               log_recv(file, &initial_stats);
+               if (!log_before_transfer)
+                       log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats, "receive");
 +#endif
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2005-02-11 22:24:19
-+++ sender.c   2004-07-15 02:37:48
-@@ -236,6 +236,9 @@ void send_files(struct file_list *flist,
+--- orig/sender.c      2005-05-19 08:52:42
++++ sender.c   2005-03-05 00:31:19
+@@ -347,6 +347,9 @@ void send_files(struct file_list *flist,
  
-               match_sums(f_out, s, mbuf, st.st_size);
-               log_send(file, &initial_stats);
+               if (!log_before_transfer)
+                       log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats,"send");
 +#endif