after the session row is inserted (as is done when the session ID is
automatically generates unique IDs). Defaults to True.
---- orig/Makefile.in 2004-11-02 16:47:15
+--- orig/Makefile.in 2005-07-07 23:11:07
+++ Makefile.in 2005-05-23 23:31:30
-@@ -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
+@@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
+ ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
+ zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
- main.o checksum.o match.o syscall.o log.o backup.o
+ main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c 2005-05-19 08:52:42
+--- orig/clientserver.c 2005-08-17 06:45:07
+++ clientserver.c 2005-05-23 23:29:31
-@@ -346,6 +346,9 @@ static int rsync_module(int f_in, int f_
+@@ -348,6 +348,9 @@ static int rsync_module(int f_in, int f_
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
log_init();
+ db_log_open();
+#endif
- if (use_chroot) {
- /*
-@@ -468,6 +471,9 @@ static int rsync_module(int f_in, int f_
+ #ifdef HAVE_PUTENV
+ s = lp_prexfer_exec(i);
+@@ -524,6 +527,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);
} else {
rprintf(FLOG, "rsync %s %s from %s (%s)\n",
am_sender ? "on" : "to",
---- orig/configure.in 2005-05-28 08:24:57
+--- orig/configure.in 2005-07-29 02:47:19
+++ configure.in 2005-05-23 23:32:21
-@@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
+@@ -92,6 +92,8 @@ AC_ARG_WITH(rsync-path,
[ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)],
[ RSYNC_PATH="$with_rsync_path" ],
[ RSYNC_PATH="rsync" ])
AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
-@@ -537,6 +539,14 @@ then
+@@ -547,6 +549,14 @@ then
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
+ rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
+ }
+}
---- orig/loadparm.c 2005-02-19 17:38:51
+--- orig/loadparm.c 2005-07-28 17:25:13
+++ loadparm.c 2005-05-23 23:29:42
-@@ -125,6 +125,17 @@ typedef struct
+@@ -124,6 +124,17 @@ typedef struct
BOOL list;
BOOL use_chroot;
BOOL transfer_logging;
BOOL ignore_errors;
char *uid;
char *gid;
-@@ -159,6 +170,17 @@ static service sDefault =
+@@ -161,6 +172,17 @@ static service sDefault =
True, /* list */
True, /* use chroot */
False, /* transfer logging */
+ NULL, /* custom unique id select*/
+ True, /* get custom id before insert */
False, /* ignore errors */
- "nobody",/* uid */
-
-@@ -302,6 +324,17 @@ static struct parm_struct parm_table[] =
+ NOBODY_USER,/* uid */
+ NOBODY_GROUP,/* gid */
+@@ -298,6 +320,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},
-@@ -372,6 +405,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only)
+@@ -370,6 +403,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 2005-04-15 07:08:03
+--- orig/log.c 2005-06-10 21:33:28
+++ log.c 2005-05-23 23:29:54
@@ -84,7 +84,7 @@ struct {
/*
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c 2005-05-12 07:51:58
+--- orig/main.c 2005-07-27 23:31:12
+++ main.c 2005-05-23 23:30:01
-@@ -144,6 +144,9 @@ static void handle_stats(int f)
+@@ -139,6 +139,9 @@ static void handle_stats(int f)
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender)
return;
}
---- orig/receiver.c 2005-04-14 01:53:12
+--- orig/receiver.c 2005-08-17 06:45:08
+++ receiver.c 2005-05-23 23:30:07
-@@ -640,6 +640,9 @@ int recv_files(int f_in, struct file_lis
+@@ -668,6 +668,9 @@ int recv_files(int f_in, struct file_lis
if (!log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
if (fd1 != -1)
close(fd1);
---- orig/sender.c 2005-05-19 08:52:42
+--- orig/sender.c 2005-07-28 01:46:25
+++ sender.c 2005-05-23 23:30:15
-@@ -347,6 +347,9 @@ void send_files(struct file_list *flist,
+@@ -356,6 +356,9 @@ void send_files(struct file_list *flist,
if (!log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);