Updated to apply cleanly to latest CVS source.

[rsync/rsync-patches.git] / ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index ea3ee43..540cdde 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -122,9 +122,9 @@ dblog.c file has a compile problem, it's probably my fault...)
  
        if (verbose > 2)
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", 
---- clientserver.c     27 Mar 2004 09:44:01 -0000      1.118
-+++ clientserver.c     8 Apr 2004 05:56:31 -0000
-@@ -316,6 +316,9 @@
+--- clientserver.c     14 Apr 2004 23:33:34 -0000      1.121
++++ clientserver.c     15 Apr 2004 18:51:14 -0000
+@@ -311,6 +311,9 @@
        exclude_path_prefix = NULL;
  
        log_init();
@@ -134,7 +134,7 @@ dblog.c file has a compile problem, it's probably my fault...)
  
        if (use_chroot) {
                /*
-@@ -434,6 +437,9 @@
+@@ -429,6 +432,9 @@
                        rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
                                am_sender?"on":"to",
                                request, auth_user, host, addr);
@@ -144,8 +144,8 @@ dblog.c file has a compile problem, it's probably my fault...)
                } else {
                        rprintf(FINFO,"rsync %s %s from %s (%s)\n",
                                am_sender?"on":"to",
---- configure.in       24 Mar 2004 21:59:07 -0000      1.188
-+++ configure.in       8 Apr 2004 05:56:31 -0000
+--- configure.in       9 Apr 2004 18:09:16 -0000       1.190
++++ configure.in       15 Apr 2004 18:51:14 -0000
 @@ -94,6 +94,8 @@
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
        [ RSYNC_PATH="$with_rsync_path" ],
@@ -155,7 +155,7 @@ dblog.c file has a compile problem, it's probably my fault...)
  
  AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
  
-@@ -459,6 +461,14 @@
+@@ -458,6 +460,14 @@
  if test x"$with_included_popt" != x"yes"
  then
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
@@ -716,22 +716,22 @@ dblog.c file has a compile problem, it's probably my fault...)
                if (f == -1 || !am_sender) return;
        }
  
---- proto.h    27 Mar 2004 09:44:34 -0000      1.185
-+++ proto.h    8 Apr 2004 05:56:32 -0000
+--- proto.h    14 Apr 2004 23:33:30 -0000      1.188
++++ proto.h    15 Apr 2004 18:51:15 -0000
 @@ -51,6 +51,12 @@
  int daemon_main(void);
  void setup_protocol(int f_out,int f_in);
  int claim_connection(char *fname,int max_connections);
-+char *sanitizeSql(const char *input) ;
++char *sanitizeSql(const char *input);
 +void db_log_open(void);
 +void db_log_close();
 +void db_log_session();
 +void db_log_transfer(struct file_struct *file,struct stats *initial_stats,char *operation);
 +void db_log_exit(int code, const char *file, int line);
- void free_exclude_list(struct exclude_struct ***listp);
- int check_exclude(struct exclude_struct **list, char *name, int name_is_dir);
- void add_exclude(struct exclude_struct ***listp, const char *pattern, int include);
-@@ -137,6 +143,17 @@
+ void free_exclude_list(struct exclude_list_struct *listp);
+ int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir,
+                 const char *type);
+@@ -136,6 +142,17 @@
  BOOL lp_list(int );
  BOOL lp_use_chroot(int );
  BOOL lp_transfer_logging(int );
@@ -749,7 +749,7 @@ dblog.c file has a compile problem, it's probably my fault...)
  BOOL lp_ignore_errors(int );
  BOOL lp_ignore_nonreadable(int );
  char *lp_uid(int );
-@@ -158,6 +175,7 @@
+@@ -157,6 +174,7 @@
  BOOL lp_load(char *pszFname, int globals_only);
  int lp_numservices(void);
  int lp_number(char *name);