From d0ac62771bfac44ed30acc3437879d0f737fc81f Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 10 Jun 2005 23:41:50 +0000 Subject: [PATCH] Fixed high levels of fuzz. --- ODBC-dblog.diff | 22 +++++++++++----------- acls.diff | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index fa6f932..7849999 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -125,7 +125,7 @@ This patch adds the following options: if (verbose > 2) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", ---- orig/clientserver.c 2005-05-19 08:52:42 +--- orig/clientserver.c 2005-06-10 21:33:27 +++ clientserver.c 2005-05-23 23:29:31 @@ -346,6 +346,9 @@ static int rsync_module(int f_in, int f_ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES); @@ -147,9 +147,9 @@ This patch adds the following options: } else { rprintf(FLOG, "rsync %s %s from %s (%s)\n", am_sender ? "on" : "to", ---- orig/configure.in 2005-05-28 08:24:57 +--- orig/configure.in 2005-06-10 21:33:28 +++ configure.in 2005-05-23 23:32:21 -@@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path, +@@ -92,6 +92,8 @@ AC_ARG_WITH(rsync-path, [ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)], [ RSYNC_PATH="$with_rsync_path" ], [ RSYNC_PATH="rsync" ]) @@ -158,7 +158,7 @@ This patch adds the following options: AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine]) -@@ -537,6 +539,14 @@ then +@@ -546,6 +548,14 @@ then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) fi @@ -630,9 +630,9 @@ This patch adds the following options: + rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n"); + } +} ---- orig/loadparm.c 2005-02-19 17:38:51 +--- orig/loadparm.c 2005-06-10 21:33:28 +++ loadparm.c 2005-05-23 23:29:42 -@@ -125,6 +125,17 @@ typedef struct +@@ -124,6 +124,17 @@ typedef struct BOOL list; BOOL use_chroot; BOOL transfer_logging; @@ -666,9 +666,9 @@ This patch adds the following options: + NULL, /* custom unique id select*/ + True, /* get custom id before insert */ False, /* ignore errors */ - "nobody",/* uid */ - -@@ -302,6 +324,17 @@ static struct parm_struct parm_table[] = + NOBODY_USER,/* uid */ + NOBODY_GROUP,/* gid */ +@@ -294,6 +316,17 @@ static struct parm_struct parm_table[] = {"include", P_STRING, P_LOCAL, &sDefault.include, NULL, 0}, {"include from", P_STRING, P_LOCAL, &sDefault.include_from,NULL, 0}, {"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,NULL,0}, @@ -686,7 +686,7 @@ This patch adds the following options: {"ignore errors", P_BOOL, P_LOCAL, &sDefault.ignore_errors,NULL,0}, {"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL, 0}, {"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options,NULL, 0}, -@@ -372,6 +405,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only) +@@ -362,6 +395,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only) FN_LOCAL_BOOL(lp_list, list) FN_LOCAL_BOOL(lp_use_chroot, use_chroot) FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging) @@ -704,7 +704,7 @@ This patch adds the following options: FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors) FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable) FN_LOCAL_STRING(lp_uid, uid) ---- orig/log.c 2005-04-15 07:08:03 +--- orig/log.c 2005-06-10 21:33:28 +++ log.c 2005-05-23 23:29:54 @@ -84,7 +84,7 @@ struct { /* diff --git a/acls.diff b/acls.diff index 6d46e97..112e604 100644 --- a/acls.diff +++ b/acls.diff @@ -1166,7 +1166,7 @@ ACLs to a non-ACL-supporting disk should complain. +} + +#endif /* SUPPORT_ACLS */ ---- orig/backup.c 2005-02-22 01:57:58 +--- orig/backup.c 2005-06-10 21:33:27 +++ backup.c 2004-10-06 00:13:09 @@ -135,6 +135,7 @@ static int make_bak_dir(char *fullpath) } else { @@ -1183,9 +1183,9 @@ ACLs to a non-ACL-supporting disk should complain. + PUSH_KEEP_BACKUP_ACL(file, fname, buf); + /* Check to see if this is a device file, or link */ - if (IS_DEVICE(file->mode)) { - if (am_root && preserve_devices) { -@@ -260,6 +263,7 @@ static int keep_backup(char *fname) + if (IS_DEVICE(file->mode) && am_root && preserve_devices) { + do_unlink(buf); +@@ -261,6 +264,7 @@ static int keep_backup(char *fname) } } set_perms(buf, file, NULL, 0); @@ -1193,9 +1193,9 @@ ACLs to a non-ACL-supporting disk should complain. free(file); if (verbose > 1) { ---- orig/configure.in 2005-05-28 08:24:57 +--- orig/configure.in 2005-06-10 21:33:28 +++ configure.in 2004-08-19 19:53:27 -@@ -480,6 +480,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no +@@ -489,6 +489,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no AC_CHECK_LIB(resolv, strcasecmp) fi @@ -1207,7 +1207,7 @@ ACLs to a non-ACL-supporting disk should complain. dnl At the moment we don't test for a broken memcmp(), because all we dnl need to do is test for equality, not comparison, and it seems that dnl every platform has a memcmp that can do at least that. -@@ -736,6 +741,77 @@ AC_SUBST(OBJ_RESTORE) +@@ -745,6 +750,77 @@ AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(BUILD_POPT) @@ -1325,9 +1325,9 @@ ACLs to a non-ACL-supporting disk should complain. if (f >= 0) { /* Now send the uid/gid list. This was introduced in * protocol version 15 */ ---- orig/generator.c 2005-05-22 20:53:34 +--- orig/generator.c 2005-06-10 21:33:28 +++ generator.c 2005-05-12 23:34:00 -@@ -715,6 +715,10 @@ static void recv_generator(char *fname, +@@ -716,6 +716,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) && verbose && code && f_out != -1) rprintf(code, "%s/\n", safe_fname(fname)); @@ -4780,7 +4780,7 @@ ACLs to a non-ACL-supporting disk should complain. #include "proto.h" /* We have replacement versions of these if they're missing. */ ---- orig/rsync.yo 2005-05-22 20:53:34 +--- orig/rsync.yo 2005-06-03 08:32:34 +++ rsync.yo 2004-07-03 20:11:58 @@ -317,6 +317,7 @@ to the detailed description below for a -H, --hard-links preserve hard links -- 2.34.1