Updated to apply cleanly.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 7cdc2ac..4786c60 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -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-03-01 03:39:32
+--- orig/clientserver.c        2005-04-09 17:38:31
 +++ clientserver.c     2004-07-03 20:22:18
-@@ -351,6 +351,9 @@ static int rsync_module(int f_in, int f_
+@@ -347,6 +347,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) {
                /*
-@@ -473,6 +476,9 @@ static int rsync_module(int f_in, int f_
+@@ -469,6 +472,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-03-16 02:19:29
+--- orig/configure.in  2005-04-07 17:04:26
 +++ 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
  
@@ -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-03-16 02:19:30
+--- orig/log.c 2005-04-15 07:08:03
 +++ log.c      2004-07-03 20:22:18
-@@ -83,7 +83,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-03-16 02:19:30
+--- orig/main.c        2005-04-24 04:42:39
 +++ main.c     2004-07-03 20:22:18
-@@ -139,6 +139,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,9 +709,9 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2005-03-16 02:19:30
+--- orig/receiver.c    2005-04-14 01:53:12
 +++ receiver.c 2005-03-05 00:31:00
-@@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis
+@@ -640,6 +640,9 @@ int recv_files(int f_in, struct file_lis
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
@@ -721,9 +721,9 @@ This patch adds the following options:
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2005-03-16 02:19:30
+--- orig/sender.c      2005-04-14 01:53:12
 +++ sender.c   2005-03-05 00:31:19
-@@ -351,6 +351,9 @@ void send_files(struct file_list *flist,
+@@ -342,6 +342,9 @@ void send_files(struct file_list *flist,
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);