Got rid of patch fuzz.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index efb7b40..2c89be5 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-08-13 07:18:58
+--- orig/Makefile.in   2004-11-03 11:56:03
 +++ 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-29 16:08:03
+--- orig/cleanup.c     2005-01-10 09:46:11
 +++ cleanup.c  2004-07-03 20:22:18
-@@ -139,8 +139,12 @@ void _exit_cleanup(int code, const char 
+@@ -143,8 +143,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
        }
  
@@ -115,10 +115,10 @@ 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-08-02 02:29:16
+--- orig/clientserver.c        2005-01-25 00:53:58
 +++ clientserver.c     2004-07-03 20:22:18
-@@ -322,6 +322,9 @@ static int rsync_module(int f_in, int f_
-       exclude_path_prefix = NULL;
+@@ -341,6 +341,9 @@ static int rsync_module(int f_in, int f_
+                   XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
  
        log_init();
 +#ifdef HAVE_LIBODBC
@@ -127,7 +127,7 @@ This patch adds the following options:
  
        if (use_chroot) {
                /*
-@@ -440,6 +443,9 @@ static int rsync_module(int f_in, int f_
+@@ -459,6 +462,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-09-23 17:42:07
+--- orig/configure.in  2005-01-10 00:21:12
 +++ 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])
  
-@@ -466,6 +468,14 @@ then
+@@ -500,6 +502,14 @@ then
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -612,9 +612,9 @@ This patch adds the following options:
 +              rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
 +      }
 +}
---- orig/loadparm.c    2004-07-31 16:41:04
+--- orig/loadparm.c    2005-01-25 00:53:58
 +++ loadparm.c 2004-07-03 20:22:18
-@@ -123,6 +123,17 @@ typedef struct
+@@ -125,6 +125,17 @@ typedef struct
        BOOL list;
        BOOL use_chroot;
        BOOL transfer_logging;
@@ -632,7 +632,7 @@ This patch adds the following options:
        BOOL ignore_errors;
        char *uid;
        char *gid;
-@@ -156,6 +167,17 @@ static service sDefault =
+@@ -159,6 +170,17 @@ static service sDefault =
        True,    /* list */
        True,    /* use chroot */
        False,   /* transfer logging */
@@ -650,7 +650,7 @@ This patch adds the following options:
        False,   /* ignore errors */
        "nobody",/* uid */
  
-@@ -295,6 +317,17 @@ static struct parm_struct parm_table[] =
+@@ -302,6 +324,17 @@ static struct parm_struct parm_table[] =
    {"include",          P_STRING,  P_LOCAL,  &sDefault.include,     NULL,   0},
    {"include from",     P_STRING,  P_LOCAL,  &sDefault.include_from,NULL,   0},
    {"transfer logging", P_BOOL,    P_LOCAL,  &sDefault.transfer_logging,NULL,0},
@@ -668,7 +668,7 @@ This patch adds the following options:
    {"ignore errors",    P_BOOL,    P_LOCAL,  &sDefault.ignore_errors,NULL,0},
    {"log format",       P_STRING,  P_LOCAL,  &sDefault.log_format,  NULL,   0},
    {"refuse options",   P_STRING,  P_LOCAL,  &sDefault.refuse_options,NULL, 0},
-@@ -363,6 +396,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only)
+@@ -372,6 +405,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only)
  FN_LOCAL_BOOL(lp_list, list)
  FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
  FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
@@ -697,9 +697,9 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2004-09-29 17:58:26
+--- orig/main.c        2005-01-24 01:43:10
 +++ main.c     2004-07-03 20:22:18
-@@ -136,6 +136,9 @@ static void report(int f)
+@@ -139,6 +139,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-09-21 09:40:27
+--- orig/receiver.c    2005-01-24 01:43:10
 +++ receiver.c 2004-07-20 21:47:47
-@@ -546,6 +546,9 @@ int recv_files(int f_in, struct file_lis
+@@ -490,6 +490,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-09-20 05:10:48
+--- orig/sender.c      2005-01-25 00:00:31
 +++ sender.c   2004-07-15 02:37:48
-@@ -239,6 +239,9 @@ void send_files(struct file_list *flist,
+@@ -231,6 +231,9 @@ void send_files(struct file_list *flist,
  
                match_sums(f_out, s, mbuf, st.st_size);
                log_send(file, &initial_stats);