automatically generates unique IDs). Defaults to True.
---- orig/Makefile.in 2004-08-09 21:07:09
+--- 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 \
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-03-05 18:58:38
+++ cleanup.c 2004-07-03 20:22:18
-@@ -139,8 +139,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)
+ if (code) {
log_exit(code, file, line);
-+#ifdef HAVE_LIBODBC
++#if HAVE_LIBODBC
+ db_log_exit(code,file,line);
+#endif
+ }
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-03-01 03:39:32
+++ 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;
+@@ -351,6 +351,9 @@ static int rsync_module(int f_in, int f_
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
log_init();
-+#ifdef HAVE_LIBODBC
++#if HAVE_LIBODBC
+ db_log_open();
+#endif
if (use_chroot) {
/*
-@@ -440,6 +443,9 @@ static int rsync_module(int f_in, int f_
+@@ -473,6 +476,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
++#if HAVE_LIBODBC
+ db_log_session();
+#endif
} else {
rprintf(FLOG, "rsync %s %s from %s (%s)\n",
am_sender ? "on" : "to",
---- orig/configure.in 2004-08-02 21:56:58
+--- orig/configure.in 2005-03-16 02:19:29.819770817
+++ 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)],
AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
-@@ -466,6 +468,14 @@ then
+@@ -524,6 +526,14 @@ then
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
+
+#include "rsync.h"
+
-+#ifdef HAVE_SQL_H
++#if HAVE_SQL_H
+#include <sql.h>
+#else
-+#ifdef HAVE_ODBC_SQL_H
++#if HAVE_ODBC_SQL_H
+#include <odbc/sql.h>
+#endif
+#endif
+
-+#ifdef HAVE_SQLEXT_H
++#if HAVE_SQLEXT_H
+#include <sqlext.h>
+#else
-+#ifdef HAVE_ODBC_SQLEXT_H
++#if HAVE_ODBC_SQLEXT_H
+#include <odbc/sqlext.h>
+#endif
+#endif
+
-+#ifdef HAVE_SQLTYPES_H
++#if HAVE_SQLTYPES_H
+#include <sqltypes.h>
+#else
-+#ifdef HAVE_ODBC_SQLTYPES_H
++#if HAVE_ODBC_SQLTYPES_H
+#include <odbc/sqltypes.h>
+#endif
+#endif
+ 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-02-19 17:38:51
+++ 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;
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 */
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},
{"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)
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 2004-06-09 15:34:38
+--- orig/log.c 2005-03-16 02:19:30.009754284
+++ log.c 2004-07-03 20:22:18
-@@ -75,7 +75,7 @@ struct {
+@@ -83,7 +83,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
*/
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c 2004-08-05 18:24:21
+--- orig/main.c 2005-03-16 02:19:30.077748367
+++ 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__);
-+#ifdef HAVE_LIBODBC
++#if HAVE_LIBODBC
+ db_log_exit(0,__FILE__,__LINE__);
+#endif
if (f == -1 || !am_sender)
return;
}
---- orig/receiver.c 2004-08-03 15:34:32
-+++ receiver.c 2004-07-20 21:47:47
-@@ -545,6 +545,9 @@ int recv_files(int f_in, struct file_lis
- fname, fd2, file->length);
+--- orig/receiver.c 2005-03-16 02:19:30.248733487
++++ receiver.c 2005-03-05 00:31:00
+@@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis
- log_recv(file, &initial_stats);
-+#ifdef HAVE_LIBODBC
+ 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 2004-08-03 15:34:32
-+++ sender.c 2004-07-15 02:37:48
-@@ -234,6 +234,9 @@ void send_files(struct file_list *flist,
+--- orig/sender.c 2005-03-16 02:19:30.828683018
++++ sender.c 2005-03-05 00:31:19
+@@ -351,6 +351,9 @@ void send_files(struct file_list *flist,
- match_sums(f_out, s, mbuf, st.st_size);
- log_send(file, &initial_stats);
-+#ifdef HAVE_LIBODBC
+ if (!log_before_transfer)
+ log_item(file, &initial_stats, iflags, NULL);
++#if HAVE_LIBODBC
+ db_log_transfer(file, &initial_stats,"send");
+#endif
git.samba.org / rsync-patches.git / blobdiff