X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/afcb578c53a1c5579d48336e2197e476cead7057..94adfe526fd3fe6919e3efd786d08524f634fade:/ODBC-dblog.diff diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index d0daa19..98c6f79 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -1,62 +1,63 @@ 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 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 -@@ -392,6 +392,9 @@ static int rsync_module(int f_in, int f_ +@@ -410,6 +410,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_ +@@ -649,6 +652,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 -@@ -540,6 +540,12 @@ if test x"$with_included_popt" != x"yes" +@@ -659,6 +659,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 -@@ -120,9 +120,16 @@ typedef struct +@@ -124,9 +124,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; -@@ -139,13 +146,19 @@ typedef struct +@@ -144,15 +151,21 @@ typedef struct char *prexfer_exec; char *refuse_options; char *secrets_file; @@ -927,14 +928,16 @@ 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; + BOOL fake_super; + BOOL get_custom_id_before_insert; BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; -@@ -165,9 +178,16 @@ static service sDefault = +@@ -172,9 +185,16 @@ static service sDefault = { /* auth_users; */ NULL, /* comment; */ NULL, @@ -943,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, @@ -951,7 +954,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 = +@@ -192,15 +212,21 @@ static service sDefault = /* prexfer_exec; */ NULL, /* refuse_options; */ NULL, /* secrets_file; */ NULL, @@ -964,14 +967,16 @@ 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, + /* fake_super; */ False, + /* get_custom_id_before_insert; */ True, /* ignore_errors; */ False, /* ignore_nonreadable; */ False, /* list; */ True, -@@ -291,10 +317,19 @@ static struct parm_struct parm_table[] = +@@ -299,11 +325,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}, @@ -986,18 +991,20 @@ 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}, -@@ -318,11 +353,15 @@ static struct parm_struct parm_table[] = +@@ -328,12 +363,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 +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} -@@ -383,9 +422,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G +@@ -389,9 +428,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global FN_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_comment, comment) @@ -1024,12 +1031,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 +@@ -409,15 +455,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_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) @@ -1040,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 { +@@ -96,7 +96,7 @@ struct { /* * Map from rsync error code to name, or return NULL. */ @@ -1055,21 +1064,9 @@ See the file "instructions" (after applying this patch) for more info. { int i; for (i = 0; rerr_names[i].name; i++) { ---- old/main.c -+++ new/main.c -@@ -168,6 +168,9 @@ static void handle_stats(int f) - - if (am_daemon) { - log_exit(0, __FILE__, __LINE__); -+#ifdef HAVE_LIBODBC -+ db_log_exit(0,__FILE__,__LINE__); -+#endif - if (f == -1 || !am_sender) - return; - } --- old/receiver.c +++ new/receiver.c -@@ -113,6 +113,10 @@ static int get_tmpname(char *fnametmp, c +@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, char *fn if (maxname < 1) { rprintf(FERROR, "temporary filename too long: %s\n", fname); @@ -1080,10 +1077,21 @@ See the file "instructions" (after applying this patch) for more info. fnametmp[0] = '\0'; return 0; } -@@ -229,6 +233,11 @@ static int receive_data(int f_in, char * - rsyserr(FERROR, errno, - "lseek failed on %s", - full_fname(fname)); +@@ -176,6 +180,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); ++#ifdef HAVE_LIBODBC ++ db_log_error(FERROR, 14, "lseek failed on %s", ++ full_fname(fname)); ++#endif + exit_cleanup(RERR_FILEIO); + } + } +@@ -233,6 +241,11 @@ static int receive_data(int f_in, char * + "lseek of %s returned %.0f, not %.0f", + full_fname(fname), + (double)pos, (double)offset); +#ifdef HAVE_LIBODBC + db_log_error(FERROR, 14, + "lseek failed on %s", @@ -1092,7 +1100,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } continue; -@@ -254,6 +263,9 @@ static int receive_data(int f_in, char * +@@ -258,6 +271,9 @@ static int receive_data(int f_in, char * report_write_error: rsyserr(FERROR, errno, "write failed on %s", full_fname(fname)); @@ -1102,7 +1110,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } -@@ -297,6 +309,12 @@ static void handle_delayed_updates(struc +@@ -301,6 +317,12 @@ static void handle_delayed_updates(char rsyserr(FERROR, errno, "rename failed for %s (from %s)", full_fname(fname), partialptr); @@ -1113,19 +1121,19 @@ See the file "instructions" (after applying this patch) for more info. + partialptr); +#endif } else { - if (remove_sent_files - || (preserve_hard_links -@@ -419,6 +437,9 @@ int recv_files(int f_in, struct file_lis + if (remove_source_files + || (preserve_hard_links && F_IS_HLINKED(file))) +@@ -454,6 +476,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"); +#ifdef HAVE_LIBODBC -+ db_log_error(FERROR,17,"attempt to hack rsync failed."); ++ db_log_error(FERROR,17,"attempt to hack rsync failed."); +#endif exit_cleanup(RERR_PROTOCOL); } -@@ -474,6 +495,11 @@ int recv_files(int f_in, struct file_lis +@@ -512,6 +537,11 @@ int recv_files(int f_in, char *local_nam rprintf(FERROR, "invalid basis_dir index: %d.\n", fnamecmp_type); @@ -1137,51 +1145,51 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -@@ -519,6 +545,9 @@ int recv_files(int f_in, struct file_lis - if (fd1 != -1 && do_fstat(fd1,&st) != 0) { +@@ -560,6 +590,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)); ++ 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; -@@ -532,6 +561,9 @@ int recv_files(int f_in, struct file_lis + if (inc_recurse) +@@ -575,6 +608,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)); ++ 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; -@@ -555,6 +587,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 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)); ++ db_log_error(FERROR,22, "open %s failed", full_fname(fname)); +#endif - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -588,6 +623,10 @@ int recv_files(int f_in, struct file_lis +@@ -646,6 +685,10 @@ int recv_files(int f_in, char *local_nam if (fd2 == -1) { rsyserr(FERROR, errno, "mkstemp %s failed", full_fname(fnametmp)); +#ifdef HAVE_LIBODBC -+ db_log_error(FERROR, 22, "mkstemp %s failed", ++ db_log_error(FERROR, 22, "mkstemp %s failed", + full_fname(fnametmp)); +#endif - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -610,12 +649,19 @@ int recv_files(int f_in, struct file_lis +@@ -668,12 +711,19 @@ int recv_files(int f_in, char *local_nam + fname, fd2, F_LENGTH(file)); - 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 @@ -1198,25 +1206,25 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } -@@ -669,6 +715,12 @@ int recv_files(int f_in, struct file_lis +@@ -730,6 +780,12 @@ int recv_files(int f_in, char *local_nam rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", errstr, fname, keptstr, redostr); +#ifdef HAVE_LIBODBC -+ db_log_error(msgtype,24, ++ db_log_error(msgtype,24, + "%s: %s failed verification -- update %s%s.\n", + errstr, fname, + keptstr, redostr); +#endif } - if (!phase) { - SIVAL(numbuf, 0, i); + if (!redoing) { + send_msg_int(MSG_REDO, ndx); --- old/sender.c +++ new/sender.c -@@ -352,6 +352,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); - 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