OBJS3=progress.o pipe.o
--- old/cleanup.c
+++ new/cleanup.c
-@@ -23,6 +23,7 @@
-
+@@ -27,6 +27,7 @@ extern int am_server;
+ extern int am_daemon;
extern int io_error;
extern int keep_partial;
+extern int am_generator;
extern int log_got_error;
extern char *partial_dir;
-
-@@ -149,8 +150,13 @@ void _exit_cleanup(int code, const char
+ extern char *logfile_name;
+@@ -154,8 +155,13 @@ void _exit_cleanup(int code, const char
code = RERR_PARTIAL;
}
-- if (code)
-+ if (code) {
+- 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_exit(code, file, line);
+ db_log_close();
+#endif
+ }
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
--- 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_
+@@ -628,6 +631,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
-@@ -536,6 +536,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -577,6 +577,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
-@@ -120,9 +120,16 @@ typedef struct
+@@ -122,9 +122,16 @@ typedef struct
{
char *auth_users;
char *comment;
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;
int max_connections;
int max_verbosity;
+ int syslog_facility;
int timeout;
+ BOOL database_logging;
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,
/* 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,
/* max_connections; */ 0,
/* max_verbosity; */ 1,
+ /* syslog_facility; */ LOG_DAEMON,
/* timeout; */ 0,
+ /* database_logging; */ False,
/* 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},
{"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},
{"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)
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)
FN_LOCAL_BOOL(lp_list, list)
--- old/log.c
+++ new/log.c
-@@ -93,7 +93,7 @@ struct {
+@@ -92,7 +92,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
*/
{
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
-@@ -174,6 +174,10 @@ static int get_tmpname(char *fnametmp, c
+@@ -109,6 +109,10 @@ static int get_tmpname(char *fnametmp, c
if (maxname < 1) {
rprintf(FERROR, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';
return 0;
}
-@@ -290,6 +294,11 @@ static int receive_data(int f_in, char *
- rsyserr(FERROR, errno,
- "lseek failed on %s",
- full_fname(fname));
+@@ -170,6 +174,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);
+ }
+ }
+@@ -227,6 +235,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",
exit_cleanup(RERR_FILEIO);
}
continue;
-@@ -315,6 +324,9 @@ static int receive_data(int f_in, char *
+@@ -252,6 +265,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);
}
-@@ -358,6 +370,12 @@ static void handle_delayed_updates(struc
+@@ -295,6 +311,12 @@ static void handle_delayed_updates(struc
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
if (remove_sent_files
|| (preserve_hard_links
-@@ -480,6 +498,9 @@ int recv_files(int f_in, struct file_lis
+@@ -417,6 +439,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");
+#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);
}
-@@ -535,6 +556,11 @@ int recv_files(int f_in, struct file_lis
+@@ -471,6 +496,11 @@ int recv_files(int f_in, struct file_lis
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
fnamecmp_type);
exit_cleanup(RERR_PROTOCOL);
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -580,6 +606,9 @@ int recv_files(int f_in, struct file_lis
+@@ -516,6 +546,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));
+#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);
close(fd1);
continue;
-@@ -593,6 +622,9 @@ int recv_files(int f_in, struct file_lis
+@@ -529,6 +562,9 @@ int recv_files(int f_in, struct file_lis
*/
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);
close(fd1);
continue;
-@@ -616,6 +648,9 @@ int recv_files(int f_in, struct file_lis
+@@ -552,6 +588,9 @@ int recv_files(int f_in, struct file_lis
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);
if (fd1 != -1)
close(fd1);
-@@ -649,6 +684,10 @@ int recv_files(int f_in, struct file_lis
+@@ -585,6 +624,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",
++ db_log_error(FERROR, 22, "mkstemp %s failed",
+ full_fname(fnametmp));
+#endif
discard_receive_data(f_in, file->length);
if (fd1 != -1)
close(fd1);
-@@ -671,12 +710,19 @@ int recv_files(int f_in, struct file_lis
+@@ -605,12 +648,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
exit_cleanup(RERR_FILEIO);
}
-@@ -730,6 +776,12 @@ int recv_files(int f_in, struct file_lis
+@@ -669,6 +719,12 @@ int recv_files(int f_in, struct file_lis
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);
SIVAL(numbuf, 0, i);
--- old/sender.c
+++ new/sender.c
-@@ -352,6 +352,9 @@ void send_files(struct file_list *flist,
+@@ -353,6 +353,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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff