Updated the opening comments to mention how to apply the patch

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 4182aff6adf9c2b0d1cdc3bab693cdfb4c08d624..71801031a3ba036081001d61212c8c142290bf15 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -1,12 +1,13 @@
 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 <patches/ODBC-dblog.diff
     ./prepare-source
     ./configure --enable-ODBC
     make
 
-See the file "instructions" (after applying this patch) for more info.
+See the newly-created file "instructions" for more info.
 
 --- old/Makefile.in
 +++ new/Makefile.in
@@ -29,7 +30,7 @@ See the file "instructions" (after applying this patch) for more info.
  extern int log_got_error;
  extern char *partial_dir;
  extern char *logfile_name;
-@@ -179,8 +180,13 @@ NORETURN void _exit_cleanup(int code, co
+@@ -174,8 +175,13 @@ NORETURN void _exit_cleanup(int code, co
                                code = exit_code = RERR_PARTIAL;
                }
  
@@ -43,10 +44,10 @@ See the file "instructions" (after applying this patch) for more info.
 +              }
  
                /* FALLTHROUGH */
-       case 5:
+ #include "case_N.h"
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -390,6 +390,9 @@ static int rsync_module(int f_in, int f_
+@@ -394,6 +394,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
  
        log_init(1);
@@ -56,7 +57,7 @@ See the file "instructions" (after applying this patch) for more info.
  
  #ifdef HAVE_PUTENV
        if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -629,6 +632,9 @@ static int rsync_module(int f_in, int f_
+@@ -633,6 +636,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);