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;
67 +/* === ACL structures === */
79 +#define NO_ENTRY ((uchar)0x80)
80 +typedef struct rsync_acl {
83 + /* These will be NO_ENTRY if there's no such entry. */
95 +static const rsync_acl empty_rsync_acl = {
96 + {NULL, 0}, {NULL, 0}, NO_ENTRY, NO_ENTRY, NO_ENTRY, NO_ENTRY
99 +static item_list access_acl_list = EMPTY_ITEM_LIST;
100 +static item_list default_acl_list = EMPTY_ITEM_LIST;
102 +/* === Calculations on ACL types === */
104 +static const char *str_acl_type(SMB_ACL_TYPE_T type)
106 + return type == SMB_ACL_TYPE_ACCESS ? "SMB_ACL_TYPE_ACCESS"
107 + : type == SMB_ACL_TYPE_DEFAULT ? "SMB_ACL_TYPE_DEFAULT"
108 + : "unknown SMB_ACL_TYPE_T";
111 +#define OTHER_TYPE(t) (SMB_ACL_TYPE_ACCESS+SMB_ACL_TYPE_DEFAULT-(t))
112 +#define BUMP_TYPE(t) ((t = OTHER_TYPE(t)) == SMB_ACL_TYPE_DEFAULT)
114 +static int count_racl_entries(const rsync_acl *racl)
116 + return racl->users.count + racl->groups.count
117 + + (racl->user_obj != NO_ENTRY)
118 + + (racl->group_obj != NO_ENTRY)
119 + + (racl->mask != NO_ENTRY)
120 + + (racl->other != NO_ENTRY);
123 +static int calc_sacl_entries(const rsync_acl *racl)
125 + /* A System ACL always gets user/group/other permission entries. */
126 + return racl->users.count + racl->groups.count
127 +#ifdef ACLS_NEED_MASK
130 + + (racl->mask != NO_ENTRY) + 3;
134 +/* Extracts and returns the permission bits from the ACL. This cannot be
135 + * called on an rsync_acl that has NO_ENTRY in any spot but the mask. */
136 +static int rsync_acl_get_perms(const rsync_acl *racl)
138 + return (racl->user_obj << 6)
139 + + ((racl->mask != NO_ENTRY ? racl->mask : racl->group_obj) << 3)
143 +/* Removes the permission-bit entries from the ACL because these
144 + * can be reconstructed from the file's mode. */
145 +static void rsync_acl_strip_perms(rsync_acl *racl)
147 + racl->user_obj = NO_ENTRY;
148 + if (racl->mask == NO_ENTRY)
149 + racl->group_obj = NO_ENTRY;
151 + if (racl->group_obj == racl->mask)
152 + racl->group_obj = NO_ENTRY;
153 + racl->mask = NO_ENTRY;
155 + racl->other = NO_ENTRY;
158 +/* Given an empty rsync_acl, fake up the permission bits. */
159 +static void rsync_acl_fake_perms(rsync_acl *racl, mode_t mode)
161 + racl->user_obj = (mode >> 6) & 7;
162 + racl->group_obj = (mode >> 3) & 7;
163 + racl->other = mode & 7;
166 +/* === Rsync ACL functions === */
168 +static BOOL ida_entries_equal(const ida_entries *ial1, const ida_entries *ial2)
170 + id_access *ida1, *ida2;
171 + int count = ial1->count;
172 + if (count != ial2->count)
176 + for (; count--; ida1++, ida2++) {
177 + if (ida1->access != ida2->access || ida1->id != ida2->id)
183 +static BOOL rsync_acl_equal(const rsync_acl *racl1, const rsync_acl *racl2)
185 + return racl1->user_obj == racl2->user_obj
186 + && racl1->group_obj == racl2->group_obj
187 + && racl1->mask == racl2->mask
188 + && racl1->other == racl2->other
189 + && ida_entries_equal(&racl1->users, &racl2->users)
190 + && ida_entries_equal(&racl1->groups, &racl2->groups);
193 +/* Are the extended (non-permission-bit) entries equal? If so, the rest of
194 + * the ACL will be handled by the normal mode-preservation code. This is
195 + * only meaningful for access ACLs! Note: the 1st arg is a fully-populated
196 + * rsync_acl, but the 2nd parameter can be a condensed rsync_acl, which means
197 + * that it might have several of its permission objects set to NO_ENTRY. */
198 +static BOOL rsync_acl_equal_enough(const rsync_acl *racl1,
199 + const rsync_acl *racl2, mode_t m)
201 + if ((racl1->mask ^ racl2->mask) & NO_ENTRY)
202 + return False; /* One has a mask and the other doesn't */
204 + /* When there's a mask, the group_obj becomes an extended entry. */
205 + if (racl1->mask != NO_ENTRY) {
206 + /* A condensed rsync_acl with a mask can only have no
207 + * group_obj when it was identical to the mask. This
208 + * means that it was also identical to the group attrs
209 + * from the mode. */
210 + if (racl2->group_obj == NO_ENTRY) {
211 + if (racl1->group_obj != ((m >> 3) & 7))
213 + } else if (racl1->group_obj != racl2->group_obj)
216 + return ida_entries_equal(&racl1->users, &racl2->users)
217 + && ida_entries_equal(&racl1->groups, &racl2->groups);
220 +static void rsync_acl_free(rsync_acl *racl)
222 + if (racl->users.idas)
223 + free(racl->users.idas);
224 + if (racl->groups.idas)
225 + free(racl->groups.idas);
226 + *racl = empty_rsync_acl;
229 +void free_acl(statx *sxp)
231 + if (sxp->acc_acl) {
232 + rsync_acl_free(sxp->acc_acl);
233 + free(sxp->acc_acl);
234 + sxp->acc_acl = NULL;
236 + if (sxp->def_acl) {
237 + rsync_acl_free(sxp->def_acl);
238 + free(sxp->def_acl);
239 + sxp->def_acl = NULL;
243 +static int id_access_sorter(const void *r1, const void *r2)
245 + id_access *ida1 = (id_access *)r1;
246 + id_access *ida2 = (id_access *)r2;
247 + id_t rid1 = ida1->id, rid2 = ida2->id;
248 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
251 +static void sort_ida_entries(ida_entries *idal)
255 + qsort(idal->idas, idal->count, sizeof idal->idas[0], id_access_sorter);
258 +/* Transfer the count id_access items out of the temp_ida_list into either
259 + * the users or groups ida_entries list in racl. */
260 +static void save_idas(item_list *temp_ida_list, rsync_acl *racl, SMB_ACL_TAG_T type)
265 + if (temp_ida_list->count) {
266 + int cnt = temp_ida_list->count;
267 + id_access *temp_idas = temp_ida_list->items;
268 + if (!(idas = new_array(id_access, cnt)))
269 + out_of_memory("save_idas");
270 + memcpy(idas, temp_idas, cnt * sizeof *temp_idas);
274 + ent = type == SMB_ACL_USER ? &racl->users : &racl->groups;
277 + rprintf(FERROR, "save_idas: disjoint list found for type %d\n", type);
278 + exit_cleanup(RERR_UNSUPPORTED);
280 + ent->count = temp_ida_list->count;
283 + /* Truncate the temporary list now that its idas have been saved. */
284 + temp_ida_list->count = 0;
287 +/* === System ACLs === */
289 +/* Unpack system ACL -> rsync ACL verbatim. Return whether we succeeded. */
290 +static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
292 + static item_list temp_ida_list = EMPTY_ITEM_LIST;
293 + SMB_ACL_TAG_T prior_list_type = 0;
294 + SMB_ACL_ENTRY_T entry;
295 + const char *errfun;
298 + errfun = "sys_acl_get_entry";
299 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
301 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
302 + SMB_ACL_TAG_T tag_type;
303 + SMB_ACL_PERMSET_T permset;
307 + if ((rc = sys_acl_get_tag_type(entry, &tag_type))) {
308 + errfun = "sys_acl_get_tag_type";
311 + if ((rc = sys_acl_get_permset(entry, &permset))) {
312 + errfun = "sys_acl_get_tag_type";
315 + access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
316 + | (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
317 + | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
318 + /* continue == done with entry; break == store in temporary ida list */
319 + switch (tag_type) {
320 + case SMB_ACL_USER_OBJ:
321 + if (racl->user_obj == NO_ENTRY)
322 + racl->user_obj = access;
324 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate USER_OBJ entry ignored\n");
328 + case SMB_ACL_GROUP_OBJ:
329 + if (racl->group_obj == NO_ENTRY)
330 + racl->group_obj = access;
332 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate GROUP_OBJ entry ignored\n");
334 + case SMB_ACL_GROUP:
337 + if (racl->mask == NO_ENTRY)
338 + racl->mask = access;
340 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate MASK entry ignored\n");
342 + case SMB_ACL_OTHER:
343 + if (racl->other == NO_ENTRY)
344 + racl->other = access;
346 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate OTHER entry ignored\n");
349 + rprintf(FINFO, "unpack_smb_acl: warning: entry with unrecognized tag type ignored\n");
352 + if (!(qualifier = sys_acl_get_qualifier(entry))) {
353 + errfun = "sys_acl_get_tag_type";
357 + if (tag_type != prior_list_type) {
358 + if (prior_list_type)
359 + save_idas(&temp_ida_list, racl, prior_list_type);
360 + prior_list_type = tag_type;
362 + ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
363 + ida->id = *((id_t *)qualifier);
364 + ida->access = access;
365 + sys_acl_free_qualifier(qualifier, tag_type);
368 + rsyserr(FERROR, errno, "unpack_smb_acl: %s()", errfun);
369 + rsync_acl_free(racl);
372 + if (prior_list_type)
373 + save_idas(&temp_ida_list, racl, prior_list_type);
375 + sort_ida_entries(&racl->users);
376 + sort_ida_entries(&racl->groups);
378 +#ifdef ACLS_NEED_MASK
379 + if (!racl->users.count && !racl->groups.count && racl->mask != NO_ENTRY) {
380 + /* Throw away a superfluous mask, but mask off the
381 + * group perms with it first. */
382 + racl->group_obj &= racl->mask;
383 + racl->mask = NO_ENTRY;
390 +/* Synactic sugar for system calls */
392 +#define CALL_OR_ERROR(func,args,str) \
400 +#define COE(func,args) CALL_OR_ERROR(func,args,#func)
401 +#define COE2(func,args) CALL_OR_ERROR(func,args,NULL)
403 +/* Store the permissions in the system ACL entry. */
404 +static int store_access_in_entry(uchar access, SMB_ACL_ENTRY_T entry)
406 + const char *errfun = NULL;
407 + SMB_ACL_PERMSET_T permset;
409 + COE( sys_acl_get_permset,(entry, &permset) );
410 + COE( sys_acl_clear_perms,(permset) );
412 + COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
414 + COE( sys_acl_add_perm,(permset, SMB_ACL_WRITE) );
416 + COE( sys_acl_add_perm,(permset, SMB_ACL_EXECUTE) );
417 + COE( sys_acl_set_permset,(entry, permset) );
422 + rsyserr(FERROR, errno, "store_access_in_entry %s()", errfun);
426 +/* Pack rsync ACL -> system ACL verbatim. Return whether we succeeded. */
427 +static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
429 +#ifdef ACLS_NEED_MASK
434 + const char *errfun = NULL;
435 + SMB_ACL_ENTRY_T entry;
437 + if (!(*smb_acl = sys_acl_init(calc_sacl_entries(racl)))) {
438 + rsyserr(FERROR, errno, "pack_smb_acl: sys_acl_init()");
442 + COE( sys_acl_create_entry,(smb_acl, &entry) );
443 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER_OBJ) );
444 + COE2( store_access_in_entry,(racl->user_obj & 7, entry) );
446 + for (ida = racl->users.idas, count = racl->users.count; count--; ida++) {
447 + COE( sys_acl_create_entry,(smb_acl, &entry) );
448 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER) );
449 + COE( sys_acl_set_qualifier,(entry, (void*)&ida->id) );
450 + COE2( store_access_in_entry,(ida->access, entry) );
453 + COE( sys_acl_create_entry,(smb_acl, &entry) );
454 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP_OBJ) );
455 + COE2( store_access_in_entry,(racl->group_obj & 7, entry) );
457 + for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) {
458 + COE( sys_acl_create_entry,(smb_acl, &entry) );
459 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP) );
460 + COE( sys_acl_set_qualifier,(entry, (void*)&ida->id) );
461 + COE2( store_access_in_entry,(ida->access, entry) );
464 +#ifdef ACLS_NEED_MASK
465 + mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 7 : racl->mask;
466 + COE( sys_acl_create_entry,(smb_acl, &entry) );
467 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
468 + COE2( store_access_in_entry,(mask_bits, entry) );
470 + if (racl->mask != NO_ENTRY) {
471 + COE( sys_acl_create_entry,(smb_acl, &entry) );
472 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
473 + COE2( store_access_in_entry,(racl->mask, entry) );
477 + COE( sys_acl_create_entry,(smb_acl, &entry) );
478 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_OTHER) );
479 + COE2( store_access_in_entry,(racl->other & 7, entry) );
482 + if (sys_acl_valid(*smb_acl) < 0)
483 + rprintf(FERROR, "pack_smb_acl: warning: system says the ACL I packed is invalid\n");
490 + rsyserr(FERROR, errno, "pack_smb_acl %s()", errfun);
492 + sys_acl_free_acl(*smb_acl);
496 +static int find_matching_rsync_acl(SMB_ACL_TYPE_T type,
497 + const item_list *racl_list,
498 + const rsync_acl *racl)
500 + static int access_match = -1, default_match = -1;
501 + int *match = type == SMB_ACL_TYPE_ACCESS ? &access_match : &default_match;
502 + size_t count = racl_list->count;
504 + /* If this is the first time through or we didn't match the last
505 + * time, then start at the end of the list, which should be the
506 + * best place to start hunting. */
508 + *match = racl_list->count - 1;
510 + rsync_acl *base = racl_list->items;
511 + if (rsync_acl_equal(base + *match, racl))
514 + *match = racl_list->count - 1;
521 +/* Return the Access Control List for the given filename. */
522 +int get_acl(const char *fname, statx *sxp)
524 + SMB_ACL_TYPE_T type;
526 + if (S_ISLNK(sxp->st.st_mode))
529 + type = SMB_ACL_TYPE_ACCESS;
531 + SMB_ACL_T sacl = sys_acl_get_file(fname, type);
532 + rsync_acl *racl = new(rsync_acl);
535 + out_of_memory("get_acl");
536 + *racl = empty_rsync_acl;
537 + if (type == SMB_ACL_TYPE_ACCESS)
538 + sxp->acc_acl = racl;
540 + sxp->def_acl = racl;
543 + BOOL ok = unpack_smb_acl(racl, sacl);
545 + sys_acl_free_acl(sacl);
550 + } else if (errno == ENOTSUP || errno == ENOSYS) {
551 + /* ACLs are not supported, so pretend we have a basic ACL. */
552 + if (type == SMB_ACL_TYPE_ACCESS)
553 + rsync_acl_fake_perms(racl, sxp->st.st_mode);
555 + rsyserr(FERROR, errno, "get_acl: sys_acl_get_file(%s, %s)",
556 + fname, str_acl_type(type));
560 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
565 +/* === Send functions === */
567 +/* The general strategy with the tag_type <-> character mapping is that
568 + * lowercase implies that no qualifier follows, where uppercase does.
569 + * A similar idiom for the ACL type (access or default) itself, but
570 + * lowercase in this instance means there's no ACL following, so the
571 + * ACL is a repeat, so the receiver should reuse the last of the same
574 +/* Send the ida list over the file descriptor. */
575 +static void send_ida_entries(int f, const ida_entries *idal, char tag_char)
578 + size_t count = idal->count;
579 + for (ida = idal->idas; count--; ida++) {
580 + write_byte(f, tag_char);
581 + write_byte(f, ida->access);
582 + write_int(f, ida->id);
583 + /* FIXME: sorta wasteful: we should maybe buffer as
584 + * many ids as max(ACL_USER + ACL_GROUP) objects to
585 + * keep from making so many calls. */
586 + if (tag_char == 'U')
593 +/* Send an rsync ACL over the file descriptor. */
594 +static void send_rsync_acl(int f, const rsync_acl *racl)
596 + size_t count = count_racl_entries(racl);
597 + write_int(f, count);
598 + if (racl->user_obj != NO_ENTRY) {
599 + write_byte(f, 'u');
600 + write_byte(f, racl->user_obj);
602 + send_ida_entries(f, &racl->users, 'U');
603 + if (racl->group_obj != NO_ENTRY) {
604 + write_byte(f, 'g');
605 + write_byte(f, racl->group_obj);
607 + send_ida_entries(f, &racl->groups, 'G');
608 + if (racl->mask != NO_ENTRY) {
609 + write_byte(f, 'm');
610 + write_byte(f, racl->mask);
612 + if (racl->other != NO_ENTRY) {
613 + write_byte(f, 'o');
614 + write_byte(f, racl->other);
618 +/* Send the ACL from the statx structure down the indicated file descriptor.
619 + * This also frees the ACL data. */
620 +void send_acl(statx *sxp, int f)
622 + SMB_ACL_TYPE_T type;
623 + rsync_acl *racl, *new_racl;
624 + item_list *racl_list;
627 + if (S_ISLNK(sxp->st.st_mode))
630 + type = SMB_ACL_TYPE_ACCESS;
631 + racl = sxp->acc_acl;
632 + racl_list = &access_acl_list;
635 + racl = new(rsync_acl);
637 + out_of_memory("send_acl");
638 + *racl = empty_rsync_acl;
639 + if (type == SMB_ACL_TYPE_ACCESS) {
640 + rsync_acl_fake_perms(racl, sxp->st.st_mode);
641 + sxp->acc_acl = racl;
643 + sxp->def_acl = racl;
646 + /* Avoid sending values that can be inferred from other data. */
647 + if (type == SMB_ACL_TYPE_ACCESS)
648 + rsync_acl_strip_perms(racl);
649 + if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
650 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
653 + new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1000);
654 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
655 + send_rsync_acl(f, racl);
657 + *racl = empty_rsync_acl;
659 + racl = sxp->def_acl;
660 + racl_list = &default_acl_list;
661 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
666 +/* === Receive functions === */
668 +static void receive_rsync_acl(rsync_acl *racl, int f, SMB_ACL_TYPE_T type)
670 + static item_list temp_ida_list = EMPTY_ITEM_LIST;
671 + SMB_ACL_TAG_T tag_type = 0, prior_list_type = 0;
672 + uchar computed_mask_bits = 0;
676 + if (!(count = read_int(f)))
680 + char tag = read_byte(f);
681 + uchar access = read_byte(f);
682 + if (access & ~ (4 | 2 | 1)) {
683 + rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
685 + exit_cleanup(RERR_STREAMIO);
689 + if (racl->user_obj != NO_ENTRY) {
690 + rprintf(FERROR, "receive_rsync_acl: error: duplicate USER_OBJ entry\n");
691 + exit_cleanup(RERR_STREAMIO);
693 + racl->user_obj = access;
696 + tag_type = SMB_ACL_USER;
699 + if (racl->group_obj != NO_ENTRY) {
700 + rprintf(FERROR, "receive_rsync_acl: error: duplicate GROUP_OBJ entry\n");
701 + exit_cleanup(RERR_STREAMIO);
703 + racl->group_obj = access;
706 + tag_type = SMB_ACL_GROUP;
709 + if (racl->mask != NO_ENTRY) {
710 + rprintf(FERROR, "receive_rsync_acl: error: duplicate MASK entry\n");
711 + exit_cleanup(RERR_STREAMIO);
713 + racl->mask = access;
716 + if (racl->other != NO_ENTRY) {
717 + rprintf(FERROR, "receive_rsync_acl: error: duplicate OTHER entry\n");
718 + exit_cleanup(RERR_STREAMIO);
720 + racl->other = access;
723 + rprintf(FERROR, "receive_rsync_acl: unknown tag %c\n",
725 + exit_cleanup(RERR_STREAMIO);
727 + if (tag_type != prior_list_type) {
728 + if (prior_list_type)
729 + save_idas(&temp_ida_list, racl, prior_list_type);
730 + prior_list_type = tag_type;
732 + ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
733 + ida->access = access;
734 + ida->id = read_int(f);
735 + computed_mask_bits |= access;
737 + if (prior_list_type)
738 + save_idas(&temp_ida_list, racl, prior_list_type);
740 + if (type == SMB_ACL_TYPE_DEFAULT) {
741 + /* Ensure that these are never unset. */
742 + if (racl->user_obj == NO_ENTRY)
743 + racl->user_obj = 7;
744 + if (racl->group_obj == NO_ENTRY)
745 + racl->group_obj = 0;
746 + if (racl->other == NO_ENTRY)
750 + if (!racl->users.count && !racl->groups.count) {
751 + /* If we received a superfluous mask, throw it away. */
752 + if (racl->mask != NO_ENTRY) {
753 + /* Mask off the group perms with it first. */
754 + racl->group_obj &= racl->mask | NO_ENTRY;
755 + racl->mask = NO_ENTRY;
757 + } else if (racl->mask == NO_ENTRY) /* Must be non-empty with lists. */
758 + racl->mask = computed_mask_bits | (racl->group_obj & 7);
761 +/* Receive the ACL info the sender has included for this file-list entry. */
762 +void receive_acl(struct file_struct *file, int f)
764 + SMB_ACL_TYPE_T type;
765 + item_list *racl_list;
767 + if (S_ISLNK(file->mode))
770 + type = SMB_ACL_TYPE_ACCESS;
771 + racl_list = &access_acl_list;
773 + char tag = read_byte(f);
776 + if (tag == 'A' || tag == 'a') {
777 + if (type != SMB_ACL_TYPE_ACCESS) {
778 + rprintf(FERROR, "receive_acl %s: duplicate access ACL\n",
779 + f_name(file, NULL));
780 + exit_cleanup(RERR_STREAMIO);
782 + } else if (tag == 'D' || tag == 'd') {
783 + if (type == SMB_ACL_TYPE_ACCESS) {
784 + rprintf(FERROR, "receive_acl %s: expecting access ACL; got default\n",
785 + f_name(file, NULL));
786 + exit_cleanup(RERR_STREAMIO);
789 + rprintf(FERROR, "receive_acl %s: unknown ACL type tag: %c\n",
790 + f_name(file, NULL), tag);
791 + exit_cleanup(RERR_STREAMIO);
793 + if (tag == 'A' || tag == 'D') {
795 + ndx = racl_list->count;
796 + duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
797 + duo_item->racl = empty_rsync_acl;
798 + receive_rsync_acl(&duo_item->racl, f, type);
799 + duo_item->sacl = NULL;
802 + if (ndx < 0 || (size_t)ndx >= racl_list->count) {
803 + rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
804 + f_name(file, NULL), str_acl_type(type), ndx);
805 + exit_cleanup(RERR_STREAMIO);
808 + if (type == SMB_ACL_TYPE_ACCESS)
811 + F_DEF_ACL(file) = ndx;
812 + racl_list = &default_acl_list;
813 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
816 +/* Turn the ACL data in statx into cached ACL data, setting the index
817 + * values in the file struct. */
818 +void cache_acl(struct file_struct *file, statx *sxp)
820 + SMB_ACL_TYPE_T type;
822 + item_list *racl_list;
825 + if (S_ISLNK(file->mode))
828 + type = SMB_ACL_TYPE_ACCESS;
829 + racl = sxp->acc_acl;
830 + racl_list = &access_acl_list;
834 + else if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) == -1) {
836 + ndx = racl_list->count;
837 + new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
838 + new_duo->racl = *racl;
839 + new_duo->sacl = NULL;
840 + *racl = empty_rsync_acl;
842 + if (type == SMB_ACL_TYPE_ACCESS)
845 + F_DEF_ACL(file) = ndx;
846 + racl = sxp->def_acl;
847 + racl_list = &default_acl_list;
848 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
853 +static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode, mode_t mode)
855 + SMB_ACL_ENTRY_T entry;
856 + const char *errfun;
859 + if (S_ISDIR(mode)) {
860 + /* If the sticky bit is going on, it's not safe to allow all
861 + * the new ACL to go into effect before it gets set. */
862 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
863 + if (mode & S_ISVTX)
866 + if (mode & S_ISVTX && !(old_mode & S_ISVTX))
869 + /* If setuid or setgid is going off, it's not safe to allow all
870 + * the new ACL to go into effect before they get cleared. */
871 + if ((old_mode & S_ISUID && !(mode & S_ISUID))
872 + || (old_mode & S_ISGID && !(mode & S_ISGID)))
877 + errfun = "sys_acl_get_entry";
878 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
880 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
881 + SMB_ACL_TAG_T tag_type;
882 + if ((rc = sys_acl_get_tag_type(entry, &tag_type))) {
883 + errfun = "sys_acl_get_tag_type";
886 + switch (tag_type) {
887 + case SMB_ACL_USER_OBJ:
888 + COE2( store_access_in_entry,((mode >> 6) & 7, entry) );
890 + case SMB_ACL_GROUP_OBJ:
891 + /* group is only empty when identical to group perms. */
892 + if (racl->group_obj != NO_ENTRY)
894 + COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
897 +#ifndef ACLS_NEED_MASK
898 + /* mask is only empty when we don't need it. */
899 + if (racl->mask == NO_ENTRY)
902 + COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
904 + case SMB_ACL_OTHER:
905 + COE2( store_access_in_entry,(mode & 7, entry) );
912 + rsyserr(FERROR, errno, "change_sacl_perms: %s()",
918 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
919 + /* Ensure that chmod() will be called to restore any lost setid bits. */
920 + if (old_mode & (S_ISUID | S_ISGID | S_ISVTX)
921 + && BITS_EQUAL(old_mode, mode, CHMOD_BITS))
922 + old_mode &= ~(S_ISUID | S_ISGID | S_ISVTX);
925 + /* Return the mode of the file on disk, as we will set them. */
926 + return (old_mode & ~ACCESSPERMS) | (mode & ACCESSPERMS);
929 +/* Set ACL on indicated filename.
931 + * This sets extended access ACL entries and default ACL. If convenient,
932 + * it sets permission bits along with the access ACL and signals having
933 + * done so by modifying sxp->st.st_mode.
935 + * Returns 1 for unchanged, 0 for changed, -1 for failed. Call this
936 + * with fname set to NULL to just check if the ACL is unchanged. */
937 +int set_acl(const char *fname, const struct file_struct *file, statx *sxp)
940 + SMB_ACL_TYPE_T type;
942 + if (!dry_run && (read_only || list_only)) {
947 + if (S_ISLNK(file->mode))
950 + type = SMB_ACL_TYPE_ACCESS;
956 + if (type == SMB_ACL_TYPE_ACCESS) {
958 + if (ndx < 0 || (size_t)ndx >= access_acl_list.count)
960 + duo_item = access_acl_list.items;
963 + && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
965 + ndx = F_DEF_ACL(file);
966 + if (ndx < 0 || (size_t)ndx >= default_acl_list.count)
968 + duo_item = default_acl_list.items;
971 + && rsync_acl_equal(sxp->def_acl, &duo_item->racl);
975 + if (!dry_run && fname) {
976 + if (type == SMB_ACL_TYPE_DEFAULT
977 + && duo_item->racl.user_obj == NO_ENTRY) {
978 + if (sys_acl_delete_def_file(fname) < 0) {
979 + rsyserr(FERROR, errno, "set_acl: sys_acl_delete_def_file(%s)",
985 + mode_t cur_mode = sxp->st.st_mode;
986 + if (!duo_item->sacl
987 + && !pack_smb_acl(&duo_item->sacl, &duo_item->racl)) {
991 + if (type == SMB_ACL_TYPE_ACCESS) {
992 + cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl,
993 + cur_mode, file->mode);
994 + if (cur_mode == (mode_t)~0)
997 + if (sys_acl_set_file(fname, type, duo_item->sacl) < 0) {
998 + rsyserr(FERROR, errno, "set_acl: sys_acl_set_file(%s, %s)",
999 + fname, str_acl_type(type));
1003 + if (type == SMB_ACL_TYPE_ACCESS)
1004 + sxp->st.st_mode = cur_mode;
1007 + if (unchanged == 1)
1009 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
1014 +/* === Enumeration functions for uid mapping === */
1016 +/* Context -- one and only one. Should be cycled through once on uid
1017 + * mapping and once on gid mapping. */
1018 +static item_list *_enum_racl_lists[] = {
1019 + &access_acl_list, &default_acl_list, NULL
1022 +static item_list **enum_racl_list = &_enum_racl_lists[0];
1023 +static int enum_ida_index = 0;
1024 +static size_t enum_racl_index = 0;
1026 +/* This returns the next tag_type id from the given ACL for the next entry,
1027 + * or it returns 0 if there are no more tag_type ids in the acl. */
1028 +static id_t *next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
1030 + const ida_entries *idal = tag_type == SMB_ACL_USER ? &racl->users : &racl->groups;
1031 + if (enum_ida_index < idal->count) {
1032 + id_access *ida = &idal->idas[enum_ida_index++];
1035 + enum_ida_index = 0;
1039 +static id_t *next_acl_id(SMB_ACL_TAG_T tag_type, const item_list *racl_list)
1041 + for (; enum_racl_index < racl_list->count; enum_racl_index++) {
1043 + acl_duo *duo_item = racl_list->items;
1044 + duo_item += enum_racl_index;
1045 + if ((id = next_ace_id(tag_type, &duo_item->racl)) != NULL)
1048 + enum_racl_index = 0;
1052 +static id_t *next_acl_list_id(SMB_ACL_TAG_T tag_type)
1054 + for (; *enum_racl_list; enum_racl_list++) {
1055 + id_t *id = next_acl_id(tag_type, *enum_racl_list);
1059 + enum_racl_list = &_enum_racl_lists[0];
1063 +id_t *next_acl_uid()
1065 + return next_acl_list_id(SMB_ACL_USER);
1068 +id_t *next_acl_gid()
1070 + return next_acl_list_id(SMB_ACL_GROUP);
1073 +/* This is used by dest_mode(). */
1074 +int default_perms_for_dir(const char *dir)
1083 + perms = ACCESSPERMS & ~orig_umask;
1084 + /* Read the directory's default ACL. If it has none, this will successfully return an empty ACL. */
1085 + sacl = sys_acl_get_file(dir, SMB_ACL_TYPE_DEFAULT);
1086 + if (sacl == NULL) {
1087 + /* Couldn't get an ACL. Darn. */
1091 + /* No ACLs are available. */
1095 + /* We're doing a dry run, so the containing directory
1096 + * wasn't actually created. Don't worry about it. */
1099 + /* Otherwise fall through. */
1101 + rprintf(FERROR, "default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
1102 + dir, str_acl_type(SMB_ACL_TYPE_DEFAULT), strerror(errno));
1108 + racl = empty_rsync_acl;
1109 + ok = unpack_smb_acl(&racl, sacl);
1110 + sys_acl_free_acl(sacl);
1112 + rprintf(FERROR, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
1116 + /* Apply the permission-bit entries of the default ACL, if any. */
1117 + if (racl.user_obj != NO_ENTRY) {
1118 + perms = rsync_acl_get_perms(&racl);
1120 + rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
1123 + rsync_acl_free(&racl);
1127 +#endif /* SUPPORT_ACLS */
1134 +extern int preserve_acls;
1135 extern int preserve_devices;
1136 extern int preserve_specials;
1137 extern int preserve_links;
1138 @@ -93,7 +94,8 @@ path
1139 ****************************************************************************/
1140 static int make_bak_dir(char *fullpath)
1144 + struct file_struct *file;
1145 char *rel = fullpath + backup_dir_len;
1146 char *end = rel + strlen(rel);
1148 @@ -125,15 +127,24 @@ static int make_bak_dir(char *fullpath)
1150 /* Try to transfer the directory settings of the
1151 * actual dir that the files are coming from. */
1152 - if (do_stat(rel, &st) < 0) {
1153 + if (do_stat(rel, &sx.st) < 0) {
1154 rsyserr(FERROR, errno,
1155 "make_bak_dir stat %s failed",
1158 - do_lchown(fullpath, st.st_uid, st.st_gid);
1160 - do_chmod(fullpath, st.st_mode);
1161 +#ifdef SUPPORT_ACLS
1162 + sx.acc_acl = sx.def_acl = NULL;
1164 + if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
1166 +#ifdef SUPPORT_ACLS
1167 + if (preserve_acls) {
1168 + get_acl(rel, &sx);
1169 + cache_acl(file, &sx);
1172 + set_file_attrs(fullpath, file, NULL, 0);
1177 @@ -171,15 +182,18 @@ static int robust_move(const char *src,
1178 * We will move the file to be deleted into a parallel directory tree. */
1179 static int keep_backup(const char *fname)
1183 struct file_struct *file;
1188 /* return if no file to keep */
1189 - if (do_lstat(fname, &st) < 0)
1190 + if (do_lstat(fname, &sx.st) < 0)
1192 +#ifdef SUPPORT_ACLS
1193 + sx.acc_acl = sx.def_acl = NULL;
1196 if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
1197 return 1; /* the file could have disappeared */
1198 @@ -189,6 +203,13 @@ static int keep_backup(const char *fname
1202 +#ifdef SUPPORT_ACLS
1203 + if (preserve_acls) {
1204 + get_acl(fname, &sx);
1205 + cache_acl(file, &sx);
1209 /* Check to see if this is a device file, or link */
1210 if ((am_root && preserve_devices && IS_DEVICE(file->mode))
1211 || (preserve_specials && IS_SPECIAL(file->mode))) {
1212 @@ -260,7 +281,7 @@ static int keep_backup(const char *fname
1213 if (robust_move(fname, buf) != 0) {
1214 rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
1215 full_fname(fname), buf);
1216 - } else if (st.st_nlink > 1) {
1217 + } else if (sx.st.st_nlink > 1) {
1218 /* If someone has hard-linked the file into the backup
1219 * dir, rename() might return success but do nothing! */
1220 robust_unlink(fname); /* Just in case... */
1223 @@ -48,6 +48,8 @@ void setup_protocol(int f_out,int f_in)
1224 preserve_uid = ++flist_extra_cnt;
1226 preserve_gid = ++flist_extra_cnt;
1227 + if (preserve_acls && !am_sender)
1228 + preserve_acls = ++flist_extra_cnt;
1230 if (remote_protocol == 0) {
1232 --- old/configure.in
1233 +++ new/configure.in
1234 @@ -537,6 +537,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1235 AC_CHECK_LIB(resolv, strcasecmp)
1238 +AC_CHECK_FUNCS(aclsort)
1239 +if test x"$ac_cv_func_aclsort" = x"no"; then
1240 + AC_CHECK_LIB(sec, aclsort)
1243 dnl At the moment we don't test for a broken memcmp(), because all we
1244 dnl need to do is test for equality, not comparison, and it seems that
1245 dnl every platform has a memcmp that can do at least that.
1246 @@ -801,6 +806,78 @@ AC_SUBST(OBJ_RESTORE)
1247 AC_SUBST(CC_SHOBJ_FLAG)
1248 AC_SUBST(BUILD_POPT)
1250 +AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
1251 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1252 +#################################################
1253 +# check for ACL support
1255 +AC_MSG_CHECKING(whether to support ACLs)
1256 +AC_ARG_ENABLE(acl-support,
1257 +AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
1258 +[ case "$enableval" in
1261 + case "$host_os" in
1263 + AC_MSG_RESULT(Using UnixWare ACLs)
1264 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1266 + *solaris*|*cygwin*)
1267 + AC_MSG_RESULT(Using solaris ACLs)
1268 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1271 + AC_MSG_RESULT(Using HPUX ACLs)
1272 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1275 + AC_MSG_RESULT(Using IRIX ACLs)
1276 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1279 + AC_MSG_RESULT(Using AIX ACLs)
1280 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1283 + AC_MSG_RESULT(Using Tru64 ACLs)
1284 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1285 + LIBS="$LIBS -lpacl"
1288 + AC_MSG_RESULT(ACLs requested -- running tests)
1289 + AC_CHECK_LIB(acl,acl_get_file)
1290 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1291 + AC_TRY_LINK([#include <sys/types.h>
1292 +#include <sys/acl.h>],
1293 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1294 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1295 + AC_MSG_CHECKING(ACL test results)
1296 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1297 + AC_MSG_RESULT(Using posix ACLs)
1298 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1299 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1300 + AC_TRY_LINK([#include <sys/types.h>
1301 +#include <sys/acl.h>],
1302 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1303 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1304 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1305 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1308 + AC_MSG_ERROR(Failed to find ACL support)
1315 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1318 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1322 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1327 @@ -41,6 +41,7 @@ extern int filesfrom_fd;
1328 extern int one_file_system;
1329 extern int copy_dirlinks;
1330 extern int keep_dirlinks;
1331 +extern int preserve_acls;
1332 extern int preserve_links;
1333 extern int preserve_hard_links;
1334 extern int preserve_devices;
1335 @@ -147,6 +148,8 @@ static void list_file_entry(struct file_
1336 permstring(permbuf, f->mode);
1339 + /* TODO: indicate '+' if the entry has an ACL. */
1341 #ifdef SUPPORT_LINKS
1342 if (preserve_links && S_ISLNK(f->mode)) {
1343 rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
1344 @@ -662,6 +665,12 @@ static struct file_struct *recv_file_ent
1348 +#ifdef SUPPORT_ACLS
1349 + /* We need one or two index int32s when we're preserving ACLs. */
1350 + if (preserve_acls)
1351 + extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
1354 if (always_checksum && S_ISREG(mode))
1355 extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
1357 @@ -799,6 +808,11 @@ static struct file_struct *recv_file_ent
1358 read_buf(f, bp, checksum_len);
1361 +#ifdef SUPPORT_ACLS
1362 + if (preserve_acls)
1363 + receive_acl(file, f);
1369 @@ -1068,6 +1082,9 @@ static struct file_struct *send_file_nam
1370 unsigned short flags)
1372 struct file_struct *file;
1373 +#ifdef SUPPORT_ACLS
1377 file = make_file(fname, flist, stp, flags,
1378 f == -2 ? SERVER_FILTERS : ALL_FILTERS);
1379 @@ -1077,12 +1094,26 @@ static struct file_struct *send_file_nam
1380 if (chmod_modes && !S_ISLNK(file->mode))
1381 file->mode = tweak_mode(file->mode, chmod_modes);
1383 +#ifdef SUPPORT_ACLS
1384 + if (preserve_acls && f >= 0) {
1385 + sx.st.st_mode = file->mode;
1386 + sx.acc_acl = sx.def_acl = NULL;
1387 + if (get_acl(fname, &sx) < 0)
1392 maybe_emit_filelist_progress(flist->count + flist_count_offset);
1394 flist_expand(flist);
1395 flist->files[flist->count++] = file;
1398 send_file_entry(file, f, flist->count - 1);
1399 +#ifdef SUPPORT_ACLS
1400 + if (preserve_acls)
1409 @@ -35,6 +35,7 @@ extern int do_progress;
1410 extern int relative_paths;
1411 extern int implied_dirs;
1412 extern int keep_dirlinks;
1413 +extern int preserve_acls;
1414 extern int preserve_links;
1415 extern int preserve_devices;
1416 extern int preserve_specials;
1417 @@ -87,6 +88,7 @@ extern int force_delete;
1418 extern int one_file_system;
1419 extern struct stats stats;
1420 extern dev_t filesystem_dev;
1421 +extern mode_t orig_umask;
1422 extern char *backup_dir;
1423 extern char *backup_suffix;
1424 extern int backup_suffix_len;
1425 @@ -518,21 +520,26 @@ static void do_delete_pass(struct file_l
1426 rprintf(FINFO, " \r");
1429 -int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
1430 +int unchanged_attrs(struct file_struct *file, statx *sxp)
1432 - if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1433 + if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1436 - if (am_root && preserve_uid && st->st_uid != F_UID(file))
1437 + if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
1440 - if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
1441 + if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
1444 +#ifdef SUPPORT_ACLS
1445 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1452 -void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
1453 +void itemize(struct file_struct *file, int ndx, int statret, statx *sxp,
1454 int32 iflags, uchar fnamecmp_type, const char *xname)
1456 if (statret >= 0) { /* A from-dest-dir statret can == 1! */
1457 @@ -540,20 +547,24 @@ void itemize(struct file_struct *file, i
1458 : S_ISDIR(file->mode) ? !omit_dir_times
1459 : !S_ISLNK(file->mode);
1461 - if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
1462 + if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
1463 iflags |= ITEM_REPORT_SIZE;
1464 if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
1465 && !(iflags & ITEM_MATCHED)
1466 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
1467 - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
1468 + || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
1469 iflags |= ITEM_REPORT_TIME;
1470 - if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1471 + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1472 iflags |= ITEM_REPORT_PERMS;
1473 - if (preserve_uid && am_root && F_UID(file) != st->st_uid)
1474 + if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
1475 iflags |= ITEM_REPORT_OWNER;
1476 if (preserve_gid && F_GID(file) != GID_NONE
1477 - && st->st_gid != F_GID(file))
1478 + && sxp->st.st_gid != F_GID(file))
1479 iflags |= ITEM_REPORT_GROUP;
1480 +#ifdef SUPPORT_ACLS
1481 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1482 + iflags |= ITEM_REPORT_ACL;
1485 iflags |= ITEM_IS_NEW;
1487 @@ -808,7 +819,7 @@ void check_for_finished_hlinks(int itemi
1488 * handling the file, -1 if no dest-linking occurred, or a non-negative
1489 * value if we found an alternate basis file. */
1490 static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
1491 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1492 + char *cmpbuf, statx *sxp, int itemizing,
1495 int best_match = -1;
1496 @@ -817,7 +828,7 @@ static int try_dests_reg(struct file_str
1499 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1500 - if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
1501 + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
1503 switch (match_level) {
1505 @@ -825,16 +836,20 @@ static int try_dests_reg(struct file_str
1509 - if (!unchanged_file(cmpbuf, file, stp))
1510 + if (!unchanged_file(cmpbuf, file, &sxp->st))
1516 - if (!unchanged_attrs(file, stp))
1517 +#ifdef SUPPORT_ACLS
1518 + if (preserve_acls)
1519 + get_acl(cmpbuf, sxp);
1521 + if (!unchanged_attrs(file, sxp))
1523 if (always_checksum && preserve_times
1524 - && cmp_time(stp->st_mtime, file->modtime))
1525 + && cmp_time(sxp->st.st_mtime, file->modtime))
1529 @@ -849,7 +864,7 @@ static int try_dests_reg(struct file_str
1530 if (j != best_match) {
1532 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1533 - if (link_stat(cmpbuf, stp, 0) < 0)
1534 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1538 @@ -859,16 +874,25 @@ static int try_dests_reg(struct file_str
1539 if (!hard_link_one(file, fname, cmpbuf, 1))
1541 if (preserve_hard_links && F_IS_HLINKED(file))
1542 - finish_hard_link(file, fname, stp, itemizing, code, j);
1543 + finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
1544 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
1545 - itemize(file, ndx, 1, stp,
1546 +#ifdef SUPPORT_ACLS
1547 + if (preserve_acls && !ACL_READY(*sxp))
1548 + get_acl(fname, sxp);
1550 + itemize(file, ndx, 1, sxp,
1551 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
1557 - itemize(file, ndx, 0, stp, 0, 0, NULL);
1559 +#ifdef SUPPORT_ACLS
1560 + if (preserve_acls && !ACL_READY(*sxp))
1561 + get_acl(fname, sxp);
1563 + itemize(file, ndx, 0, sxp, 0, 0, NULL);
1565 if (verbose > 1 && maybe_ATTRS_REPORT)
1566 rprintf(FCLIENT, "%s is uptodate\n", fname);
1568 @@ -885,8 +909,13 @@ static int try_dests_reg(struct file_str
1573 - itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
1575 +#ifdef SUPPORT_ACLS
1576 + if (preserve_acls && !ACL_READY(*sxp))
1577 + get_acl(fname, sxp);
1579 + itemize(file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
1581 set_file_attrs(fname, file, NULL, 0);
1582 if (maybe_ATTRS_REPORT
1583 && ((!itemizing && verbose && match_level == 2)
1584 @@ -897,7 +926,7 @@ static int try_dests_reg(struct file_str
1586 #ifdef SUPPORT_HARD_LINKS
1587 if (preserve_hard_links && F_IS_HLINKED(file))
1588 - finish_hard_link(file, fname, stp, itemizing, code, -1);
1589 + finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
1593 @@ -909,7 +938,7 @@ static int try_dests_reg(struct file_str
1594 * handling the file, or -1 if no dest-linking occurred, or a non-negative
1595 * value if we found an alternate basis file. */
1596 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
1597 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1598 + char *cmpbuf, statx *sxp, int itemizing,
1601 char lnk[MAXPATHLEN];
1602 @@ -942,24 +971,24 @@ static int try_dests_non(struct file_str
1605 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1606 - if (link_stat(cmpbuf, stp, 0) < 0)
1607 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1611 - if (!S_ISDIR(stp->st_mode))
1612 + if (!S_ISDIR(sxp->st.st_mode))
1616 - if (!IS_SPECIAL(stp->st_mode))
1617 + if (!IS_SPECIAL(sxp->st.st_mode))
1621 - if (!IS_DEVICE(stp->st_mode))
1622 + if (!IS_DEVICE(sxp->st.st_mode))
1625 #ifdef SUPPORT_LINKS
1627 - if (!S_ISLNK(stp->st_mode))
1628 + if (!S_ISLNK(sxp->st.st_mode))
1632 @@ -974,7 +1003,7 @@ static int try_dests_non(struct file_str
1635 devp = F_RDEV_P(file);
1636 - if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1637 + if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1640 #ifdef SUPPORT_LINKS
1641 @@ -991,7 +1020,11 @@ static int try_dests_non(struct file_str
1645 - if (unchanged_attrs(file, stp)) {
1646 +#ifdef SUPPORT_ACLS
1647 + if (preserve_acls)
1648 + get_acl(cmpbuf, sxp);
1650 + if (unchanged_attrs(file, sxp)) {
1654 @@ -1004,7 +1037,7 @@ static int try_dests_non(struct file_str
1655 if (j != best_match) {
1657 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1658 - if (link_stat(cmpbuf, stp, 0) < 0)
1659 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1663 @@ -1035,7 +1068,15 @@ static int try_dests_non(struct file_str
1665 + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
1666 char *lp = match_level == 3 ? "" : NULL;
1667 - itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
1668 +#ifdef SUPPORT_ACLS
1669 + if (preserve_acls)
1670 + get_acl(fname, sxp);
1672 + itemize(file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
1673 +#ifdef SUPPORT_ACLS
1674 + if (preserve_acls)
1678 if (verbose > 1 && maybe_ATTRS_REPORT) {
1679 rprintf(FCLIENT, "%s%s is uptodate\n",
1680 @@ -1048,6 +1089,7 @@ static int try_dests_non(struct file_str
1683 static int phase = 0;
1684 +static int dflt_perms;
1686 /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
1687 * make sure it exists, and has the right permissions/timestamp info. For
1688 @@ -1068,7 +1110,8 @@ static void recv_generator(char *fname,
1689 static int need_fuzzy_dirlist = 0;
1690 struct file_struct *fuzzy_file = NULL;
1691 int fd = -1, f_copy = -1;
1692 - STRUCT_STAT st, real_st, partial_st;
1693 + statx sx, real_sx;
1694 + STRUCT_STAT partial_st;
1695 struct file_struct *back_file = NULL;
1696 int statret, real_ret, stat_errno;
1697 char *fnamecmp, *partialptr, *backupptr = NULL;
1698 @@ -1124,6 +1167,9 @@ static void recv_generator(char *fname,
1699 } else if (!dry_run)
1702 +#ifdef SUPPORT_ACLS
1703 + sx.acc_acl = sx.def_acl = NULL;
1707 stat_errno = ENOENT;
1708 @@ -1131,7 +1177,7 @@ static void recv_generator(char *fname,
1709 const char *dn = file->dirname ? file->dirname : ".";
1710 if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
1711 if (relative_paths && !implied_dirs
1712 - && do_stat(dn, &st) < 0
1713 + && do_stat(dn, &sx.st) < 0
1714 && create_directory_path(fname) < 0) {
1715 rsyserr(FERROR, errno,
1716 "recv_generator: mkdir %s failed",
1717 @@ -1143,6 +1189,10 @@ static void recv_generator(char *fname,
1720 need_fuzzy_dirlist = 1;
1721 +#ifdef SUPPORT_ACLS
1722 + if (!preserve_perms)
1723 + dflt_perms = default_perms_for_dir(dn);
1726 parent_dirname = dn;
1728 @@ -1152,7 +1202,7 @@ static void recv_generator(char *fname,
1729 need_fuzzy_dirlist = 0;
1732 - statret = link_stat(fname, &st,
1733 + statret = link_stat(fname, &sx.st,
1734 keep_dirlinks && S_ISDIR(file->mode));
1737 @@ -1170,8 +1220,9 @@ static void recv_generator(char *fname,
1738 * mode based on the local permissions and some heuristics. */
1739 if (!preserve_perms) {
1740 int exists = statret == 0
1741 - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
1742 - file->mode = dest_mode(file->mode, st.st_mode, exists);
1743 + && S_ISDIR(sx.st.st_mode) == S_ISDIR(file->mode);
1744 + file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
1748 if (S_ISDIR(file->mode)) {
1749 @@ -1180,8 +1231,8 @@ static void recv_generator(char *fname,
1750 * file of that name and it is *not* a directory, then
1751 * we need to delete it. If it doesn't exist, then
1752 * (perhaps recursively) create it. */
1753 - if (statret == 0 && !S_ISDIR(st.st_mode)) {
1754 - if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
1755 + if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
1756 + if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
1760 @@ -1190,14 +1241,14 @@ static void recv_generator(char *fname,
1767 if (*fname == '.' && fname[1] == '\0')
1771 if (statret != 0 && basis_dir[0] != NULL) {
1772 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1773 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1777 @@ -1206,7 +1257,11 @@ static void recv_generator(char *fname,
1780 if (itemizing && f_out != -1) {
1781 - itemize(file, ndx, statret, &st,
1782 +#ifdef SUPPORT_ACLS
1783 + if (preserve_acls && statret == 0)
1784 + get_acl(fname, &sx);
1786 + itemize(file, ndx, statret, &sx,
1787 statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
1789 if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
1790 @@ -1226,21 +1281,21 @@ static void recv_generator(char *fname,
1794 - if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
1795 + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, 0)
1796 && verbose && code != FNONE && f_out != -1)
1797 rprintf(code, "%s/\n", fname);
1798 if (real_ret != 0 && one_file_system)
1799 - real_st.st_dev = filesystem_dev;
1800 + real_sx.st.st_dev = filesystem_dev;
1801 if (delete_during && f_out != -1 && !phase && dry_run < 2
1802 && (file->flags & FLAG_XFER_DIR))
1803 - delete_in_dir(the_file_list, fname, file, &real_st);
1805 + delete_in_dir(the_file_list, fname, file, &real_sx.st);
1809 #ifdef SUPPORT_HARD_LINKS
1810 if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
1811 - && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
1813 + && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
1817 if (preserve_links && S_ISLNK(file->mode)) {
1818 @@ -1260,17 +1315,17 @@ static void recv_generator(char *fname,
1819 char lnk[MAXPATHLEN];
1822 - if (!S_ISLNK(st.st_mode))
1823 + if (!S_ISLNK(sx.st.st_mode))
1825 else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
1826 && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
1827 /* The link is pointing to the right place. */
1829 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1830 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1831 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1832 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1833 #ifdef SUPPORT_HARD_LINKS
1834 if (preserve_hard_links && F_IS_HLINKED(file))
1835 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1836 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1838 if (remove_source_files == 1)
1839 goto return_with_success;
1840 @@ -1278,10 +1333,10 @@ static void recv_generator(char *fname,
1842 /* Not the right symlink (or not a symlink), so
1844 - if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
1845 + if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
1847 } else if (basis_dir[0] != NULL) {
1848 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1849 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1852 #ifndef CAN_HARDLINK_SYMLINK
1853 @@ -1306,7 +1361,7 @@ static void recv_generator(char *fname,
1855 set_file_attrs(fname, file, NULL, 0);
1857 - itemize(file, ndx, statret, &st,
1858 + itemize(file, ndx, statret, &sx,
1859 ITEM_LOCAL_CHANGE, 0, NULL);
1861 if (code != FNONE && verbose)
1862 @@ -1332,33 +1387,38 @@ static void recv_generator(char *fname,
1865 if (IS_DEVICE(file->mode)) {
1866 - if (!IS_DEVICE(st.st_mode))
1867 + if (!IS_DEVICE(sx.st.st_mode))
1871 - if (!IS_SPECIAL(st.st_mode))
1872 + if (!IS_SPECIAL(sx.st.st_mode))
1877 - && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
1878 - && st.st_rdev == rdev) {
1879 + && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
1880 + && sx.st.st_rdev == rdev) {
1881 /* The device or special file is identical. */
1883 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1884 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1886 +#ifdef SUPPORT_ACLS
1887 + if (preserve_acls)
1888 + get_acl(fname, &sx);
1890 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1892 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1893 #ifdef SUPPORT_HARD_LINKS
1894 if (preserve_hard_links && F_IS_HLINKED(file))
1895 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1896 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1898 if (remove_source_files == 1)
1899 goto return_with_success;
1903 - if (delete_item(fname, st.st_mode, t, del_opts) != 0)
1904 + if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
1906 } else if (basis_dir[0] != NULL) {
1907 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1908 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1911 #ifndef CAN_HARDLINK_SPECIAL
1912 @@ -1388,7 +1448,11 @@ static void recv_generator(char *fname,
1914 set_file_attrs(fname, file, NULL, 0);
1916 - itemize(file, ndx, statret, &st,
1917 +#ifdef SUPPORT_ACLS
1918 + if (preserve_acls && statret == 0)
1919 + get_acl(fname, &sx);
1921 + itemize(file, ndx, statret, &sx,
1922 ITEM_LOCAL_CHANGE, 0, NULL);
1924 if (code != FNONE && verbose)
1925 @@ -1400,7 +1464,7 @@ static void recv_generator(char *fname,
1926 if (remove_source_files == 1)
1927 goto return_with_success;
1933 if (!S_ISREG(file->mode)) {
1934 @@ -1434,7 +1498,7 @@ static void recv_generator(char *fname,
1937 if (update_only && statret == 0
1938 - && cmp_time(st.st_mtime, file->modtime) > 0) {
1939 + && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
1941 rprintf(FINFO, "%s is newer\n", fname);
1943 @@ -1443,20 +1507,20 @@ static void recv_generator(char *fname,
1945 fnamecmp_type = FNAMECMP_FNAME;
1947 - if (statret == 0 && !S_ISREG(st.st_mode)) {
1948 - if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
1949 + if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
1950 + if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
1953 stat_errno = ENOENT;
1956 if (statret != 0 && basis_dir[0] != NULL) {
1957 - int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
1958 + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
1961 if (remove_source_files == 1)
1962 goto return_with_success;
1967 fnamecmp = fnamecmpbuf;
1968 @@ -1466,7 +1530,7 @@ static void recv_generator(char *fname,
1975 if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
1976 && link_stat(partialptr, &partial_st, 0) == 0
1977 @@ -1485,7 +1549,7 @@ static void recv_generator(char *fname,
1978 rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
1979 fname, fnamecmpbuf);
1981 - st.st_size = F_LENGTH(fuzzy_file);
1982 + sx.st.st_size = F_LENGTH(fuzzy_file);
1984 fnamecmp = fnamecmpbuf;
1985 fnamecmp_type = FNAMECMP_FUZZY;
1986 @@ -1504,36 +1568,41 @@ static void recv_generator(char *fname,
1990 - if (append_mode && st.st_size > F_LENGTH(file))
1991 + if (append_mode && sx.st.st_size > F_LENGTH(file))
1994 if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
1996 else if (fnamecmp_type == FNAMECMP_FUZZY)
1998 - else if (unchanged_file(fnamecmp, file, &st)) {
1999 + else if (unchanged_file(fnamecmp, file, &sx.st)) {
2001 do_unlink(partialptr);
2002 handle_partial_dir(partialptr, PDIR_DELETE);
2005 - itemize(file, ndx, statret, &st, 0, 0, NULL);
2006 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
2008 +#ifdef SUPPORT_ACLS
2009 + if (preserve_acls && statret == 0)
2010 + get_acl(fnamecmp, &sx);
2012 + itemize(file, ndx, statret, &sx, 0, 0, NULL);
2014 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
2015 #ifdef SUPPORT_HARD_LINKS
2016 if (preserve_hard_links && F_IS_HLINKED(file))
2017 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2018 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2020 if (remove_source_files != 1)
2023 return_with_success:
2025 send_msg_int(MSG_SUCCESS, ndx);
2033 + sx.st = partial_st;
2034 fnamecmp = partialptr;
2035 fnamecmp_type = FNAMECMP_PARTIAL_DIR;
2037 @@ -1558,16 +1627,20 @@ static void recv_generator(char *fname,
2038 /* pretend the file didn't exist */
2039 #ifdef SUPPORT_HARD_LINKS
2040 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
2044 statret = real_ret = -1;
2045 +#ifdef SUPPORT_ACLS
2046 + if (preserve_acls && ACL_READY(sx))
2052 if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
2053 if (!(backupptr = get_backup_name(fname))) {
2058 if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
2060 @@ -1578,7 +1651,7 @@ static void recv_generator(char *fname,
2061 full_fname(backupptr));
2062 unmake_file(back_file);
2067 if ((f_copy = do_open(backupptr,
2068 O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
2069 @@ -1586,14 +1659,14 @@ static void recv_generator(char *fname,
2070 full_fname(backupptr));
2071 unmake_file(back_file);
2076 fnamecmp_type = FNAMECMP_BACKUP;
2080 rprintf(FINFO, "gen mapped %s of size %.0f\n",
2081 - fnamecmp, (double)st.st_size);
2082 + fnamecmp, (double)sx.st.st_size);
2086 @@ -1615,26 +1688,34 @@ static void recv_generator(char *fname,
2087 iflags |= ITEM_BASIS_TYPE_FOLLOWS;
2088 if (fnamecmp_type == FNAMECMP_FUZZY)
2089 iflags |= ITEM_XNAME_FOLLOWS;
2090 - itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
2091 +#ifdef SUPPORT_ACLS
2092 + if (preserve_acls && real_ret == 0)
2093 + get_acl(fnamecmp, &real_sx);
2095 + itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
2096 fuzzy_file ? fuzzy_file->basename : NULL);
2097 +#ifdef SUPPORT_ACLS
2098 + if (preserve_acls)
2099 + free_acl(&real_sx);
2104 #ifdef SUPPORT_HARD_LINKS
2105 if (preserve_hard_links && F_IS_HLINKED(file))
2106 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2107 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2116 if (statret != 0 || whole_file) {
2117 write_sum_head(f_out, NULL);
2122 - generate_and_send_sums(fd, st.st_size, f_out, f_copy);
2123 + generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy);
2127 @@ -1647,6 +1728,13 @@ static void recv_generator(char *fname,
2133 +#ifdef SUPPORT_ACLS
2134 + if (preserve_acls)
2140 void generate_files(int f_out, struct file_list *flist, char *local_name)
2141 @@ -1713,6 +1801,8 @@ void generate_files(int f_out, struct fi
2142 * notice that and let us know via the redo pipe (or its closing). */
2145 + dflt_perms = (ACCESSPERMS & ~orig_umask);
2147 for (i = 0; i < flist->count; i++) {
2148 struct file_struct *file = flist->files[i];
2152 @@ -27,6 +27,7 @@ extern int verbose;
2154 extern int do_xfers;
2155 extern int link_dest;
2156 +extern int preserve_acls;
2157 extern int make_backups;
2158 extern int protocol_version;
2159 extern int remove_source_files;
2160 @@ -269,15 +270,19 @@ void match_hard_links(void)
2163 static int maybe_hard_link(struct file_struct *file, int ndx,
2164 - const char *fname, int statret, STRUCT_STAT *stp,
2165 + const char *fname, int statret, statx *sxp,
2166 const char *oldname, STRUCT_STAT *old_stp,
2167 const char *realname, int itemizing, enum logcode code)
2170 - if (stp->st_dev == old_stp->st_dev
2171 - && stp->st_ino == old_stp->st_ino) {
2172 + if (sxp->st.st_dev == old_stp->st_dev
2173 + && sxp->st.st_ino == old_stp->st_ino) {
2175 - itemize(file, ndx, statret, stp,
2176 +#ifdef SUPPORT_ACLS
2177 + if (preserve_acls && !ACL_READY(*sxp))
2178 + get_acl(fname, sxp);
2180 + itemize(file, ndx, statret, sxp,
2181 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
2184 @@ -298,7 +303,11 @@ static int maybe_hard_link(struct file_s
2186 if (hard_link_one(file, fname, oldname, 0)) {
2188 - itemize(file, ndx, statret, stp,
2189 +#ifdef SUPPORT_ACLS
2190 + if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
2191 + get_acl(fname, sxp);
2193 + itemize(file, ndx, statret, sxp,
2194 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
2197 @@ -312,7 +321,7 @@ static int maybe_hard_link(struct file_s
2198 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
2199 * 0 = process the file, 1 = skip the file, -1 = error occurred. */
2200 int hard_link_check(struct file_struct *file, int ndx, const char *fname,
2201 - int statret, STRUCT_STAT *stp, int itemizing,
2202 + int statret, statx *sxp, int itemizing,
2205 STRUCT_STAT prev_st;
2206 @@ -363,18 +372,20 @@ int hard_link_check(struct file_struct *
2207 if (statret < 0 && basis_dir[0] != NULL) {
2208 /* If we match an alt-dest item, we don't output this as a change. */
2209 char cmpbuf[MAXPATHLEN];
2210 - STRUCT_STAT alt_st;
2213 +#ifdef SUPPORT_ACLS
2214 + alt_sx.acc_acl = alt_sx.def_acl = NULL;
2217 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
2218 - if (link_stat(cmpbuf, &alt_st, 0) < 0)
2219 + if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
2222 - if (prev_st.st_dev != alt_st.st_dev
2223 - || prev_st.st_ino != alt_st.st_ino)
2224 + if (prev_st.st_dev != alt_sx.st.st_dev
2225 + || prev_st.st_ino != alt_sx.st.st_ino)
2229 if (verbose < 2 || !stdout_format_has_i) {
2232 @@ -383,16 +394,36 @@ int hard_link_check(struct file_struct *
2236 - if (!unchanged_file(cmpbuf, file, &alt_st))
2237 + if (!unchanged_file(cmpbuf, file, &alt_sx.st))
2241 - if (unchanged_attrs(file, &alt_st))
2242 +#ifdef SUPPORT_ACLS
2243 + if (preserve_acls)
2244 + get_acl(cmpbuf, &alt_sx);
2246 + if (unchanged_attrs(file, &alt_sx))
2248 } while (basis_dir[++j] != NULL);
2249 + if (statret == 1) {
2250 + sxp->st = alt_sx.st;
2251 +#ifdef SUPPORT_ACLS
2252 + if (preserve_acls) {
2253 + if (!ACL_READY(*sxp))
2254 + get_acl(cmpbuf, sxp);
2256 + sxp->acc_acl = alt_sx.acc_acl;
2257 + sxp->def_acl = alt_sx.def_acl;
2262 +#ifdef SUPPORT_ACLS
2263 + else if (preserve_acls)
2264 + free_acl(&alt_sx);
2268 - if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
2269 + if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
2270 realname, itemizing, code) < 0)
2273 @@ -427,7 +458,8 @@ void finish_hard_link(struct file_struct
2274 STRUCT_STAT *stp, int itemizing, enum logcode code,
2277 - STRUCT_STAT st, prev_st;
2280 char alt_name[MAXPATHLEN], *prev_name;
2281 const char *our_name;
2282 int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
2283 @@ -451,14 +483,24 @@ void finish_hard_link(struct file_struct
2287 +#ifdef SUPPORT_ACLS
2288 + prev_sx.acc_acl = prev_sx.def_acl = NULL;
2291 while ((ndx = prev_ndx) >= 0) {
2294 file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
2295 prev_ndx = F_HL_PREV(file);
2296 prev_name = f_name(file, NULL);
2297 - prev_statret = link_stat(prev_name, &prev_st, 0);
2298 - if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
2299 - our_name, stp, fname, itemizing, code) < 0)
2300 + prev_statret = link_stat(prev_name, &prev_sx.st, 0);
2301 + val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
2302 + our_name, stp, fname, itemizing, code);
2303 +#ifdef SUPPORT_ACLS
2304 + if (preserve_acls)
2305 + free_acl(&prev_sx);
2309 if (remove_source_files == 1 && do_xfers)
2310 send_msg_int(MSG_SUCCESS, ndx);
2311 --- old/lib/sysacls.c
2312 +++ new/lib/sysacls.c
2315 + Unix SMB/CIFS implementation.
2316 + Samba system utilities for ACL support.
2317 + Copyright (C) Jeremy Allison 2000.
2319 + This program is free software; you can redistribute it and/or modify
2320 + it under the terms of the GNU General Public License as published by
2321 + the Free Software Foundation; either version 2 of the License, or
2322 + (at your option) any later version.
2324 + This program is distributed in the hope that it will be useful,
2325 + but WITHOUT ANY WARRANTY; without even the implied warranty of
2326 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2327 + GNU General Public License for more details.
2329 + You should have received a copy of the GNU General Public License
2330 + along with this program; if not, write to the Free Software
2331 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2335 +#include "sysacls.h" /****** ADDED ******/
2337 +#ifdef SUPPORT_ACLS
2339 +/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
2345 +void SAFE_FREE(void *mem)
2351 +char *uidtoname(uid_t uid)
2353 + static char idbuf[12];
2354 + struct passwd *pw;
2356 + if ((pw = getpwuid(uid)) == NULL) {
2357 + slprintf(idbuf, sizeof(idbuf)-1, "%ld", (long)uid);
2360 + return pw->pw_name;
2362 +/****** EXTRAS -- END ******/
2365 + This file wraps all differing system ACL interfaces into a consistent
2366 + one based on the POSIX interface. It also returns the correct errors
2367 + for older UNIX systems that don't support ACLs.
2369 + The interfaces that each ACL implementation must support are as follows :
2371 + int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2372 + int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2373 + int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
2374 + void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2375 + SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2376 + SMB_ACL_T sys_acl_get_fd(int fd)
2377 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
2378 + int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
2379 + char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
2380 + SMB_ACL_T sys_acl_init( int count)
2381 + int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2382 + int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2383 + int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2384 + int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2385 + int sys_acl_valid( SMB_ACL_T theacl )
2386 + int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2387 + int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2388 + int sys_acl_delete_def_file(const char *path)
2390 + This next one is not POSIX complient - but we *have* to have it !
2391 + More POSIX braindamage.
2393 + int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2395 + The generic POSIX free is the following call. We split this into
2396 + several different free functions as we may need to add tag info
2397 + to structures when emulating the POSIX interface.
2399 + int sys_acl_free( void *obj_p)
2401 + The calls we actually use are :
2403 + int sys_acl_free_text(char *text) - free acl_to_text
2404 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
2405 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
2409 +#if defined(HAVE_POSIX_ACLS)
2411 +/* Identity mapping - easy. */
2413 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2415 + return acl_get_entry( the_acl, entry_id, entry_p);
2418 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2420 + return acl_get_tag_type( entry_d, tag_type_p);
2423 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2425 + return acl_get_permset( entry_d, permset_p);
2428 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2430 + return acl_get_qualifier( entry_d);
2433 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2435 + return acl_get_file( path_p, type);
2438 +SMB_ACL_T sys_acl_get_fd(int fd)
2440 + return acl_get_fd(fd);
2443 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2445 + return acl_clear_perms(permset);
2448 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2450 + return acl_add_perm(permset, perm);
2453 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2455 +#if defined(HAVE_ACL_GET_PERM_NP)
2457 + * Required for TrustedBSD-based ACL implementations where
2458 + * non-POSIX.1e functions are denoted by a _np (non-portable)
2461 + return acl_get_perm_np(permset, perm);
2463 + return acl_get_perm(permset, perm);
2467 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2469 + return acl_to_text( the_acl, plen);
2472 +SMB_ACL_T sys_acl_init( int count)
2474 + return acl_init(count);
2477 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2479 + return acl_create_entry(pacl, pentry);
2482 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2484 + return acl_set_tag_type(entry, tagtype);
2487 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2489 + return acl_set_qualifier(entry, qual);
2492 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2494 + return acl_set_permset(entry, permset);
2497 +int sys_acl_valid( SMB_ACL_T theacl )
2499 + return acl_valid(theacl);
2502 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2504 + return acl_set_file(name, acltype, theacl);
2507 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2509 + return acl_set_fd(fd, theacl);
2512 +int sys_acl_delete_def_file(const char *name)
2514 + return acl_delete_def_file(name);
2517 +int sys_acl_free_text(char *text)
2519 + return acl_free(text);
2522 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2524 + return acl_free(the_acl);
2527 +int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
2529 + return acl_free(qual);
2532 +#elif defined(HAVE_TRU64_ACLS)
2534 + * The interface to DEC/Compaq Tru64 UNIX ACLs
2535 + * is based on Draft 13 of the POSIX spec which is
2536 + * slightly different from the Draft 16 interface.
2538 + * Also, some of the permset manipulation functions
2539 + * such as acl_clear_perm() and acl_add_perm() appear
2540 + * to be broken on Tru64 so we have to manipulate
2541 + * the permission bits in the permset directly.
2543 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2545 + SMB_ACL_ENTRY_T entry;
2547 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
2552 + if ((entry = acl_get_entry(the_acl)) != NULL) {
2557 + return errno ? -1 : 0;
2560 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2562 + return acl_get_tag_type( entry_d, tag_type_p);
2565 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2567 + return acl_get_permset( entry_d, permset_p);
2570 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2572 + return acl_get_qualifier( entry_d);
2575 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2577 + return acl_get_file((char *)path_p, type);
2580 +SMB_ACL_T sys_acl_get_fd(int fd)
2582 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
2585 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2587 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
2592 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2594 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
2599 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
2604 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2606 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
2609 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2611 + return acl_to_text( the_acl, plen);
2614 +SMB_ACL_T sys_acl_init( int count)
2616 + return acl_init(count);
2619 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2621 + SMB_ACL_ENTRY_T entry;
2623 + if ((entry = acl_create_entry(pacl)) == NULL) {
2631 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2633 + return acl_set_tag_type(entry, tagtype);
2636 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2638 + return acl_set_qualifier(entry, qual);
2641 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2643 + return acl_set_permset(entry, permset);
2646 +int sys_acl_valid( SMB_ACL_T theacl )
2648 + acl_entry_t entry;
2650 + return acl_valid(theacl, &entry);
2653 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2655 + return acl_set_file((char *)name, acltype, theacl);
2658 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2660 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
2663 +int sys_acl_delete_def_file(const char *name)
2665 + return acl_delete_def_file((char *)name);
2668 +int sys_acl_free_text(char *text)
2671 + * (void) cast and explicit return 0 are for DEC UNIX
2672 + * which just #defines acl_free_text() to be free()
2674 + (void) acl_free_text(text);
2678 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2680 + return acl_free(the_acl);
2683 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2685 + return acl_free_qualifier(qual, tagtype);
2688 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
2691 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
2692 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
2696 + * Note that while this code implements sufficient functionality
2697 + * to support the sys_acl_* interfaces it does not provide all
2698 + * of the semantics of the POSIX ACL interfaces.
2700 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2701 + * from a call to sys_acl_get_entry() should not be assumed to be
2702 + * valid after calling any of the following functions, which may
2703 + * reorder the entries in the ACL.
2706 + * sys_acl_set_file()
2707 + * sys_acl_set_fd()
2711 + * The only difference between Solaris and UnixWare / OpenUNIX is
2712 + * that the #defines for the ACL operations have different names
2714 +#if defined(HAVE_UNIXWARE_ACLS)
2716 +#define SETACL ACL_SET
2717 +#define GETACL ACL_GET
2718 +#define GETACLCNT ACL_CNT
2723 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2725 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2730 + if (entry_p == NULL) {
2735 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2739 + if (acl_d->next < 0) {
2744 + if (acl_d->next >= acl_d->count) {
2748 + *entry_p = &acl_d->acl[acl_d->next++];
2753 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2755 + *type_p = entry_d->a_type;
2760 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2762 + *permset_p = &entry_d->a_perm;
2767 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2769 + if (entry_d->a_type != SMB_ACL_USER
2770 + && entry_d->a_type != SMB_ACL_GROUP) {
2775 + return &entry_d->a_id;
2779 + * There is no way of knowing what size the ACL returned by
2780 + * GETACL will be unless you first call GETACLCNT which means
2781 + * making an additional system call.
2783 + * In the hope of avoiding the cost of the additional system
2784 + * call in most cases, we initially allocate enough space for
2785 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2786 + * be too small then we use GETACLCNT to find out the actual
2787 + * size, reallocate the ACL buffer, and then call GETACL again.
2790 +#define INITIAL_ACL_SIZE 16
2792 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2795 + int count; /* # of ACL entries allocated */
2796 + int naccess; /* # of access ACL entries */
2797 + int ndefault; /* # of default ACL entries */
2799 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2804 + count = INITIAL_ACL_SIZE;
2805 + if ((acl_d = sys_acl_init(count)) == NULL) {
2810 + * If there isn't enough space for the ACL entries we use
2811 + * GETACLCNT to determine the actual number of ACL entries
2812 + * reallocate and try again. This is in a loop because it
2813 + * is possible that someone else could modify the ACL and
2814 + * increase the number of entries between the call to
2815 + * GETACLCNT and the call to GETACL.
2817 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
2818 + && errno == ENOSPC) {
2820 + sys_acl_free_acl(acl_d);
2822 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
2826 + if ((acl_d = sys_acl_init(count)) == NULL) {
2832 + sys_acl_free_acl(acl_d);
2837 + * calculate the number of access and default ACL entries
2839 + * Note: we assume that the acl() system call returned a
2840 + * well formed ACL which is sorted so that all of the
2841 + * access ACL entries preceed any default ACL entries
2843 + for (naccess = 0; naccess < count; naccess++) {
2844 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2847 + ndefault = count - naccess;
2850 + * if the caller wants the default ACL we have to copy
2851 + * the entries down to the start of the acl[] buffer
2852 + * and mask out the ACL_DEFAULT flag from the type field
2854 + if (type == SMB_ACL_TYPE_DEFAULT) {
2857 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2858 + acl_d->acl[i] = acl_d->acl[j];
2859 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2862 + acl_d->count = ndefault;
2864 + acl_d->count = naccess;
2870 +SMB_ACL_T sys_acl_get_fd(int fd)
2873 + int count; /* # of ACL entries allocated */
2874 + int naccess; /* # of access ACL entries */
2876 + count = INITIAL_ACL_SIZE;
2877 + if ((acl_d = sys_acl_init(count)) == NULL) {
2881 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2882 + && errno == ENOSPC) {
2884 + sys_acl_free_acl(acl_d);
2886 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2890 + if ((acl_d = sys_acl_init(count)) == NULL) {
2896 + sys_acl_free_acl(acl_d);
2901 + * calculate the number of access ACL entries
2903 + for (naccess = 0; naccess < count; naccess++) {
2904 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2908 + acl_d->count = naccess;
2913 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2920 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2922 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2923 + && perm != SMB_ACL_EXECUTE) {
2928 + if (permset_d == NULL) {
2933 + *permset_d |= perm;
2938 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2940 + return *permset_d & perm;
2943 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2950 + * use an initial estimate of 20 bytes per ACL entry
2951 + * when allocating memory for the text representation
2955 + maxlen = 20 * acl_d->count;
2956 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
2961 + for (i = 0; i < acl_d->count; i++) {
2962 + struct acl *ap = &acl_d->acl[i];
2971 + switch (ap->a_type) {
2973 + * for debugging purposes it's probably more
2974 + * useful to dump unknown tag types rather
2975 + * than just returning an error
2978 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
2981 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2986 + case SMB_ACL_USER:
2987 + id = uidtoname(ap->a_id);
2988 + case SMB_ACL_USER_OBJ:
2992 + case SMB_ACL_GROUP:
2993 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2994 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3000 + case SMB_ACL_GROUP_OBJ:
3004 + case SMB_ACL_OTHER:
3008 + case SMB_ACL_MASK:
3014 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3015 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3016 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3019 + /* <tag> : <qualifier> : rwx \n \0 */
3020 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3023 + * If this entry would overflow the buffer
3024 + * allocate enough additional memory for this
3025 + * entry and an estimate of another 20 bytes
3026 + * for each entry still to be processed
3028 + if ((len + nbytes) > maxlen) {
3029 + char *oldtext = text;
3031 + maxlen += nbytes + 20 * (acl_d->count - i);
3033 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3034 + SAFE_FREE(oldtext);
3040 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3041 + len += nbytes - 1;
3050 +SMB_ACL_T sys_acl_init(int count)
3060 + * note that since the definition of the structure pointed
3061 + * to by the SMB_ACL_T includes the first element of the
3062 + * acl[] array, this actually allocates an ACL with room
3063 + * for (count+1) entries
3065 + if ((a = (SMB_ACL_T)SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3070 + a->size = count + 1;
3078 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3081 + SMB_ACL_ENTRY_T entry_d;
3083 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3088 + if (acl_d->count >= acl_d->size) {
3093 + entry_d = &acl_d->acl[acl_d->count++];
3094 + entry_d->a_type = 0;
3095 + entry_d->a_id = -1;
3096 + entry_d->a_perm = 0;
3097 + *entry_p = entry_d;
3102 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3104 + switch (tag_type) {
3105 + case SMB_ACL_USER:
3106 + case SMB_ACL_USER_OBJ:
3107 + case SMB_ACL_GROUP:
3108 + case SMB_ACL_GROUP_OBJ:
3109 + case SMB_ACL_OTHER:
3110 + case SMB_ACL_MASK:
3111 + entry_d->a_type = tag_type;
3121 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3123 + if (entry_d->a_type != SMB_ACL_GROUP
3124 + && entry_d->a_type != SMB_ACL_USER) {
3129 + entry_d->a_id = *((id_t *)qual_p);
3134 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3136 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3140 + entry_d->a_perm = *permset_d;
3146 + * sort the ACL and check it for validity
3148 + * if it's a minimal ACL with only 4 entries then we
3149 + * need to recalculate the mask permissions to make
3150 + * sure that they are the same as the GROUP_OBJ
3151 + * permissions as required by the UnixWare acl() system call.
3153 + * (note: since POSIX allows minimal ACLs which only contain
3154 + * 3 entries - ie there is no mask entry - we should, in theory,
3155 + * check for this and add a mask entry if necessary - however
3156 + * we "know" that the caller of this interface always specifies
3157 + * a mask so, in practice "this never happens" (tm) - if it *does*
3158 + * happen aclsort() will fail and return an error and someone will
3159 + * have to fix it ...)
3162 +static int acl_sort(SMB_ACL_T acl_d)
3164 + int fixmask = (acl_d->count <= 4);
3166 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
3173 +int sys_acl_valid(SMB_ACL_T acl_d)
3175 + return acl_sort(acl_d);
3178 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3181 + struct acl *acl_p;
3183 + struct acl *acl_buf = NULL;
3186 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3191 + if (acl_sort(acl_d) != 0) {
3195 + acl_p = &acl_d->acl[0];
3196 + acl_count = acl_d->count;
3199 + * if it's a directory there is extra work to do
3200 + * since the acl() system call will replace both
3201 + * the access ACLs and the default ACLs (if any)
3203 + if (stat(name, &s) != 0) {
3206 + if (S_ISDIR(s.st_mode)) {
3207 + SMB_ACL_T acc_acl;
3208 + SMB_ACL_T def_acl;
3209 + SMB_ACL_T tmp_acl;
3212 + if (type == SMB_ACL_TYPE_ACCESS) {
3214 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3218 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3221 + if (tmp_acl == NULL) {
3226 + * allocate a temporary buffer for the complete ACL
3228 + acl_count = acc_acl->count + def_acl->count;
3229 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
3231 + if (acl_buf == NULL) {
3232 + sys_acl_free_acl(tmp_acl);
3238 + * copy the access control and default entries into the buffer
3240 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3241 + acc_acl->count * sizeof(acl_buf[0]));
3243 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3244 + def_acl->count * sizeof(acl_buf[0]));
3247 + * set the ACL_DEFAULT flag on the default entries
3249 + for (i = acc_acl->count; i < acl_count; i++) {
3250 + acl_buf[i].a_type |= ACL_DEFAULT;
3253 + sys_acl_free_acl(tmp_acl);
3255 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3260 + ret = acl(name, SETACL, acl_count, acl_p);
3262 + SAFE_FREE(acl_buf);
3267 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3269 + if (acl_sort(acl_d) != 0) {
3273 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
3276 +int sys_acl_delete_def_file(const char *path)
3282 + * fetching the access ACL and rewriting it has
3283 + * the effect of deleting the default ACL
3285 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3289 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
3291 + sys_acl_free_acl(acl_d);
3296 +int sys_acl_free_text(char *text)
3302 +int sys_acl_free_acl(SMB_ACL_T acl_d)
3308 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
3313 +#elif defined(HAVE_HPUX_ACLS)
3317 + * Based on the Solaris/SCO code - with modifications.
3321 + * Note that while this code implements sufficient functionality
3322 + * to support the sys_acl_* interfaces it does not provide all
3323 + * of the semantics of the POSIX ACL interfaces.
3325 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
3326 + * from a call to sys_acl_get_entry() should not be assumed to be
3327 + * valid after calling any of the following functions, which may
3328 + * reorder the entries in the ACL.
3331 + * sys_acl_set_file()
3332 + * sys_acl_set_fd()
3335 +/* This checks if the POSIX ACL system call is defined */
3336 +/* which basically corresponds to whether JFS 3.3 or */
3337 +/* higher is installed. If acl() was called when it */
3338 +/* isn't defined, it causes the process to core dump */
3339 +/* so it is important to check this and avoid acl() */
3340 +/* calls if it isn't there. */
3342 +static BOOL hpux_acl_call_presence(void)
3345 + shl_t handle = NULL;
3348 + static BOOL already_checked=0;
3350 + if(already_checked)
3354 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
3356 + if(ret_val != 0) {
3357 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
3358 + ret_val, errno, strerror(errno)));
3359 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
3363 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
3365 + already_checked = True;
3369 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3371 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3376 + if (entry_p == NULL) {
3381 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3385 + if (acl_d->next < 0) {
3390 + if (acl_d->next >= acl_d->count) {
3394 + *entry_p = &acl_d->acl[acl_d->next++];
3399 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3401 + *type_p = entry_d->a_type;
3406 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3408 + *permset_p = &entry_d->a_perm;
3413 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3415 + if (entry_d->a_type != SMB_ACL_USER
3416 + && entry_d->a_type != SMB_ACL_GROUP) {
3421 + return &entry_d->a_id;
3425 + * There is no way of knowing what size the ACL returned by
3426 + * ACL_GET will be unless you first call ACL_CNT which means
3427 + * making an additional system call.
3429 + * In the hope of avoiding the cost of the additional system
3430 + * call in most cases, we initially allocate enough space for
3431 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
3432 + * be too small then we use ACL_CNT to find out the actual
3433 + * size, reallocate the ACL buffer, and then call ACL_GET again.
3436 +#define INITIAL_ACL_SIZE 16
3438 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3441 + int count; /* # of ACL entries allocated */
3442 + int naccess; /* # of access ACL entries */
3443 + int ndefault; /* # of default ACL entries */
3445 + if(hpux_acl_call_presence() == False) {
3446 + /* Looks like we don't have the acl() system call on HPUX.
3447 + * May be the system doesn't have the latest version of JFS.
3452 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3457 + count = INITIAL_ACL_SIZE;
3458 + if ((acl_d = sys_acl_init(count)) == NULL) {
3463 + * If there isn't enough space for the ACL entries we use
3464 + * ACL_CNT to determine the actual number of ACL entries
3465 + * reallocate and try again. This is in a loop because it
3466 + * is possible that someone else could modify the ACL and
3467 + * increase the number of entries between the call to
3468 + * ACL_CNT and the call to ACL_GET.
3470 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
3472 + sys_acl_free_acl(acl_d);
3474 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
3478 + if ((acl_d = sys_acl_init(count)) == NULL) {
3484 + sys_acl_free_acl(acl_d);
3489 + * calculate the number of access and default ACL entries
3491 + * Note: we assume that the acl() system call returned a
3492 + * well formed ACL which is sorted so that all of the
3493 + * access ACL entries preceed any default ACL entries
3495 + for (naccess = 0; naccess < count; naccess++) {
3496 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
3499 + ndefault = count - naccess;
3502 + * if the caller wants the default ACL we have to copy
3503 + * the entries down to the start of the acl[] buffer
3504 + * and mask out the ACL_DEFAULT flag from the type field
3506 + if (type == SMB_ACL_TYPE_DEFAULT) {
3509 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
3510 + acl_d->acl[i] = acl_d->acl[j];
3511 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
3514 + acl_d->count = ndefault;
3516 + acl_d->count = naccess;
3522 +SMB_ACL_T sys_acl_get_fd(int fd)
3525 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
3528 + files_struct *fsp = file_find_fd(fd);
3530 + if (fsp == NULL) {
3536 + * We know we're in the same conn context. So we
3537 + * can use the relative path.
3540 + return sys_acl_get_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
3543 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3550 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3552 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3553 + && perm != SMB_ACL_EXECUTE) {
3558 + if (permset_d == NULL) {
3563 + *permset_d |= perm;
3568 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3570 + return *permset_d & perm;
3573 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3580 + * use an initial estimate of 20 bytes per ACL entry
3581 + * when allocating memory for the text representation
3585 + maxlen = 20 * acl_d->count;
3586 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
3591 + for (i = 0; i < acl_d->count; i++) {
3592 + struct acl *ap = &acl_d->acl[i];
3601 + switch (ap->a_type) {
3603 + * for debugging purposes it's probably more
3604 + * useful to dump unknown tag types rather
3605 + * than just returning an error
3608 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
3611 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3616 + case SMB_ACL_USER:
3617 + id = uidtoname(ap->a_id);
3618 + case SMB_ACL_USER_OBJ:
3622 + case SMB_ACL_GROUP:
3623 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3624 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3630 + case SMB_ACL_GROUP_OBJ:
3634 + case SMB_ACL_OTHER:
3638 + case SMB_ACL_MASK:
3644 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3645 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3646 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3649 + /* <tag> : <qualifier> : rwx \n \0 */
3650 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3653 + * If this entry would overflow the buffer
3654 + * allocate enough additional memory for this
3655 + * entry and an estimate of another 20 bytes
3656 + * for each entry still to be processed
3658 + if ((len + nbytes) > maxlen) {
3659 + char *oldtext = text;
3661 + maxlen += nbytes + 20 * (acl_d->count - i);
3663 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3670 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3671 + len += nbytes - 1;
3680 +SMB_ACL_T sys_acl_init(int count)
3690 + * note that since the definition of the structure pointed
3691 + * to by the SMB_ACL_T includes the first element of the
3692 + * acl[] array, this actually allocates an ACL with room
3693 + * for (count+1) entries
3695 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3700 + a->size = count + 1;
3708 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3711 + SMB_ACL_ENTRY_T entry_d;
3713 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3718 + if (acl_d->count >= acl_d->size) {
3723 + entry_d = &acl_d->acl[acl_d->count++];
3724 + entry_d->a_type = 0;
3725 + entry_d->a_id = -1;
3726 + entry_d->a_perm = 0;
3727 + *entry_p = entry_d;
3732 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3734 + switch (tag_type) {
3735 + case SMB_ACL_USER:
3736 + case SMB_ACL_USER_OBJ:
3737 + case SMB_ACL_GROUP:
3738 + case SMB_ACL_GROUP_OBJ:
3739 + case SMB_ACL_OTHER:
3740 + case SMB_ACL_MASK:
3741 + entry_d->a_type = tag_type;
3751 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3753 + if (entry_d->a_type != SMB_ACL_GROUP
3754 + && entry_d->a_type != SMB_ACL_USER) {
3759 + entry_d->a_id = *((id_t *)qual_p);
3764 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3766 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3770 + entry_d->a_perm = *permset_d;
3775 +/* Structure to capture the count for each type of ACE. */
3777 +struct hpux_acl_types {
3781 + int n_def_user_obj;
3786 + int n_def_group_obj;
3790 + int n_def_other_obj;
3793 + int n_def_class_obj;
3795 + int n_illegal_obj;
3799 + * Counts the different number of objects in a given array of ACL
3803 + * acl_count - Count of ACLs in the array of ACL strucutres.
3804 + * aclp - Array of ACL structures.
3805 + * acl_type_count - Pointer to acl_types structure. Should already be
3809 + * acl_type_count - This structure is filled up with counts of various
3813 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
3817 + memset(acl_type_count, 0, sizeof(struct hpux_acl_types));
3819 + for(i=0;i<acl_count;i++) {
3820 + switch(aclp[i].a_type) {
3822 + acl_type_count->n_user++;
3825 + acl_type_count->n_user_obj++;
3827 + case DEF_USER_OBJ:
3828 + acl_type_count->n_def_user_obj++;
3831 + acl_type_count->n_group++;
3834 + acl_type_count->n_group_obj++;
3836 + case DEF_GROUP_OBJ:
3837 + acl_type_count->n_def_group_obj++;
3840 + acl_type_count->n_other_obj++;
3842 + case DEF_OTHER_OBJ:
3843 + acl_type_count->n_def_other_obj++;
3846 + acl_type_count->n_class_obj++;
3848 + case DEF_CLASS_OBJ:
3849 + acl_type_count->n_def_class_obj++;
3852 + acl_type_count->n_def_user++;
3855 + acl_type_count->n_def_group++;
3858 + acl_type_count->n_illegal_obj++;
3864 +/* swap_acl_entries: Swaps two ACL entries.
3866 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3869 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3871 + struct acl temp_acl;
3873 + temp_acl.a_type = aclp0->a_type;
3874 + temp_acl.a_id = aclp0->a_id;
3875 + temp_acl.a_perm = aclp0->a_perm;
3877 + aclp0->a_type = aclp1->a_type;
3878 + aclp0->a_id = aclp1->a_id;
3879 + aclp0->a_perm = aclp1->a_perm;
3881 + aclp1->a_type = temp_acl.a_type;
3882 + aclp1->a_id = temp_acl.a_id;
3883 + aclp1->a_perm = temp_acl.a_perm;
3886 +/* prohibited_duplicate_type
3887 + * Identifies if given ACL type can have duplicate entries or
3890 + * Inputs: acl_type - ACL Type.
3896 + * True - If the ACL type matches any of the prohibited types.
3897 + * False - If the ACL type doesn't match any of the prohibited types.
3900 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
3902 + switch(acl_type) {
3913 +/* get_needed_class_perm
3914 + * Returns the permissions of a ACL structure only if the ACL
3915 + * type matches one of the pre-determined types for computing
3916 + * CLASS_OBJ permissions.
3918 + * Inputs: aclp - Pointer to ACL structure.
3921 +static int hpux_get_needed_class_perm(struct acl *aclp)
3923 + switch(aclp->a_type) {
3927 + case DEF_USER_OBJ:
3929 + case DEF_GROUP_OBJ:
3931 + case DEF_CLASS_OBJ:
3932 + case DEF_OTHER_OBJ:
3933 + return aclp->a_perm;
3939 +/* acl_sort for HPUX.
3940 + * Sorts the array of ACL structures as per the description in
3941 + * aclsort man page. Refer to aclsort man page for more details
3945 + * acl_count - Count of ACLs in the array of ACL structures.
3946 + * calclass - If this is not zero, then we compute the CLASS_OBJ
3948 + * aclp - Array of ACL structures.
3952 + * aclp - Sorted array of ACL structures.
3956 + * Returns 0 for success -1 for failure. Prints a message to the Samba
3957 + * debug log in case of failure.
3960 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
3962 +#if !defined(HAVE_HPUX_ACLSORT)
3964 + * The aclsort() system call is availabe on the latest HPUX General
3965 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
3966 + * function. Because, we don't want to update to a new
3967 + * HPUX GR bundle just for aclsort() call.
3970 + struct hpux_acl_types acl_obj_count;
3971 + int n_class_obj_perm = 0;
3975 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
3979 + if(aclp == NULL) {
3980 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
3984 + /* Count different types of ACLs in the ACLs array */
3986 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
3988 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
3989 + * CLASS_OBJ and OTHER_OBJ
3992 + if( (acl_obj_count.n_user_obj != 1) ||
3993 + (acl_obj_count.n_group_obj != 1) ||
3994 + (acl_obj_count.n_class_obj != 1) ||
3995 + (acl_obj_count.n_other_obj != 1)
3997 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
3998 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
4002 + /* If any of the default objects are present, there should be only
4003 + * one of them each.
4006 + if( (acl_obj_count.n_def_user_obj > 1) || (acl_obj_count.n_def_group_obj > 1) ||
4007 + (acl_obj_count.n_def_other_obj > 1) || (acl_obj_count.n_def_class_obj > 1) ) {
4008 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
4009 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
4013 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
4016 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
4017 + * same ACL type, sort by ACL id.
4019 + * I am using the trival kind of sorting method here because, performance isn't
4020 + * really effected by the ACLs feature. More over there aren't going to be more
4021 + * than 17 entries on HPUX.
4024 + for(i=0; i<acl_count;i++) {
4025 + for (j=i+1; j<acl_count; j++) {
4026 + if( aclp[i].a_type > aclp[j].a_type ) {
4027 + /* ACL entries out of order, swap them */
4029 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4031 + } else if ( aclp[i].a_type == aclp[j].a_type ) {
4033 + /* ACL entries of same type, sort by id */
4035 + if(aclp[i].a_id > aclp[j].a_id) {
4036 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4037 + } else if (aclp[i].a_id == aclp[j].a_id) {
4038 + /* We have a duplicate entry. */
4039 + if(hpux_prohibited_duplicate_type(aclp[i].a_type)) {
4040 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
4041 + aclp[i].a_type, aclp[i].a_id));
4050 + /* set the class obj permissions to the computed one. */
4052 + int n_class_obj_index = -1;
4054 + for(i=0;i<acl_count;i++) {
4055 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
4057 + if(aclp[i].a_type == CLASS_OBJ)
4058 + n_class_obj_index = i;
4060 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
4065 + return aclsort(acl_count, calclass, aclp);
4070 + * sort the ACL and check it for validity
4072 + * if it's a minimal ACL with only 4 entries then we
4073 + * need to recalculate the mask permissions to make
4074 + * sure that they are the same as the GROUP_OBJ
4075 + * permissions as required by the UnixWare acl() system call.
4077 + * (note: since POSIX allows minimal ACLs which only contain
4078 + * 3 entries - ie there is no mask entry - we should, in theory,
4079 + * check for this and add a mask entry if necessary - however
4080 + * we "know" that the caller of this interface always specifies
4081 + * a mask so, in practice "this never happens" (tm) - if it *does*
4082 + * happen aclsort() will fail and return an error and someone will
4083 + * have to fix it ...)
4086 +static int acl_sort(SMB_ACL_T acl_d)
4088 + int fixmask = (acl_d->count <= 4);
4090 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
4097 +int sys_acl_valid(SMB_ACL_T acl_d)
4099 + return acl_sort(acl_d);
4102 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4105 + struct acl *acl_p;
4107 + struct acl *acl_buf = NULL;
4110 + if(hpux_acl_call_presence() == False) {
4111 + /* Looks like we don't have the acl() system call on HPUX.
4112 + * May be the system doesn't have the latest version of JFS.
4118 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
4123 + if (acl_sort(acl_d) != 0) {
4127 + acl_p = &acl_d->acl[0];
4128 + acl_count = acl_d->count;
4131 + * if it's a directory there is extra work to do
4132 + * since the acl() system call will replace both
4133 + * the access ACLs and the default ACLs (if any)
4135 + if (stat(name, &s) != 0) {
4138 + if (S_ISDIR(s.st_mode)) {
4139 + SMB_ACL_T acc_acl;
4140 + SMB_ACL_T def_acl;
4141 + SMB_ACL_T tmp_acl;
4144 + if (type == SMB_ACL_TYPE_ACCESS) {
4146 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
4150 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
4153 + if (tmp_acl == NULL) {
4158 + * allocate a temporary buffer for the complete ACL
4160 + acl_count = acc_acl->count + def_acl->count;
4161 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
4163 + if (acl_buf == NULL) {
4164 + sys_acl_free_acl(tmp_acl);
4170 + * copy the access control and default entries into the buffer
4172 + memcpy(&acl_buf[0], &acc_acl->acl[0],
4173 + acc_acl->count * sizeof(acl_buf[0]));
4175 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
4176 + def_acl->count * sizeof(acl_buf[0]));
4179 + * set the ACL_DEFAULT flag on the default entries
4181 + for (i = acc_acl->count; i < acl_count; i++) {
4182 + acl_buf[i].a_type |= ACL_DEFAULT;
4185 + sys_acl_free_acl(tmp_acl);
4187 + } else if (type != SMB_ACL_TYPE_ACCESS) {
4192 + ret = acl(name, ACL_SET, acl_count, acl_p);
4201 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4204 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
4207 + files_struct *fsp = file_find_fd(fd);
4209 + if (fsp == NULL) {
4214 + if (acl_sort(acl_d) != 0) {
4219 + * We know we're in the same conn context. So we
4220 + * can use the relative path.
4223 + return sys_acl_set_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS, acl_d);
4226 +int sys_acl_delete_def_file(const char *path)
4232 + * fetching the access ACL and rewriting it has
4233 + * the effect of deleting the default ACL
4235 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
4239 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
4241 + sys_acl_free_acl(acl_d);
4246 +int sys_acl_free_text(char *text)
4252 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4258 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4263 +#elif defined(HAVE_IRIX_ACLS)
4265 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4267 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
4272 + if (entry_p == NULL) {
4277 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
4281 + if (acl_d->next < 0) {
4286 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
4290 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
4295 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
4297 + *type_p = entry_d->ae_tag;
4302 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4304 + *permset_p = entry_d;
4309 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
4311 + if (entry_d->ae_tag != SMB_ACL_USER
4312 + && entry_d->ae_tag != SMB_ACL_GROUP) {
4317 + return &entry_d->ae_id;
4320 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
4324 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4328 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
4333 + a->freeaclp = True;
4337 +SMB_ACL_T sys_acl_get_fd(int fd)
4341 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4345 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
4350 + a->freeaclp = True;
4354 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
4356 + permset_d->ae_perm = 0;
4361 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4363 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
4364 + && perm != SMB_ACL_EXECUTE) {
4369 + if (permset_d == NULL) {
4374 + permset_d->ae_perm |= perm;
4379 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4381 + return permset_d->ae_perm & perm;
4384 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
4386 + return acl_to_text(acl_d->aclp, len_p);
4389 +SMB_ACL_T sys_acl_init(int count)
4398 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
4404 + a->freeaclp = False;
4405 + a->aclp = (struct acl *)(&a->aclp + sizeof(struct acl *));
4406 + a->aclp->acl_cnt = 0;
4412 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
4415 + SMB_ACL_ENTRY_T entry_d;
4417 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
4422 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
4427 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
4428 + entry_d->ae_tag = 0;
4429 + entry_d->ae_id = 0;
4430 + entry_d->ae_perm = 0;
4431 + *entry_p = entry_d;
4436 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
4438 + switch (tag_type) {
4439 + case SMB_ACL_USER:
4440 + case SMB_ACL_USER_OBJ:
4441 + case SMB_ACL_GROUP:
4442 + case SMB_ACL_GROUP_OBJ:
4443 + case SMB_ACL_OTHER:
4444 + case SMB_ACL_MASK:
4445 + entry_d->ae_tag = tag_type;
4455 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
4457 + if (entry_d->ae_tag != SMB_ACL_GROUP
4458 + && entry_d->ae_tag != SMB_ACL_USER) {
4463 + entry_d->ae_id = *((id_t *)qual_p);
4468 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
4470 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
4474 + entry_d->ae_perm = permset_d->ae_perm;
4479 +int sys_acl_valid(SMB_ACL_T acl_d)
4481 + return acl_valid(acl_d->aclp);
4484 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4486 + return acl_set_file(name, type, acl_d->aclp);
4489 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4491 + return acl_set_fd(fd, acl_d->aclp);
4494 +int sys_acl_delete_def_file(const char *name)
4496 + return acl_delete_def_file(name);
4499 +int sys_acl_free_text(char *text)
4501 + return acl_free(text);
4504 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4506 + if (acl_d->freeaclp) {
4507 + acl_free(acl_d->aclp);
4513 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4518 +#elif defined(HAVE_AIX_ACLS)
4520 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
4522 +int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4524 + struct acl_entry_link *link;
4525 + struct new_acl_entry *entry;
4528 + DEBUG(10,("This is the count: %d\n",theacl->count));
4530 + /* Check if count was previously set to -1. *
4531 + * If it was, that means we reached the end *
4532 + * of the acl last time. */
4533 + if(theacl->count == -1)
4537 + /* To get to the next acl, traverse linked list until index *
4538 + * of acl matches the count we are keeping. This count is *
4539 + * incremented each time we return an acl entry. */
4541 + for(keep_going = 0; keep_going < theacl->count; keep_going++)
4542 + link = link->nextp;
4544 + entry = *entry_p = link->entryp;
4546 + DEBUG(10,("*entry_p is %d\n",entry_p));
4547 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
4549 + /* Increment count */
4551 + if(link->nextp == NULL)
4552 + theacl->count = -1;
4557 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
4559 + /* Initialize tag type */
4562 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
4564 + /* Depending on what type of entry we have, *
4565 + * return tag type. */
4566 + switch(entry_d->ace_id->id_type) {
4568 + *tag_type_p = SMB_ACL_USER;
4571 + *tag_type_p = SMB_ACL_GROUP;
4574 + case SMB_ACL_USER_OBJ:
4575 + case SMB_ACL_GROUP_OBJ:
4576 + case SMB_ACL_OTHER:
4577 + *tag_type_p = entry_d->ace_id->id_type;
4587 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4589 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
4590 + *permset_p = &entry_d->ace_access;
4591 + DEBUG(10,("**permset_p is %d\n",**permset_p));
4592 + if(!(**permset_p & S_IXUSR) &&
4593 + !(**permset_p & S_IWUSR) &&
4594 + !(**permset_p & S_IRUSR) &&
4595 + (**permset_p != 0))
4598 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
4602 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
4604 + return(entry_d->ace_id->id_data);
4607 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
4609 + struct acl *file_acl = (struct acl *)NULL;
4610 + struct acl_entry *acl_entry;
4611 + struct new_acl_entry *new_acl_entry;
4612 + struct ace_id *idp;
4613 + struct acl_entry_link *acl_entry_link;
4614 + struct acl_entry_link *acl_entry_link_head;
4619 + /* AIX has no DEFAULT */
4620 + if ( type == SMB_ACL_TYPE_DEFAULT ) {
4625 + /* Get the acl using statacl */
4627 + DEBUG(10,("Entering sys_acl_get_file\n"));
4628 + DEBUG(10,("path_p is %s\n",path_p));
4630 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4632 + if(file_acl == NULL) {
4634 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
4638 + memset(file_acl,0,BUFSIZ);
4640 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
4642 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
4643 + SAFE_FREE(file_acl);
4647 + DEBUG(10,("Got facl and returned it\n"));
4649 + /* Point to the first acl entry in the acl */
4650 + acl_entry = file_acl->acl_ext;
4652 + /* Begin setting up the head of the linked list *
4653 + * that will be used for the storing the acl *
4654 + * in a way that is useful for the posix_acls.c *
4657 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4658 + if(acl_entry_link_head == NULL)
4661 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4662 + if(acl_entry_link->entryp == NULL) {
4663 + SAFE_FREE(file_acl);
4665 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4669 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4670 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4672 + /* Check if the extended acl bit is on. *
4673 + * If it isn't, do not show the *
4674 + * contents of the acl since AIX intends *
4675 + * the extended info to remain unused */
4677 + if(file_acl->acl_mode & S_IXACL){
4678 + /* while we are not pointing to the very end */
4679 + while(acl_entry < acl_last(file_acl)) {
4680 + /* before we malloc anything, make sure this is */
4681 + /* a valid acl entry and one that we want to map */
4682 + idp = id_nxt(acl_entry->ace_id);
4683 + if((acl_entry->ace_type == ACC_SPECIFY ||
4684 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4685 + acl_entry = acl_nxt(acl_entry);
4689 + idp = acl_entry->ace_id;
4691 + /* Check if this is the first entry in the linked list. *
4692 + * The first entry needs to keep prevp pointing to NULL *
4693 + * and already has entryp allocated. */
4695 + if(acl_entry_link_head->count != 0) {
4696 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4698 + if(acl_entry_link->nextp == NULL) {
4699 + SAFE_FREE(file_acl);
4701 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4705 + acl_entry_link->nextp->prevp = acl_entry_link;
4706 + acl_entry_link = acl_entry_link->nextp;
4707 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4708 + if(acl_entry_link->entryp == NULL) {
4709 + SAFE_FREE(file_acl);
4711 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4714 + acl_entry_link->nextp = NULL;
4717 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4719 + /* Don't really need this since all types are going *
4720 + * to be specified but, it's better than leaving it 0 */
4722 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4724 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4726 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof(struct ace_id));
4728 + /* The access in the acl entries must be left shifted by *
4729 + * three bites, because they will ultimately be compared *
4730 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4732 + switch(acl_entry->ace_type){
4735 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4736 + acl_entry_link->entryp->ace_access <<= 6;
4737 + acl_entry_link_head->count++;
4740 + /* Since there is no way to return a DENY acl entry *
4741 + * change to PERMIT and then shift. */
4742 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4743 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4744 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4745 + acl_entry_link->entryp->ace_access <<= 6;
4746 + acl_entry_link_head->count++;
4752 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4753 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4755 + acl_entry = acl_nxt(acl_entry);
4757 + } /* end of if enabled */
4759 + /* Since owner, group, other acl entries are not *
4760 + * part of the acl entries in an acl, they must *
4761 + * be dummied up to become part of the list. */
4763 + for( i = 1; i < 4; i++) {
4764 + DEBUG(10,("i is %d\n",i));
4765 + if(acl_entry_link_head->count != 0) {
4766 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4767 + if(acl_entry_link->nextp == NULL) {
4768 + SAFE_FREE(file_acl);
4770 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4774 + acl_entry_link->nextp->prevp = acl_entry_link;
4775 + acl_entry_link = acl_entry_link->nextp;
4776 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4777 + if(acl_entry_link->entryp == NULL) {
4778 + SAFE_FREE(file_acl);
4780 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4785 + acl_entry_link->nextp = NULL;
4787 + new_acl_entry = acl_entry_link->entryp;
4788 + idp = new_acl_entry->ace_id;
4790 + new_acl_entry->ace_len = sizeof(struct acl_entry);
4791 + new_acl_entry->ace_type = ACC_PERMIT;
4792 + idp->id_len = sizeof(struct ace_id);
4793 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4794 + memset(idp->id_data,0,sizeof(uid_t));
4798 + new_acl_entry->ace_access = file_acl->g_access << 6;
4799 + idp->id_type = SMB_ACL_GROUP_OBJ;
4803 + new_acl_entry->ace_access = file_acl->o_access << 6;
4804 + idp->id_type = SMB_ACL_OTHER;
4808 + new_acl_entry->ace_access = file_acl->u_access << 6;
4809 + idp->id_type = SMB_ACL_USER_OBJ;
4817 + acl_entry_link_head->count++;
4818 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4821 + acl_entry_link_head->count = 0;
4822 + SAFE_FREE(file_acl);
4824 + return(acl_entry_link_head);
4827 +SMB_ACL_T sys_acl_get_fd(int fd)
4829 + struct acl *file_acl = (struct acl *)NULL;
4830 + struct acl_entry *acl_entry;
4831 + struct new_acl_entry *new_acl_entry;
4832 + struct ace_id *idp;
4833 + struct acl_entry_link *acl_entry_link;
4834 + struct acl_entry_link *acl_entry_link_head;
4839 + /* Get the acl using fstatacl */
4841 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4842 + DEBUG(10,("fd is %d\n",fd));
4843 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4845 + if(file_acl == NULL) {
4847 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4851 + memset(file_acl,0,BUFSIZ);
4853 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4855 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4856 + SAFE_FREE(file_acl);
4860 + DEBUG(10,("Got facl and returned it\n"));
4862 + /* Point to the first acl entry in the acl */
4864 + acl_entry = file_acl->acl_ext;
4865 + /* Begin setting up the head of the linked list *
4866 + * that will be used for the storing the acl *
4867 + * in a way that is useful for the posix_acls.c *
4870 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4871 + if(acl_entry_link_head == NULL){
4872 + SAFE_FREE(file_acl);
4876 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4878 + if(acl_entry_link->entryp == NULL) {
4880 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4881 + SAFE_FREE(file_acl);
4885 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4886 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4888 + /* Check if the extended acl bit is on. *
4889 + * If it isn't, do not show the *
4890 + * contents of the acl since AIX intends *
4891 + * the extended info to remain unused */
4893 + if(file_acl->acl_mode & S_IXACL){
4894 + /* while we are not pointing to the very end */
4895 + while(acl_entry < acl_last(file_acl)) {
4896 + /* before we malloc anything, make sure this is */
4897 + /* a valid acl entry and one that we want to map */
4899 + idp = id_nxt(acl_entry->ace_id);
4900 + if((acl_entry->ace_type == ACC_SPECIFY ||
4901 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4902 + acl_entry = acl_nxt(acl_entry);
4906 + idp = acl_entry->ace_id;
4908 + /* Check if this is the first entry in the linked list. *
4909 + * The first entry needs to keep prevp pointing to NULL *
4910 + * and already has entryp allocated. */
4912 + if(acl_entry_link_head->count != 0) {
4913 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4914 + if(acl_entry_link->nextp == NULL) {
4916 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4917 + SAFE_FREE(file_acl);
4920 + acl_entry_link->nextp->prevp = acl_entry_link;
4921 + acl_entry_link = acl_entry_link->nextp;
4922 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4923 + if(acl_entry_link->entryp == NULL) {
4925 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4926 + SAFE_FREE(file_acl);
4930 + acl_entry_link->nextp = NULL;
4933 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4935 + /* Don't really need this since all types are going *
4936 + * to be specified but, it's better than leaving it 0 */
4938 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4939 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4941 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof(struct ace_id));
4943 + /* The access in the acl entries must be left shifted by *
4944 + * three bites, because they will ultimately be compared *
4945 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4947 + switch(acl_entry->ace_type){
4950 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4951 + acl_entry_link->entryp->ace_access <<= 6;
4952 + acl_entry_link_head->count++;
4955 + /* Since there is no way to return a DENY acl entry *
4956 + * change to PERMIT and then shift. */
4957 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4958 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4959 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4960 + acl_entry_link->entryp->ace_access <<= 6;
4961 + acl_entry_link_head->count++;
4967 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4968 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4970 + acl_entry = acl_nxt(acl_entry);
4972 + } /* end of if enabled */
4974 + /* Since owner, group, other acl entries are not *
4975 + * part of the acl entries in an acl, they must *
4976 + * be dummied up to become part of the list. */
4978 + for( i = 1; i < 4; i++) {
4979 + DEBUG(10,("i is %d\n",i));
4980 + if(acl_entry_link_head->count != 0){
4981 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4982 + if(acl_entry_link->nextp == NULL) {
4984 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4985 + SAFE_FREE(file_acl);
4989 + acl_entry_link->nextp->prevp = acl_entry_link;
4990 + acl_entry_link = acl_entry_link->nextp;
4991 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4993 + if(acl_entry_link->entryp == NULL) {
4994 + SAFE_FREE(file_acl);
4996 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
5001 + acl_entry_link->nextp = NULL;
5003 + new_acl_entry = acl_entry_link->entryp;
5004 + idp = new_acl_entry->ace_id;
5006 + new_acl_entry->ace_len = sizeof(struct acl_entry);
5007 + new_acl_entry->ace_type = ACC_PERMIT;
5008 + idp->id_len = sizeof(struct ace_id);
5009 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
5010 + memset(idp->id_data,0,sizeof(uid_t));
5014 + new_acl_entry->ace_access = file_acl->g_access << 6;
5015 + idp->id_type = SMB_ACL_GROUP_OBJ;
5019 + new_acl_entry->ace_access = file_acl->o_access << 6;
5020 + idp->id_type = SMB_ACL_OTHER;
5024 + new_acl_entry->ace_access = file_acl->u_access << 6;
5025 + idp->id_type = SMB_ACL_USER_OBJ;
5032 + acl_entry_link_head->count++;
5033 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
5036 + acl_entry_link_head->count = 0;
5037 + SAFE_FREE(file_acl);
5039 + return(acl_entry_link_head);
5042 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
5044 + *permset = *permset & ~0777;
5048 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5051 + (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
5055 + DEBUG(10,("This is the permset now: %d\n",*permset));
5059 +char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
5064 +SMB_ACL_T sys_acl_init( int count)
5066 + struct acl_entry_link *theacl = NULL;
5068 + DEBUG(10,("Entering sys_acl_init\n"));
5070 + theacl = SMB_MALLOC_P(struct acl_entry_link);
5071 + if(theacl == NULL) {
5073 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
5077 + theacl->count = 0;
5078 + theacl->nextp = NULL;
5079 + theacl->prevp = NULL;
5080 + theacl->entryp = NULL;
5081 + DEBUG(10,("Exiting sys_acl_init\n"));
5085 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
5087 + struct acl_entry_link *theacl;
5088 + struct acl_entry_link *acl_entryp;
5089 + struct acl_entry_link *temp_entry;
5092 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
5094 + theacl = acl_entryp = *pacl;
5096 + /* Get to the end of the acl before adding entry */
5098 + for(counting=0; counting < theacl->count; counting++){
5099 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5100 + temp_entry = acl_entryp;
5101 + acl_entryp = acl_entryp->nextp;
5104 + if(theacl->count != 0){
5105 + temp_entry->nextp = acl_entryp = SMB_MALLOC_P(struct acl_entry_link);
5106 + if(acl_entryp == NULL) {
5108 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5112 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5113 + acl_entryp->prevp = temp_entry;
5114 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
5117 + *pentry = acl_entryp->entryp = SMB_MALLOC_P(struct new_acl_entry);
5118 + if(*pentry == NULL) {
5120 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5124 + memset(*pentry,0,sizeof(struct new_acl_entry));
5125 + acl_entryp->entryp->ace_len = sizeof(struct acl_entry);
5126 + acl_entryp->entryp->ace_type = ACC_PERMIT;
5127 + acl_entryp->entryp->ace_id->id_len = sizeof(struct ace_id);
5128 + acl_entryp->nextp = NULL;
5130 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
5134 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
5136 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
5137 + entry->ace_id->id_type = tagtype;
5138 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
5139 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
5142 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
5144 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
5145 + memcpy(entry->ace_id->id_data,qual,sizeof(uid_t));
5146 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
5150 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
5152 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
5153 + if(!(*permset & S_IXUSR) &&
5154 + !(*permset & S_IWUSR) &&
5155 + !(*permset & S_IRUSR) &&
5159 + entry->ace_access = *permset;
5160 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
5161 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
5165 +int sys_acl_valid( SMB_ACL_T theacl )
5168 + int group_obj = 0;
5169 + int other_obj = 0;
5170 + struct acl_entry_link *acl_entry;
5172 + for(acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
5173 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
5174 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
5175 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
5178 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
5180 + if(user_obj != 1 || group_obj != 1 || other_obj != 1)
5186 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
5188 + struct acl_entry_link *acl_entry_link = NULL;
5189 + struct acl *file_acl = NULL;
5190 + struct acl *file_acl_temp = NULL;
5191 + struct acl_entry *acl_entry = NULL;
5192 + struct ace_id *ace_id = NULL;
5199 + DEBUG(10,("Entering sys_acl_set_file\n"));
5200 + DEBUG(10,("File name is %s\n",name));
5202 + /* AIX has no default ACL */
5203 + if(acltype == SMB_ACL_TYPE_DEFAULT)
5206 + acl_length = BUFSIZ;
5207 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5209 + if(file_acl == NULL) {
5211 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5215 + memset(file_acl,0,BUFSIZ);
5217 + file_acl->acl_len = ACL_SIZ;
5218 + file_acl->acl_mode = S_IXACL;
5220 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5221 + acl_entry_link->entryp->ace_access >>= 6;
5222 + id_type = acl_entry_link->entryp->ace_id->id_type;
5225 + case SMB_ACL_USER_OBJ:
5226 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5228 + case SMB_ACL_GROUP_OBJ:
5229 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5231 + case SMB_ACL_OTHER:
5232 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5234 + case SMB_ACL_MASK:
5238 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5239 + acl_length += sizeof(struct acl_entry);
5240 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5241 + if(file_acl_temp == NULL) {
5242 + SAFE_FREE(file_acl);
5244 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5248 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5249 + SAFE_FREE(file_acl);
5250 + file_acl = file_acl_temp;
5253 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5254 + file_acl->acl_len += sizeof(struct acl_entry);
5255 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5256 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5258 + /* In order to use this, we'll need to wait until we can get denies */
5259 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5260 + acl_entry->ace_type = ACC_SPECIFY; */
5262 + acl_entry->ace_type = ACC_SPECIFY;
5264 + ace_id = acl_entry->ace_id;
5266 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5267 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5268 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5269 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5270 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof(uid_t));
5273 + rc = chacl(name,file_acl,file_acl->acl_len);
5274 + DEBUG(10,("errno is %d\n",errno));
5275 + DEBUG(10,("return code is %d\n",rc));
5276 + SAFE_FREE(file_acl);
5277 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
5281 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
5283 + struct acl_entry_link *acl_entry_link = NULL;
5284 + struct acl *file_acl = NULL;
5285 + struct acl *file_acl_temp = NULL;
5286 + struct acl_entry *acl_entry = NULL;
5287 + struct ace_id *ace_id = NULL;
5293 + DEBUG(10,("Entering sys_acl_set_fd\n"));
5294 + acl_length = BUFSIZ;
5295 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5297 + if(file_acl == NULL) {
5299 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5303 + memset(file_acl,0,BUFSIZ);
5305 + file_acl->acl_len = ACL_SIZ;
5306 + file_acl->acl_mode = S_IXACL;
5308 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5309 + acl_entry_link->entryp->ace_access >>= 6;
5310 + id_type = acl_entry_link->entryp->ace_id->id_type;
5311 + DEBUG(10,("The id_type is %d\n",id_type));
5314 + case SMB_ACL_USER_OBJ:
5315 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5317 + case SMB_ACL_GROUP_OBJ:
5318 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5320 + case SMB_ACL_OTHER:
5321 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5323 + case SMB_ACL_MASK:
5327 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5328 + acl_length += sizeof(struct acl_entry);
5329 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5330 + if(file_acl_temp == NULL) {
5331 + SAFE_FREE(file_acl);
5333 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5337 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5338 + SAFE_FREE(file_acl);
5339 + file_acl = file_acl_temp;
5342 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5343 + file_acl->acl_len += sizeof(struct acl_entry);
5344 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5345 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5347 + /* In order to use this, we'll need to wait until we can get denies */
5348 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5349 + acl_entry->ace_type = ACC_SPECIFY; */
5351 + acl_entry->ace_type = ACC_SPECIFY;
5353 + ace_id = acl_entry->ace_id;
5355 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5356 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5357 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5358 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5359 + memcpy(ace_id->id_data, &user_id, sizeof(uid_t));
5362 + rc = fchacl(fd,file_acl,file_acl->acl_len);
5363 + DEBUG(10,("errno is %d\n",errno));
5364 + DEBUG(10,("return code is %d\n",rc));
5365 + SAFE_FREE(file_acl);
5366 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
5370 +int sys_acl_delete_def_file(const char *name)
5372 + /* AIX has no default ACL */
5376 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5378 + return(*permset & perm);
5381 +int sys_acl_free_text(char *text)
5386 +int sys_acl_free_acl(SMB_ACL_T posix_acl)
5388 + struct acl_entry_link *acl_entry_link;
5390 + for(acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
5391 + SAFE_FREE(acl_entry_link->prevp->entryp);
5392 + SAFE_FREE(acl_entry_link->prevp);
5395 + SAFE_FREE(acl_entry_link->prevp->entryp);
5396 + SAFE_FREE(acl_entry_link->prevp);
5397 + SAFE_FREE(acl_entry_link->entryp);
5398 + SAFE_FREE(acl_entry_link);
5403 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
5408 +#else /* No ACLs. */
5410 +int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
5416 +int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
5422 +int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
5428 +void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
5434 +SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
5437 + return (SMB_ACL_T)NULL;
5440 +SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
5443 + return (SMB_ACL_T)NULL;
5446 +int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
5452 +int sys_acl_add_perm( UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
5458 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5461 + return (permset & perm) ? 1 : 0;
5464 +char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
5470 +int sys_acl_free_text(UNUSED(char *text))
5476 +SMB_ACL_T sys_acl_init(UNUSED(int count))
5482 +int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
5488 +int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
5494 +int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
5500 +int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
5506 +int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
5512 +int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
5518 +int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
5524 +int sys_acl_delete_def_file(UNUSED(const char *name))
5530 +int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
5536 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
5542 +#endif /* No ACLs. */
5544 +/************************************************************************
5545 + Deliberately outside the ACL defines. Return 1 if this is a "no acls"
5547 +************************************************************************/
5549 +int no_acl_syscall_error(int err)
5551 +#if defined(ENOSYS)
5552 + if (err == ENOSYS) {
5556 +#if defined(ENOTSUP)
5557 + if (err == ENOTSUP) {
5564 +#endif /* SUPPORT_ACLS */
5565 --- old/lib/sysacls.h
5566 +++ new/lib/sysacls.h
5568 +#ifdef SUPPORT_ACLS
5570 +#ifdef HAVE_SYS_ACL_H
5571 +#include <sys/acl.h>
5573 +#ifdef HAVE_ACL_LIBACL_H
5574 +#include <acl/libacl.h>
5576 +#include "smb_acls.h"
5578 +#define SMB_MALLOC(cnt) new_array(char, cnt)
5579 +#define SMB_MALLOC_P(obj) new_array(obj, 1)
5580 +#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
5581 +#define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt)
5582 +#define slprintf snprintf
5584 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
5585 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
5586 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
5587 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d);
5588 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type);
5589 +SMB_ACL_T sys_acl_get_fd(int fd);
5590 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
5591 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5592 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5593 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen);
5594 +SMB_ACL_T sys_acl_init(int count);
5595 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
5596 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype);
5597 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual);
5598 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset);
5599 +int sys_acl_valid(SMB_ACL_T theacl);
5600 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
5601 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl);
5602 +int sys_acl_delete_def_file(const char *name);
5603 +int sys_acl_free_text(char *text);
5604 +int sys_acl_free_acl(SMB_ACL_T the_acl);
5605 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
5607 +#endif /* SUPPORT_ACLS */
5610 @@ -625,8 +625,10 @@ static void log_formatted(enum logcode c
5611 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
5612 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
5613 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
5616 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
5617 + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
5618 + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
5621 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
5622 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
5625 @@ -47,6 +47,7 @@ int copy_dirlinks = 0;
5627 int preserve_links = 0;
5628 int preserve_hard_links = 0;
5629 +int preserve_acls = 0;
5630 int preserve_perms = 0;
5631 int preserve_executability = 0;
5632 int preserve_devices = 0;
5633 @@ -198,6 +199,7 @@ static void print_rsync_version(enum log
5634 char const *got_socketpair = "no ";
5635 char const *have_inplace = "no ";
5636 char const *hardlinks = "no ";
5637 + char const *acls = "no ";
5638 char const *links = "no ";
5639 char const *ipv6 = "no ";
5640 STRUCT_STAT *dumstat;
5641 @@ -214,6 +216,10 @@ static void print_rsync_version(enum log
5645 +#ifdef SUPPORT_ACLS
5649 #ifdef SUPPORT_LINKS
5652 @@ -232,8 +238,8 @@ static void print_rsync_version(enum log
5653 (int)(sizeof (int64) * 8));
5654 rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
5655 got_socketpair, hardlinks, links, ipv6, have_inplace);
5656 - rprintf(f, " %sappend\n",
5658 + rprintf(f, " %sappend, %sACLs\n",
5659 + have_inplace, acls);
5661 #ifdef MAINTAINER_MODE
5662 rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
5663 @@ -279,7 +285,7 @@ void usage(enum logcode F)
5664 rprintf(F," -q, --quiet suppress non-error messages\n");
5665 rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
5666 rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
5667 - rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n");
5668 + rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n");
5669 rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
5670 rprintf(F," -r, --recursive recurse into directories\n");
5671 rprintf(F," -R, --relative use relative path names\n");
5672 @@ -301,6 +307,9 @@ void usage(enum logcode F)
5673 rprintf(F," -p, --perms preserve permissions\n");
5674 rprintf(F," -E, --executability preserve the file's executability\n");
5675 rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
5676 +#ifdef SUPPORT_ACLS
5677 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
5679 rprintf(F," -o, --owner preserve owner (super-user only)\n");
5680 rprintf(F," -g, --group preserve group\n");
5681 rprintf(F," --devices preserve device files (super-user only)\n");
5682 @@ -421,6 +430,9 @@ static struct poptOption long_options[]
5683 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5684 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5685 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
5686 + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
5687 + {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5688 + {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5689 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
5690 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5691 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5692 @@ -1086,6 +1098,24 @@ int parse_arguments(int *argc, const cha
5697 +#ifdef SUPPORT_ACLS
5698 + preserve_acls = 1;
5699 + preserve_perms = 1;
5702 + /* FIXME: this should probably be ignored with a
5703 + * warning and then countermeasures taken to
5704 + * restrict group and other access in the presence
5705 + * of any more restrictive ACLs, but this is safe
5707 + snprintf(err_buf,sizeof(err_buf),
5708 + "ACLs are not supported on this %s\n",
5709 + am_server ? "server" : "client");
5715 /* A large opt value means that set_refuse_options()
5716 * turned this option off. */
5717 @@ -1528,6 +1558,10 @@ void server_options(char **args,int *arg
5719 if (preserve_hard_links)
5721 +#ifdef SUPPORT_ACLS
5722 + if (preserve_acls)
5723 + argstr[x++] = 'A';
5730 @@ -47,6 +47,7 @@ extern int keep_partial;
5731 extern int checksum_seed;
5733 extern int delay_updates;
5734 +extern mode_t orig_umask;
5735 extern struct stats stats;
5736 extern char *stdout_format;
5737 extern char *tmpdir;
5738 @@ -347,6 +348,10 @@ int recv_files(int f_in, struct file_lis
5739 int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
5740 enum logcode log_code = log_before_transfer ? FLOG : FINFO;
5741 int max_phase = protocol_version >= 29 ? 2 : 1;
5742 + int dflt_perms = (ACCESSPERMS & ~orig_umask);
5743 +#ifdef SUPPORT_ACLS
5744 + const char *parent_dirname = "";
5749 @@ -545,7 +550,16 @@ int recv_files(int f_in, struct file_lis
5750 * mode based on the local permissions and some heuristics. */
5751 if (!preserve_perms) {
5752 int exists = fd1 != -1;
5753 - file->mode = dest_mode(file->mode, st.st_mode, exists);
5754 +#ifdef SUPPORT_ACLS
5755 + const char *dn = file->dirname ? file->dirname : ".";
5756 + if (parent_dirname != dn
5757 + && strcmp(parent_dirname, dn) != 0) {
5758 + dflt_perms = default_perms_for_dir(dn);
5759 + parent_dirname = dn;
5762 + file->mode = dest_mode(file->mode, st.st_mode,
5763 + dflt_perms, exists);
5766 /* We now check to see if we are writing the file "inplace" */
5773 +extern int preserve_acls;
5774 extern int preserve_perms;
5775 extern int preserve_executability;
5776 extern int preserve_times;
5777 @@ -48,7 +49,6 @@ extern int preserve_gid;
5779 extern int keep_dirlinks;
5780 extern int make_backups;
5781 -extern mode_t orig_umask;
5782 extern struct stats stats;
5783 extern struct file_list *the_file_list;
5784 extern struct chmod_mode_struct *daemon_chmod_modes;
5785 @@ -153,7 +153,8 @@ void free_sums(struct sum_struct *s)
5787 /* This is only called when we aren't preserving permissions. Figure out what
5788 * the permissions should be and return them merged back into the mode. */
5789 -mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists)
5790 +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
5794 /* If the file already exists, we'll return the local permissions,
5795 @@ -170,56 +171,65 @@ mode_t dest_mode(mode_t flist_mode, mode
5796 new_mode |= (new_mode & 0444) >> 2;
5799 - /* Apply the umask and turn off special permissions. */
5800 - new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask));
5801 + /* Apply destination default permissions and turn
5802 + * off special permissions. */
5803 + new_mode = flist_mode & (~CHMOD_BITS | dflt_perms);
5808 -int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
5809 +int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
5815 int change_uid, change_gid;
5816 mode_t new_mode = file->mode;
5822 - if (link_stat(fname, &st2, 0) < 0) {
5823 + if (link_stat(fname, &sx2.st, 0) < 0) {
5824 rsyserr(FERROR, errno, "stat %s failed",
5829 +#ifdef SUPPORT_ACLS
5830 + sx2.acc_acl = sx2.def_acl = NULL;
5832 if (!preserve_perms && S_ISDIR(new_mode)
5833 - && st->st_mode & S_ISGID) {
5834 + && sx2.st.st_mode & S_ISGID) {
5835 /* We just created this directory and its setgid
5836 * bit is on, so make sure it stays on. */
5837 new_mode |= S_ISGID;
5842 - if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
5843 +#ifdef SUPPORT_ACLS
5844 + if (preserve_acls && !ACL_READY(*sxp))
5845 + get_acl(fname, sxp);
5848 + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
5849 flags |= ATTRS_SKIP_MTIME;
5850 if (!(flags & ATTRS_SKIP_MTIME)
5851 - && cmp_time(st->st_mtime, file->modtime) != 0) {
5852 - int ret = set_modtime(fname, file->modtime, st->st_mode);
5853 + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
5854 + int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
5856 rsyserr(FERROR, errno, "failed to set times on %s",
5861 if (ret == 0) /* ret == 1 if symlink could not be set */
5865 - change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
5866 + change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
5867 change_gid = preserve_gid && F_GID(file) != GID_NONE
5868 - && st->st_gid != F_GID(file);
5869 + && sxp->st.st_gid != F_GID(file);
5870 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
5871 - if (S_ISLNK(st->st_mode))
5872 + if (S_ISLNK(sxp->st.st_mode))
5876 @@ -229,45 +239,57 @@ int set_file_attrs(char *fname, struct f
5878 "set uid of %s from %ld to %ld\n",
5880 - (long)st->st_uid, (long)F_UID(file));
5881 + (long)sxp->st.st_uid, (long)F_UID(file));
5885 "set gid of %s from %ld to %ld\n",
5887 - (long)st->st_gid, (long)F_GID(file));
5888 + (long)sxp->st.st_gid, (long)F_GID(file));
5891 if (do_lchown(fname,
5892 - change_uid ? F_UID(file) : st->st_uid,
5893 - change_gid ? F_GID(file) : st->st_gid) != 0) {
5894 + change_uid ? F_UID(file) : sxp->st.st_uid,
5895 + change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
5896 /* shouldn't have attempted to change uid or gid
5897 * unless have the privilege */
5898 rsyserr(FERROR, errno, "%s %s failed",
5899 change_uid ? "chown" : "chgrp",
5904 /* a lchown had been done - we have to re-stat if the
5905 * destination had the setuid or setgid bits set due
5906 * to the side effect of the chown call */
5907 - if (st->st_mode & (S_ISUID | S_ISGID)) {
5908 - link_stat(fname, st,
5909 - keep_dirlinks && S_ISDIR(st->st_mode));
5910 + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) {
5911 + link_stat(fname, &sxp->st,
5912 + keep_dirlinks && S_ISDIR(sxp->st.st_mode));
5917 if (daemon_chmod_modes && !S_ISLNK(new_mode))
5918 new_mode = tweak_mode(new_mode, daemon_chmod_modes);
5920 +#ifdef SUPPORT_ACLS
5921 + /* It's OK to call set_acl() now, even for a dir, as the generator
5922 + * will enable owner-writability using chmod, if necessary.
5924 + * If set_acl() changes permission bits in the process of setting
5925 + * an access ACL, it changes sxp->st.st_mode so we know whether we
5926 + * need to chmod(). */
5927 + if (preserve_acls && set_acl(fname, file, sxp) == 0)
5932 - if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
5933 + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
5934 int ret = do_chmod(fname, new_mode);
5936 rsyserr(FERROR, errno,
5937 "failed to set permissions on %s",
5942 if (ret == 0) /* ret == 1 if symlink could not be set */
5944 @@ -280,6 +302,11 @@ int set_file_attrs(char *fname, struct f
5946 rprintf(FCLIENT, "%s is uptodate\n", fname);
5949 +#ifdef SUPPORT_ACLS
5950 + if (preserve_acls && sxp == &sx2)
5958 @@ -503,6 +503,14 @@ struct idev_node {
5959 #define IN_LOOPBACKNET 127
5962 +#ifndef HAVE_NO_ACLS
5963 +#define SUPPORT_ACLS 1
5966 +#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
5967 +#define ACLS_NEED_MASK 1
5970 #define GID_NONE ((gid_t)-1)
5973 @@ -522,6 +530,7 @@ struct file_struct {
5974 extern int flist_extra_cnt;
5975 extern int preserve_uid;
5976 extern int preserve_gid;
5977 +extern int preserve_acls;
5979 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
5980 #define EXTRA_LEN (sizeof (union file_extras))
5981 @@ -554,10 +563,12 @@ extern int preserve_gid;
5982 /* When the associated option is on, all entries will have these present: */
5983 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
5984 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
5985 +#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
5987 /* These items are per-entry optional and mutally exclusive: */
5988 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
5989 #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
5990 +#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
5992 /* This optional item might follow an F_HL_*() item.
5993 * (Note: a device doesn't need to check LEN64_BUMP(f).) */
5994 @@ -693,6 +704,17 @@ struct stats {
5996 struct chmod_mode_struct;
5998 +#define EMPTY_ITEM_LIST {NULL, 0, 0}
6006 +#define EXPAND_ITEM_LIST(lp, type, incr) \
6007 + (type*)expand_item_list(lp, sizeof (type), #type, incr)
6009 #include "byteorder.h"
6010 #include "lib/mdfour.h"
6011 #include "lib/wildmatch.h"
6012 @@ -711,6 +733,16 @@ struct chmod_mode_struct;
6013 #define NORETURN __attribute__((__noreturn__))
6018 +#ifdef SUPPORT_ACLS
6019 + struct rsync_acl *acc_acl; /* access ACL */
6020 + struct rsync_acl *def_acl; /* default ACL */
6024 +#define ACL_READY(sx) ((sx).acc_acl != NULL)
6028 /* We have replacement versions of these if they're missing. */
6031 @@ -301,7 +301,7 @@ to the detailed description below for a
6032 -q, --quiet suppress non-error messages
6033 --no-motd suppress daemon-mode MOTD (see caveat)
6034 -c, --checksum skip based on checksum, not mod-time & size
6035 - -a, --archive archive mode; same as -rlptgoD (no -H)
6036 + -a, --archive archive mode; same as -rlptgoD (no -H, -A)
6037 --no-OPTION turn off an implied OPTION (e.g. --no-D)
6038 -r, --recursive recurse into directories
6039 -R, --relative use relative path names
6040 @@ -323,6 +323,7 @@ to the detailed description below for a
6041 -p, --perms preserve permissions
6042 -E, --executability preserve executability
6043 --chmod=CHMOD affect file and/or directory permissions
6044 + -A, --acls preserve ACLs (implies -p) [non-standard]
6045 -o, --owner preserve owner (super-user only)
6046 -g, --group preserve group
6047 --devices preserve device files (super-user only)
6048 @@ -754,7 +755,9 @@ quote(itemization(
6049 permissions, though the bf(--executability) option might change just
6050 the execute permission for the file.
6051 it() New files get their "normal" permission bits set to the source
6052 - file's permissions masked with the receiving end's umask setting, and
6053 + file's permissions masked with the receiving directory's default
6054 + permissions (either the receiving process's umask, or the permissions
6055 + specified via the destination directory's default ACL), and
6056 their special permission bits disabled except in the case where a new
6057 directory inherits a setgid bit from its parent directory.
6059 @@ -785,9 +788,11 @@ The preservation of the destination's se
6060 directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
6061 versions erroneously preserved the three special permission bits for
6062 newly-created files when bf(--perms) was off, while overriding the
6063 -destination's setgid bit setting on a newly-created directory. (Keep in
6064 -mind that it is the version of the receiving rsync that affects this
6066 +destination's setgid bit setting on a newly-created directory. Default ACL
6067 +observance was added to the ACL patch for rsync 2.6.7, so older (or
6068 +non-ACL-enabled) rsyncs use the umask even if default ACLs are present.
6069 +(Keep in mind that it is the version of the receiving rsync that affects
6072 dit(bf(-E, --executability)) This option causes rsync to preserve the
6073 executability (or non-executability) of regular files when bf(--perms) is
6074 @@ -805,6 +810,14 @@ quote(itemization(
6076 If bf(--perms) is enabled, this option is ignored.
6078 +dit(bf(-A, --acls)) This option causes rsync to update the destination
6079 +ACLs to be the same as the source ACLs. This nonstandard option only
6080 +works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
6082 +The ACL-sending protocol used by this version was first introduced in
6083 +the patch that was shipped with 2.6.8. Sending ACLs to an older version
6084 +of the ACL patch is not supported.
6086 dit(bf(--chmod)) This option tells rsync to apply one or more
6087 comma-separated "chmod" strings to the permission of the files in the
6088 transfer. The resulting value is treated as though it was the permissions
6089 @@ -1402,8 +1415,8 @@ if the receiving rsync is at least versi
6090 with older versions of rsync, but that also turns on the output of other
6093 -The "%i" escape has a cryptic output that is 9 letters long. The general
6094 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
6095 +The "%i" escape has a cryptic output that is 11 letters long. The general
6096 +format is like the string bf(YXcstpoguax), where bf(Y) is replaced by the
6097 type of update being done, bf(X) is replaced by the file-type, and the
6098 other letters represent attributes that may be output if they are being
6100 @@ -1452,7 +1465,11 @@ quote(itemization(
6101 sender's value (requires bf(--owner) and super-user privileges).
6102 it() A bf(g) means the group is different and is being updated to the
6103 sender's value (requires bf(--group) and the authority to set the group).
6104 - it() The bf(z) slot is reserved for future use.
6105 + it() The bf(u) slot is reserved for reporting update (access) time changes
6106 + (a feature that is not yet released).
6107 + it() The bf(a) means that the ACL information changed.
6108 + it() The bf(x) slot is reserved for reporting extended attribute changes
6109 + (a feature that is not yet released).
6112 One other output is possible: when deleting files, the "%i" will output
6117 + Unix SMB/Netbios implementation.
6119 + Portable SMB ACL interface
6120 + Copyright (C) Jeremy Allison 2000
6122 + This program is free software; you can redistribute it and/or modify
6123 + it under the terms of the GNU General Public License as published by
6124 + the Free Software Foundation; either version 2 of the License, or
6125 + (at your option) any later version.
6127 + This program is distributed in the hope that it will be useful,
6128 + but WITHOUT ANY WARRANTY; without even the implied warranty of
6129 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6130 + GNU General Public License for more details.
6132 + You should have received a copy of the GNU General Public License
6133 + along with this program; if not, write to the Free Software
6134 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
6137 +#ifndef _SMB_ACLS_H
6138 +#define _SMB_ACLS_H
6140 +#if defined HAVE_POSIX_ACLS
6142 +/* This is an identity mapping (just remove the SMB_). */
6144 +#define SMB_ACL_TAG_T acl_tag_t
6145 +#define SMB_ACL_TYPE_T acl_type_t
6146 +#define SMB_ACL_PERMSET_T acl_permset_t
6147 +#define SMB_ACL_PERM_T acl_perm_t
6148 +#define SMB_ACL_READ ACL_READ
6149 +#define SMB_ACL_WRITE ACL_WRITE
6150 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6152 +/* Types of ACLs. */
6153 +#define SMB_ACL_USER ACL_USER
6154 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6155 +#define SMB_ACL_GROUP ACL_GROUP
6156 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6157 +#define SMB_ACL_OTHER ACL_OTHER
6158 +#define SMB_ACL_MASK ACL_MASK
6160 +#define SMB_ACL_T acl_t
6162 +#define SMB_ACL_ENTRY_T acl_entry_t
6164 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
6165 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
6167 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6168 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6170 +#elif defined HAVE_TRU64_ACLS
6172 +/* This is for DEC/Compaq Tru64 UNIX */
6174 +#define SMB_ACL_TAG_T acl_tag_t
6175 +#define SMB_ACL_TYPE_T acl_type_t
6176 +#define SMB_ACL_PERMSET_T acl_permset_t
6177 +#define SMB_ACL_PERM_T acl_perm_t
6178 +#define SMB_ACL_READ ACL_READ
6179 +#define SMB_ACL_WRITE ACL_WRITE
6180 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6182 +/* Types of ACLs. */
6183 +#define SMB_ACL_USER ACL_USER
6184 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6185 +#define SMB_ACL_GROUP ACL_GROUP
6186 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6187 +#define SMB_ACL_OTHER ACL_OTHER
6188 +#define SMB_ACL_MASK ACL_MASK
6190 +#define SMB_ACL_T acl_t
6192 +#define SMB_ACL_ENTRY_T acl_entry_t
6194 +#define SMB_ACL_FIRST_ENTRY 0
6195 +#define SMB_ACL_NEXT_ENTRY 1
6197 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6198 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6200 +#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS
6202 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
6203 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
6206 +/* SVR4.2 ES/MP ACLs */
6207 +typedef int SMB_ACL_TAG_T;
6208 +typedef int SMB_ACL_TYPE_T;
6209 +typedef ushort *SMB_ACL_PERMSET_T;
6210 +typedef ushort SMB_ACL_PERM_T;
6211 +#define SMB_ACL_READ 4
6212 +#define SMB_ACL_WRITE 2
6213 +#define SMB_ACL_EXECUTE 1
6215 +/* Types of ACLs. */
6216 +#define SMB_ACL_USER USER
6217 +#define SMB_ACL_USER_OBJ USER_OBJ
6218 +#define SMB_ACL_GROUP GROUP
6219 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6220 +#define SMB_ACL_OTHER OTHER_OBJ
6221 +#define SMB_ACL_MASK CLASS_OBJ
6223 +typedef struct SMB_ACL_T {
6227 + struct acl acl[1];
6230 +typedef struct acl *SMB_ACL_ENTRY_T;
6232 +#define SMB_ACL_FIRST_ENTRY 0
6233 +#define SMB_ACL_NEXT_ENTRY 1
6235 +#define SMB_ACL_TYPE_ACCESS 0
6236 +#define SMB_ACL_TYPE_DEFAULT 1
6239 +#define SMB_ACL_LOSES_SPECIAL_MODE_BITS
6242 +#elif defined HAVE_HPUX_ACLS
6245 + * Based on the Solaris & UnixWare code.
6249 +#include <sys/aclv.h>
6251 +/* SVR4.2 ES/MP ACLs */
6252 +typedef int SMB_ACL_TAG_T;
6253 +typedef int SMB_ACL_TYPE_T;
6254 +typedef ushort *SMB_ACL_PERMSET_T;
6255 +typedef ushort SMB_ACL_PERM_T;
6256 +#define SMB_ACL_READ 4
6257 +#define SMB_ACL_WRITE 2
6258 +#define SMB_ACL_EXECUTE 1
6260 +/* Types of ACLs. */
6261 +#define SMB_ACL_USER USER
6262 +#define SMB_ACL_USER_OBJ USER_OBJ
6263 +#define SMB_ACL_GROUP GROUP
6264 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6265 +#define SMB_ACL_OTHER OTHER_OBJ
6266 +#define SMB_ACL_MASK CLASS_OBJ
6268 +typedef struct SMB_ACL_T {
6272 + struct acl acl[1];
6275 +typedef struct acl *SMB_ACL_ENTRY_T;
6277 +#define SMB_ACL_FIRST_ENTRY 0
6278 +#define SMB_ACL_NEXT_ENTRY 1
6280 +#define SMB_ACL_TYPE_ACCESS 0
6281 +#define SMB_ACL_TYPE_DEFAULT 1
6283 +#elif defined HAVE_IRIX_ACLS
6285 +#define SMB_ACL_TAG_T acl_tag_t
6286 +#define SMB_ACL_TYPE_T acl_type_t
6287 +#define SMB_ACL_PERMSET_T acl_permset_t
6288 +#define SMB_ACL_PERM_T acl_perm_t
6289 +#define SMB_ACL_READ ACL_READ
6290 +#define SMB_ACL_WRITE ACL_WRITE
6291 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6293 +/* Types of ACLs. */
6294 +#define SMB_ACL_USER ACL_USER
6295 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6296 +#define SMB_ACL_GROUP ACL_GROUP
6297 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6298 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
6299 +#define SMB_ACL_MASK ACL_MASK
6301 +typedef struct SMB_ACL_T {
6307 +#define SMB_ACL_ENTRY_T acl_entry_t
6309 +#define SMB_ACL_FIRST_ENTRY 0
6310 +#define SMB_ACL_NEXT_ENTRY 1
6312 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6313 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6315 +#elif defined HAVE_AIX_ACLS
6317 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
6319 +#include "/usr/include/acl.h"
6321 +typedef uint *SMB_ACL_PERMSET_T;
6323 +struct acl_entry_link{
6324 + struct acl_entry_link *prevp;
6325 + struct new_acl_entry *entryp;
6326 + struct acl_entry_link *nextp;
6330 +struct new_acl_entry{
6331 + unsigned short ace_len;
6332 + unsigned short ace_type;
6333 + unsigned int ace_access;
6334 + struct ace_id ace_id[1];
6337 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
6338 +#define SMB_ACL_T struct acl_entry_link*
6340 +#define SMB_ACL_TAG_T unsigned short
6341 +#define SMB_ACL_TYPE_T int
6342 +#define SMB_ACL_PERM_T uint
6343 +#define SMB_ACL_READ S_IRUSR
6344 +#define SMB_ACL_WRITE S_IWUSR
6345 +#define SMB_ACL_EXECUTE S_IXUSR
6347 +/* Types of ACLs. */
6348 +#define SMB_ACL_USER ACEID_USER
6349 +#define SMB_ACL_USER_OBJ 3
6350 +#define SMB_ACL_GROUP ACEID_GROUP
6351 +#define SMB_ACL_GROUP_OBJ 4
6352 +#define SMB_ACL_OTHER 5
6353 +#define SMB_ACL_MASK 6
6356 +#define SMB_ACL_FIRST_ENTRY 1
6357 +#define SMB_ACL_NEXT_ENTRY 2
6359 +#define SMB_ACL_TYPE_ACCESS 0
6360 +#define SMB_ACL_TYPE_DEFAULT 1
6362 +#else /* No ACLs. */
6364 +/* No ACLS - fake it. */
6365 +#define SMB_ACL_TAG_T int
6366 +#define SMB_ACL_TYPE_T int
6367 +#define SMB_ACL_PERMSET_T mode_t
6368 +#define SMB_ACL_PERM_T mode_t
6369 +#define SMB_ACL_READ S_IRUSR
6370 +#define SMB_ACL_WRITE S_IWUSR
6371 +#define SMB_ACL_EXECUTE S_IXUSR
6373 +/* Types of ACLs. */
6374 +#define SMB_ACL_USER 0
6375 +#define SMB_ACL_USER_OBJ 1
6376 +#define SMB_ACL_GROUP 2
6377 +#define SMB_ACL_GROUP_OBJ 3
6378 +#define SMB_ACL_OTHER 4
6379 +#define SMB_ACL_MASK 5
6381 +typedef struct SMB_ACL_T {
6385 +typedef struct SMB_ACL_ENTRY_T {
6387 +} *SMB_ACL_ENTRY_T;
6389 +#define SMB_ACL_FIRST_ENTRY 0
6390 +#define SMB_ACL_NEXT_ENTRY 1
6392 +#define SMB_ACL_TYPE_ACCESS 0
6393 +#define SMB_ACL_TYPE_DEFAULT 1
6395 +#endif /* No ACLs. */
6396 +#endif /* _SMB_ACLS_H */
6397 --- old/testsuite/acls.test
6398 +++ new/testsuite/acls.test
6402 +# This program is distributable under the terms of the GNU GPL (see
6405 +# Test that rsync handles basic ACL preservation.
6407 +. $srcdir/testsuite/rsync.fns
6409 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6410 +case "$setfacl_nodef" in
6411 +true) test_skipped "I don't know how to use your setfacl command" ;;
6414 +makepath "$fromdir/foo"
6415 +echo something >"$fromdir/file1"
6416 +echo else >"$fromdir/file2"
6418 +files='foo file1 file2'
6420 +setfacl -m u:0:7 "$fromdir/foo" || test_skipped "Your filesystem has ACLs disabled"
6421 +setfacl -m u:0:5 "$fromdir/file1"
6422 +setfacl -m u:0:5 "$fromdir/file2"
6424 +$RSYNC -avvA "$fromdir/" "$todir/"
6427 +getfacl $files >"$scratchdir/acls.txt"
6430 +getfacl $files | diff $diffopt "$scratchdir/acls.txt" -
6432 +# The script would have aborted on error, so getting here means we've won.
6434 --- old/testsuite/default-acls.test
6435 +++ new/testsuite/default-acls.test
6439 +# This program is distributable under the terms of the GNU GPL (see
6442 +# Test that rsync obeys default ACLs. -- Matt McCutchen
6444 +. $srcdir/testsuite/rsync.fns
6446 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6447 +case "$setfacl_nodef" in
6448 +true) test_skipped "I don't know how to use your setfacl command" ;;
6449 +*-k*) opts='-dm u::7,g::5,o:5' ;;
6450 +*) opts='-m d:u::7,d:g::5,d:o:5' ;;
6452 +setfacl $opts "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
6454 +# Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
6456 + todir="$scratchdir/$1"
6458 + $setfacl_nodef "$todir"
6460 + case "$setfacl_nodef" in
6461 + *-k*) opts="-dm $2" ;;
6462 + *) opts="-m `echo $2 | sed 's/\([ugom]:\)/d:\1/g'`"
6464 + setfacl $opts "$todir"
6466 + # Make sure we obey ACLs when creating a directory to hold multiple transferred files,
6467 + # even though the directory itself is outside the transfer
6468 + $RSYNC -rvv "$scratchdir/dir" "$scratchdir/file" "$scratchdir/program" "$todir/to/"
6469 + check_perms "$todir/to" $4 "Target $1"
6470 + check_perms "$todir/to/dir" $4 "Target $1"
6471 + check_perms "$todir/to/file" $3 "Target $1"
6472 + check_perms "$todir/to/program" $4 "Target $1"
6473 + # Make sure get_local_name doesn't mess us up when transferring only one file
6474 + $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
6475 + check_perms "$todir/to/anotherfile" $3 "Target $1"
6476 + # Make sure we obey default ACLs when not transferring a regular file
6477 + $RSYNC -rvv "$scratchdir/dir/" "$todir/to/anotherdir/"
6478 + check_perms "$todir/to/anotherdir" $4 "Target $1"
6481 +mkdir "$scratchdir/dir"
6482 +echo "File!" >"$scratchdir/file"
6483 +echo "#!/bin/sh" >"$scratchdir/program"
6484 +chmod 777 "$scratchdir/dir"
6485 +chmod 666 "$scratchdir/file"
6486 +chmod 777 "$scratchdir/program"
6488 +# Test some target directories
6490 +testit da777 u::7,g::7,o:7 rw-rw-rw- rwxrwxrwx
6491 +testit da775 u::7,g::7,o:5 rw-rw-r-- rwxrwxr-x
6492 +testit da750 u::7,g::5,o:0 rw-r----- rwxr-x---
6493 +testit da770mask u::7,u:0:7,g::0,m:7,o:0 rw-rw---- rwxrwx---
6494 +testit noda1 '' rw------- rwx------
6496 +testit noda2 '' rw-rw-rw- rwxrwxrwx
6498 +testit noda3 '' rw-r--r-- rwxr-xr-x
6502 --- old/testsuite/devices.test
6503 +++ new/testsuite/devices.test
6504 @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
6505 $RSYNC -ai "$fromdir/block" "$todir/block2" \
6507 cat <<EOT >"$chkfile"
6511 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6513 $RSYNC -ai "$fromdir/block2" "$todir/block" \
6515 cat <<EOT >"$chkfile"
6519 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6521 @@ -58,7 +58,7 @@ sleep 1
6522 $RSYNC -Di "$fromdir/block3" "$todir/block" \
6524 cat <<EOT >"$chkfile"
6528 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6530 @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
6533 cat <<EOT >"$chkfile"
6538 -hD+++++++ block2.5 => block3
6547 +hD+++++++++ block2.5 => block3
6553 if test ! -b "$fromdir/block2.5"; then
6554 sed -e '/block2\.5/d' \
6555 @@ -94,15 +94,15 @@ if test -b "$fromdir/block2.5"; then
6556 $RSYNC -aii --link-dest="$todir" "$fromdir/" "$chkdir/" \
6558 cat <<EOT >"$chkfile"
6578 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
6580 --- old/testsuite/itemize.test
6581 +++ new/testsuite/itemize.test
6582 @@ -38,15 +38,15 @@ rm -f "$to2dir" "$to2dir.test"
6583 $RSYNC -iplr "$fromdir/" "$todir/" \
6585 cat <<EOT >"$chkfile"
6589 ->f+++++++ bar/baz/rsync
6591 ->f+++++++ foo/config1
6592 ->f+++++++ foo/config2
6593 ->f+++++++ foo/extra
6594 -cL+++++++ foo/sym -> ../bar/baz/rsync
6597 +cd+++++++++ bar/baz/
6598 +>f+++++++++ bar/baz/rsync
6600 +>f+++++++++ foo/config1
6601 +>f+++++++++ foo/config2
6602 +>f+++++++++ foo/extra
6603 +cL+++++++++ foo/sym -> ../bar/baz/rsync
6605 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6607 @@ -58,10 +58,10 @@ chmod 601 "$fromdir/foo/config2"
6608 $RSYNC -iplrH "$fromdir/" "$todir/" \
6610 cat <<EOT >"$chkfile"
6611 ->f..T.... bar/baz/rsync
6612 ->f..T.... foo/config1
6613 ->f.sTp... foo/config2
6614 -hf..T.... foo/extra => foo/config1
6615 +>f..T...... bar/baz/rsync
6616 +>f..T...... foo/config1
6617 +>f.sTp..... foo/config2
6618 +hf..T...... foo/extra => foo/config1
6620 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6622 @@ -78,11 +78,11 @@ chmod 777 "$todir/bar/baz/rsync"
6623 $RSYNC -iplrtc "$fromdir/" "$todir/" \
6625 cat <<EOT >"$chkfile"
6626 -.f..tp... bar/baz/rsync
6628 -.f..t.... foo/config1
6629 ->fcstp... foo/config2
6630 -cL..T.... foo/sym -> ../bar/baz/rsync
6631 +.f..tp..... bar/baz/rsync
6633 +.f..t...... foo/config1
6634 +>fcstp..... foo/config2
6635 +cL..T...... foo/sym -> ../bar/baz/rsync
6637 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6639 @@ -107,15 +107,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
6642 cat <<EOT >"$chkfile"
6646 -.f...p... bar/baz/rsync
6649 ->f..t.... foo/config2
6651 -.L foo/sym -> ../bar/baz/rsync
6655 +.f...p..... bar/baz/rsync
6658 +>f..t...... foo/config2
6660 +.L foo/sym -> ../bar/baz/rsync
6662 diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
6664 @@ -134,8 +134,8 @@ touch "$todir/foo/config2"
6665 $RSYNC -iplrtH "$fromdir/" "$todir/" \
6667 cat <<EOT >"$chkfile"
6668 -.f...p... foo/config1
6669 ->f..t.... foo/config2
6670 +.f...p..... foo/config1
6671 +>f..t...... foo/config2
6673 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
6675 @@ -143,15 +143,15 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fro
6678 cat <<EOT >"$chkfile"
6686 -hf foo/extra => foo/config1
6687 -cL foo/sym -> ../bar/baz/rsync
6695 +hf foo/extra => foo/config1
6696 +cL foo/sym -> ../bar/baz/rsync
6698 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
6700 @@ -159,7 +159,7 @@ rm -rf "$to2dir"
6701 $RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
6703 cat <<EOT >"$chkfile"
6704 -hf foo/extra => foo/config1
6705 +hf foo/extra => foo/config1
6707 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
6709 @@ -185,15 +185,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
6712 cat <<EOT >"$chkfile"
6720 -hf foo/extra => foo/config1
6721 -$L foo/sym -> ../bar/baz/rsync
6729 +hf foo/extra => foo/config1
6730 +$L foo/sym -> ../bar/baz/rsync
6732 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
6734 @@ -233,15 +233,15 @@ $RSYNC -ivvplrtH --compare-dest="$todir"
6737 cat <<EOT >"$chkfile"
6746 -.L foo/sym -> ../bar/baz/rsync
6755 +.L foo/sym -> ../bar/baz/rsync
6757 diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
6763 extern int preserve_uid;
6764 extern int preserve_gid;
6765 +extern int preserve_acls;
6766 extern int numeric_ids;
6769 @@ -270,7 +271,7 @@ void send_uid_list(int f)
6771 struct idlist *list;
6773 - if (preserve_uid) {
6774 + if (preserve_uid || preserve_acls) {
6776 /* we send sequences of uid/byte-length/name */
6777 for (list = uidlist; list; list = list->next) {
6778 @@ -287,7 +288,7 @@ void send_uid_list(int f)
6782 - if (preserve_gid) {
6783 + if (preserve_gid || preserve_acls) {
6785 for (list = gidlist; list; list = list->next) {
6787 @@ -308,7 +309,7 @@ void recv_uid_list(int f, struct file_li
6791 - if (preserve_uid && !numeric_ids) {
6792 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
6793 /* read the uid list */
6794 while ((id = read_int(f)) != 0) {
6795 int len = read_byte(f);
6796 @@ -320,7 +321,7 @@ void recv_uid_list(int f, struct file_li
6800 - if (preserve_gid && !numeric_ids) {
6801 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
6802 /* read the gid list */
6803 while ((id = read_int(f)) != 0) {
6804 int len = read_byte(f);
6805 @@ -332,6 +333,16 @@ void recv_uid_list(int f, struct file_li
6809 +#ifdef SUPPORT_ACLS
6810 + if (preserve_acls && !numeric_ids) {
6812 + while ((id = next_acl_uid(flist)) != NULL)
6813 + *id = match_uid(*id);
6814 + while ((id = next_acl_gid(flist)) != NULL)
6815 + *id = match_gid(*id);
6819 /* Now convert all the uids/gids from sender values to our values. */
6820 if (am_root && preserve_uid && !numeric_ids) {
6821 for (i = 0; i < flist->count; i++)
6824 @@ -1467,3 +1467,31 @@ int bitbag_next_bit(struct bitbag *bb, i
6829 +void *expand_item_list(item_list *lp, size_t item_size,
6830 + const char *desc, int incr)
6832 + /* First time through, 0 <= 0, so list is expanded. */
6833 + if (lp->malloced <= lp->count) {
6835 + size_t new_size = lp->malloced;
6837 + new_size -= incr; /* increase slowly */
6838 + else if (new_size < (size_t)incr)
6842 + new_ptr = realloc_array(lp->items, char, new_size * item_size);
6843 + if (verbose >= 4) {
6844 + rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
6845 + who_am_i(), desc, (double)new_size * item_size,
6846 + new_ptr == lp->items ? " not" : "");
6849 + out_of_memory("expand_item_list");
6851 + lp->items = new_ptr;
6852 + lp->malloced = new_size;
6854 + return (char*)lp->items + (lp->count++ * item_size);