From 545864f1278dab27f0a4ed1fed6c4c2257bb076c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 9 Jun 2004 15:39:08 +0000 Subject: [PATCH] Got rid of some fuzz. --- ODBC-dblog.diff | 76 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index c71ed01..070a4b8 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -88,8 +88,8 @@ This patch adds the following options: automatically generates unique IDs). Defaults to True. ---- Makefile.in 2 May 2004 17:04:14 -0000 1.100 -+++ Makefile.in 13 May 2004 18:17:08 -0000 +--- Makefile.in 15 May 2004 00:48:11 -0000 1.101 ++++ Makefile.in 9 Jun 2004 15:34:50 -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 13 May 2004 18:17:08 -0000 ++++ cleanup.c 9 Jun 2004 15:34:50 -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 14 Apr 2004 23:33:34 -0000 1.121 -+++ clientserver.c 13 May 2004 18:17:08 -0000 -@@ -311,6 +311,9 @@ static int rsync_module(int f_in, int f_ +--- 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_ exclude_path_prefix = NULL; log_init(); @@ -127,18 +127,18 @@ This patch adds the following options: if (use_chroot) { /* -@@ -429,6 +432,9 @@ static int rsync_module(int f_in, int f_ - rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n", - am_sender?"on":"to", +@@ -426,6 +429,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); +#ifdef HAVE_LIBODBC + db_log_session(); +#endif } else { - rprintf(FINFO,"rsync %s %s from %s (%s)\n", - am_sender?"on":"to", + 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 13 May 2004 18:17:08 -0000 ++++ configure.in 9 Jun 2004 15:34:50 -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" ], @@ -148,23 +148,23 @@ This patch adds the following options: AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine]) -@@ -463,6 +465,14 @@ fi - if test x"$with_included_popt" != x"yes" - then +@@ -465,6 +467,14 @@ then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) -+fi -+ + fi + +if test x"$with_ODBC" = x"yes" +then + AC_CHECK_HEADERS(sql.h sqlext.h sqltypes.h) + AC_CHECK_LIB(odbc,SQLExecDirect) + EXTRA_OBJECT="$EXTRA_OBJECT dblog.o" + AC_SUBST(EXTRA_OBJECT) - fi - ++fi ++ AC_MSG_CHECKING([whether to use included libpopt]) + if test x"$with_included_popt" = x"yes" + then --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ dblog-tables-mysql.sql 13 May 2004 18:17:08 -0000 ++++ dblog-tables-mysql.sql 9 Jun 2004 15:34:50 -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 13 May 2004 18:17:08 -0000 ++++ dblog-tables-postgresql.sql 9 Jun 2004 15:34:50 -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 13 May 2004 18:17:08 -0000 ++++ dblog.c 9 Jun 2004 15:34:50 -0000 @@ -0,0 +1,352 @@ +/* + * ODBC Database logging functions @@ -612,9 +612,9 @@ This patch adds the following options: + rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n"); + } +} ---- loadparm.c 4 Feb 2004 07:31:29 -0000 1.50 -+++ loadparm.c 13 May 2004 18:17:08 -0000 -@@ -122,6 +122,17 @@ typedef struct +--- loadparm.c 19 May 2004 22:19:19 -0000 1.51 ++++ loadparm.c 9 Jun 2004 15:34:51 -0000 +@@ -123,6 +123,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; -@@ -154,6 +165,17 @@ static service sDefault = +@@ -156,6 +167,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 */ -@@ -292,6 +314,17 @@ static struct parm_struct parm_table[] = +@@ -295,6 +317,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}, -@@ -359,6 +392,17 @@ FN_LOCAL_BOOL(lp_read_only, read_only) +@@ -363,6 +396,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) @@ -686,8 +686,8 @@ 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) ---- log.c 29 Apr 2004 19:34:31 -0000 1.72 -+++ log.c 13 May 2004 18:17:09 -0000 +--- log.c 7 Jun 2004 22:51:14 -0000 1.74 ++++ log.c 9 Jun 2004 15:34:51 -0000 @@ -75,7 +75,7 @@ struct { /* * Map from rsync error code to name, or return NULL. @@ -697,8 +697,8 @@ This patch adds the following options: { int i; for (i = 0; rerr_names[i].name; i++) { ---- main.c 10 Feb 2004 03:54:47 -0000 1.192 -+++ main.c 13 May 2004 18:17:09 -0000 +--- 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) if (am_daemon) { @@ -709,9 +709,9 @@ This patch adds the following options: if (f == -1 || !am_sender) return; } ---- receiver.c 13 May 2004 07:08:22 -0000 1.77 -+++ receiver.c 13 May 2004 18:17:09 -0000 -@@ -454,7 +454,9 @@ int recv_files(int f_in,struct file_list +--- 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 recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length); log_recv(file, &initial_stats); @@ -722,9 +722,9 @@ This patch adds the following options: if (mapbuf) unmap_file(mapbuf); if (fd1 != -1) { close(fd1); ---- sender.c 11 May 2004 19:53:16 -0000 1.39 -+++ sender.c 13 May 2004 18:17:09 -0000 -@@ -280,6 +280,9 @@ void send_files(struct file_list *flist, +--- sender.c 15 May 2004 19:31:10 -0000 1.40 ++++ sender.c 9 Jun 2004 15:34:51 -0000 +@@ -281,6 +281,9 @@ void send_files(struct file_list *flist, } else { match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); -- 2.34.1