X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/60a8bf367b7ed061f1c8ff5723b73ef9ccb964aa..76c553f74d8a10a1e2f8ac39a091d390f27a4865:/ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index c75e5bb..2673bc8 100644
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -1,27 +1,28 @@
 Add support for logging daemon messages to an SQL database.
 
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
 
+    patch -p1 <patches/ODBC-dblog.diff
     ./prepare-source
     ./configure --enable-ODBC
     make
 
-See the file "instructions" (after applying this patch) for more info.
+See the newly-created file "instructions" for more info.
 
 --- old/Makefile.in
 +++ new/Makefile.in
 @@ -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 hashtable.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;
@@ -29,24 +30,24 @@ See the file "instructions" (after applying this patch) for more info.
  extern int log_got_error;
  extern char *partial_dir;
  extern char *logfile_name;
-@@ -154,8 +155,13 @@ void _exit_cleanup(int code, const char 
- 			code = RERR_PARTIAL;
- 	}
+@@ -178,8 +179,13 @@ NORETURN void _exit_cleanup(int code, co
+ 				code = exit_code = RERR_PARTIAL;
+ 		}
  
--	if (code || am_daemon || (logfile_name && (am_server || !verbose)))
-+	if (code || am_daemon || (logfile_name && (am_server || !verbose))) {
- 		log_exit(code, file, line);
+-		if (code || am_daemon || (logfile_name && (am_server || !verbose)))
++		if (code || am_daemon || (logfile_name && (am_server || !verbose))) {
+ 			log_exit(code, file, line);
 +#ifdef HAVE_LIBODBC
-+		db_log_exit(code, file, line);
-+		db_log_close();
++			db_log_exit(code, file, line);
++			db_log_close();
 +#endif
-+	}
++		}
  
- 	if (verbose > 2) {
- 		rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
+ 		/* FALLTHROUGH */
+ #include "case_N.h"
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -390,6 +390,9 @@ static int rsync_module(int f_in, int f_
+@@ -499,6 +499,9 @@ static int rsync_module(int f_in, int f_
  		   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
  
  	log_init(1);
@@ -56,7 +57,7 @@ See the file "instructions" (after applying this patch) for more info.
  
  #ifdef HAVE_PUTENV
  	if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -629,6 +632,9 @@ static int rsync_module(int f_in, int f_
+@@ -695,6 +698,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);
@@ -68,7 +69,7 @@ See the file "instructions" (after applying this patch) for more info.
  				am_sender ? "on" : "to",
 --- old/configure.in
 +++ new/configure.in
-@@ -610,6 +610,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -656,6 +656,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -660,7 +661,7 @@ See the file "instructions" (after applying this patch) for more info.
 +		if (*strFileNamePtr == '/')
 +			strFileNamePtr++;
 +
-+		snprintf(strFileSize, sizeof strFileSize, "%.0f", (double)file->length);
++		snprintf(strFileSize, sizeof strFileSize, "%.0f", (double)F_LENGTH(file));
 +		if (am_sender) {
 +			intBytesTransferred = stats.total_written - initial_stats->total_written;
 +		} else {
@@ -897,7 +898,7 @@ See the file "instructions" (after applying this patch) for more info.
 +    automatically generates unique IDs).  Defaults to True.
 --- old/loadparm.c
 +++ new/loadparm.c
-@@ -122,9 +122,16 @@ typedef struct
+@@ -125,9 +125,16 @@ typedef struct
  {
  	char *auth_users;
  	char *comment;
@@ -914,7 +915,7 @@ See the file "instructions" (after applying this patch) for more info.
  	char *filter;
  	char *gid;
  	char *hosts_allow;
-@@ -142,14 +149,20 @@ typedef struct
+@@ -145,15 +152,21 @@ typedef struct
  	char *prexfer_exec;
  	char *refuse_options;
  	char *secrets_file;
@@ -931,11 +932,12 @@ See the file "instructions" (after applying this patch) for more info.
  	int timeout;
  
 +	BOOL database_logging;
+ 	BOOL fake_super;
 +	BOOL get_custom_id_before_insert;
  	BOOL ignore_errors;
  	BOOL ignore_nonreadable;
  	BOOL list;
-@@ -169,9 +182,16 @@ static service sDefault =
+@@ -173,9 +186,16 @@ static service sDefault =
  {
   /* auth_users; */		NULL,
   /* comment; */			NULL,
@@ -944,7 +946,7 @@ See the file "instructions" (after applying this patch) for more info.
 + /* database_password; */	NULL,
 + /* database_username; */	NULL,
 + /* delete_table_name; */	NULL,
-  /* dont_compress; */		"*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz",
+  /* dont_compress; */		DEFAULT_DONT_COMPRESS,
 + /* error_table_name; */	NULL,
   /* exclude; */			NULL,
   /* exclude_from; */		NULL,
@@ -952,7 +954,7 @@ See the file "instructions" (after applying this patch) for more info.
   /* filter; */			NULL,
   /* gid; */			NOBODY_GROUP,
   /* hosts_allow; */		NULL,
-@@ -189,14 +209,20 @@ static service sDefault =
+@@ -193,15 +213,21 @@ static service sDefault =
   /* prexfer_exec; */		NULL,
   /* refuse_options; */		NULL,
   /* secrets_file; */		NULL,
@@ -969,11 +971,12 @@ See the file "instructions" (after applying this patch) for more info.
   /* 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[] =
+@@ -300,11 +326,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},
@@ -988,12 +991,13 @@ See the file "instructions" (after applying this patch) for more info.
   {"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[] =
+@@ -329,12 +364,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},
@@ -1010,7 +1014,7 @@ See the file "instructions" (after applying this patch) for more info.
   {"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
+@@ -390,9 +429,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_comment, comment)
@@ -1027,7 +1031,7 @@ See the file "instructions" (after applying this patch) for more info.
  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
+@@ -410,15 +456,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)
@@ -1044,13 +1048,14 @@ See the file "instructions" (after applying this patch) for more info.
  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
-@@ -94,7 +94,7 @@ struct {
+@@ -97,7 +97,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1061,7 +1066,7 @@ See the file "instructions" (after applying this patch) for more info.
  	for (i = 0; rerr_names[i].name; i++) {
 --- old/receiver.c
 +++ new/receiver.c
-@@ -111,6 +111,10 @@ static int get_tmpname(char *fnametmp, c
+@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, const ch
  
  	if (maxname < 1) {
  		rprintf(FERROR, "temporary filename too long: %s\n", fname);
@@ -1072,7 +1077,17 @@ See the file "instructions" (after applying this patch) for more info.
  		fnametmp[0] = '\0';
  		return 0;
  	}
-@@ -172,6 +176,10 @@ static int receive_data(int f_in, char *
+@@ -155,6 +159,9 @@ int open_tmpfile(char *fnametmp, const c
+ 	if (fd == -1) {
+ 		rsyserr(FERROR, errno, "mkstemp %s failed",
+ 			full_fname(fnametmp));
++#ifdef HAVE_LIBODBC
++		db_log_error(FERROR, 22, "mkstemp %s failed", full_fname(fnametmp));
++#endif
+ 		return -1;
+ 	}
+ 
+@@ -213,6 +220,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);
@@ -1083,7 +1098,7 @@ See the file "instructions" (after applying this patch) for more info.
  			exit_cleanup(RERR_FILEIO);
  		}
  	}
-@@ -229,6 +237,11 @@ static int receive_data(int f_in, char *
+@@ -270,6 +281,11 @@ static int receive_data(int f_in, char *
  						"lseek of %s returned %.0f, not %.0f",
  						full_fname(fname),
  						(double)pos, (double)offset);
@@ -1095,7 +1110,7 @@ See the file "instructions" (after applying this patch) for more info.
  					exit_cleanup(RERR_FILEIO);
  				}
  				continue;
-@@ -254,6 +267,9 @@ static int receive_data(int f_in, char *
+@@ -295,6 +311,9 @@ static int receive_data(int f_in, char *
  	    report_write_error:
  		rsyserr(FERROR, errno, "write failed on %s",
  			full_fname(fname));
@@ -1105,7 +1120,7 @@ See the file "instructions" (after applying this patch) for more info.
  		exit_cleanup(RERR_FILEIO);
  	}
  
-@@ -297,6 +313,12 @@ static void handle_delayed_updates(struc
+@@ -338,6 +357,12 @@ static void handle_delayed_updates(char 
  				rsyserr(FERROR, errno,
  					"rename failed for %s (from %s)",
  					full_fname(fname), partialptr);
@@ -1117,8 +1132,8 @@ See the file "instructions" (after applying this patch) for more info.
 +#endif
  			} else {
  				if (remove_source_files
- 				    || (preserve_hard_links
-@@ -421,6 +443,9 @@ int recv_files(int f_in, struct file_lis
+ 				 || (preserve_hard_links && F_IS_HLINKED(file)))
+@@ -489,6 +514,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");
@@ -1128,7 +1143,7 @@ See the file "instructions" (after applying this patch) for more info.
  			exit_cleanup(RERR_PROTOCOL);
  		}
  
-@@ -477,6 +502,11 @@ int recv_files(int f_in, struct file_lis
+@@ -545,6 +573,11 @@ int recv_files(int f_in, char *local_nam
  					rprintf(FERROR,
  						"invalid basis_dir index: %d.\n",
  						fnamecmp_type);
@@ -1140,49 +1155,38 @@ See the file "instructions" (after applying this patch) for more info.
  					exit_cleanup(RERR_PROTOCOL);
  				}
  				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -522,6 +552,9 @@ int recv_files(int f_in, struct file_lis
- 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+@@ -594,6 +627,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));
 +#ifdef HAVE_LIBODBC
 +			db_log_error(FERROR, 19,"fstat %s failed",full_fname(fnamecmp));
 +#endif
- 			discard_receive_data(f_in, file->length);
+ 			discard_receive_data(f_in, F_LENGTH(file));
  			close(fd1);
- 			continue;
-@@ -535,6 +568,9 @@ int recv_files(int f_in, struct file_lis
+ 			if (inc_recurse)
+@@ -609,6 +645,9 @@ int recv_files(int f_in, char *local_nam
  			 */
  			rprintf(FERROR,"recv_files: %s is a directory\n",
  				full_fname(fnamecmp));
 +#ifdef HAVE_LIBODBC
 +			db_log_error(FERROR,20,"recv_files: %s is a directory",full_fname(fnamecmp));
 +#endif
- 			discard_receive_data(f_in, file->length);
+ 			discard_receive_data(f_in, F_LENGTH(file));
  			close(fd1);
- 			continue;
-@@ -558,6 +594,9 @@ int recv_files(int f_in, struct file_lis
+ 			if (inc_recurse)
+@@ -643,6 +682,9 @@ int recv_files(int f_in, char *local_nam
  			if (fd2 == -1) {
  				rsyserr(FERROR, errno, "open %s failed",
  					full_fname(fname));
 +#ifdef HAVE_LIBODBC
 +				db_log_error(FERROR,22, "open %s failed", full_fname(fname));
 +#endif
- 				discard_receive_data(f_in, file->length);
- 				if (fd1 != -1)
- 					close(fd1);
-@@ -591,6 +630,10 @@ int recv_files(int f_in, struct file_lis
- 			if (fd2 == -1) {
- 				rsyserr(FERROR, errno, "mkstemp %s failed",
- 					full_fname(fnametmp));
-+#ifdef HAVE_LIBODBC
-+				db_log_error(FERROR, 22, "mkstemp %s failed",
-+					full_fname(fnametmp));
-+#endif
- 				discard_receive_data(f_in, file->length);
- 				if (fd1 != -1)
- 					close(fd1);
-@@ -611,12 +654,19 @@ int recv_files(int f_in, struct file_lis
- 				       fname, fd2, file->length);
+ 			}
+ 		} else {
+ 			fd2 = open_tmpfile(fnametmp, fname, file);
+@@ -670,12 +712,19 @@ int recv_files(int f_in, char *local_nam
+ 				       fname, fd2, F_LENGTH(file));
  
  		log_item(log_code, file, &initial_stats, iflags, NULL);
 +#ifdef HAVE_LIBODBC
@@ -1201,7 +1205,7 @@ See the file "instructions" (after applying this patch) for more info.
  			exit_cleanup(RERR_FILEIO);
  		}
  
-@@ -675,6 +725,12 @@ int recv_files(int f_in, struct file_lis
+@@ -732,6 +781,12 @@ int recv_files(int f_in, char *local_nam
  				rprintf(msgtype,
  					"%s: %s failed verification -- update %s%s.\n",
  					errstr, fname, keptstr, redostr);
@@ -1212,11 +1216,11 @@ See the file "instructions" (after applying this patch) for more info.
 +					keptstr, redostr);
 +#endif
  			}
- 			if (!phase) {
- 				SIVAL(numbuf, 0, i);
+ 			if (!redoing) {
+ 				send_msg_int(MSG_REDO, ndx);
 --- old/sender.c
 +++ new/sender.c
-@@ -355,6 +355,9 @@ void send_files(struct file_list *flist,
+@@ -344,6 +344,9 @@ void send_files(int f_in, int f_out)
  			end_progress(st.st_size);
  
  		log_item(log_code, file, &initial_stats, iflags, NULL);