@@ -32,7 +32,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@
- OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
- fileio.o batch.o clientname.o chmod.o
+ OBJS1=flist.o 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
++ util.o main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
+ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \
+ fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
OBJS3=progress.o pipe.o
--- old/cleanup.c
+++ new/cleanup.c
-@@ -27,6 +27,7 @@ extern int am_server;
+@@ -26,6 +26,7 @@ extern int am_server;
extern int am_daemon;
extern int io_error;
extern int keep_partial;
extern int log_got_error;
extern char *partial_dir;
extern char *logfile_name;
-@@ -174,8 +175,13 @@ NORETURN void _exit_cleanup(int code, co
+@@ -173,8 +174,13 @@ NORETURN void _exit_cleanup(int code, co
code = exit_code = RERR_PARTIAL;
}
#include "case_N.h"
--- old/clientserver.c
+++ new/clientserver.c
-@@ -394,6 +394,9 @@ static int rsync_module(int f_in, int f_
+@@ -396,6 +396,9 @@ static int rsync_module(int f_in, int f_
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
log_init(1);
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -633,6 +636,9 @@ static int rsync_module(int f_in, int f_
+@@ -642,6 +645,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);
am_sender ? "on" : "to",
--- old/configure.in
+++ new/configure.in
-@@ -632,6 +632,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -643,6 +643,12 @@ if test x"$with_included_popt" != x"yes"
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
+ automatically generates unique IDs). Defaults to True.
--- old/loadparm.c
+++ new/loadparm.c
-@@ -122,9 +122,16 @@ typedef struct
+@@ -121,9 +121,16 @@ typedef struct
{
char *auth_users;
char *comment;
char *filter;
char *gid;
char *hosts_allow;
-@@ -142,14 +149,20 @@ typedef struct
+@@ -141,15 +148,21 @@ typedef struct
char *prexfer_exec;
char *refuse_options;
char *secrets_file;
int timeout;
+ BOOL database_logging;
+ BOOL fake_super;
+ BOOL get_custom_id_before_insert;
BOOL ignore_errors;
BOOL ignore_nonreadable;
/* filter; */ NULL,
/* gid; */ NOBODY_GROUP,
/* hosts_allow; */ NULL,
-@@ -189,14 +209,20 @@ static service sDefault =
+@@ -189,15 +209,21 @@ static service sDefault =
/* prexfer_exec; */ NULL,
/* refuse_options; */ NULL,
/* secrets_file; */ NULL,
/* timeout; */ 0,
+ /* database_logging; */ False,
+ /* fake_super; */ False,
+ /* get_custom_id_before_insert; */ True,
/* ignore_errors; */ False,
/* ignore_nonreadable; */ False,
/* list; */ True,
-@@ -295,10 +321,19 @@ static struct parm_struct parm_table[] =
+@@ -296,11 +322,20 @@ static struct parm_struct parm_table[] =
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL,0},
{"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from, NULL,0},
{"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL,0},
+ {"exit table name", P_STRING, P_LOCAL, &sDefault.exit_table_name, NULL,0},
+ {"fake super", P_BOOL, P_LOCAL, &sDefault.fake_super, NULL,0},
{"filter", P_STRING, P_LOCAL, &sDefault.filter, NULL,0},
+ {"get custom id before insert",P_BOOL,P_LOCAL,&sDefault.get_custom_id_before_insert,NULL,0},
{"gid", P_STRING, P_LOCAL, &sDefault.gid, NULL,0},
{"hosts allow", P_STRING, P_LOCAL, &sDefault.hosts_allow, NULL,0},
{"hosts deny", P_STRING, P_LOCAL, &sDefault.hosts_deny, NULL,0},
-@@ -323,12 +358,16 @@ static struct parm_struct parm_table[] =
+@@ -325,12 +360,16 @@ static struct parm_struct parm_table[] =
{"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL,0},
{"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options, NULL,0},
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file, NULL,0},
{"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL,0},
{"write only", P_BOOL, P_LOCAL, &sDefault.write_only, NULL,0},
{NULL, P_BOOL, P_NONE, NULL, NULL,0}
-@@ -384,9 +423,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
+@@ -386,9 +425,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_comment, comment)
FN_LOCAL_STRING(lp_filter, filter)
FN_LOCAL_STRING(lp_gid, gid)
FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
-@@ -404,14 +450,20 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
+@@ -406,15 +452,21 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)
FN_LOCAL_STRING(lp_refuse_options, refuse_options)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
FN_LOCAL_INTEGER(lp_timeout, timeout)
+FN_LOCAL_BOOL(lp_database_logging, database_logging)
+ FN_LOCAL_BOOL(lp_fake_super, fake_super)
+FN_LOCAL_BOOL(lp_get_custom_id_before_insert,get_custom_id_before_insert)
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_BOOL(lp_list, list)
--- old/log.c
+++ new/log.c
-@@ -95,7 +95,7 @@ struct {
+@@ -94,7 +94,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
*/
for (i = 0; rerr_names[i].name; i++) {
--- old/receiver.c
+++ new/receiver.c
-@@ -110,6 +110,10 @@ int get_tmpname(char *fnametmp, char *fn
+@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, char *fn
if (maxname < 1) {
rprintf(FERROR, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';
return 0;
}
-@@ -173,6 +177,10 @@ static int receive_data(int f_in, char *
+@@ -174,6 +178,10 @@ static int receive_data(int f_in, char *
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
rsyserr(FERROR, errno, "lseek of %s returned %.0f, not %.0f",
full_fname(fname), (double)j, (double)offset);
exit_cleanup(RERR_FILEIO);
}
}
-@@ -230,6 +238,11 @@ static int receive_data(int f_in, char *
+@@ -231,6 +239,11 @@ static int receive_data(int f_in, char *
"lseek of %s returned %.0f, not %.0f",
full_fname(fname),
(double)pos, (double)offset);
exit_cleanup(RERR_FILEIO);
}
continue;
-@@ -255,6 +268,9 @@ static int receive_data(int f_in, char *
+@@ -256,6 +269,9 @@ static int receive_data(int f_in, char *
report_write_error:
rsyserr(FERROR, errno, "write failed on %s",
full_fname(fname));
exit_cleanup(RERR_FILEIO);
}
-@@ -298,6 +314,12 @@ static void handle_delayed_updates(struc
+@@ -299,6 +315,12 @@ static void handle_delayed_updates(char
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
if (remove_source_files
|| (preserve_hard_links && F_IS_HLINKED(file)))
-@@ -419,6 +441,9 @@ int recv_files(int f_in, struct file_lis
+@@ -447,6 +469,9 @@ int recv_files(int f_in, char *local_nam
if (server_filter_list.head
&& check_filter(&server_filter_list, fname, 0) < 0) {
rprintf(FERROR, "attempt to hack rsync failed.\n");
exit_cleanup(RERR_PROTOCOL);
}
-@@ -475,6 +500,11 @@ int recv_files(int f_in, struct file_lis
+@@ -503,6 +528,11 @@ int recv_files(int f_in, char *local_nam
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
fnamecmp_type);
exit_cleanup(RERR_PROTOCOL);
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -523,6 +553,9 @@ int recv_files(int f_in, struct file_lis
+@@ -551,6 +581,9 @@ int recv_files(int f_in, char *local_nam
} else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
-@@ -536,6 +569,9 @@ int recv_files(int f_in, struct file_lis
+@@ -564,6 +597,9 @@ int recv_files(int f_in, char *local_nam
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
-@@ -559,6 +595,9 @@ int recv_files(int f_in, struct file_lis
+@@ -596,6 +632,9 @@ int recv_files(int f_in, char *local_nam
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
-@@ -592,6 +631,10 @@ int recv_files(int f_in, struct file_lis
+@@ -629,6 +668,10 @@ int recv_files(int f_in, char *local_nam
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
-@@ -612,12 +655,19 @@ int recv_files(int f_in, struct file_lis
+@@ -649,12 +692,19 @@ int recv_files(int f_in, char *local_nam
fname, fd2, F_LENGTH(file));
log_item(log_code, file, &initial_stats, iflags, NULL);
exit_cleanup(RERR_FILEIO);
}
-@@ -674,6 +724,12 @@ int recv_files(int f_in, struct file_lis
+@@ -711,6 +761,12 @@ int recv_files(int f_in, char *local_nam
rprintf(msgtype,
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
+ keptstr, redostr);
+#endif
}
- if (!phase)
- send_msg_int(MSG_REDO, i);
+ if (!redoing) {
+ send_msg_int(MSG_REDO, ndx);
--- old/sender.c
+++ new/sender.c
-@@ -305,6 +305,9 @@ void send_files(struct file_list *flist,
+@@ -341,6 +341,9 @@ void send_files(int f_in, int f_out)
end_progress(st.st_size);
log_item(log_code, file, &initial_stats, iflags, NULL);