Updated to apply cleanly.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 070a4b8..78ac5bb 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -89,7 +89,7 @@ This patch adds the following options:
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
-+++ Makefile.in        9 Jun 2004 15:34:50 -0000
++++ Makefile.in        18 Jun 2004 17:21:24 -0000
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o
@@ -100,7 +100,7 @@ This patch adds the following options:
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22
-+++ cleanup.c  9 Jun 2004 15:34:50 -0000
++++ cleanup.c  18 Jun 2004 17:21:24 -0000
 @@ -140,7 +140,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",
---- clientserver.c     7 Jun 2004 22:33:01 -0000       1.124
-+++ clientserver.c     9 Jun 2004 15:34:50 -0000
-@@ -313,6 +313,9 @@ static int rsync_module(int f_in, int f_
+--- clientserver.c     13 Jun 2004 14:18:48 -0000      1.127
++++ clientserver.c     18 Jun 2004 17:21:24 -0000
+@@ -315,6 +315,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) {
                /*
-@@ -426,6 +429,9 @@ static int rsync_module(int f_in, int f_
+@@ -433,6 +436,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);
@@ -138,7 +138,7 @@ This patch adds the following options:
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196
-+++ configure.in       9 Jun 2004 15:34:50 -0000
++++ configure.in       18 Jun 2004 17:21:24 -0000
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
        [ RSYNC_PATH="$with_rsync_path" ],
@@ -164,7 +164,7 @@ This patch adds the following options:
  if test x"$with_included_popt" = x"yes"
  then
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ dblog-tables-mysql.sql     9 Jun 2004 15:34:50 -0000
++++ dblog-tables-mysql.sql     18 Jun 2004 17:21:24 -0000
 @@ -0,0 +1,43 @@
 +drop table transfer;
 +drop table exit;
@@ -210,7 +210,7 @@ This patch adds the following options:
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ dblog-tables-postgresql.sql        9 Jun 2004 15:34:50 -0000
++++ dblog-tables-postgresql.sql        18 Jun 2004 17:21:24 -0000
 @@ -0,0 +1,45 @@
 +drop table transfer;
 +drop table exit;
@@ -258,7 +258,7 @@ This patch adds the following options:
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ dblog.c    9 Jun 2004 15:34:50 -0000
++++ dblog.c    18 Jun 2004 17:21:24 -0000
 @@ -0,0 +1,352 @@
 +/*
 + *  ODBC Database logging functions
@@ -613,7 +613,7 @@ This patch adds the following options:
 +      }
 +}
 --- loadparm.c 19 May 2004 22:19:19 -0000      1.51
-+++ loadparm.c 9 Jun 2004 15:34:51 -0000
++++ loadparm.c 18 Jun 2004 17:21:25 -0000
 @@ -123,6 +123,17 @@ typedef struct
        BOOL list;
        BOOL use_chroot;
@@ -687,7 +687,7 @@ This patch adds the following options:
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
 --- log.c      7 Jun 2004 22:51:14 -0000       1.74
-+++ log.c      9 Jun 2004 15:34:51 -0000
++++ log.c      18 Jun 2004 17:21:25 -0000
 @@ -75,7 +75,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
@@ -697,21 +697,21 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- main.c     19 May 2004 22:19:19 -0000      1.195
-+++ main.c     9 Jun 2004 15:34:51 -0000
-@@ -120,6 +120,9 @@ static void report(int f)
+--- main.c     18 Jun 2004 16:50:20 -0000      1.198
++++ main.c     18 Jun 2004 17:21:25 -0000
+@@ -121,6 +121,9 @@ static void report(int f)
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
 +#ifdef HAVE_LIBODBC
 +              db_log_exit(0,__FILE__,__LINE__);
 +#endif
-               if (f == -1 || !am_sender) return;
+               if (f == -1 || !am_sender)
+                       return;
        }
- 
---- receiver.c 21 May 2004 08:27:04 -0000      1.79
-+++ receiver.c 9 Jun 2004 15:34:51 -0000
-@@ -456,7 +456,9 @@ int recv_files(int f_in,struct file_list
+--- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
++++ receiver.c 18 Jun 2004 17:21:25 -0000
+@@ -461,7 +461,9 @@ int recv_files(int f_in,struct file_list
                recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
  
                log_recv(file, &initial_stats);
@@ -722,10 +722,10 @@ This patch adds the following options:
                if (mapbuf) unmap_file(mapbuf);
                if (fd1 != -1) {
                        close(fd1);
---- sender.c   15 May 2004 19:31:10 -0000      1.40
-+++ sender.c   9 Jun 2004 15:34:51 -0000
+--- sender.c   18 Jun 2004 16:55:12 -0000      1.41
++++ sender.c   18 Jun 2004 17:21:25 -0000
 @@ -281,6 +281,9 @@ void send_files(struct file_list *flist,
-               } else  {
+               } else  { /* not read_batch */
                        match_sums(f_out, s, mbuf, st.st_size);
                        log_send(file, &initial_stats);
 +#ifdef HAVE_LIBODBC