Fixed failing hunks.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 98c6f79..2673bc8 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -30,7 +30,7 @@ See the newly-created file "instructions" for more info.
  extern int log_got_error;
  extern char *partial_dir;
  extern char *logfile_name;
-@@ -173,8 +174,13 @@ NORETURN void _exit_cleanup(int code, co
+@@ -178,8 +179,13 @@ NORETURN void _exit_cleanup(int code, co
                                code = exit_code = RERR_PARTIAL;
                }
  
@@ -47,7 +47,7 @@ See the newly-created file "instructions" for more info.
  #include "case_N.h"
 --- old/clientserver.c
 +++ new/clientserver.c
-@@ -410,6 +410,9 @@ static int rsync_module(int f_in, int f_
+@@ -499,6 +499,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
  
        log_init(1);
@@ -57,7 +57,7 @@ See the newly-created file "instructions" for more info.
  
  #ifdef HAVE_PUTENV
        if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -649,6 +652,9 @@ static int rsync_module(int f_in, int f_
+@@ -695,6 +698,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);
@@ -69,7 +69,7 @@ See the newly-created file "instructions" for more info.
                                am_sender ? "on" : "to",
 --- old/configure.in
 +++ new/configure.in
-@@ -659,6 +659,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -656,6 +656,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -898,7 +898,7 @@ See the newly-created file "instructions" for more info.
 +    automatically generates unique IDs).  Defaults to True.
 --- old/loadparm.c
 +++ new/loadparm.c
-@@ -124,9 +124,16 @@ typedef struct
+@@ -125,9 +125,16 @@ typedef struct
  {
        char *auth_users;
        char *comment;
@@ -915,7 +915,7 @@ See the newly-created file "instructions" for more info.
        char *filter;
        char *gid;
        char *hosts_allow;
-@@ -144,15 +151,21 @@ typedef struct
+@@ -145,15 +152,21 @@ typedef struct
        char *prexfer_exec;
        char *refuse_options;
        char *secrets_file;
@@ -937,7 +937,7 @@ See the newly-created file "instructions" for more info.
        BOOL ignore_errors;
        BOOL ignore_nonreadable;
        BOOL list;
-@@ -172,9 +185,16 @@ static service sDefault =
+@@ -173,9 +186,16 @@ static service sDefault =
  {
   /* auth_users; */            NULL,
   /* comment; */                       NULL,
@@ -954,7 +954,7 @@ See the newly-created file "instructions" for more info.
   /* filter; */                        NULL,
   /* gid; */                   NOBODY_GROUP,
   /* hosts_allow; */           NULL,
-@@ -192,15 +212,21 @@ static service sDefault =
+@@ -193,15 +213,21 @@ static service sDefault =
   /* prexfer_exec; */          NULL,
   /* refuse_options; */                NULL,
   /* secrets_file; */          NULL,
@@ -976,7 +976,7 @@ See the newly-created file "instructions" for more info.
   /* ignore_errors; */         False,
   /* ignore_nonreadable; */    False,
   /* list; */                  True,
-@@ -299,11 +325,20 @@ static struct parm_struct parm_table[] =
+@@ -300,11 +326,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},
@@ -997,7 +997,7 @@ See the newly-created file "instructions" 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},
-@@ -328,12 +363,16 @@ static struct parm_struct parm_table[] =
+@@ -329,12 +364,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},
@@ -1014,7 +1014,7 @@ See the newly-created file "instructions" 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}
-@@ -389,9 +428,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
+@@ -390,9 +429,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_comment, comment)
@@ -1031,7 +1031,7 @@ See the newly-created file "instructions" for more info.
  FN_LOCAL_STRING(lp_filter, filter)
  FN_LOCAL_STRING(lp_gid, gid)
  FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
-@@ -409,15 +455,21 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
+@@ -410,15 +456,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)
@@ -1055,7 +1055,7 @@ See the newly-created file "instructions" for more info.
  FN_LOCAL_BOOL(lp_list, list)
 --- old/log.c
 +++ new/log.c
-@@ -96,7 +96,7 @@ struct {
+@@ -97,7 +97,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1066,7 +1066,7 @@ See the newly-created file "instructions" for more info.
        for (i = 0; rerr_names[i].name; i++) {
 --- old/receiver.c
 +++ new/receiver.c
-@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, char *fn
+@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, const ch
  
        if (maxname < 1) {
                rprintf(FERROR, "temporary filename too long: %s\n", fname);
@@ -1077,7 +1077,17 @@ See the newly-created file "instructions" for more info.
                fnametmp[0] = '\0';
                return 0;
        }
-@@ -176,6 +180,10 @@ static int receive_data(int f_in, char *
+@@ -155,6 +159,9 @@ int open_tmpfile(char *fnametmp, const c
+       if (fd == -1) {
+               rsyserr(FERROR, errno, "mkstemp %s failed",
+                       full_fname(fnametmp));
++#ifdef HAVE_LIBODBC
++              db_log_error(FERROR, 22, "mkstemp %s failed", full_fname(fnametmp));
++#endif
+               return -1;
+       }
+ 
+@@ -213,6 +220,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);
@@ -1088,7 +1098,7 @@ See the newly-created file "instructions" for more info.
                        exit_cleanup(RERR_FILEIO);
                }
        }
-@@ -233,6 +241,11 @@ static int receive_data(int f_in, char *
+@@ -270,6 +281,11 @@ static int receive_data(int f_in, char *
                                                "lseek of %s returned %.0f, not %.0f",
                                                full_fname(fname),
                                                (double)pos, (double)offset);
@@ -1100,7 +1110,7 @@ See the newly-created file "instructions" for more info.
                                        exit_cleanup(RERR_FILEIO);
                                }
                                continue;
-@@ -258,6 +271,9 @@ static int receive_data(int f_in, char *
+@@ -295,6 +311,9 @@ static int receive_data(int f_in, char *
            report_write_error:
                rsyserr(FERROR, errno, "write failed on %s",
                        full_fname(fname));
@@ -1110,7 +1120,7 @@ See the newly-created file "instructions" for more info.
                exit_cleanup(RERR_FILEIO);
        }
  
-@@ -301,6 +317,12 @@ static void handle_delayed_updates(char 
+@@ -338,6 +357,12 @@ static void handle_delayed_updates(char 
                                rsyserr(FERROR, errno,
                                        "rename failed for %s (from %s)",
                                        full_fname(fname), partialptr);
@@ -1123,7 +1133,7 @@ See the newly-created file "instructions" for more info.
                        } else {
                                if (remove_source_files
                                 || (preserve_hard_links && F_IS_HLINKED(file)))
-@@ -454,6 +476,9 @@ int recv_files(int f_in, char *local_nam
+@@ -489,6 +514,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");
@@ -1133,7 +1143,7 @@ See the newly-created file "instructions" for more info.
                        exit_cleanup(RERR_PROTOCOL);
                }
  
-@@ -512,6 +537,11 @@ int recv_files(int f_in, char *local_nam
+@@ -545,6 +573,11 @@ int recv_files(int f_in, char *local_nam
                                        rprintf(FERROR,
                                                "invalid basis_dir index: %d.\n",
                                                fnamecmp_type);
@@ -1145,7 +1155,7 @@ See the newly-created file "instructions" for more info.
                                        exit_cleanup(RERR_PROTOCOL);
                                }
                                pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -560,6 +590,9 @@ int recv_files(int f_in, char *local_nam
+@@ -594,6 +627,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));
@@ -1155,7 +1165,7 @@ See the newly-created file "instructions" for more info.
                        discard_receive_data(f_in, F_LENGTH(file));
                        close(fd1);
                        if (inc_recurse)
-@@ -575,6 +608,9 @@ int recv_files(int f_in, char *local_nam
+@@ -609,6 +645,9 @@ int recv_files(int f_in, char *local_nam
                         */
                        rprintf(FERROR,"recv_files: %s is a directory\n",
                                full_fname(fnamecmp));
@@ -1165,28 +1175,17 @@ See the newly-created file "instructions" for more info.
                        discard_receive_data(f_in, F_LENGTH(file));
                        close(fd1);
                        if (inc_recurse)
-@@ -609,6 +645,9 @@ int recv_files(int f_in, char *local_nam
+@@ -643,6 +682,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));
 +#endif
-                               discard_receive_data(f_in, F_LENGTH(file));
-                               if (fd1 != -1)
-                                       close(fd1);
-@@ -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",
-+                                      full_fname(fnametmp));
-+#endif
-                               discard_receive_data(f_in, F_LENGTH(file));
-                               if (fd1 != -1)
-                                       close(fd1);
-@@ -668,12 +711,19 @@ int recv_files(int f_in, char *local_nam
+                       }
+               } else {
+                       fd2 = open_tmpfile(fnametmp, fname, file);
+@@ -670,12 +712,19 @@ int recv_files(int f_in, char *local_nam
                                       fname, fd2, F_LENGTH(file));
  
                log_item(log_code, file, &initial_stats, iflags, NULL);
@@ -1206,7 +1205,7 @@ See the newly-created file "instructions" for more info.
                        exit_cleanup(RERR_FILEIO);
                }
  
-@@ -730,6 +780,12 @@ int recv_files(int f_in, char *local_nam
+@@ -732,6 +781,12 @@ int recv_files(int f_in, char *local_nam
                                rprintf(msgtype,
                                        "%s: %s failed verification -- update %s%s.\n",
                                        errstr, fname, keptstr, redostr);