1 To use this patch, run these commands for a successful build:
3 patch -p1 <patches/acls.diff
5 ./configure --enable-acl-support
8 See the --acls (-A) option in the revised man page for a note on using this
9 latest ACL-enabling patch to send files to an older ACL-enabled rsync.
13 @@ -26,15 +26,15 @@ VERSION=@VERSION@
17 -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h lib/pool_alloc.h
18 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
19 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
20 - lib/permstring.o lib/pool_alloc.o @LIBOBJS@
21 + lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
22 ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
23 zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
24 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
25 main.o checksum.o match.o syscall.o log.o backup.o
26 OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
27 - fileio.o batch.o clientname.o chmod.o
28 + fileio.o batch.o clientname.o chmod.o acls.o
29 OBJS3=progress.o pipe.o
30 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
31 popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
36 + * Handle passing Access Control Lists between systems.
38 + * Copyright (C) 1996 Andrew Tridgell
39 + * Copyright (C) 1996 Paul Mackerras
40 + * Copyright (C) 2006 Wayne Davison
42 + * This program is free software; you can redistribute it and/or modify
43 + * it under the terms of the GNU General Public License as published by
44 + * the Free Software Foundation; either version 2 of the License, or
45 + * (at your option) any later version.
47 + * This program is distributed in the hope that it will be useful,
48 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
49 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
50 + * GNU General Public License for more details.
52 + * You should have received a copy of the GNU General Public License along
53 + * with this program; if not, write to the Free Software Foundation, Inc.,
54 + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
58 +#include "lib/sysacls.h"
63 +extern int read_only;
64 +extern int list_only;
65 +extern int orig_umask;
66 +extern int preserve_acls;
67 +extern int flist_extra_ndx;
68 +extern unsigned int file_struct_len;
70 +/* === ACL structures === */
82 +#define NO_ENTRY ((uchar)0x80)
83 +typedef struct rsync_acl {
86 + /* These will be NO_ENTRY if there's no such entry. */
98 +static const rsync_acl empty_rsync_acl = {
99 + {NULL, 0}, {NULL, 0}, NO_ENTRY, NO_ENTRY, NO_ENTRY, NO_ENTRY
102 +static item_list access_acl_list = EMPTY_ITEM_LIST;
103 +static item_list default_acl_list = EMPTY_ITEM_LIST;
105 +/* === Calculations on ACL types === */
107 +static const char *str_acl_type(SMB_ACL_TYPE_T type)
109 + return type == SMB_ACL_TYPE_ACCESS ? "SMB_ACL_TYPE_ACCESS"
110 + : type == SMB_ACL_TYPE_DEFAULT ? "SMB_ACL_TYPE_DEFAULT"
111 + : "unknown SMB_ACL_TYPE_T";
114 +#define OTHER_TYPE(t) (SMB_ACL_TYPE_ACCESS+SMB_ACL_TYPE_DEFAULT-(t))
115 +#define BUMP_TYPE(t) ((t = OTHER_TYPE(t)) == SMB_ACL_TYPE_DEFAULT)
117 +static int count_racl_entries(const rsync_acl *racl)
119 + return racl->users.count + racl->groups.count
120 + + (racl->user_obj != NO_ENTRY)
121 + + (racl->group_obj != NO_ENTRY)
122 + + (racl->mask != NO_ENTRY)
123 + + (racl->other != NO_ENTRY);
126 +static int calc_sacl_entries(const rsync_acl *racl)
128 + /* A System ACL always gets user/group/other permission entries. */
129 + return racl->users.count + racl->groups.count
130 +#ifdef ACLS_NEED_MASK
133 + + (racl->mask != NO_ENTRY) + 3;
137 +/* Extracts and returns the permission bits from the ACL. This cannot be
138 + * called on an rsync_acl that has NO_ENTRY in any spot but the mask. */
139 +static int rsync_acl_get_perms(const rsync_acl *racl)
141 + return (racl->user_obj << 6)
142 + + ((racl->mask != NO_ENTRY ? racl->mask : racl->group_obj) << 3)
146 +/* Removes the permission-bit entries from the ACL because these
147 + * can be reconstructed from the file's mode. */
148 +static void rsync_acl_strip_perms(rsync_acl *racl)
150 + racl->user_obj = NO_ENTRY;
151 + if (racl->mask == NO_ENTRY)
152 + racl->group_obj = NO_ENTRY;
154 + if (racl->group_obj == racl->mask)
155 + racl->group_obj = NO_ENTRY;
156 + racl->mask = NO_ENTRY;
158 + racl->other = NO_ENTRY;
161 +/* Given an empty rsync_acl, fake up the permission bits. */
162 +static void rsync_acl_fake_perms(rsync_acl *racl, mode_t mode)
164 + racl->user_obj = (mode >> 6) & 7;
165 + racl->group_obj = (mode >> 3) & 7;
166 + racl->other = mode & 7;
169 +/* === Rsync ACL functions === */
171 +static BOOL ida_entries_equal(const ida_entries *ial1, const ida_entries *ial2)
173 + id_access *ida1, *ida2;
174 + int count = ial1->count;
175 + if (count != ial2->count)
179 + for (; count--; ida1++, ida2++) {
180 + if (ida1->access != ida2->access || ida1->id != ida2->id)
186 +static BOOL rsync_acl_equal(const rsync_acl *racl1, const rsync_acl *racl2)
188 + return racl1->user_obj == racl2->user_obj
189 + && racl1->group_obj == racl2->group_obj
190 + && racl1->mask == racl2->mask
191 + && racl1->other == racl2->other
192 + && ida_entries_equal(&racl1->users, &racl2->users)
193 + && ida_entries_equal(&racl1->groups, &racl2->groups);
196 +/* Are the extended (non-permission-bit) entries equal? If so, the rest of
197 + * the ACL will be handled by the normal mode-preservation code. This is
198 + * only meaningful for access ACLs! Note: the 1st arg is a fully-populated
199 + * rsync_acl, but the 2nd parameter can be a condensed rsync_acl, which means
200 + * that it might have several of its permission objects set to NO_ENTRY. */
201 +static BOOL rsync_acl_equal_enough(const rsync_acl *racl1,
202 + const rsync_acl *racl2, mode_t m)
204 + if ((racl1->mask ^ racl2->mask) & NO_ENTRY)
205 + return False; /* One has a mask and the other doesn't */
207 + /* When there's a mask, the group_obj becomes an extended entry. */
208 + if (racl1->mask != NO_ENTRY) {
209 + /* A condensed rsync_acl with a mask can only have no
210 + * group_obj when it was identical to the mask. This
211 + * means that it was also identical to the group attrs
212 + * from the mode. */
213 + if (racl2->group_obj == NO_ENTRY) {
214 + if (racl1->group_obj != ((m >> 3) & 7))
216 + } else if (racl1->group_obj != racl2->group_obj)
219 + return ida_entries_equal(&racl1->users, &racl2->users)
220 + && ida_entries_equal(&racl1->groups, &racl2->groups);
223 +static void rsync_acl_free(rsync_acl *racl)
225 + if (racl->users.idas)
226 + free(racl->users.idas);
227 + if (racl->groups.idas)
228 + free(racl->groups.idas);
229 + *racl = empty_rsync_acl;
232 +void free_acl(statx *sxp)
234 + if (sxp->acc_acl) {
235 + rsync_acl_free(sxp->acc_acl);
236 + free(sxp->acc_acl);
237 + sxp->acc_acl = NULL;
239 + if (sxp->def_acl) {
240 + rsync_acl_free(sxp->def_acl);
241 + free(sxp->def_acl);
242 + sxp->def_acl = NULL;
246 +static int id_access_sorter(const void *r1, const void *r2)
248 + id_access *ida1 = (id_access *)r1;
249 + id_access *ida2 = (id_access *)r2;
250 + id_t rid1 = ida1->id, rid2 = ida2->id;
251 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
254 +static void sort_ida_entries(ida_entries *idal)
258 + qsort(idal->idas, idal->count, sizeof idal->idas[0], id_access_sorter);
261 +/* Transfer the count id_access items out of the temp_ida_list into either
262 + * the users or groups ida_entries list in racl. */
263 +static void save_idas(item_list *temp_ida_list, rsync_acl *racl, SMB_ACL_TAG_T type)
268 + if (temp_ida_list->count) {
269 + int cnt = temp_ida_list->count;
270 + id_access *temp_idas = temp_ida_list->items;
271 + if (!(idas = new_array(id_access, cnt)))
272 + out_of_memory("save_idas");
273 + memcpy(idas, temp_idas, cnt * sizeof *temp_idas);
277 + ent = type == SMB_ACL_USER ? &racl->users : &racl->groups;
280 + rprintf(FERROR, "save_idas: disjoint list found for type %d\n", type);
281 + exit_cleanup(RERR_UNSUPPORTED);
283 + ent->count = temp_ida_list->count;
286 + /* Truncate the temporary list now that its idas have been saved. */
287 + temp_ida_list->count = 0;
290 +/* === System ACLs === */
292 +/* Unpack system ACL -> rsync ACL verbatim. Return whether we succeeded. */
293 +static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
295 + static item_list temp_ida_list = EMPTY_ITEM_LIST;
296 + SMB_ACL_TAG_T prior_list_type = 0;
297 + SMB_ACL_ENTRY_T entry;
298 + const char *errfun;
301 + errfun = "sys_acl_get_entry";
302 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
304 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
305 + SMB_ACL_TAG_T tag_type;
306 + SMB_ACL_PERMSET_T permset;
310 + if ((rc = sys_acl_get_tag_type(entry, &tag_type))) {
311 + errfun = "sys_acl_get_tag_type";
314 + if ((rc = sys_acl_get_permset(entry, &permset))) {
315 + errfun = "sys_acl_get_tag_type";
318 + access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
319 + | (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
320 + | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
321 + /* continue == done with entry; break == store in temporary ida list */
322 + switch (tag_type) {
323 + case SMB_ACL_USER_OBJ:
324 + if (racl->user_obj == NO_ENTRY)
325 + racl->user_obj = access;
327 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate USER_OBJ entry ignored\n");
331 + case SMB_ACL_GROUP_OBJ:
332 + if (racl->group_obj == NO_ENTRY)
333 + racl->group_obj = access;
335 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate GROUP_OBJ entry ignored\n");
337 + case SMB_ACL_GROUP:
340 + if (racl->mask == NO_ENTRY)
341 + racl->mask = access;
343 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate MASK entry ignored\n");
345 + case SMB_ACL_OTHER:
346 + if (racl->other == NO_ENTRY)
347 + racl->other = access;
349 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate OTHER entry ignored\n");
352 + rprintf(FINFO, "unpack_smb_acl: warning: entry with unrecognized tag type ignored\n");
355 + if (!(qualifier = sys_acl_get_qualifier(entry))) {
356 + errfun = "sys_acl_get_tag_type";
360 + if (tag_type != prior_list_type) {
361 + if (prior_list_type)
362 + save_idas(&temp_ida_list, racl, prior_list_type);
363 + prior_list_type = tag_type;
365 + ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
366 + ida->id = *((id_t *)qualifier);
367 + ida->access = access;
368 + sys_acl_free_qualifier(qualifier, tag_type);
371 + rsyserr(FERROR, errno, "unpack_smb_acl: %s()", errfun);
372 + rsync_acl_free(racl);
375 + if (prior_list_type)
376 + save_idas(&temp_ida_list, racl, prior_list_type);
378 + sort_ida_entries(&racl->users);
379 + sort_ida_entries(&racl->groups);
381 +#ifdef ACLS_NEED_MASK
382 + if (!racl->users.count && !racl->groups.count && racl->mask != NO_ENTRY) {
383 + /* Throw away a superfluous mask, but mask off the
384 + * group perms with it first. */
385 + racl->group_obj &= racl->mask;
386 + racl->mask = NO_ENTRY;
393 +/* Synactic sugar for system calls */
395 +#define CALL_OR_ERROR(func,args,str) \
403 +#define COE(func,args) CALL_OR_ERROR(func,args,#func)
404 +#define COE2(func,args) CALL_OR_ERROR(func,args,NULL)
406 +/* Store the permissions in the system ACL entry. */
407 +static int store_access_in_entry(uchar access, SMB_ACL_ENTRY_T entry)
409 + const char *errfun = NULL;
410 + SMB_ACL_PERMSET_T permset;
412 + COE( sys_acl_get_permset,(entry, &permset) );
413 + COE( sys_acl_clear_perms,(permset) );
415 + COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
417 + COE( sys_acl_add_perm,(permset, SMB_ACL_WRITE) );
419 + COE( sys_acl_add_perm,(permset, SMB_ACL_EXECUTE) );
420 + COE( sys_acl_set_permset,(entry, permset) );
425 + rsyserr(FERROR, errno, "store_access_in_entry %s()", errfun);
429 +/* Pack rsync ACL -> system ACL verbatim. Return whether we succeeded. */
430 +static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
432 +#ifdef ACLS_NEED_MASK
437 + const char *errfun = NULL;
438 + SMB_ACL_ENTRY_T entry;
440 + if (!(*smb_acl = sys_acl_init(calc_sacl_entries(racl)))) {
441 + rsyserr(FERROR, errno, "pack_smb_acl: sys_acl_init()");
445 + COE( sys_acl_create_entry,(smb_acl, &entry) );
446 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER_OBJ) );
447 + COE2( store_access_in_entry,(racl->user_obj & 7, entry) );
449 + for (ida = racl->users.idas, count = racl->users.count; count--; ida++) {
450 + COE( sys_acl_create_entry,(smb_acl, &entry) );
451 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER) );
452 + COE( sys_acl_set_qualifier,(entry, (void*)&ida->id) );
453 + COE2( store_access_in_entry,(ida->access, entry) );
456 + COE( sys_acl_create_entry,(smb_acl, &entry) );
457 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP_OBJ) );
458 + COE2( store_access_in_entry,(racl->group_obj & 7, entry) );
460 + for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) {
461 + COE( sys_acl_create_entry,(smb_acl, &entry) );
462 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP) );
463 + COE( sys_acl_set_qualifier,(entry, (void*)&ida->id) );
464 + COE2( store_access_in_entry,(ida->access, entry) );
467 +#ifdef ACLS_NEED_MASK
468 + mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 7 : racl->mask;
469 + COE( sys_acl_create_entry,(smb_acl, &entry) );
470 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
471 + COE2( store_access_in_entry,(mask_bits, entry) );
473 + if (racl->mask != NO_ENTRY) {
474 + COE( sys_acl_create_entry,(smb_acl, &entry) );
475 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
476 + COE2( store_access_in_entry,(racl->mask, entry) );
480 + COE( sys_acl_create_entry,(smb_acl, &entry) );
481 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_OTHER) );
482 + COE2( store_access_in_entry,(racl->other & 7, entry) );
485 + if (sys_acl_valid(*smb_acl) < 0)
486 + rprintf(FERROR, "pack_smb_acl: warning: system says the ACL I packed is invalid\n");
493 + rsyserr(FERROR, errno, "pack_smb_acl %s()", errfun);
495 + sys_acl_free_acl(*smb_acl);
499 +static int find_matching_rsync_acl(SMB_ACL_TYPE_T type,
500 + const item_list *racl_list,
501 + const rsync_acl *racl)
503 + static int access_match = -1, default_match = -1;
504 + int *match = type == SMB_ACL_TYPE_ACCESS ? &access_match : &default_match;
505 + size_t count = racl_list->count;
507 + /* If this is the first time through or we didn't match the last
508 + * time, then start at the end of the list, which should be the
509 + * best place to start hunting. */
511 + *match = racl_list->count - 1;
513 + rsync_acl *base = racl_list->items;
514 + if (rsync_acl_equal(base + *match, racl))
517 + *match = racl_list->count - 1;
524 +/* Return the Access Control List for the given filename. */
525 +int get_acl(const char *fname, statx *sxp)
527 + SMB_ACL_TYPE_T type;
529 + if (S_ISLNK(sxp->st.st_mode))
532 + type = SMB_ACL_TYPE_ACCESS;
534 + SMB_ACL_T sacl = sys_acl_get_file(fname, type);
535 + rsync_acl *racl = new(rsync_acl);
538 + out_of_memory("get_acl");
539 + *racl = empty_rsync_acl;
540 + if (type == SMB_ACL_TYPE_ACCESS)
541 + sxp->acc_acl = racl;
543 + sxp->def_acl = racl;
546 + BOOL ok = unpack_smb_acl(racl, sacl);
548 + sys_acl_free_acl(sacl);
553 + } else if (errno == ENOTSUP || errno == ENOSYS) {
554 + /* ACLs are not supported, so pretend we have a basic ACL. */
555 + if (type == SMB_ACL_TYPE_ACCESS)
556 + rsync_acl_fake_perms(racl, sxp->st.st_mode);
558 + rsyserr(FERROR, errno, "get_acl: sys_acl_get_file(%s, %s)",
559 + fname, str_acl_type(type));
563 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
568 +/* === Send functions === */
570 +/* The general strategy with the tag_type <-> character mapping is that
571 + * lowercase implies that no qualifier follows, where uppercase does.
572 + * A similar idiom for the ACL type (access or default) itself, but
573 + * lowercase in this instance means there's no ACL following, so the
574 + * ACL is a repeat, so the receiver should reuse the last of the same
577 +/* Send the ida list over the file descriptor. */
578 +static void send_ida_entries(int f, const ida_entries *idal, char tag_char)
581 + size_t count = idal->count;
582 + for (ida = idal->idas; count--; ida++) {
583 + write_byte(f, tag_char);
584 + write_byte(f, ida->access);
585 + write_int(f, ida->id);
586 + /* FIXME: sorta wasteful: we should maybe buffer as
587 + * many ids as max(ACL_USER + ACL_GROUP) objects to
588 + * keep from making so many calls. */
589 + if (tag_char == 'U')
596 +/* Send an rsync ACL over the file descriptor. */
597 +static void send_rsync_acl(int f, const rsync_acl *racl)
599 + size_t count = count_racl_entries(racl);
600 + write_int(f, count);
601 + if (racl->user_obj != NO_ENTRY) {
602 + write_byte(f, 'u');
603 + write_byte(f, racl->user_obj);
605 + send_ida_entries(f, &racl->users, 'U');
606 + if (racl->group_obj != NO_ENTRY) {
607 + write_byte(f, 'g');
608 + write_byte(f, racl->group_obj);
610 + send_ida_entries(f, &racl->groups, 'G');
611 + if (racl->mask != NO_ENTRY) {
612 + write_byte(f, 'm');
613 + write_byte(f, racl->mask);
615 + if (racl->other != NO_ENTRY) {
616 + write_byte(f, 'o');
617 + write_byte(f, racl->other);
621 +/* Send the ACL from the statx structure down the indicated file descriptor.
622 + * This also frees the ACL data. */
623 +void send_acl(statx *sxp, int f)
625 + SMB_ACL_TYPE_T type;
626 + rsync_acl *racl, *new_racl;
627 + item_list *racl_list;
630 + if (S_ISLNK(sxp->st.st_mode))
633 + type = SMB_ACL_TYPE_ACCESS;
634 + racl = sxp->acc_acl;
635 + racl_list = &access_acl_list;
638 + racl = new(rsync_acl);
640 + out_of_memory("send_acl");
641 + *racl = empty_rsync_acl;
642 + if (type == SMB_ACL_TYPE_ACCESS) {
643 + rsync_acl_fake_perms(racl, sxp->st.st_mode);
644 + sxp->acc_acl = racl;
646 + sxp->def_acl = racl;
649 + /* Avoid sending values that can be inferred from other data. */
650 + if (type == SMB_ACL_TYPE_ACCESS)
651 + rsync_acl_strip_perms(racl);
652 + if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
653 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
656 + new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1000);
657 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
658 + send_rsync_acl(f, racl);
660 + *racl = empty_rsync_acl;
662 + racl = sxp->def_acl;
663 + racl_list = &default_acl_list;
664 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
669 +/* === Receive functions === */
671 +static void receive_rsync_acl(rsync_acl *racl, int f, SMB_ACL_TYPE_T type)
673 + static item_list temp_ida_list = EMPTY_ITEM_LIST;
674 + SMB_ACL_TAG_T tag_type = 0, prior_list_type = 0;
675 + uchar computed_mask_bits = 0;
679 + if (!(count = read_int(f)))
683 + char tag = read_byte(f);
684 + uchar access = read_byte(f);
685 + if (access & ~ (4 | 2 | 1)) {
686 + rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
688 + exit_cleanup(RERR_STREAMIO);
692 + if (racl->user_obj != NO_ENTRY) {
693 + rprintf(FERROR, "receive_rsync_acl: error: duplicate USER_OBJ entry\n");
694 + exit_cleanup(RERR_STREAMIO);
696 + racl->user_obj = access;
699 + tag_type = SMB_ACL_USER;
702 + if (racl->group_obj != NO_ENTRY) {
703 + rprintf(FERROR, "receive_rsync_acl: error: duplicate GROUP_OBJ entry\n");
704 + exit_cleanup(RERR_STREAMIO);
706 + racl->group_obj = access;
709 + tag_type = SMB_ACL_GROUP;
712 + if (racl->mask != NO_ENTRY) {
713 + rprintf(FERROR, "receive_rsync_acl: error: duplicate MASK entry\n");
714 + exit_cleanup(RERR_STREAMIO);
716 + racl->mask = access;
719 + if (racl->other != NO_ENTRY) {
720 + rprintf(FERROR, "receive_rsync_acl: error: duplicate OTHER entry\n");
721 + exit_cleanup(RERR_STREAMIO);
723 + racl->other = access;
726 + rprintf(FERROR, "receive_rsync_acl: unknown tag %c\n",
728 + exit_cleanup(RERR_STREAMIO);
730 + if (tag_type != prior_list_type) {
731 + if (prior_list_type)
732 + save_idas(&temp_ida_list, racl, prior_list_type);
733 + prior_list_type = tag_type;
735 + ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
736 + ida->access = access;
737 + ida->id = read_int(f);
738 + computed_mask_bits |= access;
740 + if (prior_list_type)
741 + save_idas(&temp_ida_list, racl, prior_list_type);
743 + if (type == SMB_ACL_TYPE_DEFAULT) {
744 + /* Ensure that these are never unset. */
745 + if (racl->user_obj == NO_ENTRY)
746 + racl->user_obj = 7;
747 + if (racl->group_obj == NO_ENTRY)
748 + racl->group_obj = 0;
749 + if (racl->other == NO_ENTRY)
753 + if (!racl->users.count && !racl->groups.count) {
754 + /* If we received a superfluous mask, throw it away. */
755 + if (racl->mask != NO_ENTRY) {
756 + /* Mask off the group perms with it first. */
757 + racl->group_obj &= racl->mask | NO_ENTRY;
758 + racl->mask = NO_ENTRY;
760 + } else if (racl->mask == NO_ENTRY) /* Must be non-empty with lists. */
761 + racl->mask = computed_mask_bits | (racl->group_obj & 7);
764 +/* Receive the ACL info the sender has included for this file-list entry. */
765 +void receive_acl(struct file_struct *file, int f)
767 + SMB_ACL_TYPE_T type;
768 + item_list *racl_list;
770 + if (S_ISLNK(file->mode))
773 + type = SMB_ACL_TYPE_ACCESS;
774 + racl_list = &access_acl_list;
776 + char tag = read_byte(f);
779 + if (tag == 'A' || tag == 'a') {
780 + if (type != SMB_ACL_TYPE_ACCESS) {
781 + rprintf(FERROR, "receive_acl %s: duplicate access ACL\n",
782 + f_name(file, NULL));
783 + exit_cleanup(RERR_STREAMIO);
785 + } else if (tag == 'D' || tag == 'd') {
786 + if (type == SMB_ACL_TYPE_ACCESS) {
787 + rprintf(FERROR, "receive_acl %s: expecting access ACL; got default\n",
788 + f_name(file, NULL));
789 + exit_cleanup(RERR_STREAMIO);
792 + rprintf(FERROR, "receive_acl %s: unknown ACL type tag: %c\n",
793 + f_name(file, NULL), tag);
794 + exit_cleanup(RERR_STREAMIO);
796 + if (tag == 'A' || tag == 'D') {
798 + ndx = racl_list->count;
799 + duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
800 + duo_item->racl = empty_rsync_acl;
801 + receive_rsync_acl(&duo_item->racl, f, type);
802 + duo_item->sacl = NULL;
805 + if (ndx < 0 || (size_t)ndx >= racl_list->count) {
806 + rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
807 + f_name(file, NULL), str_acl_type(type), ndx);
808 + exit_cleanup(RERR_STREAMIO);
811 + if (type == SMB_ACL_TYPE_ACCESS)
814 + F_DEF_ACL(file) = ndx;
815 + racl_list = &default_acl_list;
816 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
819 +/* Turn the ACL data in statx into cached ACL data, setting the index
820 + * values in the file struct. */
821 +void cache_acl(struct file_struct *file, statx *sxp)
823 + SMB_ACL_TYPE_T type;
825 + item_list *racl_list;
828 + if (S_ISLNK(file->mode))
831 + type = SMB_ACL_TYPE_ACCESS;
832 + racl = sxp->acc_acl;
833 + racl_list = &access_acl_list;
837 + else if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) == -1) {
839 + ndx = racl_list->count;
840 + new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
841 + new_duo->racl = *racl;
842 + new_duo->sacl = NULL;
843 + *racl = empty_rsync_acl;
845 + if (type == SMB_ACL_TYPE_ACCESS)
848 + F_DEF_ACL(file) = ndx;
849 + racl = sxp->def_acl;
850 + racl_list = &default_acl_list;
851 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
856 +static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode, mode_t mode)
858 + SMB_ACL_ENTRY_T entry;
859 + const char *errfun;
862 + if (S_ISDIR(mode)) {
863 + /* If the sticky bit is going on, it's not safe to allow all
864 + * the new ACL to go into effect before it gets set. */
865 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
866 + if (mode & S_ISVTX)
869 + if (mode & S_ISVTX && !(old_mode & S_ISVTX))
872 + /* If setuid or setgid is going off, it's not safe to allow all
873 + * the new ACL to go into effect before they get cleared. */
874 + if ((old_mode & S_ISUID && !(mode & S_ISUID))
875 + || (old_mode & S_ISGID && !(mode & S_ISGID)))
880 + errfun = "sys_acl_get_entry";
881 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
883 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
884 + SMB_ACL_TAG_T tag_type;
885 + if ((rc = sys_acl_get_tag_type(entry, &tag_type))) {
886 + errfun = "sys_acl_get_tag_type";
889 + switch (tag_type) {
890 + case SMB_ACL_USER_OBJ:
891 + COE2( store_access_in_entry,((mode >> 6) & 7, entry) );
893 + case SMB_ACL_GROUP_OBJ:
894 + /* group is only empty when identical to group perms. */
895 + if (racl->group_obj != NO_ENTRY)
897 + COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
900 +#ifndef ACLS_NEED_MASK
901 + /* mask is only empty when we don't need it. */
902 + if (racl->mask == NO_ENTRY)
905 + COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
907 + case SMB_ACL_OTHER:
908 + COE2( store_access_in_entry,(mode & 7, entry) );
915 + rsyserr(FERROR, errno, "change_sacl_perms: %s()",
921 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
922 + /* Ensure that chmod() will be called to restore any lost setid bits. */
923 + if (old_mode & (S_ISUID | S_ISGID | S_ISVTX)
924 + && BITS_EQUAL(old_mode, mode, CHMOD_BITS))
925 + old_mode &= ~(S_ISUID | S_ISGID | S_ISVTX);
928 + /* Return the mode of the file on disk, as we will set them. */
929 + return (old_mode & ~ACCESSPERMS) | (mode & ACCESSPERMS);
932 +/* Set ACL on indicated filename.
934 + * This sets extended access ACL entries and default ACL. If convenient,
935 + * it sets permission bits along with the access ACL and signals having
936 + * done so by modifying sxp->st.st_mode.
938 + * Returns 1 for unchanged, 0 for changed, -1 for failed. Call this
939 + * with fname set to NULL to just check if the ACL is unchanged. */
940 +int set_acl(const char *fname, const struct file_struct *file, statx *sxp)
943 + SMB_ACL_TYPE_T type;
945 + if (!dry_run && (read_only || list_only)) {
950 + if (S_ISLNK(file->mode))
953 + type = SMB_ACL_TYPE_ACCESS;
959 + if (type == SMB_ACL_TYPE_ACCESS) {
961 + if (ndx < 0 || (size_t)ndx >= access_acl_list.count)
963 + duo_item = access_acl_list.items;
966 + && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
968 + ndx = F_DEF_ACL(file);
969 + if (ndx < 0 || (size_t)ndx >= default_acl_list.count)
971 + duo_item = default_acl_list.items;
974 + && rsync_acl_equal(sxp->def_acl, &duo_item->racl);
978 + if (!dry_run && fname) {
979 + if (type == SMB_ACL_TYPE_DEFAULT
980 + && duo_item->racl.user_obj == NO_ENTRY) {
981 + if (sys_acl_delete_def_file(fname) < 0) {
982 + rsyserr(FERROR, errno, "set_acl: sys_acl_delete_def_file(%s)",
988 + mode_t cur_mode = sxp->st.st_mode;
989 + if (!duo_item->sacl
990 + && !pack_smb_acl(&duo_item->sacl, &duo_item->racl)) {
994 + if (type == SMB_ACL_TYPE_ACCESS) {
995 + cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl,
996 + cur_mode, file->mode);
997 + if (cur_mode == (mode_t)~0)
1000 + if (sys_acl_set_file(fname, type, duo_item->sacl) < 0) {
1001 + rsyserr(FERROR, errno, "set_acl: sys_acl_set_file(%s, %s)",
1002 + fname, str_acl_type(type));
1006 + if (type == SMB_ACL_TYPE_ACCESS)
1007 + sxp->st.st_mode = cur_mode;
1010 + if (unchanged == 1)
1012 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
1017 +/* === Enumeration functions for uid mapping === */
1019 +/* Context -- one and only one. Should be cycled through once on uid
1020 + * mapping and once on gid mapping. */
1021 +static item_list *_enum_racl_lists[] = {
1022 + &access_acl_list, &default_acl_list, NULL
1025 +static item_list **enum_racl_list = &_enum_racl_lists[0];
1026 +static int enum_ida_index = 0;
1027 +static size_t enum_racl_index = 0;
1029 +/* This returns the next tag_type id from the given ACL for the next entry,
1030 + * or it returns 0 if there are no more tag_type ids in the acl. */
1031 +static id_t *next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
1033 + const ida_entries *idal = tag_type == SMB_ACL_USER ? &racl->users : &racl->groups;
1034 + if (enum_ida_index < idal->count) {
1035 + id_access *ida = &idal->idas[enum_ida_index++];
1038 + enum_ida_index = 0;
1042 +static id_t *next_acl_id(SMB_ACL_TAG_T tag_type, const item_list *racl_list)
1044 + for (; enum_racl_index < racl_list->count; enum_racl_index++) {
1046 + acl_duo *duo_item = racl_list->items;
1047 + duo_item += enum_racl_index;
1048 + if ((id = next_ace_id(tag_type, &duo_item->racl)) != NULL)
1051 + enum_racl_index = 0;
1055 +static id_t *next_acl_list_id(SMB_ACL_TAG_T tag_type)
1057 + for (; *enum_racl_list; enum_racl_list++) {
1058 + id_t *id = next_acl_id(tag_type, *enum_racl_list);
1062 + enum_racl_list = &_enum_racl_lists[0];
1066 +id_t *next_acl_uid()
1068 + return next_acl_list_id(SMB_ACL_USER);
1071 +id_t *next_acl_gid()
1073 + return next_acl_list_id(SMB_ACL_GROUP);
1076 +/* This is used by dest_mode(). */
1077 +int default_perms_for_dir(const char *dir)
1086 + perms = ACCESSPERMS & ~orig_umask;
1087 + /* Read the directory's default ACL. If it has none, this will successfully return an empty ACL. */
1088 + sacl = sys_acl_get_file(dir, SMB_ACL_TYPE_DEFAULT);
1089 + if (sacl == NULL) {
1090 + /* Couldn't get an ACL. Darn. */
1094 + /* No ACLs are available. */
1098 + /* We're doing a dry run, so the containing directory
1099 + * wasn't actually created. Don't worry about it. */
1102 + /* Otherwise fall through. */
1104 + rprintf(FERROR, "default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
1105 + dir, str_acl_type(SMB_ACL_TYPE_DEFAULT), strerror(errno));
1111 + racl = empty_rsync_acl;
1112 + ok = unpack_smb_acl(&racl, sacl);
1113 + sys_acl_free_acl(sacl);
1115 + rprintf(FERROR, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
1119 + /* Apply the permission-bit entries of the default ACL, if any. */
1120 + if (racl.user_obj != NO_ENTRY) {
1121 + perms = rsync_acl_get_perms(&racl);
1123 + rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
1126 + rsync_acl_free(&racl);
1130 +#endif /* SUPPORT_ACLS */
1137 +extern int preserve_acls;
1138 extern int preserve_devices;
1139 extern int preserve_specials;
1140 extern int preserve_links;
1141 @@ -93,7 +94,8 @@ path
1142 ****************************************************************************/
1143 static int make_bak_dir(char *fullpath)
1147 + struct file_struct *file;
1148 char *rel = fullpath + backup_dir_len;
1149 char *end = rel + strlen(rel);
1151 @@ -125,15 +127,24 @@ static int make_bak_dir(char *fullpath)
1153 /* Try to transfer the directory settings of the
1154 * actual dir that the files are coming from. */
1155 - if (do_stat(rel, &st) < 0) {
1156 + if (do_stat(rel, &sx.st) < 0) {
1157 rsyserr(FERROR, errno,
1158 "make_bak_dir stat %s failed",
1161 - do_lchown(fullpath, st.st_uid, st.st_gid);
1163 - do_chmod(fullpath, st.st_mode);
1164 +#ifdef SUPPORT_ACLS
1165 + sx.acc_acl = sx.def_acl = NULL;
1167 + if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
1169 +#ifdef SUPPORT_ACLS
1170 + if (preserve_acls) {
1171 + get_acl(rel, &sx);
1172 + cache_acl(file, &sx);
1175 + set_file_attrs(fullpath, file, NULL, 0);
1180 @@ -171,15 +182,18 @@ static int robust_move(const char *src,
1181 * We will move the file to be deleted into a parallel directory tree. */
1182 static int keep_backup(const char *fname)
1186 struct file_struct *file;
1191 /* return if no file to keep */
1192 - if (do_lstat(fname, &st) < 0)
1193 + if (do_lstat(fname, &sx.st) < 0)
1195 +#ifdef SUPPORT_ACLS
1196 + sx.acc_acl = sx.def_acl = NULL;
1199 if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
1200 return 1; /* the file could have disappeared */
1201 @@ -189,6 +203,13 @@ static int keep_backup(const char *fname
1205 +#ifdef SUPPORT_ACLS
1206 + if (preserve_acls) {
1207 + get_acl(fname, &sx);
1208 + cache_acl(file, &sx);
1212 /* Check to see if this is a device file, or link */
1213 if ((am_root && preserve_devices && IS_DEVICE(file->mode))
1214 || (preserve_specials && IS_SPECIAL(file->mode))) {
1215 @@ -260,7 +281,7 @@ static int keep_backup(const char *fname
1216 if (robust_move(fname, buf) != 0) {
1217 rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
1218 full_fname(fname), buf);
1219 - } else if (st.st_nlink > 1) {
1220 + } else if (sx.st.st_nlink > 1) {
1221 /* If someone has hard-linked the file into the backup
1222 * dir, rename() might return success but do nothing! */
1223 robust_unlink(fname); /* Just in case... */
1224 --- old/configure.in
1225 +++ new/configure.in
1226 @@ -537,6 +537,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1227 AC_CHECK_LIB(resolv, strcasecmp)
1230 +AC_CHECK_FUNCS(aclsort)
1231 +if test x"$ac_cv_func_aclsort" = x"no"; then
1232 + AC_CHECK_LIB(sec, aclsort)
1235 dnl At the moment we don't test for a broken memcmp(), because all we
1236 dnl need to do is test for equality, not comparison, and it seems that
1237 dnl every platform has a memcmp that can do at least that.
1238 @@ -801,6 +806,78 @@ AC_SUBST(OBJ_RESTORE)
1239 AC_SUBST(CC_SHOBJ_FLAG)
1240 AC_SUBST(BUILD_POPT)
1242 +AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
1243 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1244 +#################################################
1245 +# check for ACL support
1247 +AC_MSG_CHECKING(whether to support ACLs)
1248 +AC_ARG_ENABLE(acl-support,
1249 +AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
1250 +[ case "$enableval" in
1253 + case "$host_os" in
1255 + AC_MSG_RESULT(Using UnixWare ACLs)
1256 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1258 + *solaris*|*cygwin*)
1259 + AC_MSG_RESULT(Using solaris ACLs)
1260 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1263 + AC_MSG_RESULT(Using HPUX ACLs)
1264 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1267 + AC_MSG_RESULT(Using IRIX ACLs)
1268 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1271 + AC_MSG_RESULT(Using AIX ACLs)
1272 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1275 + AC_MSG_RESULT(Using Tru64 ACLs)
1276 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1277 + LIBS="$LIBS -lpacl"
1280 + AC_MSG_RESULT(ACLs requested -- running tests)
1281 + AC_CHECK_LIB(acl,acl_get_file)
1282 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1283 + AC_TRY_LINK([#include <sys/types.h>
1284 +#include <sys/acl.h>],
1285 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1286 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1287 + AC_MSG_CHECKING(ACL test results)
1288 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1289 + AC_MSG_RESULT(Using posix ACLs)
1290 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1291 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1292 + AC_TRY_LINK([#include <sys/types.h>
1293 +#include <sys/acl.h>],
1294 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1295 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1296 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1297 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1300 + AC_MSG_ERROR(Failed to find ACL support)
1307 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1310 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1314 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1319 @@ -40,6 +40,7 @@ extern int filesfrom_fd;
1320 extern int one_file_system;
1321 extern int copy_dirlinks;
1322 extern int keep_dirlinks;
1323 +extern int preserve_acls;
1324 extern int preserve_links;
1325 extern int preserve_hard_links;
1326 extern int preserve_devices;
1327 @@ -147,6 +148,8 @@ static void list_file_entry(struct file_
1328 permstring(permbuf, f->mode);
1331 + /* TODO: indicate '+' if the entry has an ACL. */
1333 #ifdef SUPPORT_LINKS
1334 if (preserve_links && S_ISLNK(f->mode)) {
1335 rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
1336 @@ -624,6 +627,12 @@ static struct file_struct *recv_file_ent
1340 +#ifdef SUPPORT_ACLS
1341 + /* We need one or two index int32s when we're preserving ACLs. */
1342 + if (preserve_acls)
1343 + extra_len += (S_ISDIR(mode) ? 2 : 1) * sizeof (union flist_extras);
1346 if (always_checksum && S_ISREG(mode))
1347 extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
1349 @@ -736,6 +745,11 @@ static struct file_struct *recv_file_ent
1350 read_buf(f, bp, checksum_len);
1353 +#ifdef SUPPORT_ACLS
1354 + if (preserve_acls)
1355 + receive_acl(file, f);
1361 @@ -996,6 +1010,9 @@ static struct file_struct *send_file_nam
1362 unsigned short flags)
1364 struct file_struct *file;
1365 +#ifdef SUPPORT_ACLS
1369 file = make_file(fname, flist, stp, flags,
1370 f == -2 ? SERVER_FILTERS : ALL_FILTERS);
1371 @@ -1005,11 +1022,24 @@ static struct file_struct *send_file_nam
1372 if (chmod_modes && !S_ISLNK(file->mode))
1373 file->mode = tweak_mode(file->mode, chmod_modes);
1375 +#ifdef SUPPORT_ACLS
1376 + if (preserve_acls && f >= 0) {
1377 + sx.st.st_mode = file->mode;
1378 + sx.acc_acl = sx.def_acl = NULL;
1379 + if (get_acl(fname, &sx) < 0)
1384 maybe_emit_filelist_progress(flist->count + flist_count_offset);
1386 flist_expand(flist);
1387 flist->files[flist->count++] = file;
1388 send_file_entry(file, f);
1389 +#ifdef SUPPORT_ACLS
1390 + if (preserve_acls && f >= 0)
1398 @@ -35,6 +35,7 @@ extern int do_progress;
1399 extern int relative_paths;
1400 extern int implied_dirs;
1401 extern int keep_dirlinks;
1402 +extern int preserve_acls;
1403 extern int preserve_links;
1404 extern int preserve_devices;
1405 extern int preserve_specials;
1406 @@ -87,6 +88,7 @@ extern int force_delete;
1407 extern int one_file_system;
1408 extern struct stats stats;
1409 extern dev_t filesystem_dev;
1410 +extern mode_t orig_umask;
1411 extern char *backup_dir;
1412 extern char *backup_suffix;
1413 extern int backup_suffix_len;
1414 @@ -518,21 +520,26 @@ static void do_delete_pass(struct file_l
1415 rprintf(FINFO, " \r");
1418 -int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
1419 +int unchanged_attrs(struct file_struct *file, statx *sxp)
1421 - if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1422 + if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1425 - if (am_root && preserve_uid && st->st_uid != F_UID(file))
1426 + if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
1429 - if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
1430 + if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
1433 +#ifdef SUPPORT_ACLS
1434 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1441 -void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
1442 +void itemize(struct file_struct *file, int ndx, int statret, statx *sxp,
1443 int32 iflags, uchar fnamecmp_type, const char *xname)
1445 if (statret >= 0) { /* A from-dest-dir statret can == 1! */
1446 @@ -540,20 +547,24 @@ void itemize(struct file_struct *file, i
1447 : S_ISDIR(file->mode) ? !omit_dir_times
1448 : !S_ISLNK(file->mode);
1450 - if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
1451 + if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
1452 iflags |= ITEM_REPORT_SIZE;
1453 if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
1454 && !(iflags & ITEM_MATCHED)
1455 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
1456 - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
1457 + || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
1458 iflags |= ITEM_REPORT_TIME;
1459 - if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1460 + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1461 iflags |= ITEM_REPORT_PERMS;
1462 - if (preserve_uid && am_root && F_UID(file) != st->st_uid)
1463 + if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
1464 iflags |= ITEM_REPORT_OWNER;
1465 if (preserve_gid && F_GID(file) != GID_NONE
1466 - && st->st_gid != F_GID(file))
1467 + && sxp->st.st_gid != F_GID(file))
1468 iflags |= ITEM_REPORT_GROUP;
1469 +#ifdef SUPPORT_ACLS
1470 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1471 + iflags |= ITEM_REPORT_ACL;
1474 iflags |= ITEM_IS_NEW;
1476 @@ -808,7 +819,7 @@ void check_for_finished_hlinks(int itemi
1477 * handling the file, -1 if no dest-linking occurred, or a non-negative
1478 * value if we found an alternate basis file. */
1479 static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
1480 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1481 + char *cmpbuf, statx *sxp, int itemizing,
1484 int best_match = -1;
1485 @@ -817,7 +828,7 @@ static int try_dests_reg(struct file_str
1488 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1489 - if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
1490 + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
1492 switch (match_level) {
1494 @@ -825,16 +836,20 @@ static int try_dests_reg(struct file_str
1498 - if (!unchanged_file(cmpbuf, file, stp))
1499 + if (!unchanged_file(cmpbuf, file, &sxp->st))
1505 - if (!unchanged_attrs(file, stp))
1506 +#ifdef SUPPORT_ACLS
1507 + if (preserve_acls)
1508 + get_acl(cmpbuf, sxp);
1510 + if (!unchanged_attrs(file, sxp))
1512 if (always_checksum && preserve_times
1513 - && cmp_time(stp->st_mtime, file->modtime))
1514 + && cmp_time(sxp->st.st_mtime, file->modtime))
1518 @@ -849,7 +864,7 @@ static int try_dests_reg(struct file_str
1519 if (j != best_match) {
1521 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1522 - if (link_stat(cmpbuf, stp, 0) < 0)
1523 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1527 @@ -859,16 +874,25 @@ static int try_dests_reg(struct file_str
1528 if (!hard_link_one(file, fname, cmpbuf, 1))
1530 if (preserve_hard_links && F_IS_HLINKED(file))
1531 - finish_hard_link(file, fname, stp, itemizing, code, j);
1532 + finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
1533 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
1534 - itemize(file, ndx, 1, stp,
1535 +#ifdef SUPPORT_ACLS
1536 + if (preserve_acls && !ACL_READY(*sxp))
1537 + get_acl(fname, sxp);
1539 + itemize(file, ndx, 1, sxp,
1540 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
1546 - itemize(file, ndx, 0, stp, 0, 0, NULL);
1548 +#ifdef SUPPORT_ACLS
1549 + if (preserve_acls && !ACL_READY(*sxp))
1550 + get_acl(fname, sxp);
1552 + itemize(file, ndx, 0, sxp, 0, 0, NULL);
1554 if (verbose > 1 && maybe_ATTRS_REPORT)
1555 rprintf(FCLIENT, "%s is uptodate\n", fname);
1557 @@ -885,8 +909,13 @@ static int try_dests_reg(struct file_str
1562 - itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
1564 +#ifdef SUPPORT_ACLS
1565 + if (preserve_acls && !ACL_READY(*sxp))
1566 + get_acl(fname, sxp);
1568 + itemize(file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
1570 set_file_attrs(fname, file, NULL, 0);
1571 if (maybe_ATTRS_REPORT
1572 && ((!itemizing && verbose && match_level == 2)
1573 @@ -897,7 +926,7 @@ static int try_dests_reg(struct file_str
1575 #ifdef SUPPORT_HARD_LINKS
1576 if (preserve_hard_links && F_IS_HLINKED(file))
1577 - finish_hard_link(file, fname, stp, itemizing, code, -1);
1578 + finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
1582 @@ -909,7 +938,7 @@ static int try_dests_reg(struct file_str
1583 * handling the file, or -1 if no dest-linking occurred, or a non-negative
1584 * value if we found an alternate basis file. */
1585 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
1586 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1587 + char *cmpbuf, statx *sxp, int itemizing,
1590 char lnk[MAXPATHLEN];
1591 @@ -942,24 +971,24 @@ static int try_dests_non(struct file_str
1594 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1595 - if (link_stat(cmpbuf, stp, 0) < 0)
1596 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1600 - if (!S_ISDIR(stp->st_mode))
1601 + if (!S_ISDIR(sxp->st.st_mode))
1605 - if (!IS_SPECIAL(stp->st_mode))
1606 + if (!IS_SPECIAL(sxp->st.st_mode))
1610 - if (!IS_DEVICE(stp->st_mode))
1611 + if (!IS_DEVICE(sxp->st.st_mode))
1614 #ifdef SUPPORT_LINKS
1616 - if (!S_ISLNK(stp->st_mode))
1617 + if (!S_ISLNK(sxp->st.st_mode))
1621 @@ -974,7 +1003,7 @@ static int try_dests_non(struct file_str
1624 devp = F_RDEV_P(file);
1625 - if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1626 + if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1629 #ifdef SUPPORT_LINKS
1630 @@ -991,7 +1020,11 @@ static int try_dests_non(struct file_str
1634 - if (unchanged_attrs(file, stp)) {
1635 +#ifdef SUPPORT_ACLS
1636 + if (preserve_acls)
1637 + get_acl(cmpbuf, sxp);
1639 + if (unchanged_attrs(file, sxp)) {
1643 @@ -1004,7 +1037,7 @@ static int try_dests_non(struct file_str
1644 if (j != best_match) {
1646 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1647 - if (link_stat(cmpbuf, stp, 0) < 0)
1648 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1652 @@ -1035,7 +1068,15 @@ static int try_dests_non(struct file_str
1654 + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
1655 char *lp = match_level == 3 ? "" : NULL;
1656 - itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
1657 +#ifdef SUPPORT_ACLS
1658 + if (preserve_acls)
1659 + get_acl(fname, sxp);
1661 + itemize(file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
1662 +#ifdef SUPPORT_ACLS
1663 + if (preserve_acls)
1667 if (verbose > 1 && maybe_ATTRS_REPORT) {
1668 rprintf(FCLIENT, "%s%s is uptodate\n",
1669 @@ -1048,6 +1089,7 @@ static int try_dests_non(struct file_str
1672 static int phase = 0;
1673 +static int dflt_perms;
1675 /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
1676 * make sure it exists, and has the right permissions/timestamp info. For
1677 @@ -1068,7 +1110,8 @@ static void recv_generator(char *fname,
1678 static int need_fuzzy_dirlist = 0;
1679 struct file_struct *fuzzy_file = NULL;
1680 int fd = -1, f_copy = -1;
1681 - STRUCT_STAT st, real_st, partial_st;
1682 + statx sx, real_sx;
1683 + STRUCT_STAT partial_st;
1684 struct file_struct *back_file = NULL;
1685 int statret, real_ret, stat_errno;
1686 char *fnamecmp, *partialptr, *backupptr = NULL;
1687 @@ -1124,6 +1167,9 @@ static void recv_generator(char *fname,
1688 } else if (!dry_run)
1691 +#ifdef SUPPORT_ACLS
1692 + sx.acc_acl = sx.def_acl = NULL;
1696 stat_errno = ENOENT;
1697 @@ -1131,7 +1177,7 @@ static void recv_generator(char *fname,
1698 const char *dn = file->dirname ? file->dirname : ".";
1699 if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
1700 if (relative_paths && !implied_dirs
1701 - && do_stat(dn, &st) < 0
1702 + && do_stat(dn, &sx.st) < 0
1703 && create_directory_path(fname) < 0) {
1704 rsyserr(FERROR, errno,
1705 "recv_generator: mkdir %s failed",
1706 @@ -1143,6 +1189,10 @@ static void recv_generator(char *fname,
1709 need_fuzzy_dirlist = 1;
1710 +#ifdef SUPPORT_ACLS
1711 + if (!preserve_perms)
1712 + dflt_perms = default_perms_for_dir(dn);
1715 parent_dirname = dn;
1717 @@ -1152,7 +1202,7 @@ static void recv_generator(char *fname,
1718 need_fuzzy_dirlist = 0;
1721 - statret = link_stat(fname, &st,
1722 + statret = link_stat(fname, &sx.st,
1723 keep_dirlinks && S_ISDIR(file->mode));
1726 @@ -1170,8 +1220,9 @@ static void recv_generator(char *fname,
1727 * mode based on the local permissions and some heuristics. */
1728 if (!preserve_perms) {
1729 int exists = statret == 0
1730 - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
1731 - file->mode = dest_mode(file->mode, st.st_mode, exists);
1732 + && S_ISDIR(sx.st.st_mode) == S_ISDIR(file->mode);
1733 + file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
1737 if (S_ISDIR(file->mode)) {
1738 @@ -1180,8 +1231,8 @@ static void recv_generator(char *fname,
1739 * file of that name and it is *not* a directory, then
1740 * we need to delete it. If it doesn't exist, then
1741 * (perhaps recursively) create it. */
1742 - if (statret == 0 && !S_ISDIR(st.st_mode)) {
1743 - if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
1744 + if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
1745 + if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
1749 @@ -1190,14 +1241,14 @@ static void recv_generator(char *fname,
1756 if (*fname == '.' && fname[1] == '\0')
1760 if (statret != 0 && basis_dir[0] != NULL) {
1761 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1762 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1766 @@ -1206,7 +1257,11 @@ static void recv_generator(char *fname,
1769 if (itemizing && f_out != -1) {
1770 - itemize(file, ndx, statret, &st,
1771 +#ifdef SUPPORT_ACLS
1772 + if (preserve_acls && statret == 0)
1773 + get_acl(fname, &sx);
1775 + itemize(file, ndx, statret, &sx,
1776 statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
1778 if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
1779 @@ -1226,21 +1281,21 @@ static void recv_generator(char *fname,
1783 - if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
1784 + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, 0)
1785 && verbose && code != FNONE && f_out != -1)
1786 rprintf(code, "%s/\n", fname);
1787 if (real_ret != 0 && one_file_system)
1788 - real_st.st_dev = filesystem_dev;
1789 + real_sx.st.st_dev = filesystem_dev;
1790 if (delete_during && f_out != -1 && !phase && dry_run < 2
1791 && (file->flags & FLAG_XFER_DIR))
1792 - delete_in_dir(the_file_list, fname, file, &real_st);
1794 + delete_in_dir(the_file_list, fname, file, &real_sx.st);
1798 #ifdef SUPPORT_HARD_LINKS
1799 if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
1800 - && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
1802 + && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
1806 if (preserve_links && S_ISLNK(file->mode)) {
1807 @@ -1260,17 +1315,17 @@ static void recv_generator(char *fname,
1808 char lnk[MAXPATHLEN];
1811 - if (!S_ISLNK(st.st_mode))
1812 + if (!S_ISLNK(sx.st.st_mode))
1814 else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
1815 && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
1816 /* The link is pointing to the right place. */
1818 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1819 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1820 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1821 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1822 #ifdef SUPPORT_HARD_LINKS
1823 if (preserve_hard_links && F_IS_HLINKED(file))
1824 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1825 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1827 if (remove_source_files == 1)
1828 goto return_with_success;
1829 @@ -1278,10 +1333,10 @@ static void recv_generator(char *fname,
1831 /* Not the right symlink (or not a symlink), so
1833 - if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
1834 + if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
1836 } else if (basis_dir[0] != NULL) {
1837 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1838 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1841 #ifndef CAN_HARDLINK_SYMLINK
1842 @@ -1306,7 +1361,7 @@ static void recv_generator(char *fname,
1844 set_file_attrs(fname, file, NULL, 0);
1846 - itemize(file, ndx, statret, &st,
1847 + itemize(file, ndx, statret, &sx,
1848 ITEM_LOCAL_CHANGE, 0, NULL);
1850 if (code != FNONE && verbose)
1851 @@ -1332,33 +1387,38 @@ static void recv_generator(char *fname,
1854 if (IS_DEVICE(file->mode)) {
1855 - if (!IS_DEVICE(st.st_mode))
1856 + if (!IS_DEVICE(sx.st.st_mode))
1860 - if (!IS_SPECIAL(st.st_mode))
1861 + if (!IS_SPECIAL(sx.st.st_mode))
1866 - && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
1867 - && st.st_rdev == rdev) {
1868 + && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
1869 + && sx.st.st_rdev == rdev) {
1870 /* The device or special file is identical. */
1872 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1873 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1875 +#ifdef SUPPORT_ACLS
1876 + if (preserve_acls)
1877 + get_acl(fname, &sx);
1879 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1881 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1882 #ifdef SUPPORT_HARD_LINKS
1883 if (preserve_hard_links && F_IS_HLINKED(file))
1884 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1885 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1887 if (remove_source_files == 1)
1888 goto return_with_success;
1892 - if (delete_item(fname, st.st_mode, t, del_opts) != 0)
1893 + if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
1895 } else if (basis_dir[0] != NULL) {
1896 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1897 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1900 #ifndef CAN_HARDLINK_SPECIAL
1901 @@ -1388,7 +1448,11 @@ static void recv_generator(char *fname,
1903 set_file_attrs(fname, file, NULL, 0);
1905 - itemize(file, ndx, statret, &st,
1906 +#ifdef SUPPORT_ACLS
1907 + if (preserve_acls && statret == 0)
1908 + get_acl(fname, &sx);
1910 + itemize(file, ndx, statret, &sx,
1911 ITEM_LOCAL_CHANGE, 0, NULL);
1913 if (code != FNONE && verbose)
1914 @@ -1400,7 +1464,7 @@ static void recv_generator(char *fname,
1915 if (remove_source_files == 1)
1916 goto return_with_success;
1922 if (!S_ISREG(file->mode)) {
1923 @@ -1434,7 +1498,7 @@ static void recv_generator(char *fname,
1926 if (update_only && statret == 0
1927 - && cmp_time(st.st_mtime, file->modtime) > 0) {
1928 + && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
1930 rprintf(FINFO, "%s is newer\n", fname);
1932 @@ -1443,20 +1507,20 @@ static void recv_generator(char *fname,
1934 fnamecmp_type = FNAMECMP_FNAME;
1936 - if (statret == 0 && !S_ISREG(st.st_mode)) {
1937 - if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
1938 + if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
1939 + if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
1942 stat_errno = ENOENT;
1945 if (statret != 0 && basis_dir[0] != NULL) {
1946 - int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
1947 + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
1950 if (remove_source_files == 1)
1951 goto return_with_success;
1956 fnamecmp = fnamecmpbuf;
1957 @@ -1466,7 +1530,7 @@ static void recv_generator(char *fname,
1964 if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
1965 && link_stat(partialptr, &partial_st, 0) == 0
1966 @@ -1485,7 +1549,7 @@ static void recv_generator(char *fname,
1967 rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
1968 fname, fnamecmpbuf);
1970 - st.st_size = F_LENGTH(fuzzy_file);
1971 + sx.st.st_size = F_LENGTH(fuzzy_file);
1973 fnamecmp = fnamecmpbuf;
1974 fnamecmp_type = FNAMECMP_FUZZY;
1975 @@ -1504,36 +1568,41 @@ static void recv_generator(char *fname,
1979 - if (append_mode && st.st_size > F_LENGTH(file))
1980 + if (append_mode && sx.st.st_size > F_LENGTH(file))
1983 if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
1985 else if (fnamecmp_type == FNAMECMP_FUZZY)
1987 - else if (unchanged_file(fnamecmp, file, &st)) {
1988 + else if (unchanged_file(fnamecmp, file, &sx.st)) {
1990 do_unlink(partialptr);
1991 handle_partial_dir(partialptr, PDIR_DELETE);
1994 - itemize(file, ndx, statret, &st, 0, 0, NULL);
1995 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1997 +#ifdef SUPPORT_ACLS
1998 + if (preserve_acls && statret == 0)
1999 + get_acl(fnamecmp, &sx);
2001 + itemize(file, ndx, statret, &sx, 0, 0, NULL);
2003 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
2004 #ifdef SUPPORT_HARD_LINKS
2005 if (preserve_hard_links && F_IS_HLINKED(file))
2006 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2007 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2009 if (remove_source_files != 1)
2012 return_with_success:
2014 send_msg_int(MSG_SUCCESS, ndx);
2022 + sx.st = partial_st;
2023 fnamecmp = partialptr;
2024 fnamecmp_type = FNAMECMP_PARTIAL_DIR;
2026 @@ -1558,16 +1627,20 @@ static void recv_generator(char *fname,
2027 /* pretend the file didn't exist */
2028 #ifdef SUPPORT_HARD_LINKS
2029 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
2033 statret = real_ret = -1;
2034 +#ifdef SUPPORT_ACLS
2035 + if (preserve_acls && ACL_READY(sx))
2041 if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
2042 if (!(backupptr = get_backup_name(fname))) {
2047 if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
2049 @@ -1578,7 +1651,7 @@ static void recv_generator(char *fname,
2050 full_fname(backupptr));
2051 unmake_file(back_file);
2056 if ((f_copy = do_open(backupptr,
2057 O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
2058 @@ -1586,14 +1659,14 @@ static void recv_generator(char *fname,
2059 full_fname(backupptr));
2060 unmake_file(back_file);
2065 fnamecmp_type = FNAMECMP_BACKUP;
2069 rprintf(FINFO, "gen mapped %s of size %.0f\n",
2070 - fnamecmp, (double)st.st_size);
2071 + fnamecmp, (double)sx.st.st_size);
2075 @@ -1615,26 +1688,34 @@ static void recv_generator(char *fname,
2076 iflags |= ITEM_BASIS_TYPE_FOLLOWS;
2077 if (fnamecmp_type == FNAMECMP_FUZZY)
2078 iflags |= ITEM_XNAME_FOLLOWS;
2079 - itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
2080 +#ifdef SUPPORT_ACLS
2081 + if (preserve_acls && real_ret == 0)
2082 + get_acl(fnamecmp, &real_sx);
2084 + itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
2085 fuzzy_file ? F_BASENAME(fuzzy_file) : NULL);
2086 +#ifdef SUPPORT_ACLS
2087 + if (preserve_acls)
2088 + free_acl(&real_sx);
2093 #ifdef SUPPORT_HARD_LINKS
2094 if (preserve_hard_links && F_IS_HLINKED(file))
2095 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2096 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2105 if (statret != 0 || whole_file) {
2106 write_sum_head(f_out, NULL);
2111 - generate_and_send_sums(fd, st.st_size, f_out, f_copy);
2112 + generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy);
2116 @@ -1647,6 +1728,13 @@ static void recv_generator(char *fname,
2122 +#ifdef SUPPORT_ACLS
2123 + if (preserve_acls)
2129 void generate_files(int f_out, struct file_list *flist, char *local_name)
2130 @@ -1713,6 +1801,8 @@ void generate_files(int f_out, struct fi
2131 * notice that and let us know via the redo pipe (or its closing). */
2134 + dflt_perms = (ACCESSPERMS & ~orig_umask);
2136 for (i = 0; i < flist->count; i++) {
2137 struct file_struct *file = flist->files[i];
2141 @@ -27,6 +27,7 @@ extern int verbose;
2143 extern int do_xfers;
2144 extern int link_dest;
2145 +extern int preserve_acls;
2146 extern int make_backups;
2147 extern int remove_source_files;
2148 extern int stdout_format_has_i;
2149 @@ -119,15 +120,19 @@ void match_hard_links(void)
2152 static int maybe_hard_link(struct file_struct *file, int ndx,
2153 - const char *fname, int statret, STRUCT_STAT *stp,
2154 + const char *fname, int statret, statx *sxp,
2155 const char *oldname, STRUCT_STAT *old_stp,
2156 const char *realname, int itemizing, enum logcode code)
2159 - if (stp->st_dev == old_stp->st_dev
2160 - && stp->st_ino == old_stp->st_ino) {
2161 + if (sxp->st.st_dev == old_stp->st_dev
2162 + && sxp->st.st_ino == old_stp->st_ino) {
2164 - itemize(file, ndx, statret, stp,
2165 +#ifdef SUPPORT_ACLS
2166 + if (preserve_acls && !ACL_READY(*sxp))
2167 + get_acl(fname, sxp);
2169 + itemize(file, ndx, statret, sxp,
2170 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
2173 @@ -148,7 +153,11 @@ static int maybe_hard_link(struct file_s
2175 if (hard_link_one(file, fname, oldname, 0)) {
2177 - itemize(file, ndx, statret, stp,
2178 +#ifdef SUPPORT_ACLS
2179 + if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
2180 + get_acl(fname, sxp);
2182 + itemize(file, ndx, statret, sxp,
2183 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
2186 @@ -162,7 +171,7 @@ static int maybe_hard_link(struct file_s
2187 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
2188 * 0 = process the file, 1 = skip the file, -1 = error occurred. */
2189 int hard_link_check(struct file_struct *file, int ndx, const char *fname,
2190 - int statret, STRUCT_STAT *stp, int itemizing,
2191 + int statret, statx *sxp, int itemizing,
2194 STRUCT_STAT prev_st;
2195 @@ -213,18 +222,20 @@ int hard_link_check(struct file_struct *
2196 if (statret < 0 && basis_dir[0] != NULL) {
2197 /* If we match an alt-dest item, we don't output this as a change. */
2198 char cmpbuf[MAXPATHLEN];
2199 - STRUCT_STAT alt_st;
2202 +#ifdef SUPPORT_ACLS
2203 + alt_sx.acc_acl = alt_sx.def_acl = NULL;
2206 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
2207 - if (link_stat(cmpbuf, &alt_st, 0) < 0)
2208 + if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
2211 - if (prev_st.st_dev != alt_st.st_dev
2212 - || prev_st.st_ino != alt_st.st_ino)
2213 + if (prev_st.st_dev != alt_sx.st.st_dev
2214 + || prev_st.st_ino != alt_sx.st.st_ino)
2218 if (verbose < 2 || !stdout_format_has_i) {
2221 @@ -233,16 +244,36 @@ int hard_link_check(struct file_struct *
2225 - if (!unchanged_file(cmpbuf, file, &alt_st))
2226 + if (!unchanged_file(cmpbuf, file, &alt_sx.st))
2230 - if (unchanged_attrs(file, &alt_st))
2231 +#ifdef SUPPORT_ACLS
2232 + if (preserve_acls)
2233 + get_acl(cmpbuf, &alt_sx);
2235 + if (unchanged_attrs(file, &alt_sx))
2237 } while (basis_dir[++j] != NULL);
2238 + if (statret == 1) {
2239 + sxp->st = alt_sx.st;
2240 +#ifdef SUPPORT_ACLS
2241 + if (preserve_acls) {
2242 + if (!ACL_READY(*sxp))
2243 + get_acl(cmpbuf, sxp);
2245 + sxp->acc_acl = alt_sx.acc_acl;
2246 + sxp->def_acl = alt_sx.def_acl;
2251 +#ifdef SUPPORT_ACLS
2252 + else if (preserve_acls)
2253 + free_acl(&alt_sx);
2257 - if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
2258 + if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
2259 realname, itemizing, code) < 0)
2262 @@ -277,7 +308,8 @@ void finish_hard_link(struct file_struct
2263 STRUCT_STAT *stp, int itemizing, enum logcode code,
2266 - STRUCT_STAT st, prev_st;
2269 char alt_name[MAXPATHLEN], *prev_name;
2270 const char *our_name;
2271 int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
2272 @@ -301,14 +333,24 @@ void finish_hard_link(struct file_struct
2276 +#ifdef SUPPORT_ACLS
2277 + prev_sx.acc_acl = prev_sx.def_acl = NULL;
2280 while ((ndx = prev_ndx) >= 0) {
2283 file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
2284 prev_ndx = F_HL_PREV(file);
2285 prev_name = f_name(file, NULL);
2286 - prev_statret = link_stat(prev_name, &prev_st, 0);
2287 - if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
2288 - our_name, stp, fname, itemizing, code) < 0)
2289 + prev_statret = link_stat(prev_name, &prev_sx.st, 0);
2290 + val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
2291 + our_name, stp, fname, itemizing, code);
2292 +#ifdef SUPPORT_ACLS
2293 + if (preserve_acls)
2294 + free_acl(&prev_sx);
2298 if (remove_source_files == 1 && do_xfers)
2299 send_msg_int(MSG_SUCCESS, ndx);
2300 --- old/lib/sysacls.c
2301 +++ new/lib/sysacls.c
2304 + Unix SMB/CIFS implementation.
2305 + Samba system utilities for ACL support.
2306 + Copyright (C) Jeremy Allison 2000.
2308 + This program is free software; you can redistribute it and/or modify
2309 + it under the terms of the GNU General Public License as published by
2310 + the Free Software Foundation; either version 2 of the License, or
2311 + (at your option) any later version.
2313 + This program is distributed in the hope that it will be useful,
2314 + but WITHOUT ANY WARRANTY; without even the implied warranty of
2315 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2316 + GNU General Public License for more details.
2318 + You should have received a copy of the GNU General Public License
2319 + along with this program; if not, write to the Free Software
2320 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2324 +#include "sysacls.h" /****** ADDED ******/
2326 +#ifdef SUPPORT_ACLS
2328 +/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
2334 +void SAFE_FREE(void *mem)
2340 +char *uidtoname(uid_t uid)
2342 + static char idbuf[12];
2343 + struct passwd *pw;
2345 + if ((pw = getpwuid(uid)) == NULL) {
2346 + slprintf(idbuf, sizeof(idbuf)-1, "%ld", (long)uid);
2349 + return pw->pw_name;
2351 +/****** EXTRAS -- END ******/
2354 + This file wraps all differing system ACL interfaces into a consistent
2355 + one based on the POSIX interface. It also returns the correct errors
2356 + for older UNIX systems that don't support ACLs.
2358 + The interfaces that each ACL implementation must support are as follows :
2360 + int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2361 + int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2362 + int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
2363 + void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2364 + SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2365 + SMB_ACL_T sys_acl_get_fd(int fd)
2366 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
2367 + int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
2368 + char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
2369 + SMB_ACL_T sys_acl_init( int count)
2370 + int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2371 + int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2372 + int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2373 + int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2374 + int sys_acl_valid( SMB_ACL_T theacl )
2375 + int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2376 + int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2377 + int sys_acl_delete_def_file(const char *path)
2379 + This next one is not POSIX complient - but we *have* to have it !
2380 + More POSIX braindamage.
2382 + int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2384 + The generic POSIX free is the following call. We split this into
2385 + several different free functions as we may need to add tag info
2386 + to structures when emulating the POSIX interface.
2388 + int sys_acl_free( void *obj_p)
2390 + The calls we actually use are :
2392 + int sys_acl_free_text(char *text) - free acl_to_text
2393 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
2394 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
2398 +#if defined(HAVE_POSIX_ACLS)
2400 +/* Identity mapping - easy. */
2402 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2404 + return acl_get_entry( the_acl, entry_id, entry_p);
2407 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2409 + return acl_get_tag_type( entry_d, tag_type_p);
2412 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2414 + return acl_get_permset( entry_d, permset_p);
2417 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2419 + return acl_get_qualifier( entry_d);
2422 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2424 + return acl_get_file( path_p, type);
2427 +SMB_ACL_T sys_acl_get_fd(int fd)
2429 + return acl_get_fd(fd);
2432 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2434 + return acl_clear_perms(permset);
2437 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2439 + return acl_add_perm(permset, perm);
2442 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2444 +#if defined(HAVE_ACL_GET_PERM_NP)
2446 + * Required for TrustedBSD-based ACL implementations where
2447 + * non-POSIX.1e functions are denoted by a _np (non-portable)
2450 + return acl_get_perm_np(permset, perm);
2452 + return acl_get_perm(permset, perm);
2456 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2458 + return acl_to_text( the_acl, plen);
2461 +SMB_ACL_T sys_acl_init( int count)
2463 + return acl_init(count);
2466 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2468 + return acl_create_entry(pacl, pentry);
2471 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2473 + return acl_set_tag_type(entry, tagtype);
2476 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2478 + return acl_set_qualifier(entry, qual);
2481 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2483 + return acl_set_permset(entry, permset);
2486 +int sys_acl_valid( SMB_ACL_T theacl )
2488 + return acl_valid(theacl);
2491 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2493 + return acl_set_file(name, acltype, theacl);
2496 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2498 + return acl_set_fd(fd, theacl);
2501 +int sys_acl_delete_def_file(const char *name)
2503 + return acl_delete_def_file(name);
2506 +int sys_acl_free_text(char *text)
2508 + return acl_free(text);
2511 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2513 + return acl_free(the_acl);
2516 +int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
2518 + return acl_free(qual);
2521 +#elif defined(HAVE_TRU64_ACLS)
2523 + * The interface to DEC/Compaq Tru64 UNIX ACLs
2524 + * is based on Draft 13 of the POSIX spec which is
2525 + * slightly different from the Draft 16 interface.
2527 + * Also, some of the permset manipulation functions
2528 + * such as acl_clear_perm() and acl_add_perm() appear
2529 + * to be broken on Tru64 so we have to manipulate
2530 + * the permission bits in the permset directly.
2532 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2534 + SMB_ACL_ENTRY_T entry;
2536 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
2541 + if ((entry = acl_get_entry(the_acl)) != NULL) {
2546 + return errno ? -1 : 0;
2549 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2551 + return acl_get_tag_type( entry_d, tag_type_p);
2554 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2556 + return acl_get_permset( entry_d, permset_p);
2559 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2561 + return acl_get_qualifier( entry_d);
2564 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2566 + return acl_get_file((char *)path_p, type);
2569 +SMB_ACL_T sys_acl_get_fd(int fd)
2571 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
2574 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2576 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
2581 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2583 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
2588 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
2593 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2595 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
2598 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2600 + return acl_to_text( the_acl, plen);
2603 +SMB_ACL_T sys_acl_init( int count)
2605 + return acl_init(count);
2608 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2610 + SMB_ACL_ENTRY_T entry;
2612 + if ((entry = acl_create_entry(pacl)) == NULL) {
2620 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2622 + return acl_set_tag_type(entry, tagtype);
2625 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2627 + return acl_set_qualifier(entry, qual);
2630 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2632 + return acl_set_permset(entry, permset);
2635 +int sys_acl_valid( SMB_ACL_T theacl )
2637 + acl_entry_t entry;
2639 + return acl_valid(theacl, &entry);
2642 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2644 + return acl_set_file((char *)name, acltype, theacl);
2647 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2649 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
2652 +int sys_acl_delete_def_file(const char *name)
2654 + return acl_delete_def_file((char *)name);
2657 +int sys_acl_free_text(char *text)
2660 + * (void) cast and explicit return 0 are for DEC UNIX
2661 + * which just #defines acl_free_text() to be free()
2663 + (void) acl_free_text(text);
2667 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2669 + return acl_free(the_acl);
2672 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2674 + return acl_free_qualifier(qual, tagtype);
2677 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
2680 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
2681 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
2685 + * Note that while this code implements sufficient functionality
2686 + * to support the sys_acl_* interfaces it does not provide all
2687 + * of the semantics of the POSIX ACL interfaces.
2689 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2690 + * from a call to sys_acl_get_entry() should not be assumed to be
2691 + * valid after calling any of the following functions, which may
2692 + * reorder the entries in the ACL.
2695 + * sys_acl_set_file()
2696 + * sys_acl_set_fd()
2700 + * The only difference between Solaris and UnixWare / OpenUNIX is
2701 + * that the #defines for the ACL operations have different names
2703 +#if defined(HAVE_UNIXWARE_ACLS)
2705 +#define SETACL ACL_SET
2706 +#define GETACL ACL_GET
2707 +#define GETACLCNT ACL_CNT
2712 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2714 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2719 + if (entry_p == NULL) {
2724 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2728 + if (acl_d->next < 0) {
2733 + if (acl_d->next >= acl_d->count) {
2737 + *entry_p = &acl_d->acl[acl_d->next++];
2742 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2744 + *type_p = entry_d->a_type;
2749 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2751 + *permset_p = &entry_d->a_perm;
2756 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2758 + if (entry_d->a_type != SMB_ACL_USER
2759 + && entry_d->a_type != SMB_ACL_GROUP) {
2764 + return &entry_d->a_id;
2768 + * There is no way of knowing what size the ACL returned by
2769 + * GETACL will be unless you first call GETACLCNT which means
2770 + * making an additional system call.
2772 + * In the hope of avoiding the cost of the additional system
2773 + * call in most cases, we initially allocate enough space for
2774 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2775 + * be too small then we use GETACLCNT to find out the actual
2776 + * size, reallocate the ACL buffer, and then call GETACL again.
2779 +#define INITIAL_ACL_SIZE 16
2781 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2784 + int count; /* # of ACL entries allocated */
2785 + int naccess; /* # of access ACL entries */
2786 + int ndefault; /* # of default ACL entries */
2788 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2793 + count = INITIAL_ACL_SIZE;
2794 + if ((acl_d = sys_acl_init(count)) == NULL) {
2799 + * If there isn't enough space for the ACL entries we use
2800 + * GETACLCNT to determine the actual number of ACL entries
2801 + * reallocate and try again. This is in a loop because it
2802 + * is possible that someone else could modify the ACL and
2803 + * increase the number of entries between the call to
2804 + * GETACLCNT and the call to GETACL.
2806 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
2807 + && errno == ENOSPC) {
2809 + sys_acl_free_acl(acl_d);
2811 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
2815 + if ((acl_d = sys_acl_init(count)) == NULL) {
2821 + sys_acl_free_acl(acl_d);
2826 + * calculate the number of access and default ACL entries
2828 + * Note: we assume that the acl() system call returned a
2829 + * well formed ACL which is sorted so that all of the
2830 + * access ACL entries preceed any default ACL entries
2832 + for (naccess = 0; naccess < count; naccess++) {
2833 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2836 + ndefault = count - naccess;
2839 + * if the caller wants the default ACL we have to copy
2840 + * the entries down to the start of the acl[] buffer
2841 + * and mask out the ACL_DEFAULT flag from the type field
2843 + if (type == SMB_ACL_TYPE_DEFAULT) {
2846 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2847 + acl_d->acl[i] = acl_d->acl[j];
2848 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2851 + acl_d->count = ndefault;
2853 + acl_d->count = naccess;
2859 +SMB_ACL_T sys_acl_get_fd(int fd)
2862 + int count; /* # of ACL entries allocated */
2863 + int naccess; /* # of access ACL entries */
2865 + count = INITIAL_ACL_SIZE;
2866 + if ((acl_d = sys_acl_init(count)) == NULL) {
2870 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2871 + && errno == ENOSPC) {
2873 + sys_acl_free_acl(acl_d);
2875 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2879 + if ((acl_d = sys_acl_init(count)) == NULL) {
2885 + sys_acl_free_acl(acl_d);
2890 + * calculate the number of access ACL entries
2892 + for (naccess = 0; naccess < count; naccess++) {
2893 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2897 + acl_d->count = naccess;
2902 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2909 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2911 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2912 + && perm != SMB_ACL_EXECUTE) {
2917 + if (permset_d == NULL) {
2922 + *permset_d |= perm;
2927 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2929 + return *permset_d & perm;
2932 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2939 + * use an initial estimate of 20 bytes per ACL entry
2940 + * when allocating memory for the text representation
2944 + maxlen = 20 * acl_d->count;
2945 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
2950 + for (i = 0; i < acl_d->count; i++) {
2951 + struct acl *ap = &acl_d->acl[i];
2960 + switch (ap->a_type) {
2962 + * for debugging purposes it's probably more
2963 + * useful to dump unknown tag types rather
2964 + * than just returning an error
2967 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
2970 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2975 + case SMB_ACL_USER:
2976 + id = uidtoname(ap->a_id);
2977 + case SMB_ACL_USER_OBJ:
2981 + case SMB_ACL_GROUP:
2982 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2983 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2989 + case SMB_ACL_GROUP_OBJ:
2993 + case SMB_ACL_OTHER:
2997 + case SMB_ACL_MASK:
3003 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3004 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3005 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3008 + /* <tag> : <qualifier> : rwx \n \0 */
3009 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3012 + * If this entry would overflow the buffer
3013 + * allocate enough additional memory for this
3014 + * entry and an estimate of another 20 bytes
3015 + * for each entry still to be processed
3017 + if ((len + nbytes) > maxlen) {
3018 + char *oldtext = text;
3020 + maxlen += nbytes + 20 * (acl_d->count - i);
3022 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3023 + SAFE_FREE(oldtext);
3029 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3030 + len += nbytes - 1;
3039 +SMB_ACL_T sys_acl_init(int count)
3049 + * note that since the definition of the structure pointed
3050 + * to by the SMB_ACL_T includes the first element of the
3051 + * acl[] array, this actually allocates an ACL with room
3052 + * for (count+1) entries
3054 + if ((a = (SMB_ACL_T)SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3059 + a->size = count + 1;
3067 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3070 + SMB_ACL_ENTRY_T entry_d;
3072 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3077 + if (acl_d->count >= acl_d->size) {
3082 + entry_d = &acl_d->acl[acl_d->count++];
3083 + entry_d->a_type = 0;
3084 + entry_d->a_id = -1;
3085 + entry_d->a_perm = 0;
3086 + *entry_p = entry_d;
3091 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3093 + switch (tag_type) {
3094 + case SMB_ACL_USER:
3095 + case SMB_ACL_USER_OBJ:
3096 + case SMB_ACL_GROUP:
3097 + case SMB_ACL_GROUP_OBJ:
3098 + case SMB_ACL_OTHER:
3099 + case SMB_ACL_MASK:
3100 + entry_d->a_type = tag_type;
3110 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3112 + if (entry_d->a_type != SMB_ACL_GROUP
3113 + && entry_d->a_type != SMB_ACL_USER) {
3118 + entry_d->a_id = *((id_t *)qual_p);
3123 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3125 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3129 + entry_d->a_perm = *permset_d;
3135 + * sort the ACL and check it for validity
3137 + * if it's a minimal ACL with only 4 entries then we
3138 + * need to recalculate the mask permissions to make
3139 + * sure that they are the same as the GROUP_OBJ
3140 + * permissions as required by the UnixWare acl() system call.
3142 + * (note: since POSIX allows minimal ACLs which only contain
3143 + * 3 entries - ie there is no mask entry - we should, in theory,
3144 + * check for this and add a mask entry if necessary - however
3145 + * we "know" that the caller of this interface always specifies
3146 + * a mask so, in practice "this never happens" (tm) - if it *does*
3147 + * happen aclsort() will fail and return an error and someone will
3148 + * have to fix it ...)
3151 +static int acl_sort(SMB_ACL_T acl_d)
3153 + int fixmask = (acl_d->count <= 4);
3155 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
3162 +int sys_acl_valid(SMB_ACL_T acl_d)
3164 + return acl_sort(acl_d);
3167 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3170 + struct acl *acl_p;
3172 + struct acl *acl_buf = NULL;
3175 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3180 + if (acl_sort(acl_d) != 0) {
3184 + acl_p = &acl_d->acl[0];
3185 + acl_count = acl_d->count;
3188 + * if it's a directory there is extra work to do
3189 + * since the acl() system call will replace both
3190 + * the access ACLs and the default ACLs (if any)
3192 + if (stat(name, &s) != 0) {
3195 + if (S_ISDIR(s.st_mode)) {
3196 + SMB_ACL_T acc_acl;
3197 + SMB_ACL_T def_acl;
3198 + SMB_ACL_T tmp_acl;
3201 + if (type == SMB_ACL_TYPE_ACCESS) {
3203 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3207 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3210 + if (tmp_acl == NULL) {
3215 + * allocate a temporary buffer for the complete ACL
3217 + acl_count = acc_acl->count + def_acl->count;
3218 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
3220 + if (acl_buf == NULL) {
3221 + sys_acl_free_acl(tmp_acl);
3227 + * copy the access control and default entries into the buffer
3229 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3230 + acc_acl->count * sizeof(acl_buf[0]));
3232 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3233 + def_acl->count * sizeof(acl_buf[0]));
3236 + * set the ACL_DEFAULT flag on the default entries
3238 + for (i = acc_acl->count; i < acl_count; i++) {
3239 + acl_buf[i].a_type |= ACL_DEFAULT;
3242 + sys_acl_free_acl(tmp_acl);
3244 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3249 + ret = acl(name, SETACL, acl_count, acl_p);
3251 + SAFE_FREE(acl_buf);
3256 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3258 + if (acl_sort(acl_d) != 0) {
3262 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
3265 +int sys_acl_delete_def_file(const char *path)
3271 + * fetching the access ACL and rewriting it has
3272 + * the effect of deleting the default ACL
3274 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3278 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
3280 + sys_acl_free_acl(acl_d);
3285 +int sys_acl_free_text(char *text)
3291 +int sys_acl_free_acl(SMB_ACL_T acl_d)
3297 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
3302 +#elif defined(HAVE_HPUX_ACLS)
3306 + * Based on the Solaris/SCO code - with modifications.
3310 + * Note that while this code implements sufficient functionality
3311 + * to support the sys_acl_* interfaces it does not provide all
3312 + * of the semantics of the POSIX ACL interfaces.
3314 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
3315 + * from a call to sys_acl_get_entry() should not be assumed to be
3316 + * valid after calling any of the following functions, which may
3317 + * reorder the entries in the ACL.
3320 + * sys_acl_set_file()
3321 + * sys_acl_set_fd()
3324 +/* This checks if the POSIX ACL system call is defined */
3325 +/* which basically corresponds to whether JFS 3.3 or */
3326 +/* higher is installed. If acl() was called when it */
3327 +/* isn't defined, it causes the process to core dump */
3328 +/* so it is important to check this and avoid acl() */
3329 +/* calls if it isn't there. */
3331 +static BOOL hpux_acl_call_presence(void)
3334 + shl_t handle = NULL;
3337 + static BOOL already_checked=0;
3339 + if(already_checked)
3343 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
3345 + if(ret_val != 0) {
3346 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
3347 + ret_val, errno, strerror(errno)));
3348 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
3352 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
3354 + already_checked = True;
3358 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3360 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3365 + if (entry_p == NULL) {
3370 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3374 + if (acl_d->next < 0) {
3379 + if (acl_d->next >= acl_d->count) {
3383 + *entry_p = &acl_d->acl[acl_d->next++];
3388 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3390 + *type_p = entry_d->a_type;
3395 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3397 + *permset_p = &entry_d->a_perm;
3402 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3404 + if (entry_d->a_type != SMB_ACL_USER
3405 + && entry_d->a_type != SMB_ACL_GROUP) {
3410 + return &entry_d->a_id;
3414 + * There is no way of knowing what size the ACL returned by
3415 + * ACL_GET will be unless you first call ACL_CNT which means
3416 + * making an additional system call.
3418 + * In the hope of avoiding the cost of the additional system
3419 + * call in most cases, we initially allocate enough space for
3420 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
3421 + * be too small then we use ACL_CNT to find out the actual
3422 + * size, reallocate the ACL buffer, and then call ACL_GET again.
3425 +#define INITIAL_ACL_SIZE 16
3427 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3430 + int count; /* # of ACL entries allocated */
3431 + int naccess; /* # of access ACL entries */
3432 + int ndefault; /* # of default ACL entries */
3434 + if(hpux_acl_call_presence() == False) {
3435 + /* Looks like we don't have the acl() system call on HPUX.
3436 + * May be the system doesn't have the latest version of JFS.
3441 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3446 + count = INITIAL_ACL_SIZE;
3447 + if ((acl_d = sys_acl_init(count)) == NULL) {
3452 + * If there isn't enough space for the ACL entries we use
3453 + * ACL_CNT to determine the actual number of ACL entries
3454 + * reallocate and try again. This is in a loop because it
3455 + * is possible that someone else could modify the ACL and
3456 + * increase the number of entries between the call to
3457 + * ACL_CNT and the call to ACL_GET.
3459 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
3461 + sys_acl_free_acl(acl_d);
3463 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
3467 + if ((acl_d = sys_acl_init(count)) == NULL) {
3473 + sys_acl_free_acl(acl_d);
3478 + * calculate the number of access and default ACL entries
3480 + * Note: we assume that the acl() system call returned a
3481 + * well formed ACL which is sorted so that all of the
3482 + * access ACL entries preceed any default ACL entries
3484 + for (naccess = 0; naccess < count; naccess++) {
3485 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
3488 + ndefault = count - naccess;
3491 + * if the caller wants the default ACL we have to copy
3492 + * the entries down to the start of the acl[] buffer
3493 + * and mask out the ACL_DEFAULT flag from the type field
3495 + if (type == SMB_ACL_TYPE_DEFAULT) {
3498 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
3499 + acl_d->acl[i] = acl_d->acl[j];
3500 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
3503 + acl_d->count = ndefault;
3505 + acl_d->count = naccess;
3511 +SMB_ACL_T sys_acl_get_fd(int fd)
3514 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
3517 + files_struct *fsp = file_find_fd(fd);
3519 + if (fsp == NULL) {
3525 + * We know we're in the same conn context. So we
3526 + * can use the relative path.
3529 + return sys_acl_get_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
3532 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3539 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3541 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3542 + && perm != SMB_ACL_EXECUTE) {
3547 + if (permset_d == NULL) {
3552 + *permset_d |= perm;
3557 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3559 + return *permset_d & perm;
3562 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3569 + * use an initial estimate of 20 bytes per ACL entry
3570 + * when allocating memory for the text representation
3574 + maxlen = 20 * acl_d->count;
3575 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
3580 + for (i = 0; i < acl_d->count; i++) {
3581 + struct acl *ap = &acl_d->acl[i];
3590 + switch (ap->a_type) {
3592 + * for debugging purposes it's probably more
3593 + * useful to dump unknown tag types rather
3594 + * than just returning an error
3597 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
3600 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3605 + case SMB_ACL_USER:
3606 + id = uidtoname(ap->a_id);
3607 + case SMB_ACL_USER_OBJ:
3611 + case SMB_ACL_GROUP:
3612 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3613 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3619 + case SMB_ACL_GROUP_OBJ:
3623 + case SMB_ACL_OTHER:
3627 + case SMB_ACL_MASK:
3633 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3634 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3635 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3638 + /* <tag> : <qualifier> : rwx \n \0 */
3639 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3642 + * If this entry would overflow the buffer
3643 + * allocate enough additional memory for this
3644 + * entry and an estimate of another 20 bytes
3645 + * for each entry still to be processed
3647 + if ((len + nbytes) > maxlen) {
3648 + char *oldtext = text;
3650 + maxlen += nbytes + 20 * (acl_d->count - i);
3652 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3659 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3660 + len += nbytes - 1;
3669 +SMB_ACL_T sys_acl_init(int count)
3679 + * note that since the definition of the structure pointed
3680 + * to by the SMB_ACL_T includes the first element of the
3681 + * acl[] array, this actually allocates an ACL with room
3682 + * for (count+1) entries
3684 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3689 + a->size = count + 1;
3697 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3700 + SMB_ACL_ENTRY_T entry_d;
3702 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3707 + if (acl_d->count >= acl_d->size) {
3712 + entry_d = &acl_d->acl[acl_d->count++];
3713 + entry_d->a_type = 0;
3714 + entry_d->a_id = -1;
3715 + entry_d->a_perm = 0;
3716 + *entry_p = entry_d;
3721 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3723 + switch (tag_type) {
3724 + case SMB_ACL_USER:
3725 + case SMB_ACL_USER_OBJ:
3726 + case SMB_ACL_GROUP:
3727 + case SMB_ACL_GROUP_OBJ:
3728 + case SMB_ACL_OTHER:
3729 + case SMB_ACL_MASK:
3730 + entry_d->a_type = tag_type;
3740 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3742 + if (entry_d->a_type != SMB_ACL_GROUP
3743 + && entry_d->a_type != SMB_ACL_USER) {
3748 + entry_d->a_id = *((id_t *)qual_p);
3753 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3755 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3759 + entry_d->a_perm = *permset_d;
3764 +/* Structure to capture the count for each type of ACE. */
3766 +struct hpux_acl_types {
3770 + int n_def_user_obj;
3775 + int n_def_group_obj;
3779 + int n_def_other_obj;
3782 + int n_def_class_obj;
3784 + int n_illegal_obj;
3788 + * Counts the different number of objects in a given array of ACL
3792 + * acl_count - Count of ACLs in the array of ACL strucutres.
3793 + * aclp - Array of ACL structures.
3794 + * acl_type_count - Pointer to acl_types structure. Should already be
3798 + * acl_type_count - This structure is filled up with counts of various
3802 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
3806 + memset(acl_type_count, 0, sizeof(struct hpux_acl_types));
3808 + for(i=0;i<acl_count;i++) {
3809 + switch(aclp[i].a_type) {
3811 + acl_type_count->n_user++;
3814 + acl_type_count->n_user_obj++;
3816 + case DEF_USER_OBJ:
3817 + acl_type_count->n_def_user_obj++;
3820 + acl_type_count->n_group++;
3823 + acl_type_count->n_group_obj++;
3825 + case DEF_GROUP_OBJ:
3826 + acl_type_count->n_def_group_obj++;
3829 + acl_type_count->n_other_obj++;
3831 + case DEF_OTHER_OBJ:
3832 + acl_type_count->n_def_other_obj++;
3835 + acl_type_count->n_class_obj++;
3837 + case DEF_CLASS_OBJ:
3838 + acl_type_count->n_def_class_obj++;
3841 + acl_type_count->n_def_user++;
3844 + acl_type_count->n_def_group++;
3847 + acl_type_count->n_illegal_obj++;
3853 +/* swap_acl_entries: Swaps two ACL entries.
3855 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3858 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3860 + struct acl temp_acl;
3862 + temp_acl.a_type = aclp0->a_type;
3863 + temp_acl.a_id = aclp0->a_id;
3864 + temp_acl.a_perm = aclp0->a_perm;
3866 + aclp0->a_type = aclp1->a_type;
3867 + aclp0->a_id = aclp1->a_id;
3868 + aclp0->a_perm = aclp1->a_perm;
3870 + aclp1->a_type = temp_acl.a_type;
3871 + aclp1->a_id = temp_acl.a_id;
3872 + aclp1->a_perm = temp_acl.a_perm;
3875 +/* prohibited_duplicate_type
3876 + * Identifies if given ACL type can have duplicate entries or
3879 + * Inputs: acl_type - ACL Type.
3885 + * True - If the ACL type matches any of the prohibited types.
3886 + * False - If the ACL type doesn't match any of the prohibited types.
3889 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
3891 + switch(acl_type) {
3902 +/* get_needed_class_perm
3903 + * Returns the permissions of a ACL structure only if the ACL
3904 + * type matches one of the pre-determined types for computing
3905 + * CLASS_OBJ permissions.
3907 + * Inputs: aclp - Pointer to ACL structure.
3910 +static int hpux_get_needed_class_perm(struct acl *aclp)
3912 + switch(aclp->a_type) {
3916 + case DEF_USER_OBJ:
3918 + case DEF_GROUP_OBJ:
3920 + case DEF_CLASS_OBJ:
3921 + case DEF_OTHER_OBJ:
3922 + return aclp->a_perm;
3928 +/* acl_sort for HPUX.
3929 + * Sorts the array of ACL structures as per the description in
3930 + * aclsort man page. Refer to aclsort man page for more details
3934 + * acl_count - Count of ACLs in the array of ACL structures.
3935 + * calclass - If this is not zero, then we compute the CLASS_OBJ
3937 + * aclp - Array of ACL structures.
3941 + * aclp - Sorted array of ACL structures.
3945 + * Returns 0 for success -1 for failure. Prints a message to the Samba
3946 + * debug log in case of failure.
3949 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
3951 +#if !defined(HAVE_HPUX_ACLSORT)
3953 + * The aclsort() system call is availabe on the latest HPUX General
3954 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
3955 + * function. Because, we don't want to update to a new
3956 + * HPUX GR bundle just for aclsort() call.
3959 + struct hpux_acl_types acl_obj_count;
3960 + int n_class_obj_perm = 0;
3964 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
3968 + if(aclp == NULL) {
3969 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
3973 + /* Count different types of ACLs in the ACLs array */
3975 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
3977 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
3978 + * CLASS_OBJ and OTHER_OBJ
3981 + if( (acl_obj_count.n_user_obj != 1) ||
3982 + (acl_obj_count.n_group_obj != 1) ||
3983 + (acl_obj_count.n_class_obj != 1) ||
3984 + (acl_obj_count.n_other_obj != 1)
3986 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
3987 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
3991 + /* If any of the default objects are present, there should be only
3992 + * one of them each.
3995 + if( (acl_obj_count.n_def_user_obj > 1) || (acl_obj_count.n_def_group_obj > 1) ||
3996 + (acl_obj_count.n_def_other_obj > 1) || (acl_obj_count.n_def_class_obj > 1) ) {
3997 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
3998 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
4002 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
4005 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
4006 + * same ACL type, sort by ACL id.
4008 + * I am using the trival kind of sorting method here because, performance isn't
4009 + * really effected by the ACLs feature. More over there aren't going to be more
4010 + * than 17 entries on HPUX.
4013 + for(i=0; i<acl_count;i++) {
4014 + for (j=i+1; j<acl_count; j++) {
4015 + if( aclp[i].a_type > aclp[j].a_type ) {
4016 + /* ACL entries out of order, swap them */
4018 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4020 + } else if ( aclp[i].a_type == aclp[j].a_type ) {
4022 + /* ACL entries of same type, sort by id */
4024 + if(aclp[i].a_id > aclp[j].a_id) {
4025 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4026 + } else if (aclp[i].a_id == aclp[j].a_id) {
4027 + /* We have a duplicate entry. */
4028 + if(hpux_prohibited_duplicate_type(aclp[i].a_type)) {
4029 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
4030 + aclp[i].a_type, aclp[i].a_id));
4039 + /* set the class obj permissions to the computed one. */
4041 + int n_class_obj_index = -1;
4043 + for(i=0;i<acl_count;i++) {
4044 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
4046 + if(aclp[i].a_type == CLASS_OBJ)
4047 + n_class_obj_index = i;
4049 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
4054 + return aclsort(acl_count, calclass, aclp);
4059 + * sort the ACL and check it for validity
4061 + * if it's a minimal ACL with only 4 entries then we
4062 + * need to recalculate the mask permissions to make
4063 + * sure that they are the same as the GROUP_OBJ
4064 + * permissions as required by the UnixWare acl() system call.
4066 + * (note: since POSIX allows minimal ACLs which only contain
4067 + * 3 entries - ie there is no mask entry - we should, in theory,
4068 + * check for this and add a mask entry if necessary - however
4069 + * we "know" that the caller of this interface always specifies
4070 + * a mask so, in practice "this never happens" (tm) - if it *does*
4071 + * happen aclsort() will fail and return an error and someone will
4072 + * have to fix it ...)
4075 +static int acl_sort(SMB_ACL_T acl_d)
4077 + int fixmask = (acl_d->count <= 4);
4079 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
4086 +int sys_acl_valid(SMB_ACL_T acl_d)
4088 + return acl_sort(acl_d);
4091 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4094 + struct acl *acl_p;
4096 + struct acl *acl_buf = NULL;
4099 + if(hpux_acl_call_presence() == False) {
4100 + /* Looks like we don't have the acl() system call on HPUX.
4101 + * May be the system doesn't have the latest version of JFS.
4107 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
4112 + if (acl_sort(acl_d) != 0) {
4116 + acl_p = &acl_d->acl[0];
4117 + acl_count = acl_d->count;
4120 + * if it's a directory there is extra work to do
4121 + * since the acl() system call will replace both
4122 + * the access ACLs and the default ACLs (if any)
4124 + if (stat(name, &s) != 0) {
4127 + if (S_ISDIR(s.st_mode)) {
4128 + SMB_ACL_T acc_acl;
4129 + SMB_ACL_T def_acl;
4130 + SMB_ACL_T tmp_acl;
4133 + if (type == SMB_ACL_TYPE_ACCESS) {
4135 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
4139 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
4142 + if (tmp_acl == NULL) {
4147 + * allocate a temporary buffer for the complete ACL
4149 + acl_count = acc_acl->count + def_acl->count;
4150 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
4152 + if (acl_buf == NULL) {
4153 + sys_acl_free_acl(tmp_acl);
4159 + * copy the access control and default entries into the buffer
4161 + memcpy(&acl_buf[0], &acc_acl->acl[0],
4162 + acc_acl->count * sizeof(acl_buf[0]));
4164 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
4165 + def_acl->count * sizeof(acl_buf[0]));
4168 + * set the ACL_DEFAULT flag on the default entries
4170 + for (i = acc_acl->count; i < acl_count; i++) {
4171 + acl_buf[i].a_type |= ACL_DEFAULT;
4174 + sys_acl_free_acl(tmp_acl);
4176 + } else if (type != SMB_ACL_TYPE_ACCESS) {
4181 + ret = acl(name, ACL_SET, acl_count, acl_p);
4190 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4193 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
4196 + files_struct *fsp = file_find_fd(fd);
4198 + if (fsp == NULL) {
4203 + if (acl_sort(acl_d) != 0) {
4208 + * We know we're in the same conn context. So we
4209 + * can use the relative path.
4212 + return sys_acl_set_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS, acl_d);
4215 +int sys_acl_delete_def_file(const char *path)
4221 + * fetching the access ACL and rewriting it has
4222 + * the effect of deleting the default ACL
4224 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
4228 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
4230 + sys_acl_free_acl(acl_d);
4235 +int sys_acl_free_text(char *text)
4241 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4247 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4252 +#elif defined(HAVE_IRIX_ACLS)
4254 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4256 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
4261 + if (entry_p == NULL) {
4266 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
4270 + if (acl_d->next < 0) {
4275 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
4279 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
4284 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
4286 + *type_p = entry_d->ae_tag;
4291 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4293 + *permset_p = entry_d;
4298 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
4300 + if (entry_d->ae_tag != SMB_ACL_USER
4301 + && entry_d->ae_tag != SMB_ACL_GROUP) {
4306 + return &entry_d->ae_id;
4309 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
4313 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4317 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
4322 + a->freeaclp = True;
4326 +SMB_ACL_T sys_acl_get_fd(int fd)
4330 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4334 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
4339 + a->freeaclp = True;
4343 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
4345 + permset_d->ae_perm = 0;
4350 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4352 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
4353 + && perm != SMB_ACL_EXECUTE) {
4358 + if (permset_d == NULL) {
4363 + permset_d->ae_perm |= perm;
4368 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4370 + return permset_d->ae_perm & perm;
4373 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
4375 + return acl_to_text(acl_d->aclp, len_p);
4378 +SMB_ACL_T sys_acl_init(int count)
4387 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
4393 + a->freeaclp = False;
4394 + a->aclp = (struct acl *)(&a->aclp + sizeof(struct acl *));
4395 + a->aclp->acl_cnt = 0;
4401 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
4404 + SMB_ACL_ENTRY_T entry_d;
4406 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
4411 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
4416 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
4417 + entry_d->ae_tag = 0;
4418 + entry_d->ae_id = 0;
4419 + entry_d->ae_perm = 0;
4420 + *entry_p = entry_d;
4425 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
4427 + switch (tag_type) {
4428 + case SMB_ACL_USER:
4429 + case SMB_ACL_USER_OBJ:
4430 + case SMB_ACL_GROUP:
4431 + case SMB_ACL_GROUP_OBJ:
4432 + case SMB_ACL_OTHER:
4433 + case SMB_ACL_MASK:
4434 + entry_d->ae_tag = tag_type;
4444 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
4446 + if (entry_d->ae_tag != SMB_ACL_GROUP
4447 + && entry_d->ae_tag != SMB_ACL_USER) {
4452 + entry_d->ae_id = *((id_t *)qual_p);
4457 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
4459 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
4463 + entry_d->ae_perm = permset_d->ae_perm;
4468 +int sys_acl_valid(SMB_ACL_T acl_d)
4470 + return acl_valid(acl_d->aclp);
4473 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4475 + return acl_set_file(name, type, acl_d->aclp);
4478 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4480 + return acl_set_fd(fd, acl_d->aclp);
4483 +int sys_acl_delete_def_file(const char *name)
4485 + return acl_delete_def_file(name);
4488 +int sys_acl_free_text(char *text)
4490 + return acl_free(text);
4493 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4495 + if (acl_d->freeaclp) {
4496 + acl_free(acl_d->aclp);
4502 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4507 +#elif defined(HAVE_AIX_ACLS)
4509 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
4511 +int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4513 + struct acl_entry_link *link;
4514 + struct new_acl_entry *entry;
4517 + DEBUG(10,("This is the count: %d\n",theacl->count));
4519 + /* Check if count was previously set to -1. *
4520 + * If it was, that means we reached the end *
4521 + * of the acl last time. */
4522 + if(theacl->count == -1)
4526 + /* To get to the next acl, traverse linked list until index *
4527 + * of acl matches the count we are keeping. This count is *
4528 + * incremented each time we return an acl entry. */
4530 + for(keep_going = 0; keep_going < theacl->count; keep_going++)
4531 + link = link->nextp;
4533 + entry = *entry_p = link->entryp;
4535 + DEBUG(10,("*entry_p is %d\n",entry_p));
4536 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
4538 + /* Increment count */
4540 + if(link->nextp == NULL)
4541 + theacl->count = -1;
4546 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
4548 + /* Initialize tag type */
4551 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
4553 + /* Depending on what type of entry we have, *
4554 + * return tag type. */
4555 + switch(entry_d->ace_id->id_type) {
4557 + *tag_type_p = SMB_ACL_USER;
4560 + *tag_type_p = SMB_ACL_GROUP;
4563 + case SMB_ACL_USER_OBJ:
4564 + case SMB_ACL_GROUP_OBJ:
4565 + case SMB_ACL_OTHER:
4566 + *tag_type_p = entry_d->ace_id->id_type;
4576 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4578 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
4579 + *permset_p = &entry_d->ace_access;
4580 + DEBUG(10,("**permset_p is %d\n",**permset_p));
4581 + if(!(**permset_p & S_IXUSR) &&
4582 + !(**permset_p & S_IWUSR) &&
4583 + !(**permset_p & S_IRUSR) &&
4584 + (**permset_p != 0))
4587 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
4591 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
4593 + return(entry_d->ace_id->id_data);
4596 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
4598 + struct acl *file_acl = (struct acl *)NULL;
4599 + struct acl_entry *acl_entry;
4600 + struct new_acl_entry *new_acl_entry;
4601 + struct ace_id *idp;
4602 + struct acl_entry_link *acl_entry_link;
4603 + struct acl_entry_link *acl_entry_link_head;
4608 + /* AIX has no DEFAULT */
4609 + if ( type == SMB_ACL_TYPE_DEFAULT ) {
4614 + /* Get the acl using statacl */
4616 + DEBUG(10,("Entering sys_acl_get_file\n"));
4617 + DEBUG(10,("path_p is %s\n",path_p));
4619 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4621 + if(file_acl == NULL) {
4623 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
4627 + memset(file_acl,0,BUFSIZ);
4629 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
4631 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
4632 + SAFE_FREE(file_acl);
4636 + DEBUG(10,("Got facl and returned it\n"));
4638 + /* Point to the first acl entry in the acl */
4639 + acl_entry = file_acl->acl_ext;
4641 + /* Begin setting up the head of the linked list *
4642 + * that will be used for the storing the acl *
4643 + * in a way that is useful for the posix_acls.c *
4646 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4647 + if(acl_entry_link_head == NULL)
4650 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4651 + if(acl_entry_link->entryp == NULL) {
4652 + SAFE_FREE(file_acl);
4654 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4658 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4659 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4661 + /* Check if the extended acl bit is on. *
4662 + * If it isn't, do not show the *
4663 + * contents of the acl since AIX intends *
4664 + * the extended info to remain unused */
4666 + if(file_acl->acl_mode & S_IXACL){
4667 + /* while we are not pointing to the very end */
4668 + while(acl_entry < acl_last(file_acl)) {
4669 + /* before we malloc anything, make sure this is */
4670 + /* a valid acl entry and one that we want to map */
4671 + idp = id_nxt(acl_entry->ace_id);
4672 + if((acl_entry->ace_type == ACC_SPECIFY ||
4673 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4674 + acl_entry = acl_nxt(acl_entry);
4678 + idp = acl_entry->ace_id;
4680 + /* Check if this is the first entry in the linked list. *
4681 + * The first entry needs to keep prevp pointing to NULL *
4682 + * and already has entryp allocated. */
4684 + if(acl_entry_link_head->count != 0) {
4685 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4687 + if(acl_entry_link->nextp == NULL) {
4688 + SAFE_FREE(file_acl);
4690 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4694 + acl_entry_link->nextp->prevp = acl_entry_link;
4695 + acl_entry_link = acl_entry_link->nextp;
4696 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4697 + if(acl_entry_link->entryp == NULL) {
4698 + SAFE_FREE(file_acl);
4700 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4703 + acl_entry_link->nextp = NULL;
4706 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4708 + /* Don't really need this since all types are going *
4709 + * to be specified but, it's better than leaving it 0 */
4711 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4713 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4715 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof(struct ace_id));
4717 + /* The access in the acl entries must be left shifted by *
4718 + * three bites, because they will ultimately be compared *
4719 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4721 + switch(acl_entry->ace_type){
4724 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4725 + acl_entry_link->entryp->ace_access <<= 6;
4726 + acl_entry_link_head->count++;
4729 + /* Since there is no way to return a DENY acl entry *
4730 + * change to PERMIT and then shift. */
4731 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4732 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4733 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4734 + acl_entry_link->entryp->ace_access <<= 6;
4735 + acl_entry_link_head->count++;
4741 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4742 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4744 + acl_entry = acl_nxt(acl_entry);
4746 + } /* end of if enabled */
4748 + /* Since owner, group, other acl entries are not *
4749 + * part of the acl entries in an acl, they must *
4750 + * be dummied up to become part of the list. */
4752 + for( i = 1; i < 4; i++) {
4753 + DEBUG(10,("i is %d\n",i));
4754 + if(acl_entry_link_head->count != 0) {
4755 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4756 + if(acl_entry_link->nextp == NULL) {
4757 + SAFE_FREE(file_acl);
4759 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4763 + acl_entry_link->nextp->prevp = acl_entry_link;
4764 + acl_entry_link = acl_entry_link->nextp;
4765 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4766 + if(acl_entry_link->entryp == NULL) {
4767 + SAFE_FREE(file_acl);
4769 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4774 + acl_entry_link->nextp = NULL;
4776 + new_acl_entry = acl_entry_link->entryp;
4777 + idp = new_acl_entry->ace_id;
4779 + new_acl_entry->ace_len = sizeof(struct acl_entry);
4780 + new_acl_entry->ace_type = ACC_PERMIT;
4781 + idp->id_len = sizeof(struct ace_id);
4782 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4783 + memset(idp->id_data,0,sizeof(uid_t));
4787 + new_acl_entry->ace_access = file_acl->g_access << 6;
4788 + idp->id_type = SMB_ACL_GROUP_OBJ;
4792 + new_acl_entry->ace_access = file_acl->o_access << 6;
4793 + idp->id_type = SMB_ACL_OTHER;
4797 + new_acl_entry->ace_access = file_acl->u_access << 6;
4798 + idp->id_type = SMB_ACL_USER_OBJ;
4806 + acl_entry_link_head->count++;
4807 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4810 + acl_entry_link_head->count = 0;
4811 + SAFE_FREE(file_acl);
4813 + return(acl_entry_link_head);
4816 +SMB_ACL_T sys_acl_get_fd(int fd)
4818 + struct acl *file_acl = (struct acl *)NULL;
4819 + struct acl_entry *acl_entry;
4820 + struct new_acl_entry *new_acl_entry;
4821 + struct ace_id *idp;
4822 + struct acl_entry_link *acl_entry_link;
4823 + struct acl_entry_link *acl_entry_link_head;
4828 + /* Get the acl using fstatacl */
4830 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4831 + DEBUG(10,("fd is %d\n",fd));
4832 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4834 + if(file_acl == NULL) {
4836 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4840 + memset(file_acl,0,BUFSIZ);
4842 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4844 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4845 + SAFE_FREE(file_acl);
4849 + DEBUG(10,("Got facl and returned it\n"));
4851 + /* Point to the first acl entry in the acl */
4853 + acl_entry = file_acl->acl_ext;
4854 + /* Begin setting up the head of the linked list *
4855 + * that will be used for the storing the acl *
4856 + * in a way that is useful for the posix_acls.c *
4859 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4860 + if(acl_entry_link_head == NULL){
4861 + SAFE_FREE(file_acl);
4865 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4867 + if(acl_entry_link->entryp == NULL) {
4869 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4870 + SAFE_FREE(file_acl);
4874 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4875 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4877 + /* Check if the extended acl bit is on. *
4878 + * If it isn't, do not show the *
4879 + * contents of the acl since AIX intends *
4880 + * the extended info to remain unused */
4882 + if(file_acl->acl_mode & S_IXACL){
4883 + /* while we are not pointing to the very end */
4884 + while(acl_entry < acl_last(file_acl)) {
4885 + /* before we malloc anything, make sure this is */
4886 + /* a valid acl entry and one that we want to map */
4888 + idp = id_nxt(acl_entry->ace_id);
4889 + if((acl_entry->ace_type == ACC_SPECIFY ||
4890 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4891 + acl_entry = acl_nxt(acl_entry);
4895 + idp = acl_entry->ace_id;
4897 + /* Check if this is the first entry in the linked list. *
4898 + * The first entry needs to keep prevp pointing to NULL *
4899 + * and already has entryp allocated. */
4901 + if(acl_entry_link_head->count != 0) {
4902 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4903 + if(acl_entry_link->nextp == NULL) {
4905 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4906 + SAFE_FREE(file_acl);
4909 + acl_entry_link->nextp->prevp = acl_entry_link;
4910 + acl_entry_link = acl_entry_link->nextp;
4911 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4912 + if(acl_entry_link->entryp == NULL) {
4914 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4915 + SAFE_FREE(file_acl);
4919 + acl_entry_link->nextp = NULL;
4922 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4924 + /* Don't really need this since all types are going *
4925 + * to be specified but, it's better than leaving it 0 */
4927 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4928 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4930 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof(struct ace_id));
4932 + /* The access in the acl entries must be left shifted by *
4933 + * three bites, because they will ultimately be compared *
4934 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4936 + switch(acl_entry->ace_type){
4939 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4940 + acl_entry_link->entryp->ace_access <<= 6;
4941 + acl_entry_link_head->count++;
4944 + /* Since there is no way to return a DENY acl entry *
4945 + * change to PERMIT and then shift. */
4946 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4947 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4948 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4949 + acl_entry_link->entryp->ace_access <<= 6;
4950 + acl_entry_link_head->count++;
4956 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4957 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4959 + acl_entry = acl_nxt(acl_entry);
4961 + } /* end of if enabled */
4963 + /* Since owner, group, other acl entries are not *
4964 + * part of the acl entries in an acl, they must *
4965 + * be dummied up to become part of the list. */
4967 + for( i = 1; i < 4; i++) {
4968 + DEBUG(10,("i is %d\n",i));
4969 + if(acl_entry_link_head->count != 0){
4970 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4971 + if(acl_entry_link->nextp == NULL) {
4973 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4974 + SAFE_FREE(file_acl);
4978 + acl_entry_link->nextp->prevp = acl_entry_link;
4979 + acl_entry_link = acl_entry_link->nextp;
4980 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4982 + if(acl_entry_link->entryp == NULL) {
4983 + SAFE_FREE(file_acl);
4985 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4990 + acl_entry_link->nextp = NULL;
4992 + new_acl_entry = acl_entry_link->entryp;
4993 + idp = new_acl_entry->ace_id;
4995 + new_acl_entry->ace_len = sizeof(struct acl_entry);
4996 + new_acl_entry->ace_type = ACC_PERMIT;
4997 + idp->id_len = sizeof(struct ace_id);
4998 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4999 + memset(idp->id_data,0,sizeof(uid_t));
5003 + new_acl_entry->ace_access = file_acl->g_access << 6;
5004 + idp->id_type = SMB_ACL_GROUP_OBJ;
5008 + new_acl_entry->ace_access = file_acl->o_access << 6;
5009 + idp->id_type = SMB_ACL_OTHER;
5013 + new_acl_entry->ace_access = file_acl->u_access << 6;
5014 + idp->id_type = SMB_ACL_USER_OBJ;
5021 + acl_entry_link_head->count++;
5022 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
5025 + acl_entry_link_head->count = 0;
5026 + SAFE_FREE(file_acl);
5028 + return(acl_entry_link_head);
5031 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
5033 + *permset = *permset & ~0777;
5037 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5040 + (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
5044 + DEBUG(10,("This is the permset now: %d\n",*permset));
5048 +char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
5053 +SMB_ACL_T sys_acl_init( int count)
5055 + struct acl_entry_link *theacl = NULL;
5057 + DEBUG(10,("Entering sys_acl_init\n"));
5059 + theacl = SMB_MALLOC_P(struct acl_entry_link);
5060 + if(theacl == NULL) {
5062 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
5066 + theacl->count = 0;
5067 + theacl->nextp = NULL;
5068 + theacl->prevp = NULL;
5069 + theacl->entryp = NULL;
5070 + DEBUG(10,("Exiting sys_acl_init\n"));
5074 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
5076 + struct acl_entry_link *theacl;
5077 + struct acl_entry_link *acl_entryp;
5078 + struct acl_entry_link *temp_entry;
5081 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
5083 + theacl = acl_entryp = *pacl;
5085 + /* Get to the end of the acl before adding entry */
5087 + for(counting=0; counting < theacl->count; counting++){
5088 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5089 + temp_entry = acl_entryp;
5090 + acl_entryp = acl_entryp->nextp;
5093 + if(theacl->count != 0){
5094 + temp_entry->nextp = acl_entryp = SMB_MALLOC_P(struct acl_entry_link);
5095 + if(acl_entryp == NULL) {
5097 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5101 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5102 + acl_entryp->prevp = temp_entry;
5103 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
5106 + *pentry = acl_entryp->entryp = SMB_MALLOC_P(struct new_acl_entry);
5107 + if(*pentry == NULL) {
5109 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5113 + memset(*pentry,0,sizeof(struct new_acl_entry));
5114 + acl_entryp->entryp->ace_len = sizeof(struct acl_entry);
5115 + acl_entryp->entryp->ace_type = ACC_PERMIT;
5116 + acl_entryp->entryp->ace_id->id_len = sizeof(struct ace_id);
5117 + acl_entryp->nextp = NULL;
5119 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
5123 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
5125 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
5126 + entry->ace_id->id_type = tagtype;
5127 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
5128 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
5131 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
5133 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
5134 + memcpy(entry->ace_id->id_data,qual,sizeof(uid_t));
5135 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
5139 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
5141 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
5142 + if(!(*permset & S_IXUSR) &&
5143 + !(*permset & S_IWUSR) &&
5144 + !(*permset & S_IRUSR) &&
5148 + entry->ace_access = *permset;
5149 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
5150 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
5154 +int sys_acl_valid( SMB_ACL_T theacl )
5157 + int group_obj = 0;
5158 + int other_obj = 0;
5159 + struct acl_entry_link *acl_entry;
5161 + for(acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
5162 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
5163 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
5164 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
5167 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
5169 + if(user_obj != 1 || group_obj != 1 || other_obj != 1)
5175 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
5177 + struct acl_entry_link *acl_entry_link = NULL;
5178 + struct acl *file_acl = NULL;
5179 + struct acl *file_acl_temp = NULL;
5180 + struct acl_entry *acl_entry = NULL;
5181 + struct ace_id *ace_id = NULL;
5188 + DEBUG(10,("Entering sys_acl_set_file\n"));
5189 + DEBUG(10,("File name is %s\n",name));
5191 + /* AIX has no default ACL */
5192 + if(acltype == SMB_ACL_TYPE_DEFAULT)
5195 + acl_length = BUFSIZ;
5196 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5198 + if(file_acl == NULL) {
5200 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5204 + memset(file_acl,0,BUFSIZ);
5206 + file_acl->acl_len = ACL_SIZ;
5207 + file_acl->acl_mode = S_IXACL;
5209 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5210 + acl_entry_link->entryp->ace_access >>= 6;
5211 + id_type = acl_entry_link->entryp->ace_id->id_type;
5214 + case SMB_ACL_USER_OBJ:
5215 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5217 + case SMB_ACL_GROUP_OBJ:
5218 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5220 + case SMB_ACL_OTHER:
5221 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5223 + case SMB_ACL_MASK:
5227 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5228 + acl_length += sizeof(struct acl_entry);
5229 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5230 + if(file_acl_temp == NULL) {
5231 + SAFE_FREE(file_acl);
5233 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5237 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5238 + SAFE_FREE(file_acl);
5239 + file_acl = file_acl_temp;
5242 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5243 + file_acl->acl_len += sizeof(struct acl_entry);
5244 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5245 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5247 + /* In order to use this, we'll need to wait until we can get denies */
5248 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5249 + acl_entry->ace_type = ACC_SPECIFY; */
5251 + acl_entry->ace_type = ACC_SPECIFY;
5253 + ace_id = acl_entry->ace_id;
5255 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5256 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5257 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5258 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5259 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof(uid_t));
5262 + rc = chacl(name,file_acl,file_acl->acl_len);
5263 + DEBUG(10,("errno is %d\n",errno));
5264 + DEBUG(10,("return code is %d\n",rc));
5265 + SAFE_FREE(file_acl);
5266 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
5270 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
5272 + struct acl_entry_link *acl_entry_link = NULL;
5273 + struct acl *file_acl = NULL;
5274 + struct acl *file_acl_temp = NULL;
5275 + struct acl_entry *acl_entry = NULL;
5276 + struct ace_id *ace_id = NULL;
5282 + DEBUG(10,("Entering sys_acl_set_fd\n"));
5283 + acl_length = BUFSIZ;
5284 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5286 + if(file_acl == NULL) {
5288 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5292 + memset(file_acl,0,BUFSIZ);
5294 + file_acl->acl_len = ACL_SIZ;
5295 + file_acl->acl_mode = S_IXACL;
5297 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5298 + acl_entry_link->entryp->ace_access >>= 6;
5299 + id_type = acl_entry_link->entryp->ace_id->id_type;
5300 + DEBUG(10,("The id_type is %d\n",id_type));
5303 + case SMB_ACL_USER_OBJ:
5304 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5306 + case SMB_ACL_GROUP_OBJ:
5307 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5309 + case SMB_ACL_OTHER:
5310 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5312 + case SMB_ACL_MASK:
5316 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5317 + acl_length += sizeof(struct acl_entry);
5318 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5319 + if(file_acl_temp == NULL) {
5320 + SAFE_FREE(file_acl);
5322 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5326 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5327 + SAFE_FREE(file_acl);
5328 + file_acl = file_acl_temp;
5331 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5332 + file_acl->acl_len += sizeof(struct acl_entry);
5333 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5334 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5336 + /* In order to use this, we'll need to wait until we can get denies */
5337 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5338 + acl_entry->ace_type = ACC_SPECIFY; */
5340 + acl_entry->ace_type = ACC_SPECIFY;
5342 + ace_id = acl_entry->ace_id;
5344 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5345 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5346 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5347 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5348 + memcpy(ace_id->id_data, &user_id, sizeof(uid_t));
5351 + rc = fchacl(fd,file_acl,file_acl->acl_len);
5352 + DEBUG(10,("errno is %d\n",errno));
5353 + DEBUG(10,("return code is %d\n",rc));
5354 + SAFE_FREE(file_acl);
5355 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
5359 +int sys_acl_delete_def_file(const char *name)
5361 + /* AIX has no default ACL */
5365 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5367 + return(*permset & perm);
5370 +int sys_acl_free_text(char *text)
5375 +int sys_acl_free_acl(SMB_ACL_T posix_acl)
5377 + struct acl_entry_link *acl_entry_link;
5379 + for(acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
5380 + SAFE_FREE(acl_entry_link->prevp->entryp);
5381 + SAFE_FREE(acl_entry_link->prevp);
5384 + SAFE_FREE(acl_entry_link->prevp->entryp);
5385 + SAFE_FREE(acl_entry_link->prevp);
5386 + SAFE_FREE(acl_entry_link->entryp);
5387 + SAFE_FREE(acl_entry_link);
5392 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
5397 +#else /* No ACLs. */
5399 +int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
5405 +int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
5411 +int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
5417 +void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
5423 +SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
5426 + return (SMB_ACL_T)NULL;
5429 +SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
5432 + return (SMB_ACL_T)NULL;
5435 +int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
5441 +int sys_acl_add_perm( UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
5447 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5450 + return (permset & perm) ? 1 : 0;
5453 +char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
5459 +int sys_acl_free_text(UNUSED(char *text))
5465 +SMB_ACL_T sys_acl_init(UNUSED(int count))
5471 +int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
5477 +int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
5483 +int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
5489 +int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
5495 +int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
5501 +int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
5507 +int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
5513 +int sys_acl_delete_def_file(UNUSED(const char *name))
5519 +int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
5525 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
5531 +#endif /* No ACLs. */
5533 +/************************************************************************
5534 + Deliberately outside the ACL defines. Return 1 if this is a "no acls"
5536 +************************************************************************/
5538 +int no_acl_syscall_error(int err)
5540 +#if defined(ENOSYS)
5541 + if (err == ENOSYS) {
5545 +#if defined(ENOTSUP)
5546 + if (err == ENOTSUP) {
5553 +#endif /* SUPPORT_ACLS */
5554 --- old/lib/sysacls.h
5555 +++ new/lib/sysacls.h
5557 +#ifdef SUPPORT_ACLS
5559 +#ifdef HAVE_SYS_ACL_H
5560 +#include <sys/acl.h>
5562 +#ifdef HAVE_ACL_LIBACL_H
5563 +#include <acl/libacl.h>
5565 +#include "smb_acls.h"
5567 +#define SMB_MALLOC(cnt) new_array(char, cnt)
5568 +#define SMB_MALLOC_P(obj) new_array(obj, 1)
5569 +#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
5570 +#define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt)
5571 +#define slprintf snprintf
5573 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
5574 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
5575 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
5576 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d);
5577 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type);
5578 +SMB_ACL_T sys_acl_get_fd(int fd);
5579 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
5580 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5581 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5582 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen);
5583 +SMB_ACL_T sys_acl_init(int count);
5584 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
5585 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype);
5586 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual);
5587 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset);
5588 +int sys_acl_valid(SMB_ACL_T theacl);
5589 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
5590 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl);
5591 +int sys_acl_delete_def_file(const char *name);
5592 +int sys_acl_free_text(char *text);
5593 +int sys_acl_free_acl(SMB_ACL_T the_acl);
5594 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
5596 +#endif /* SUPPORT_ACLS */
5599 @@ -625,8 +625,10 @@ static void log_formatted(enum logcode c
5600 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
5601 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
5602 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
5605 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
5606 + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
5607 + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
5610 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
5611 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
5614 @@ -47,6 +47,7 @@ int copy_dirlinks = 0;
5616 int preserve_links = 0;
5617 int preserve_hard_links = 0;
5618 +int preserve_acls = 0;
5619 int preserve_perms = 0;
5620 int preserve_executability = 0;
5621 int preserve_devices = 0;
5622 @@ -199,6 +200,7 @@ static void print_rsync_version(enum log
5623 char const *got_socketpair = "no ";
5624 char const *have_inplace = "no ";
5625 char const *hardlinks = "no ";
5626 + char const *acls = "no ";
5627 char const *links = "no ";
5628 char const *ipv6 = "no ";
5629 STRUCT_STAT *dumstat;
5630 @@ -215,6 +217,10 @@ static void print_rsync_version(enum log
5634 +#ifdef SUPPORT_ACLS
5638 #ifdef SUPPORT_LINKS
5641 @@ -233,8 +239,8 @@ static void print_rsync_version(enum log
5642 (int)(sizeof (int64) * 8));
5643 rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
5644 got_socketpair, hardlinks, links, ipv6, have_inplace);
5645 - rprintf(f, " %sappend\n",
5647 + rprintf(f, " %sappend, %sACLs\n",
5648 + have_inplace, acls);
5650 #ifdef MAINTAINER_MODE
5651 rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
5652 @@ -280,7 +286,7 @@ void usage(enum logcode F)
5653 rprintf(F," -q, --quiet suppress non-error messages\n");
5654 rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
5655 rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
5656 - rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n");
5657 + rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n");
5658 rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
5659 rprintf(F," -r, --recursive recurse into directories\n");
5660 rprintf(F," -R, --relative use relative path names\n");
5661 @@ -302,6 +308,9 @@ void usage(enum logcode F)
5662 rprintf(F," -p, --perms preserve permissions\n");
5663 rprintf(F," -E, --executability preserve the file's executability\n");
5664 rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
5665 +#ifdef SUPPORT_ACLS
5666 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
5668 rprintf(F," -o, --owner preserve owner (super-user only)\n");
5669 rprintf(F," -g, --group preserve group\n");
5670 rprintf(F," --devices preserve device files (super-user only)\n");
5671 @@ -422,6 +431,9 @@ static struct poptOption long_options[]
5672 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5673 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5674 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
5675 + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
5676 + {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5677 + {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5678 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
5679 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5680 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5681 @@ -1087,6 +1099,24 @@ int parse_arguments(int *argc, const cha
5686 +#ifdef SUPPORT_ACLS
5687 + preserve_acls = 1;
5688 + preserve_perms = 1;
5691 + /* FIXME: this should probably be ignored with a
5692 + * warning and then countermeasures taken to
5693 + * restrict group and other access in the presence
5694 + * of any more restrictive ACLs, but this is safe
5696 + snprintf(err_buf,sizeof(err_buf),
5697 + "ACLs are not supported on this %s\n",
5698 + am_server ? "server" : "client");
5704 /* A large opt value means that set_refuse_options()
5705 * turned this option off. */
5706 @@ -1223,6 +1253,8 @@ int parse_arguments(int *argc, const cha
5707 preserve_uid = ++flist_extra_cnt;
5709 preserve_gid = ++flist_extra_cnt;
5710 + if (preserve_acls)
5711 + preserve_acls = ++flist_extra_cnt;
5713 *argv = poptGetArgs(pc);
5714 *argc = count_args(*argv);
5715 @@ -1534,6 +1566,10 @@ void server_options(char **args,int *arg
5717 if (preserve_hard_links)
5719 +#ifdef SUPPORT_ACLS
5720 + if (preserve_acls)
5721 + argstr[x++] = 'A';
5728 @@ -47,6 +47,7 @@ extern int keep_partial;
5729 extern int checksum_seed;
5731 extern int delay_updates;
5732 +extern mode_t orig_umask;
5733 extern struct stats stats;
5734 extern char *stdout_format;
5735 extern char *tmpdir;
5736 @@ -347,6 +348,10 @@ int recv_files(int f_in, struct file_lis
5737 int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
5738 enum logcode log_code = log_before_transfer ? FLOG : FINFO;
5739 int max_phase = protocol_version >= 29 ? 2 : 1;
5740 + int dflt_perms = (ACCESSPERMS & ~orig_umask);
5741 +#ifdef SUPPORT_ACLS
5742 + const char *parent_dirname = "";
5747 @@ -545,7 +550,16 @@ int recv_files(int f_in, struct file_lis
5748 * mode based on the local permissions and some heuristics. */
5749 if (!preserve_perms) {
5750 int exists = fd1 != -1;
5751 - file->mode = dest_mode(file->mode, st.st_mode, exists);
5752 +#ifdef SUPPORT_ACLS
5753 + const char *dn = file->dirname ? file->dirname : ".";
5754 + if (parent_dirname != dn
5755 + && strcmp(parent_dirname, dn) != 0) {
5756 + dflt_perms = default_perms_for_dir(dn);
5757 + parent_dirname = dn;
5760 + file->mode = dest_mode(file->mode, st.st_mode,
5761 + dflt_perms, exists);
5764 /* We now check to see if we are writing the file "inplace" */
5771 +extern int preserve_acls;
5772 extern int preserve_perms;
5773 extern int preserve_executability;
5774 extern int preserve_times;
5775 @@ -48,7 +49,6 @@ extern int preserve_gid;
5777 extern int keep_dirlinks;
5778 extern int make_backups;
5779 -extern mode_t orig_umask;
5780 extern struct stats stats;
5781 extern struct file_list *the_file_list;
5782 extern struct chmod_mode_struct *daemon_chmod_modes;
5783 @@ -153,7 +153,8 @@ void free_sums(struct sum_struct *s)
5785 /* This is only called when we aren't preserving permissions. Figure out what
5786 * the permissions should be and return them merged back into the mode. */
5787 -mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists)
5788 +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
5792 /* If the file already exists, we'll return the local permissions,
5793 @@ -170,56 +171,65 @@ mode_t dest_mode(mode_t flist_mode, mode
5794 new_mode |= (new_mode & 0444) >> 2;
5797 - /* Apply the umask and turn off special permissions. */
5798 - new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask));
5799 + /* Apply destination default permissions and turn
5800 + * off special permissions. */
5801 + new_mode = flist_mode & (~CHMOD_BITS | dflt_perms);
5806 -int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
5807 +int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
5813 int change_uid, change_gid;
5814 mode_t new_mode = file->mode;
5820 - if (link_stat(fname, &st2, 0) < 0) {
5821 + if (link_stat(fname, &sx2.st, 0) < 0) {
5822 rsyserr(FERROR, errno, "stat %s failed",
5827 +#ifdef SUPPORT_ACLS
5828 + sx2.acc_acl = sx2.def_acl = NULL;
5830 if (!preserve_perms && S_ISDIR(new_mode)
5831 - && st->st_mode & S_ISGID) {
5832 + && sx2.st.st_mode & S_ISGID) {
5833 /* We just created this directory and its setgid
5834 * bit is on, so make sure it stays on. */
5835 new_mode |= S_ISGID;
5840 - if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
5841 +#ifdef SUPPORT_ACLS
5842 + if (preserve_acls && !ACL_READY(*sxp))
5843 + get_acl(fname, sxp);
5846 + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
5847 flags |= ATTRS_SKIP_MTIME;
5848 if (!(flags & ATTRS_SKIP_MTIME)
5849 - && cmp_time(st->st_mtime, file->modtime) != 0) {
5850 - int ret = set_modtime(fname, file->modtime, st->st_mode);
5851 + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
5852 + int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
5854 rsyserr(FERROR, errno, "failed to set times on %s",
5859 if (ret == 0) /* ret == 1 if symlink could not be set */
5863 - change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
5864 + change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
5865 change_gid = preserve_gid && F_GID(file) != GID_NONE
5866 - && st->st_gid != F_GID(file);
5867 + && sxp->st.st_gid != F_GID(file);
5868 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
5869 - if (S_ISLNK(st->st_mode))
5870 + if (S_ISLNK(sxp->st.st_mode))
5874 @@ -229,45 +239,57 @@ int set_file_attrs(char *fname, struct f
5876 "set uid of %s from %ld to %ld\n",
5878 - (long)st->st_uid, (long)F_UID(file));
5879 + (long)sxp->st.st_uid, (long)F_UID(file));
5883 "set gid of %s from %ld to %ld\n",
5885 - (long)st->st_gid, (long)F_GID(file));
5886 + (long)sxp->st.st_gid, (long)F_GID(file));
5889 if (do_lchown(fname,
5890 - change_uid ? F_UID(file) : st->st_uid,
5891 - change_gid ? F_GID(file) : st->st_gid) != 0) {
5892 + change_uid ? F_UID(file) : sxp->st.st_uid,
5893 + change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
5894 /* shouldn't have attempted to change uid or gid
5895 * unless have the privilege */
5896 rsyserr(FERROR, errno, "%s %s failed",
5897 change_uid ? "chown" : "chgrp",
5902 /* a lchown had been done - we have to re-stat if the
5903 * destination had the setuid or setgid bits set due
5904 * to the side effect of the chown call */
5905 - if (st->st_mode & (S_ISUID | S_ISGID)) {
5906 - link_stat(fname, st,
5907 - keep_dirlinks && S_ISDIR(st->st_mode));
5908 + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) {
5909 + link_stat(fname, &sxp->st,
5910 + keep_dirlinks && S_ISDIR(sxp->st.st_mode));
5915 if (daemon_chmod_modes && !S_ISLNK(new_mode))
5916 new_mode = tweak_mode(new_mode, daemon_chmod_modes);
5918 +#ifdef SUPPORT_ACLS
5919 + /* It's OK to call set_acl() now, even for a dir, as the generator
5920 + * will enable owner-writability using chmod, if necessary.
5922 + * If set_acl() changes permission bits in the process of setting
5923 + * an access ACL, it changes sxp->st.st_mode so we know whether we
5924 + * need to chmod(). */
5925 + if (preserve_acls && set_acl(fname, file, sxp) == 0)
5930 - if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
5931 + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
5932 int ret = do_chmod(fname, new_mode);
5934 rsyserr(FERROR, errno,
5935 "failed to set permissions on %s",
5940 if (ret == 0) /* ret == 1 if symlink could not be set */
5942 @@ -280,6 +302,11 @@ int set_file_attrs(char *fname, struct f
5944 rprintf(FCLIENT, "%s is uptodate\n", fname);
5947 +#ifdef SUPPORT_ACLS
5948 + if (preserve_acls && sxp == &sx2)
5956 @@ -502,6 +502,14 @@ struct idev {
5957 #define IN_LOOPBACKNET 127
5960 +#ifndef HAVE_NO_ACLS
5961 +#define SUPPORT_ACLS 1
5964 +#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
5965 +#define ACLS_NEED_MASK 1
5968 #define GID_NONE ((gid_t)-1)
5970 struct file_struct {
5971 @@ -553,10 +561,12 @@ extern int preserve_gid;
5972 /* When the associated option is on, all entries will have these present: */
5973 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
5974 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
5975 +#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
5977 /* These items are per-entry optional and mutally exclusive: */
5978 #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
5979 #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
5980 +#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
5982 /* This optional item might follow an F_HL_*() item.
5983 * (Note: a device doesn't need to check LEN64_BUMP(f).) */
5984 @@ -692,6 +702,17 @@ struct stats {
5986 struct chmod_mode_struct;
5988 +#define EMPTY_ITEM_LIST {NULL, 0, 0}
5996 +#define EXPAND_ITEM_LIST(lp, type, incr) \
5997 + (type*)expand_item_list(lp, sizeof (type), #type, incr)
5999 #include "byteorder.h"
6000 #include "lib/mdfour.h"
6001 #include "lib/wildmatch.h"
6002 @@ -710,6 +731,16 @@ struct chmod_mode_struct;
6003 #define NORETURN __attribute__((__noreturn__))
6008 +#ifdef SUPPORT_ACLS
6009 + struct rsync_acl *acc_acl; /* access ACL */
6010 + struct rsync_acl *def_acl; /* default ACL */
6014 +#define ACL_READY(sx) ((sx).acc_acl != NULL)
6018 /* We have replacement versions of these if they're missing. */
6021 @@ -301,7 +301,7 @@ to the detailed description below for a
6022 -q, --quiet suppress non-error messages
6023 --no-motd suppress daemon-mode MOTD (see caveat)
6024 -c, --checksum skip based on checksum, not mod-time & size
6025 - -a, --archive archive mode; same as -rlptgoD (no -H)
6026 + -a, --archive archive mode; same as -rlptgoD (no -H, -A)
6027 --no-OPTION turn off an implied OPTION (e.g. --no-D)
6028 -r, --recursive recurse into directories
6029 -R, --relative use relative path names
6030 @@ -323,6 +323,7 @@ to the detailed description below for a
6031 -p, --perms preserve permissions
6032 -E, --executability preserve executability
6033 --chmod=CHMOD affect file and/or directory permissions
6034 + -A, --acls preserve ACLs (implies -p) [non-standard]
6035 -o, --owner preserve owner (super-user only)
6036 -g, --group preserve group
6037 --devices preserve device files (super-user only)
6038 @@ -754,7 +755,9 @@ quote(itemization(
6039 permissions, though the bf(--executability) option might change just
6040 the execute permission for the file.
6041 it() New files get their "normal" permission bits set to the source
6042 - file's permissions masked with the receiving end's umask setting, and
6043 + file's permissions masked with the receiving directory's default
6044 + permissions (either the receiving process's umask, or the permissions
6045 + specified via the destination directory's default ACL), and
6046 their special permission bits disabled except in the case where a new
6047 directory inherits a setgid bit from its parent directory.
6049 @@ -785,9 +788,11 @@ The preservation of the destination's se
6050 directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
6051 versions erroneously preserved the three special permission bits for
6052 newly-created files when bf(--perms) was off, while overriding the
6053 -destination's setgid bit setting on a newly-created directory. (Keep in
6054 -mind that it is the version of the receiving rsync that affects this
6056 +destination's setgid bit setting on a newly-created directory. Default ACL
6057 +observance was added to the ACL patch for rsync 2.6.7, so older (or
6058 +non-ACL-enabled) rsyncs use the umask even if default ACLs are present.
6059 +(Keep in mind that it is the version of the receiving rsync that affects
6062 dit(bf(-E, --executability)) This option causes rsync to preserve the
6063 executability (or non-executability) of regular files when bf(--perms) is
6064 @@ -805,6 +810,15 @@ quote(itemization(
6066 If bf(--perms) is enabled, this option is ignored.
6068 +dit(bf(-A, --acls)) This option causes rsync to update the destination
6069 +ACLs to be the same as the source ACLs. This nonstandard option only
6070 +works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
6072 +Note also that an optimization of the ACL-sending protocol used by this
6073 +version makes it incompatible with sending files to an older ACL-enabled
6074 +rsync unless you double the bf(--acls) option (e.g. bf(-AA)). This
6075 +doubling is not needed when pulling files from an older rsync.
6077 dit(bf(--chmod)) This option tells rsync to apply one or more
6078 comma-separated "chmod" strings to the permission of the files in the
6079 transfer. The resulting value is treated as though it was the permissions
6080 @@ -1402,8 +1416,8 @@ if the receiving rsync is at least versi
6081 with older versions of rsync, but that also turns on the output of other
6084 -The "%i" escape has a cryptic output that is 9 letters long. The general
6085 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
6086 +The "%i" escape has a cryptic output that is 11 letters long. The general
6087 +format is like the string bf(YXcstpoguax), where bf(Y) is replaced by the
6088 type of update being done, bf(X) is replaced by the file-type, and the
6089 other letters represent attributes that may be output if they are being
6091 @@ -1452,7 +1466,11 @@ quote(itemization(
6092 sender's value (requires bf(--owner) and super-user privileges).
6093 it() A bf(g) means the group is different and is being updated to the
6094 sender's value (requires bf(--group) and the authority to set the group).
6095 - it() The bf(z) slot is reserved for future use.
6096 + it() The bf(u) slot is reserved for reporting update (access) time changes
6097 + (a feature that is not yet released).
6098 + it() The bf(a) means that the ACL information changed.
6099 + it() The bf(x) slot is reserved for reporting extended attribute changes
6100 + (a feature that is not yet released).
6103 One other output is possible: when deleting files, the "%i" will output
6108 + Unix SMB/Netbios implementation.
6110 + Portable SMB ACL interface
6111 + Copyright (C) Jeremy Allison 2000
6113 + This program is free software; you can redistribute it and/or modify
6114 + it under the terms of the GNU General Public License as published by
6115 + the Free Software Foundation; either version 2 of the License, or
6116 + (at your option) any later version.
6118 + This program is distributed in the hope that it will be useful,
6119 + but WITHOUT ANY WARRANTY; without even the implied warranty of
6120 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6121 + GNU General Public License for more details.
6123 + You should have received a copy of the GNU General Public License
6124 + along with this program; if not, write to the Free Software
6125 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
6128 +#ifndef _SMB_ACLS_H
6129 +#define _SMB_ACLS_H
6131 +#if defined HAVE_POSIX_ACLS
6133 +/* This is an identity mapping (just remove the SMB_). */
6135 +#define SMB_ACL_TAG_T acl_tag_t
6136 +#define SMB_ACL_TYPE_T acl_type_t
6137 +#define SMB_ACL_PERMSET_T acl_permset_t
6138 +#define SMB_ACL_PERM_T acl_perm_t
6139 +#define SMB_ACL_READ ACL_READ
6140 +#define SMB_ACL_WRITE ACL_WRITE
6141 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6143 +/* Types of ACLs. */
6144 +#define SMB_ACL_USER ACL_USER
6145 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6146 +#define SMB_ACL_GROUP ACL_GROUP
6147 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6148 +#define SMB_ACL_OTHER ACL_OTHER
6149 +#define SMB_ACL_MASK ACL_MASK
6151 +#define SMB_ACL_T acl_t
6153 +#define SMB_ACL_ENTRY_T acl_entry_t
6155 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
6156 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
6158 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6159 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6161 +#elif defined HAVE_TRU64_ACLS
6163 +/* This is for DEC/Compaq Tru64 UNIX */
6165 +#define SMB_ACL_TAG_T acl_tag_t
6166 +#define SMB_ACL_TYPE_T acl_type_t
6167 +#define SMB_ACL_PERMSET_T acl_permset_t
6168 +#define SMB_ACL_PERM_T acl_perm_t
6169 +#define SMB_ACL_READ ACL_READ
6170 +#define SMB_ACL_WRITE ACL_WRITE
6171 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6173 +/* Types of ACLs. */
6174 +#define SMB_ACL_USER ACL_USER
6175 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6176 +#define SMB_ACL_GROUP ACL_GROUP
6177 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6178 +#define SMB_ACL_OTHER ACL_OTHER
6179 +#define SMB_ACL_MASK ACL_MASK
6181 +#define SMB_ACL_T acl_t
6183 +#define SMB_ACL_ENTRY_T acl_entry_t
6185 +#define SMB_ACL_FIRST_ENTRY 0
6186 +#define SMB_ACL_NEXT_ENTRY 1
6188 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6189 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6191 +#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS
6193 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
6194 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
6197 +/* SVR4.2 ES/MP ACLs */
6198 +typedef int SMB_ACL_TAG_T;
6199 +typedef int SMB_ACL_TYPE_T;
6200 +typedef ushort *SMB_ACL_PERMSET_T;
6201 +typedef ushort SMB_ACL_PERM_T;
6202 +#define SMB_ACL_READ 4
6203 +#define SMB_ACL_WRITE 2
6204 +#define SMB_ACL_EXECUTE 1
6206 +/* Types of ACLs. */
6207 +#define SMB_ACL_USER USER
6208 +#define SMB_ACL_USER_OBJ USER_OBJ
6209 +#define SMB_ACL_GROUP GROUP
6210 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6211 +#define SMB_ACL_OTHER OTHER_OBJ
6212 +#define SMB_ACL_MASK CLASS_OBJ
6214 +typedef struct SMB_ACL_T {
6218 + struct acl acl[1];
6221 +typedef struct acl *SMB_ACL_ENTRY_T;
6223 +#define SMB_ACL_FIRST_ENTRY 0
6224 +#define SMB_ACL_NEXT_ENTRY 1
6226 +#define SMB_ACL_TYPE_ACCESS 0
6227 +#define SMB_ACL_TYPE_DEFAULT 1
6230 +#define SMB_ACL_LOSES_SPECIAL_MODE_BITS
6233 +#elif defined HAVE_HPUX_ACLS
6236 + * Based on the Solaris & UnixWare code.
6240 +#include <sys/aclv.h>
6242 +/* SVR4.2 ES/MP ACLs */
6243 +typedef int SMB_ACL_TAG_T;
6244 +typedef int SMB_ACL_TYPE_T;
6245 +typedef ushort *SMB_ACL_PERMSET_T;
6246 +typedef ushort SMB_ACL_PERM_T;
6247 +#define SMB_ACL_READ 4
6248 +#define SMB_ACL_WRITE 2
6249 +#define SMB_ACL_EXECUTE 1
6251 +/* Types of ACLs. */
6252 +#define SMB_ACL_USER USER
6253 +#define SMB_ACL_USER_OBJ USER_OBJ
6254 +#define SMB_ACL_GROUP GROUP
6255 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6256 +#define SMB_ACL_OTHER OTHER_OBJ
6257 +#define SMB_ACL_MASK CLASS_OBJ
6259 +typedef struct SMB_ACL_T {
6263 + struct acl acl[1];
6266 +typedef struct acl *SMB_ACL_ENTRY_T;
6268 +#define SMB_ACL_FIRST_ENTRY 0
6269 +#define SMB_ACL_NEXT_ENTRY 1
6271 +#define SMB_ACL_TYPE_ACCESS 0
6272 +#define SMB_ACL_TYPE_DEFAULT 1
6274 +#elif defined HAVE_IRIX_ACLS
6276 +#define SMB_ACL_TAG_T acl_tag_t
6277 +#define SMB_ACL_TYPE_T acl_type_t
6278 +#define SMB_ACL_PERMSET_T acl_permset_t
6279 +#define SMB_ACL_PERM_T acl_perm_t
6280 +#define SMB_ACL_READ ACL_READ
6281 +#define SMB_ACL_WRITE ACL_WRITE
6282 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6284 +/* Types of ACLs. */
6285 +#define SMB_ACL_USER ACL_USER
6286 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6287 +#define SMB_ACL_GROUP ACL_GROUP
6288 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6289 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
6290 +#define SMB_ACL_MASK ACL_MASK
6292 +typedef struct SMB_ACL_T {
6298 +#define SMB_ACL_ENTRY_T acl_entry_t
6300 +#define SMB_ACL_FIRST_ENTRY 0
6301 +#define SMB_ACL_NEXT_ENTRY 1
6303 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6304 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6306 +#elif defined HAVE_AIX_ACLS
6308 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
6310 +#include "/usr/include/acl.h"
6312 +typedef uint *SMB_ACL_PERMSET_T;
6314 +struct acl_entry_link{
6315 + struct acl_entry_link *prevp;
6316 + struct new_acl_entry *entryp;
6317 + struct acl_entry_link *nextp;
6321 +struct new_acl_entry{
6322 + unsigned short ace_len;
6323 + unsigned short ace_type;
6324 + unsigned int ace_access;
6325 + struct ace_id ace_id[1];
6328 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
6329 +#define SMB_ACL_T struct acl_entry_link*
6331 +#define SMB_ACL_TAG_T unsigned short
6332 +#define SMB_ACL_TYPE_T int
6333 +#define SMB_ACL_PERM_T uint
6334 +#define SMB_ACL_READ S_IRUSR
6335 +#define SMB_ACL_WRITE S_IWUSR
6336 +#define SMB_ACL_EXECUTE S_IXUSR
6338 +/* Types of ACLs. */
6339 +#define SMB_ACL_USER ACEID_USER
6340 +#define SMB_ACL_USER_OBJ 3
6341 +#define SMB_ACL_GROUP ACEID_GROUP
6342 +#define SMB_ACL_GROUP_OBJ 4
6343 +#define SMB_ACL_OTHER 5
6344 +#define SMB_ACL_MASK 6
6347 +#define SMB_ACL_FIRST_ENTRY 1
6348 +#define SMB_ACL_NEXT_ENTRY 2
6350 +#define SMB_ACL_TYPE_ACCESS 0
6351 +#define SMB_ACL_TYPE_DEFAULT 1
6353 +#else /* No ACLs. */
6355 +/* No ACLS - fake it. */
6356 +#define SMB_ACL_TAG_T int
6357 +#define SMB_ACL_TYPE_T int
6358 +#define SMB_ACL_PERMSET_T mode_t
6359 +#define SMB_ACL_PERM_T mode_t
6360 +#define SMB_ACL_READ S_IRUSR
6361 +#define SMB_ACL_WRITE S_IWUSR
6362 +#define SMB_ACL_EXECUTE S_IXUSR
6364 +/* Types of ACLs. */
6365 +#define SMB_ACL_USER 0
6366 +#define SMB_ACL_USER_OBJ 1
6367 +#define SMB_ACL_GROUP 2
6368 +#define SMB_ACL_GROUP_OBJ 3
6369 +#define SMB_ACL_OTHER 4
6370 +#define SMB_ACL_MASK 5
6372 +typedef struct SMB_ACL_T {
6376 +typedef struct SMB_ACL_ENTRY_T {
6378 +} *SMB_ACL_ENTRY_T;
6380 +#define SMB_ACL_FIRST_ENTRY 0
6381 +#define SMB_ACL_NEXT_ENTRY 1
6383 +#define SMB_ACL_TYPE_ACCESS 0
6384 +#define SMB_ACL_TYPE_DEFAULT 1
6386 +#endif /* No ACLs. */
6387 +#endif /* _SMB_ACLS_H */
6388 --- old/testsuite/acls.test
6389 +++ new/testsuite/acls.test
6393 +# This program is distributable under the terms of the GNU GPL (see
6396 +# Test that rsync handles basic ACL preservation.
6398 +. $srcdir/testsuite/rsync.fns
6400 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6401 +case "$setfacl_nodef" in
6402 +true) test_skipped "I don't know how to use your setfacl command" ;;
6405 +makepath "$fromdir/foo"
6406 +echo something >"$fromdir/file1"
6407 +echo else >"$fromdir/file2"
6409 +files='foo file1 file2'
6411 +setfacl -m u:0:7 "$fromdir/foo" || test_skipped "Your filesystem has ACLs disabled"
6412 +setfacl -m u:0:5 "$fromdir/file1"
6413 +setfacl -m u:0:5 "$fromdir/file2"
6415 +$RSYNC -avvA "$fromdir/" "$todir/"
6418 +getfacl $files >"$scratchdir/acls.txt"
6421 +getfacl $files | diff $diffopt "$scratchdir/acls.txt" -
6423 +# The script would have aborted on error, so getting here means we've won.
6425 --- old/testsuite/default-acls.test
6426 +++ new/testsuite/default-acls.test
6430 +# This program is distributable under the terms of the GNU GPL (see
6433 +# Test that rsync obeys default ACLs. -- Matt McCutchen
6435 +. $srcdir/testsuite/rsync.fns
6437 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6438 +case "$setfacl_nodef" in
6439 +true) test_skipped "I don't know how to use your setfacl command" ;;
6440 +*-k*) opts='-dm u::7,g::5,o:5' ;;
6441 +*) opts='-m d:u::7,d:g::5,d:o:5' ;;
6443 +setfacl $opts "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
6445 +# Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
6447 + todir="$scratchdir/$1"
6449 + $setfacl_nodef "$todir"
6451 + case "$setfacl_nodef" in
6452 + *-k*) opts="-dm $2" ;;
6453 + *) opts="-m `echo $2 | sed 's/\([ugom]:\)/d:\1/g'`"
6455 + setfacl $opts "$todir"
6457 + # Make sure we obey ACLs when creating a directory to hold multiple transferred files,
6458 + # even though the directory itself is outside the transfer
6459 + $RSYNC -rvv "$scratchdir/dir" "$scratchdir/file" "$scratchdir/program" "$todir/to/"
6460 + check_perms "$todir/to" $4 "Target $1"
6461 + check_perms "$todir/to/dir" $4 "Target $1"
6462 + check_perms "$todir/to/file" $3 "Target $1"
6463 + check_perms "$todir/to/program" $4 "Target $1"
6464 + # Make sure get_local_name doesn't mess us up when transferring only one file
6465 + $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
6466 + check_perms "$todir/to/anotherfile" $3 "Target $1"
6467 + # Make sure we obey default ACLs when not transferring a regular file
6468 + $RSYNC -rvv "$scratchdir/dir/" "$todir/to/anotherdir/"
6469 + check_perms "$todir/to/anotherdir" $4 "Target $1"
6472 +mkdir "$scratchdir/dir"
6473 +echo "File!" >"$scratchdir/file"
6474 +echo "#!/bin/sh" >"$scratchdir/program"
6475 +chmod 777 "$scratchdir/dir"
6476 +chmod 666 "$scratchdir/file"
6477 +chmod 777 "$scratchdir/program"
6479 +# Test some target directories
6481 +testit da777 u::7,g::7,o:7 rw-rw-rw- rwxrwxrwx
6482 +testit da775 u::7,g::7,o:5 rw-rw-r-- rwxrwxr-x
6483 +testit da750 u::7,g::5,o:0 rw-r----- rwxr-x---
6484 +testit da770mask u::7,u:0:7,g::0,m:7,o:0 rw-rw---- rwxrwx---
6485 +testit noda1 '' rw------- rwx------
6487 +testit noda2 '' rw-rw-rw- rwxrwxrwx
6489 +testit noda3 '' rw-r--r-- rwxr-xr-x
6493 --- old/testsuite/devices.test
6494 +++ new/testsuite/devices.test
6495 @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
6496 $RSYNC -ai "$fromdir/block" "$todir/block2" \
6498 cat <<EOT >"$chkfile"
6502 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6504 $RSYNC -ai "$fromdir/block2" "$todir/block" \
6506 cat <<EOT >"$chkfile"
6510 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6512 @@ -58,7 +58,7 @@ sleep 1
6513 $RSYNC -Di "$fromdir/block3" "$todir/block" \
6515 cat <<EOT >"$chkfile"
6519 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6521 @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
6524 cat <<EOT >"$chkfile"
6529 -hD+++++++ block2.5 => block3
6538 +hD+++++++++ block2.5 => block3
6544 if test ! -b "$fromdir/block2.5"; then
6545 sed -e '/block2\.5/d' \
6546 @@ -94,15 +94,15 @@ if test -b "$fromdir/block2.5"; then
6547 $RSYNC -aii --link-dest="$todir" "$fromdir/" "$chkdir/" \
6549 cat <<EOT >"$chkfile"
6569 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
6571 --- old/testsuite/itemize.test
6572 +++ new/testsuite/itemize.test
6573 @@ -38,15 +38,15 @@ rm -f "$to2dir" "$to2dir.test"
6574 $RSYNC -iplr "$fromdir/" "$todir/" \
6576 cat <<EOT >"$chkfile"
6580 ->f+++++++ bar/baz/rsync
6582 ->f+++++++ foo/config1
6583 ->f+++++++ foo/config2
6584 ->f+++++++ foo/extra
6585 -cL+++++++ foo/sym -> ../bar/baz/rsync
6588 +cd+++++++++ bar/baz/
6589 +>f+++++++++ bar/baz/rsync
6591 +>f+++++++++ foo/config1
6592 +>f+++++++++ foo/config2
6593 +>f+++++++++ foo/extra
6594 +cL+++++++++ foo/sym -> ../bar/baz/rsync
6596 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6598 @@ -58,10 +58,10 @@ chmod 601 "$fromdir/foo/config2"
6599 $RSYNC -iplrH "$fromdir/" "$todir/" \
6601 cat <<EOT >"$chkfile"
6602 ->f..T.... bar/baz/rsync
6603 ->f..T.... foo/config1
6604 ->f.sTp... foo/config2
6605 -hf..T.... foo/extra => foo/config1
6606 +>f..T...... bar/baz/rsync
6607 +>f..T...... foo/config1
6608 +>f.sTp..... foo/config2
6609 +hf..T...... foo/extra => foo/config1
6611 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6613 @@ -78,11 +78,11 @@ chmod 777 "$todir/bar/baz/rsync"
6614 $RSYNC -iplrtc "$fromdir/" "$todir/" \
6616 cat <<EOT >"$chkfile"
6617 -.f..tp... bar/baz/rsync
6619 -.f..t.... foo/config1
6620 ->fcstp... foo/config2
6621 -cL..T.... foo/sym -> ../bar/baz/rsync
6622 +.f..tp..... bar/baz/rsync
6624 +.f..t...... foo/config1
6625 +>fcstp..... foo/config2
6626 +cL..T...... foo/sym -> ../bar/baz/rsync
6628 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6630 @@ -107,15 +107,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
6633 cat <<EOT >"$chkfile"
6637 -.f...p... bar/baz/rsync
6640 ->f..t.... foo/config2
6642 -.L foo/sym -> ../bar/baz/rsync
6646 +.f...p..... bar/baz/rsync
6649 +>f..t...... foo/config2
6651 +.L foo/sym -> ../bar/baz/rsync
6653 diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
6655 @@ -134,8 +134,8 @@ touch "$todir/foo/config2"
6656 $RSYNC -iplrtH "$fromdir/" "$todir/" \
6658 cat <<EOT >"$chkfile"
6659 -.f...p... foo/config1
6660 ->f..t.... foo/config2
6661 +.f...p..... foo/config1
6662 +>f..t...... foo/config2
6664 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
6666 @@ -143,15 +143,15 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fro
6669 cat <<EOT >"$chkfile"
6677 -hf foo/extra => foo/config1
6678 -cL foo/sym -> ../bar/baz/rsync
6686 +hf foo/extra => foo/config1
6687 +cL foo/sym -> ../bar/baz/rsync
6689 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
6691 @@ -159,7 +159,7 @@ rm -rf "$to2dir"
6692 $RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
6694 cat <<EOT >"$chkfile"
6695 -hf foo/extra => foo/config1
6696 +hf foo/extra => foo/config1
6698 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
6700 @@ -185,15 +185,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
6703 cat <<EOT >"$chkfile"
6711 -hf foo/extra => foo/config1
6712 -$L foo/sym -> ../bar/baz/rsync
6720 +hf foo/extra => foo/config1
6721 +$L foo/sym -> ../bar/baz/rsync
6723 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
6725 @@ -233,15 +233,15 @@ $RSYNC -ivvplrtH --compare-dest="$todir"
6728 cat <<EOT >"$chkfile"
6737 -.L foo/sym -> ../bar/baz/rsync
6746 +.L foo/sym -> ../bar/baz/rsync
6748 diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
6754 extern int preserve_uid;
6755 extern int preserve_gid;
6756 +extern int preserve_acls;
6757 extern int numeric_ids;
6760 @@ -270,7 +271,7 @@ void send_uid_list(int f)
6762 struct idlist *list;
6764 - if (preserve_uid) {
6765 + if (preserve_uid || preserve_acls) {
6767 /* we send sequences of uid/byte-length/name */
6768 for (list = uidlist; list; list = list->next) {
6769 @@ -287,7 +288,7 @@ void send_uid_list(int f)
6773 - if (preserve_gid) {
6774 + if (preserve_gid || preserve_acls) {
6776 for (list = gidlist; list; list = list->next) {
6778 @@ -308,7 +309,7 @@ void recv_uid_list(int f, struct file_li
6782 - if (preserve_uid && !numeric_ids) {
6783 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
6784 /* read the uid list */
6785 while ((id = read_int(f)) != 0) {
6786 int len = read_byte(f);
6787 @@ -320,7 +321,7 @@ void recv_uid_list(int f, struct file_li
6791 - if (preserve_gid && !numeric_ids) {
6792 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
6793 /* read the gid list */
6794 while ((id = read_int(f)) != 0) {
6795 int len = read_byte(f);
6796 @@ -332,6 +333,16 @@ void recv_uid_list(int f, struct file_li
6800 +#ifdef SUPPORT_ACLS
6801 + if (preserve_acls && !numeric_ids) {
6803 + while ((id = next_acl_uid(flist)) != NULL)
6804 + *id = match_uid(*id);
6805 + while ((id = next_acl_gid(flist)) != NULL)
6806 + *id = match_gid(*id);
6810 /* Now convert all the uids/gids from sender values to our values. */
6811 if (am_root && preserve_uid && !numeric_ids) {
6812 for (i = 0; i < flist->count; i++)
6815 @@ -1467,3 +1467,31 @@ int bitbag_next_bit(struct bitbag *bb, i
6820 +void *expand_item_list(item_list *lp, size_t item_size,
6821 + const char *desc, int incr)
6823 + /* First time through, 0 <= 0, so list is expanded. */
6824 + if (lp->malloced <= lp->count) {
6826 + size_t new_size = lp->malloced;
6828 + new_size -= incr; /* increase slowly */
6829 + else if (new_size < (size_t)incr)
6833 + new_ptr = realloc_array(lp->items, char, new_size * item_size);
6834 + if (verbose >= 4) {
6835 + rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
6836 + who_am_i(), desc, (double)new_size * item_size,
6837 + new_ptr == lp->items ? " not" : "");
6840 + out_of_memory("expand_item_list");
6842 + lp->items = new_ptr;
6843 + lp->malloced = new_size;
6845 + return (char*)lp->items + (lp->count++ * item_size);