From 32f6df4ba60c0e4d281e8a1c012c86f47e8db3fc Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 19 Sep 2005 17:27:16 +0000 Subject: [PATCH] Updated to fix failing hunks. --- ODBC-dblog.diff | 76 ++++++++++++++++++++++++------------------------ rsyncd-perm.diff | 26 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 5309ada..10d1145 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -630,8 +630,8 @@ This patch adds the following options: + rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n"); + } +} ---- orig/loadparm.c 2005-09-16 20:36:31 -+++ loadparm.c 2005-09-16 20:39:31 +--- orig/loadparm.c 2005-09-19 17:21:10 ++++ loadparm.c 2005-09-19 17:22:53 @@ -120,9 +120,14 @@ typedef struct { char *auth_users; @@ -667,42 +667,42 @@ This patch adds the following options: BOOL ignore_errors; BOOL ignore_nonreadable; BOOL list; -@@ -160,9 +171,14 @@ static service sDefault = +@@ -163,9 +174,14 @@ static service sDefault = { - /* auth_users */ NULL, - /* comment */ NULL, -+ /* custom_unique_id_select */ NULL, -+ /* database_datasource */ NULL, -+ /* database_password */ NULL, -+ /* database_username */ NULL, - /* dont_compress */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", - /* exclude */ NULL, - /* exclude_from */ NULL, -+ /* exit_table_name */ NULL, - /* filter */ NULL, - /* gid */ NOBODY_GROUP, - /* hosts_allow */ NULL, -@@ -177,13 +193,19 @@ static service sDefault = - /* prexfer_exec */ NULL, - /* refuse_options */ NULL, - /* secrets_file */ NULL, -+ /* sequence_name */ NULL, -+ /* session_table_name */ NULL, - /* temp_dir */ NULL, -+ /* transfer_table_name */ NULL, - /* uid */ NOBODY_USER, -+ /* unique_id_method */ NULL, + /* auth_users; */ NULL, + /* comment; */ NULL, ++ /* custom_unique_id_select; */ NULL, ++ /* database_datasource; */ NULL, ++ /* database_password; */ NULL, ++ /* database_username; */ NULL, + /* dont_compress; */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", + /* exclude; */ NULL, + /* exclude_from; */ NULL, ++ /* exit_table_name; */ NULL, + /* filter; */ NULL, + /* gid; */ NOBODY_GROUP, + /* hosts_allow; */ NULL, +@@ -180,13 +196,19 @@ static service sDefault = + /* prexfer_exec; */ NULL, + /* refuse_options; */ NULL, + /* secrets_file; */ NULL, ++ /* sequence_name; */ NULL, ++ /* session_table_name; */ NULL, + /* temp_dir; */ NULL, ++ /* transfer_table_name; */ NULL, + /* uid; */ NOBODY_USER, ++ /* unique_id_method; */ NULL, - /* max_connections */ 0, - /* max_verbosity */ 1, - /* timeout */ 0, + /* max_connections; */ 0, + /* max_verbosity; */ 1, + /* timeout; */ 0, -+ /* database_logging */ False, -+ /* get_custom_id_before_insert */ True, - /* ignore_errors */ False, - /* ignore_nonreadable */ False, - /* list */ True, -@@ -284,10 +306,17 @@ static struct parm_struct parm_table[] = ++ /* database_logging; */ False, ++ /* get_custom_id_before_insert; */ True, + /* ignore_errors; */ False, + /* ignore_nonreadable; */ False, + /* list; */ True, +@@ -287,10 +309,17 @@ 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}, @@ -720,7 +720,7 @@ This patch adds the following options: {"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}, -@@ -302,6 +331,10 @@ static struct parm_struct parm_table[] = +@@ -305,6 +334,10 @@ static struct parm_struct parm_table[] = {"max verbosity", P_INTEGER,P_LOCAL, &sDefault.max_verbosity, NULL,0}, {"name", P_STRING, P_LOCAL, &sDefault.name, NULL,0}, {"path", P_PATH, P_LOCAL, &sDefault.path, NULL,0}, @@ -731,7 +731,7 @@ This patch adds the following options: #ifdef HAVE_PUTENV {"post-xfer exec", P_STRING, P_LOCAL, &sDefault.postxfer_exec, NULL,0}, {"pre-xfer exec", P_STRING, P_LOCAL, &sDefault.prexfer_exec, NULL,0}, -@@ -374,9 +407,14 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G +@@ -377,9 +410,14 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G FN_LOCAL_STRING(lp_auth_users, auth_users) FN_LOCAL_STRING(lp_comment, comment) @@ -746,7 +746,7 @@ This patch adds the following options: FN_LOCAL_STRING(lp_filter, filter) FN_LOCAL_STRING(lp_gid, gid) FN_LOCAL_STRING(lp_hosts_allow, hosts_allow) -@@ -391,13 +429,19 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf +@@ -394,13 +432,19 @@ 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) diff --git a/rsyncd-perm.diff b/rsyncd-perm.diff index 77db7d3..f73d0f1 100644 --- a/rsyncd-perm.diff +++ b/rsyncd-perm.diff @@ -1,4 +1,4 @@ ---- orig/loadparm.c 2005-09-16 20:36:31 +--- orig/loadparm.c 2005-09-19 17:21:10 +++ loadparm.c 2005-09-16 20:41:11 @@ -140,6 +140,10 @@ typedef struct char *temp_dir; @@ -11,18 +11,18 @@ int max_connections; int max_verbosity; int timeout; -@@ -180,6 +184,10 @@ static service sDefault = - /* temp_dir */ NULL, - /* uid */ NOBODY_USER, +@@ -183,6 +187,10 @@ static service sDefault = + /* temp_dir; */ NULL, + /* uid; */ NOBODY_USER, -+ /* create_mask */ CHMOD_BITS, -+ /* directory_mask */ CHMOD_BITS, -+ /* force_create_mode */ 0, -+ /* force_directory_mode */ 0, - /* max_connections */ 0, - /* max_verbosity */ 1, - /* timeout */ 0, -@@ -284,10 +292,14 @@ static struct parm_struct parm_table[] = ++ /* create_mask; */ CHMOD_BITS, ++ /* directory_mask; */ CHMOD_BITS, ++ /* force_create_mode; */ 0, ++ /* force_directory_mode; */ 0, + /* max_connections; */ 0, + /* max_verbosity; */ 1, + /* timeout; */ 0, +@@ -287,10 +295,14 @@ 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}, @@ -37,7 +37,7 @@ {"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}, -@@ -394,6 +406,10 @@ FN_LOCAL_STRING(lp_secrets_file, secrets +@@ -397,6 +409,10 @@ FN_LOCAL_STRING(lp_secrets_file, secrets FN_LOCAL_STRING(lp_temp_dir, temp_dir) FN_LOCAL_STRING(lp_uid, uid) -- 2.34.1