X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a9eff38db3fda16291c374603f706a14781bc123..b06103cc7d4f1827bb8f8a83ca07b56a48930e63:/ODBC-dblog.diff diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 5db88ae..d0daa19 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -2,16 +2,14 @@ Add support for logging daemon messages to an SQL database. After applying this patch, run these commands for a successful build: - autoconf - autoheader + ./prepare-source ./configure --enable-ODBC - make proto make See the file "instructions" (after applying this patch) for more info. ---- orig/Makefile.in 2005-07-07 23:11:07 -+++ Makefile.in 2005-09-23 15:59:02 +--- old/Makefile.in ++++ new/Makefile.in @@ -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 @@ -19,10 +17,10 @@ See the file "instructions" (after applying this patch) for more info. - 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 + fileio.o batch.o clientname.o chmod.o OBJS3=progress.o pipe.o ---- orig/cleanup.c 2005-03-05 18:58:38 -+++ cleanup.c 2005-09-23 15:59:19 +--- old/cleanup.c ++++ new/cleanup.c @@ -23,6 +23,7 @@ extern int io_error; @@ -31,7 +29,7 @@ See the file "instructions" (after applying this patch) for more info. extern int log_got_error; extern char *partial_dir; -@@ -144,8 +145,13 @@ void _exit_cleanup(int code, const char +@@ -149,8 +150,13 @@ void _exit_cleanup(int code, const char code = RERR_PARTIAL; } @@ -46,10 +44,10 @@ See the file "instructions" (after applying this patch) for more info. if (verbose > 2) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", ---- orig/clientserver.c 2005-09-15 18:09:14 -+++ clientserver.c 2005-09-23 15:59:36 -@@ -349,6 +349,9 @@ static int rsync_module(int f_in, int f_ - XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES); +--- old/clientserver.c ++++ new/clientserver.c +@@ -392,6 +392,9 @@ static int rsync_module(int f_in, int f_ + XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); log_init(); +#ifdef HAVE_LIBODBC @@ -57,8 +55,8 @@ See the file "instructions" (after applying this patch) for more info. +#endif #ifdef HAVE_PUTENV - s = lp_prexfer_exec(i); -@@ -535,6 +538,9 @@ static int rsync_module(int f_in, int f_ + if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) { +@@ -630,6 +633,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,9 +66,9 @@ See the file "instructions" (after applying this patch) for more info. } else { rprintf(FLOG, "rsync %s %s from %s (%s)\n", am_sender ? "on" : "to", ---- orig/configure.in 2005-09-24 17:40:30 -+++ configure.in 2005-09-24 18:38:47 -@@ -547,6 +547,12 @@ then +--- old/configure.in ++++ new/configure.in +@@ -540,6 +540,12 @@ if test x"$with_included_popt" != x"yes" AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) fi @@ -81,10 +79,10 @@ See the file "instructions" (after applying this patch) for more info. + AC_SUBST(EXTRA_OBJECT) ]) + AC_MSG_CHECKING([whether to use included libpopt]) - if test x"$with_included_popt" = x"yes" - then ---- orig/db_log_error-list.txt 2005-09-23 15:58:32 -+++ db_log_error-list.txt 2005-09-23 15:58:32 + if test x"$with_included_popt" = x"yes"; then + AC_MSG_RESULT($srcdir/popt) +--- old/db_log_error-list.txt ++++ new/db_log_error-list.txt @@ -0,0 +1,35 @@ +error type description +0 not an error. @@ -121,8 +119,8 @@ See the file "instructions" (after applying this patch) for more info. +31 unlink +32 failed to open file/directory +33 open? ---- orig/dblog-tables-mysql.sql 2005-09-23 16:08:39 -+++ dblog-tables-mysql.sql 2005-09-23 16:08:39 +--- old/dblog-tables-mysql.sql ++++ new/dblog-tables-mysql.sql @@ -0,0 +1,64 @@ +drop table transfer; +drop table exit; @@ -188,8 +186,8 @@ See the file "instructions" (after applying this patch) for more info. + PrimaryKey (id), + foreign key (session_id) references session (id) +); ---- orig/dblog-tables-postgresql.sql 2005-09-23 16:00:34 -+++ dblog-tables-postgresql.sql 2005-09-23 16:00:34 +--- old/dblog-tables-postgresql.sql ++++ new/dblog-tables-postgresql.sql @@ -0,0 +1,67 @@ +drop table transfer; +drop table exit; @@ -258,8 +256,8 @@ See the file "instructions" (after applying this patch) for more info. + Primary Key (id), + foreign key (session_id) references session (id) +); ---- orig/dblog.c 2005-09-24 18:25:52 -+++ dblog.c 2005-09-24 18:25:52 +--- old/dblog.c ++++ new/dblog.c @@ -0,0 +1,549 @@ +/* + * ODBC Database logging functions @@ -652,7 +650,7 @@ See the file "instructions" (after applying this patch) for more info. + return; + + if (db_handle != NULL) { -+ strFileNamePtr = safe_fname(f_name(file)); ++ strFileNamePtr = f_name(file, NULL); + if (am_sender && file->dir.root) { + pathjoin(strFileName, sizeof strFileName, + file->dir.root, strFileNamePtr); @@ -810,8 +808,8 @@ See the file "instructions" (after applying this patch) for more info. + rprintf(FERROR,"Error at db_log_error: Not connected to database!\n"); + } +} ---- orig/instructions 2005-09-23 15:58:24 -+++ instructions 2005-09-23 15:58:24 +--- old/instructions ++++ new/instructions @@ -0,0 +1,84 @@ +This patch adds the following options: + @@ -897,8 +895,8 @@ See the file "instructions" (after applying this patch) for more info. + sequence is used for unique IDs). If False the statement will be executed + after the session row is inserted (as is done when the session ID is + automatically generates unique IDs). Defaults to True. ---- orig/loadparm.c 2005-09-19 17:21:10 -+++ loadparm.c 2005-09-24 18:29:59 +--- old/loadparm.c ++++ new/loadparm.c @@ -120,9 +120,16 @@ typedef struct { char *auth_users; @@ -916,7 +914,7 @@ See the file "instructions" (after applying this patch) for more info. char *filter; char *gid; char *hosts_allow; -@@ -137,13 +144,19 @@ typedef struct +@@ -139,13 +146,19 @@ typedef struct char *prexfer_exec; char *refuse_options; char *secrets_file; @@ -936,7 +934,7 @@ See the file "instructions" (after applying this patch) for more info. BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; -@@ -163,9 +176,16 @@ static service sDefault = +@@ -165,9 +178,16 @@ static service sDefault = { /* auth_users; */ NULL, /* comment; */ NULL, @@ -953,7 +951,7 @@ See the file "instructions" (after applying this patch) for more info. /* filter; */ NULL, /* gid; */ NOBODY_GROUP, /* hosts_allow; */ NULL, -@@ -180,13 +200,19 @@ static service sDefault = +@@ -184,13 +204,19 @@ static service sDefault = /* prexfer_exec; */ NULL, /* refuse_options; */ NULL, /* secrets_file; */ NULL, @@ -973,7 +971,7 @@ See the file "instructions" (after applying this patch) for more info. /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, -@@ -287,10 +313,19 @@ static struct parm_struct parm_table[] = +@@ -291,10 +317,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}, @@ -993,7 +991,7 @@ 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}, -@@ -312,11 +347,15 @@ static struct parm_struct parm_table[] = +@@ -318,11 +353,15 @@ 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}, @@ -1009,7 +1007,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} -@@ -377,9 +416,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G +@@ -383,9 +422,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G FN_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_comment, comment) @@ -1026,7 +1024,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) -@@ -394,13 +440,19 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf +@@ -402,13 +448,19 @@ 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) @@ -1046,9 +1044,9 @@ See the file "instructions" (after applying this patch) for more info. FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors) FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable) FN_LOCAL_BOOL(lp_list, list) ---- orig/log.c 2005-06-10 21:33:28 -+++ log.c 2005-09-23 16:01:13 -@@ -84,7 +84,7 @@ struct { +--- old/log.c ++++ new/log.c +@@ -94,7 +94,7 @@ struct { /* * Map from rsync error code to name, or return NULL. */ @@ -1057,9 +1055,9 @@ See the file "instructions" (after applying this patch) for more info. { int i; for (i = 0; rerr_names[i].name; i++) { ---- orig/main.c 2005-09-16 16:38:53 -+++ main.c 2005-09-23 16:01:22 -@@ -139,6 +139,9 @@ static void handle_stats(int f) +--- old/main.c ++++ new/main.c +@@ -168,6 +168,9 @@ static void handle_stats(int f) if (am_daemon) { log_exit(0, __FILE__, __LINE__); @@ -1069,20 +1067,20 @@ See the file "instructions" (after applying this patch) for more info. if (f == -1 || !am_sender) return; } ---- orig/receiver.c 2005-09-16 05:41:02 -+++ receiver.c 2005-09-24 17:57:43 -@@ -175,6 +175,10 @@ static int get_tmpname(char *fnametmp, c +--- old/receiver.c ++++ new/receiver.c +@@ -113,6 +113,10 @@ static int get_tmpname(char *fnametmp, c + if (maxname < 1) { - rprintf(FERROR, "temporary filename too long: %s\n", - safe_fname(fname)); + rprintf(FERROR, "temporary filename too long: %s\n", fname); +#ifdef HAVE_LIBODBC + db_log_error(FERROR,13, "temporary filename too long: %s\n", -+ safe_fname(fname)); ++ fname); +#endif fnametmp[0] = '\0'; return 0; } -@@ -291,6 +295,11 @@ static int receive_data(int f_in, char * +@@ -229,6 +233,11 @@ static int receive_data(int f_in, char * rsyserr(FERROR, errno, "lseek failed on %s", full_fname(fname)); @@ -1094,7 +1092,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } continue; -@@ -316,6 +325,9 @@ static int receive_data(int f_in, char * +@@ -254,6 +263,9 @@ static int receive_data(int f_in, char * report_write_error: rsyserr(FERROR, errno, "write failed on %s", full_fname(fname)); @@ -1104,20 +1102,20 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } -@@ -361,6 +373,12 @@ static void handle_delayed_updates(struc +@@ -297,6 +309,12 @@ static void handle_delayed_updates(struc + rsyserr(FERROR, errno, "rename failed for %s (from %s)", - full_fname(fname), - safe_fname(partialptr)); + full_fname(fname), partialptr); +#ifdef HAVE_LIBODBC + db_log_error(FERROR, 16, + "rename failed for %s (from %s)", + full_fname(fname), -+ safe_fname(partialptr)); ++ partialptr); +#endif } else { if (remove_sent_files || (preserve_hard_links -@@ -484,6 +502,9 @@ int recv_files(int f_in, struct file_lis +@@ -419,6 +437,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"); @@ -1127,7 +1125,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_PROTOCOL); } -@@ -538,6 +559,11 @@ int recv_files(int f_in, struct file_lis +@@ -474,6 +495,11 @@ int recv_files(int f_in, struct file_lis rprintf(FERROR, "invalid basis_dir index: %d.\n", fnamecmp_type); @@ -1139,7 +1137,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -@@ -583,6 +609,9 @@ int recv_files(int f_in, struct file_lis +@@ -519,6 +545,9 @@ int recv_files(int f_in, struct file_lis if (fd1 != -1 && do_fstat(fd1,&st) != 0) { rsyserr(FERROR, errno, "fstat %s failed", full_fname(fnamecmp)); @@ -1149,7 +1147,7 @@ See the file "instructions" (after applying this patch) for more info. discard_receive_data(f_in, file->length); close(fd1); continue; -@@ -596,6 +625,9 @@ int recv_files(int f_in, struct file_lis +@@ -532,6 +561,9 @@ int recv_files(int f_in, struct file_lis */ rprintf(FERROR,"recv_files: %s is a directory\n", full_fname(fnamecmp)); @@ -1159,7 +1157,7 @@ See the file "instructions" (after applying this patch) for more info. discard_receive_data(f_in, file->length); close(fd1); continue; -@@ -619,6 +651,9 @@ int recv_files(int f_in, struct file_lis +@@ -555,6 +587,9 @@ int recv_files(int f_in, struct file_lis if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); @@ -1169,7 +1167,7 @@ See the file "instructions" (after applying this patch) for more info. discard_receive_data(f_in, file->length); if (fd1 != -1) close(fd1); -@@ -652,6 +687,10 @@ int recv_files(int f_in, struct file_lis +@@ -588,6 +623,10 @@ int recv_files(int f_in, struct file_lis if (fd2 == -1) { rsyserr(FERROR, errno, "mkstemp %s failed", full_fname(fnametmp)); @@ -1180,7 +1178,7 @@ See the file "instructions" (after applying this patch) for more info. discard_receive_data(f_in, file->length); if (fd1 != -1) close(fd1); -@@ -674,12 +713,19 @@ int recv_files(int f_in, struct file_lis +@@ -610,12 +649,19 @@ int recv_files(int f_in, struct file_lis if (!log_before_transfer) log_item(file, &initial_stats, iflags, NULL); @@ -1200,22 +1198,22 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } -@@ -731,6 +777,12 @@ int recv_files(int f_in, struct file_lis +@@ -669,6 +715,12 @@ int recv_files(int f_in, struct file_lis + rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", - errstr, safe_fname(fname), - keptstr, redostr); + errstr, fname, keptstr, redostr); +#ifdef HAVE_LIBODBC + db_log_error(msgtype,24, + "%s: %s failed verification -- update %s%s.\n", -+ errstr, safe_fname(fname), ++ errstr, fname, + keptstr, redostr); +#endif } if (!phase) { SIVAL(numbuf, 0, i); ---- orig/sender.c 2005-07-28 01:46:25 -+++ sender.c 2005-09-23 16:01:44 -@@ -356,6 +356,9 @@ void send_files(struct file_list *flist, +--- old/sender.c ++++ new/sender.c +@@ -352,6 +352,9 @@ void send_files(struct file_list *flist, if (!log_before_transfer) log_item(file, &initial_stats, iflags, NULL);