1 To use this patch, run these commands for a successful build:
3 patch -p1 <patches/acls.diff
5 ./configure --enable-acl-support
8 See the --acls (-A) option in the revised man page for a note on using this
9 latest ACL-enabling patch to send files to an older ACL-enabled rsync.
13 @@ -26,15 +26,15 @@ VERSION=@VERSION@
17 -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h lib/pool_alloc.h
18 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
19 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
20 - lib/permstring.o lib/pool_alloc.o @LIBOBJS@
21 + lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
22 ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
23 zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
24 OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
25 util.o main.o checksum.o match.o syscall.o log.o backup.o
26 OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \
27 - fileio.o batch.o clientname.o chmod.o
28 + fileio.o batch.o clientname.o chmod.o acls.o
29 OBJS3=progress.o pipe.o
30 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
31 popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
36 + * Handle passing Access Control Lists between systems.
38 + * Copyright (C) 1996 Andrew Tridgell
39 + * Copyright (C) 1996 Paul Mackerras
40 + * Copyright (C) 2006 Wayne Davison
42 + * This program is free software; you can redistribute it and/or modify
43 + * it under the terms of the GNU General Public License as published by
44 + * the Free Software Foundation; either version 2 of the License, or
45 + * (at your option) any later version.
47 + * This program is distributed in the hope that it will be useful,
48 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
49 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
50 + * GNU General Public License for more details.
52 + * You should have received a copy of the GNU General Public License along
53 + * with this program; if not, write to the Free Software Foundation, Inc.,
54 + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
58 +#include "lib/sysacls.h"
63 +extern int read_only;
64 +extern int list_only;
65 +extern int orig_umask;
66 +extern int protocol_version;
68 +/* === ACL structures === */
80 +#define NO_ENTRY ((uchar)0x80)
81 +typedef struct rsync_acl {
84 + /* These will be NO_ENTRY if there's no such entry. */
96 +static const rsync_acl empty_rsync_acl = {
97 + {NULL, 0}, {NULL, 0}, NO_ENTRY, NO_ENTRY, NO_ENTRY, NO_ENTRY
100 +static item_list access_acl_list = EMPTY_ITEM_LIST;
101 +static item_list default_acl_list = EMPTY_ITEM_LIST;
103 +/* === Calculations on ACL types === */
105 +static const char *str_acl_type(SMB_ACL_TYPE_T type)
107 + return type == SMB_ACL_TYPE_ACCESS ? "SMB_ACL_TYPE_ACCESS"
108 + : type == SMB_ACL_TYPE_DEFAULT ? "SMB_ACL_TYPE_DEFAULT"
109 + : "unknown SMB_ACL_TYPE_T";
112 +#define OTHER_TYPE(t) (SMB_ACL_TYPE_ACCESS+SMB_ACL_TYPE_DEFAULT-(t))
113 +#define BUMP_TYPE(t) ((t = OTHER_TYPE(t)) == SMB_ACL_TYPE_DEFAULT)
115 +static int count_racl_entries(const rsync_acl *racl)
117 + return racl->users.count + racl->groups.count
118 + + (racl->user_obj != NO_ENTRY)
119 + + (racl->group_obj != NO_ENTRY)
120 + + (racl->mask != NO_ENTRY)
121 + + (racl->other != NO_ENTRY);
124 +static int calc_sacl_entries(const rsync_acl *racl)
126 + /* A System ACL always gets user/group/other permission entries. */
127 + return racl->users.count + racl->groups.count
128 +#ifdef ACLS_NEED_MASK
131 + + (racl->mask != NO_ENTRY) + 3;
135 +/* Extracts and returns the permission bits from the ACL. This cannot be
136 + * called on an rsync_acl that has NO_ENTRY in any spot but the mask. */
137 +static int rsync_acl_get_perms(const rsync_acl *racl)
139 + return (racl->user_obj << 6)
140 + + ((racl->mask != NO_ENTRY ? racl->mask : racl->group_obj) << 3)
144 +/* Removes the permission-bit entries from the ACL because these
145 + * can be reconstructed from the file's mode. */
146 +static void rsync_acl_strip_perms(rsync_acl *racl)
148 + racl->user_obj = NO_ENTRY;
149 + if (racl->mask == NO_ENTRY)
150 + racl->group_obj = NO_ENTRY;
152 + if (racl->group_obj == racl->mask)
153 + racl->group_obj = NO_ENTRY;
154 + racl->mask = NO_ENTRY;
156 + racl->other = NO_ENTRY;
159 +/* Given an empty rsync_acl, fake up the permission bits. */
160 +static void rsync_acl_fake_perms(rsync_acl *racl, mode_t mode)
162 + racl->user_obj = (mode >> 6) & 7;
163 + racl->group_obj = (mode >> 3) & 7;
164 + racl->other = mode & 7;
167 +/* === Rsync ACL functions === */
169 +static BOOL ida_entries_equal(const ida_entries *ial1, const ida_entries *ial2)
171 + id_access *ida1, *ida2;
172 + int count = ial1->count;
173 + if (count != ial2->count)
177 + for (; count--; ida1++, ida2++) {
178 + if (ida1->access != ida2->access || ida1->id != ida2->id)
184 +static BOOL rsync_acl_equal(const rsync_acl *racl1, const rsync_acl *racl2)
186 + return racl1->user_obj == racl2->user_obj
187 + && racl1->group_obj == racl2->group_obj
188 + && racl1->mask == racl2->mask
189 + && racl1->other == racl2->other
190 + && ida_entries_equal(&racl1->users, &racl2->users)
191 + && ida_entries_equal(&racl1->groups, &racl2->groups);
194 +/* Are the extended (non-permission-bit) entries equal? If so, the rest of
195 + * the ACL will be handled by the normal mode-preservation code. This is
196 + * only meaningful for access ACLs! Note: the 1st arg is a fully-populated
197 + * rsync_acl, but the 2nd parameter can be a condensed rsync_acl, which means
198 + * that it might have several of its permission objects set to NO_ENTRY. */
199 +static BOOL rsync_acl_equal_enough(const rsync_acl *racl1,
200 + const rsync_acl *racl2, mode_t m)
202 + if ((racl1->mask ^ racl2->mask) & NO_ENTRY)
203 + return False; /* One has a mask and the other doesn't */
205 + /* When there's a mask, the group_obj becomes an extended entry. */
206 + if (racl1->mask != NO_ENTRY) {
207 + /* A condensed rsync_acl with a mask can only have no
208 + * group_obj when it was identical to the mask. This
209 + * means that it was also identical to the group attrs
210 + * from the mode. */
211 + if (racl2->group_obj == NO_ENTRY) {
212 + if (racl1->group_obj != ((m >> 3) & 7))
214 + } else if (racl1->group_obj != racl2->group_obj)
217 + return ida_entries_equal(&racl1->users, &racl2->users)
218 + && ida_entries_equal(&racl1->groups, &racl2->groups);
221 +static void rsync_acl_free(rsync_acl *racl)
223 + if (racl->users.idas)
224 + free(racl->users.idas);
225 + if (racl->groups.idas)
226 + free(racl->groups.idas);
227 + *racl = empty_rsync_acl;
230 +void free_acl(statx *sxp)
232 + if (sxp->acc_acl) {
233 + rsync_acl_free(sxp->acc_acl);
234 + free(sxp->acc_acl);
235 + sxp->acc_acl = NULL;
237 + if (sxp->def_acl) {
238 + rsync_acl_free(sxp->def_acl);
239 + free(sxp->def_acl);
240 + sxp->def_acl = NULL;
244 +static int id_access_sorter(const void *r1, const void *r2)
246 + id_access *ida1 = (id_access *)r1;
247 + id_access *ida2 = (id_access *)r2;
248 + id_t rid1 = ida1->id, rid2 = ida2->id;
249 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
252 +static void sort_ida_entries(ida_entries *idal)
256 + qsort(idal->idas, idal->count, sizeof idal->idas[0], id_access_sorter);
259 +/* Transfer the count id_access items out of the temp_ida_list into either
260 + * the users or groups ida_entries list in racl. */
261 +static void save_idas(item_list *temp_ida_list, rsync_acl *racl, SMB_ACL_TAG_T type)
266 + if (temp_ida_list->count) {
267 + int cnt = temp_ida_list->count;
268 + id_access *temp_idas = temp_ida_list->items;
269 + if (!(idas = new_array(id_access, cnt)))
270 + out_of_memory("save_idas");
271 + memcpy(idas, temp_idas, cnt * sizeof *temp_idas);
275 + ent = type == SMB_ACL_USER ? &racl->users : &racl->groups;
278 + rprintf(FERROR, "save_idas: disjoint list found for type %d\n", type);
279 + exit_cleanup(RERR_UNSUPPORTED);
281 + ent->count = temp_ida_list->count;
284 + /* Truncate the temporary list now that its idas have been saved. */
285 + temp_ida_list->count = 0;
288 +/* === System ACLs === */
290 +/* Unpack system ACL -> rsync ACL verbatim. Return whether we succeeded. */
291 +static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
293 + static item_list temp_ida_list = EMPTY_ITEM_LIST;
294 + SMB_ACL_TAG_T prior_list_type = 0;
295 + SMB_ACL_ENTRY_T entry;
296 + const char *errfun;
299 + errfun = "sys_acl_get_entry";
300 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
302 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
303 + SMB_ACL_TAG_T tag_type;
304 + SMB_ACL_PERMSET_T permset;
308 + if ((rc = sys_acl_get_tag_type(entry, &tag_type))) {
309 + errfun = "sys_acl_get_tag_type";
312 + if ((rc = sys_acl_get_permset(entry, &permset))) {
313 + errfun = "sys_acl_get_tag_type";
316 + access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
317 + | (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
318 + | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
319 + /* continue == done with entry; break == store in temporary ida list */
320 + switch (tag_type) {
321 + case SMB_ACL_USER_OBJ:
322 + if (racl->user_obj == NO_ENTRY)
323 + racl->user_obj = access;
325 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate USER_OBJ entry ignored\n");
329 + case SMB_ACL_GROUP_OBJ:
330 + if (racl->group_obj == NO_ENTRY)
331 + racl->group_obj = access;
333 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate GROUP_OBJ entry ignored\n");
335 + case SMB_ACL_GROUP:
338 + if (racl->mask == NO_ENTRY)
339 + racl->mask = access;
341 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate MASK entry ignored\n");
343 + case SMB_ACL_OTHER:
344 + if (racl->other == NO_ENTRY)
345 + racl->other = access;
347 + rprintf(FINFO, "unpack_smb_acl: warning: duplicate OTHER entry ignored\n");
350 + rprintf(FINFO, "unpack_smb_acl: warning: entry with unrecognized tag type ignored\n");
353 + if (!(qualifier = sys_acl_get_qualifier(entry))) {
354 + errfun = "sys_acl_get_tag_type";
358 + if (tag_type != prior_list_type) {
359 + if (prior_list_type)
360 + save_idas(&temp_ida_list, racl, prior_list_type);
361 + prior_list_type = tag_type;
363 + ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
364 + ida->id = *((id_t *)qualifier);
365 + ida->access = access;
366 + sys_acl_free_qualifier(qualifier, tag_type);
369 + rsyserr(FERROR, errno, "unpack_smb_acl: %s()", errfun);
370 + rsync_acl_free(racl);
373 + if (prior_list_type)
374 + save_idas(&temp_ida_list, racl, prior_list_type);
376 + sort_ida_entries(&racl->users);
377 + sort_ida_entries(&racl->groups);
379 +#ifdef ACLS_NEED_MASK
380 + if (!racl->users.count && !racl->groups.count && racl->mask != NO_ENTRY) {
381 + /* Throw away a superfluous mask, but mask off the
382 + * group perms with it first. */
383 + racl->group_obj &= racl->mask;
384 + racl->mask = NO_ENTRY;
391 +/* Synactic sugar for system calls */
393 +#define CALL_OR_ERROR(func,args,str) \
401 +#define COE(func,args) CALL_OR_ERROR(func,args,#func)
402 +#define COE2(func,args) CALL_OR_ERROR(func,args,NULL)
404 +/* Store the permissions in the system ACL entry. */
405 +static int store_access_in_entry(uchar access, SMB_ACL_ENTRY_T entry)
407 + const char *errfun = NULL;
408 + SMB_ACL_PERMSET_T permset;
410 + COE( sys_acl_get_permset,(entry, &permset) );
411 + COE( sys_acl_clear_perms,(permset) );
413 + COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
415 + COE( sys_acl_add_perm,(permset, SMB_ACL_WRITE) );
417 + COE( sys_acl_add_perm,(permset, SMB_ACL_EXECUTE) );
418 + COE( sys_acl_set_permset,(entry, permset) );
423 + rsyserr(FERROR, errno, "store_access_in_entry %s()", errfun);
427 +/* Pack rsync ACL -> system ACL verbatim. Return whether we succeeded. */
428 +static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
430 +#ifdef ACLS_NEED_MASK
435 + const char *errfun = NULL;
436 + SMB_ACL_ENTRY_T entry;
438 + if (!(*smb_acl = sys_acl_init(calc_sacl_entries(racl)))) {
439 + rsyserr(FERROR, errno, "pack_smb_acl: sys_acl_init()");
443 + COE( sys_acl_create_entry,(smb_acl, &entry) );
444 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER_OBJ) );
445 + COE2( store_access_in_entry,(racl->user_obj & 7, entry) );
447 + for (ida = racl->users.idas, count = racl->users.count; count--; ida++) {
448 + COE( sys_acl_create_entry,(smb_acl, &entry) );
449 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER) );
450 + COE( sys_acl_set_qualifier,(entry, (void*)&ida->id) );
451 + COE2( store_access_in_entry,(ida->access, entry) );
454 + COE( sys_acl_create_entry,(smb_acl, &entry) );
455 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP_OBJ) );
456 + COE2( store_access_in_entry,(racl->group_obj & 7, entry) );
458 + for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) {
459 + COE( sys_acl_create_entry,(smb_acl, &entry) );
460 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP) );
461 + COE( sys_acl_set_qualifier,(entry, (void*)&ida->id) );
462 + COE2( store_access_in_entry,(ida->access, entry) );
465 +#ifdef ACLS_NEED_MASK
466 + mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 7 : racl->mask;
467 + COE( sys_acl_create_entry,(smb_acl, &entry) );
468 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
469 + COE2( store_access_in_entry,(mask_bits, entry) );
471 + if (racl->mask != NO_ENTRY) {
472 + COE( sys_acl_create_entry,(smb_acl, &entry) );
473 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
474 + COE2( store_access_in_entry,(racl->mask, entry) );
478 + COE( sys_acl_create_entry,(smb_acl, &entry) );
479 + COE( sys_acl_set_tag_type,(entry, SMB_ACL_OTHER) );
480 + COE2( store_access_in_entry,(racl->other & 7, entry) );
483 + if (sys_acl_valid(*smb_acl) < 0)
484 + rprintf(FERROR, "pack_smb_acl: warning: system says the ACL I packed is invalid\n");
491 + rsyserr(FERROR, errno, "pack_smb_acl %s()", errfun);
493 + sys_acl_free_acl(*smb_acl);
497 +static int find_matching_rsync_acl(SMB_ACL_TYPE_T type,
498 + const item_list *racl_list,
499 + const rsync_acl *racl)
501 + static int access_match = -1, default_match = -1;
502 + int *match = type == SMB_ACL_TYPE_ACCESS ? &access_match : &default_match;
503 + size_t count = racl_list->count;
505 + /* If this is the first time through or we didn't match the last
506 + * time, then start at the end of the list, which should be the
507 + * best place to start hunting. */
509 + *match = racl_list->count - 1;
511 + rsync_acl *base = racl_list->items;
512 + if (rsync_acl_equal(base + *match, racl))
515 + *match = racl_list->count - 1;
522 +/* Return the Access Control List for the given filename. */
523 +int get_acl(const char *fname, statx *sxp)
525 + SMB_ACL_TYPE_T type;
527 + if (S_ISLNK(sxp->st.st_mode))
530 + type = SMB_ACL_TYPE_ACCESS;
532 + SMB_ACL_T sacl = sys_acl_get_file(fname, type);
533 + rsync_acl *racl = new(rsync_acl);
536 + out_of_memory("get_acl");
537 + *racl = empty_rsync_acl;
538 + if (type == SMB_ACL_TYPE_ACCESS)
539 + sxp->acc_acl = racl;
541 + sxp->def_acl = racl;
544 + BOOL ok = unpack_smb_acl(racl, sacl);
546 + sys_acl_free_acl(sacl);
551 + } else if (errno == ENOTSUP || errno == ENOSYS) {
552 + /* ACLs are not supported, so pretend we have a basic ACL. */
553 + if (type == SMB_ACL_TYPE_ACCESS)
554 + rsync_acl_fake_perms(racl, sxp->st.st_mode);
556 + rsyserr(FERROR, errno, "get_acl: sys_acl_get_file(%s, %s)",
557 + fname, str_acl_type(type));
561 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
566 +/* === Send functions === */
568 +/* The general strategy with the tag_type <-> character mapping is that
569 + * lowercase implies that no qualifier follows, where uppercase does.
570 + * A similar idiom for the ACL type (access or default) itself, but
571 + * lowercase in this instance means there's no ACL following, so the
572 + * ACL is a repeat, so the receiver should reuse the last of the same
575 +/* Send the ida list over the file descriptor. */
576 +static void send_ida_entries(int f, const ida_entries *idal, char tag_char)
579 + size_t count = idal->count;
580 + for (ida = idal->idas; count--; ida++) {
581 + write_byte(f, tag_char);
582 + write_byte(f, ida->access);
583 + write_int(f, ida->id);
584 + /* FIXME: sorta wasteful: we should maybe buffer as
585 + * many ids as max(ACL_USER + ACL_GROUP) objects to
586 + * keep from making so many calls. */
587 + if (tag_char == 'U')
594 +/* Send an rsync ACL over the file descriptor. */
595 +static void send_rsync_acl(int f, const rsync_acl *racl)
597 + size_t count = count_racl_entries(racl);
598 + write_int(f, count);
599 + if (racl->user_obj != NO_ENTRY) {
600 + write_byte(f, 'u');
601 + write_byte(f, racl->user_obj);
603 + send_ida_entries(f, &racl->users, 'U');
604 + if (racl->group_obj != NO_ENTRY) {
605 + write_byte(f, 'g');
606 + write_byte(f, racl->group_obj);
608 + send_ida_entries(f, &racl->groups, 'G');
609 + if (racl->mask != NO_ENTRY) {
610 + write_byte(f, 'm');
611 + write_byte(f, racl->mask);
613 + if (racl->other != NO_ENTRY) {
614 + write_byte(f, 'o');
615 + write_byte(f, racl->other);
619 +/* Send the ACL from the statx structure down the indicated file descriptor.
620 + * This also frees the ACL data. */
621 +void send_acl(statx *sxp, int f)
623 + SMB_ACL_TYPE_T type;
624 + rsync_acl *racl, *new_racl;
625 + item_list *racl_list;
628 + if (S_ISLNK(sxp->st.st_mode))
631 + type = SMB_ACL_TYPE_ACCESS;
632 + racl = sxp->acc_acl;
633 + racl_list = &access_acl_list;
636 + racl = new(rsync_acl);
638 + out_of_memory("send_acl");
639 + *racl = empty_rsync_acl;
640 + if (type == SMB_ACL_TYPE_ACCESS) {
641 + rsync_acl_fake_perms(racl, sxp->st.st_mode);
642 + sxp->acc_acl = racl;
644 + sxp->def_acl = racl;
647 + /* Avoid sending values that can be inferred from other data. */
648 + if (type == SMB_ACL_TYPE_ACCESS && protocol_version >= 30)
649 + rsync_acl_strip_perms(racl);
650 + if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
651 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
654 + new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1000);
655 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
656 + send_rsync_acl(f, racl);
658 + *racl = empty_rsync_acl;
660 + racl = sxp->def_acl;
661 + racl_list = &default_acl_list;
662 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
667 +/* === Receive functions === */
669 +static void receive_rsync_acl(rsync_acl *racl, int f, SMB_ACL_TYPE_T type)
671 + static item_list temp_ida_list = EMPTY_ITEM_LIST;
672 + SMB_ACL_TAG_T tag_type = 0, prior_list_type = 0;
673 + uchar computed_mask_bits = 0;
677 + if (!(count = read_int(f)))
681 + char tag = read_byte(f);
682 + uchar access = read_byte(f);
683 + if (access & ~ (4 | 2 | 1)) {
684 + rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
686 + exit_cleanup(RERR_STREAMIO);
690 + if (racl->user_obj != NO_ENTRY) {
691 + rprintf(FERROR, "receive_rsync_acl: error: duplicate USER_OBJ entry\n");
692 + exit_cleanup(RERR_STREAMIO);
694 + racl->user_obj = access;
697 + tag_type = SMB_ACL_USER;
700 + if (racl->group_obj != NO_ENTRY) {
701 + rprintf(FERROR, "receive_rsync_acl: error: duplicate GROUP_OBJ entry\n");
702 + exit_cleanup(RERR_STREAMIO);
704 + racl->group_obj = access;
707 + tag_type = SMB_ACL_GROUP;
710 + if (racl->mask != NO_ENTRY) {
711 + rprintf(FERROR, "receive_rsync_acl: error: duplicate MASK entry\n");
712 + exit_cleanup(RERR_STREAMIO);
714 + racl->mask = access;
717 + if (racl->other != NO_ENTRY) {
718 + rprintf(FERROR, "receive_rsync_acl: error: duplicate OTHER entry\n");
719 + exit_cleanup(RERR_STREAMIO);
721 + racl->other = access;
724 + rprintf(FERROR, "receive_rsync_acl: unknown tag %c\n",
726 + exit_cleanup(RERR_STREAMIO);
728 + if (tag_type != prior_list_type) {
729 + if (prior_list_type)
730 + save_idas(&temp_ida_list, racl, prior_list_type);
731 + prior_list_type = tag_type;
733 + ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
734 + ida->access = access;
735 + ida->id = read_int(f);
736 + computed_mask_bits |= access;
738 + if (prior_list_type)
739 + save_idas(&temp_ida_list, racl, prior_list_type);
741 + if (type == SMB_ACL_TYPE_DEFAULT) {
742 + /* Ensure that these are never unset. */
743 + if (racl->user_obj == NO_ENTRY)
744 + racl->user_obj = 7;
745 + if (racl->group_obj == NO_ENTRY)
746 + racl->group_obj = 0;
747 + if (racl->other == NO_ENTRY)
751 + if (!racl->users.count && !racl->groups.count) {
752 + /* If we received a superfluous mask, throw it away. */
753 + if (racl->mask != NO_ENTRY) {
754 + /* Mask off the group perms with it first. */
755 + racl->group_obj &= racl->mask | NO_ENTRY;
756 + racl->mask = NO_ENTRY;
758 + } else if (racl->mask == NO_ENTRY) /* Must be non-empty with lists. */
759 + racl->mask = computed_mask_bits | (racl->group_obj & 7);
762 +/* Receive the ACL info the sender has included for this file-list entry. */
763 +void receive_acl(struct file_struct *file, int f)
765 + SMB_ACL_TYPE_T type;
766 + item_list *racl_list;
768 + if (S_ISLNK(file->mode))
771 + type = SMB_ACL_TYPE_ACCESS;
772 + racl_list = &access_acl_list;
774 + char tag = read_byte(f);
777 + if (tag == 'A' || tag == 'a') {
778 + if (type != SMB_ACL_TYPE_ACCESS) {
779 + rprintf(FERROR, "receive_acl %s: duplicate access ACL\n",
780 + f_name(file, NULL));
781 + exit_cleanup(RERR_STREAMIO);
783 + } else if (tag == 'D' || tag == 'd') {
784 + if (type == SMB_ACL_TYPE_ACCESS) {
785 + rprintf(FERROR, "receive_acl %s: expecting access ACL; got default\n",
786 + f_name(file, NULL));
787 + exit_cleanup(RERR_STREAMIO);
790 + rprintf(FERROR, "receive_acl %s: unknown ACL type tag: %c\n",
791 + f_name(file, NULL), tag);
792 + exit_cleanup(RERR_STREAMIO);
794 + if (tag == 'A' || tag == 'D') {
796 + ndx = racl_list->count;
797 + duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
798 + duo_item->racl = empty_rsync_acl;
799 + receive_rsync_acl(&duo_item->racl, f, type);
800 + duo_item->sacl = NULL;
803 + if (ndx < 0 || (size_t)ndx >= racl_list->count) {
804 + rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
805 + f_name(file, NULL), str_acl_type(type), ndx);
806 + exit_cleanup(RERR_STREAMIO);
809 + if (type == SMB_ACL_TYPE_ACCESS)
812 + F_DEF_ACL(file) = ndx;
813 + racl_list = &default_acl_list;
814 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
817 +/* Turn the ACL data in statx into cached ACL data, setting the index
818 + * values in the file struct. */
819 +void cache_acl(struct file_struct *file, statx *sxp)
821 + SMB_ACL_TYPE_T type;
823 + item_list *racl_list;
826 + if (S_ISLNK(file->mode))
829 + type = SMB_ACL_TYPE_ACCESS;
830 + racl = sxp->acc_acl;
831 + racl_list = &access_acl_list;
835 + else if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) == -1) {
837 + ndx = racl_list->count;
838 + new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
839 + new_duo->racl = *racl;
840 + new_duo->sacl = NULL;
841 + *racl = empty_rsync_acl;
843 + if (type == SMB_ACL_TYPE_ACCESS)
846 + F_DEF_ACL(file) = ndx;
847 + racl = sxp->def_acl;
848 + racl_list = &default_acl_list;
849 + } while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
854 +static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode, mode_t mode)
856 + SMB_ACL_ENTRY_T entry;
857 + const char *errfun;
860 + if (S_ISDIR(mode)) {
861 + /* If the sticky bit is going on, it's not safe to allow all
862 + * the new ACL to go into effect before it gets set. */
863 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
864 + if (mode & S_ISVTX)
867 + if (mode & S_ISVTX && !(old_mode & S_ISVTX))
870 + /* If setuid or setgid is going off, it's not safe to allow all
871 + * the new ACL to go into effect before they get cleared. */
872 + if ((old_mode & S_ISUID && !(mode & S_ISUID))
873 + || (old_mode & S_ISGID && !(mode & S_ISGID)))
878 + errfun = "sys_acl_get_entry";
879 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
881 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
882 + SMB_ACL_TAG_T tag_type;
883 + if ((rc = sys_acl_get_tag_type(entry, &tag_type))) {
884 + errfun = "sys_acl_get_tag_type";
887 + switch (tag_type) {
888 + case SMB_ACL_USER_OBJ:
889 + COE2( store_access_in_entry,((mode >> 6) & 7, entry) );
891 + case SMB_ACL_GROUP_OBJ:
892 + /* group is only empty when identical to group perms. */
893 + if (racl->group_obj != NO_ENTRY)
895 + COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
898 +#ifndef ACLS_NEED_MASK
899 + /* mask is only empty when we don't need it. */
900 + if (racl->mask == NO_ENTRY)
903 + COE2( store_access_in_entry,((mode >> 3) & 7, entry) );
905 + case SMB_ACL_OTHER:
906 + COE2( store_access_in_entry,(mode & 7, entry) );
913 + rsyserr(FERROR, errno, "change_sacl_perms: %s()",
919 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
920 + /* Ensure that chmod() will be called to restore any lost setid bits. */
921 + if (old_mode & (S_ISUID | S_ISGID | S_ISVTX)
922 + && BITS_EQUAL(old_mode, mode, CHMOD_BITS))
923 + old_mode &= ~(S_ISUID | S_ISGID | S_ISVTX);
926 + /* Return the mode of the file on disk, as we will set them. */
927 + return (old_mode & ~ACCESSPERMS) | (mode & ACCESSPERMS);
930 +/* Set ACL on indicated filename.
932 + * This sets extended access ACL entries and default ACL. If convenient,
933 + * it sets permission bits along with the access ACL and signals having
934 + * done so by modifying sxp->st.st_mode.
936 + * Returns 1 for unchanged, 0 for changed, -1 for failed. Call this
937 + * with fname set to NULL to just check if the ACL is unchanged. */
938 +int set_acl(const char *fname, const struct file_struct *file, statx *sxp)
941 + SMB_ACL_TYPE_T type;
943 + if (!dry_run && (read_only || list_only)) {
948 + if (S_ISLNK(file->mode))
951 + type = SMB_ACL_TYPE_ACCESS;
957 + if (type == SMB_ACL_TYPE_ACCESS) {
959 + if (ndx < 0 || (size_t)ndx >= access_acl_list.count)
961 + duo_item = access_acl_list.items;
964 + && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
966 + ndx = F_DEF_ACL(file);
967 + if (ndx < 0 || (size_t)ndx >= default_acl_list.count)
969 + duo_item = default_acl_list.items;
972 + && rsync_acl_equal(sxp->def_acl, &duo_item->racl);
976 + if (!dry_run && fname) {
977 + if (type == SMB_ACL_TYPE_DEFAULT
978 + && duo_item->racl.user_obj == NO_ENTRY) {
979 + if (sys_acl_delete_def_file(fname) < 0) {
980 + rsyserr(FERROR, errno, "set_acl: sys_acl_delete_def_file(%s)",
986 + mode_t cur_mode = sxp->st.st_mode;
987 + if (!duo_item->sacl
988 + && !pack_smb_acl(&duo_item->sacl, &duo_item->racl)) {
992 + if (type == SMB_ACL_TYPE_ACCESS) {
993 + cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl,
994 + cur_mode, file->mode);
995 + if (cur_mode == (mode_t)~0)
998 + if (sys_acl_set_file(fname, type, duo_item->sacl) < 0) {
999 + rsyserr(FERROR, errno, "set_acl: sys_acl_set_file(%s, %s)",
1000 + fname, str_acl_type(type));
1004 + if (type == SMB_ACL_TYPE_ACCESS)
1005 + sxp->st.st_mode = cur_mode;
1008 + if (unchanged == 1)
1010 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
1015 +/* === Enumeration functions for uid mapping === */
1017 +/* Context -- one and only one. Should be cycled through once on uid
1018 + * mapping and once on gid mapping. */
1019 +static item_list *_enum_racl_lists[] = {
1020 + &access_acl_list, &default_acl_list, NULL
1023 +static item_list **enum_racl_list = &_enum_racl_lists[0];
1024 +static int enum_ida_index = 0;
1025 +static size_t enum_racl_index = 0;
1027 +/* This returns the next tag_type id from the given ACL for the next entry,
1028 + * or it returns 0 if there are no more tag_type ids in the acl. */
1029 +static id_t *next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
1031 + const ida_entries *idal = tag_type == SMB_ACL_USER ? &racl->users : &racl->groups;
1032 + if (enum_ida_index < idal->count) {
1033 + id_access *ida = &idal->idas[enum_ida_index++];
1036 + enum_ida_index = 0;
1040 +static id_t *next_acl_id(SMB_ACL_TAG_T tag_type, const item_list *racl_list)
1042 + for (; enum_racl_index < racl_list->count; enum_racl_index++) {
1044 + acl_duo *duo_item = racl_list->items;
1045 + duo_item += enum_racl_index;
1046 + if ((id = next_ace_id(tag_type, &duo_item->racl)) != NULL)
1049 + enum_racl_index = 0;
1053 +static id_t *next_acl_list_id(SMB_ACL_TAG_T tag_type)
1055 + for (; *enum_racl_list; enum_racl_list++) {
1056 + id_t *id = next_acl_id(tag_type, *enum_racl_list);
1060 + enum_racl_list = &_enum_racl_lists[0];
1064 +id_t *next_acl_uid()
1066 + return next_acl_list_id(SMB_ACL_USER);
1069 +id_t *next_acl_gid()
1071 + return next_acl_list_id(SMB_ACL_GROUP);
1074 +/* This is used by dest_mode(). */
1075 +int default_perms_for_dir(const char *dir)
1084 + perms = ACCESSPERMS & ~orig_umask;
1085 + /* Read the directory's default ACL. If it has none, this will successfully return an empty ACL. */
1086 + sacl = sys_acl_get_file(dir, SMB_ACL_TYPE_DEFAULT);
1087 + if (sacl == NULL) {
1088 + /* Couldn't get an ACL. Darn. */
1092 + /* No ACLs are available. */
1096 + /* We're doing a dry run, so the containing directory
1097 + * wasn't actually created. Don't worry about it. */
1100 + /* Otherwise fall through. */
1102 + rprintf(FERROR, "default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
1103 + dir, str_acl_type(SMB_ACL_TYPE_DEFAULT), strerror(errno));
1109 + racl = empty_rsync_acl;
1110 + ok = unpack_smb_acl(&racl, sacl);
1111 + sys_acl_free_acl(sacl);
1113 + rprintf(FERROR, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
1117 + /* Apply the permission-bit entries of the default ACL, if any. */
1118 + if (racl.user_obj != NO_ENTRY) {
1119 + perms = rsync_acl_get_perms(&racl);
1121 + rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
1124 + rsync_acl_free(&racl);
1128 +#endif /* SUPPORT_ACLS */
1135 +extern int preserve_acls;
1136 extern int preserve_devices;
1137 extern int preserve_specials;
1138 extern int preserve_links;
1139 @@ -92,7 +93,8 @@ path
1140 ****************************************************************************/
1141 static int make_bak_dir(char *fullpath)
1145 + struct file_struct *file;
1146 char *rel = fullpath + backup_dir_len;
1147 char *end = rel + strlen(rel);
1149 @@ -124,15 +126,24 @@ static int make_bak_dir(char *fullpath)
1151 /* Try to transfer the directory settings of the
1152 * actual dir that the files are coming from. */
1153 - if (do_stat(rel, &st) < 0) {
1154 + if (do_stat(rel, &sx.st) < 0) {
1155 rsyserr(FERROR, errno,
1156 "make_bak_dir stat %s failed",
1159 - do_lchown(fullpath, st.st_uid, st.st_gid);
1161 - do_chmod(fullpath, st.st_mode);
1162 +#ifdef SUPPORT_ACLS
1163 + sx.acc_acl = sx.def_acl = NULL;
1165 + if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
1167 +#ifdef SUPPORT_ACLS
1168 + if (preserve_acls) {
1169 + get_acl(rel, &sx);
1170 + cache_acl(file, &sx);
1173 + set_file_attrs(fullpath, file, NULL, 0);
1178 @@ -170,15 +181,18 @@ static int robust_move(const char *src,
1179 * We will move the file to be deleted into a parallel directory tree. */
1180 static int keep_backup(const char *fname)
1184 struct file_struct *file;
1189 /* return if no file to keep */
1190 - if (do_lstat(fname, &st) < 0)
1191 + if (do_lstat(fname, &sx.st) < 0)
1193 +#ifdef SUPPORT_ACLS
1194 + sx.acc_acl = sx.def_acl = NULL;
1197 if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
1198 return 1; /* the file could have disappeared */
1199 @@ -188,6 +202,13 @@ static int keep_backup(const char *fname
1203 +#ifdef SUPPORT_ACLS
1204 + if (preserve_acls) {
1205 + get_acl(fname, &sx);
1206 + cache_acl(file, &sx);
1210 /* Check to see if this is a device file, or link */
1211 if ((am_root && preserve_devices && IS_DEVICE(file->mode))
1212 || (preserve_specials && IS_SPECIAL(file->mode))) {
1213 @@ -259,7 +280,7 @@ static int keep_backup(const char *fname
1214 if (robust_move(fname, buf) != 0) {
1215 rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
1216 full_fname(fname), buf);
1217 - } else if (st.st_nlink > 1) {
1218 + } else if (sx.st.st_nlink > 1) {
1219 /* If someone has hard-linked the file into the backup
1220 * dir, rename() might return success but do nothing! */
1221 robust_unlink(fname); /* Just in case... */
1224 @@ -55,6 +55,8 @@ void setup_protocol(int f_out,int f_in)
1225 preserve_uid = ++file_extra_cnt;
1227 preserve_gid = ++file_extra_cnt;
1228 + if (preserve_acls && !am_sender)
1229 + preserve_acls = ++file_extra_cnt;
1231 if (remote_protocol == 0) {
1233 --- old/configure.in
1234 +++ new/configure.in
1235 @@ -542,6 +542,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1236 AC_CHECK_LIB(resolv, strcasecmp)
1239 +AC_CHECK_FUNCS(aclsort)
1240 +if test x"$ac_cv_func_aclsort" = x"no"; then
1241 + AC_CHECK_LIB(sec, aclsort)
1244 dnl At the moment we don't test for a broken memcmp(), because all we
1245 dnl need to do is test for equality, not comparison, and it seems that
1246 dnl every platform has a memcmp that can do at least that.
1247 @@ -806,6 +811,78 @@ AC_SUBST(OBJ_RESTORE)
1248 AC_SUBST(CC_SHOBJ_FLAG)
1249 AC_SUBST(BUILD_POPT)
1251 +AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
1252 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1253 +#################################################
1254 +# check for ACL support
1256 +AC_MSG_CHECKING(whether to support ACLs)
1257 +AC_ARG_ENABLE(acl-support,
1258 +AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
1259 +[ case "$enableval" in
1262 + case "$host_os" in
1264 + AC_MSG_RESULT(Using UnixWare ACLs)
1265 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1267 + *solaris*|*cygwin*)
1268 + AC_MSG_RESULT(Using solaris ACLs)
1269 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1272 + AC_MSG_RESULT(Using HPUX ACLs)
1273 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1276 + AC_MSG_RESULT(Using IRIX ACLs)
1277 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1280 + AC_MSG_RESULT(Using AIX ACLs)
1281 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1284 + AC_MSG_RESULT(Using Tru64 ACLs)
1285 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1286 + LIBS="$LIBS -lpacl"
1289 + AC_MSG_RESULT(ACLs requested -- running tests)
1290 + AC_CHECK_LIB(acl,acl_get_file)
1291 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1292 + AC_TRY_LINK([#include <sys/types.h>
1293 +#include <sys/acl.h>],
1294 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1295 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1296 + AC_MSG_CHECKING(ACL test results)
1297 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1298 + AC_MSG_RESULT(Using posix ACLs)
1299 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1300 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1301 + AC_TRY_LINK([#include <sys/types.h>
1302 +#include <sys/acl.h>],
1303 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1304 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1305 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1306 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1309 + AC_MSG_ERROR(Failed to find ACL support)
1316 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1319 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1323 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1328 @@ -41,6 +41,7 @@ extern int filesfrom_fd;
1329 extern int one_file_system;
1330 extern int copy_dirlinks;
1331 extern int keep_dirlinks;
1332 +extern int preserve_acls;
1333 extern int preserve_links;
1334 extern int preserve_hard_links;
1335 extern int preserve_devices;
1336 @@ -152,6 +153,8 @@ static void list_file_entry(struct file_
1337 permstring(permbuf, f->mode);
1340 + /* TODO: indicate '+' if the entry has an ACL. */
1342 #ifdef SUPPORT_LINKS
1343 if (preserve_links && S_ISLNK(f->mode)) {
1344 rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
1345 @@ -714,6 +717,12 @@ static struct file_struct *recv_file_ent
1349 +#ifdef SUPPORT_ACLS
1350 + /* We need one or two index int32s when we're preserving ACLs. */
1351 + if (preserve_acls)
1352 + extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
1355 if (always_checksum && S_ISREG(mode))
1356 extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
1358 @@ -851,6 +860,11 @@ static struct file_struct *recv_file_ent
1359 read_buf(f, bp, checksum_len);
1362 +#ifdef SUPPORT_ACLS
1363 + if (preserve_acls)
1364 + receive_acl(file, f);
1367 if (S_ISREG(mode) || S_ISLNK(mode))
1368 stats.total_size += file_length;
1370 @@ -1122,6 +1136,9 @@ static struct file_struct *send_file_nam
1371 int flags, int filter_flags)
1373 struct file_struct *file;
1374 +#ifdef SUPPORT_ACLS
1378 file = make_file(fname, flist, stp, flags, filter_flags);
1380 @@ -1130,12 +1147,26 @@ static struct file_struct *send_file_nam
1381 if (chmod_modes && !S_ISLNK(file->mode))
1382 file->mode = tweak_mode(file->mode, chmod_modes);
1384 +#ifdef SUPPORT_ACLS
1385 + if (preserve_acls && f >= 0) {
1386 + sx.st.st_mode = file->mode;
1387 + sx.acc_acl = sx.def_acl = NULL;
1388 + if (get_acl(fname, &sx) < 0)
1393 maybe_emit_filelist_progress(flist->count + flist_count_offset);
1395 flist_expand(flist);
1396 flist->files[flist->count++] = file;
1399 send_file_entry(f, file, flist->count - 1);
1400 +#ifdef SUPPORT_ACLS
1401 + if (preserve_acls)
1410 @@ -35,6 +35,7 @@ extern int do_progress;
1411 extern int relative_paths;
1412 extern int implied_dirs;
1413 extern int keep_dirlinks;
1414 +extern int preserve_acls;
1415 extern int preserve_links;
1416 extern int preserve_devices;
1417 extern int preserve_specials;
1418 @@ -89,6 +90,7 @@ extern int force_delete;
1419 extern int one_file_system;
1420 extern struct stats stats;
1421 extern dev_t filesystem_dev;
1422 +extern mode_t orig_umask;
1423 extern char *backup_dir;
1424 extern char *backup_suffix;
1425 extern int backup_suffix_len;
1426 @@ -511,22 +513,27 @@ static void do_delete_pass(struct file_l
1427 rprintf(FINFO, " \r");
1430 -int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
1431 +int unchanged_attrs(struct file_struct *file, statx *sxp)
1433 - if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1434 + if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1437 - if (am_root && preserve_uid && st->st_uid != F_UID(file))
1438 + if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
1441 - if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
1442 + if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
1445 +#ifdef SUPPORT_ACLS
1446 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1453 void itemize(struct file_struct *file, int ndx, int statret,
1454 - STRUCT_STAT *st, int32 iflags, uchar fnamecmp_type,
1455 + statx *sxp, int32 iflags, uchar fnamecmp_type,
1458 if (statret >= 0) { /* A from-dest-dir statret can == 1! */
1459 @@ -534,20 +541,24 @@ void itemize(struct file_struct *file, i
1460 : S_ISDIR(file->mode) ? !omit_dir_times
1461 : !S_ISLNK(file->mode);
1463 - if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
1464 + if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
1465 iflags |= ITEM_REPORT_SIZE;
1466 if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
1467 && !(iflags & ITEM_MATCHED)
1468 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
1469 - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
1470 + || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
1471 iflags |= ITEM_REPORT_TIME;
1472 - if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
1473 + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
1474 iflags |= ITEM_REPORT_PERMS;
1475 - if (preserve_uid && am_root && F_UID(file) != st->st_uid)
1476 + if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
1477 iflags |= ITEM_REPORT_OWNER;
1478 if (preserve_gid && F_GID(file) != GID_NONE
1479 - && st->st_gid != F_GID(file))
1480 + && sxp->st.st_gid != F_GID(file))
1481 iflags |= ITEM_REPORT_GROUP;
1482 +#ifdef SUPPORT_ACLS
1483 + if (preserve_acls && set_acl(NULL, file, sxp) == 0)
1484 + iflags |= ITEM_REPORT_ACL;
1487 iflags |= ITEM_IS_NEW;
1489 @@ -783,7 +794,7 @@ static int find_fuzzy(struct file_struct
1490 * handling the file, -1 if no dest-linking occurred, or a non-negative
1491 * value if we found an alternate basis file. */
1492 static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
1493 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1494 + char *cmpbuf, statx *sxp, int itemizing,
1497 int best_match = -1;
1498 @@ -792,7 +803,7 @@ static int try_dests_reg(struct file_str
1501 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1502 - if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
1503 + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
1505 switch (match_level) {
1507 @@ -800,16 +811,20 @@ static int try_dests_reg(struct file_str
1511 - if (!unchanged_file(cmpbuf, file, stp))
1512 + if (!unchanged_file(cmpbuf, file, &sxp->st))
1518 - if (!unchanged_attrs(file, stp))
1519 +#ifdef SUPPORT_ACLS
1520 + if (preserve_acls)
1521 + get_acl(cmpbuf, sxp);
1523 + if (!unchanged_attrs(file, sxp))
1525 if (always_checksum > 0 && preserve_times
1526 - && cmp_time(stp->st_mtime, file->modtime))
1527 + && cmp_time(sxp->st.st_mtime, file->modtime))
1531 @@ -824,7 +839,7 @@ static int try_dests_reg(struct file_str
1532 if (j != best_match) {
1534 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1535 - if (link_stat(cmpbuf, stp, 0) < 0)
1536 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1540 @@ -834,16 +849,25 @@ static int try_dests_reg(struct file_str
1541 if (!hard_link_one(file, fname, cmpbuf, 1))
1543 if (preserve_hard_links && F_IS_HLINKED(file))
1544 - finish_hard_link(file, fname, stp, itemizing, code, j);
1545 + finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
1546 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
1547 - itemize(file, ndx, 1, stp,
1548 +#ifdef SUPPORT_ACLS
1549 + if (preserve_acls && !ACL_READY(*sxp))
1550 + get_acl(fname, sxp);
1552 + itemize(file, ndx, 1, sxp,
1553 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
1559 - itemize(file, ndx, 0, stp, 0, 0, NULL);
1561 +#ifdef SUPPORT_ACLS
1562 + if (preserve_acls && !ACL_READY(*sxp))
1563 + get_acl(fname, sxp);
1565 + itemize(file, ndx, 0, sxp, 0, 0, NULL);
1567 if (verbose > 1 && maybe_ATTRS_REPORT)
1568 rprintf(FCLIENT, "%s is uptodate\n", fname);
1570 @@ -860,8 +884,13 @@ static int try_dests_reg(struct file_str
1575 - itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
1577 +#ifdef SUPPORT_ACLS
1578 + if (preserve_acls && !ACL_READY(*sxp))
1579 + get_acl(fname, sxp);
1581 + itemize(file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
1583 set_file_attrs(fname, file, NULL, 0);
1584 if (maybe_ATTRS_REPORT
1585 && ((!itemizing && verbose && match_level == 2)
1586 @@ -872,7 +901,7 @@ static int try_dests_reg(struct file_str
1588 #ifdef SUPPORT_HARD_LINKS
1589 if (preserve_hard_links && F_IS_HLINKED(file))
1590 - finish_hard_link(file, fname, stp, itemizing, code, -1);
1591 + finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
1595 @@ -884,7 +913,7 @@ static int try_dests_reg(struct file_str
1596 * handling the file, or -1 if no dest-linking occurred, or a non-negative
1597 * value if we found an alternate basis file. */
1598 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
1599 - char *cmpbuf, STRUCT_STAT *stp, int itemizing,
1600 + char *cmpbuf, statx *sxp, int itemizing,
1603 char lnk[MAXPATHLEN];
1604 @@ -917,24 +946,24 @@ static int try_dests_non(struct file_str
1607 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1608 - if (link_stat(cmpbuf, stp, 0) < 0)
1609 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1613 - if (!S_ISDIR(stp->st_mode))
1614 + if (!S_ISDIR(sxp->st.st_mode))
1618 - if (!IS_SPECIAL(stp->st_mode))
1619 + if (!IS_SPECIAL(sxp->st.st_mode))
1623 - if (!IS_DEVICE(stp->st_mode))
1624 + if (!IS_DEVICE(sxp->st.st_mode))
1627 #ifdef SUPPORT_LINKS
1629 - if (!S_ISLNK(stp->st_mode))
1630 + if (!S_ISLNK(sxp->st.st_mode))
1634 @@ -949,7 +978,7 @@ static int try_dests_non(struct file_str
1637 devp = F_RDEV_P(file);
1638 - if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1639 + if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
1642 #ifdef SUPPORT_LINKS
1643 @@ -966,7 +995,11 @@ static int try_dests_non(struct file_str
1647 - if (unchanged_attrs(file, stp)) {
1648 +#ifdef SUPPORT_ACLS
1649 + if (preserve_acls)
1650 + get_acl(cmpbuf, sxp);
1652 + if (unchanged_attrs(file, sxp)) {
1656 @@ -979,7 +1012,7 @@ static int try_dests_non(struct file_str
1657 if (j != best_match) {
1659 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
1660 - if (link_stat(cmpbuf, stp, 0) < 0)
1661 + if (link_stat(cmpbuf, &sxp->st, 0) < 0)
1665 @@ -1010,7 +1043,15 @@ static int try_dests_non(struct file_str
1667 + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
1668 char *lp = match_level == 3 ? "" : NULL;
1669 - itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
1670 +#ifdef SUPPORT_ACLS
1671 + if (preserve_acls)
1672 + get_acl(fname, sxp);
1674 + itemize(file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
1675 +#ifdef SUPPORT_ACLS
1676 + if (preserve_acls)
1680 if (verbose > 1 && maybe_ATTRS_REPORT) {
1681 rprintf(FCLIENT, "%s%s is uptodate\n",
1682 @@ -1023,6 +1064,7 @@ static int try_dests_non(struct file_str
1685 static int phase = 0;
1686 +static int dflt_perms;
1688 /* Acts on the indicated item in cur_flist whose name is fname. If a dir,
1689 * make sure it exists, and has the right permissions/timestamp info. For
1690 @@ -1043,7 +1085,8 @@ static void recv_generator(char *fname,
1691 static int need_fuzzy_dirlist = 0;
1692 struct file_struct *fuzzy_file = NULL;
1693 int fd = -1, f_copy = -1;
1694 - STRUCT_STAT st, real_st, partial_st;
1695 + statx sx, real_sx;
1696 + STRUCT_STAT partial_st;
1697 struct file_struct *back_file = NULL;
1698 int statret, real_ret, stat_errno;
1699 char *fnamecmp, *partialptr, *backupptr = NULL;
1700 @@ -1088,6 +1131,9 @@ static void recv_generator(char *fname,
1704 +#ifdef SUPPORT_ACLS
1705 + sx.acc_acl = sx.def_acl = NULL;
1708 if (fuzzy_dirlist) {
1709 flist_free(fuzzy_dirlist);
1710 @@ -1100,7 +1146,7 @@ static void recv_generator(char *fname,
1711 const char *dn = file->dirname ? file->dirname : ".";
1712 if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
1713 if (relative_paths && !implied_dirs
1714 - && do_stat(dn, &st) < 0
1715 + && do_stat(dn, &sx.st) < 0
1716 && create_directory_path(fname) < 0) {
1717 rsyserr(FERROR, errno,
1718 "recv_generator: mkdir %s failed",
1719 @@ -1112,6 +1158,10 @@ static void recv_generator(char *fname,
1722 need_fuzzy_dirlist = 1;
1723 +#ifdef SUPPORT_ACLS
1724 + if (!preserve_perms)
1725 + dflt_perms = default_perms_for_dir(dn);
1728 parent_dirname = dn;
1730 @@ -1121,7 +1171,7 @@ static void recv_generator(char *fname,
1731 need_fuzzy_dirlist = 0;
1734 - statret = link_stat(fname, &st,
1735 + statret = link_stat(fname, &sx.st,
1736 keep_dirlinks && S_ISDIR(file->mode));
1739 @@ -1149,8 +1199,8 @@ static void recv_generator(char *fname,
1740 * file of that name and it is *not* a directory, then
1741 * we need to delete it. If it doesn't exist, then
1742 * (perhaps recursively) create it. */
1743 - if (statret == 0 && !S_ISDIR(st.st_mode)) {
1744 - if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
1745 + if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
1746 + if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
1750 @@ -1159,7 +1209,7 @@ static void recv_generator(char *fname,
1757 if (*fname == '.' && fname[1] == '\0')
1759 @@ -1170,7 +1220,7 @@ static void recv_generator(char *fname,
1762 if (statret != 0 && basis_dir[0] != NULL) {
1763 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1764 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1768 @@ -1179,7 +1229,11 @@ static void recv_generator(char *fname,
1771 if (itemizing && f_out != -1) {
1772 - itemize(file, ndx, statret, &st,
1773 +#ifdef SUPPORT_ACLS
1774 + if (preserve_acls && statret == 0)
1775 + get_acl(fname, &sx);
1777 + itemize(file, ndx, statret, &sx,
1778 statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
1780 if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
1781 @@ -1193,38 +1247,39 @@ static void recv_generator(char *fname,
1782 "*** Skipping any contents from this failed directory ***\n");
1783 missing_below = F_DEPTH(file);
1784 file->flags |= FLAG_MISSING_DIR;
1789 - if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
1790 + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, 0)
1791 && verbose && code != FNONE && f_out != -1)
1792 rprintf(code, "%s/\n", fname);
1793 if (real_ret != 0 && one_file_system)
1794 - real_st.st_dev = filesystem_dev;
1795 + real_sx.st.st_dev = filesystem_dev;
1797 if (one_file_system) {
1798 uint32 *devp = F_DIRDEV_P(file);
1799 - DEV_MAJOR(devp) = major(real_st.st_dev);
1800 - DEV_MINOR(devp) = minor(real_st.st_dev);
1801 + DEV_MAJOR(devp) = major(real_sx.st.st_dev);
1802 + DEV_MINOR(devp) = minor(real_sx.st.st_dev);
1805 else if (delete_during && f_out != -1 && !phase && dry_run < 2
1806 && (file->flags & FLAG_XFER_DIR))
1807 - delete_in_dir(cur_flist, fname, file, &real_st.st_dev);
1809 + delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev);
1813 /* If we're not preserving permissions, change the file-list's
1814 * mode based on the local permissions and some heuristics. */
1815 if (!preserve_perms) {
1816 - int exists = statret == 0 && !S_ISDIR(st.st_mode);
1817 - file->mode = dest_mode(file->mode, st.st_mode, exists);
1818 + int exists = statret == 0 && !S_ISDIR(sx.st.st_mode);
1819 + file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
1823 #ifdef SUPPORT_HARD_LINKS
1824 if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
1825 - && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
1827 + && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
1831 if (preserve_links && S_ISLNK(file->mode)) {
1832 @@ -1244,28 +1299,28 @@ static void recv_generator(char *fname,
1833 char lnk[MAXPATHLEN];
1836 - if (!S_ISLNK(st.st_mode))
1837 + if (!S_ISLNK(sx.st.st_mode))
1839 else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
1840 && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
1841 /* The link is pointing to the right place. */
1843 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1844 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1845 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1846 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1847 #ifdef SUPPORT_HARD_LINKS
1848 if (preserve_hard_links && F_IS_HLINKED(file))
1849 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1850 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1852 if (remove_source_files == 1)
1853 goto return_with_success;
1857 /* Not the right symlink (or not a symlink), so
1859 - if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
1861 + if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
1863 } else if (basis_dir[0] != NULL) {
1864 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1865 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1868 #ifndef CAN_HARDLINK_SYMLINK
1869 @@ -1274,7 +1329,7 @@ static void recv_generator(char *fname,
1878 @@ -1282,7 +1337,7 @@ static void recv_generator(char *fname,
1880 #ifdef SUPPORT_HARD_LINKS
1881 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
1885 if (do_symlink(sl, fname) != 0) {
1886 rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
1887 @@ -1290,7 +1345,7 @@ static void recv_generator(char *fname,
1889 set_file_attrs(fname, file, NULL, 0);
1891 - itemize(file, ndx, statret, &st,
1892 + itemize(file, ndx, statret, &sx,
1893 ITEM_LOCAL_CHANGE, 0, NULL);
1895 if (code != FNONE && verbose)
1896 @@ -1306,7 +1361,7 @@ static void recv_generator(char *fname,
1897 goto return_with_success;
1904 if ((am_root && preserve_devices && IS_DEVICE(file->mode))
1905 @@ -1316,33 +1371,38 @@ static void recv_generator(char *fname,
1908 if (IS_DEVICE(file->mode)) {
1909 - if (!IS_DEVICE(st.st_mode))
1910 + if (!IS_DEVICE(sx.st.st_mode))
1914 - if (!IS_SPECIAL(st.st_mode))
1915 + if (!IS_SPECIAL(sx.st.st_mode))
1920 - && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
1921 - && st.st_rdev == rdev) {
1922 + && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
1923 + && sx.st.st_rdev == rdev) {
1924 /* The device or special file is identical. */
1926 - itemize(file, ndx, 0, &st, 0, 0, NULL);
1927 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
1929 +#ifdef SUPPORT_ACLS
1930 + if (preserve_acls)
1931 + get_acl(fname, &sx);
1933 + itemize(file, ndx, 0, &sx, 0, 0, NULL);
1935 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
1936 #ifdef SUPPORT_HARD_LINKS
1937 if (preserve_hard_links && F_IS_HLINKED(file))
1938 - finish_hard_link(file, fname, &st, itemizing, code, -1);
1939 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
1941 if (remove_source_files == 1)
1942 goto return_with_success;
1946 - if (delete_item(fname, st.st_mode, t, del_opts) != 0)
1948 + if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
1950 } else if (basis_dir[0] != NULL) {
1951 - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
1952 + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
1955 #ifndef CAN_HARDLINK_SPECIAL
1956 @@ -1351,7 +1411,7 @@ static void recv_generator(char *fname,
1965 @@ -1359,7 +1419,7 @@ static void recv_generator(char *fname,
1967 #ifdef SUPPORT_HARD_LINKS
1968 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
1973 rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
1974 @@ -1372,7 +1432,11 @@ static void recv_generator(char *fname,
1976 set_file_attrs(fname, file, NULL, 0);
1978 - itemize(file, ndx, statret, &st,
1979 +#ifdef SUPPORT_ACLS
1980 + if (preserve_acls && statret == 0)
1981 + get_acl(fname, &sx);
1983 + itemize(file, ndx, statret, &sx,
1984 ITEM_LOCAL_CHANGE, 0, NULL);
1986 if (code != FNONE && verbose)
1987 @@ -1384,14 +1448,14 @@ static void recv_generator(char *fname,
1988 if (remove_source_files == 1)
1989 goto return_with_success;
1995 if (!S_ISREG(file->mode)) {
1997 fname = f_name(file, NULL);
1998 rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
2003 if (max_size > 0 && F_LENGTH(file) > max_size) {
2004 @@ -1400,7 +1464,7 @@ static void recv_generator(char *fname,
2005 fname = f_name(file, NULL);
2006 rprintf(FINFO, "%s is over max-size\n", fname);
2011 if (min_size > 0 && F_LENGTH(file) < min_size) {
2013 @@ -1408,39 +1472,39 @@ static void recv_generator(char *fname,
2014 fname = f_name(file, NULL);
2015 rprintf(FINFO, "%s is under min-size\n", fname);
2021 if (ignore_existing > 0 && statret == 0) {
2023 rprintf(FINFO, "%s exists\n", fname);
2028 if (update_only > 0 && statret == 0
2029 - && cmp_time(st.st_mtime, file->modtime) > 0) {
2030 + && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
2032 rprintf(FINFO, "%s is newer\n", fname);
2038 fnamecmp_type = FNAMECMP_FNAME;
2040 - if (statret == 0 && !S_ISREG(st.st_mode)) {
2041 - if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
2043 + if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
2044 + if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
2047 stat_errno = ENOENT;
2050 if (statret != 0 && basis_dir[0] != NULL) {
2051 - int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
2052 + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
2055 if (remove_source_files == 1)
2056 goto return_with_success;
2061 fnamecmp = fnamecmpbuf;
2062 @@ -1450,7 +1514,7 @@ static void recv_generator(char *fname,
2069 if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
2070 && link_stat(partialptr, &partial_st, 0) == 0
2071 @@ -1469,7 +1533,7 @@ static void recv_generator(char *fname,
2072 rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
2073 fname, fnamecmpbuf);
2075 - st.st_size = F_LENGTH(fuzzy_file);
2076 + sx.st.st_size = F_LENGTH(fuzzy_file);
2078 fnamecmp = fnamecmpbuf;
2079 fnamecmp_type = FNAMECMP_FUZZY;
2080 @@ -1479,45 +1543,50 @@ static void recv_generator(char *fname,
2082 #ifdef SUPPORT_HARD_LINKS
2083 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
2087 if (stat_errno == ENOENT)
2089 rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
2095 - if (append_mode > 0 && st.st_size > F_LENGTH(file))
2097 + if (append_mode > 0 && sx.st.st_size > F_LENGTH(file))
2100 if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
2102 else if (fnamecmp_type == FNAMECMP_FUZZY)
2104 - else if (unchanged_file(fnamecmp, file, &st)) {
2105 + else if (unchanged_file(fnamecmp, file, &sx.st)) {
2107 do_unlink(partialptr);
2108 handle_partial_dir(partialptr, PDIR_DELETE);
2111 - itemize(file, ndx, statret, &st, 0, 0, NULL);
2112 - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
2114 +#ifdef SUPPORT_ACLS
2115 + if (preserve_acls && statret == 0)
2116 + get_acl(fnamecmp, &sx);
2118 + itemize(file, ndx, statret, &sx, 0, 0, NULL);
2120 + set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
2121 #ifdef SUPPORT_HARD_LINKS
2122 if (preserve_hard_links && F_IS_HLINKED(file))
2123 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2124 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2126 if (remove_source_files != 1)
2129 return_with_success:
2131 send_msg_int(MSG_SUCCESS, ndx);
2139 + sx.st = partial_st;
2140 fnamecmp = partialptr;
2141 fnamecmp_type = FNAMECMP_PARTIAL_DIR;
2143 @@ -1542,16 +1611,20 @@ static void recv_generator(char *fname,
2144 /* pretend the file didn't exist */
2145 #ifdef SUPPORT_HARD_LINKS
2146 if (preserve_hard_links && F_HLINK_NOT_LAST(file))
2150 statret = real_ret = -1;
2151 +#ifdef SUPPORT_ACLS
2152 + if (preserve_acls && ACL_READY(sx))
2158 if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
2159 if (!(backupptr = get_backup_name(fname))) {
2164 if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
2166 @@ -1562,7 +1635,7 @@ static void recv_generator(char *fname,
2167 full_fname(backupptr));
2168 unmake_file(back_file);
2173 if ((f_copy = do_open(backupptr,
2174 O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
2175 @@ -1570,14 +1643,14 @@ static void recv_generator(char *fname,
2176 full_fname(backupptr));
2177 unmake_file(back_file);
2182 fnamecmp_type = FNAMECMP_BACKUP;
2186 rprintf(FINFO, "gen mapped %s of size %.0f\n",
2187 - fnamecmp, (double)st.st_size);
2188 + fnamecmp, (double)sx.st.st_size);
2192 @@ -1601,26 +1674,34 @@ static void recv_generator(char *fname,
2193 iflags |= ITEM_BASIS_TYPE_FOLLOWS;
2194 if (fnamecmp_type == FNAMECMP_FUZZY)
2195 iflags |= ITEM_XNAME_FOLLOWS;
2196 - itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
2197 +#ifdef SUPPORT_ACLS
2198 + if (preserve_acls && real_ret == 0)
2199 + get_acl(fnamecmp, &real_sx);
2201 + itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
2202 fuzzy_file ? fuzzy_file->basename : NULL);
2203 +#ifdef SUPPORT_ACLS
2204 + if (preserve_acls)
2205 + free_acl(&real_sx);
2210 #ifdef SUPPORT_HARD_LINKS
2211 if (preserve_hard_links && F_IS_HLINKED(file))
2212 - finish_hard_link(file, fname, &st, itemizing, code, -1);
2213 + finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
2222 if (statret != 0 || whole_file) {
2223 write_sum_head(f_out, NULL);
2228 - generate_and_send_sums(fd, st.st_size, f_out, f_copy);
2229 + generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy);
2233 @@ -1633,6 +1714,13 @@ static void recv_generator(char *fname,
2239 +#ifdef SUPPORT_ACLS
2240 + if (preserve_acls)
2246 static void touch_up_dirs(struct file_list *flist, int ndx)
2247 @@ -1803,6 +1891,8 @@ void generate_files(int f_out, const cha
2248 * notice that and let us know via the redo pipe (or its closing). */
2251 + dflt_perms = (ACCESSPERMS & ~orig_umask);
2254 if (inc_recurse && delete_during && cur_flist->ndx_start) {
2255 struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
2258 @@ -26,6 +26,7 @@ extern int verbose;
2260 extern int do_xfers;
2261 extern int link_dest;
2262 +extern int preserve_acls;
2263 extern int make_backups;
2264 extern int protocol_version;
2265 extern int remove_source_files;
2266 @@ -267,15 +268,19 @@ void match_hard_links(void)
2269 static int maybe_hard_link(struct file_struct *file, int ndx,
2270 - const char *fname, int statret, STRUCT_STAT *stp,
2271 + const char *fname, int statret, statx *sxp,
2272 const char *oldname, STRUCT_STAT *old_stp,
2273 const char *realname, int itemizing, enum logcode code)
2276 - if (stp->st_dev == old_stp->st_dev
2277 - && stp->st_ino == old_stp->st_ino) {
2278 + if (sxp->st.st_dev == old_stp->st_dev
2279 + && sxp->st.st_ino == old_stp->st_ino) {
2281 - itemize(file, ndx, statret, stp,
2282 +#ifdef SUPPORT_ACLS
2283 + if (preserve_acls && !ACL_READY(*sxp))
2284 + get_acl(fname, sxp);
2286 + itemize(file, ndx, statret, sxp,
2287 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
2290 @@ -296,7 +301,11 @@ static int maybe_hard_link(struct file_s
2292 if (hard_link_one(file, fname, oldname, 0)) {
2294 - itemize(file, ndx, statret, stp,
2295 +#ifdef SUPPORT_ACLS
2296 + if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
2297 + get_acl(fname, sxp);
2299 + itemize(file, ndx, statret, sxp,
2300 ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
2303 @@ -310,7 +319,7 @@ static int maybe_hard_link(struct file_s
2304 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
2305 * 0 = process the file, 1 = skip the file, -1 = error occurred. */
2306 int hard_link_check(struct file_struct *file, int ndx, const char *fname,
2307 - int statret, STRUCT_STAT *stp, int itemizing,
2308 + int statret, statx *sxp, int itemizing,
2311 STRUCT_STAT prev_st;
2312 @@ -361,18 +370,20 @@ int hard_link_check(struct file_struct *
2313 if (statret < 0 && basis_dir[0] != NULL) {
2314 /* If we match an alt-dest item, we don't output this as a change. */
2315 char cmpbuf[MAXPATHLEN];
2316 - STRUCT_STAT alt_st;
2319 +#ifdef SUPPORT_ACLS
2320 + alt_sx.acc_acl = alt_sx.def_acl = NULL;
2323 pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
2324 - if (link_stat(cmpbuf, &alt_st, 0) < 0)
2325 + if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
2328 - if (prev_st.st_dev != alt_st.st_dev
2329 - || prev_st.st_ino != alt_st.st_ino)
2330 + if (prev_st.st_dev != alt_sx.st.st_dev
2331 + || prev_st.st_ino != alt_sx.st.st_ino)
2335 if (verbose < 2 || !stdout_format_has_i) {
2338 @@ -381,16 +392,36 @@ int hard_link_check(struct file_struct *
2342 - if (!unchanged_file(cmpbuf, file, &alt_st))
2343 + if (!unchanged_file(cmpbuf, file, &alt_sx.st))
2347 - if (unchanged_attrs(file, &alt_st))
2348 +#ifdef SUPPORT_ACLS
2349 + if (preserve_acls)
2350 + get_acl(cmpbuf, &alt_sx);
2352 + if (unchanged_attrs(file, &alt_sx))
2354 } while (basis_dir[++j] != NULL);
2355 + if (statret == 1) {
2356 + sxp->st = alt_sx.st;
2357 +#ifdef SUPPORT_ACLS
2358 + if (preserve_acls) {
2359 + if (!ACL_READY(*sxp))
2360 + get_acl(cmpbuf, sxp);
2362 + sxp->acc_acl = alt_sx.acc_acl;
2363 + sxp->def_acl = alt_sx.def_acl;
2368 +#ifdef SUPPORT_ACLS
2369 + else if (preserve_acls)
2370 + free_acl(&alt_sx);
2374 - if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
2375 + if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
2376 realname, itemizing, code) < 0)
2379 @@ -425,7 +456,8 @@ void finish_hard_link(struct file_struct
2380 STRUCT_STAT *stp, int itemizing, enum logcode code,
2383 - STRUCT_STAT st, prev_st;
2386 char alt_name[MAXPATHLEN], *prev_name;
2387 const char *our_name;
2388 int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
2389 @@ -449,14 +481,24 @@ void finish_hard_link(struct file_struct
2393 +#ifdef SUPPORT_ACLS
2394 + prev_sx.acc_acl = prev_sx.def_acl = NULL;
2397 while ((ndx = prev_ndx) >= 0) {
2400 file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
2401 prev_ndx = F_HL_PREV(file);
2402 prev_name = f_name(file, NULL);
2403 - prev_statret = link_stat(prev_name, &prev_st, 0);
2404 - if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
2405 - our_name, stp, fname, itemizing, code) < 0)
2406 + prev_statret = link_stat(prev_name, &prev_sx.st, 0);
2407 + val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
2408 + our_name, stp, fname, itemizing, code);
2409 +#ifdef SUPPORT_ACLS
2410 + if (preserve_acls)
2411 + free_acl(&prev_sx);
2415 if (remove_source_files == 1 && do_xfers)
2416 send_msg_int(MSG_SUCCESS, ndx);
2417 --- old/lib/sysacls.c
2418 +++ new/lib/sysacls.c
2421 + Unix SMB/CIFS implementation.
2422 + Samba system utilities for ACL support.
2423 + Copyright (C) Jeremy Allison 2000.
2425 + This program is free software; you can redistribute it and/or modify
2426 + it under the terms of the GNU General Public License as published by
2427 + the Free Software Foundation; either version 2 of the License, or
2428 + (at your option) any later version.
2430 + This program is distributed in the hope that it will be useful,
2431 + but WITHOUT ANY WARRANTY; without even the implied warranty of
2432 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2433 + GNU General Public License for more details.
2435 + You should have received a copy of the GNU General Public License
2436 + along with this program; if not, write to the Free Software
2437 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
2441 +#include "sysacls.h" /****** ADDED ******/
2443 +#ifdef SUPPORT_ACLS
2445 +/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
2451 +void SAFE_FREE(void *mem)
2457 +char *uidtoname(uid_t uid)
2459 + static char idbuf[12];
2460 + struct passwd *pw;
2462 + if ((pw = getpwuid(uid)) == NULL) {
2463 + slprintf(idbuf, sizeof(idbuf)-1, "%ld", (long)uid);
2466 + return pw->pw_name;
2468 +/****** EXTRAS -- END ******/
2471 + This file wraps all differing system ACL interfaces into a consistent
2472 + one based on the POSIX interface. It also returns the correct errors
2473 + for older UNIX systems that don't support ACLs.
2475 + The interfaces that each ACL implementation must support are as follows :
2477 + int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2478 + int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2479 + int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
2480 + void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2481 + SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2482 + SMB_ACL_T sys_acl_get_fd(int fd)
2483 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
2484 + int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
2485 + char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
2486 + SMB_ACL_T sys_acl_init( int count)
2487 + int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2488 + int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2489 + int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2490 + int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2491 + int sys_acl_valid( SMB_ACL_T theacl )
2492 + int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2493 + int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2494 + int sys_acl_delete_def_file(const char *path)
2496 + This next one is not POSIX complient - but we *have* to have it !
2497 + More POSIX braindamage.
2499 + int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2501 + The generic POSIX free is the following call. We split this into
2502 + several different free functions as we may need to add tag info
2503 + to structures when emulating the POSIX interface.
2505 + int sys_acl_free( void *obj_p)
2507 + The calls we actually use are :
2509 + int sys_acl_free_text(char *text) - free acl_to_text
2510 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
2511 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
2515 +#if defined(HAVE_POSIX_ACLS)
2517 +/* Identity mapping - easy. */
2519 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2521 + return acl_get_entry( the_acl, entry_id, entry_p);
2524 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2526 + return acl_get_tag_type( entry_d, tag_type_p);
2529 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2531 + return acl_get_permset( entry_d, permset_p);
2534 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2536 + return acl_get_qualifier( entry_d);
2539 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2541 + return acl_get_file( path_p, type);
2544 +SMB_ACL_T sys_acl_get_fd(int fd)
2546 + return acl_get_fd(fd);
2549 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2551 + return acl_clear_perms(permset);
2554 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2556 + return acl_add_perm(permset, perm);
2559 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2561 +#if defined(HAVE_ACL_GET_PERM_NP)
2563 + * Required for TrustedBSD-based ACL implementations where
2564 + * non-POSIX.1e functions are denoted by a _np (non-portable)
2567 + return acl_get_perm_np(permset, perm);
2569 + return acl_get_perm(permset, perm);
2573 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2575 + return acl_to_text( the_acl, plen);
2578 +SMB_ACL_T sys_acl_init( int count)
2580 + return acl_init(count);
2583 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2585 + return acl_create_entry(pacl, pentry);
2588 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2590 + return acl_set_tag_type(entry, tagtype);
2593 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2595 + return acl_set_qualifier(entry, qual);
2598 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2600 + return acl_set_permset(entry, permset);
2603 +int sys_acl_valid( SMB_ACL_T theacl )
2605 + return acl_valid(theacl);
2608 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2610 + return acl_set_file(name, acltype, theacl);
2613 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2615 + return acl_set_fd(fd, theacl);
2618 +int sys_acl_delete_def_file(const char *name)
2620 + return acl_delete_def_file(name);
2623 +int sys_acl_free_text(char *text)
2625 + return acl_free(text);
2628 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2630 + return acl_free(the_acl);
2633 +int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
2635 + return acl_free(qual);
2638 +#elif defined(HAVE_TRU64_ACLS)
2640 + * The interface to DEC/Compaq Tru64 UNIX ACLs
2641 + * is based on Draft 13 of the POSIX spec which is
2642 + * slightly different from the Draft 16 interface.
2644 + * Also, some of the permset manipulation functions
2645 + * such as acl_clear_perm() and acl_add_perm() appear
2646 + * to be broken on Tru64 so we have to manipulate
2647 + * the permission bits in the permset directly.
2649 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2651 + SMB_ACL_ENTRY_T entry;
2653 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
2658 + if ((entry = acl_get_entry(the_acl)) != NULL) {
2663 + return errno ? -1 : 0;
2666 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2668 + return acl_get_tag_type( entry_d, tag_type_p);
2671 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2673 + return acl_get_permset( entry_d, permset_p);
2676 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
2678 + return acl_get_qualifier( entry_d);
2681 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
2683 + return acl_get_file((char *)path_p, type);
2686 +SMB_ACL_T sys_acl_get_fd(int fd)
2688 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
2691 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2693 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
2698 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2700 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
2705 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
2710 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2712 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
2715 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
2717 + return acl_to_text( the_acl, plen);
2720 +SMB_ACL_T sys_acl_init( int count)
2722 + return acl_init(count);
2725 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2727 + SMB_ACL_ENTRY_T entry;
2729 + if ((entry = acl_create_entry(pacl)) == NULL) {
2737 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2739 + return acl_set_tag_type(entry, tagtype);
2742 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
2744 + return acl_set_qualifier(entry, qual);
2747 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2749 + return acl_set_permset(entry, permset);
2752 +int sys_acl_valid( SMB_ACL_T theacl )
2754 + acl_entry_t entry;
2756 + return acl_valid(theacl, &entry);
2759 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2761 + return acl_set_file((char *)name, acltype, theacl);
2764 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
2766 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
2769 +int sys_acl_delete_def_file(const char *name)
2771 + return acl_delete_def_file((char *)name);
2774 +int sys_acl_free_text(char *text)
2777 + * (void) cast and explicit return 0 are for DEC UNIX
2778 + * which just #defines acl_free_text() to be free()
2780 + (void) acl_free_text(text);
2784 +int sys_acl_free_acl(SMB_ACL_T the_acl)
2786 + return acl_free(the_acl);
2789 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2791 + return acl_free_qualifier(qual, tagtype);
2794 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
2797 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
2798 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
2802 + * Note that while this code implements sufficient functionality
2803 + * to support the sys_acl_* interfaces it does not provide all
2804 + * of the semantics of the POSIX ACL interfaces.
2806 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2807 + * from a call to sys_acl_get_entry() should not be assumed to be
2808 + * valid after calling any of the following functions, which may
2809 + * reorder the entries in the ACL.
2812 + * sys_acl_set_file()
2813 + * sys_acl_set_fd()
2817 + * The only difference between Solaris and UnixWare / OpenUNIX is
2818 + * that the #defines for the ACL operations have different names
2820 +#if defined(HAVE_UNIXWARE_ACLS)
2822 +#define SETACL ACL_SET
2823 +#define GETACL ACL_GET
2824 +#define GETACLCNT ACL_CNT
2829 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2831 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2836 + if (entry_p == NULL) {
2841 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2845 + if (acl_d->next < 0) {
2850 + if (acl_d->next >= acl_d->count) {
2854 + *entry_p = &acl_d->acl[acl_d->next++];
2859 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2861 + *type_p = entry_d->a_type;
2866 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2868 + *permset_p = &entry_d->a_perm;
2873 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2875 + if (entry_d->a_type != SMB_ACL_USER
2876 + && entry_d->a_type != SMB_ACL_GROUP) {
2881 + return &entry_d->a_id;
2885 + * There is no way of knowing what size the ACL returned by
2886 + * GETACL will be unless you first call GETACLCNT which means
2887 + * making an additional system call.
2889 + * In the hope of avoiding the cost of the additional system
2890 + * call in most cases, we initially allocate enough space for
2891 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2892 + * be too small then we use GETACLCNT to find out the actual
2893 + * size, reallocate the ACL buffer, and then call GETACL again.
2896 +#define INITIAL_ACL_SIZE 16
2898 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2901 + int count; /* # of ACL entries allocated */
2902 + int naccess; /* # of access ACL entries */
2903 + int ndefault; /* # of default ACL entries */
2905 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2910 + count = INITIAL_ACL_SIZE;
2911 + if ((acl_d = sys_acl_init(count)) == NULL) {
2916 + * If there isn't enough space for the ACL entries we use
2917 + * GETACLCNT to determine the actual number of ACL entries
2918 + * reallocate and try again. This is in a loop because it
2919 + * is possible that someone else could modify the ACL and
2920 + * increase the number of entries between the call to
2921 + * GETACLCNT and the call to GETACL.
2923 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
2924 + && errno == ENOSPC) {
2926 + sys_acl_free_acl(acl_d);
2928 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
2932 + if ((acl_d = sys_acl_init(count)) == NULL) {
2938 + sys_acl_free_acl(acl_d);
2943 + * calculate the number of access and default ACL entries
2945 + * Note: we assume that the acl() system call returned a
2946 + * well formed ACL which is sorted so that all of the
2947 + * access ACL entries preceed any default ACL entries
2949 + for (naccess = 0; naccess < count; naccess++) {
2950 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2953 + ndefault = count - naccess;
2956 + * if the caller wants the default ACL we have to copy
2957 + * the entries down to the start of the acl[] buffer
2958 + * and mask out the ACL_DEFAULT flag from the type field
2960 + if (type == SMB_ACL_TYPE_DEFAULT) {
2963 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2964 + acl_d->acl[i] = acl_d->acl[j];
2965 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2968 + acl_d->count = ndefault;
2970 + acl_d->count = naccess;
2976 +SMB_ACL_T sys_acl_get_fd(int fd)
2979 + int count; /* # of ACL entries allocated */
2980 + int naccess; /* # of access ACL entries */
2982 + count = INITIAL_ACL_SIZE;
2983 + if ((acl_d = sys_acl_init(count)) == NULL) {
2987 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2988 + && errno == ENOSPC) {
2990 + sys_acl_free_acl(acl_d);
2992 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2996 + if ((acl_d = sys_acl_init(count)) == NULL) {
3002 + sys_acl_free_acl(acl_d);
3007 + * calculate the number of access ACL entries
3009 + for (naccess = 0; naccess < count; naccess++) {
3010 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
3014 + acl_d->count = naccess;
3019 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3026 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3028 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3029 + && perm != SMB_ACL_EXECUTE) {
3034 + if (permset_d == NULL) {
3039 + *permset_d |= perm;
3044 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3046 + return *permset_d & perm;
3049 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3056 + * use an initial estimate of 20 bytes per ACL entry
3057 + * when allocating memory for the text representation
3061 + maxlen = 20 * acl_d->count;
3062 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
3067 + for (i = 0; i < acl_d->count; i++) {
3068 + struct acl *ap = &acl_d->acl[i];
3077 + switch (ap->a_type) {
3079 + * for debugging purposes it's probably more
3080 + * useful to dump unknown tag types rather
3081 + * than just returning an error
3084 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
3087 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3092 + case SMB_ACL_USER:
3093 + id = uidtoname(ap->a_id);
3094 + case SMB_ACL_USER_OBJ:
3098 + case SMB_ACL_GROUP:
3099 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3100 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3106 + case SMB_ACL_GROUP_OBJ:
3110 + case SMB_ACL_OTHER:
3114 + case SMB_ACL_MASK:
3120 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3121 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3122 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3125 + /* <tag> : <qualifier> : rwx \n \0 */
3126 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3129 + * If this entry would overflow the buffer
3130 + * allocate enough additional memory for this
3131 + * entry and an estimate of another 20 bytes
3132 + * for each entry still to be processed
3134 + if ((len + nbytes) > maxlen) {
3135 + char *oldtext = text;
3137 + maxlen += nbytes + 20 * (acl_d->count - i);
3139 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3140 + SAFE_FREE(oldtext);
3146 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3147 + len += nbytes - 1;
3156 +SMB_ACL_T sys_acl_init(int count)
3166 + * note that since the definition of the structure pointed
3167 + * to by the SMB_ACL_T includes the first element of the
3168 + * acl[] array, this actually allocates an ACL with room
3169 + * for (count+1) entries
3171 + if ((a = (SMB_ACL_T)SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3176 + a->size = count + 1;
3184 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3187 + SMB_ACL_ENTRY_T entry_d;
3189 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3194 + if (acl_d->count >= acl_d->size) {
3199 + entry_d = &acl_d->acl[acl_d->count++];
3200 + entry_d->a_type = 0;
3201 + entry_d->a_id = -1;
3202 + entry_d->a_perm = 0;
3203 + *entry_p = entry_d;
3208 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3210 + switch (tag_type) {
3211 + case SMB_ACL_USER:
3212 + case SMB_ACL_USER_OBJ:
3213 + case SMB_ACL_GROUP:
3214 + case SMB_ACL_GROUP_OBJ:
3215 + case SMB_ACL_OTHER:
3216 + case SMB_ACL_MASK:
3217 + entry_d->a_type = tag_type;
3227 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3229 + if (entry_d->a_type != SMB_ACL_GROUP
3230 + && entry_d->a_type != SMB_ACL_USER) {
3235 + entry_d->a_id = *((id_t *)qual_p);
3240 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3242 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3246 + entry_d->a_perm = *permset_d;
3252 + * sort the ACL and check it for validity
3254 + * if it's a minimal ACL with only 4 entries then we
3255 + * need to recalculate the mask permissions to make
3256 + * sure that they are the same as the GROUP_OBJ
3257 + * permissions as required by the UnixWare acl() system call.
3259 + * (note: since POSIX allows minimal ACLs which only contain
3260 + * 3 entries - ie there is no mask entry - we should, in theory,
3261 + * check for this and add a mask entry if necessary - however
3262 + * we "know" that the caller of this interface always specifies
3263 + * a mask so, in practice "this never happens" (tm) - if it *does*
3264 + * happen aclsort() will fail and return an error and someone will
3265 + * have to fix it ...)
3268 +static int acl_sort(SMB_ACL_T acl_d)
3270 + int fixmask = (acl_d->count <= 4);
3272 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
3279 +int sys_acl_valid(SMB_ACL_T acl_d)
3281 + return acl_sort(acl_d);
3284 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3287 + struct acl *acl_p;
3289 + struct acl *acl_buf = NULL;
3292 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3297 + if (acl_sort(acl_d) != 0) {
3301 + acl_p = &acl_d->acl[0];
3302 + acl_count = acl_d->count;
3305 + * if it's a directory there is extra work to do
3306 + * since the acl() system call will replace both
3307 + * the access ACLs and the default ACLs (if any)
3309 + if (stat(name, &s) != 0) {
3312 + if (S_ISDIR(s.st_mode)) {
3313 + SMB_ACL_T acc_acl;
3314 + SMB_ACL_T def_acl;
3315 + SMB_ACL_T tmp_acl;
3318 + if (type == SMB_ACL_TYPE_ACCESS) {
3320 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3324 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3327 + if (tmp_acl == NULL) {
3332 + * allocate a temporary buffer for the complete ACL
3334 + acl_count = acc_acl->count + def_acl->count;
3335 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
3337 + if (acl_buf == NULL) {
3338 + sys_acl_free_acl(tmp_acl);
3344 + * copy the access control and default entries into the buffer
3346 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3347 + acc_acl->count * sizeof(acl_buf[0]));
3349 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3350 + def_acl->count * sizeof(acl_buf[0]));
3353 + * set the ACL_DEFAULT flag on the default entries
3355 + for (i = acc_acl->count; i < acl_count; i++) {
3356 + acl_buf[i].a_type |= ACL_DEFAULT;
3359 + sys_acl_free_acl(tmp_acl);
3361 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3366 + ret = acl(name, SETACL, acl_count, acl_p);
3368 + SAFE_FREE(acl_buf);
3373 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3375 + if (acl_sort(acl_d) != 0) {
3379 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
3382 +int sys_acl_delete_def_file(const char *path)
3388 + * fetching the access ACL and rewriting it has
3389 + * the effect of deleting the default ACL
3391 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3395 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
3397 + sys_acl_free_acl(acl_d);
3402 +int sys_acl_free_text(char *text)
3408 +int sys_acl_free_acl(SMB_ACL_T acl_d)
3414 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
3419 +#elif defined(HAVE_HPUX_ACLS)
3423 + * Based on the Solaris/SCO code - with modifications.
3427 + * Note that while this code implements sufficient functionality
3428 + * to support the sys_acl_* interfaces it does not provide all
3429 + * of the semantics of the POSIX ACL interfaces.
3431 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
3432 + * from a call to sys_acl_get_entry() should not be assumed to be
3433 + * valid after calling any of the following functions, which may
3434 + * reorder the entries in the ACL.
3437 + * sys_acl_set_file()
3438 + * sys_acl_set_fd()
3441 +/* This checks if the POSIX ACL system call is defined */
3442 +/* which basically corresponds to whether JFS 3.3 or */
3443 +/* higher is installed. If acl() was called when it */
3444 +/* isn't defined, it causes the process to core dump */
3445 +/* so it is important to check this and avoid acl() */
3446 +/* calls if it isn't there. */
3448 +static BOOL hpux_acl_call_presence(void)
3451 + shl_t handle = NULL;
3454 + static BOOL already_checked=0;
3456 + if(already_checked)
3460 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
3462 + if(ret_val != 0) {
3463 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
3464 + ret_val, errno, strerror(errno)));
3465 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
3469 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
3471 + already_checked = True;
3475 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3477 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3482 + if (entry_p == NULL) {
3487 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3491 + if (acl_d->next < 0) {
3496 + if (acl_d->next >= acl_d->count) {
3500 + *entry_p = &acl_d->acl[acl_d->next++];
3505 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3507 + *type_p = entry_d->a_type;
3512 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3514 + *permset_p = &entry_d->a_perm;
3519 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3521 + if (entry_d->a_type != SMB_ACL_USER
3522 + && entry_d->a_type != SMB_ACL_GROUP) {
3527 + return &entry_d->a_id;
3531 + * There is no way of knowing what size the ACL returned by
3532 + * ACL_GET will be unless you first call ACL_CNT which means
3533 + * making an additional system call.
3535 + * In the hope of avoiding the cost of the additional system
3536 + * call in most cases, we initially allocate enough space for
3537 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
3538 + * be too small then we use ACL_CNT to find out the actual
3539 + * size, reallocate the ACL buffer, and then call ACL_GET again.
3542 +#define INITIAL_ACL_SIZE 16
3544 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3547 + int count; /* # of ACL entries allocated */
3548 + int naccess; /* # of access ACL entries */
3549 + int ndefault; /* # of default ACL entries */
3551 + if(hpux_acl_call_presence() == False) {
3552 + /* Looks like we don't have the acl() system call on HPUX.
3553 + * May be the system doesn't have the latest version of JFS.
3558 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3563 + count = INITIAL_ACL_SIZE;
3564 + if ((acl_d = sys_acl_init(count)) == NULL) {
3569 + * If there isn't enough space for the ACL entries we use
3570 + * ACL_CNT to determine the actual number of ACL entries
3571 + * reallocate and try again. This is in a loop because it
3572 + * is possible that someone else could modify the ACL and
3573 + * increase the number of entries between the call to
3574 + * ACL_CNT and the call to ACL_GET.
3576 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
3578 + sys_acl_free_acl(acl_d);
3580 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
3584 + if ((acl_d = sys_acl_init(count)) == NULL) {
3590 + sys_acl_free_acl(acl_d);
3595 + * calculate the number of access and default ACL entries
3597 + * Note: we assume that the acl() system call returned a
3598 + * well formed ACL which is sorted so that all of the
3599 + * access ACL entries preceed any default ACL entries
3601 + for (naccess = 0; naccess < count; naccess++) {
3602 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
3605 + ndefault = count - naccess;
3608 + * if the caller wants the default ACL we have to copy
3609 + * the entries down to the start of the acl[] buffer
3610 + * and mask out the ACL_DEFAULT flag from the type field
3612 + if (type == SMB_ACL_TYPE_DEFAULT) {
3615 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
3616 + acl_d->acl[i] = acl_d->acl[j];
3617 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
3620 + acl_d->count = ndefault;
3622 + acl_d->count = naccess;
3628 +SMB_ACL_T sys_acl_get_fd(int fd)
3631 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
3634 + files_struct *fsp = file_find_fd(fd);
3636 + if (fsp == NULL) {
3642 + * We know we're in the same conn context. So we
3643 + * can use the relative path.
3646 + return sys_acl_get_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
3649 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3656 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3658 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3659 + && perm != SMB_ACL_EXECUTE) {
3664 + if (permset_d == NULL) {
3669 + *permset_d |= perm;
3674 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3676 + return *permset_d & perm;
3679 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3686 + * use an initial estimate of 20 bytes per ACL entry
3687 + * when allocating memory for the text representation
3691 + maxlen = 20 * acl_d->count;
3692 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
3697 + for (i = 0; i < acl_d->count; i++) {
3698 + struct acl *ap = &acl_d->acl[i];
3707 + switch (ap->a_type) {
3709 + * for debugging purposes it's probably more
3710 + * useful to dump unknown tag types rather
3711 + * than just returning an error
3714 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
3717 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3722 + case SMB_ACL_USER:
3723 + id = uidtoname(ap->a_id);
3724 + case SMB_ACL_USER_OBJ:
3728 + case SMB_ACL_GROUP:
3729 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3730 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
3736 + case SMB_ACL_GROUP_OBJ:
3740 + case SMB_ACL_OTHER:
3744 + case SMB_ACL_MASK:
3750 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3751 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3752 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3755 + /* <tag> : <qualifier> : rwx \n \0 */
3756 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3759 + * If this entry would overflow the buffer
3760 + * allocate enough additional memory for this
3761 + * entry and an estimate of another 20 bytes
3762 + * for each entry still to be processed
3764 + if ((len + nbytes) > maxlen) {
3765 + char *oldtext = text;
3767 + maxlen += nbytes + 20 * (acl_d->count - i);
3769 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
3776 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3777 + len += nbytes - 1;
3786 +SMB_ACL_T sys_acl_init(int count)
3796 + * note that since the definition of the structure pointed
3797 + * to by the SMB_ACL_T includes the first element of the
3798 + * acl[] array, this actually allocates an ACL with room
3799 + * for (count+1) entries
3801 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
3806 + a->size = count + 1;
3814 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3817 + SMB_ACL_ENTRY_T entry_d;
3819 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3824 + if (acl_d->count >= acl_d->size) {
3829 + entry_d = &acl_d->acl[acl_d->count++];
3830 + entry_d->a_type = 0;
3831 + entry_d->a_id = -1;
3832 + entry_d->a_perm = 0;
3833 + *entry_p = entry_d;
3838 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3840 + switch (tag_type) {
3841 + case SMB_ACL_USER:
3842 + case SMB_ACL_USER_OBJ:
3843 + case SMB_ACL_GROUP:
3844 + case SMB_ACL_GROUP_OBJ:
3845 + case SMB_ACL_OTHER:
3846 + case SMB_ACL_MASK:
3847 + entry_d->a_type = tag_type;
3857 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3859 + if (entry_d->a_type != SMB_ACL_GROUP
3860 + && entry_d->a_type != SMB_ACL_USER) {
3865 + entry_d->a_id = *((id_t *)qual_p);
3870 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3872 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3876 + entry_d->a_perm = *permset_d;
3881 +/* Structure to capture the count for each type of ACE. */
3883 +struct hpux_acl_types {
3887 + int n_def_user_obj;
3892 + int n_def_group_obj;
3896 + int n_def_other_obj;
3899 + int n_def_class_obj;
3901 + int n_illegal_obj;
3905 + * Counts the different number of objects in a given array of ACL
3909 + * acl_count - Count of ACLs in the array of ACL strucutres.
3910 + * aclp - Array of ACL structures.
3911 + * acl_type_count - Pointer to acl_types structure. Should already be
3915 + * acl_type_count - This structure is filled up with counts of various
3919 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
3923 + memset(acl_type_count, 0, sizeof(struct hpux_acl_types));
3925 + for(i=0;i<acl_count;i++) {
3926 + switch(aclp[i].a_type) {
3928 + acl_type_count->n_user++;
3931 + acl_type_count->n_user_obj++;
3933 + case DEF_USER_OBJ:
3934 + acl_type_count->n_def_user_obj++;
3937 + acl_type_count->n_group++;
3940 + acl_type_count->n_group_obj++;
3942 + case DEF_GROUP_OBJ:
3943 + acl_type_count->n_def_group_obj++;
3946 + acl_type_count->n_other_obj++;
3948 + case DEF_OTHER_OBJ:
3949 + acl_type_count->n_def_other_obj++;
3952 + acl_type_count->n_class_obj++;
3954 + case DEF_CLASS_OBJ:
3955 + acl_type_count->n_def_class_obj++;
3958 + acl_type_count->n_def_user++;
3961 + acl_type_count->n_def_group++;
3964 + acl_type_count->n_illegal_obj++;
3970 +/* swap_acl_entries: Swaps two ACL entries.
3972 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3975 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3977 + struct acl temp_acl;
3979 + temp_acl.a_type = aclp0->a_type;
3980 + temp_acl.a_id = aclp0->a_id;
3981 + temp_acl.a_perm = aclp0->a_perm;
3983 + aclp0->a_type = aclp1->a_type;
3984 + aclp0->a_id = aclp1->a_id;
3985 + aclp0->a_perm = aclp1->a_perm;
3987 + aclp1->a_type = temp_acl.a_type;
3988 + aclp1->a_id = temp_acl.a_id;
3989 + aclp1->a_perm = temp_acl.a_perm;
3992 +/* prohibited_duplicate_type
3993 + * Identifies if given ACL type can have duplicate entries or
3996 + * Inputs: acl_type - ACL Type.
4002 + * True - If the ACL type matches any of the prohibited types.
4003 + * False - If the ACL type doesn't match any of the prohibited types.
4006 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
4008 + switch(acl_type) {
4019 +/* get_needed_class_perm
4020 + * Returns the permissions of a ACL structure only if the ACL
4021 + * type matches one of the pre-determined types for computing
4022 + * CLASS_OBJ permissions.
4024 + * Inputs: aclp - Pointer to ACL structure.
4027 +static int hpux_get_needed_class_perm(struct acl *aclp)
4029 + switch(aclp->a_type) {
4033 + case DEF_USER_OBJ:
4035 + case DEF_GROUP_OBJ:
4037 + case DEF_CLASS_OBJ:
4038 + case DEF_OTHER_OBJ:
4039 + return aclp->a_perm;
4045 +/* acl_sort for HPUX.
4046 + * Sorts the array of ACL structures as per the description in
4047 + * aclsort man page. Refer to aclsort man page for more details
4051 + * acl_count - Count of ACLs in the array of ACL structures.
4052 + * calclass - If this is not zero, then we compute the CLASS_OBJ
4054 + * aclp - Array of ACL structures.
4058 + * aclp - Sorted array of ACL structures.
4062 + * Returns 0 for success -1 for failure. Prints a message to the Samba
4063 + * debug log in case of failure.
4066 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
4068 +#if !defined(HAVE_HPUX_ACLSORT)
4070 + * The aclsort() system call is availabe on the latest HPUX General
4071 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
4072 + * function. Because, we don't want to update to a new
4073 + * HPUX GR bundle just for aclsort() call.
4076 + struct hpux_acl_types acl_obj_count;
4077 + int n_class_obj_perm = 0;
4081 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
4085 + if(aclp == NULL) {
4086 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
4090 + /* Count different types of ACLs in the ACLs array */
4092 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
4094 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
4095 + * CLASS_OBJ and OTHER_OBJ
4098 + if( (acl_obj_count.n_user_obj != 1) ||
4099 + (acl_obj_count.n_group_obj != 1) ||
4100 + (acl_obj_count.n_class_obj != 1) ||
4101 + (acl_obj_count.n_other_obj != 1)
4103 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
4104 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
4108 + /* If any of the default objects are present, there should be only
4109 + * one of them each.
4112 + if( (acl_obj_count.n_def_user_obj > 1) || (acl_obj_count.n_def_group_obj > 1) ||
4113 + (acl_obj_count.n_def_other_obj > 1) || (acl_obj_count.n_def_class_obj > 1) ) {
4114 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
4115 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
4119 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
4122 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
4123 + * same ACL type, sort by ACL id.
4125 + * I am using the trival kind of sorting method here because, performance isn't
4126 + * really effected by the ACLs feature. More over there aren't going to be more
4127 + * than 17 entries on HPUX.
4130 + for(i=0; i<acl_count;i++) {
4131 + for (j=i+1; j<acl_count; j++) {
4132 + if( aclp[i].a_type > aclp[j].a_type ) {
4133 + /* ACL entries out of order, swap them */
4135 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4137 + } else if ( aclp[i].a_type == aclp[j].a_type ) {
4139 + /* ACL entries of same type, sort by id */
4141 + if(aclp[i].a_id > aclp[j].a_id) {
4142 + hpux_swap_acl_entries((aclp+i), (aclp+j));
4143 + } else if (aclp[i].a_id == aclp[j].a_id) {
4144 + /* We have a duplicate entry. */
4145 + if(hpux_prohibited_duplicate_type(aclp[i].a_type)) {
4146 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
4147 + aclp[i].a_type, aclp[i].a_id));
4156 + /* set the class obj permissions to the computed one. */
4158 + int n_class_obj_index = -1;
4160 + for(i=0;i<acl_count;i++) {
4161 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
4163 + if(aclp[i].a_type == CLASS_OBJ)
4164 + n_class_obj_index = i;
4166 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
4171 + return aclsort(acl_count, calclass, aclp);
4176 + * sort the ACL and check it for validity
4178 + * if it's a minimal ACL with only 4 entries then we
4179 + * need to recalculate the mask permissions to make
4180 + * sure that they are the same as the GROUP_OBJ
4181 + * permissions as required by the UnixWare acl() system call.
4183 + * (note: since POSIX allows minimal ACLs which only contain
4184 + * 3 entries - ie there is no mask entry - we should, in theory,
4185 + * check for this and add a mask entry if necessary - however
4186 + * we "know" that the caller of this interface always specifies
4187 + * a mask so, in practice "this never happens" (tm) - if it *does*
4188 + * happen aclsort() will fail and return an error and someone will
4189 + * have to fix it ...)
4192 +static int acl_sort(SMB_ACL_T acl_d)
4194 + int fixmask = (acl_d->count <= 4);
4196 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
4203 +int sys_acl_valid(SMB_ACL_T acl_d)
4205 + return acl_sort(acl_d);
4208 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4211 + struct acl *acl_p;
4213 + struct acl *acl_buf = NULL;
4216 + if(hpux_acl_call_presence() == False) {
4217 + /* Looks like we don't have the acl() system call on HPUX.
4218 + * May be the system doesn't have the latest version of JFS.
4224 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
4229 + if (acl_sort(acl_d) != 0) {
4233 + acl_p = &acl_d->acl[0];
4234 + acl_count = acl_d->count;
4237 + * if it's a directory there is extra work to do
4238 + * since the acl() system call will replace both
4239 + * the access ACLs and the default ACLs (if any)
4241 + if (stat(name, &s) != 0) {
4244 + if (S_ISDIR(s.st_mode)) {
4245 + SMB_ACL_T acc_acl;
4246 + SMB_ACL_T def_acl;
4247 + SMB_ACL_T tmp_acl;
4250 + if (type == SMB_ACL_TYPE_ACCESS) {
4252 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
4256 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
4259 + if (tmp_acl == NULL) {
4264 + * allocate a temporary buffer for the complete ACL
4266 + acl_count = acc_acl->count + def_acl->count;
4267 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
4269 + if (acl_buf == NULL) {
4270 + sys_acl_free_acl(tmp_acl);
4276 + * copy the access control and default entries into the buffer
4278 + memcpy(&acl_buf[0], &acc_acl->acl[0],
4279 + acc_acl->count * sizeof(acl_buf[0]));
4281 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
4282 + def_acl->count * sizeof(acl_buf[0]));
4285 + * set the ACL_DEFAULT flag on the default entries
4287 + for (i = acc_acl->count; i < acl_count; i++) {
4288 + acl_buf[i].a_type |= ACL_DEFAULT;
4291 + sys_acl_free_acl(tmp_acl);
4293 + } else if (type != SMB_ACL_TYPE_ACCESS) {
4298 + ret = acl(name, ACL_SET, acl_count, acl_p);
4307 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4310 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
4313 + files_struct *fsp = file_find_fd(fd);
4315 + if (fsp == NULL) {
4320 + if (acl_sort(acl_d) != 0) {
4325 + * We know we're in the same conn context. So we
4326 + * can use the relative path.
4329 + return sys_acl_set_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS, acl_d);
4332 +int sys_acl_delete_def_file(const char *path)
4338 + * fetching the access ACL and rewriting it has
4339 + * the effect of deleting the default ACL
4341 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
4345 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
4347 + sys_acl_free_acl(acl_d);
4352 +int sys_acl_free_text(char *text)
4358 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4364 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4369 +#elif defined(HAVE_IRIX_ACLS)
4371 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4373 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
4378 + if (entry_p == NULL) {
4383 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
4387 + if (acl_d->next < 0) {
4392 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
4396 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
4401 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
4403 + *type_p = entry_d->ae_tag;
4408 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4410 + *permset_p = entry_d;
4415 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
4417 + if (entry_d->ae_tag != SMB_ACL_USER
4418 + && entry_d->ae_tag != SMB_ACL_GROUP) {
4423 + return &entry_d->ae_id;
4426 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
4430 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4434 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
4439 + a->freeaclp = True;
4443 +SMB_ACL_T sys_acl_get_fd(int fd)
4447 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
4451 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
4456 + a->freeaclp = True;
4460 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
4462 + permset_d->ae_perm = 0;
4467 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4469 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
4470 + && perm != SMB_ACL_EXECUTE) {
4475 + if (permset_d == NULL) {
4480 + permset_d->ae_perm |= perm;
4485 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
4487 + return permset_d->ae_perm & perm;
4490 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
4492 + return acl_to_text(acl_d->aclp, len_p);
4495 +SMB_ACL_T sys_acl_init(int count)
4504 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
4510 + a->freeaclp = False;
4511 + a->aclp = (struct acl *)(&a->aclp + sizeof(struct acl *));
4512 + a->aclp->acl_cnt = 0;
4518 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
4521 + SMB_ACL_ENTRY_T entry_d;
4523 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
4528 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
4533 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
4534 + entry_d->ae_tag = 0;
4535 + entry_d->ae_id = 0;
4536 + entry_d->ae_perm = 0;
4537 + *entry_p = entry_d;
4542 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
4544 + switch (tag_type) {
4545 + case SMB_ACL_USER:
4546 + case SMB_ACL_USER_OBJ:
4547 + case SMB_ACL_GROUP:
4548 + case SMB_ACL_GROUP_OBJ:
4549 + case SMB_ACL_OTHER:
4550 + case SMB_ACL_MASK:
4551 + entry_d->ae_tag = tag_type;
4561 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
4563 + if (entry_d->ae_tag != SMB_ACL_GROUP
4564 + && entry_d->ae_tag != SMB_ACL_USER) {
4569 + entry_d->ae_id = *((id_t *)qual_p);
4574 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
4576 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
4580 + entry_d->ae_perm = permset_d->ae_perm;
4585 +int sys_acl_valid(SMB_ACL_T acl_d)
4587 + return acl_valid(acl_d->aclp);
4590 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
4592 + return acl_set_file(name, type, acl_d->aclp);
4595 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
4597 + return acl_set_fd(fd, acl_d->aclp);
4600 +int sys_acl_delete_def_file(const char *name)
4602 + return acl_delete_def_file(name);
4605 +int sys_acl_free_text(char *text)
4607 + return acl_free(text);
4610 +int sys_acl_free_acl(SMB_ACL_T acl_d)
4612 + if (acl_d->freeaclp) {
4613 + acl_free(acl_d->aclp);
4619 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4624 +#elif defined(HAVE_AIX_ACLS)
4626 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
4628 +int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
4630 + struct acl_entry_link *link;
4631 + struct new_acl_entry *entry;
4634 + DEBUG(10,("This is the count: %d\n",theacl->count));
4636 + /* Check if count was previously set to -1. *
4637 + * If it was, that means we reached the end *
4638 + * of the acl last time. */
4639 + if(theacl->count == -1)
4643 + /* To get to the next acl, traverse linked list until index *
4644 + * of acl matches the count we are keeping. This count is *
4645 + * incremented each time we return an acl entry. */
4647 + for(keep_going = 0; keep_going < theacl->count; keep_going++)
4648 + link = link->nextp;
4650 + entry = *entry_p = link->entryp;
4652 + DEBUG(10,("*entry_p is %d\n",entry_p));
4653 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
4655 + /* Increment count */
4657 + if(link->nextp == NULL)
4658 + theacl->count = -1;
4663 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
4665 + /* Initialize tag type */
4668 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
4670 + /* Depending on what type of entry we have, *
4671 + * return tag type. */
4672 + switch(entry_d->ace_id->id_type) {
4674 + *tag_type_p = SMB_ACL_USER;
4677 + *tag_type_p = SMB_ACL_GROUP;
4680 + case SMB_ACL_USER_OBJ:
4681 + case SMB_ACL_GROUP_OBJ:
4682 + case SMB_ACL_OTHER:
4683 + *tag_type_p = entry_d->ace_id->id_type;
4693 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
4695 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
4696 + *permset_p = &entry_d->ace_access;
4697 + DEBUG(10,("**permset_p is %d\n",**permset_p));
4698 + if(!(**permset_p & S_IXUSR) &&
4699 + !(**permset_p & S_IWUSR) &&
4700 + !(**permset_p & S_IRUSR) &&
4701 + (**permset_p != 0))
4704 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
4708 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
4710 + return(entry_d->ace_id->id_data);
4713 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
4715 + struct acl *file_acl = (struct acl *)NULL;
4716 + struct acl_entry *acl_entry;
4717 + struct new_acl_entry *new_acl_entry;
4718 + struct ace_id *idp;
4719 + struct acl_entry_link *acl_entry_link;
4720 + struct acl_entry_link *acl_entry_link_head;
4725 + /* AIX has no DEFAULT */
4726 + if ( type == SMB_ACL_TYPE_DEFAULT ) {
4731 + /* Get the acl using statacl */
4733 + DEBUG(10,("Entering sys_acl_get_file\n"));
4734 + DEBUG(10,("path_p is %s\n",path_p));
4736 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4738 + if(file_acl == NULL) {
4740 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
4744 + memset(file_acl,0,BUFSIZ);
4746 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
4748 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
4749 + SAFE_FREE(file_acl);
4753 + DEBUG(10,("Got facl and returned it\n"));
4755 + /* Point to the first acl entry in the acl */
4756 + acl_entry = file_acl->acl_ext;
4758 + /* Begin setting up the head of the linked list *
4759 + * that will be used for the storing the acl *
4760 + * in a way that is useful for the posix_acls.c *
4763 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4764 + if(acl_entry_link_head == NULL)
4767 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4768 + if(acl_entry_link->entryp == NULL) {
4769 + SAFE_FREE(file_acl);
4771 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4775 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4776 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4778 + /* Check if the extended acl bit is on. *
4779 + * If it isn't, do not show the *
4780 + * contents of the acl since AIX intends *
4781 + * the extended info to remain unused */
4783 + if(file_acl->acl_mode & S_IXACL){
4784 + /* while we are not pointing to the very end */
4785 + while(acl_entry < acl_last(file_acl)) {
4786 + /* before we malloc anything, make sure this is */
4787 + /* a valid acl entry and one that we want to map */
4788 + idp = id_nxt(acl_entry->ace_id);
4789 + if((acl_entry->ace_type == ACC_SPECIFY ||
4790 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4791 + acl_entry = acl_nxt(acl_entry);
4795 + idp = acl_entry->ace_id;
4797 + /* Check if this is the first entry in the linked list. *
4798 + * The first entry needs to keep prevp pointing to NULL *
4799 + * and already has entryp allocated. */
4801 + if(acl_entry_link_head->count != 0) {
4802 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4804 + if(acl_entry_link->nextp == NULL) {
4805 + SAFE_FREE(file_acl);
4807 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4811 + acl_entry_link->nextp->prevp = acl_entry_link;
4812 + acl_entry_link = acl_entry_link->nextp;
4813 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4814 + if(acl_entry_link->entryp == NULL) {
4815 + SAFE_FREE(file_acl);
4817 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4820 + acl_entry_link->nextp = NULL;
4823 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4825 + /* Don't really need this since all types are going *
4826 + * to be specified but, it's better than leaving it 0 */
4828 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4830 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4832 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof(struct ace_id));
4834 + /* The access in the acl entries must be left shifted by *
4835 + * three bites, because they will ultimately be compared *
4836 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4838 + switch(acl_entry->ace_type){
4841 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4842 + acl_entry_link->entryp->ace_access <<= 6;
4843 + acl_entry_link_head->count++;
4846 + /* Since there is no way to return a DENY acl entry *
4847 + * change to PERMIT and then shift. */
4848 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4849 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4850 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4851 + acl_entry_link->entryp->ace_access <<= 6;
4852 + acl_entry_link_head->count++;
4858 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4859 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4861 + acl_entry = acl_nxt(acl_entry);
4863 + } /* end of if enabled */
4865 + /* Since owner, group, other acl entries are not *
4866 + * part of the acl entries in an acl, they must *
4867 + * be dummied up to become part of the list. */
4869 + for( i = 1; i < 4; i++) {
4870 + DEBUG(10,("i is %d\n",i));
4871 + if(acl_entry_link_head->count != 0) {
4872 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4873 + if(acl_entry_link->nextp == NULL) {
4874 + SAFE_FREE(file_acl);
4876 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4880 + acl_entry_link->nextp->prevp = acl_entry_link;
4881 + acl_entry_link = acl_entry_link->nextp;
4882 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4883 + if(acl_entry_link->entryp == NULL) {
4884 + SAFE_FREE(file_acl);
4886 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4891 + acl_entry_link->nextp = NULL;
4893 + new_acl_entry = acl_entry_link->entryp;
4894 + idp = new_acl_entry->ace_id;
4896 + new_acl_entry->ace_len = sizeof(struct acl_entry);
4897 + new_acl_entry->ace_type = ACC_PERMIT;
4898 + idp->id_len = sizeof(struct ace_id);
4899 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4900 + memset(idp->id_data,0,sizeof(uid_t));
4904 + new_acl_entry->ace_access = file_acl->g_access << 6;
4905 + idp->id_type = SMB_ACL_GROUP_OBJ;
4909 + new_acl_entry->ace_access = file_acl->o_access << 6;
4910 + idp->id_type = SMB_ACL_OTHER;
4914 + new_acl_entry->ace_access = file_acl->u_access << 6;
4915 + idp->id_type = SMB_ACL_USER_OBJ;
4923 + acl_entry_link_head->count++;
4924 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4927 + acl_entry_link_head->count = 0;
4928 + SAFE_FREE(file_acl);
4930 + return(acl_entry_link_head);
4933 +SMB_ACL_T sys_acl_get_fd(int fd)
4935 + struct acl *file_acl = (struct acl *)NULL;
4936 + struct acl_entry *acl_entry;
4937 + struct new_acl_entry *new_acl_entry;
4938 + struct ace_id *idp;
4939 + struct acl_entry_link *acl_entry_link;
4940 + struct acl_entry_link *acl_entry_link_head;
4945 + /* Get the acl using fstatacl */
4947 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4948 + DEBUG(10,("fd is %d\n",fd));
4949 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4951 + if(file_acl == NULL) {
4953 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4957 + memset(file_acl,0,BUFSIZ);
4959 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4961 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4962 + SAFE_FREE(file_acl);
4966 + DEBUG(10,("Got facl and returned it\n"));
4968 + /* Point to the first acl entry in the acl */
4970 + acl_entry = file_acl->acl_ext;
4971 + /* Begin setting up the head of the linked list *
4972 + * that will be used for the storing the acl *
4973 + * in a way that is useful for the posix_acls.c *
4976 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4977 + if(acl_entry_link_head == NULL){
4978 + SAFE_FREE(file_acl);
4982 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4984 + if(acl_entry_link->entryp == NULL) {
4986 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4987 + SAFE_FREE(file_acl);
4991 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4992 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4994 + /* Check if the extended acl bit is on. *
4995 + * If it isn't, do not show the *
4996 + * contents of the acl since AIX intends *
4997 + * the extended info to remain unused */
4999 + if(file_acl->acl_mode & S_IXACL){
5000 + /* while we are not pointing to the very end */
5001 + while(acl_entry < acl_last(file_acl)) {
5002 + /* before we malloc anything, make sure this is */
5003 + /* a valid acl entry and one that we want to map */
5005 + idp = id_nxt(acl_entry->ace_id);
5006 + if((acl_entry->ace_type == ACC_SPECIFY ||
5007 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
5008 + acl_entry = acl_nxt(acl_entry);
5012 + idp = acl_entry->ace_id;
5014 + /* Check if this is the first entry in the linked list. *
5015 + * The first entry needs to keep prevp pointing to NULL *
5016 + * and already has entryp allocated. */
5018 + if(acl_entry_link_head->count != 0) {
5019 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
5020 + if(acl_entry_link->nextp == NULL) {
5022 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
5023 + SAFE_FREE(file_acl);
5026 + acl_entry_link->nextp->prevp = acl_entry_link;
5027 + acl_entry_link = acl_entry_link->nextp;
5028 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
5029 + if(acl_entry_link->entryp == NULL) {
5031 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
5032 + SAFE_FREE(file_acl);
5036 + acl_entry_link->nextp = NULL;
5039 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
5041 + /* Don't really need this since all types are going *
5042 + * to be specified but, it's better than leaving it 0 */
5044 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
5045 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
5047 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof(struct ace_id));
5049 + /* The access in the acl entries must be left shifted by *
5050 + * three bites, because they will ultimately be compared *
5051 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
5053 + switch(acl_entry->ace_type){
5056 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
5057 + acl_entry_link->entryp->ace_access <<= 6;
5058 + acl_entry_link_head->count++;
5061 + /* Since there is no way to return a DENY acl entry *
5062 + * change to PERMIT and then shift. */
5063 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
5064 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
5065 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
5066 + acl_entry_link->entryp->ace_access <<= 6;
5067 + acl_entry_link_head->count++;
5073 + DEBUG(10,("acl_entry = %d\n",acl_entry));
5074 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
5076 + acl_entry = acl_nxt(acl_entry);
5078 + } /* end of if enabled */
5080 + /* Since owner, group, other acl entries are not *
5081 + * part of the acl entries in an acl, they must *
5082 + * be dummied up to become part of the list. */
5084 + for( i = 1; i < 4; i++) {
5085 + DEBUG(10,("i is %d\n",i));
5086 + if(acl_entry_link_head->count != 0){
5087 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
5088 + if(acl_entry_link->nextp == NULL) {
5090 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
5091 + SAFE_FREE(file_acl);
5095 + acl_entry_link->nextp->prevp = acl_entry_link;
5096 + acl_entry_link = acl_entry_link->nextp;
5097 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
5099 + if(acl_entry_link->entryp == NULL) {
5100 + SAFE_FREE(file_acl);
5102 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
5107 + acl_entry_link->nextp = NULL;
5109 + new_acl_entry = acl_entry_link->entryp;
5110 + idp = new_acl_entry->ace_id;
5112 + new_acl_entry->ace_len = sizeof(struct acl_entry);
5113 + new_acl_entry->ace_type = ACC_PERMIT;
5114 + idp->id_len = sizeof(struct ace_id);
5115 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
5116 + memset(idp->id_data,0,sizeof(uid_t));
5120 + new_acl_entry->ace_access = file_acl->g_access << 6;
5121 + idp->id_type = SMB_ACL_GROUP_OBJ;
5125 + new_acl_entry->ace_access = file_acl->o_access << 6;
5126 + idp->id_type = SMB_ACL_OTHER;
5130 + new_acl_entry->ace_access = file_acl->u_access << 6;
5131 + idp->id_type = SMB_ACL_USER_OBJ;
5138 + acl_entry_link_head->count++;
5139 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
5142 + acl_entry_link_head->count = 0;
5143 + SAFE_FREE(file_acl);
5145 + return(acl_entry_link_head);
5148 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
5150 + *permset = *permset & ~0777;
5154 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5157 + (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
5161 + DEBUG(10,("This is the permset now: %d\n",*permset));
5165 +char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
5170 +SMB_ACL_T sys_acl_init( int count)
5172 + struct acl_entry_link *theacl = NULL;
5174 + DEBUG(10,("Entering sys_acl_init\n"));
5176 + theacl = SMB_MALLOC_P(struct acl_entry_link);
5177 + if(theacl == NULL) {
5179 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
5183 + theacl->count = 0;
5184 + theacl->nextp = NULL;
5185 + theacl->prevp = NULL;
5186 + theacl->entryp = NULL;
5187 + DEBUG(10,("Exiting sys_acl_init\n"));
5191 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
5193 + struct acl_entry_link *theacl;
5194 + struct acl_entry_link *acl_entryp;
5195 + struct acl_entry_link *temp_entry;
5198 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
5200 + theacl = acl_entryp = *pacl;
5202 + /* Get to the end of the acl before adding entry */
5204 + for(counting=0; counting < theacl->count; counting++){
5205 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5206 + temp_entry = acl_entryp;
5207 + acl_entryp = acl_entryp->nextp;
5210 + if(theacl->count != 0){
5211 + temp_entry->nextp = acl_entryp = SMB_MALLOC_P(struct acl_entry_link);
5212 + if(acl_entryp == NULL) {
5214 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5218 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
5219 + acl_entryp->prevp = temp_entry;
5220 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
5223 + *pentry = acl_entryp->entryp = SMB_MALLOC_P(struct new_acl_entry);
5224 + if(*pentry == NULL) {
5226 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
5230 + memset(*pentry,0,sizeof(struct new_acl_entry));
5231 + acl_entryp->entryp->ace_len = sizeof(struct acl_entry);
5232 + acl_entryp->entryp->ace_type = ACC_PERMIT;
5233 + acl_entryp->entryp->ace_id->id_len = sizeof(struct ace_id);
5234 + acl_entryp->nextp = NULL;
5236 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
5240 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
5242 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
5243 + entry->ace_id->id_type = tagtype;
5244 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
5245 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
5248 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
5250 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
5251 + memcpy(entry->ace_id->id_data,qual,sizeof(uid_t));
5252 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
5256 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
5258 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
5259 + if(!(*permset & S_IXUSR) &&
5260 + !(*permset & S_IWUSR) &&
5261 + !(*permset & S_IRUSR) &&
5265 + entry->ace_access = *permset;
5266 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
5267 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
5271 +int sys_acl_valid( SMB_ACL_T theacl )
5274 + int group_obj = 0;
5275 + int other_obj = 0;
5276 + struct acl_entry_link *acl_entry;
5278 + for(acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
5279 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
5280 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
5281 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
5284 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
5286 + if(user_obj != 1 || group_obj != 1 || other_obj != 1)
5292 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
5294 + struct acl_entry_link *acl_entry_link = NULL;
5295 + struct acl *file_acl = NULL;
5296 + struct acl *file_acl_temp = NULL;
5297 + struct acl_entry *acl_entry = NULL;
5298 + struct ace_id *ace_id = NULL;
5305 + DEBUG(10,("Entering sys_acl_set_file\n"));
5306 + DEBUG(10,("File name is %s\n",name));
5308 + /* AIX has no default ACL */
5309 + if(acltype == SMB_ACL_TYPE_DEFAULT)
5312 + acl_length = BUFSIZ;
5313 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5315 + if(file_acl == NULL) {
5317 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5321 + memset(file_acl,0,BUFSIZ);
5323 + file_acl->acl_len = ACL_SIZ;
5324 + file_acl->acl_mode = S_IXACL;
5326 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5327 + acl_entry_link->entryp->ace_access >>= 6;
5328 + id_type = acl_entry_link->entryp->ace_id->id_type;
5331 + case SMB_ACL_USER_OBJ:
5332 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5334 + case SMB_ACL_GROUP_OBJ:
5335 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5337 + case SMB_ACL_OTHER:
5338 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5340 + case SMB_ACL_MASK:
5344 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5345 + acl_length += sizeof(struct acl_entry);
5346 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5347 + if(file_acl_temp == NULL) {
5348 + SAFE_FREE(file_acl);
5350 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
5354 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5355 + SAFE_FREE(file_acl);
5356 + file_acl = file_acl_temp;
5359 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5360 + file_acl->acl_len += sizeof(struct acl_entry);
5361 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5362 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5364 + /* In order to use this, we'll need to wait until we can get denies */
5365 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5366 + acl_entry->ace_type = ACC_SPECIFY; */
5368 + acl_entry->ace_type = ACC_SPECIFY;
5370 + ace_id = acl_entry->ace_id;
5372 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5373 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5374 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5375 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5376 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof(uid_t));
5379 + rc = chacl(name,file_acl,file_acl->acl_len);
5380 + DEBUG(10,("errno is %d\n",errno));
5381 + DEBUG(10,("return code is %d\n",rc));
5382 + SAFE_FREE(file_acl);
5383 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
5387 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
5389 + struct acl_entry_link *acl_entry_link = NULL;
5390 + struct acl *file_acl = NULL;
5391 + struct acl *file_acl_temp = NULL;
5392 + struct acl_entry *acl_entry = NULL;
5393 + struct ace_id *ace_id = NULL;
5399 + DEBUG(10,("Entering sys_acl_set_fd\n"));
5400 + acl_length = BUFSIZ;
5401 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
5403 + if(file_acl == NULL) {
5405 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5409 + memset(file_acl,0,BUFSIZ);
5411 + file_acl->acl_len = ACL_SIZ;
5412 + file_acl->acl_mode = S_IXACL;
5414 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
5415 + acl_entry_link->entryp->ace_access >>= 6;
5416 + id_type = acl_entry_link->entryp->ace_id->id_type;
5417 + DEBUG(10,("The id_type is %d\n",id_type));
5420 + case SMB_ACL_USER_OBJ:
5421 + file_acl->u_access = acl_entry_link->entryp->ace_access;
5423 + case SMB_ACL_GROUP_OBJ:
5424 + file_acl->g_access = acl_entry_link->entryp->ace_access;
5426 + case SMB_ACL_OTHER:
5427 + file_acl->o_access = acl_entry_link->entryp->ace_access;
5429 + case SMB_ACL_MASK:
5433 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
5434 + acl_length += sizeof(struct acl_entry);
5435 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
5436 + if(file_acl_temp == NULL) {
5437 + SAFE_FREE(file_acl);
5439 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
5443 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
5444 + SAFE_FREE(file_acl);
5445 + file_acl = file_acl_temp;
5448 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
5449 + file_acl->acl_len += sizeof(struct acl_entry);
5450 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
5451 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
5453 + /* In order to use this, we'll need to wait until we can get denies */
5454 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
5455 + acl_entry->ace_type = ACC_SPECIFY; */
5457 + acl_entry->ace_type = ACC_SPECIFY;
5459 + ace_id = acl_entry->ace_id;
5461 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
5462 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
5463 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
5464 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
5465 + memcpy(ace_id->id_data, &user_id, sizeof(uid_t));
5468 + rc = fchacl(fd,file_acl,file_acl->acl_len);
5469 + DEBUG(10,("errno is %d\n",errno));
5470 + DEBUG(10,("return code is %d\n",rc));
5471 + SAFE_FREE(file_acl);
5472 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
5476 +int sys_acl_delete_def_file(const char *name)
5478 + /* AIX has no default ACL */
5482 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5484 + return(*permset & perm);
5487 +int sys_acl_free_text(char *text)
5492 +int sys_acl_free_acl(SMB_ACL_T posix_acl)
5494 + struct acl_entry_link *acl_entry_link;
5496 + for(acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
5497 + SAFE_FREE(acl_entry_link->prevp->entryp);
5498 + SAFE_FREE(acl_entry_link->prevp);
5501 + SAFE_FREE(acl_entry_link->prevp->entryp);
5502 + SAFE_FREE(acl_entry_link->prevp);
5503 + SAFE_FREE(acl_entry_link->entryp);
5504 + SAFE_FREE(acl_entry_link);
5509 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
5514 +#else /* No ACLs. */
5516 +int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
5522 +int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
5528 +int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
5534 +void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
5540 +SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
5543 + return (SMB_ACL_T)NULL;
5546 +SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
5549 + return (SMB_ACL_T)NULL;
5552 +int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
5558 +int sys_acl_add_perm( UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
5564 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
5567 + return (permset & perm) ? 1 : 0;
5570 +char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
5576 +int sys_acl_free_text(UNUSED(char *text))
5582 +SMB_ACL_T sys_acl_init(UNUSED(int count))
5588 +int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
5594 +int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
5600 +int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
5606 +int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
5612 +int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
5618 +int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
5624 +int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
5630 +int sys_acl_delete_def_file(UNUSED(const char *name))
5636 +int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
5642 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
5648 +#endif /* No ACLs. */
5650 +/************************************************************************
5651 + Deliberately outside the ACL defines. Return 1 if this is a "no acls"
5653 +************************************************************************/
5655 +int no_acl_syscall_error(int err)
5657 +#if defined(ENOSYS)
5658 + if (err == ENOSYS) {
5662 +#if defined(ENOTSUP)
5663 + if (err == ENOTSUP) {
5670 +#endif /* SUPPORT_ACLS */
5671 --- old/lib/sysacls.h
5672 +++ new/lib/sysacls.h
5674 +#ifdef SUPPORT_ACLS
5676 +#ifdef HAVE_SYS_ACL_H
5677 +#include <sys/acl.h>
5679 +#ifdef HAVE_ACL_LIBACL_H
5680 +#include <acl/libacl.h>
5682 +#include "smb_acls.h"
5684 +#define SMB_MALLOC(cnt) new_array(char, cnt)
5685 +#define SMB_MALLOC_P(obj) new_array(obj, 1)
5686 +#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
5687 +#define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt)
5688 +#define slprintf snprintf
5690 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
5691 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
5692 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
5693 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d);
5694 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type);
5695 +SMB_ACL_T sys_acl_get_fd(int fd);
5696 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
5697 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5698 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
5699 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen);
5700 +SMB_ACL_T sys_acl_init(int count);
5701 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
5702 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype);
5703 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual);
5704 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset);
5705 +int sys_acl_valid(SMB_ACL_T theacl);
5706 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
5707 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl);
5708 +int sys_acl_delete_def_file(const char *name);
5709 +int sys_acl_free_text(char *text);
5710 +int sys_acl_free_acl(SMB_ACL_T the_acl);
5711 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
5713 +#endif /* SUPPORT_ACLS */
5716 @@ -624,8 +624,10 @@ static void log_formatted(enum logcode c
5717 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
5718 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
5719 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
5722 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
5723 + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
5724 + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
5727 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
5728 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
5731 @@ -46,6 +46,7 @@ int copy_dirlinks = 0;
5733 int preserve_links = 0;
5734 int preserve_hard_links = 0;
5735 +int preserve_acls = 0;
5736 int preserve_perms = 0;
5737 int preserve_executability = 0;
5738 int preserve_devices = 0;
5739 @@ -198,6 +199,7 @@ static void print_rsync_version(enum log
5740 char const *got_socketpair = "no ";
5741 char const *have_inplace = "no ";
5742 char const *hardlinks = "no ";
5743 + char const *acls = "no ";
5744 char const *links = "no ";
5745 char const *ipv6 = "no ";
5746 STRUCT_STAT *dumstat;
5747 @@ -214,6 +216,10 @@ static void print_rsync_version(enum log
5751 +#ifdef SUPPORT_ACLS
5755 #ifdef SUPPORT_LINKS
5758 @@ -232,8 +238,8 @@ static void print_rsync_version(enum log
5759 (int)(sizeof (int64) * 8));
5760 rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
5761 got_socketpair, hardlinks, links, ipv6, have_inplace);
5762 - rprintf(f, " %sappend\n",
5764 + rprintf(f, " %sappend, %sACLs\n",
5765 + have_inplace, acls);
5767 #ifdef MAINTAINER_MODE
5768 rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
5769 @@ -279,7 +285,7 @@ void usage(enum logcode F)
5770 rprintf(F," -q, --quiet suppress non-error messages\n");
5771 rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
5772 rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
5773 - rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n");
5774 + rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n");
5775 rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
5776 rprintf(F," -r, --recursive recurse into directories\n");
5777 rprintf(F," -R, --relative use relative path names\n");
5778 @@ -301,6 +307,9 @@ void usage(enum logcode F)
5779 rprintf(F," -p, --perms preserve permissions\n");
5780 rprintf(F," -E, --executability preserve the file's executability\n");
5781 rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
5782 +#ifdef SUPPORT_ACLS
5783 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
5785 rprintf(F," -o, --owner preserve owner (super-user only)\n");
5786 rprintf(F," -g, --group preserve group\n");
5787 rprintf(F," --devices preserve device files (super-user only)\n");
5788 @@ -421,6 +430,9 @@ static struct poptOption long_options[]
5789 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5790 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
5791 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
5792 + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
5793 + {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5794 + {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
5795 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
5796 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5797 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
5798 @@ -1092,6 +1104,24 @@ int parse_arguments(int *argc, const cha
5803 +#ifdef SUPPORT_ACLS
5804 + preserve_acls = 1;
5805 + preserve_perms = 1;
5808 + /* FIXME: this should probably be ignored with a
5809 + * warning and then countermeasures taken to
5810 + * restrict group and other access in the presence
5811 + * of any more restrictive ACLs, but this is safe
5813 + snprintf(err_buf,sizeof(err_buf),
5814 + "ACLs are not supported on this %s\n",
5815 + am_server ? "server" : "client");
5821 /* A large opt value means that set_refuse_options()
5822 * turned this option off. */
5823 @@ -1555,6 +1585,10 @@ void server_options(char **args,int *arg
5825 else if (preserve_executability && am_sender)
5827 +#ifdef SUPPORT_ACLS
5828 + if (preserve_acls)
5829 + argstr[x++] = 'A';
5833 if (always_checksum)
5836 @@ -47,6 +47,7 @@ extern int keep_partial;
5837 extern int checksum_seed;
5839 extern int delay_updates;
5840 +extern mode_t orig_umask;
5841 extern struct stats stats;
5842 extern char *tmpdir;
5843 extern char *partial_dir;
5844 @@ -347,6 +348,10 @@ int recv_files(int f_in, char *local_nam
5845 int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
5846 enum logcode log_code = log_before_transfer ? FLOG : FINFO;
5847 int max_phase = protocol_version >= 29 ? 2 : 1;
5848 + int dflt_perms = (ACCESSPERMS & ~orig_umask);
5849 +#ifdef SUPPORT_ACLS
5850 + const char *parent_dirname = "";
5855 @@ -562,7 +567,16 @@ int recv_files(int f_in, char *local_nam
5856 * mode based on the local permissions and some heuristics. */
5857 if (!preserve_perms) {
5858 int exists = fd1 != -1;
5859 - file->mode = dest_mode(file->mode, st.st_mode, exists);
5860 +#ifdef SUPPORT_ACLS
5861 + const char *dn = file->dirname ? file->dirname : ".";
5862 + if (parent_dirname != dn
5863 + && strcmp(parent_dirname, dn) != 0) {
5864 + dflt_perms = default_perms_for_dir(dn);
5865 + parent_dirname = dn;
5868 + file->mode = dest_mode(file->mode, st.st_mode,
5869 + dflt_perms, exists);
5872 /* We now check to see if we are writing the file "inplace" */
5879 +extern int preserve_acls;
5880 extern int preserve_perms;
5881 extern int preserve_executability;
5882 extern int preserve_times;
5883 @@ -49,7 +50,6 @@ extern int inplace;
5884 extern int flist_eof;
5885 extern int keep_dirlinks;
5886 extern int make_backups;
5887 -extern mode_t orig_umask;
5888 extern struct file_list *cur_flist, *first_flist, *dir_flist;
5889 extern struct chmod_mode_struct *daemon_chmod_modes;
5891 @@ -203,7 +203,8 @@ void free_sums(struct sum_struct *s)
5893 /* This is only called when we aren't preserving permissions. Figure out what
5894 * the permissions should be and return them merged back into the mode. */
5895 -mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists)
5896 +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
5900 /* If the file already exists, we'll return the local permissions,
5901 @@ -220,56 +221,65 @@ mode_t dest_mode(mode_t flist_mode, mode
5902 new_mode |= (new_mode & 0444) >> 2;
5905 - /* Apply the umask and turn off special permissions. */
5906 - new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask));
5907 + /* Apply destination default permissions and turn
5908 + * off special permissions. */
5909 + new_mode = flist_mode & (~CHMOD_BITS | dflt_perms);
5914 -int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
5915 +int set_file_attrs(char *fname, struct file_struct *file, statx *sxp,
5921 int change_uid, change_gid;
5922 mode_t new_mode = file->mode;
5928 - if (link_stat(fname, &st2, 0) < 0) {
5929 + if (link_stat(fname, &sx2.st, 0) < 0) {
5930 rsyserr(FERROR, errno, "stat %s failed",
5935 +#ifdef SUPPORT_ACLS
5936 + sx2.acc_acl = sx2.def_acl = NULL;
5938 if (!preserve_perms && S_ISDIR(new_mode)
5939 - && st->st_mode & S_ISGID) {
5940 + && sx2.st.st_mode & S_ISGID) {
5941 /* We just created this directory and its setgid
5942 * bit is on, so make sure it stays on. */
5943 new_mode |= S_ISGID;
5948 - if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
5949 +#ifdef SUPPORT_ACLS
5950 + if (preserve_acls && !ACL_READY(*sxp))
5951 + get_acl(fname, sxp);
5954 + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
5955 flags |= ATTRS_SKIP_MTIME;
5956 if (!(flags & ATTRS_SKIP_MTIME)
5957 - && cmp_time(st->st_mtime, file->modtime) != 0) {
5958 - int ret = set_modtime(fname, file->modtime, st->st_mode);
5959 + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
5960 + int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
5962 rsyserr(FERROR, errno, "failed to set times on %s",
5967 if (ret == 0) /* ret == 1 if symlink could not be set */
5971 - change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
5972 + change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
5973 change_gid = preserve_gid && F_GID(file) != GID_NONE
5974 - && st->st_gid != F_GID(file);
5975 + && sxp->st.st_gid != F_GID(file);
5976 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
5977 - if (S_ISLNK(st->st_mode))
5978 + if (S_ISLNK(sxp->st.st_mode))
5982 @@ -279,45 +289,57 @@ int set_file_attrs(char *fname, struct f
5984 "set uid of %s from %ld to %ld\n",
5986 - (long)st->st_uid, (long)F_UID(file));
5987 + (long)sxp->st.st_uid, (long)F_UID(file));
5991 "set gid of %s from %ld to %ld\n",
5993 - (long)st->st_gid, (long)F_GID(file));
5994 + (long)sxp->st.st_gid, (long)F_GID(file));
5997 if (do_lchown(fname,
5998 - change_uid ? F_UID(file) : st->st_uid,
5999 - change_gid ? F_GID(file) : st->st_gid) != 0) {
6000 + change_uid ? F_UID(file) : sxp->st.st_uid,
6001 + change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
6002 /* shouldn't have attempted to change uid or gid
6003 * unless have the privilege */
6004 rsyserr(FERROR, errno, "%s %s failed",
6005 change_uid ? "chown" : "chgrp",
6010 /* a lchown had been done - we have to re-stat if the
6011 * destination had the setuid or setgid bits set due
6012 * to the side effect of the chown call */
6013 - if (st->st_mode & (S_ISUID | S_ISGID)) {
6014 - link_stat(fname, st,
6015 - keep_dirlinks && S_ISDIR(st->st_mode));
6016 + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) {
6017 + link_stat(fname, &sxp->st,
6018 + keep_dirlinks && S_ISDIR(sxp->st.st_mode));
6023 if (daemon_chmod_modes && !S_ISLNK(new_mode))
6024 new_mode = tweak_mode(new_mode, daemon_chmod_modes);
6026 +#ifdef SUPPORT_ACLS
6027 + /* It's OK to call set_acl() now, even for a dir, as the generator
6028 + * will enable owner-writability using chmod, if necessary.
6030 + * If set_acl() changes permission bits in the process of setting
6031 + * an access ACL, it changes sxp->st.st_mode so we know whether we
6032 + * need to chmod(). */
6033 + if (preserve_acls && set_acl(fname, file, sxp) == 0)
6038 - if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
6039 + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
6040 int ret = do_chmod(fname, new_mode);
6042 rsyserr(FERROR, errno,
6043 "failed to set permissions on %s",
6048 if (ret == 0) /* ret == 1 if symlink could not be set */
6050 @@ -330,6 +352,11 @@ int set_file_attrs(char *fname, struct f
6052 rprintf(FCLIENT, "%s is uptodate\n", fname);
6055 +#ifdef SUPPORT_ACLS
6056 + if (preserve_acls && sxp == &sx2)
6064 @@ -547,6 +547,14 @@ struct idev_node {
6065 #define IN_LOOPBACKNET 127
6068 +#ifndef HAVE_NO_ACLS
6069 +#define SUPPORT_ACLS 1
6072 +#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
6073 +#define ACLS_NEED_MASK 1
6076 #define GID_NONE ((gid_t)-1)
6079 @@ -566,6 +574,7 @@ struct file_struct {
6080 extern int file_extra_cnt;
6081 extern int preserve_uid;
6082 extern int preserve_gid;
6083 +extern int preserve_acls;
6085 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
6086 #define EXTRA_LEN (sizeof (union file_extras))
6087 @@ -598,10 +607,12 @@ extern int preserve_gid;
6088 /* When the associated option is on, all entries will have these present: */
6089 #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
6090 #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
6091 +#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
6093 /* These items are per-entry optional and mutally exclusive: */
6094 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
6095 #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
6096 +#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
6097 #define F_DIRDEV_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + 2 - 1)->unum)
6098 #define F_DIRNODE_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + 3 - 1)->num)
6100 @@ -753,6 +764,17 @@ struct stats {
6102 struct chmod_mode_struct;
6104 +#define EMPTY_ITEM_LIST {NULL, 0, 0}
6112 +#define EXPAND_ITEM_LIST(lp, type, incr) \
6113 + (type*)expand_item_list(lp, sizeof (type), #type, incr)
6115 #include "byteorder.h"
6116 #include "lib/mdfour.h"
6117 #include "lib/wildmatch.h"
6118 @@ -771,6 +793,16 @@ struct chmod_mode_struct;
6119 #define NORETURN __attribute__((__noreturn__))
6124 +#ifdef SUPPORT_ACLS
6125 + struct rsync_acl *acc_acl; /* access ACL */
6126 + struct rsync_acl *def_acl; /* default ACL */
6130 +#define ACL_READY(sx) ((sx).acc_acl != NULL)
6134 /* We have replacement versions of these if they're missing. */
6137 @@ -301,7 +301,7 @@ to the detailed description below for a
6138 -q, --quiet suppress non-error messages
6139 --no-motd suppress daemon-mode MOTD (see caveat)
6140 -c, --checksum skip based on checksum, not mod-time & size
6141 - -a, --archive archive mode; same as -rlptgoD (no -H)
6142 + -a, --archive archive mode; same as -rlptgoD (no -H, -A)
6143 --no-OPTION turn off an implied OPTION (e.g. --no-D)
6144 -r, --recursive recurse into directories
6145 -R, --relative use relative path names
6146 @@ -323,6 +323,7 @@ to the detailed description below for a
6147 -p, --perms preserve permissions
6148 -E, --executability preserve executability
6149 --chmod=CHMOD affect file and/or directory permissions
6150 + -A, --acls preserve ACLs (implies -p) [non-standard]
6151 -o, --owner preserve owner (super-user only)
6152 -g, --group preserve group
6153 --devices preserve device files (super-user only)
6154 @@ -771,7 +772,9 @@ quote(itemization(
6155 permissions, though the bf(--executability) option might change just
6156 the execute permission for the file.
6157 it() New files get their "normal" permission bits set to the source
6158 - file's permissions masked with the receiving end's umask setting, and
6159 + file's permissions masked with the receiving directory's default
6160 + permissions (either the receiving process's umask, or the permissions
6161 + specified via the destination directory's default ACL), and
6162 their special permission bits disabled except in the case where a new
6163 directory inherits a setgid bit from its parent directory.
6165 @@ -802,9 +805,11 @@ The preservation of the destination's se
6166 directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
6167 versions erroneously preserved the three special permission bits for
6168 newly-created files when bf(--perms) was off, while overriding the
6169 -destination's setgid bit setting on a newly-created directory. (Keep in
6170 -mind that it is the version of the receiving rsync that affects this
6172 +destination's setgid bit setting on a newly-created directory. Default ACL
6173 +observance was added to the ACL patch for rsync 2.6.7, so older (or
6174 +non-ACL-enabled) rsyncs use the umask even if default ACLs are present.
6175 +(Keep in mind that it is the version of the receiving rsync that affects
6178 dit(bf(-E, --executability)) This option causes rsync to preserve the
6179 executability (or non-executability) of regular files when bf(--perms) is
6180 @@ -822,6 +827,14 @@ quote(itemization(
6182 If bf(--perms) is enabled, this option is ignored.
6184 +dit(bf(-A, --acls)) This option causes rsync to update the destination
6185 +ACLs to be the same as the source ACLs. This nonstandard option only
6186 +works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
6188 +The ACL-sending protocol used by this version was first introduced in
6189 +the patch that was shipped with 2.6.8. Sending ACLs to an older version
6190 +of the ACL patch is not supported.
6192 dit(bf(--chmod)) This option tells rsync to apply one or more
6193 comma-separated "chmod" strings to the permission of the files in the
6194 transfer. The resulting value is treated as though it was the permissions
6195 @@ -1432,8 +1445,8 @@ if the receiving rsync is at least versi
6196 with older versions of rsync, but that also turns on the output of other
6199 -The "%i" escape has a cryptic output that is 9 letters long. The general
6200 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
6201 +The "%i" escape has a cryptic output that is 11 letters long. The general
6202 +format is like the string bf(YXcstpoguax), where bf(Y) is replaced by the
6203 type of update being done, bf(X) is replaced by the file-type, and the
6204 other letters represent attributes that may be output if they are being
6206 @@ -1482,7 +1495,11 @@ quote(itemization(
6207 sender's value (requires bf(--owner) and super-user privileges).
6208 it() A bf(g) means the group is different and is being updated to the
6209 sender's value (requires bf(--group) and the authority to set the group).
6210 - it() The bf(z) slot is reserved for future use.
6211 + it() The bf(u) slot is reserved for reporting update (access) time changes
6212 + (a feature that is not yet released).
6213 + it() The bf(a) means that the ACL information changed.
6214 + it() The bf(x) slot is reserved for reporting extended attribute changes
6215 + (a feature that is not yet released).
6218 One other output is possible: when deleting files, the "%i" will output
6223 + Unix SMB/Netbios implementation.
6225 + Portable SMB ACL interface
6226 + Copyright (C) Jeremy Allison 2000
6228 + This program is free software; you can redistribute it and/or modify
6229 + it under the terms of the GNU General Public License as published by
6230 + the Free Software Foundation; either version 2 of the License, or
6231 + (at your option) any later version.
6233 + This program is distributed in the hope that it will be useful,
6234 + but WITHOUT ANY WARRANTY; without even the implied warranty of
6235 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6236 + GNU General Public License for more details.
6238 + You should have received a copy of the GNU General Public License
6239 + along with this program; if not, write to the Free Software
6240 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
6243 +#ifndef _SMB_ACLS_H
6244 +#define _SMB_ACLS_H
6246 +#if defined HAVE_POSIX_ACLS
6248 +/* This is an identity mapping (just remove the SMB_). */
6250 +#define SMB_ACL_TAG_T acl_tag_t
6251 +#define SMB_ACL_TYPE_T acl_type_t
6252 +#define SMB_ACL_PERMSET_T acl_permset_t
6253 +#define SMB_ACL_PERM_T acl_perm_t
6254 +#define SMB_ACL_READ ACL_READ
6255 +#define SMB_ACL_WRITE ACL_WRITE
6256 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6258 +/* Types of ACLs. */
6259 +#define SMB_ACL_USER ACL_USER
6260 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6261 +#define SMB_ACL_GROUP ACL_GROUP
6262 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6263 +#define SMB_ACL_OTHER ACL_OTHER
6264 +#define SMB_ACL_MASK ACL_MASK
6266 +#define SMB_ACL_T acl_t
6268 +#define SMB_ACL_ENTRY_T acl_entry_t
6270 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
6271 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
6273 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6274 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6276 +#elif defined HAVE_TRU64_ACLS
6278 +/* This is for DEC/Compaq Tru64 UNIX */
6280 +#define SMB_ACL_TAG_T acl_tag_t
6281 +#define SMB_ACL_TYPE_T acl_type_t
6282 +#define SMB_ACL_PERMSET_T acl_permset_t
6283 +#define SMB_ACL_PERM_T acl_perm_t
6284 +#define SMB_ACL_READ ACL_READ
6285 +#define SMB_ACL_WRITE ACL_WRITE
6286 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6288 +/* Types of ACLs. */
6289 +#define SMB_ACL_USER ACL_USER
6290 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6291 +#define SMB_ACL_GROUP ACL_GROUP
6292 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6293 +#define SMB_ACL_OTHER ACL_OTHER
6294 +#define SMB_ACL_MASK ACL_MASK
6296 +#define SMB_ACL_T acl_t
6298 +#define SMB_ACL_ENTRY_T acl_entry_t
6300 +#define SMB_ACL_FIRST_ENTRY 0
6301 +#define SMB_ACL_NEXT_ENTRY 1
6303 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6304 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6306 +#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS
6308 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
6309 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
6312 +/* SVR4.2 ES/MP ACLs */
6313 +typedef int SMB_ACL_TAG_T;
6314 +typedef int SMB_ACL_TYPE_T;
6315 +typedef ushort *SMB_ACL_PERMSET_T;
6316 +typedef ushort SMB_ACL_PERM_T;
6317 +#define SMB_ACL_READ 4
6318 +#define SMB_ACL_WRITE 2
6319 +#define SMB_ACL_EXECUTE 1
6321 +/* Types of ACLs. */
6322 +#define SMB_ACL_USER USER
6323 +#define SMB_ACL_USER_OBJ USER_OBJ
6324 +#define SMB_ACL_GROUP GROUP
6325 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6326 +#define SMB_ACL_OTHER OTHER_OBJ
6327 +#define SMB_ACL_MASK CLASS_OBJ
6329 +typedef struct SMB_ACL_T {
6333 + struct acl acl[1];
6336 +typedef struct acl *SMB_ACL_ENTRY_T;
6338 +#define SMB_ACL_FIRST_ENTRY 0
6339 +#define SMB_ACL_NEXT_ENTRY 1
6341 +#define SMB_ACL_TYPE_ACCESS 0
6342 +#define SMB_ACL_TYPE_DEFAULT 1
6345 +#define SMB_ACL_LOSES_SPECIAL_MODE_BITS
6348 +#elif defined HAVE_HPUX_ACLS
6351 + * Based on the Solaris & UnixWare code.
6355 +#include <sys/aclv.h>
6357 +/* SVR4.2 ES/MP ACLs */
6358 +typedef int SMB_ACL_TAG_T;
6359 +typedef int SMB_ACL_TYPE_T;
6360 +typedef ushort *SMB_ACL_PERMSET_T;
6361 +typedef ushort SMB_ACL_PERM_T;
6362 +#define SMB_ACL_READ 4
6363 +#define SMB_ACL_WRITE 2
6364 +#define SMB_ACL_EXECUTE 1
6366 +/* Types of ACLs. */
6367 +#define SMB_ACL_USER USER
6368 +#define SMB_ACL_USER_OBJ USER_OBJ
6369 +#define SMB_ACL_GROUP GROUP
6370 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
6371 +#define SMB_ACL_OTHER OTHER_OBJ
6372 +#define SMB_ACL_MASK CLASS_OBJ
6374 +typedef struct SMB_ACL_T {
6378 + struct acl acl[1];
6381 +typedef struct acl *SMB_ACL_ENTRY_T;
6383 +#define SMB_ACL_FIRST_ENTRY 0
6384 +#define SMB_ACL_NEXT_ENTRY 1
6386 +#define SMB_ACL_TYPE_ACCESS 0
6387 +#define SMB_ACL_TYPE_DEFAULT 1
6389 +#elif defined HAVE_IRIX_ACLS
6391 +#define SMB_ACL_TAG_T acl_tag_t
6392 +#define SMB_ACL_TYPE_T acl_type_t
6393 +#define SMB_ACL_PERMSET_T acl_permset_t
6394 +#define SMB_ACL_PERM_T acl_perm_t
6395 +#define SMB_ACL_READ ACL_READ
6396 +#define SMB_ACL_WRITE ACL_WRITE
6397 +#define SMB_ACL_EXECUTE ACL_EXECUTE
6399 +/* Types of ACLs. */
6400 +#define SMB_ACL_USER ACL_USER
6401 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
6402 +#define SMB_ACL_GROUP ACL_GROUP
6403 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
6404 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
6405 +#define SMB_ACL_MASK ACL_MASK
6407 +typedef struct SMB_ACL_T {
6413 +#define SMB_ACL_ENTRY_T acl_entry_t
6415 +#define SMB_ACL_FIRST_ENTRY 0
6416 +#define SMB_ACL_NEXT_ENTRY 1
6418 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
6419 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
6421 +#elif defined HAVE_AIX_ACLS
6423 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
6425 +#include "/usr/include/acl.h"
6427 +typedef uint *SMB_ACL_PERMSET_T;
6429 +struct acl_entry_link{
6430 + struct acl_entry_link *prevp;
6431 + struct new_acl_entry *entryp;
6432 + struct acl_entry_link *nextp;
6436 +struct new_acl_entry{
6437 + unsigned short ace_len;
6438 + unsigned short ace_type;
6439 + unsigned int ace_access;
6440 + struct ace_id ace_id[1];
6443 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
6444 +#define SMB_ACL_T struct acl_entry_link*
6446 +#define SMB_ACL_TAG_T unsigned short
6447 +#define SMB_ACL_TYPE_T int
6448 +#define SMB_ACL_PERM_T uint
6449 +#define SMB_ACL_READ S_IRUSR
6450 +#define SMB_ACL_WRITE S_IWUSR
6451 +#define SMB_ACL_EXECUTE S_IXUSR
6453 +/* Types of ACLs. */
6454 +#define SMB_ACL_USER ACEID_USER
6455 +#define SMB_ACL_USER_OBJ 3
6456 +#define SMB_ACL_GROUP ACEID_GROUP
6457 +#define SMB_ACL_GROUP_OBJ 4
6458 +#define SMB_ACL_OTHER 5
6459 +#define SMB_ACL_MASK 6
6462 +#define SMB_ACL_FIRST_ENTRY 1
6463 +#define SMB_ACL_NEXT_ENTRY 2
6465 +#define SMB_ACL_TYPE_ACCESS 0
6466 +#define SMB_ACL_TYPE_DEFAULT 1
6468 +#else /* No ACLs. */
6470 +/* No ACLS - fake it. */
6471 +#define SMB_ACL_TAG_T int
6472 +#define SMB_ACL_TYPE_T int
6473 +#define SMB_ACL_PERMSET_T mode_t
6474 +#define SMB_ACL_PERM_T mode_t
6475 +#define SMB_ACL_READ S_IRUSR
6476 +#define SMB_ACL_WRITE S_IWUSR
6477 +#define SMB_ACL_EXECUTE S_IXUSR
6479 +/* Types of ACLs. */
6480 +#define SMB_ACL_USER 0
6481 +#define SMB_ACL_USER_OBJ 1
6482 +#define SMB_ACL_GROUP 2
6483 +#define SMB_ACL_GROUP_OBJ 3
6484 +#define SMB_ACL_OTHER 4
6485 +#define SMB_ACL_MASK 5
6487 +typedef struct SMB_ACL_T {
6491 +typedef struct SMB_ACL_ENTRY_T {
6493 +} *SMB_ACL_ENTRY_T;
6495 +#define SMB_ACL_FIRST_ENTRY 0
6496 +#define SMB_ACL_NEXT_ENTRY 1
6498 +#define SMB_ACL_TYPE_ACCESS 0
6499 +#define SMB_ACL_TYPE_DEFAULT 1
6501 +#endif /* No ACLs. */
6502 +#endif /* _SMB_ACLS_H */
6503 --- old/testsuite/acls.test
6504 +++ new/testsuite/acls.test
6508 +# This program is distributable under the terms of the GNU GPL (see
6511 +# Test that rsync handles basic ACL preservation.
6513 +. $srcdir/testsuite/rsync.fns
6515 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6516 +case "$setfacl_nodef" in
6517 +true) test_skipped "I don't know how to use your setfacl command" ;;
6520 +makepath "$fromdir/foo"
6521 +echo something >"$fromdir/file1"
6522 +echo else >"$fromdir/file2"
6524 +files='foo file1 file2'
6526 +setfacl -m u:0:7 "$fromdir/foo" || test_skipped "Your filesystem has ACLs disabled"
6527 +setfacl -m u:0:5 "$fromdir/file1"
6528 +setfacl -m u:0:5 "$fromdir/file2"
6530 +$RSYNC -avvA "$fromdir/" "$todir/"
6533 +getfacl $files >"$scratchdir/acls.txt"
6536 +getfacl $files | diff $diffopt "$scratchdir/acls.txt" -
6538 +# The script would have aborted on error, so getting here means we've won.
6540 --- old/testsuite/default-acls.test
6541 +++ new/testsuite/default-acls.test
6545 +# This program is distributable under the terms of the GNU GPL (see
6548 +# Test that rsync obeys default ACLs. -- Matt McCutchen
6550 +. $srcdir/testsuite/rsync.fns
6552 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
6553 +case "$setfacl_nodef" in
6554 +true) test_skipped "I don't know how to use your setfacl command" ;;
6555 +*-k*) opts='-dm u::7,g::5,o:5' ;;
6556 +*) opts='-m d:u::7,d:g::5,d:o:5' ;;
6558 +setfacl $opts "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
6560 +# Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
6562 + todir="$scratchdir/$1"
6564 + $setfacl_nodef "$todir"
6566 + case "$setfacl_nodef" in
6567 + *-k*) opts="-dm $2" ;;
6568 + *) opts="-m `echo $2 | sed 's/\([ugom]:\)/d:\1/g'`"
6570 + setfacl $opts "$todir"
6572 + # Make sure we obey ACLs when creating a directory to hold multiple transferred files,
6573 + # even though the directory itself is outside the transfer
6574 + $RSYNC -rvv "$scratchdir/dir" "$scratchdir/file" "$scratchdir/program" "$todir/to/"
6575 + check_perms "$todir/to" $4 "Target $1"
6576 + check_perms "$todir/to/dir" $4 "Target $1"
6577 + check_perms "$todir/to/file" $3 "Target $1"
6578 + check_perms "$todir/to/program" $4 "Target $1"
6579 + # Make sure get_local_name doesn't mess us up when transferring only one file
6580 + $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
6581 + check_perms "$todir/to/anotherfile" $3 "Target $1"
6582 + # Make sure we obey default ACLs when not transferring a regular file
6583 + $RSYNC -rvv "$scratchdir/dir/" "$todir/to/anotherdir/"
6584 + check_perms "$todir/to/anotherdir" $4 "Target $1"
6587 +mkdir "$scratchdir/dir"
6588 +echo "File!" >"$scratchdir/file"
6589 +echo "#!/bin/sh" >"$scratchdir/program"
6590 +chmod 777 "$scratchdir/dir"
6591 +chmod 666 "$scratchdir/file"
6592 +chmod 777 "$scratchdir/program"
6594 +# Test some target directories
6596 +testit da777 u::7,g::7,o:7 rw-rw-rw- rwxrwxrwx
6597 +testit da775 u::7,g::7,o:5 rw-rw-r-- rwxrwxr-x
6598 +testit da750 u::7,g::5,o:0 rw-r----- rwxr-x---
6599 +testit da770mask u::7,u:0:7,g::0,m:7,o:0 rw-rw---- rwxrwx---
6600 +testit noda1 '' rw------- rwx------
6602 +testit noda2 '' rw-rw-rw- rwxrwxrwx
6604 +testit noda3 '' rw-r--r-- rwxr-xr-x
6608 --- old/testsuite/devices.test
6609 +++ new/testsuite/devices.test
6610 @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
6611 $RSYNC -ai "$fromdir/block" "$todir/block2" \
6613 cat <<EOT >"$chkfile"
6617 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6619 $RSYNC -ai "$fromdir/block2" "$todir/block" \
6621 cat <<EOT >"$chkfile"
6625 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6627 @@ -58,7 +58,7 @@ sleep 1
6628 $RSYNC -Di "$fromdir/block3" "$todir/block" \
6630 cat <<EOT >"$chkfile"
6634 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6636 @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
6639 cat <<EOT >"$chkfile"
6644 -hD+++++++ block2.5 => block3
6653 +hD+++++++++ block2.5 => block3
6659 if test ! -b "$fromdir/block2.5"; then
6660 sed -e '/block2\.5/d' \
6661 @@ -94,15 +94,15 @@ if test -b "$fromdir/block2.5"; then
6662 $RSYNC -aii --link-dest="$todir" "$fromdir/" "$chkdir/" \
6664 cat <<EOT >"$chkfile"
6684 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
6686 --- old/testsuite/itemize.test
6687 +++ new/testsuite/itemize.test
6688 @@ -47,16 +47,16 @@ rm -f "$to2dir" "$to2dir.test"
6689 $RSYNC -iplr "$fromdir/" "$todir/" \
6691 sed -e "$sed_cmd" <<EOT >"$chkfile"
6694 -cd+++++++ foo/_P30_
6696 ->f+++++++ bar/baz/rsync
6697 -cd+++++++ foo/_P29_
6698 ->f+++++++ foo/config1
6699 ->f+++++++ foo/config2
6700 ->f+++++++ foo/extra
6701 -cL+++++++ foo/sym -> ../bar/baz/rsync
6704 +cd+++++++++ foo/_P30_
6705 +cd+++++++++ bar/baz/
6706 +>f+++++++++ bar/baz/rsync
6707 +cd+++++++++ foo/_P29_
6708 +>f+++++++++ foo/config1
6709 +>f+++++++++ foo/config2
6710 +>f+++++++++ foo/extra
6711 +cL+++++++++ foo/sym -> ../bar/baz/rsync
6713 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
6715 @@ -68,10 +68,10 @@ chmod 601 "$fromdir/foo/config2"
6716 $RSYNC -iplrH "$fromdir/" "$todir/" \
6718 sed -e "$sed_cmd" <<EOT >"$chkfile"
6719 ->f..T.... bar/baz/rsync
6720 ->f..T.... foo/config1
6721 ->f.sTp... foo/config2
6722 -hf..T.... foo/extra => foo/config1
6723 +>f..T...... bar/baz/rsync
6724 +>f..T...... foo/config1
6725 +>f.sTp..... foo/config2
6726 +hf..T...... foo/extra => foo/config1
6728 diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
6730 @@ -88,12 +88,12 @@ chmod 777 "$todir/bar/baz/rsync"
6731 $RSYNC -iplrtc "$fromdir/" "$todir/" \
6733 sed -e "$sed_cmd" <<EOT >"$chkfile"
6734 -.d..t.... foo/_P30_
6735 -.f..tp... bar/baz/rsync
6736 -.d..t.... foo/_P29_
6737 -.f..t.... foo/config1
6738 ->fcstp... foo/config2
6739 -cL..T.... foo/sym -> ../bar/baz/rsync
6740 +.d..t...... foo/_P30_
6741 +.f..tp..... bar/baz/rsync
6742 +.d..t...... foo/_P29_
6743 +.f..t...... foo/config1
6744 +>fcstp..... foo/config2
6745 +cL..T...... foo/sym -> ../bar/baz/rsync
6747 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
6749 @@ -118,15 +118,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
6752 sed -e "$sed_cmd" <<EOT >"$chkfile"
6756 -.f...p... bar/baz/rsync
6759 ->f..t.... foo/config2
6761 -.L foo/sym -> ../bar/baz/rsync
6765 +.f...p..... bar/baz/rsync
6768 +>f..t...... foo/config2
6770 +.L foo/sym -> ../bar/baz/rsync
6772 diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
6774 @@ -145,8 +145,8 @@ touch "$todir/foo/config2"
6775 $RSYNC -iplrtH "$fromdir/" "$todir/" \
6777 sed -e "$sed_cmd" <<EOT >"$chkfile"
6778 -.f...p... foo/config1
6779 ->f..t.... foo/config2
6780 +.f...p..... foo/config1
6781 +>f..t...... foo/config2
6783 diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
6785 @@ -154,15 +154,15 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fro
6788 sed -e "$sed_cmd" <<EOT >"$chkfile"
6796 -hf foo/extra => foo/config1
6797 -cL foo/sym -> ../bar/baz/rsync
6805 +hf foo/extra => foo/config1
6806 +cL foo/sym -> ../bar/baz/rsync
6808 diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
6810 @@ -170,7 +170,7 @@ rm -rf "$to2dir"
6811 $RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
6813 sed -e "$sed_cmd" <<EOT >"$chkfile"
6814 -hf foo/extra => foo/config1
6815 +hf foo/extra => foo/config1
6817 diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
6819 @@ -196,15 +196,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
6822 sed -e "$sed_cmd" <<EOT >"$chkfile"
6830 -hf foo/extra => foo/config1
6831 -$L foo/sym -> ../bar/baz/rsync
6839 +hf foo/extra => foo/config1
6840 +$L foo/sym -> ../bar/baz/rsync
6842 diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
6844 @@ -244,15 +244,15 @@ $RSYNC -ivvplrtH --compare-dest="$todir"
6847 sed -e "$sed_cmd" <<EOT >"$chkfile"
6856 -.L foo/sym -> ../bar/baz/rsync
6865 +.L foo/sym -> ../bar/baz/rsync
6867 diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
6871 @@ -35,6 +35,7 @@ extern int verbose;
6873 extern int preserve_uid;
6874 extern int preserve_gid;
6875 +extern int preserve_acls;
6876 extern int numeric_ids;
6879 @@ -271,7 +272,7 @@ void send_uid_list(int f)
6881 struct idlist *list;
6883 - if (preserve_uid) {
6884 + if (preserve_uid || preserve_acls) {
6886 /* we send sequences of uid/byte-length/name */
6887 for (list = uidlist; list; list = list->next) {
6888 @@ -288,7 +289,7 @@ void send_uid_list(int f)
6892 - if (preserve_gid) {
6893 + if (preserve_gid || preserve_acls) {
6895 for (list = gidlist; list; list = list->next) {
6897 @@ -328,18 +329,28 @@ void recv_uid_list(int f, struct file_li
6901 - if (preserve_uid && !numeric_ids) {
6902 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
6903 /* read the uid list */
6904 while ((id = read_int(f)) != 0)
6905 recv_user_name(f, (uid_t)id);
6908 - if (preserve_gid && !numeric_ids) {
6909 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
6910 /* read the gid list */
6911 while ((id = read_int(f)) != 0)
6912 recv_group_name(f, (gid_t)id);
6915 +#ifdef SUPPORT_ACLS
6916 + if (preserve_acls && !numeric_ids) {
6918 + while ((id = next_acl_uid(flist)) != NULL)
6919 + *id = match_uid(*id);
6920 + while ((id = next_acl_gid(flist)) != NULL)
6921 + *id = match_gid(*id);
6925 /* Now convert all the uids/gids from sender values to our values. */
6926 if (am_root && preserve_uid && !numeric_ids) {
6927 for (i = 0; i < flist->count; i++)
6930 @@ -1466,3 +1466,31 @@ int bitbag_next_bit(struct bitbag *bb, i
6935 +void *expand_item_list(item_list *lp, size_t item_size,
6936 + const char *desc, int incr)
6938 + /* First time through, 0 <= 0, so list is expanded. */
6939 + if (lp->malloced <= lp->count) {
6941 + size_t new_size = lp->malloced;
6943 + new_size -= incr; /* increase slowly */
6944 + else if (new_size < (size_t)incr)
6948 + new_ptr = realloc_array(lp->items, char, new_size * item_size);
6949 + if (verbose >= 4) {
6950 + rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
6951 + who_am_i(), desc, (double)new_size * item_size,
6952 + new_ptr == lp->items ? " not" : "");
6955 + out_of_memory("expand_item_list");
6957 + lp->items = new_ptr;
6958 + lp->malloced = new_size;
6960 + return (char*)lp->items + (lp->count++ * item_size);