From ee12ff0e93ddc975d2fee058bd08afc66bdccf76 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 16 Oct 2005 23:06:33 +0000 Subject: [PATCH] One function needed its return type changed from BOOL to int. --- acls.diff | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/acls.diff b/acls.diff index afcad17..0dfcb16 100644 --- a/acls.diff +++ b/acls.diff @@ -376,7 +376,7 @@ ACLs to a non-ACL-supporting disk should complain. +/* Generate the ACL(s) for this flist entry; + * ACL(s) are either sent or cleaned-up by send_acl() below. */ + -+BOOL make_acl(const struct file_struct *file, const char *fname) ++int make_acl(const struct file_struct *file, const char *fname) +{ + SMB_ACL_TYPE_T *type, + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT}; @@ -1284,9 +1284,9 @@ ACLs to a non-ACL-supporting disk should complain. AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT ---- orig/flist.c 2005-09-17 21:48:45 +--- orig/flist.c 2005-09-29 07:43:17 +++ flist.c 2005-07-29 02:49:06 -@@ -968,6 +968,8 @@ static struct file_struct *send_file_nam +@@ -966,6 +966,8 @@ static struct file_struct *send_file_nam file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS); if (!file) return NULL; @@ -1295,7 +1295,7 @@ ACLs to a non-ACL-supporting disk should complain. maybe_emit_filelist_progress(flist->count + flist_count_offset); -@@ -976,6 +978,10 @@ static struct file_struct *send_file_nam +@@ -974,6 +976,10 @@ static struct file_struct *send_file_nam if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); @@ -1306,7 +1306,7 @@ ACLs to a non-ACL-supporting disk should complain. } return file; } -@@ -1321,6 +1327,8 @@ struct file_list *recv_file_list(int f) +@@ -1320,6 +1326,8 @@ struct file_list *recv_file_list(int f) flags |= read_byte(f) << 8; file = receive_file_entry(flist, flags, f); @@ -1315,7 +1315,7 @@ ACLs to a non-ACL-supporting disk should complain. if (S_ISREG(file->mode)) stats.total_size += file->length; -@@ -1343,6 +1351,8 @@ struct file_list *recv_file_list(int f) +@@ -1342,6 +1350,8 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -1324,7 +1324,7 @@ 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-09-15 18:09:14 +--- orig/generator.c 2005-10-14 20:03:01 +++ generator.c 2005-05-12 23:34:00 @@ -725,6 +725,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) @@ -4624,7 +4624,7 @@ ACLs to a non-ACL-supporting disk should complain. next; } ---- orig/options.c 2005-09-24 17:40:31 +--- orig/options.c 2005-10-15 16:39:46 +++ options.c 2005-08-27 21:15:29 @@ -43,6 +43,7 @@ int keep_dirlinks = 0; int copy_links = 0; @@ -4634,7 +4634,7 @@ ACLs to a non-ACL-supporting disk should complain. int preserve_perms = 0; int preserve_devices = 0; int preserve_uid = 0; -@@ -181,6 +182,7 @@ static void print_rsync_version(enum log +@@ -182,6 +183,7 @@ static void print_rsync_version(enum log char const *got_socketpair = "no "; char const *have_inplace = "no "; char const *hardlinks = "no "; @@ -4642,7 +4642,7 @@ ACLs to a non-ACL-supporting disk should complain. char const *links = "no "; char const *ipv6 = "no "; STRUCT_STAT *dumstat; -@@ -197,6 +199,10 @@ static void print_rsync_version(enum log +@@ -198,6 +200,10 @@ static void print_rsync_version(enum log hardlinks = ""; #endif @@ -4653,7 +4653,7 @@ ACLs to a non-ACL-supporting disk should complain. #ifdef SUPPORT_LINKS links = ""; #endif -@@ -211,9 +217,9 @@ static void print_rsync_version(enum log +@@ -212,9 +218,9 @@ static void print_rsync_version(enum log "Copyright (C) 1996-2005 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " @@ -4665,7 +4665,7 @@ ACLs to a non-ACL-supporting disk should complain. /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature -@@ -283,6 +289,7 @@ void usage(enum logcode F) +@@ -284,6 +290,7 @@ void usage(enum logcode F) rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -p, --perms preserve permissions\n"); @@ -4673,7 +4673,7 @@ ACLs to a non-ACL-supporting disk should complain. rprintf(F," -o, --owner preserve owner (root only)\n"); rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); -@@ -385,6 +392,9 @@ static struct poptOption long_options[] +@@ -387,6 +394,9 @@ static struct poptOption long_options[] {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, @@ -4683,7 +4683,7 @@ ACLs to a non-ACL-supporting disk should complain. {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, -@@ -927,6 +937,24 @@ int parse_arguments(int *argc, const cha +@@ -967,6 +977,24 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -4708,7 +4708,7 @@ ACLs to a non-ACL-supporting disk should complain. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1348,6 +1376,8 @@ void server_options(char **args,int *arg +@@ -1388,6 +1416,8 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -4734,9 +4734,9 @@ ACLs to a non-ACL-supporting disk should complain. if (verbose > 1 && flags & PERMS_REPORT) { enum logcode code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; ---- orig/rsync.h 2005-09-24 17:40:31 +--- orig/rsync.h 2005-10-14 18:45:50 +++ rsync.h 2005-07-29 02:25:55 -@@ -650,6 +650,44 @@ struct stats { +@@ -651,6 +651,44 @@ struct stats { #include "lib/permstring.h" #include "lib/addrinfo.h" @@ -4781,7 +4781,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-09-24 17:40:31 +--- orig/rsync.yo 2005-10-15 16:39:47 +++ rsync.yo 2004-07-03 20:11:58 @@ -316,6 +316,7 @@ to the detailed description below for a -H, --hard-links preserve hard links @@ -4791,7 +4791,7 @@ ACLs to a non-ACL-supporting disk should complain. -o, --owner preserve owner (root only) -g, --group preserve group -D, --devices preserve devices (root only) -@@ -665,6 +666,11 @@ based on the source file's permissions, +@@ -666,6 +667,11 @@ based on the source file's permissions, umask setting (which is the same behavior as other file-copy utilities, such as cp). -- 2.34.1