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=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
25 util.o main.o checksum.o match.o syscall.o log.o backup.o
26 OBJS2=options.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... */
1226 @@ -48,6 +48,8 @@ void setup_protocol(int f_out,int f_in)
1227 preserve_uid = ++flist_extra_cnt;
1229 preserve_gid = ++flist_extra_cnt;
1230 + if (preserve_acls && !am_sender)
1231 + preserve_acls = ++flist_extra_cnt;
1233 if (remote_protocol == 0) {
1235 --- old/configure.in
1236 +++ new/configure.in
1237 @@ -537,6 +537,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1238 AC_CHECK_LIB(resolv, strcasecmp)
1241 +AC_CHECK_FUNCS(aclsort)
1242 +if test x"$ac_cv_func_aclsort" = x"no"; then
1243 + AC_CHECK_LIB(sec, aclsort)
1246 dnl At the moment we don't test for a broken memcmp(), because all we
1247 dnl need to do is test for equality, not comparison, and it seems that
1248 dnl every platform has a memcmp that can do at least that.
1249 @@ -801,6 +806,78 @@ AC_SUBST(OBJ_RESTORE)
1250 AC_SUBST(CC_SHOBJ_FLAG)
1251 AC_SUBST(BUILD_POPT)
1253 +AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
1254 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1255 +#################################################
1256 +# check for ACL support
1258 +AC_MSG_CHECKING(whether to support ACLs)
1259 +AC_ARG_ENABLE(acl-support,
1260 +AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
1261 +[ case "$enableval" in
1264 + case "$host_os" in
1266 + AC_MSG_RESULT(Using UnixWare ACLs)
1267 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1269 + *solaris*|*cygwin*)
1270 + AC_MSG_RESULT(Using solaris ACLs)
1271 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1274 + AC_MSG_RESULT(Using HPUX ACLs)
1275 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1278 + AC_MSG_RESULT(Using IRIX ACLs)
1279 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1282 + AC_MSG_RESULT(Using AIX ACLs)
1283 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1286 + AC_MSG_RESULT(Using Tru64 ACLs)
1287 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1288 + LIBS="$LIBS -lpacl"
1291 + AC_MSG_RESULT(ACLs requested -- running tests)
1292 + AC_CHECK_LIB(acl,acl_get_file)
1293 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1294 + AC_TRY_LINK([#include <sys/types.h>
1295 +#include <sys/acl.h>],
1296 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1297 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1298 + AC_MSG_CHECKING(ACL test results)
1299 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1300 + AC_MSG_RESULT(Using posix ACLs)
1301 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1302 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1303 + AC_TRY_LINK([#include <sys/types.h>
1304 +#include <sys/acl.h>],
1305 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1306 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1307 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1308 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1311 + AC_MSG_ERROR(Failed to find ACL support)
1318 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1321 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1325 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1330 @@ -41,6 +41,7 @@ extern int filesfrom_fd;
1331 extern int one_file_system;
1332 extern int copy_dirlinks;
1333 extern int keep_dirlinks;
1334 +extern int preserve_acls;
1335 extern int preserve_links;
1336 extern int preserve_hard_links;
1337 extern int preserve_devices;
1338 @@ -147,6 +148,8 @@ static void list_file_entry(struct file_
1339 permstring(permbuf, f->mode);
1342 + /* TODO: indicate '+' if the entry has an ACL. */
1344 #ifdef SUPPORT_LINKS
1345 if (preserve_links && S_ISLNK(f->mode)) {
1346 rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
1347 @@ -662,6 +665,12 @@ static struct file_struct *recv_file_ent
1351 +#ifdef SUPPORT_ACLS
1352 + /* We need one or two index int32s when we're preserving ACLs. */
1353 + if (preserve_acls)
1354 + extra_len += (S_ISDIR(mode) ? 2 : 1) * sizeof (union flist_extras);
1357 if (always_checksum && S_ISREG(mode))
1358 extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
1360 @@ -799,6 +808,11 @@ static struct file_struct *recv_file_ent
1361 read_buf(f, bp, checksum_len);
1364 +#ifdef SUPPORT_ACLS
1365 + if (preserve_acls)
1366 + receive_acl(file, f);
1372 @@ -1068,6 +1082,9 @@ static struct file_struct *send_file_nam
1373 unsigned short flags)
1375 struct file_struct *file;
1376 +#ifdef SUPPORT_ACLS
1380 file = make_file(fname, flist, stp, flags,
1381 f == -2 ? SERVER_FILTERS : ALL_FILTERS);
1382 @@ -1077,12 +1094,26 @@ static struct file_struct *send_file_nam
1383 if (chmod_modes && !S_ISLNK(file->mode))
1384 file->mode = tweak_mode(file->mode, chmod_modes);
1386 +#ifdef SUPPORT_ACLS
1387 + if (preserve_acls && f >= 0) {
1388 + sx.st.st_mode = file->mode;
1389 + sx.acc_acl = sx.def_acl = NULL;
1390 + if (get_acl(fname, &sx) < 0)
1395 maybe_emit_filelist_progress(flist->count + flist_count_offset);
1397 flist_expand(flist);
1398 flist->files[flist->count++] = file;
1401 send_file_entry(file, f, flist->count - 1);
1402 +#ifdef SUPPORT_ACLS
1403 + if (preserve_acls)
1412 @@ -35,6 +35,7 @@ extern int do_progress;
1413 extern int relative_paths;
1414 extern int implied_dirs;
1415 extern int keep_dirlinks;
1416 +extern int preserve_acls;
1417 extern int preserve_links;
1418 extern int preserve_devices;
1419 extern int preserve_specials;
1420 @@ -87,6 +88,7 @@ extern int force_delete;
1421 extern int one_file_system;
1422 extern struct stats stats;
1423 extern dev_t filesystem_dev;
1424 +extern mode_t orig_umask;
1425 extern char *backup_dir;
1426 extern char *backup_suffix;
1427 extern int backup_suffix_len;
1428 @@ -518,21 +520,26 @@ static void do_delete_pass(struct file_l
1429 rprintf(FINFO, " \r");
1432 -int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
1433 +int unchanged_attrs(struct file_struct *file, statx *sxp)
1435 - if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1436 + if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1439 - if (am_root && preserve_uid && st->st_uid != F_UID(file))
1440 + if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
1443 - if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
1444 + if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
1447 +#ifdef SUPPORT_ACLS
1448 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1455 -void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
1456 +void itemize(struct file_struct *file, int ndx, int statret, statx *sxp,
1457 int32 iflags, uchar fnamecmp_type, const char *xname)
1459 if (statret >= 0) { /* A from-dest-dir statret can == 1! */
1460 @@ -540,20 +547,24 @@ void itemize(struct file_struct *file, i
1461 : S_ISDIR(file->mode) ? !omit_dir_times
1462 : !S_ISLNK(file->mode);
1464 - if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
1465 + if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
1466 iflags |= ITEM_REPORT_SIZE;
1467 if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
1468 && !(iflags & ITEM_MATCHED)
1469 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
1470 - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
1471 + || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
1472 iflags |= ITEM_REPORT_TIME;
1473 - if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1474 + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1475 iflags |= ITEM_REPORT_PERMS;
1476 - if (preserve_uid && am_root && F_UID(file) != st->st_uid)
1477 + if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
1478 iflags |= ITEM_REPORT_OWNER;
1479 if (preserve_gid && F_GID(file) != GID_NONE
1480 - && st->st_gid != F_GID(file))
1481 + && sxp->st.st_gid != F_GID(file))
1482 iflags |= ITEM_REPORT_GROUP;
1483 +#ifdef SUPPORT_ACLS
1484 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1485 + iflags |= ITEM_REPORT_ACL;
1488 iflags |= ITEM_IS_NEW;
1490 @@ -808,7 +819,7 @@ void check_for_finished_hlinks(int itemi
1491 * handling the file, -1 if no dest-linking occurred, or a non-negative
1492 * value if we found an alternate basis file. */
1493 static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
1494 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1495 + char *cmpbuf, statx *sxp, int itemizing,
1498 int best_match = -1;
1499 @@ -817,7 +828,7 @@ static int try_dests_reg(struct file_str
1502 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1503 - if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
1504 + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
1506 switch (match_level) {
1508 @@ -825,16 +836,20 @@ static int try_dests_reg(struct file_str
1512 - if (!unchanged_file(cmpbuf, file, stp))
1513 + if (!unchanged_file(cmpbuf, file, &sxp->st))
1519 - if (!unchanged_attrs(file, stp))
1520 +#ifdef SUPPORT_ACLS
1521 + if (preserve_acls)
1522 + get_acl(cmpbuf, sxp);
1524 + if (!unchanged_attrs(file, sxp))
1526 if (always_checksum && preserve_times
1527 - && cmp_time(stp->st_mtime, file->modtime))
1528 + && cmp_time(sxp->st.st_mtime, file->modtime))
1532 @@ -849,7 +864,7 @@ static int try_dests_reg(struct file_str
1533 if (j != best_match) {
1535 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1536 - if (link_stat(cmpbuf, stp, 0) < 0)
1537 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1541 @@ -859,16 +874,25 @@ static int try_dests_reg(struct file_str
1542 if (!hard_link_one(file, fname, cmpbuf, 1))
1544 if (preserve_hard_links && F_IS_HLINKED(file))
1545 - finish_hard_link(file, fname, stp, itemizing, code, j);
1546 + finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
1547 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
1548 - itemize(file, ndx, 1, stp,
1549 +#ifdef SUPPORT_ACLS
1550 + if (preserve_acls && !ACL_READY(*sxp))
1551 + get_acl(fname, sxp);
1553 + itemize(file, ndx, 1, sxp,
1554 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
1560 - itemize(file, ndx, 0, stp, 0, 0, NULL);
1562 +#ifdef SUPPORT_ACLS
1563 + if (preserve_acls && !ACL_READY(*sxp))
1564 + get_acl(fname, sxp);
1566 + itemize(file, ndx, 0, sxp, 0, 0, NULL);
1568 if (verbose > 1 && maybe_ATTRS_REPORT)
1569 rprintf(FCLIENT, "%s is uptodate\n", fname);
1571 @@ -885,8 +909,13 @@ static int try_dests_reg(struct file_str
1576 - itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
1578 +#ifdef SUPPORT_ACLS
1579 + if (preserve_acls && !ACL_READY(*sxp))
1580 + get_acl(fname, sxp);
1582 + itemize(file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
1584 set_file_attrs(fname, file, NULL, 0);
1585 if (maybe_ATTRS_REPORT
1586 && ((!itemizing && verbose && match_level == 2)
1587 @@ -897,7 +926,7 @@ static int try_dests_reg(struct file_str
1589 #ifdef SUPPORT_HARD_LINKS
1590 if (preserve_hard_links && F_IS_HLINKED(file))
1591 - finish_hard_link(file, fname, stp, itemizing, code, -1);
1592 + finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
1596 @@ -909,7 +938,7 @@ static int try_dests_reg(struct file_str
1597 * handling the file, or -1 if no dest-linking occurred, or a non-negative
1598 * value if we found an alternate basis file. */
1599 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
1600 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1601 + char *cmpbuf, statx *sxp, int itemizing,
1604 char lnk[MAXPATHLEN];
1605 @@ -942,24 +971,24 @@ static int try_dests_non(struct file_str
1608 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1609 - if (link_stat(cmpbuf, stp, 0) < 0)
1610 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1614 - if (!S_ISDIR(stp->st_mode))
1615 + if (!S_ISDIR(sxp->st.st_mode))
1619 - if (!IS_SPECIAL(stp->st_mode))
1620 + if (!IS_SPECIAL(sxp->st.st_mode))
1624 - if (!IS_DEVICE(stp->st_mode))
1625 + if (!IS_DEVICE(sxp->st.st_mode))
1628 #ifdef SUPPORT_LINKS
1630 - if (!S_ISLNK(stp->st_mode))
1631 + if (!S_ISLNK(sxp->st.st_mode))
1635 @@ -974,7 +1003,7 @@ static int try_dests_non(struct file_str
1638 devp = F_RDEV_P(file);
1639 - if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1640 + if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1643 #ifdef SUPPORT_LINKS
1644 @@ -991,7 +1020,11 @@ static int try_dests_non(struct file_str
1648 - if (unchanged_attrs(file, stp)) {
1649 +#ifdef SUPPORT_ACLS
1650 + if (preserve_acls)
1651 + get_acl(cmpbuf, sxp);
1653 + if (unchanged_attrs(file, sxp)) {
1657 @@ -1004,7 +1037,7 @@ static int try_dests_non(struct file_str
1658 if (j != best_match) {
1660 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1661 - if (link_stat(cmpbuf, stp, 0) < 0)
1662 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1666 @@ -1035,7 +1068,15 @@ static int try_dests_non(struct file_str
1668 + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
1669 char *lp = match_level == 3 ? "" : NULL;
1670 - itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
1671 +#ifdef SUPPORT_ACLS
1672 + if (preserve_acls)
1673 + get_acl(fname, sxp);
1675 + itemize(file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
1676 +#ifdef SUPPORT_ACLS
1677 + if (preserve_acls)
1681 if (verbose > 1 && maybe_ATTRS_REPORT) {
1682 rprintf(FCLIENT, "%s%s is uptodate\n",
1683 @@ -1048,6 +1089,7 @@ static int try_dests_non(struct file_str
1686 static int phase = 0;
1687 +static int dflt_perms;
1689 /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
1690 * make sure it exists, and has the right permissions/timestamp info. For
1691 @@ -1068,7 +1110,8 @@ static void recv_generator(char *fname,
1692 static int need_fuzzy_dirlist = 0;
1693 struct file_struct *fuzzy_file = NULL;
1694 int fd = -1, f_copy = -1;
1695 - STRUCT_STAT st, real_st, partial_st;
1696 + statx sx, real_sx;
1697 + STRUCT_STAT partial_st;
1698 struct file_struct *back_file = NULL;
1699 int statret, real_ret, stat_errno;
1700 char *fnamecmp, *partialptr, *backupptr = NULL;
1701 @@ -1124,6 +1167,9 @@ static void recv_generator(char *fname,
1702 } else if (!dry_run)
1705 +#ifdef SUPPORT_ACLS
1706 + sx.acc_acl = sx.def_acl = NULL;
1710 stat_errno = ENOENT;
1711 @@ -1131,7 +1177,7 @@ static void recv_generator(char *fname,
1712 const char *dn = file->dirname ? file->dirname : ".";
1713 if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
1714 if (relative_paths && !implied_dirs
1715 - && do_stat(dn, &st) < 0
1716 + && do_stat(dn, &sx.st) < 0
1717 && create_directory_path(fname) < 0) {
1718 rsyserr(FERROR, errno,
1719 "recv_generator: mkdir %s failed",
1720 @@ -1143,6 +1189,10 @@ static void recv_generator(char *fname,
1723 need_fuzzy_dirlist = 1;
1724 +#ifdef SUPPORT_ACLS
1725 + if (!preserve_perms)
1726 + dflt_perms = default_perms_for_dir(dn);
1729 parent_dirname = dn;
1731 @@ -1152,7 +1202,7 @@ static void recv_generator(char *fname,
1732 need_fuzzy_dirlist = 0;
1735 - statret = link_stat(fname, &st,
1736 + statret = link_stat(fname, &sx.st,
1737 keep_dirlinks && S_ISDIR(file->mode));
1740 @@ -1170,8 +1220,9 @@ static void recv_generator(char *fname,
1741 * mode based on the local permissions and some heuristics. */
1742 if (!preserve_perms) {
1743 int exists = statret == 0
1744 - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
1745 - file->mode = dest_mode(file->mode, st.st_mode, exists);
1746 + && S_ISDIR(sx.st.st_mode) == S_ISDIR(file->mode);
1747 + file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
1751 if (S_ISDIR(file->mode)) {
1752 @@ -1180,8 +1231,8 @@ static void recv_generator(char *fname,
1753 * file of that name and it is *not* a directory, then
1754 * we need to delete it. If it doesn't exist, then
1755 * (perhaps recursively) create it. */
1756 - if (statret == 0 && !S_ISDIR(st.st_mode)) {
1757 - if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
1758 + if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
1759 + if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
1763 @@ -1190,14 +1241,14 @@ static void recv_generator(char *fname,
1770 if (*fname == '.' && fname[1] == '\0')
1774 if (statret != 0 && basis_dir[0] != NULL) {
1775 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1776 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1780 @@ -1206,7 +1257,11 @@ static void recv_generator(char *fname,
1783 if (itemizing && f_out != -1) {
1784 - itemize(file, ndx, statret, &st,
1785 +#ifdef SUPPORT_ACLS
1786 + if (preserve_acls && statret == 0)
1787 + get_acl(fname, &sx);
1789 + itemize(file, ndx, statret, &sx,
1790 statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
1792 if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
1793 @@ -1226,21 +1281,21 @@ static void recv_generator(char *fname,
1797 - if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
1798 + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, 0)
1799 && verbose && code != FNONE && f_out != -1)
1800 rprintf(code, "%s/\n", fname);
1801 if (real_ret != 0 && one_file_system)
1802 - real_st.st_dev = filesystem_dev;
1803 + real_sx.st.st_dev = filesystem_dev;
1804 if (delete_during && f_out != -1 && !phase && dry_run < 2
1805 && (file->flags & FLAG_XFER_DIR))
1806 - delete_in_dir(the_file_list, fname, file, &real_st);
1808 + delete_in_dir(the_file_list, fname, file, &real_sx.st);
1812 #ifdef SUPPORT_HARD_LINKS
1813 if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
1814 - && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
1816 + && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
1820 if (preserve_links && S_ISLNK(file->mode)) {
1821 @@ -1260,17 +1315,17 @@ static void recv_generator(char *fname,
1822 char lnk[MAXPATHLEN];
1825 - if (!S_ISLNK(st.st_mode))
1826 + if (!S_ISLNK(sx.st.st_mode))
1828 else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
1829 && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
1830 /* The link is pointing to the right place. */
1832 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1833 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1834 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1835 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1836 #ifdef SUPPORT_HARD_LINKS
1837 if (preserve_hard_links && F_IS_HLINKED(file))
1838 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1839 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1841 if (remove_source_files == 1)
1842 goto return_with_success;
1843 @@ -1278,10 +1333,10 @@ static void recv_generator(char *fname,
1845 /* Not the right symlink (or not a symlink), so
1847 - if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
1848 + if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
1850 } else if (basis_dir[0] != NULL) {
1851 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1852 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1855 #ifndef CAN_HARDLINK_SYMLINK
1856 @@ -1306,7 +1361,7 @@ static void recv_generator(char *fname,
1858 set_file_attrs(fname, file, NULL, 0);
1860 - itemize(file, ndx, statret, &st,
1861 + itemize(file, ndx, statret, &sx,
1862 ITEM_LOCAL_CHANGE, 0, NULL);
1864 if (code != FNONE && verbose)
1865 @@ -1332,33 +1387,38 @@ static void recv_generator(char *fname,
1868 if (IS_DEVICE(file->mode)) {
1869 - if (!IS_DEVICE(st.st_mode))
1870 + if (!IS_DEVICE(sx.st.st_mode))
1874 - if (!IS_SPECIAL(st.st_mode))
1875 + if (!IS_SPECIAL(sx.st.st_mode))
1880 - && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
1881 - && st.st_rdev == rdev) {
1882 + && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
1883 + && sx.st.st_rdev == rdev) {
1884 /* The device or special file is identical. */
1886 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1887 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1889 +#ifdef SUPPORT_ACLS
1890 + if (preserve_acls)
1891 + get_acl(fname, &sx);
1893 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1895 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1896 #ifdef SUPPORT_HARD_LINKS
1897 if (preserve_hard_links && F_IS_HLINKED(file))
1898 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1899 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1901 if (remove_source_files == 1)
1902 goto return_with_success;
1906 - if (delete_item(fname, st.st_mode, t, del_opts) != 0)
1907 + if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
1909 } else if (basis_dir[0] != NULL) {
1910 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1911 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1914 #ifndef CAN_HARDLINK_SPECIAL
1915 @@ -1388,7 +1448,11 @@ static void recv_generator(char *fname,
1917 set_file_attrs(fname, file, NULL, 0);
1919 - itemize(file, ndx, statret, &st,
1920 +#ifdef SUPPORT_ACLS
1921 + if (preserve_acls && statret == 0)
1922 + get_acl(fname, &sx);
1924 + itemize(file, ndx, statret, &sx,
1925 ITEM_LOCAL_CHANGE, 0, NULL);
1927 if (code != FNONE && verbose)
1928 @@ -1400,7 +1464,7 @@ static void recv_generator(char *fname,
1929 if (remove_source_files == 1)
1930 goto return_with_success;
1936 if (!S_ISREG(file->mode)) {
1937 @@ -1434,7 +1498,7 @@ static void recv_generator(char *fname,
1940 if (update_only && statret == 0
1941 - && cmp_time(st.st_mtime, file->modtime) > 0) {
1942 + && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
1944 rprintf(FINFO, "%s is newer\n", fname);
1946 @@ -1443,20 +1507,20 @@ static void recv_generator(char *fname,
1948 fnamecmp_type = FNAMECMP_FNAME;
1950 - if (statret == 0 && !S_ISREG(st.st_mode)) {
1951 - if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
1952 + if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
1953 + if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
1956 stat_errno = ENOENT;
1959 if (statret != 0 && basis_dir[0] != NULL) {
1960 - int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
1961 + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
1964 if (remove_source_files == 1)
1965 goto return_with_success;
1970 fnamecmp = fnamecmpbuf;
1971 @@ -1466,7 +1530,7 @@ static void recv_generator(char *fname,
1978 if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
1979 && link_stat(partialptr, &partial_st, 0) == 0
1980 @@ -1485,7 +1549,7 @@ static void recv_generator(char *fname,
1981 rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
1982 fname, fnamecmpbuf);
1984 - st.st_size = F_LENGTH(fuzzy_file);
1985 + sx.st.st_size = F_LENGTH(fuzzy_file);
1987 fnamecmp = fnamecmpbuf;
1988 fnamecmp_type = FNAMECMP_FUZZY;
1989 @@ -1504,36 +1568,41 @@ static void recv_generator(char *fname,
1993 - if (append_mode && st.st_size > F_LENGTH(file))
1994 + if (append_mode && sx.st.st_size > F_LENGTH(file))
1997 if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
1999 else if (fnamecmp_type == FNAMECMP_FUZZY)
2001 - else if (unchanged_file(fnamecmp, file, &st)) {
2002 + else if (unchanged_file(fnamecmp, file, &sx.st)) {
2004 do_unlink(partialptr);
2005 handle_partial_dir(partialptr, PDIR_DELETE);
2008 - itemize(file, ndx, statret, &st, 0, 0, NULL);
2009 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
2011 +#ifdef SUPPORT_ACLS
2012 + if (preserve_acls && statret == 0)
2013 + get_acl(fnamecmp, &sx);
2015 + itemize(file, ndx, statret, &sx, 0, 0, NULL);
2017 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
2018 #ifdef SUPPORT_HARD_LINKS
2019 if (preserve_hard_links && F_IS_HLINKED(file))
2020 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2021 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2023 if (remove_source_files != 1)
2026 return_with_success:
2028 send_msg_int(MSG_SUCCESS, ndx);
2036 + sx.st = partial_st;
2037 fnamecmp = partialptr;
2038 fnamecmp_type = FNAMECMP_PARTIAL_DIR;
2040 @@ -1558,16 +1627,20 @@ static void recv_generator(char *fname,
2041 /* pretend the file didn't exist */
2042 #ifdef SUPPORT_HARD_LINKS
2043 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
2047 statret = real_ret = -1;
2048 +#ifdef SUPPORT_ACLS
2049 + if (preserve_acls && ACL_READY(sx))
2055 if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
2056 if (!(backupptr = get_backup_name(fname))) {
2061 if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
2063 @@ -1578,7 +1651,7 @@ static void recv_generator(char *fname,
2064 full_fname(backupptr));
2065 unmake_file(back_file);
2070 if ((f_copy = do_open(backupptr,
2071 O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
2072 @@ -1586,14 +1659,14 @@ static void recv_generator(char *fname,
2073 full_fname(backupptr));
2074 unmake_file(back_file);
2079 fnamecmp_type = FNAMECMP_BACKUP;
2083 rprintf(FINFO, "gen mapped %s of size %.0f\n",
2084 - fnamecmp, (double)st.st_size);
2085 + fnamecmp, (double)sx.st.st_size);
2089 @@ -1615,26 +1688,34 @@ static void recv_generator(char *fname,
2090 iflags |= ITEM_BASIS_TYPE_FOLLOWS;
2091 if (fnamecmp_type == FNAMECMP_FUZZY)
2092 iflags |= ITEM_XNAME_FOLLOWS;
2093 - itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
2094 +#ifdef SUPPORT_ACLS
2095 + if (preserve_acls && real_ret == 0)
2096 + get_acl(fnamecmp, &real_sx);
2098 + itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
2099 fuzzy_file ? fuzzy_file->basename : NULL);
2100 +#ifdef SUPPORT_ACLS
2101 + if (preserve_acls)
2102 + free_acl(&real_sx);
2107 #ifdef SUPPORT_HARD_LINKS
2108 if (preserve_hard_links && F_IS_HLINKED(file))
2109 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2110 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2119 if (statret != 0 || whole_file) {
2120 write_sum_head(f_out, NULL);
2125 - generate_and_send_sums(fd, st.st_size, f_out, f_copy);
2126 + generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy);
2130 @@ -1647,6 +1728,13 @@ static void recv_generator(char *fname,
2136 +#ifdef SUPPORT_ACLS
2137 + if (preserve_acls)
2143 void generate_files(int f_out, struct file_list *flist, char *local_name)
2144 @@ -1713,6 +1801,8 @@ void generate_files(int f_out, struct fi
2145 * notice that and let us know via the redo pipe (or its closing). */
2148 + dflt_perms = (ACCESSPERMS & ~orig_umask);
2150 for (i = 0; i < flist->count; i++) {
2151 struct file_struct *file = flist->files[i];
2155 @@ -27,6 +27,7 @@ extern int verbose;
2157 extern int do_xfers;
2158 extern int link_dest;
2159 +extern int preserve_acls;
2160 extern int make_backups;
2161 extern int protocol_version;
2162 extern int remove_source_files;
2163 @@ -269,15 +270,19 @@ void match_hard_links(void)
2166 static int maybe_hard_link(struct file_struct *file, int ndx,
2167 - const char *fname, int statret, STRUCT_STAT *stp,
2168 + const char *fname, int statret, statx *sxp,
2169 const char *oldname, STRUCT_STAT *old_stp,
2170 const char *realname, int itemizing, enum logcode code)
2173 - if (stp->st_dev == old_stp->st_dev
2174 - && stp->st_ino == old_stp->st_ino) {
2175 + if (sxp->st.st_dev == old_stp->st_dev
2176 + && sxp->st.st_ino == old_stp->st_ino) {
2178 - itemize(file, ndx, statret, stp,
2179 +#ifdef SUPPORT_ACLS
2180 + if (preserve_acls && !ACL_READY(*sxp))
2181 + get_acl(fname, sxp);
2183 + itemize(file, ndx, statret, sxp,
2184 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
2187 @@ -298,7 +303,11 @@ static int maybe_hard_link(struct file_s
2189 if (hard_link_one(file, fname, oldname, 0)) {
2191 - itemize(file, ndx, statret, stp,
2192 +#ifdef SUPPORT_ACLS
2193 + if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
2194 + get_acl(fname, sxp);
2196 + itemize(file, ndx, statret, sxp,
2197 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
2200 @@ -312,7 +321,7 @@ static int maybe_hard_link(struct file_s
2201 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
2202 * 0 = process the file, 1 = skip the file, -1 = error occurred. */
2203 int hard_link_check(struct file_struct *file, int ndx, const char *fname,
2204 - int statret, STRUCT_STAT *stp, int itemizing,
2205 + int statret, statx *sxp, int itemizing,
2208 STRUCT_STAT prev_st;
2209 @@ -363,18 +372,20 @@ int hard_link_check(struct file_struct *
2210 if (statret < 0 && basis_dir[0] != NULL) {
2211 /* If we match an alt-dest item, we don't output this as a change. */
2212 char cmpbuf[MAXPATHLEN];
2213 - STRUCT_STAT alt_st;
2216 +#ifdef SUPPORT_ACLS
2217 + alt_sx.acc_acl = alt_sx.def_acl = NULL;
2220 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
2221 - if (link_stat(cmpbuf, &alt_st, 0) < 0)
2222 + if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
2225 - if (prev_st.st_dev != alt_st.st_dev
2226 - || prev_st.st_ino != alt_st.st_ino)
2227 + if (prev_st.st_dev != alt_sx.st.st_dev
2228 + || prev_st.st_ino != alt_sx.st.st_ino)
2232 if (verbose < 2 || !stdout_format_has_i) {
2235 @@ -383,16 +394,36 @@ int hard_link_check(struct file_struct *
2239 - if (!unchanged_file(cmpbuf, file, &alt_st))
2240 + if (!unchanged_file(cmpbuf, file, &alt_sx.st))
2244 - if (unchanged_attrs(file, &alt_st))
2245 +#ifdef SUPPORT_ACLS
2246 + if (preserve_acls)
2247 + get_acl(cmpbuf, &alt_sx);
2249 + if (unchanged_attrs(file, &alt_sx))
2251 } while (basis_dir[++j] != NULL);
2252 + if (statret == 1) {
2253 + sxp->st = alt_sx.st;
2254 +#ifdef SUPPORT_ACLS
2255 + if (preserve_acls) {
2256 + if (!ACL_READY(*sxp))
2257 + get_acl(cmpbuf, sxp);
2259 + sxp->acc_acl = alt_sx.acc_acl;
2260 + sxp->def_acl = alt_sx.def_acl;
2265 +#ifdef SUPPORT_ACLS
2266 + else if (preserve_acls)
2267 + free_acl(&alt_sx);
2271 - if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
2272 + if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
2273 realname, itemizing, code) < 0)
2276 @@ -427,7 +458,8 @@ void finish_hard_link(struct file_struct
2277 STRUCT_STAT *stp, int itemizing, enum logcode code,
2280 - STRUCT_STAT st, prev_st;
2283 char alt_name[MAXPATHLEN], *prev_name;
2284 const char *our_name;
2285 int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
2286 @@ -451,14 +483,24 @@ void finish_hard_link(struct file_struct
2290 +#ifdef SUPPORT_ACLS
2291 + prev_sx.acc_acl = prev_sx.def_acl = NULL;
2294 while ((ndx = prev_ndx) >= 0) {
2297 file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
2298 prev_ndx = F_HL_PREV(file);
2299 prev_name = f_name(file, NULL);
2300 - prev_statret = link_stat(prev_name, &prev_st, 0);
2301 - if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
2302 - our_name, stp, fname, itemizing, code) < 0)
2303 + prev_statret = link_stat(prev_name, &prev_sx.st, 0);
2304 + val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
2305 + our_name, stp, fname, itemizing, code);
2306 +#ifdef SUPPORT_ACLS
2307 + if (preserve_acls)
2308 + free_acl(&prev_sx);
2312 if (remove_source_files == 1 && do_xfers)
2313 send_msg_int(MSG_SUCCESS, ndx);
2314 --- old/lib/sysacls.c
2315 +++ new/lib/sysacls.c
2318 + Unix SMB/CIFS implementation.
2319 + Samba system utilities for ACL support.
2320 + Copyright (C) Jeremy Allison 2000.
2322 + This program is free software; you can redistribute it and/or modify
2323 + it under the terms of the GNU General Public License as published by
2324 + the Free Software Foundation; either version 2 of the License, or
2325 + (at your option) any later version.
2327 + This program is distributed in the hope that it will be useful,
2328 + but WITHOUT ANY WARRANTY; without even the implied warranty of
2329 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2330 + GNU General Public License for more details.
2332 + You should have received a copy of the GNU General Public License
2333 + along with this program; if not, write to the Free Software
2334 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2338 +#include "sysacls.h" /****** ADDED ******/
2340 +#ifdef SUPPORT_ACLS
2342 +/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
2348 +void SAFE_FREE(void *mem)
2354 +char *uidtoname(uid_t uid)
2356 + static char idbuf[12];
2357 + struct passwd *pw;
2359 + if ((pw = getpwuid(uid)) == NULL) {
2360 + slprintf(idbuf, sizeof(idbuf)-1, "%ld", (long)uid);
2363 + return pw->pw_name;
2365 +/****** EXTRAS -- END ******/
2368 + This file wraps all differing system ACL interfaces into a consistent
2369 + one based on the POSIX interface. It also returns the correct errors
2370 + for older UNIX systems that don't support ACLs.
2372 + The interfaces that each ACL implementation must support are as follows :
2374 + int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2375 + int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2376 + int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
2377 + void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2378 + SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2379 + SMB_ACL_T sys_acl_get_fd(int fd)
2380 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
2381 + int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
2382 + char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
2383 + SMB_ACL_T sys_acl_init( int count)
2384 + int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2385 + int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2386 + int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2387 + int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2388 + int sys_acl_valid( SMB_ACL_T theacl )
2389 + int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2390 + int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2391 + int sys_acl_delete_def_file(const char *path)
2393 + This next one is not POSIX complient - but we *have* to have it !
2394 + More POSIX braindamage.
2396 + int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2398 + The generic POSIX free is the following call. We split this into
2399 + several different free functions as we may need to add tag info
2400 + to structures when emulating the POSIX interface.
2402 + int sys_acl_free( void *obj_p)
2404 + The calls we actually use are :
2406 + int sys_acl_free_text(char *text) - free acl_to_text
2407 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
2408 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
2412 +#if defined(HAVE_POSIX_ACLS)
2414 +/* Identity mapping - easy. */
2416 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2418 + return acl_get_entry( the_acl, entry_id, entry_p);
2421 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2423 + return acl_get_tag_type( entry_d, tag_type_p);
2426 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2428 + return acl_get_permset( entry_d, permset_p);
2431 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2433 + return acl_get_qualifier( entry_d);
2436 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2438 + return acl_get_file( path_p, type);
2441 +SMB_ACL_T sys_acl_get_fd(int fd)
2443 + return acl_get_fd(fd);
2446 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2448 + return acl_clear_perms(permset);
2451 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2453 + return acl_add_perm(permset, perm);
2456 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2458 +#if defined(HAVE_ACL_GET_PERM_NP)
2460 + * Required for TrustedBSD-based ACL implementations where
2461 + * non-POSIX.1e functions are denoted by a _np (non-portable)
2464 + return acl_get_perm_np(permset, perm);
2466 + return acl_get_perm(permset, perm);
2470 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2472 + return acl_to_text( the_acl, plen);
2475 +SMB_ACL_T sys_acl_init( int count)
2477 + return acl_init(count);
2480 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2482 + return acl_create_entry(pacl, pentry);
2485 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2487 + return acl_set_tag_type(entry, tagtype);
2490 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2492 + return acl_set_qualifier(entry, qual);
2495 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2497 + return acl_set_permset(entry, permset);
2500 +int sys_acl_valid( SMB_ACL_T theacl )
2502 + return acl_valid(theacl);
2505 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2507 + return acl_set_file(name, acltype, theacl);
2510 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2512 + return acl_set_fd(fd, theacl);
2515 +int sys_acl_delete_def_file(const char *name)
2517 + return acl_delete_def_file(name);
2520 +int sys_acl_free_text(char *text)
2522 + return acl_free(text);
2525 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2527 + return acl_free(the_acl);
2530 +int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
2532 + return acl_free(qual);
2535 +#elif defined(HAVE_TRU64_ACLS)
2537 + * The interface to DEC/Compaq Tru64 UNIX ACLs
2538 + * is based on Draft 13 of the POSIX spec which is
2539 + * slightly different from the Draft 16 interface.
2541 + * Also, some of the permset manipulation functions
2542 + * such as acl_clear_perm() and acl_add_perm() appear
2543 + * to be broken on Tru64 so we have to manipulate
2544 + * the permission bits in the permset directly.
2546 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2548 + SMB_ACL_ENTRY_T entry;
2550 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
2555 + if ((entry = acl_get_entry(the_acl)) != NULL) {
2560 + return errno ? -1 : 0;
2563 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2565 + return acl_get_tag_type( entry_d, tag_type_p);
2568 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2570 + return acl_get_permset( entry_d, permset_p);
2573 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2575 + return acl_get_qualifier( entry_d);
2578 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2580 + return acl_get_file((char *)path_p, type);
2583 +SMB_ACL_T sys_acl_get_fd(int fd)
2585 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
2588 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2590 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
2595 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2597 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
2602 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
2607 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2609 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
2612 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2614 + return acl_to_text( the_acl, plen);
2617 +SMB_ACL_T sys_acl_init( int count)
2619 + return acl_init(count);
2622 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2624 + SMB_ACL_ENTRY_T entry;
2626 + if ((entry = acl_create_entry(pacl)) == NULL) {
2634 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2636 + return acl_set_tag_type(entry, tagtype);
2639 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2641 + return acl_set_qualifier(entry, qual);
2644 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2646 + return acl_set_permset(entry, permset);
2649 +int sys_acl_valid( SMB_ACL_T theacl )
2651 + acl_entry_t entry;
2653 + return acl_valid(theacl, &entry);
2656 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2658 + return acl_set_file((char *)name, acltype, theacl);
2661 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2663 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
2666 +int sys_acl_delete_def_file(const char *name)
2668 + return acl_delete_def_file((char *)name);
2671 +int sys_acl_free_text(char *text)
2674 + * (void) cast and explicit return 0 are for DEC UNIX
2675 + * which just #defines acl_free_text() to be free()
2677 + (void) acl_free_text(text);
2681 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2683 + return acl_free(the_acl);
2686 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2688 + return acl_free_qualifier(qual, tagtype);
2691 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
2694 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
2695 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
2699 + * Note that while this code implements sufficient functionality
2700 + * to support the sys_acl_* interfaces it does not provide all
2701 + * of the semantics of the POSIX ACL interfaces.
2703 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2704 + * from a call to sys_acl_get_entry() should not be assumed to be
2705 + * valid after calling any of the following functions, which may
2706 + * reorder the entries in the ACL.
2709 + * sys_acl_set_file()
2710 + * sys_acl_set_fd()
2714 + * The only difference between Solaris and UnixWare / OpenUNIX is
2715 + * that the #defines for the ACL operations have different names
2717 +#if defined(HAVE_UNIXWARE_ACLS)
2719 +#define SETACL ACL_SET
2720 +#define GETACL ACL_GET
2721 +#define GETACLCNT ACL_CNT
2726 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2728 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2733 + if (entry_p == NULL) {
2738 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2742 + if (acl_d->next < 0) {
2747 + if (acl_d->next >= acl_d->count) {
2751 + *entry_p = &acl_d->acl[acl_d->next++];
2756 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2758 + *type_p = entry_d->a_type;
2763 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2765 + *permset_p = &entry_d->a_perm;
2770 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2772 + if (entry_d->a_type != SMB_ACL_USER
2773 + && entry_d->a_type != SMB_ACL_GROUP) {
2778 + return &entry_d->a_id;
2782 + * There is no way of knowing what size the ACL returned by
2783 + * GETACL will be unless you first call GETACLCNT which means
2784 + * making an additional system call.
2786 + * In the hope of avoiding the cost of the additional system
2787 + * call in most cases, we initially allocate enough space for
2788 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2789 + * be too small then we use GETACLCNT to find out the actual
2790 + * size, reallocate the ACL buffer, and then call GETACL again.
2793 +#define INITIAL_ACL_SIZE 16
2795 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2798 + int count; /* # of ACL entries allocated */
2799 + int naccess; /* # of access ACL entries */
2800 + int ndefault; /* # of default ACL entries */
2802 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2807 + count = INITIAL_ACL_SIZE;
2808 + if ((acl_d = sys_acl_init(count)) == NULL) {
2813 + * If there isn't enough space for the ACL entries we use
2814 + * GETACLCNT to determine the actual number of ACL entries
2815 + * reallocate and try again. This is in a loop because it
2816 + * is possible that someone else could modify the ACL and
2817 + * increase the number of entries between the call to
2818 + * GETACLCNT and the call to GETACL.
2820 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
2821 + && errno == ENOSPC) {
2823 + sys_acl_free_acl(acl_d);
2825 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
2829 + if ((acl_d = sys_acl_init(count)) == NULL) {
2835 + sys_acl_free_acl(acl_d);
2840 + * calculate the number of access and default ACL entries
2842 + * Note: we assume that the acl() system call returned a
2843 + * well formed ACL which is sorted so that all of the
2844 + * access ACL entries preceed any default ACL entries
2846 + for (naccess = 0; naccess < count; naccess++) {
2847 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2850 + ndefault = count - naccess;
2853 + * if the caller wants the default ACL we have to copy
2854 + * the entries down to the start of the acl[] buffer
2855 + * and mask out the ACL_DEFAULT flag from the type field
2857 + if (type == SMB_ACL_TYPE_DEFAULT) {
2860 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2861 + acl_d->acl[i] = acl_d->acl[j];
2862 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2865 + acl_d->count = ndefault;
2867 + acl_d->count = naccess;
2873 +SMB_ACL_T sys_acl_get_fd(int fd)
2876 + int count; /* # of ACL entries allocated */
2877 + int naccess; /* # of access ACL entries */
2879 + count = INITIAL_ACL_SIZE;
2880 + if ((acl_d = sys_acl_init(count)) == NULL) {
2884 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2885 + && errno == ENOSPC) {
2887 + sys_acl_free_acl(acl_d);
2889 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2893 + if ((acl_d = sys_acl_init(count)) == NULL) {
2899 + sys_acl_free_acl(acl_d);
2904 + * calculate the number of access ACL entries
2906 + for (naccess = 0; naccess < count; naccess++) {
2907 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2911 + acl_d->count = naccess;
2916 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2923 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2925 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2926 + && perm != SMB_ACL_EXECUTE) {
2931 + if (permset_d == NULL) {
2936 + *permset_d |= perm;
2941 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2943 + return *permset_d & perm;
2946 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2953 + * use an initial estimate of 20 bytes per ACL entry
2954 + * when allocating memory for the text representation
2958 + maxlen = 20 * acl_d->count;
2959 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
2964 + for (i = 0; i < acl_d->count; i++) {
2965 + struct acl *ap = &acl_d->acl[i];
2974 + switch (ap->a_type) {
2976 + * for debugging purposes it's probably more
2977 + * useful to dump unknown tag types rather
2978 + * than just returning an error
2981 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
2984 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2989 + case SMB_ACL_USER:
2990 + id = uidtoname(ap->a_id);
2991 + case SMB_ACL_USER_OBJ:
2995 + case SMB_ACL_GROUP:
2996 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2997 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3003 + case SMB_ACL_GROUP_OBJ:
3007 + case SMB_ACL_OTHER:
3011 + case SMB_ACL_MASK:
3017 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3018 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3019 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3022 + /* <tag> : <qualifier> : rwx \n \0 */
3023 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3026 + * If this entry would overflow the buffer
3027 + * allocate enough additional memory for this
3028 + * entry and an estimate of another 20 bytes
3029 + * for each entry still to be processed
3031 + if ((len + nbytes) > maxlen) {
3032 + char *oldtext = text;
3034 + maxlen += nbytes + 20 * (acl_d->count - i);
3036 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3037 + SAFE_FREE(oldtext);
3043 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3044 + len += nbytes - 1;
3053 +SMB_ACL_T sys_acl_init(int count)
3063 + * note that since the definition of the structure pointed
3064 + * to by the SMB_ACL_T includes the first element of the
3065 + * acl[] array, this actually allocates an ACL with room
3066 + * for (count+1) entries
3068 + if ((a = (SMB_ACL_T)SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3073 + a->size = count + 1;
3081 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3084 + SMB_ACL_ENTRY_T entry_d;
3086 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3091 + if (acl_d->count >= acl_d->size) {
3096 + entry_d = &acl_d->acl[acl_d->count++];
3097 + entry_d->a_type = 0;
3098 + entry_d->a_id = -1;
3099 + entry_d->a_perm = 0;
3100 + *entry_p = entry_d;
3105 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3107 + switch (tag_type) {
3108 + case SMB_ACL_USER:
3109 + case SMB_ACL_USER_OBJ:
3110 + case SMB_ACL_GROUP:
3111 + case SMB_ACL_GROUP_OBJ:
3112 + case SMB_ACL_OTHER:
3113 + case SMB_ACL_MASK:
3114 + entry_d->a_type = tag_type;
3124 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3126 + if (entry_d->a_type != SMB_ACL_GROUP
3127 + && entry_d->a_type != SMB_ACL_USER) {
3132 + entry_d->a_id = *((id_t *)qual_p);
3137 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3139 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3143 + entry_d->a_perm = *permset_d;
3149 + * sort the ACL and check it for validity
3151 + * if it's a minimal ACL with only 4 entries then we
3152 + * need to recalculate the mask permissions to make
3153 + * sure that they are the same as the GROUP_OBJ
3154 + * permissions as required by the UnixWare acl() system call.
3156 + * (note: since POSIX allows minimal ACLs which only contain
3157 + * 3 entries - ie there is no mask entry - we should, in theory,
3158 + * check for this and add a mask entry if necessary - however
3159 + * we "know" that the caller of this interface always specifies
3160 + * a mask so, in practice "this never happens" (tm) - if it *does*
3161 + * happen aclsort() will fail and return an error and someone will
3162 + * have to fix it ...)
3165 +static int acl_sort(SMB_ACL_T acl_d)
3167 + int fixmask = (acl_d->count <= 4);
3169 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
3176 +int sys_acl_valid(SMB_ACL_T acl_d)
3178 + return acl_sort(acl_d);
3181 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3184 + struct acl *acl_p;
3186 + struct acl *acl_buf = NULL;
3189 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3194 + if (acl_sort(acl_d) != 0) {
3198 + acl_p = &acl_d->acl[0];
3199 + acl_count = acl_d->count;
3202 + * if it's a directory there is extra work to do
3203 + * since the acl() system call will replace both
3204 + * the access ACLs and the default ACLs (if any)
3206 + if (stat(name, &s) != 0) {
3209 + if (S_ISDIR(s.st_mode)) {
3210 + SMB_ACL_T acc_acl;
3211 + SMB_ACL_T def_acl;
3212 + SMB_ACL_T tmp_acl;
3215 + if (type == SMB_ACL_TYPE_ACCESS) {
3217 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3221 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3224 + if (tmp_acl == NULL) {
3229 + * allocate a temporary buffer for the complete ACL
3231 + acl_count = acc_acl->count + def_acl->count;
3232 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
3234 + if (acl_buf == NULL) {
3235 + sys_acl_free_acl(tmp_acl);
3241 + * copy the access control and default entries into the buffer
3243 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3244 + acc_acl->count * sizeof(acl_buf[0]));
3246 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3247 + def_acl->count * sizeof(acl_buf[0]));
3250 + * set the ACL_DEFAULT flag on the default entries
3252 + for (i = acc_acl->count; i < acl_count; i++) {
3253 + acl_buf[i].a_type |= ACL_DEFAULT;
3256 + sys_acl_free_acl(tmp_acl);
3258 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3263 + ret = acl(name, SETACL, acl_count, acl_p);
3265 + SAFE_FREE(acl_buf);
3270 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3272 + if (acl_sort(acl_d) != 0) {
3276 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
3279 +int sys_acl_delete_def_file(const char *path)
3285 + * fetching the access ACL and rewriting it has
3286 + * the effect of deleting the default ACL
3288 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3292 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
3294 + sys_acl_free_acl(acl_d);
3299 +int sys_acl_free_text(char *text)
3305 +int sys_acl_free_acl(SMB_ACL_T acl_d)
3311 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
3316 +#elif defined(HAVE_HPUX_ACLS)
3320 + * Based on the Solaris/SCO code - with modifications.
3324 + * Note that while this code implements sufficient functionality
3325 + * to support the sys_acl_* interfaces it does not provide all
3326 + * of the semantics of the POSIX ACL interfaces.
3328 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
3329 + * from a call to sys_acl_get_entry() should not be assumed to be
3330 + * valid after calling any of the following functions, which may
3331 + * reorder the entries in the ACL.
3334 + * sys_acl_set_file()
3335 + * sys_acl_set_fd()
3338 +/* This checks if the POSIX ACL system call is defined */
3339 +/* which basically corresponds to whether JFS 3.3 or */
3340 +/* higher is installed. If acl() was called when it */
3341 +/* isn't defined, it causes the process to core dump */
3342 +/* so it is important to check this and avoid acl() */
3343 +/* calls if it isn't there. */
3345 +static BOOL hpux_acl_call_presence(void)
3348 + shl_t handle = NULL;
3351 + static BOOL already_checked=0;
3353 + if(already_checked)
3357 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
3359 + if(ret_val != 0) {
3360 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
3361 + ret_val, errno, strerror(errno)));
3362 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
3366 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
3368 + already_checked = True;
3372 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3374 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3379 + if (entry_p == NULL) {
3384 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3388 + if (acl_d->next < 0) {
3393 + if (acl_d->next >= acl_d->count) {
3397 + *entry_p = &acl_d->acl[acl_d->next++];
3402 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3404 + *type_p = entry_d->a_type;
3409 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3411 + *permset_p = &entry_d->a_perm;
3416 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3418 + if (entry_d->a_type != SMB_ACL_USER
3419 + && entry_d->a_type != SMB_ACL_GROUP) {
3424 + return &entry_d->a_id;
3428 + * There is no way of knowing what size the ACL returned by
3429 + * ACL_GET will be unless you first call ACL_CNT which means
3430 + * making an additional system call.
3432 + * In the hope of avoiding the cost of the additional system
3433 + * call in most cases, we initially allocate enough space for
3434 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
3435 + * be too small then we use ACL_CNT to find out the actual
3436 + * size, reallocate the ACL buffer, and then call ACL_GET again.
3439 +#define INITIAL_ACL_SIZE 16
3441 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3444 + int count; /* # of ACL entries allocated */
3445 + int naccess; /* # of access ACL entries */
3446 + int ndefault; /* # of default ACL entries */
3448 + if(hpux_acl_call_presence() == False) {
3449 + /* Looks like we don't have the acl() system call on HPUX.
3450 + * May be the system doesn't have the latest version of JFS.
3455 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3460 + count = INITIAL_ACL_SIZE;
3461 + if ((acl_d = sys_acl_init(count)) == NULL) {
3466 + * If there isn't enough space for the ACL entries we use
3467 + * ACL_CNT to determine the actual number of ACL entries
3468 + * reallocate and try again. This is in a loop because it
3469 + * is possible that someone else could modify the ACL and
3470 + * increase the number of entries between the call to
3471 + * ACL_CNT and the call to ACL_GET.
3473 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
3475 + sys_acl_free_acl(acl_d);
3477 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
3481 + if ((acl_d = sys_acl_init(count)) == NULL) {
3487 + sys_acl_free_acl(acl_d);
3492 + * calculate the number of access and default ACL entries
3494 + * Note: we assume that the acl() system call returned a
3495 + * well formed ACL which is sorted so that all of the
3496 + * access ACL entries preceed any default ACL entries
3498 + for (naccess = 0; naccess < count; naccess++) {
3499 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
3502 + ndefault = count - naccess;
3505 + * if the caller wants the default ACL we have to copy
3506 + * the entries down to the start of the acl[] buffer
3507 + * and mask out the ACL_DEFAULT flag from the type field
3509 + if (type == SMB_ACL_TYPE_DEFAULT) {
3512 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
3513 + acl_d->acl[i] = acl_d->acl[j];
3514 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
3517 + acl_d->count = ndefault;
3519 + acl_d->count = naccess;
3525 +SMB_ACL_T sys_acl_get_fd(int fd)
3528 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
3531 + files_struct *fsp = file_find_fd(fd);
3533 + if (fsp == NULL) {
3539 + * We know we're in the same conn context. So we
3540 + * can use the relative path.
3543 + return sys_acl_get_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
3546 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3553 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3555 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3556 + && perm != SMB_ACL_EXECUTE) {
3561 + if (permset_d == NULL) {
3566 + *permset_d |= perm;
3571 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3573 + return *permset_d & perm;
3576 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3583 + * use an initial estimate of 20 bytes per ACL entry
3584 + * when allocating memory for the text representation
3588 + maxlen = 20 * acl_d->count;
3589 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
3594 + for (i = 0; i < acl_d->count; i++) {
3595 + struct acl *ap = &acl_d->acl[i];
3604 + switch (ap->a_type) {
3606 + * for debugging purposes it's probably more
3607 + * useful to dump unknown tag types rather
3608 + * than just returning an error
3611 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
3614 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3619 + case SMB_ACL_USER:
3620 + id = uidtoname(ap->a_id);
3621 + case SMB_ACL_USER_OBJ:
3625 + case SMB_ACL_GROUP:
3626 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3627 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3633 + case SMB_ACL_GROUP_OBJ:
3637 + case SMB_ACL_OTHER:
3641 + case SMB_ACL_MASK:
3647 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3648 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3649 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3652 + /* <tag> : <qualifier> : rwx \n \0 */
3653 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3656 + * If this entry would overflow the buffer
3657 + * allocate enough additional memory for this
3658 + * entry and an estimate of another 20 bytes
3659 + * for each entry still to be processed
3661 + if ((len + nbytes) > maxlen) {
3662 + char *oldtext = text;
3664 + maxlen += nbytes + 20 * (acl_d->count - i);
3666 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3673 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3674 + len += nbytes - 1;
3683 +SMB_ACL_T sys_acl_init(int count)
3693 + * note that since the definition of the structure pointed
3694 + * to by the SMB_ACL_T includes the first element of the
3695 + * acl[] array, this actually allocates an ACL with room
3696 + * for (count+1) entries
3698 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3703 + a->size = count + 1;
3711 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3714 + SMB_ACL_ENTRY_T entry_d;
3716 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3721 + if (acl_d->count >= acl_d->size) {
3726 + entry_d = &acl_d->acl[acl_d->count++];
3727 + entry_d->a_type = 0;
3728 + entry_d->a_id = -1;
3729 + entry_d->a_perm = 0;
3730 + *entry_p = entry_d;
3735 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3737 + switch (tag_type) {
3738 + case SMB_ACL_USER:
3739 + case SMB_ACL_USER_OBJ:
3740 + case SMB_ACL_GROUP:
3741 + case SMB_ACL_GROUP_OBJ:
3742 + case SMB_ACL_OTHER:
3743 + case SMB_ACL_MASK:
3744 + entry_d->a_type = tag_type;
3754 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3756 + if (entry_d->a_type != SMB_ACL_GROUP
3757 + && entry_d->a_type != SMB_ACL_USER) {
3762 + entry_d->a_id = *((id_t *)qual_p);
3767 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3769 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3773 + entry_d->a_perm = *permset_d;
3778 +/* Structure to capture the count for each type of ACE. */
3780 +struct hpux_acl_types {
3784 + int n_def_user_obj;
3789 + int n_def_group_obj;
3793 + int n_def_other_obj;
3796 + int n_def_class_obj;
3798 + int n_illegal_obj;
3802 + * Counts the different number of objects in a given array of ACL
3806 + * acl_count - Count of ACLs in the array of ACL strucutres.
3807 + * aclp - Array of ACL structures.
3808 + * acl_type_count - Pointer to acl_types structure. Should already be
3812 + * acl_type_count - This structure is filled up with counts of various
3816 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
3820 + memset(acl_type_count, 0, sizeof(struct hpux_acl_types));
3822 + for(i=0;i<acl_count;i++) {
3823 + switch(aclp[i].a_type) {
3825 + acl_type_count->n_user++;
3828 + acl_type_count->n_user_obj++;
3830 + case DEF_USER_OBJ:
3831 + acl_type_count->n_def_user_obj++;
3834 + acl_type_count->n_group++;
3837 + acl_type_count->n_group_obj++;
3839 + case DEF_GROUP_OBJ:
3840 + acl_type_count->n_def_group_obj++;
3843 + acl_type_count->n_other_obj++;
3845 + case DEF_OTHER_OBJ:
3846 + acl_type_count->n_def_other_obj++;
3849 + acl_type_count->n_class_obj++;
3851 + case DEF_CLASS_OBJ:
3852 + acl_type_count->n_def_class_obj++;
3855 + acl_type_count->n_def_user++;
3858 + acl_type_count->n_def_group++;
3861 + acl_type_count->n_illegal_obj++;
3867 +/* swap_acl_entries: Swaps two ACL entries.
3869 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3872 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3874 + struct acl temp_acl;
3876 + temp_acl.a_type = aclp0->a_type;
3877 + temp_acl.a_id = aclp0->a_id;
3878 + temp_acl.a_perm = aclp0->a_perm;
3880 + aclp0->a_type = aclp1->a_type;
3881 + aclp0->a_id = aclp1->a_id;
3882 + aclp0->a_perm = aclp1->a_perm;
3884 + aclp1->a_type = temp_acl.a_type;
3885 + aclp1->a_id = temp_acl.a_id;
3886 + aclp1->a_perm = temp_acl.a_perm;
3889 +/* prohibited_duplicate_type
3890 + * Identifies if given ACL type can have duplicate entries or
3893 + * Inputs: acl_type - ACL Type.
3899 + * True - If the ACL type matches any of the prohibited types.
3900 + * False - If the ACL type doesn't match any of the prohibited types.
3903 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
3905 + switch(acl_type) {
3916 +/* get_needed_class_perm
3917 + * Returns the permissions of a ACL structure only if the ACL
3918 + * type matches one of the pre-determined types for computing
3919 + * CLASS_OBJ permissions.
3921 + * Inputs: aclp - Pointer to ACL structure.
3924 +static int hpux_get_needed_class_perm(struct acl *aclp)
3926 + switch(aclp->a_type) {
3930 + case DEF_USER_OBJ:
3932 + case DEF_GROUP_OBJ:
3934 + case DEF_CLASS_OBJ:
3935 + case DEF_OTHER_OBJ:
3936 + return aclp->a_perm;
3942 +/* acl_sort for HPUX.
3943 + * Sorts the array of ACL structures as per the description in
3944 + * aclsort man page. Refer to aclsort man page for more details
3948 + * acl_count - Count of ACLs in the array of ACL structures.
3949 + * calclass - If this is not zero, then we compute the CLASS_OBJ
3951 + * aclp - Array of ACL structures.
3955 + * aclp - Sorted array of ACL structures.
3959 + * Returns 0 for success -1 for failure. Prints a message to the Samba
3960 + * debug log in case of failure.
3963 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
3965 +#if !defined(HAVE_HPUX_ACLSORT)
3967 + * The aclsort() system call is availabe on the latest HPUX General
3968 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
3969 + * function. Because, we don't want to update to a new
3970 + * HPUX GR bundle just for aclsort() call.
3973 + struct hpux_acl_types acl_obj_count;
3974 + int n_class_obj_perm = 0;
3978 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
3982 + if(aclp == NULL) {
3983 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
3987 + /* Count different types of ACLs in the ACLs array */
3989 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
3991 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
3992 + * CLASS_OBJ and OTHER_OBJ
3995 + if( (acl_obj_count.n_user_obj != 1) ||
3996 + (acl_obj_count.n_group_obj != 1) ||
3997 + (acl_obj_count.n_class_obj != 1) ||
3998 + (acl_obj_count.n_other_obj != 1)
4000 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
4001 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
4005 + /* If any of the default objects are present, there should be only
4006 + * one of them each.
4009 + if( (acl_obj_count.n_def_user_obj > 1) || (acl_obj_count.n_def_group_obj > 1) ||
4010 + (acl_obj_count.n_def_other_obj > 1) || (acl_obj_count.n_def_class_obj > 1) ) {
4011 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
4012 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
4016 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
4019 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
4020 + * same ACL type, sort by ACL id.
4022 + * I am using the trival kind of sorting method here because, performance isn't
4023 + * really effected by the ACLs feature. More over there aren't going to be more
4024 + * than 17 entries on HPUX.
4027 + for(i=0; i<acl_count;i++) {
4028 + for (j=i+1; j<acl_count; j++) {
4029 + if( aclp[i].a_type > aclp[j].a_type ) {
4030 + /* ACL entries out of order, swap them */
4032 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4034 + } else if ( aclp[i].a_type == aclp[j].a_type ) {
4036 + /* ACL entries of same type, sort by id */
4038 + if(aclp[i].a_id > aclp[j].a_id) {
4039 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4040 + } else if (aclp[i].a_id == aclp[j].a_id) {
4041 + /* We have a duplicate entry. */
4042 + if(hpux_prohibited_duplicate_type(aclp[i].a_type)) {
4043 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
4044 + aclp[i].a_type, aclp[i].a_id));
4053 + /* set the class obj permissions to the computed one. */
4055 + int n_class_obj_index = -1;
4057 + for(i=0;i<acl_count;i++) {
4058 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
4060 + if(aclp[i].a_type == CLASS_OBJ)
4061 + n_class_obj_index = i;
4063 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
4068 + return aclsort(acl_count, calclass, aclp);
4073 + * sort the ACL and check it for validity
4075 + * if it's a minimal ACL with only 4 entries then we
4076 + * need to recalculate the mask permissions to make
4077 + * sure that they are the same as the GROUP_OBJ
4078 + * permissions as required by the UnixWare acl() system call.
4080 + * (note: since POSIX allows minimal ACLs which only contain
4081 + * 3 entries - ie there is no mask entry - we should, in theory,
4082 + * check for this and add a mask entry if necessary - however
4083 + * we "know" that the caller of this interface always specifies
4084 + * a mask so, in practice "this never happens" (tm) - if it *does*
4085 + * happen aclsort() will fail and return an error and someone will
4086 + * have to fix it ...)
4089 +static int acl_sort(SMB_ACL_T acl_d)
4091 + int fixmask = (acl_d->count <= 4);
4093 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
4100 +int sys_acl_valid(SMB_ACL_T acl_d)
4102 + return acl_sort(acl_d);
4105 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4108 + struct acl *acl_p;
4110 + struct acl *acl_buf = NULL;
4113 + if(hpux_acl_call_presence() == False) {
4114 + /* Looks like we don't have the acl() system call on HPUX.
4115 + * May be the system doesn't have the latest version of JFS.
4121 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
4126 + if (acl_sort(acl_d) != 0) {
4130 + acl_p = &acl_d->acl[0];
4131 + acl_count = acl_d->count;
4134 + * if it's a directory there is extra work to do
4135 + * since the acl() system call will replace both
4136 + * the access ACLs and the default ACLs (if any)
4138 + if (stat(name, &s) != 0) {
4141 + if (S_ISDIR(s.st_mode)) {
4142 + SMB_ACL_T acc_acl;
4143 + SMB_ACL_T def_acl;
4144 + SMB_ACL_T tmp_acl;
4147 + if (type == SMB_ACL_TYPE_ACCESS) {
4149 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
4153 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
4156 + if (tmp_acl == NULL) {
4161 + * allocate a temporary buffer for the complete ACL
4163 + acl_count = acc_acl->count + def_acl->count;
4164 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
4166 + if (acl_buf == NULL) {
4167 + sys_acl_free_acl(tmp_acl);
4173 + * copy the access control and default entries into the buffer
4175 + memcpy(&acl_buf[0], &acc_acl->acl[0],
4176 + acc_acl->count * sizeof(acl_buf[0]));
4178 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
4179 + def_acl->count * sizeof(acl_buf[0]));
4182 + * set the ACL_DEFAULT flag on the default entries
4184 + for (i = acc_acl->count; i < acl_count; i++) {
4185 + acl_buf[i].a_type |= ACL_DEFAULT;
4188 + sys_acl_free_acl(tmp_acl);
4190 + } else if (type != SMB_ACL_TYPE_ACCESS) {
4195 + ret = acl(name, ACL_SET, acl_count, acl_p);
4204 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4207 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
4210 + files_struct *fsp = file_find_fd(fd);
4212 + if (fsp == NULL) {
4217 + if (acl_sort(acl_d) != 0) {
4222 + * We know we're in the same conn context. So we
4223 + * can use the relative path.
4226 + return sys_acl_set_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS, acl_d);
4229 +int sys_acl_delete_def_file(const char *path)
4235 + * fetching the access ACL and rewriting it has
4236 + * the effect of deleting the default ACL
4238 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
4242 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
4244 + sys_acl_free_acl(acl_d);
4249 +int sys_acl_free_text(char *text)
4255 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4261 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4266 +#elif defined(HAVE_IRIX_ACLS)
4268 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4270 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
4275 + if (entry_p == NULL) {
4280 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
4284 + if (acl_d->next < 0) {
4289 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
4293 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
4298 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
4300 + *type_p = entry_d->ae_tag;
4305 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4307 + *permset_p = entry_d;
4312 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
4314 + if (entry_d->ae_tag != SMB_ACL_USER
4315 + && entry_d->ae_tag != SMB_ACL_GROUP) {
4320 + return &entry_d->ae_id;
4323 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
4327 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4331 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
4336 + a->freeaclp = True;
4340 +SMB_ACL_T sys_acl_get_fd(int fd)
4344 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4348 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
4353 + a->freeaclp = True;
4357 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
4359 + permset_d->ae_perm = 0;
4364 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4366 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
4367 + && perm != SMB_ACL_EXECUTE) {
4372 + if (permset_d == NULL) {
4377 + permset_d->ae_perm |= perm;
4382 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4384 + return permset_d->ae_perm & perm;
4387 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
4389 + return acl_to_text(acl_d->aclp, len_p);
4392 +SMB_ACL_T sys_acl_init(int count)
4401 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
4407 + a->freeaclp = False;
4408 + a->aclp = (struct acl *)(&a->aclp + sizeof(struct acl *));
4409 + a->aclp->acl_cnt = 0;
4415 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
4418 + SMB_ACL_ENTRY_T entry_d;
4420 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
4425 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
4430 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
4431 + entry_d->ae_tag = 0;
4432 + entry_d->ae_id = 0;
4433 + entry_d->ae_perm = 0;
4434 + *entry_p = entry_d;
4439 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
4441 + switch (tag_type) {
4442 + case SMB_ACL_USER:
4443 + case SMB_ACL_USER_OBJ:
4444 + case SMB_ACL_GROUP:
4445 + case SMB_ACL_GROUP_OBJ:
4446 + case SMB_ACL_OTHER:
4447 + case SMB_ACL_MASK:
4448 + entry_d->ae_tag = tag_type;
4458 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
4460 + if (entry_d->ae_tag != SMB_ACL_GROUP
4461 + && entry_d->ae_tag != SMB_ACL_USER) {
4466 + entry_d->ae_id = *((id_t *)qual_p);
4471 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
4473 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
4477 + entry_d->ae_perm = permset_d->ae_perm;
4482 +int sys_acl_valid(SMB_ACL_T acl_d)
4484 + return acl_valid(acl_d->aclp);
4487 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4489 + return acl_set_file(name, type, acl_d->aclp);
4492 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4494 + return acl_set_fd(fd, acl_d->aclp);
4497 +int sys_acl_delete_def_file(const char *name)
4499 + return acl_delete_def_file(name);
4502 +int sys_acl_free_text(char *text)
4504 + return acl_free(text);
4507 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4509 + if (acl_d->freeaclp) {
4510 + acl_free(acl_d->aclp);
4516 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4521 +#elif defined(HAVE_AIX_ACLS)
4523 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
4525 +int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4527 + struct acl_entry_link *link;
4528 + struct new_acl_entry *entry;
4531 + DEBUG(10,("This is the count: %d\n",theacl->count));
4533 + /* Check if count was previously set to -1. *
4534 + * If it was, that means we reached the end *
4535 + * of the acl last time. */
4536 + if(theacl->count == -1)
4540 + /* To get to the next acl, traverse linked list until index *
4541 + * of acl matches the count we are keeping. This count is *
4542 + * incremented each time we return an acl entry. */
4544 + for(keep_going = 0; keep_going < theacl->count; keep_going++)
4545 + link = link->nextp;
4547 + entry = *entry_p = link->entryp;
4549 + DEBUG(10,("*entry_p is %d\n",entry_p));
4550 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
4552 + /* Increment count */
4554 + if(link->nextp == NULL)
4555 + theacl->count = -1;
4560 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
4562 + /* Initialize tag type */
4565 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
4567 + /* Depending on what type of entry we have, *
4568 + * return tag type. */
4569 + switch(entry_d->ace_id->id_type) {
4571 + *tag_type_p = SMB_ACL_USER;
4574 + *tag_type_p = SMB_ACL_GROUP;
4577 + case SMB_ACL_USER_OBJ:
4578 + case SMB_ACL_GROUP_OBJ:
4579 + case SMB_ACL_OTHER:
4580 + *tag_type_p = entry_d->ace_id->id_type;
4590 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4592 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
4593 + *permset_p = &entry_d->ace_access;
4594 + DEBUG(10,("**permset_p is %d\n",**permset_p));
4595 + if(!(**permset_p & S_IXUSR) &&
4596 + !(**permset_p & S_IWUSR) &&
4597 + !(**permset_p & S_IRUSR) &&
4598 + (**permset_p != 0))
4601 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
4605 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
4607 + return(entry_d->ace_id->id_data);
4610 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
4612 + struct acl *file_acl = (struct acl *)NULL;
4613 + struct acl_entry *acl_entry;
4614 + struct new_acl_entry *new_acl_entry;
4615 + struct ace_id *idp;
4616 + struct acl_entry_link *acl_entry_link;
4617 + struct acl_entry_link *acl_entry_link_head;
4622 + /* AIX has no DEFAULT */
4623 + if ( type == SMB_ACL_TYPE_DEFAULT ) {
4628 + /* Get the acl using statacl */
4630 + DEBUG(10,("Entering sys_acl_get_file\n"));
4631 + DEBUG(10,("path_p is %s\n",path_p));
4633 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4635 + if(file_acl == NULL) {
4637 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
4641 + memset(file_acl,0,BUFSIZ);
4643 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
4645 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
4646 + SAFE_FREE(file_acl);
4650 + DEBUG(10,("Got facl and returned it\n"));
4652 + /* Point to the first acl entry in the acl */
4653 + acl_entry = file_acl->acl_ext;
4655 + /* Begin setting up the head of the linked list *
4656 + * that will be used for the storing the acl *
4657 + * in a way that is useful for the posix_acls.c *
4660 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4661 + if(acl_entry_link_head == NULL)
4664 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4665 + if(acl_entry_link->entryp == NULL) {
4666 + SAFE_FREE(file_acl);
4668 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4672 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4673 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4675 + /* Check if the extended acl bit is on. *
4676 + * If it isn't, do not show the *
4677 + * contents of the acl since AIX intends *
4678 + * the extended info to remain unused */
4680 + if(file_acl->acl_mode & S_IXACL){
4681 + /* while we are not pointing to the very end */
4682 + while(acl_entry < acl_last(file_acl)) {
4683 + /* before we malloc anything, make sure this is */
4684 + /* a valid acl entry and one that we want to map */
4685 + idp = id_nxt(acl_entry->ace_id);
4686 + if((acl_entry->ace_type == ACC_SPECIFY ||
4687 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4688 + acl_entry = acl_nxt(acl_entry);
4692 + idp = acl_entry->ace_id;
4694 + /* Check if this is the first entry in the linked list. *
4695 + * The first entry needs to keep prevp pointing to NULL *
4696 + * and already has entryp allocated. */
4698 + if(acl_entry_link_head->count != 0) {
4699 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4701 + if(acl_entry_link->nextp == NULL) {
4702 + SAFE_FREE(file_acl);
4704 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4708 + acl_entry_link->nextp->prevp = acl_entry_link;
4709 + acl_entry_link = acl_entry_link->nextp;
4710 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4711 + if(acl_entry_link->entryp == NULL) {
4712 + SAFE_FREE(file_acl);
4714 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4717 + acl_entry_link->nextp = NULL;
4720 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4722 + /* Don't really need this since all types are going *
4723 + * to be specified but, it's better than leaving it 0 */
4725 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4727 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4729 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof(struct ace_id));
4731 + /* The access in the acl entries must be left shifted by *
4732 + * three bites, because they will ultimately be compared *
4733 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4735 + switch(acl_entry->ace_type){
4738 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4739 + acl_entry_link->entryp->ace_access <<= 6;
4740 + acl_entry_link_head->count++;
4743 + /* Since there is no way to return a DENY acl entry *
4744 + * change to PERMIT and then shift. */
4745 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4746 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4747 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4748 + acl_entry_link->entryp->ace_access <<= 6;
4749 + acl_entry_link_head->count++;
4755 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4756 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4758 + acl_entry = acl_nxt(acl_entry);
4760 + } /* end of if enabled */
4762 + /* Since owner, group, other acl entries are not *
4763 + * part of the acl entries in an acl, they must *
4764 + * be dummied up to become part of the list. */
4766 + for( i = 1; i < 4; i++) {
4767 + DEBUG(10,("i is %d\n",i));
4768 + if(acl_entry_link_head->count != 0) {
4769 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4770 + if(acl_entry_link->nextp == NULL) {
4771 + SAFE_FREE(file_acl);
4773 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4777 + acl_entry_link->nextp->prevp = acl_entry_link;
4778 + acl_entry_link = acl_entry_link->nextp;
4779 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4780 + if(acl_entry_link->entryp == NULL) {
4781 + SAFE_FREE(file_acl);
4783 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4788 + acl_entry_link->nextp = NULL;
4790 + new_acl_entry = acl_entry_link->entryp;
4791 + idp = new_acl_entry->ace_id;
4793 + new_acl_entry->ace_len = sizeof(struct acl_entry);
4794 + new_acl_entry->ace_type = ACC_PERMIT;
4795 + idp->id_len = sizeof(struct ace_id);
4796 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4797 + memset(idp->id_data,0,sizeof(uid_t));
4801 + new_acl_entry->ace_access = file_acl->g_access << 6;
4802 + idp->id_type = SMB_ACL_GROUP_OBJ;
4806 + new_acl_entry->ace_access = file_acl->o_access << 6;
4807 + idp->id_type = SMB_ACL_OTHER;
4811 + new_acl_entry->ace_access = file_acl->u_access << 6;
4812 + idp->id_type = SMB_ACL_USER_OBJ;
4820 + acl_entry_link_head->count++;
4821 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4824 + acl_entry_link_head->count = 0;
4825 + SAFE_FREE(file_acl);
4827 + return(acl_entry_link_head);
4830 +SMB_ACL_T sys_acl_get_fd(int fd)
4832 + struct acl *file_acl = (struct acl *)NULL;
4833 + struct acl_entry *acl_entry;
4834 + struct new_acl_entry *new_acl_entry;
4835 + struct ace_id *idp;
4836 + struct acl_entry_link *acl_entry_link;
4837 + struct acl_entry_link *acl_entry_link_head;
4842 + /* Get the acl using fstatacl */
4844 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4845 + DEBUG(10,("fd is %d\n",fd));
4846 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4848 + if(file_acl == NULL) {
4850 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4854 + memset(file_acl,0,BUFSIZ);
4856 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4858 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4859 + SAFE_FREE(file_acl);
4863 + DEBUG(10,("Got facl and returned it\n"));
4865 + /* Point to the first acl entry in the acl */
4867 + acl_entry = file_acl->acl_ext;
4868 + /* Begin setting up the head of the linked list *
4869 + * that will be used for the storing the acl *
4870 + * in a way that is useful for the posix_acls.c *
4873 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4874 + if(acl_entry_link_head == NULL){
4875 + SAFE_FREE(file_acl);
4879 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4881 + if(acl_entry_link->entryp == NULL) {
4883 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4884 + SAFE_FREE(file_acl);
4888 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4889 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4891 + /* Check if the extended acl bit is on. *
4892 + * If it isn't, do not show the *
4893 + * contents of the acl since AIX intends *
4894 + * the extended info to remain unused */
4896 + if(file_acl->acl_mode & S_IXACL){
4897 + /* while we are not pointing to the very end */
4898 + while(acl_entry < acl_last(file_acl)) {
4899 + /* before we malloc anything, make sure this is */
4900 + /* a valid acl entry and one that we want to map */
4902 + idp = id_nxt(acl_entry->ace_id);
4903 + if((acl_entry->ace_type == ACC_SPECIFY ||
4904 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4905 + acl_entry = acl_nxt(acl_entry);
4909 + idp = acl_entry->ace_id;
4911 + /* Check if this is the first entry in the linked list. *
4912 + * The first entry needs to keep prevp pointing to NULL *
4913 + * and already has entryp allocated. */
4915 + if(acl_entry_link_head->count != 0) {
4916 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4917 + if(acl_entry_link->nextp == NULL) {
4919 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4920 + SAFE_FREE(file_acl);
4923 + acl_entry_link->nextp->prevp = acl_entry_link;
4924 + acl_entry_link = acl_entry_link->nextp;
4925 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4926 + if(acl_entry_link->entryp == NULL) {
4928 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4929 + SAFE_FREE(file_acl);
4933 + acl_entry_link->nextp = NULL;
4936 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4938 + /* Don't really need this since all types are going *
4939 + * to be specified but, it's better than leaving it 0 */
4941 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4942 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4944 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof(struct ace_id));
4946 + /* The access in the acl entries must be left shifted by *
4947 + * three bites, because they will ultimately be compared *
4948 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4950 + switch(acl_entry->ace_type){
4953 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4954 + acl_entry_link->entryp->ace_access <<= 6;
4955 + acl_entry_link_head->count++;
4958 + /* Since there is no way to return a DENY acl entry *
4959 + * change to PERMIT and then shift. */
4960 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4961 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4962 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4963 + acl_entry_link->entryp->ace_access <<= 6;
4964 + acl_entry_link_head->count++;
4970 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4971 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4973 + acl_entry = acl_nxt(acl_entry);
4975 + } /* end of if enabled */
4977 + /* Since owner, group, other acl entries are not *
4978 + * part of the acl entries in an acl, they must *
4979 + * be dummied up to become part of the list. */
4981 + for( i = 1; i < 4; i++) {
4982 + DEBUG(10,("i is %d\n",i));
4983 + if(acl_entry_link_head->count != 0){
4984 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4985 + if(acl_entry_link->nextp == NULL) {
4987 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4988 + SAFE_FREE(file_acl);
4992 + acl_entry_link->nextp->prevp = acl_entry_link;
4993 + acl_entry_link = acl_entry_link->nextp;
4994 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4996 + if(acl_entry_link->entryp == NULL) {
4997 + SAFE_FREE(file_acl);
4999 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
5004 + acl_entry_link->nextp = NULL;
5006 + new_acl_entry = acl_entry_link->entryp;
5007 + idp = new_acl_entry->ace_id;
5009 + new_acl_entry->ace_len = sizeof(struct acl_entry);
5010 + new_acl_entry->ace_type = ACC_PERMIT;
5011 + idp->id_len = sizeof(struct ace_id);
5012 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
5013 + memset(idp->id_data,0,sizeof(uid_t));
5017 + new_acl_entry->ace_access = file_acl->g_access << 6;
5018 + idp->id_type = SMB_ACL_GROUP_OBJ;
5022 + new_acl_entry->ace_access = file_acl->o_access << 6;
5023 + idp->id_type = SMB_ACL_OTHER;
5027 + new_acl_entry->ace_access = file_acl->u_access << 6;
5028 + idp->id_type = SMB_ACL_USER_OBJ;
5035 + acl_entry_link_head->count++;
5036 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
5039 + acl_entry_link_head->count = 0;
5040 + SAFE_FREE(file_acl);
5042 + return(acl_entry_link_head);
5045 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
5047 + *permset = *permset & ~0777;
5051 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5054 + (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
5058 + DEBUG(10,("This is the permset now: %d\n",*permset));
5062 +char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
5067 +SMB_ACL_T sys_acl_init( int count)
5069 + struct acl_entry_link *theacl = NULL;
5071 + DEBUG(10,("Entering sys_acl_init\n"));
5073 + theacl = SMB_MALLOC_P(struct acl_entry_link);
5074 + if(theacl == NULL) {
5076 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
5080 + theacl->count = 0;
5081 + theacl->nextp = NULL;
5082 + theacl->prevp = NULL;
5083 + theacl->entryp = NULL;
5084 + DEBUG(10,("Exiting sys_acl_init\n"));
5088 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
5090 + struct acl_entry_link *theacl;
5091 + struct acl_entry_link *acl_entryp;
5092 + struct acl_entry_link *temp_entry;
5095 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
5097 + theacl = acl_entryp = *pacl;
5099 + /* Get to the end of the acl before adding entry */
5101 + for(counting=0; counting < theacl->count; counting++){
5102 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5103 + temp_entry = acl_entryp;
5104 + acl_entryp = acl_entryp->nextp;
5107 + if(theacl->count != 0){
5108 + temp_entry->nextp = acl_entryp = SMB_MALLOC_P(struct acl_entry_link);
5109 + if(acl_entryp == NULL) {
5111 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5115 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5116 + acl_entryp->prevp = temp_entry;
5117 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
5120 + *pentry = acl_entryp->entryp = SMB_MALLOC_P(struct new_acl_entry);
5121 + if(*pentry == NULL) {
5123 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5127 + memset(*pentry,0,sizeof(struct new_acl_entry));
5128 + acl_entryp->entryp->ace_len = sizeof(struct acl_entry);
5129 + acl_entryp->entryp->ace_type = ACC_PERMIT;
5130 + acl_entryp->entryp->ace_id->id_len = sizeof(struct ace_id);
5131 + acl_entryp->nextp = NULL;
5133 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
5137 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
5139 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
5140 + entry->ace_id->id_type = tagtype;
5141 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
5142 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
5145 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
5147 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
5148 + memcpy(entry->ace_id->id_data,qual,sizeof(uid_t));
5149 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
5153 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
5155 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
5156 + if(!(*permset & S_IXUSR) &&
5157 + !(*permset & S_IWUSR) &&
5158 + !(*permset & S_IRUSR) &&
5162 + entry->ace_access = *permset;
5163 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
5164 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
5168 +int sys_acl_valid( SMB_ACL_T theacl )
5171 + int group_obj = 0;
5172 + int other_obj = 0;
5173 + struct acl_entry_link *acl_entry;
5175 + for(acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
5176 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
5177 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
5178 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
5181 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
5183 + if(user_obj != 1 || group_obj != 1 || other_obj != 1)
5189 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
5191 + struct acl_entry_link *acl_entry_link = NULL;
5192 + struct acl *file_acl = NULL;
5193 + struct acl *file_acl_temp = NULL;
5194 + struct acl_entry *acl_entry = NULL;
5195 + struct ace_id *ace_id = NULL;
5202 + DEBUG(10,("Entering sys_acl_set_file\n"));
5203 + DEBUG(10,("File name is %s\n",name));
5205 + /* AIX has no default ACL */
5206 + if(acltype == SMB_ACL_TYPE_DEFAULT)
5209 + acl_length = BUFSIZ;
5210 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5212 + if(file_acl == NULL) {
5214 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5218 + memset(file_acl,0,BUFSIZ);
5220 + file_acl->acl_len = ACL_SIZ;
5221 + file_acl->acl_mode = S_IXACL;
5223 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5224 + acl_entry_link->entryp->ace_access >>= 6;
5225 + id_type = acl_entry_link->entryp->ace_id->id_type;
5228 + case SMB_ACL_USER_OBJ:
5229 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5231 + case SMB_ACL_GROUP_OBJ:
5232 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5234 + case SMB_ACL_OTHER:
5235 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5237 + case SMB_ACL_MASK:
5241 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5242 + acl_length += sizeof(struct acl_entry);
5243 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5244 + if(file_acl_temp == NULL) {
5245 + SAFE_FREE(file_acl);
5247 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5251 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5252 + SAFE_FREE(file_acl);
5253 + file_acl = file_acl_temp;
5256 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5257 + file_acl->acl_len += sizeof(struct acl_entry);
5258 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5259 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5261 + /* In order to use this, we'll need to wait until we can get denies */
5262 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5263 + acl_entry->ace_type = ACC_SPECIFY; */
5265 + acl_entry->ace_type = ACC_SPECIFY;
5267 + ace_id = acl_entry->ace_id;
5269 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5270 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5271 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5272 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5273 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof(uid_t));
5276 + rc = chacl(name,file_acl,file_acl->acl_len);
5277 + DEBUG(10,("errno is %d\n",errno));
5278 + DEBUG(10,("return code is %d\n",rc));
5279 + SAFE_FREE(file_acl);
5280 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
5284 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
5286 + struct acl_entry_link *acl_entry_link = NULL;
5287 + struct acl *file_acl = NULL;
5288 + struct acl *file_acl_temp = NULL;
5289 + struct acl_entry *acl_entry = NULL;
5290 + struct ace_id *ace_id = NULL;
5296 + DEBUG(10,("Entering sys_acl_set_fd\n"));
5297 + acl_length = BUFSIZ;
5298 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5300 + if(file_acl == NULL) {
5302 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5306 + memset(file_acl,0,BUFSIZ);
5308 + file_acl->acl_len = ACL_SIZ;
5309 + file_acl->acl_mode = S_IXACL;
5311 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5312 + acl_entry_link->entryp->ace_access >>= 6;
5313 + id_type = acl_entry_link->entryp->ace_id->id_type;
5314 + DEBUG(10,("The id_type is %d\n",id_type));
5317 + case SMB_ACL_USER_OBJ:
5318 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5320 + case SMB_ACL_GROUP_OBJ:
5321 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5323 + case SMB_ACL_OTHER:
5324 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5326 + case SMB_ACL_MASK:
5330 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5331 + acl_length += sizeof(struct acl_entry);
5332 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5333 + if(file_acl_temp == NULL) {
5334 + SAFE_FREE(file_acl);
5336 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5340 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5341 + SAFE_FREE(file_acl);
5342 + file_acl = file_acl_temp;
5345 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5346 + file_acl->acl_len += sizeof(struct acl_entry);
5347 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5348 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5350 + /* In order to use this, we'll need to wait until we can get denies */
5351 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5352 + acl_entry->ace_type = ACC_SPECIFY; */
5354 + acl_entry->ace_type = ACC_SPECIFY;
5356 + ace_id = acl_entry->ace_id;
5358 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5359 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5360 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5361 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5362 + memcpy(ace_id->id_data, &user_id, sizeof(uid_t));
5365 + rc = fchacl(fd,file_acl,file_acl->acl_len);
5366 + DEBUG(10,("errno is %d\n",errno));
5367 + DEBUG(10,("return code is %d\n",rc));
5368 + SAFE_FREE(file_acl);
5369 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
5373 +int sys_acl_delete_def_file(const char *name)
5375 + /* AIX has no default ACL */
5379 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5381 + return(*permset & perm);
5384 +int sys_acl_free_text(char *text)
5389 +int sys_acl_free_acl(SMB_ACL_T posix_acl)
5391 + struct acl_entry_link *acl_entry_link;
5393 + for(acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
5394 + SAFE_FREE(acl_entry_link->prevp->entryp);
5395 + SAFE_FREE(acl_entry_link->prevp);
5398 + SAFE_FREE(acl_entry_link->prevp->entryp);
5399 + SAFE_FREE(acl_entry_link->prevp);
5400 + SAFE_FREE(acl_entry_link->entryp);
5401 + SAFE_FREE(acl_entry_link);
5406 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
5411 +#else /* No ACLs. */
5413 +int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
5419 +int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
5425 +int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
5431 +void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
5437 +SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
5440 + return (SMB_ACL_T)NULL;
5443 +SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
5446 + return (SMB_ACL_T)NULL;
5449 +int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
5455 +int sys_acl_add_perm( UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
5461 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5464 + return (permset & perm) ? 1 : 0;
5467 +char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
5473 +int sys_acl_free_text(UNUSED(char *text))
5479 +SMB_ACL_T sys_acl_init(UNUSED(int count))
5485 +int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
5491 +int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
5497 +int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
5503 +int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
5509 +int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
5515 +int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
5521 +int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
5527 +int sys_acl_delete_def_file(UNUSED(const char *name))
5533 +int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
5539 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
5545 +#endif /* No ACLs. */
5547 +/************************************************************************
5548 + Deliberately outside the ACL defines. Return 1 if this is a "no acls"
5550 +************************************************************************/
5552 +int no_acl_syscall_error(int err)
5554 +#if defined(ENOSYS)
5555 + if (err == ENOSYS) {
5559 +#if defined(ENOTSUP)
5560 + if (err == ENOTSUP) {
5567 +#endif /* SUPPORT_ACLS */
5568 --- old/lib/sysacls.h
5569 +++ new/lib/sysacls.h
5571 +#ifdef SUPPORT_ACLS
5573 +#ifdef HAVE_SYS_ACL_H
5574 +#include <sys/acl.h>
5576 +#ifdef HAVE_ACL_LIBACL_H
5577 +#include <acl/libacl.h>
5579 +#include "smb_acls.h"
5581 +#define SMB_MALLOC(cnt) new_array(char, cnt)
5582 +#define SMB_MALLOC_P(obj) new_array(obj, 1)
5583 +#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
5584 +#define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt)
5585 +#define slprintf snprintf
5587 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
5588 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
5589 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
5590 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d);
5591 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type);
5592 +SMB_ACL_T sys_acl_get_fd(int fd);
5593 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
5594 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5595 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5596 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen);
5597 +SMB_ACL_T sys_acl_init(int count);
5598 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
5599 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype);
5600 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual);
5601 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset);
5602 +int sys_acl_valid(SMB_ACL_T theacl);
5603 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
5604 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl);
5605 +int sys_acl_delete_def_file(const char *name);
5606 +int sys_acl_free_text(char *text);
5607 +int sys_acl_free_acl(SMB_ACL_T the_acl);
5608 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
5610 +#endif /* SUPPORT_ACLS */
5613 @@ -625,8 +625,10 @@ static void log_formatted(enum logcode c
5614 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
5615 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
5616 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
5619 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
5620 + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
5621 + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
5624 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
5625 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
5628 @@ -47,6 +47,7 @@ int copy_dirlinks = 0;
5630 int preserve_links = 0;
5631 int preserve_hard_links = 0;
5632 +int preserve_acls = 0;
5633 int preserve_perms = 0;
5634 int preserve_executability = 0;
5635 int preserve_devices = 0;
5636 @@ -198,6 +199,7 @@ static void print_rsync_version(enum log
5637 char const *got_socketpair = "no ";
5638 char const *have_inplace = "no ";
5639 char const *hardlinks = "no ";
5640 + char const *acls = "no ";
5641 char const *links = "no ";
5642 char const *ipv6 = "no ";
5643 STRUCT_STAT *dumstat;
5644 @@ -214,6 +216,10 @@ static void print_rsync_version(enum log
5648 +#ifdef SUPPORT_ACLS
5652 #ifdef SUPPORT_LINKS
5655 @@ -232,8 +238,8 @@ static void print_rsync_version(enum log
5656 (int)(sizeof (int64) * 8));
5657 rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
5658 got_socketpair, hardlinks, links, ipv6, have_inplace);
5659 - rprintf(f, " %sappend\n",
5661 + rprintf(f, " %sappend, %sACLs\n",
5662 + have_inplace, acls);
5664 #ifdef MAINTAINER_MODE
5665 rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
5666 @@ -279,7 +285,7 @@ void usage(enum logcode F)
5667 rprintf(F," -q, --quiet suppress non-error messages\n");
5668 rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
5669 rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
5670 - rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n");
5671 + rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n");
5672 rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
5673 rprintf(F," -r, --recursive recurse into directories\n");
5674 rprintf(F," -R, --relative use relative path names\n");
5675 @@ -301,6 +307,9 @@ void usage(enum logcode F)
5676 rprintf(F," -p, --perms preserve permissions\n");
5677 rprintf(F," -E, --executability preserve the file's executability\n");
5678 rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
5679 +#ifdef SUPPORT_ACLS
5680 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
5682 rprintf(F," -o, --owner preserve owner (super-user only)\n");
5683 rprintf(F," -g, --group preserve group\n");
5684 rprintf(F," --devices preserve device files (super-user only)\n");
5685 @@ -421,6 +430,9 @@ static struct poptOption long_options[]
5686 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5687 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5688 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
5689 + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
5690 + {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5691 + {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5692 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
5693 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5694 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5695 @@ -1086,6 +1098,24 @@ int parse_arguments(int *argc, const cha
5700 +#ifdef SUPPORT_ACLS
5701 + preserve_acls = 1;
5702 + preserve_perms = 1;
5705 + /* FIXME: this should probably be ignored with a
5706 + * warning and then countermeasures taken to
5707 + * restrict group and other access in the presence
5708 + * of any more restrictive ACLs, but this is safe
5710 + snprintf(err_buf,sizeof(err_buf),
5711 + "ACLs are not supported on this %s\n",
5712 + am_server ? "server" : "client");
5718 /* A large opt value means that set_refuse_options()
5719 * turned this option off. */
5720 @@ -1528,6 +1558,10 @@ void server_options(char **args,int *arg
5722 if (preserve_hard_links)
5724 +#ifdef SUPPORT_ACLS
5725 + if (preserve_acls)
5726 + argstr[x++] = 'A';
5733 @@ -47,6 +47,7 @@ extern int keep_partial;
5734 extern int checksum_seed;
5736 extern int delay_updates;
5737 +extern mode_t orig_umask;
5738 extern struct stats stats;
5739 extern char *stdout_format;
5740 extern char *tmpdir;
5741 @@ -347,6 +348,10 @@ int recv_files(int f_in, struct file_lis
5742 int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
5743 enum logcode log_code = log_before_transfer ? FLOG : FINFO;
5744 int max_phase = protocol_version >= 29 ? 2 : 1;
5745 + int dflt_perms = (ACCESSPERMS & ~orig_umask);
5746 +#ifdef SUPPORT_ACLS
5747 + const char *parent_dirname = "";
5752 @@ -545,7 +550,16 @@ int recv_files(int f_in, struct file_lis
5753 * mode based on the local permissions and some heuristics. */
5754 if (!preserve_perms) {
5755 int exists = fd1 != -1;
5756 - file->mode = dest_mode(file->mode, st.st_mode, exists);
5757 +#ifdef SUPPORT_ACLS
5758 + const char *dn = file->dirname ? file->dirname : ".";
5759 + if (parent_dirname != dn
5760 + && strcmp(parent_dirname, dn) != 0) {
5761 + dflt_perms = default_perms_for_dir(dn);
5762 + parent_dirname = dn;
5765 + file->mode = dest_mode(file->mode, st.st_mode,
5766 + dflt_perms, exists);
5769 /* We now check to see if we are writing the file "inplace" */
5776 +extern int preserve_acls;
5777 extern int preserve_perms;
5778 extern int preserve_executability;
5779 extern int preserve_times;
5780 @@ -48,7 +49,6 @@ extern int preserve_gid;
5782 extern int keep_dirlinks;
5783 extern int make_backups;
5784 -extern mode_t orig_umask;
5785 extern struct stats stats;
5786 extern struct file_list *the_file_list;
5787 extern struct chmod_mode_struct *daemon_chmod_modes;
5788 @@ -153,7 +153,8 @@ void free_sums(struct sum_struct *s)
5790 /* This is only called when we aren't preserving permissions. Figure out what
5791 * the permissions should be and return them merged back into the mode. */
5792 -mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists)
5793 +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
5797 /* If the file already exists, we'll return the local permissions,
5798 @@ -170,56 +171,65 @@ mode_t dest_mode(mode_t flist_mode, mode
5799 new_mode |= (new_mode & 0444) >> 2;
5802 - /* Apply the umask and turn off special permissions. */
5803 - new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask));
5804 + /* Apply destination default permissions and turn
5805 + * off special permissions. */
5806 + new_mode = flist_mode & (~CHMOD_BITS | dflt_perms);
5811 -int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
5812 +int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
5818 int change_uid, change_gid;
5819 mode_t new_mode = file->mode;
5825 - if (link_stat(fname, &st2, 0) < 0) {
5826 + if (link_stat(fname, &sx2.st, 0) < 0) {
5827 rsyserr(FERROR, errno, "stat %s failed",
5832 +#ifdef SUPPORT_ACLS
5833 + sx2.acc_acl = sx2.def_acl = NULL;
5835 if (!preserve_perms && S_ISDIR(new_mode)
5836 - && st->st_mode & S_ISGID) {
5837 + && sx2.st.st_mode & S_ISGID) {
5838 /* We just created this directory and its setgid
5839 * bit is on, so make sure it stays on. */
5840 new_mode |= S_ISGID;
5845 - if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
5846 +#ifdef SUPPORT_ACLS
5847 + if (preserve_acls && !ACL_READY(*sxp))
5848 + get_acl(fname, sxp);
5851 + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
5852 flags |= ATTRS_SKIP_MTIME;
5853 if (!(flags & ATTRS_SKIP_MTIME)
5854 - && cmp_time(st->st_mtime, file->modtime) != 0) {
5855 - int ret = set_modtime(fname, file->modtime, st->st_mode);
5856 + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
5857 + int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
5859 rsyserr(FERROR, errno, "failed to set times on %s",
5864 if (ret == 0) /* ret == 1 if symlink could not be set */
5868 - change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
5869 + change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
5870 change_gid = preserve_gid && F_GID(file) != GID_NONE
5871 - && st->st_gid != F_GID(file);
5872 + && sxp->st.st_gid != F_GID(file);
5873 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
5874 - if (S_ISLNK(st->st_mode))
5875 + if (S_ISLNK(sxp->st.st_mode))
5879 @@ -229,45 +239,57 @@ int set_file_attrs(char *fname, struct f
5881 "set uid of %s from %ld to %ld\n",
5883 - (long)st->st_uid, (long)F_UID(file));
5884 + (long)sxp->st.st_uid, (long)F_UID(file));
5888 "set gid of %s from %ld to %ld\n",
5890 - (long)st->st_gid, (long)F_GID(file));
5891 + (long)sxp->st.st_gid, (long)F_GID(file));
5894 if (do_lchown(fname,
5895 - change_uid ? F_UID(file) : st->st_uid,
5896 - change_gid ? F_GID(file) : st->st_gid) != 0) {
5897 + change_uid ? F_UID(file) : sxp->st.st_uid,
5898 + change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
5899 /* shouldn't have attempted to change uid or gid
5900 * unless have the privilege */
5901 rsyserr(FERROR, errno, "%s %s failed",
5902 change_uid ? "chown" : "chgrp",
5907 /* a lchown had been done - we have to re-stat if the
5908 * destination had the setuid or setgid bits set due
5909 * to the side effect of the chown call */
5910 - if (st->st_mode & (S_ISUID | S_ISGID)) {
5911 - link_stat(fname, st,
5912 - keep_dirlinks && S_ISDIR(st->st_mode));
5913 + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) {
5914 + link_stat(fname, &sxp->st,
5915 + keep_dirlinks && S_ISDIR(sxp->st.st_mode));
5920 if (daemon_chmod_modes && !S_ISLNK(new_mode))
5921 new_mode = tweak_mode(new_mode, daemon_chmod_modes);
5923 +#ifdef SUPPORT_ACLS
5924 + /* It's OK to call set_acl() now, even for a dir, as the generator
5925 + * will enable owner-writability using chmod, if necessary.
5927 + * If set_acl() changes permission bits in the process of setting
5928 + * an access ACL, it changes sxp->st.st_mode so we know whether we
5929 + * need to chmod(). */
5930 + if (preserve_acls && set_acl(fname, file, sxp) == 0)
5935 - if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
5936 + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
5937 int ret = do_chmod(fname, new_mode);
5939 rsyserr(FERROR, errno,
5940 "failed to set permissions on %s",
5945 if (ret == 0) /* ret == 1 if symlink could not be set */
5947 @@ -280,6 +302,11 @@ int set_file_attrs(char *fname, struct f
5949 rprintf(FCLIENT, "%s is uptodate\n", fname);
5952 +#ifdef SUPPORT_ACLS
5953 + if (preserve_acls && sxp == &sx2)
5961 @@ -503,6 +503,14 @@ struct idev_node {
5962 #define IN_LOOPBACKNET 127
5965 +#ifndef HAVE_NO_ACLS
5966 +#define SUPPORT_ACLS 1
5969 +#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
5970 +#define ACLS_NEED_MASK 1
5973 #define GID_NONE ((gid_t)-1)
5976 @@ -554,10 +562,12 @@ extern int preserve_gid;
5977 /* When the associated option is on, all entries will have these present: */
5978 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
5979 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
5980 +#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
5982 /* These items are per-entry optional and mutally exclusive: */
5983 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
5984 #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
5985 +#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
5987 /* This optional item might follow an F_HL_*() item.
5988 * (Note: a device doesn't need to check LEN64_BUMP(f).) */
5989 @@ -693,6 +703,17 @@ struct stats {
5991 struct chmod_mode_struct;
5993 +#define EMPTY_ITEM_LIST {NULL, 0, 0}
6001 +#define EXPAND_ITEM_LIST(lp, type, incr) \
6002 + (type*)expand_item_list(lp, sizeof (type), #type, incr)
6004 #include "byteorder.h"
6005 #include "lib/mdfour.h"
6006 #include "lib/wildmatch.h"
6007 @@ -711,6 +732,16 @@ struct chmod_mode_struct;
6008 #define NORETURN __attribute__((__noreturn__))
6013 +#ifdef SUPPORT_ACLS
6014 + struct rsync_acl *acc_acl; /* access ACL */
6015 + struct rsync_acl *def_acl; /* default ACL */
6019 +#define ACL_READY(sx) ((sx).acc_acl != NULL)
6023 /* We have replacement versions of these if they're missing. */
6026 @@ -301,7 +301,7 @@ to the detailed description below for a
6027 -q, --quiet suppress non-error messages
6028 --no-motd suppress daemon-mode MOTD (see caveat)
6029 -c, --checksum skip based on checksum, not mod-time & size
6030 - -a, --archive archive mode; same as -rlptgoD (no -H)
6031 + -a, --archive archive mode; same as -rlptgoD (no -H, -A)
6032 --no-OPTION turn off an implied OPTION (e.g. --no-D)
6033 -r, --recursive recurse into directories
6034 -R, --relative use relative path names
6035 @@ -323,6 +323,7 @@ to the detailed description below for a
6036 -p, --perms preserve permissions
6037 -E, --executability preserve executability
6038 --chmod=CHMOD affect file and/or directory permissions
6039 + -A, --acls preserve ACLs (implies -p) [non-standard]
6040 -o, --owner preserve owner (super-user only)
6041 -g, --group preserve group
6042 --devices preserve device files (super-user only)
6043 @@ -754,7 +755,9 @@ quote(itemization(
6044 permissions, though the bf(--executability) option might change just
6045 the execute permission for the file.
6046 it() New files get their "normal" permission bits set to the source
6047 - file's permissions masked with the receiving end's umask setting, and
6048 + file's permissions masked with the receiving directory's default
6049 + permissions (either the receiving process's umask, or the permissions
6050 + specified via the destination directory's default ACL), and
6051 their special permission bits disabled except in the case where a new
6052 directory inherits a setgid bit from its parent directory.
6054 @@ -785,9 +788,11 @@ The preservation of the destination's se
6055 directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
6056 versions erroneously preserved the three special permission bits for
6057 newly-created files when bf(--perms) was off, while overriding the
6058 -destination's setgid bit setting on a newly-created directory. (Keep in
6059 -mind that it is the version of the receiving rsync that affects this
6061 +destination's setgid bit setting on a newly-created directory. Default ACL
6062 +observance was added to the ACL patch for rsync 2.6.7, so older (or
6063 +non-ACL-enabled) rsyncs use the umask even if default ACLs are present.
6064 +(Keep in mind that it is the version of the receiving rsync that affects
6067 dit(bf(-E, --executability)) This option causes rsync to preserve the
6068 executability (or non-executability) of regular files when bf(--perms) is
6069 @@ -805,6 +810,14 @@ quote(itemization(
6071 If bf(--perms) is enabled, this option is ignored.
6073 +dit(bf(-A, --acls)) This option causes rsync to update the destination
6074 +ACLs to be the same as the source ACLs. This nonstandard option only
6075 +works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
6077 +The ACL-sending protocol used by this version was first introduced in
6078 +the patch that was shipped with 2.6.8. Sending ACLs to an older version
6079 +of the ACL patch is not supported.
6081 dit(bf(--chmod)) This option tells rsync to apply one or more
6082 comma-separated "chmod" strings to the permission of the files in the
6083 transfer. The resulting value is treated as though it was the permissions
6084 @@ -1402,8 +1415,8 @@ if the receiving rsync is at least versi
6085 with older versions of rsync, but that also turns on the output of other
6088 -The "%i" escape has a cryptic output that is 9 letters long. The general
6089 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
6090 +The "%i" escape has a cryptic output that is 11 letters long. The general
6091 +format is like the string bf(YXcstpoguax), where bf(Y) is replaced by the
6092 type of update being done, bf(X) is replaced by the file-type, and the
6093 other letters represent attributes that may be output if they are being
6095 @@ -1452,7 +1465,11 @@ quote(itemization(
6096 sender's value (requires bf(--owner) and super-user privileges).
6097 it() A bf(g) means the group is different and is being updated to the
6098 sender's value (requires bf(--group) and the authority to set the group).
6099 - it() The bf(z) slot is reserved for future use.
6100 + it() The bf(u) slot is reserved for reporting update (access) time changes
6101 + (a feature that is not yet released).
6102 + it() The bf(a) means that the ACL information changed.
6103 + it() The bf(x) slot is reserved for reporting extended attribute changes
6104 + (a feature that is not yet released).
6107 One other output is possible: when deleting files, the "%i" will output
6112 + Unix SMB/Netbios implementation.
6114 + Portable SMB ACL interface
6115 + Copyright (C) Jeremy Allison 2000
6117 + This program is free software; you can redistribute it and/or modify
6118 + it under the terms of the GNU General Public License as published by
6119 + the Free Software Foundation; either version 2 of the License, or
6120 + (at your option) any later version.
6122 + This program is distributed in the hope that it will be useful,
6123 + but WITHOUT ANY WARRANTY; without even the implied warranty of
6124 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6125 + GNU General Public License for more details.
6127 + You should have received a copy of the GNU General Public License
6128 + along with this program; if not, write to the Free Software
6129 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
6132 +#ifndef _SMB_ACLS_H
6133 +#define _SMB_ACLS_H
6135 +#if defined HAVE_POSIX_ACLS
6137 +/* This is an identity mapping (just remove the SMB_). */
6139 +#define SMB_ACL_TAG_T acl_tag_t
6140 +#define SMB_ACL_TYPE_T acl_type_t
6141 +#define SMB_ACL_PERMSET_T acl_permset_t
6142 +#define SMB_ACL_PERM_T acl_perm_t
6143 +#define SMB_ACL_READ ACL_READ
6144 +#define SMB_ACL_WRITE ACL_WRITE
6145 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6147 +/* Types of ACLs. */
6148 +#define SMB_ACL_USER ACL_USER
6149 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6150 +#define SMB_ACL_GROUP ACL_GROUP
6151 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6152 +#define SMB_ACL_OTHER ACL_OTHER
6153 +#define SMB_ACL_MASK ACL_MASK
6155 +#define SMB_ACL_T acl_t
6157 +#define SMB_ACL_ENTRY_T acl_entry_t
6159 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
6160 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
6162 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6163 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6165 +#elif defined HAVE_TRU64_ACLS
6167 +/* This is for DEC/Compaq Tru64 UNIX */
6169 +#define SMB_ACL_TAG_T acl_tag_t
6170 +#define SMB_ACL_TYPE_T acl_type_t
6171 +#define SMB_ACL_PERMSET_T acl_permset_t
6172 +#define SMB_ACL_PERM_T acl_perm_t
6173 +#define SMB_ACL_READ ACL_READ
6174 +#define SMB_ACL_WRITE ACL_WRITE
6175 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6177 +/* Types of ACLs. */
6178 +#define SMB_ACL_USER ACL_USER
6179 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6180 +#define SMB_ACL_GROUP ACL_GROUP
6181 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6182 +#define SMB_ACL_OTHER ACL_OTHER
6183 +#define SMB_ACL_MASK ACL_MASK
6185 +#define SMB_ACL_T acl_t
6187 +#define SMB_ACL_ENTRY_T acl_entry_t
6189 +#define SMB_ACL_FIRST_ENTRY 0
6190 +#define SMB_ACL_NEXT_ENTRY 1
6192 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6193 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6195 +#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS
6197 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
6198 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
6201 +/* SVR4.2 ES/MP ACLs */
6202 +typedef int SMB_ACL_TAG_T;
6203 +typedef int SMB_ACL_TYPE_T;
6204 +typedef ushort *SMB_ACL_PERMSET_T;
6205 +typedef ushort SMB_ACL_PERM_T;
6206 +#define SMB_ACL_READ 4
6207 +#define SMB_ACL_WRITE 2
6208 +#define SMB_ACL_EXECUTE 1
6210 +/* Types of ACLs. */
6211 +#define SMB_ACL_USER USER
6212 +#define SMB_ACL_USER_OBJ USER_OBJ
6213 +#define SMB_ACL_GROUP GROUP
6214 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6215 +#define SMB_ACL_OTHER OTHER_OBJ
6216 +#define SMB_ACL_MASK CLASS_OBJ
6218 +typedef struct SMB_ACL_T {
6222 + struct acl acl[1];
6225 +typedef struct acl *SMB_ACL_ENTRY_T;
6227 +#define SMB_ACL_FIRST_ENTRY 0
6228 +#define SMB_ACL_NEXT_ENTRY 1
6230 +#define SMB_ACL_TYPE_ACCESS 0
6231 +#define SMB_ACL_TYPE_DEFAULT 1
6234 +#define SMB_ACL_LOSES_SPECIAL_MODE_BITS
6237 +#elif defined HAVE_HPUX_ACLS
6240 + * Based on the Solaris & UnixWare code.
6244 +#include <sys/aclv.h>
6246 +/* SVR4.2 ES/MP ACLs */
6247 +typedef int SMB_ACL_TAG_T;
6248 +typedef int SMB_ACL_TYPE_T;
6249 +typedef ushort *SMB_ACL_PERMSET_T;
6250 +typedef ushort SMB_ACL_PERM_T;
6251 +#define SMB_ACL_READ 4
6252 +#define SMB_ACL_WRITE 2
6253 +#define SMB_ACL_EXECUTE 1
6255 +/* Types of ACLs. */
6256 +#define SMB_ACL_USER USER
6257 +#define SMB_ACL_USER_OBJ USER_OBJ
6258 +#define SMB_ACL_GROUP GROUP
6259 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6260 +#define SMB_ACL_OTHER OTHER_OBJ
6261 +#define SMB_ACL_MASK CLASS_OBJ
6263 +typedef struct SMB_ACL_T {
6267 + struct acl acl[1];
6270 +typedef struct acl *SMB_ACL_ENTRY_T;
6272 +#define SMB_ACL_FIRST_ENTRY 0
6273 +#define SMB_ACL_NEXT_ENTRY 1
6275 +#define SMB_ACL_TYPE_ACCESS 0
6276 +#define SMB_ACL_TYPE_DEFAULT 1
6278 +#elif defined HAVE_IRIX_ACLS
6280 +#define SMB_ACL_TAG_T acl_tag_t
6281 +#define SMB_ACL_TYPE_T acl_type_t
6282 +#define SMB_ACL_PERMSET_T acl_permset_t
6283 +#define SMB_ACL_PERM_T acl_perm_t
6284 +#define SMB_ACL_READ ACL_READ
6285 +#define SMB_ACL_WRITE ACL_WRITE
6286 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6288 +/* Types of ACLs. */
6289 +#define SMB_ACL_USER ACL_USER
6290 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6291 +#define SMB_ACL_GROUP ACL_GROUP
6292 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6293 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
6294 +#define SMB_ACL_MASK ACL_MASK
6296 +typedef struct SMB_ACL_T {
6302 +#define SMB_ACL_ENTRY_T acl_entry_t
6304 +#define SMB_ACL_FIRST_ENTRY 0
6305 +#define SMB_ACL_NEXT_ENTRY 1
6307 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6308 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6310 +#elif defined HAVE_AIX_ACLS
6312 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
6314 +#include "/usr/include/acl.h"
6316 +typedef uint *SMB_ACL_PERMSET_T;
6318 +struct acl_entry_link{
6319 + struct acl_entry_link *prevp;
6320 + struct new_acl_entry *entryp;
6321 + struct acl_entry_link *nextp;
6325 +struct new_acl_entry{
6326 + unsigned short ace_len;
6327 + unsigned short ace_type;
6328 + unsigned int ace_access;
6329 + struct ace_id ace_id[1];
6332 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
6333 +#define SMB_ACL_T struct acl_entry_link*
6335 +#define SMB_ACL_TAG_T unsigned short
6336 +#define SMB_ACL_TYPE_T int
6337 +#define SMB_ACL_PERM_T uint
6338 +#define SMB_ACL_READ S_IRUSR
6339 +#define SMB_ACL_WRITE S_IWUSR
6340 +#define SMB_ACL_EXECUTE S_IXUSR
6342 +/* Types of ACLs. */
6343 +#define SMB_ACL_USER ACEID_USER
6344 +#define SMB_ACL_USER_OBJ 3
6345 +#define SMB_ACL_GROUP ACEID_GROUP
6346 +#define SMB_ACL_GROUP_OBJ 4
6347 +#define SMB_ACL_OTHER 5
6348 +#define SMB_ACL_MASK 6
6351 +#define SMB_ACL_FIRST_ENTRY 1
6352 +#define SMB_ACL_NEXT_ENTRY 2
6354 +#define SMB_ACL_TYPE_ACCESS 0
6355 +#define SMB_ACL_TYPE_DEFAULT 1
6357 +#else /* No ACLs. */
6359 +/* No ACLS - fake it. */
6360 +#define SMB_ACL_TAG_T int
6361 +#define SMB_ACL_TYPE_T int
6362 +#define SMB_ACL_PERMSET_T mode_t
6363 +#define SMB_ACL_PERM_T mode_t
6364 +#define SMB_ACL_READ S_IRUSR
6365 +#define SMB_ACL_WRITE S_IWUSR
6366 +#define SMB_ACL_EXECUTE S_IXUSR
6368 +/* Types of ACLs. */
6369 +#define SMB_ACL_USER 0
6370 +#define SMB_ACL_USER_OBJ 1
6371 +#define SMB_ACL_GROUP 2
6372 +#define SMB_ACL_GROUP_OBJ 3
6373 +#define SMB_ACL_OTHER 4
6374 +#define SMB_ACL_MASK 5
6376 +typedef struct SMB_ACL_T {
6380 +typedef struct SMB_ACL_ENTRY_T {
6382 +} *SMB_ACL_ENTRY_T;
6384 +#define SMB_ACL_FIRST_ENTRY 0
6385 +#define SMB_ACL_NEXT_ENTRY 1
6387 +#define SMB_ACL_TYPE_ACCESS 0
6388 +#define SMB_ACL_TYPE_DEFAULT 1
6390 +#endif /* No ACLs. */
6391 +#endif /* _SMB_ACLS_H */
6392 --- old/testsuite/acls.test
6393 +++ new/testsuite/acls.test
6397 +# This program is distributable under the terms of the GNU GPL (see
6400 +# Test that rsync handles basic ACL preservation.
6402 +. $srcdir/testsuite/rsync.fns
6404 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6405 +case "$setfacl_nodef" in
6406 +true) test_skipped "I don't know how to use your setfacl command" ;;
6409 +makepath "$fromdir/foo"
6410 +echo something >"$fromdir/file1"
6411 +echo else >"$fromdir/file2"
6413 +files='foo file1 file2'
6415 +setfacl -m u:0:7 "$fromdir/foo" || test_skipped "Your filesystem has ACLs disabled"
6416 +setfacl -m u:0:5 "$fromdir/file1"
6417 +setfacl -m u:0:5 "$fromdir/file2"
6419 +$RSYNC -avvA "$fromdir/" "$todir/"
6422 +getfacl $files >"$scratchdir/acls.txt"
6425 +getfacl $files | diff $diffopt "$scratchdir/acls.txt" -
6427 +# The script would have aborted on error, so getting here means we've won.
6429 --- old/testsuite/default-acls.test
6430 +++ new/testsuite/default-acls.test
6434 +# This program is distributable under the terms of the GNU GPL (see
6437 +# Test that rsync obeys default ACLs. -- Matt McCutchen
6439 +. $srcdir/testsuite/rsync.fns
6441 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6442 +case "$setfacl_nodef" in
6443 +true) test_skipped "I don't know how to use your setfacl command" ;;
6444 +*-k*) opts='-dm u::7,g::5,o:5' ;;
6445 +*) opts='-m d:u::7,d:g::5,d:o:5' ;;
6447 +setfacl $opts "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
6449 +# Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
6451 + todir="$scratchdir/$1"
6453 + $setfacl_nodef "$todir"
6455 + case "$setfacl_nodef" in
6456 + *-k*) opts="-dm $2" ;;
6457 + *) opts="-m `echo $2 | sed 's/\([ugom]:\)/d:\1/g'`"
6459 + setfacl $opts "$todir"
6461 + # Make sure we obey ACLs when creating a directory to hold multiple transferred files,
6462 + # even though the directory itself is outside the transfer
6463 + $RSYNC -rvv "$scratchdir/dir" "$scratchdir/file" "$scratchdir/program" "$todir/to/"
6464 + check_perms "$todir/to" $4 "Target $1"
6465 + check_perms "$todir/to/dir" $4 "Target $1"
6466 + check_perms "$todir/to/file" $3 "Target $1"
6467 + check_perms "$todir/to/program" $4 "Target $1"
6468 + # Make sure get_local_name doesn't mess us up when transferring only one file
6469 + $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
6470 + check_perms "$todir/to/anotherfile" $3 "Target $1"
6471 + # Make sure we obey default ACLs when not transferring a regular file
6472 + $RSYNC -rvv "$scratchdir/dir/" "$todir/to/anotherdir/"
6473 + check_perms "$todir/to/anotherdir" $4 "Target $1"
6476 +mkdir "$scratchdir/dir"
6477 +echo "File!" >"$scratchdir/file"
6478 +echo "#!/bin/sh" >"$scratchdir/program"
6479 +chmod 777 "$scratchdir/dir"
6480 +chmod 666 "$scratchdir/file"
6481 +chmod 777 "$scratchdir/program"
6483 +# Test some target directories
6485 +testit da777 u::7,g::7,o:7 rw-rw-rw- rwxrwxrwx
6486 +testit da775 u::7,g::7,o:5 rw-rw-r-- rwxrwxr-x
6487 +testit da750 u::7,g::5,o:0 rw-r----- rwxr-x---
6488 +testit da770mask u::7,u:0:7,g::0,m:7,o:0 rw-rw---- rwxrwx---
6489 +testit noda1 '' rw------- rwx------
6491 +testit noda2 '' rw-rw-rw- rwxrwxrwx
6493 +testit noda3 '' rw-r--r-- rwxr-xr-x
6497 --- old/testsuite/devices.test
6498 +++ new/testsuite/devices.test
6499 @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
6500 $RSYNC -ai "$fromdir/block" "$todir/block2" \
6502 cat <<EOT >"$chkfile"
6506 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6508 $RSYNC -ai "$fromdir/block2" "$todir/block" \
6510 cat <<EOT >"$chkfile"
6514 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6516 @@ -58,7 +58,7 @@ sleep 1
6517 $RSYNC -Di "$fromdir/block3" "$todir/block" \
6519 cat <<EOT >"$chkfile"
6523 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6525 @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
6528 cat <<EOT >"$chkfile"
6533 -hD+++++++ block2.5 => block3
6542 +hD+++++++++ block2.5 => block3
6548 if test ! -b "$fromdir/block2.5"; then
6549 sed -e '/block2\.5/d' \
6550 @@ -94,15 +94,15 @@ if test -b "$fromdir/block2.5"; then
6551 $RSYNC -aii --link-dest="$todir" "$fromdir/" "$chkdir/" \
6553 cat <<EOT >"$chkfile"
6573 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
6575 --- old/testsuite/itemize.test
6576 +++ new/testsuite/itemize.test
6577 @@ -38,15 +38,15 @@ rm -f "$to2dir" "$to2dir.test"
6578 $RSYNC -iplr "$fromdir/" "$todir/" \
6580 cat <<EOT >"$chkfile"
6584 ->f+++++++ bar/baz/rsync
6586 ->f+++++++ foo/config1
6587 ->f+++++++ foo/config2
6588 ->f+++++++ foo/extra
6589 -cL+++++++ foo/sym -> ../bar/baz/rsync
6592 +cd+++++++++ bar/baz/
6593 +>f+++++++++ bar/baz/rsync
6595 +>f+++++++++ foo/config1
6596 +>f+++++++++ foo/config2
6597 +>f+++++++++ foo/extra
6598 +cL+++++++++ foo/sym -> ../bar/baz/rsync
6600 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6602 @@ -58,10 +58,10 @@ chmod 601 "$fromdir/foo/config2"
6603 $RSYNC -iplrH "$fromdir/" "$todir/" \
6605 cat <<EOT >"$chkfile"
6606 ->f..T.... bar/baz/rsync
6607 ->f..T.... foo/config1
6608 ->f.sTp... foo/config2
6609 -hf..T.... foo/extra => foo/config1
6610 +>f..T...... bar/baz/rsync
6611 +>f..T...... foo/config1
6612 +>f.sTp..... foo/config2
6613 +hf..T...... foo/extra => foo/config1
6615 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6617 @@ -78,11 +78,11 @@ chmod 777 "$todir/bar/baz/rsync"
6618 $RSYNC -iplrtc "$fromdir/" "$todir/" \
6620 cat <<EOT >"$chkfile"
6621 -.f..tp... bar/baz/rsync
6623 -.f..t.... foo/config1
6624 ->fcstp... foo/config2
6625 -cL..T.... foo/sym -> ../bar/baz/rsync
6626 +.f..tp..... bar/baz/rsync
6628 +.f..t...... foo/config1
6629 +>fcstp..... foo/config2
6630 +cL..T...... foo/sym -> ../bar/baz/rsync
6632 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6634 @@ -107,15 +107,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
6637 cat <<EOT >"$chkfile"
6641 -.f...p... bar/baz/rsync
6644 ->f..t.... foo/config2
6646 -.L foo/sym -> ../bar/baz/rsync
6650 +.f...p..... bar/baz/rsync
6653 +>f..t...... foo/config2
6655 +.L foo/sym -> ../bar/baz/rsync
6657 diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
6659 @@ -134,8 +134,8 @@ touch "$todir/foo/config2"
6660 $RSYNC -iplrtH "$fromdir/" "$todir/" \
6662 cat <<EOT >"$chkfile"
6663 -.f...p... foo/config1
6664 ->f..t.... foo/config2
6665 +.f...p..... foo/config1
6666 +>f..t...... foo/config2
6668 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
6670 @@ -143,15 +143,15 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fro
6673 cat <<EOT >"$chkfile"
6681 -hf foo/extra => foo/config1
6682 -cL foo/sym -> ../bar/baz/rsync
6690 +hf foo/extra => foo/config1
6691 +cL foo/sym -> ../bar/baz/rsync
6693 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
6695 @@ -159,7 +159,7 @@ rm -rf "$to2dir"
6696 $RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
6698 cat <<EOT >"$chkfile"
6699 -hf foo/extra => foo/config1
6700 +hf foo/extra => foo/config1
6702 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
6704 @@ -185,15 +185,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
6707 cat <<EOT >"$chkfile"
6715 -hf foo/extra => foo/config1
6716 -$L foo/sym -> ../bar/baz/rsync
6724 +hf foo/extra => foo/config1
6725 +$L foo/sym -> ../bar/baz/rsync
6727 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
6729 @@ -233,15 +233,15 @@ $RSYNC -ivvplrtH --compare-dest="$todir"
6732 cat <<EOT >"$chkfile"
6741 -.L foo/sym -> ../bar/baz/rsync
6750 +.L foo/sym -> ../bar/baz/rsync
6752 diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
6758 extern int preserve_uid;
6759 extern int preserve_gid;
6760 +extern int preserve_acls;
6761 extern int numeric_ids;
6764 @@ -270,7 +271,7 @@ void send_uid_list(int f)
6766 struct idlist *list;
6768 - if (preserve_uid) {
6769 + if (preserve_uid || preserve_acls) {
6771 /* we send sequences of uid/byte-length/name */
6772 for (list = uidlist; list; list = list->next) {
6773 @@ -287,7 +288,7 @@ void send_uid_list(int f)
6777 - if (preserve_gid) {
6778 + if (preserve_gid || preserve_acls) {
6780 for (list = gidlist; list; list = list->next) {
6782 @@ -308,7 +309,7 @@ void recv_uid_list(int f, struct file_li
6786 - if (preserve_uid && !numeric_ids) {
6787 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
6788 /* read the uid list */
6789 while ((id = read_int(f)) != 0) {
6790 int len = read_byte(f);
6791 @@ -320,7 +321,7 @@ void recv_uid_list(int f, struct file_li
6795 - if (preserve_gid && !numeric_ids) {
6796 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
6797 /* read the gid list */
6798 while ((id = read_int(f)) != 0) {
6799 int len = read_byte(f);
6800 @@ -332,6 +333,16 @@ void recv_uid_list(int f, struct file_li
6804 +#ifdef SUPPORT_ACLS
6805 + if (preserve_acls && !numeric_ids) {
6807 + while ((id = next_acl_uid(flist)) != NULL)
6808 + *id = match_uid(*id);
6809 + while ((id = next_acl_gid(flist)) != NULL)
6810 + *id = match_gid(*id);
6814 /* Now convert all the uids/gids from sender values to our values. */
6815 if (am_root && preserve_uid && !numeric_ids) {
6816 for (i = 0; i < flist->count; i++)
6819 @@ -1467,3 +1467,31 @@ int bitbag_next_bit(struct bitbag *bb, i
6824 +void *expand_item_list(item_list *lp, size_t item_size,
6825 + const char *desc, int incr)
6827 + /* First time through, 0 <= 0, so list is expanded. */
6828 + if (lp->malloced <= lp->count) {
6830 + size_t new_size = lp->malloced;
6832 + new_size -= incr; /* increase slowly */
6833 + else if (new_size < (size_t)incr)
6837 + new_ptr = realloc_array(lp->items, char, new_size * item_size);
6838 + if (verbose >= 4) {
6839 + rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
6840 + who_am_i(), desc, (double)new_size * item_size,
6841 + new_ptr == lp->items ? " not" : "");
6844 + out_of_memory("expand_item_list");
6846 + lp->items = new_ptr;
6847 + lp->malloced = new_size;
6849 + return (char*)lp->items + (lp->count++ * item_size);