X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/88f7513df3fca996d2669285ddb48a362a9a9825..7ac2aef2fd35ed0cffe2b558b69643f12662a03e:/ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 15f231c..4182aff 100644
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -10,7 +10,7 @@ See the file "instructions" (after applying this patch) for more info.
 
 --- old/Makefile.in
 +++ new/Makefile.in
-@@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
+@@ -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 \
@@ -29,34 +29,34 @@ 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;
- 	}
+@@ -179,8 +180,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 */
+ 	case 5:
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -392,6 +392,9 @@ static int rsync_module(int f_in, int f_
+@@ -390,6 +390,9 @@ static int rsync_module(int f_in, int f_
  		   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
  
- 	log_init();
+ 	log_init(1);
 +#ifdef HAVE_LIBODBC
 +	db_log_open();
 +#endif
  
  #ifdef HAVE_PUTENV
  	if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -630,6 +633,9 @@ static int rsync_module(int f_in, int f_
+@@ -629,6 +632,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 +68,7 @@ See the file "instructions" (after applying this patch) for more info.
  				am_sender ? "on" : "to",
 --- old/configure.in
 +++ new/configure.in
-@@ -577,6 +577,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -610,6 +610,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -897,7 +897,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
-@@ -120,9 +120,16 @@ typedef struct
+@@ -122,9 +122,16 @@ typedef struct
  {
  	char *auth_users;
  	char *comment;
@@ -914,7 +914,7 @@ See the file "instructions" (after applying this patch) for more info.
  	char *filter;
  	char *gid;
  	char *hosts_allow;
-@@ -139,13 +146,19 @@ typedef struct
+@@ -142,14 +149,20 @@ typedef struct
  	char *prexfer_exec;
  	char *refuse_options;
  	char *secrets_file;
@@ -927,6 +927,7 @@ See the file "instructions" (after applying this patch) for more info.
  
  	int max_connections;
  	int max_verbosity;
+ 	int syslog_facility;
  	int timeout;
  
 +	BOOL database_logging;
@@ -934,7 +935,7 @@ See the file "instructions" (after applying this patch) for more info.
  	BOOL ignore_errors;
  	BOOL ignore_nonreadable;
  	BOOL list;
-@@ -165,9 +178,16 @@ static service sDefault =
+@@ -169,9 +182,16 @@ static service sDefault =
  {
   /* auth_users; */		NULL,
   /* comment; */			NULL,
@@ -951,7 +952,7 @@ See the file "instructions" (after applying this patch) for more info.
   /* filter; */			NULL,
   /* gid; */			NOBODY_GROUP,
   /* hosts_allow; */		NULL,
-@@ -184,13 +204,19 @@ static service sDefault =
+@@ -189,14 +209,20 @@ static service sDefault =
   /* prexfer_exec; */		NULL,
   /* refuse_options; */		NULL,
   /* secrets_file; */		NULL,
@@ -964,6 +965,7 @@ See the file "instructions" (after applying this patch) for more info.
  
   /* max_connections; */		0,
   /* max_verbosity; */		1,
+  /* syslog_facility; */		LOG_DAEMON,
   /* timeout; */			0,
  
 + /* database_logging; */	False,
@@ -971,7 +973,7 @@ See the file "instructions" (after applying this patch) for more info.
   /* ignore_errors; */		False,
   /* ignore_nonreadable; */	False,
   /* list; */			True,
-@@ -291,10 +317,19 @@ static struct parm_struct parm_table[] =
+@@ -295,10 +321,19 @@ 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},
@@ -991,13 +993,14 @@ See the file "instructions" (after applying this patch) for more info.
   {"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},
-@@ -318,11 +353,15 @@ static struct parm_struct parm_table[] =
+@@ -323,12 +358,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},
 + {"sequence name",     P_STRING, P_LOCAL, &sDefault.sequence_name,     NULL,0},
 + {"session table name",P_STRING, P_LOCAL, &sDefault.session_table_name,NULL,0},
   {"strict modes",      P_BOOL,   P_LOCAL, &sDefault.strict_modes,      NULL,0},
+  {"syslog facility",   P_ENUM,   P_LOCAL, &sDefault.syslog_facility,enum_facilities,0},
   {"temp dir",          P_PATH,   P_LOCAL, &sDefault.temp_dir,          NULL,0},
   {"timeout",           P_INTEGER,P_LOCAL, &sDefault.timeout,           NULL,0},
   {"transfer logging",  P_BOOL,   P_LOCAL, &sDefault.transfer_logging,  NULL,0},
@@ -1007,7 +1010,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}
-@@ -383,9 +422,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G
+@@ -384,9 +423,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_comment, comment)
@@ -1024,12 +1027,13 @@ 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)
-@@ -402,13 +448,19 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
+@@ -404,14 +450,20 @@ 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_STRING(lp_sequence_name,sequence_name)
 +FN_LOCAL_STRING(lp_session_table_name,session_table_name)
+ FN_LOCAL_INTEGER(lp_syslog_facility, syslog_facility)
  FN_LOCAL_STRING(lp_temp_dir, temp_dir)
 +FN_LOCAL_STRING(lp_transfer_table_name, transfer_table_name)
  FN_LOCAL_STRING(lp_uid, uid)
@@ -1046,7 +1050,7 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_list, list)
 --- old/log.c
 +++ new/log.c
-@@ -91,7 +91,7 @@ struct {
+@@ -93,7 +93,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1057,7 +1061,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
-@@ -109,6 +109,10 @@ static int get_tmpname(char *fnametmp, c
+@@ -110,6 +110,10 @@ static int get_tmpname(char *fnametmp, c
  
  	if (maxname < 1) {
  		rprintf(FERROR, "temporary filename too long: %s\n", fname);
@@ -1068,7 +1072,7 @@ See the file "instructions" (after applying this patch) for more info.
  		fnametmp[0] = '\0';
  		return 0;
  	}
-@@ -170,6 +174,10 @@ static int receive_data(int f_in, char *
+@@ -173,6 +177,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);
@@ -1079,7 +1083,7 @@ See the file "instructions" (after applying this patch) for more info.
  			exit_cleanup(RERR_FILEIO);
  		}
  	}
-@@ -227,6 +235,11 @@ static int receive_data(int f_in, char *
+@@ -230,6 +238,11 @@ static int receive_data(int f_in, char *
  						"lseek of %s returned %.0f, not %.0f",
  						full_fname(fname),
  						(double)pos, (double)offset);
@@ -1091,7 +1095,7 @@ See the file "instructions" (after applying this patch) for more info.
  					exit_cleanup(RERR_FILEIO);
  				}
  				continue;
-@@ -252,6 +265,9 @@ static int receive_data(int f_in, char *
+@@ -255,6 +268,9 @@ static int receive_data(int f_in, char *
  	    report_write_error:
  		rsyserr(FERROR, errno, "write failed on %s",
  			full_fname(fname));
@@ -1101,7 +1105,7 @@ See the file "instructions" (after applying this patch) for more info.
  		exit_cleanup(RERR_FILEIO);
  	}
  
-@@ -295,6 +311,12 @@ static void handle_delayed_updates(struc
+@@ -298,6 +314,12 @@ static void handle_delayed_updates(struc
  				rsyserr(FERROR, errno,
  					"rename failed for %s (from %s)",
  					full_fname(fname), partialptr);
@@ -1112,9 +1116,9 @@ See the file "instructions" (after applying this patch) for more info.
 +					partialptr);
 +#endif
  			} else {
- 				if (remove_sent_files
+ 				if (remove_source_files
  				    || (preserve_hard_links
-@@ -416,6 +438,9 @@ int recv_files(int f_in, struct file_lis
+@@ -422,6 +444,9 @@ int recv_files(int f_in, struct file_lis
  		if (server_filter_list.head
  		    && check_filter(&server_filter_list, fname, 0) < 0) {
  			rprintf(FERROR, "attempt to hack rsync failed.\n");
@@ -1124,7 +1128,7 @@ See the file "instructions" (after applying this patch) for more info.
  			exit_cleanup(RERR_PROTOCOL);
  		}
  
-@@ -471,6 +496,11 @@ int recv_files(int f_in, struct file_lis
+@@ -478,6 +503,11 @@ int recv_files(int f_in, struct file_lis
  					rprintf(FERROR,
  						"invalid basis_dir index: %d.\n",
  						fnamecmp_type);
@@ -1136,8 +1140,8 @@ See the file "instructions" (after applying this patch) for more info.
  					exit_cleanup(RERR_PROTOCOL);
  				}
  				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -516,6 +546,9 @@ int recv_files(int f_in, struct file_lis
- 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+@@ -526,6 +556,9 @@ int recv_files(int f_in, struct file_lis
+ 		} else if (do_fstat(fd1,&st) != 0) {
  			rsyserr(FERROR, errno, "fstat %s failed",
  				full_fname(fnamecmp));
 +#ifdef HAVE_LIBODBC
@@ -1146,7 +1150,7 @@ See the file "instructions" (after applying this patch) for more info.
  			discard_receive_data(f_in, file->length);
  			close(fd1);
  			continue;
-@@ -529,6 +562,9 @@ int recv_files(int f_in, struct file_lis
+@@ -539,6 +572,9 @@ int recv_files(int f_in, struct file_lis
  			 */
  			rprintf(FERROR,"recv_files: %s is a directory\n",
  				full_fname(fnamecmp));
@@ -1156,7 +1160,7 @@ See the file "instructions" (after applying this patch) for more info.
  			discard_receive_data(f_in, file->length);
  			close(fd1);
  			continue;
-@@ -552,6 +588,9 @@ int recv_files(int f_in, struct file_lis
+@@ -562,6 +598,9 @@ int recv_files(int f_in, struct file_lis
  			if (fd2 == -1) {
  				rsyserr(FERROR, errno, "open %s failed",
  					full_fname(fname));
@@ -1166,7 +1170,7 @@ See the file "instructions" (after applying this patch) for more info.
  				discard_receive_data(f_in, file->length);
  				if (fd1 != -1)
  					close(fd1);
-@@ -585,6 +624,10 @@ int recv_files(int f_in, struct file_lis
+@@ -595,6 +634,10 @@ int recv_files(int f_in, struct file_lis
  			if (fd2 == -1) {
  				rsyserr(FERROR, errno, "mkstemp %s failed",
  					full_fname(fnametmp));
@@ -1177,10 +1181,10 @@ See the file "instructions" (after applying this patch) for more info.
  				discard_receive_data(f_in, file->length);
  				if (fd1 != -1)
  					close(fd1);
-@@ -607,12 +650,19 @@ int recv_files(int f_in, struct file_lis
+@@ -615,12 +658,19 @@ int recv_files(int f_in, struct file_lis
+ 				       fname, fd2, file->length);
  
- 		if (!log_before_transfer)
- 			log_item(file, &initial_stats, iflags, NULL);
+ 		log_item(log_code, file, &initial_stats, iflags, NULL);
 +#ifdef HAVE_LIBODBC
 +		db_log_transfer(file, &initial_stats, "receive");
 +#endif
@@ -1197,7 +1201,7 @@ See the file "instructions" (after applying this patch) for more info.
  			exit_cleanup(RERR_FILEIO);
  		}
  
-@@ -671,6 +721,12 @@ int recv_files(int f_in, struct file_lis
+@@ -679,6 +729,12 @@ int recv_files(int f_in, struct file_lis
  				rprintf(msgtype,
  					"%s: %s failed verification -- update %s%s.\n",
  					errstr, fname, keptstr, redostr);
@@ -1212,10 +1216,10 @@ See the file "instructions" (after applying this patch) for more info.
  				SIVAL(numbuf, 0, i);
 --- old/sender.c
 +++ new/sender.c
-@@ -354,6 +354,9 @@ void send_files(struct file_list *flist,
+@@ -355,6 +355,9 @@ void send_files(struct file_list *flist,
+ 			end_progress(st.st_size);
  
- 		if (!log_before_transfer)
- 			log_item(file, &initial_stats, iflags, NULL);
+ 		log_item(log_code, file, &initial_stats, iflags, NULL);
 +#ifdef HAVE_LIBODBC
 +		db_log_transfer(file, &initial_stats,"send");
 +#endif