1 After applying this patch, run these commands for a successful build:
4 ./configure --enable-acl-support
9 @@ -25,15 +25,15 @@ VERSION=@VERSION@
13 -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h lib/pool_alloc.h
14 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
15 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
16 - lib/permstring.o lib/pool_alloc.o @LIBOBJS@
17 + lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
18 ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
19 zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
20 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
21 main.o checksum.o match.o syscall.o log.o backup.o
22 OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
23 - fileio.o batch.o clientname.o chmod.o
24 + fileio.o batch.o clientname.o chmod.o acls.o
25 OBJS3=progress.o pipe.o
26 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
27 popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
31 +/* -*- c-file-style: "linux" -*-
32 + Copyright (C) Andrew Tridgell 1996
33 + Copyright (C) Paul Mackerras 1996
35 + This program is free software; you can redistribute it and/or modify
36 + it under the terms of the GNU General Public License as published by
37 + the Free Software Foundation; either version 2 of the License, or
38 + (at your option) any later version.
40 + This program is distributed in the hope that it will be useful,
41 + but WITHOUT ANY WARRANTY; without even the implied warranty of
42 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43 + GNU General Public License for more details.
45 + You should have received a copy of the GNU General Public License
46 + along with this program; if not, write to the Free Software
47 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
50 +/* handle passing ACLs between systems */
53 +#include "lib/sysacls.h"
59 +extern int orig_umask;
64 + SMB_ACL_TAG_T tag_type;
73 +static const rsync_acl rsync_acl_initializer = { 0, 0, NULL };
75 +#define OTHER_TYPE(t) (SMB_ACL_TYPE_ACCESS+SMB_ACL_TYPE_DEFAULT-(t))
76 +#define BUMP_TYPE(t) ((t = OTHER_TYPE(t)) == SMB_ACL_TYPE_DEFAULT)
78 +static void expand_rsync_acl(rsync_acl *racl)
80 + /* First time through, 0 <= 0, so list is expanded. */
81 + if (racl->malloced <= racl->count) {
83 + size_t new_size = racl->malloced + 10;
84 + new_ptr = realloc_array(racl->races, rsync_ace, new_size);
86 + rprintf(FINFO, "expand rsync_acl to %.0f bytes, did%s move\n",
87 + (double) new_size * sizeof racl->races[0],
88 + racl->races ? "" : " not");
91 + racl->races = new_ptr;
92 + racl->malloced = new_size;
95 + out_of_memory("expand_rsync_acl");
99 +static void rsync_acl_free(rsync_acl *racl)
102 + racl->races = NULL;
104 + racl->malloced = 0;
107 +static int rsync_ace_sorter(const void *r1, const void *r2)
109 + rsync_ace *race1 = (rsync_ace *)r1;
110 + SMB_ACL_TAG_T rtag1 = race1->tag_type;
111 + id_t rid1 = race1->id;
112 + rsync_ace *race2 = (rsync_ace *)r2;
113 + SMB_ACL_TAG_T rtag2 = race2->tag_type;
114 + id_t rid2 = race2->id;
115 + /* start at the extrema */
116 + if (rtag1 == SMB_ACL_USER_OBJ || rtag2 == SMB_ACL_MASK)
118 + if (rtag2 == SMB_ACL_USER_OBJ || rtag1 == SMB_ACL_MASK)
121 + if (rtag1 == SMB_ACL_OTHER)
123 + if (rtag2 == SMB_ACL_OTHER)
125 + /* only SMB_ACL_USERs and SMB_ACL_GROUP*s left */
126 + if (rtag1 == SMB_ACL_USER) {
128 + case SMB_ACL_GROUP:
129 + case SMB_ACL_GROUP_OBJ:
130 + case SMB_ACL_OTHER:
134 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
136 + if (rtag2 == SMB_ACL_USER)
138 + /* only SMB_ACL_GROUP*s to worry about; kick out GROUP_OBJs first */
139 + if (rtag1 == SMB_ACL_GROUP_OBJ)
141 + if (rtag2 == SMB_ACL_GROUP_OBJ)
143 + /* only SMB_ACL_GROUPs left */
144 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
147 +static void sort_rsync_acl(rsync_acl *racl)
151 + qsort((void **)racl->races, racl->count, sizeof racl->races[0],
152 + &rsync_ace_sorter);
155 +static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
157 + SMB_ACL_ENTRY_T entry;
159 + const char *errfun;
160 + *racl = rsync_acl_initializer;
161 + errfun = "sys_acl_get_entry";
162 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
164 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
165 + SMB_ACL_PERMSET_T permset;
168 + expand_rsync_acl(racl);
169 + race = &racl->races[racl->count++];
170 + if ((rc = sys_acl_get_tag_type(entry, &race->tag_type))) {
171 + errfun = "sys_acl_get_tag_type";
174 + if ((rc = sys_acl_get_permset(entry, &permset))) {
175 + errfun = "sys_acl_get_tag_type";
178 + race->access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
179 + | (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
180 + | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
181 + switch (race->tag_type) {
183 + case SMB_ACL_GROUP:
188 + if (!(qualifier = sys_acl_get_qualifier(entry))) {
189 + errfun = "sys_acl_get_tag_type";
193 + race->id = *((id_t *)qualifier);
194 + sys_acl_free_qualifier(qualifier, race->tag_type);
197 + rprintf(FERROR, "unpack_smb_acl: %s(): %s\n",
198 + errfun, strerror(errno));
199 + rsync_acl_free(racl);
202 + sort_rsync_acl(racl);
206 +static BOOL rsync_acls_equal(const rsync_acl *racl1, const rsync_acl *racl2)
208 + rsync_ace *race1, *race2;
209 + size_t count = racl1->count;
210 + if (count != racl2->count)
212 + race1 = racl1->races;
213 + race2 = racl2->races;
214 + for (; count--; race1++, race2++) {
215 + if (race1->tag_type != race2->tag_type
216 + || race1->access != race2->access
217 + || ((race1->tag_type == SMB_ACL_USER
218 + || race1->tag_type == SMB_ACL_GROUP)
219 + && race1->id != race2->id))
231 +static rsync_acl_list _rsync_acl_lists[] = {
232 + { 0, 0, NULL }, /* SMB_ACL_TYPE_ACCESS */
233 + { 0, 0, NULL } /* SMB_ACL_TYPE_DEFAULT */
236 +static inline rsync_acl_list *rsync_acl_lists(SMB_ACL_TYPE_T type)
238 + return type == SMB_ACL_TYPE_ACCESS ? &_rsync_acl_lists[0]
239 + : &_rsync_acl_lists[1];
242 +static void expand_rsync_acl_list(rsync_acl_list *racl_list)
244 + /* First time through, 0 <= 0, so list is expanded. */
245 + if (racl_list->malloced <= racl_list->count) {
246 + rsync_acl *new_ptr;
248 + if (racl_list->malloced < 1000)
249 + new_size = racl_list->malloced + 1000;
251 + new_size = racl_list->malloced * 2;
252 + new_ptr = realloc_array(racl_list->racls, rsync_acl, new_size);
253 + if (verbose >= 3) {
254 + rprintf(FINFO, "expand_rsync_acl_list to %.0f bytes, did%s move\n",
255 + (double) new_size * sizeof racl_list->racls[0],
256 + racl_list->racls ? "" : " not");
259 + racl_list->racls = new_ptr;
260 + racl_list->malloced = new_size;
262 + if (!racl_list->racls)
263 + out_of_memory("expand_rsync_acl_list");
268 +static void free_rsync_acl_list(rsync_acl_list *racl_list)
270 + /* Run this in reverse, so references are freed before referents,
271 + * although not currently necessary. */
272 + while (racl_list->count--) {
273 + rsync_acl *racl = &racl_list->racls[racl_list->count];
275 + rsync_acl_free(racl);
277 + free(racl_list->racls);
278 + racl_list->racls = NULL;
279 + racl_list->malloced = 0;
283 +static int find_matching_rsync_acl(SMB_ACL_TYPE_T type,
284 + const rsync_acl_list *racl_list,
285 + const rsync_acl *racl)
287 + static int access_match = -1, default_match = -1;
288 + int *match = (type == SMB_ACL_TYPE_ACCESS) ?
289 + &access_match : &default_match;
290 + size_t count = racl_list->count;
291 + /* If this is the first time through or we didn't match the last
292 + * time, then start at the end of the list, which should be the
293 + * best place to start hunting. */
295 + *match = racl_list->count - 1;
297 + if (rsync_acls_equal(&racl_list->racls[*match], racl))
300 + *match = racl_list->count - 1;
306 +/* The general strategy with the tag_type <-> character mapping is that
307 + * lowercase implies that no qualifier follows, where uppercase does.
308 + * A similar idiom for the acl type (access or default) itself, but
309 + * lowercase in this instance means there's no ACL following, so the
310 + * ACL is a repeat, so the receiver should reuse the last of the same
313 +static void send_rsync_acl(int f, const rsync_acl *racl)
316 + size_t count = racl->count;
317 + write_int(f, count);
318 + for (race = racl->races; count--; race++) {
320 + switch (race->tag_type) {
321 + case SMB_ACL_USER_OBJ:
327 + case SMB_ACL_GROUP_OBJ:
330 + case SMB_ACL_GROUP:
333 + case SMB_ACL_OTHER:
341 + "send_rsync_acl: unknown tag_type (%02x) on ACE; disregarding\n",
346 + write_byte(f, race->access);
348 + write_int(f, race->id);
349 + /* FIXME: sorta wasteful: we should maybe buffer as
350 + * many ids as max(ACL_USER + ACL_GROUP) objects to
351 + * keep from making so many calls. */
360 +static rsync_acl _curr_rsync_acls[2];
363 +static const char *str_acl_type(SMB_ACL_TYPE_T type)
365 + return type == SMB_ACL_TYPE_ACCESS ? "SMB_ACL_TYPE_ACCESS" :
366 + type == SMB_ACL_TYPE_DEFAULT ? "SMB_ACL_TYPE_DEFAULT" :
367 + "unknown SMB_ACL_TYPE_T";
371 + * Overwrite racl with a new three-entry ACL from the given permissions.
373 +static void perms_to_acl(int perms, rsync_acl *racl)
376 + expand_rsync_acl(racl);
377 + racl->races[racl->count].tag_type = SMB_ACL_USER_OBJ;
378 + racl->races[racl->count++].access = (perms >> 6) & 7;
379 + expand_rsync_acl(racl);
380 + racl->races[racl->count].tag_type = SMB_ACL_GROUP_OBJ;
381 + racl->races[racl->count++].access = (perms >> 3) & 7;
382 + expand_rsync_acl(racl);
383 + racl->races[racl->count].tag_type = SMB_ACL_OTHER;
384 + racl->races[racl->count++].access = (perms >> 0) & 7;
387 +/* Generate the ACL(s) for this flist entry;
388 + * ACL(s) are either sent or cleaned-up by send_acl() below. */
390 +int make_acl(const struct file_struct *file, const char *fname)
392 + SMB_ACL_TYPE_T type;
393 + rsync_acl *curr_racl;
395 + if (S_ISLNK(file->mode))
398 + curr_racl = &_curr_rsync_acls[0];
399 + type = SMB_ACL_TYPE_ACCESS;
403 + if ((sacl = sys_acl_get_file(fname, type)) != 0) {
404 + ok = unpack_smb_acl(curr_racl, sacl);
405 + sys_acl_free_acl(sacl);
408 + } else if (errno == ENOTSUP) {
409 + /* ACLs are not supported. Invent an access ACL from
410 + * permissions; let the default ACL default to empty. */
411 + *curr_racl = rsync_acl_initializer;
412 + if (type == SMB_ACL_TYPE_ACCESS)
413 + perms_to_acl(file->mode & ACCESSPERMS, curr_racl);
415 + rprintf(FERROR, "send_acl: sys_acl_get_file(%s, %s): %s\n",
416 + fname, str_acl_type(type), strerror(errno));
420 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
425 +/* Send the make_acl()-generated ACLs for this flist entry,
426 + * or clean up after an flist entry that's not being sent (f == -1). */
428 +void send_acl(const struct file_struct *file, int f)
430 + SMB_ACL_TYPE_T type;
431 + rsync_acl *curr_racl;
433 + if (S_ISLNK(file->mode))
436 + curr_racl = &_curr_rsync_acls[0];
437 + type = SMB_ACL_TYPE_ACCESS;
440 + rsync_acl_list *racl_list = rsync_acl_lists(type);
442 + rsync_acl_free(curr_racl);
445 + if ((index = find_matching_rsync_acl(type, racl_list, curr_racl))
447 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
448 + write_int(f, index);
449 + rsync_acl_free(curr_racl);
451 + write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
452 + send_rsync_acl(f, curr_racl);
453 + expand_rsync_acl_list(racl_list);
454 + racl_list->racls[racl_list->count++] = *curr_racl;
457 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
460 +/* The below stuff is only used by the receiver: */
462 +/* structure to hold index to rsync_acl_list member corresponding to
463 + * flist->files[i] */
466 + const struct file_struct *file;
473 + file_acl_index *fileaclidxs;
474 +} file_acl_index_list;
476 +static file_acl_index_list _file_acl_index_lists[] = {
477 + {0, 0, NULL },/* SMB_ACL_TYPE_ACCESS */
478 + {0, 0, NULL } /* SMB_ACL_TYPE_DEFAULT */
481 +static inline file_acl_index_list *file_acl_index_lists(SMB_ACL_TYPE_T type)
483 + return type == SMB_ACL_TYPE_ACCESS ?
484 + &_file_acl_index_lists[0] : &_file_acl_index_lists[1];
487 +static void expand_file_acl_index_list(file_acl_index_list *fileaclidx_list)
489 + /* First time through, 0 <= 0, so list is expanded. */
490 + if (fileaclidx_list->malloced <= fileaclidx_list->count) {
491 + file_acl_index *new_ptr;
493 + if (fileaclidx_list->malloced < 1000)
494 + new_size = fileaclidx_list->malloced + 1000;
496 + new_size = fileaclidx_list->malloced * 2;
497 + new_ptr = realloc_array(fileaclidx_list->fileaclidxs, file_acl_index, new_size);
498 + if (verbose >= 3) {
499 + rprintf(FINFO, "expand_file_acl_index_list to %.0f bytes, did%s move\n",
500 + (double) new_size * sizeof fileaclidx_list->fileaclidxs[0],
501 + fileaclidx_list->fileaclidxs ? "" : " not");
504 + fileaclidx_list->fileaclidxs = new_ptr;
505 + fileaclidx_list->malloced = new_size;
507 + if (!fileaclidx_list->fileaclidxs)
508 + out_of_memory("expand_file_acl_index_list");
513 +static void free_file_acl_index_list(file_acl_index_list *fileaclidx_list)
515 + free(fileaclidx_list->fileaclidxs);
516 + fileaclidx_list->fileaclidxs = NULL;
517 + fileaclidx_list->malloced = 0;
521 +/* lists to hold the SMB_ACL_Ts corresponding to the rsync_acl_list entries */
529 +static smb_acl_list _smb_acl_lists[] = {
530 + { 0, 0, NULL }, /* SMB_ACL_TYPE_ACCESS */
531 + { 0, 0, NULL } /* SMB_ACL_TYPE_DEFAULT */
534 +static inline smb_acl_list *smb_acl_lists(SMB_ACL_TYPE_T type)
536 + return type == SMB_ACL_TYPE_ACCESS ? &_smb_acl_lists[0] :
537 + &_smb_acl_lists[1];
540 +static void expand_smb_acl_list(smb_acl_list *sacl_list)
542 + /* First time through, 0 <= 0, so list is expanded. */
543 + if (sacl_list->malloced <= sacl_list->count) {
544 + SMB_ACL_T *new_ptr;
546 + if (sacl_list->malloced < 1000)
547 + new_size = sacl_list->malloced + 1000;
549 + new_size = sacl_list->malloced * 2;
550 + new_ptr = realloc_array(sacl_list->sacls, SMB_ACL_T, new_size);
551 + if (verbose >= 3) {
552 + rprintf(FINFO, "expand_smb_acl_list to %.0f bytes, did%s move\n",
553 + (double) new_size * sizeof sacl_list->sacls[0],
554 + sacl_list->sacls ? "" : " not");
557 + sacl_list->sacls = new_ptr;
558 + sacl_list->malloced = new_size;
560 + if (!sacl_list->sacls)
561 + out_of_memory("expand_smb_acl_list");
566 +static void free_smb_acl_list(SMB_ACL_TYPE_T type)
568 + smb_acl_list *sacl_list = smb_acl_lists(type);
569 + SMB_ACL_T *sacl = sacl_list->sacls;
570 + while (sacl_list->count--) {
572 + sys_acl_free_acl(*sacl++);
574 + free(sacl_list->sacls);
575 + sacl_list->sacls = NULL;
576 + sacl_list->malloced = 0;
580 +/* build an SMB_ACL_T corresponding to an rsync_acl */
581 +static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl, int perms)
583 + size_t count = racl->count;
584 + rsync_ace *race = racl->races;
585 + const char *errfun = NULL;
588 + *smb_acl = sys_acl_init(count);
590 + rprintf(FERROR, "pack_smb_acl: sys_acl_init(): %s\n",
595 + for (; count--; race++) {
596 + SMB_ACL_ENTRY_T entry;
597 + SMB_ACL_PERMSET_T permset;
598 + if (sys_acl_create_entry(smb_acl, &entry)) {
599 + errfun = "sys_acl_create)";
602 + if (sys_acl_set_tag_type(entry, race->tag_type)) {
603 + errfun = "sys_acl_set_tag";
606 + if (race->tag_type == SMB_ACL_USER ||
607 + race->tag_type == SMB_ACL_GROUP) {
608 + if (sys_acl_set_qualifier(entry, (void*)&race->id)) {
609 + errfun = "sys_acl_set_qualfier";
613 + if (sys_acl_get_permset(entry, &permset)) {
614 + errfun = "sys_acl_get_permset";
617 + if (sys_acl_clear_perms(permset)) {
618 + errfun = "sys_acl_clear_perms";
621 + switch (perms >= 0 ? race->tag_type : SMB_ACL_USER_OBJ) {
622 + case SMB_ACL_GROUP_OBJ:
623 + bits = racl->count > 3 ? race->access : (perms >> 3) & 7;
626 + bits = (perms >> 3) & 7;
628 + case SMB_ACL_OTHER:
632 + bits = race->access;
636 + if (sys_acl_add_perm(permset, SMB_ACL_READ)) {
637 + errfun = "sys_acl_add_perm";
642 + if (sys_acl_add_perm(permset, SMB_ACL_WRITE)) {
643 + errfun = "sys_acl_add_perm";
648 + if (sys_acl_add_perm(permset, SMB_ACL_EXECUTE)) {
649 + errfun = "sys_acl_add_perm";
653 + if (sys_acl_set_permset(entry, permset)) {
654 + errfun = "sys_acl_set_permset";
659 + sys_acl_free_acl(*smb_acl);
660 + rprintf(FERROR, "pack_smb_acl %s(): %s\n", errfun,
667 +static void receive_rsync_acl(rsync_acl *racl, mode_t mode, int f)
669 + rsync_ace *user = NULL, *group = NULL, *other = NULL, *mask = NULL;
671 + BOOL need_sort = 0;
674 + if (!(count = read_int(f)))
678 + uchar tag = read_byte(f);
679 + expand_rsync_acl(racl);
680 + race = &racl->races[racl->count++];
683 + race->tag_type = SMB_ACL_USER_OBJ;
687 + race->tag_type = SMB_ACL_USER;
690 + race->tag_type = SMB_ACL_GROUP_OBJ;
694 + race->tag_type = SMB_ACL_GROUP;
697 + race->tag_type = SMB_ACL_OTHER;
701 + race->tag_type = SMB_ACL_MASK;
705 + rprintf(FERROR, "receive_rsync_acl: unknown tag %c\n",
707 + exit_cleanup(RERR_STREAMIO);
709 + race->access = read_byte(f);
710 + if (race->access & ~ (4 | 2 | 1)) {
711 + rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
713 + exit_cleanup(RERR_STREAMIO);
715 + if (race->tag_type == SMB_ACL_USER ||
716 + race->tag_type == SMB_ACL_GROUP) {
717 + race->id = read_int(f);
721 + expand_rsync_acl(racl);
722 + user = &racl->races[racl->count++];
723 + user->tag_type = SMB_ACL_USER_OBJ;
724 + user->access = (mode >> 6) & 7;
728 + expand_rsync_acl(racl);
729 + group = &racl->races[racl->count++];
730 + group->tag_type = SMB_ACL_GROUP_OBJ;
731 + group->access = (mode >> 3) & 7;
735 + expand_rsync_acl(racl);
736 + other = &racl->races[racl->count++];
737 + other->tag_type = SMB_ACL_OTHER;
738 + other->access = mode & 7;
743 + expand_rsync_acl(racl);
744 + mask = &racl->races[racl->count++];
745 + mask->tag_type = SMB_ACL_MASK;
746 + mask->access = (mode >> 3) & 7;
750 + /* If we, a system without ACLS_NEED_MASK, received data from a
751 + * system that has masks, throw away the extraneous CLASS_OBJs. */
752 + if (mask && racl->count == 4) {
753 + /* mask off group perms with it first */
754 + group->access &= mask->access;
755 + /* dump mask; re-slot any followers-on */
757 + if (mask != &racl->races[racl->count]) {
758 + *mask = racl->races[racl->count];
764 + sort_rsync_acl(racl);
767 +/* receive and build the rsync_acl_lists */
769 +void receive_acl(struct file_struct *file, int f)
771 + SMB_ACL_TYPE_T type;
774 + if (S_ISLNK(file->mode))
777 + fname = f_name(file, NULL);
778 + type = SMB_ACL_TYPE_ACCESS;
780 + file_acl_index_list *fileaclidx_list =
781 + file_acl_index_lists(type);
783 + expand_file_acl_index_list(fileaclidx_list);
785 + tag = read_byte(f);
786 + if (tag == 'A' || tag == 'a') {
787 + if (type != SMB_ACL_TYPE_ACCESS) {
788 + rprintf(FERROR, "receive_acl %s: duplicate access ACL\n",
790 + exit_cleanup(RERR_STREAMIO);
792 + } else if (tag == 'D' || tag == 'd') {
793 + if (type == SMB_ACL_TYPE_ACCESS) {
794 + rprintf(FERROR, "receive_acl %s: expecting access ACL; got default\n",
796 + exit_cleanup(RERR_STREAMIO);
799 + rprintf(FERROR, "receive_acl %s: unknown ACL type tag: %c\n",
801 + exit_cleanup(RERR_STREAMIO);
803 + if (tag == 'A' || tag == 'D') {
804 + rsync_acl racl = rsync_acl_initializer;
805 + rsync_acl_list *racl_list = rsync_acl_lists(type);
806 + smb_acl_list *sacl_list = smb_acl_lists(type);
807 + fileaclidx_list->fileaclidxs[fileaclidx_list->count].
808 + aclidx = racl_list->count;
809 + fileaclidx_list->fileaclidxs[fileaclidx_list->count++].
811 + receive_rsync_acl(&racl, file->mode, f);
812 + expand_rsync_acl_list(racl_list);
813 + racl_list->racls[racl_list->count++] = racl;
814 + expand_smb_acl_list(sacl_list);
815 + sacl_list->sacls[sacl_list->count++] = NULL;
817 + int index = read_int(f);
818 + rsync_acl_list *racl_list = rsync_acl_lists(type);
819 + if ((size_t) index >= racl_list->count) {
820 + rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
822 + str_acl_type(type),
824 + exit_cleanup(RERR_STREAMIO);
826 + fileaclidx_list->fileaclidxs[fileaclidx_list->count].
828 + fileaclidx_list->fileaclidxs[fileaclidx_list->count++].
831 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
834 +static int file_acl_index_list_sorter(const void *f1, const void *f2)
836 + const file_acl_index *fileaclidx1 = (const file_acl_index *)f1;
837 + const file_acl_index *fileaclidx2 = (const file_acl_index *)f2;
838 + return fileaclidx1->file == fileaclidx2->file ? 0 :
839 + fileaclidx1->file < fileaclidx2->file ? -1 : 1;
842 +void sort_file_acl_index_lists()
844 + SMB_ACL_TYPE_T type;
846 + type = SMB_ACL_TYPE_ACCESS;
848 + file_acl_index_list *fileaclidx_list =
849 + file_acl_index_lists(type);
850 + if (!fileaclidx_list->count)
852 + qsort(fileaclidx_list->fileaclidxs, fileaclidx_list->count,
853 + sizeof fileaclidx_list->fileaclidxs[0],
854 + &file_acl_index_list_sorter);
855 + } while (BUMP_TYPE(type));
858 +static int find_file_acl_index(const file_acl_index_list *fileaclidx_list,
859 + const struct file_struct *file) {
860 + int low = 0, high = fileaclidx_list->count;
861 + const struct file_struct *file_mid;
865 + int mid = (high + low) / 2;
866 + file_mid = fileaclidx_list->fileaclidxs[mid].file;
867 + if (file_mid == file)
868 + return fileaclidx_list->fileaclidxs[mid].aclidx;
869 + if (file_mid > file)
873 + } while (low < high);
875 + file_mid = fileaclidx_list->fileaclidxs[low].file;
876 + if (file_mid == file)
877 + return fileaclidx_list->fileaclidxs[low].aclidx;
880 + "find_file_acl_index: can't find entry for file in list\n");
881 + exit_cleanup(RERR_STREAMIO);
885 +/* for duplicating ACLs on backups when using backup_dir */
887 +int dup_acl(const char *orig, const char *bak, mode_t mode)
889 + SMB_ACL_TYPE_T type;
892 + type = SMB_ACL_TYPE_ACCESS;
894 + SMB_ACL_T sacl_orig, sacl_bak;
895 + rsync_acl racl_orig, racl_bak;
896 + if (!(sacl_orig = sys_acl_get_file(orig, type))) {
897 + rprintf(FERROR, "dup_acl: sys_acl_get_file(%s, %s): %s\n",
898 + orig, str_acl_type(type), strerror(errno));
902 + if (!(sacl_bak = sys_acl_get_file(orig, type))) {
903 + rprintf(FERROR, "dup_acl: sys_acl_get_file(%s, %s): %s. ignoring\n",
904 + bak, str_acl_type(type), strerror(errno));
906 + /* try to forge on through */
908 + if (!unpack_smb_acl(&racl_orig, sacl_orig)) {
910 + goto out_with_sacls;
913 + if (!unpack_smb_acl(&racl_bak, sacl_bak)) {
915 + goto out_with_one_racl;
917 + if (rsync_acls_equal(&racl_orig, &racl_bak))
920 + ; /* presume they're unequal */
922 + if (type == SMB_ACL_TYPE_DEFAULT && !racl_orig.count) {
923 + if (sys_acl_delete_def_file(bak) < 0) {
924 + rprintf(FERROR, "dup_acl: sys_acl_delete_def_file(%s): %s\n",
925 + bak, strerror(errno));
928 + } else if (sys_acl_set_file(bak, type, sacl_bak) < 0) {
929 + rprintf(FERROR, "dup_acl: sys_acl_set_file(%s, %s): %s\n",
930 + bak, str_acl_type(type), strerror(errno));
935 + rsync_acl_free(&racl_bak);
937 + rsync_acl_free(&racl_orig);
940 + sys_acl_free_acl(sacl_bak);
941 + /* out_with_one_sacl: */
943 + sys_acl_free_acl(sacl_orig);
944 + } while (BUMP_TYPE(type) && S_ISDIR(mode));
949 +/* Stuff for redirecting calls to set_acl() from set_file_attrs()
950 + * for keep_backup(). */
951 +static const struct file_struct *backup_orig_file = NULL;
952 +static const char null_string[] = "";
953 +static const char *backup_orig_fname = null_string;
954 +static const char *backup_dest_fname = null_string;
955 +static SMB_ACL_T _backup_sacl[] = { NULL, NULL };
957 +void push_keep_backup_acl(const struct file_struct *file,
958 + const char *orig, const char *dest)
960 + SMB_ACL_TYPE_T type;
963 + backup_orig_file = file;
964 + backup_orig_fname = orig;
965 + backup_dest_fname = dest;
967 + sacl = &_backup_sacl[0];
968 + type = SMB_ACL_TYPE_ACCESS;
970 + if (type == SMB_ACL_TYPE_DEFAULT && !S_ISDIR(file->mode)) {
974 + if (!(*sacl = sys_acl_get_file(orig, type))) {
976 + "push_keep_backup_acl: sys_acl_get_file(%s, %s): %s\n",
977 + orig, str_acl_type(type),
980 + } while (BUMP_TYPE(type));
983 +static int set_keep_backup_acl()
985 + SMB_ACL_TYPE_T type;
989 + sacl = &_backup_sacl[0];
990 + type = SMB_ACL_TYPE_ACCESS;
993 + && sys_acl_set_file(backup_dest_fname, type, *sacl) < 0) {
995 + "push_keep_backup_acl: sys_acl_get_file(%s, %s): %s\n",
997 + str_acl_type(type),
1001 + } while (BUMP_TYPE(type));
1006 +void cleanup_keep_backup_acl()
1008 + SMB_ACL_TYPE_T type;
1011 + backup_orig_file = NULL;
1012 + backup_orig_fname = null_string;
1013 + backup_dest_fname = null_string;
1015 + sacl = &_backup_sacl[0];
1016 + type = SMB_ACL_TYPE_ACCESS;
1019 + sys_acl_free_acl(*sacl);
1022 + } while (BUMP_TYPE(type));
1025 +/* set ACL on rsync-ed or keep_backup-ed file */
1027 +int set_acl(const char *fname, const struct file_struct *file, mode_t old_mode)
1029 + int unchanged = 1;
1030 + SMB_ACL_TYPE_T type;
1032 + if (dry_run || S_ISLNK(file->mode))
1033 + return 1; /* FIXME: --dry-run needs to compute this value */
1035 + if (file == backup_orig_file) {
1036 + if (!strcmp(fname, backup_dest_fname))
1037 + return set_keep_backup_acl();
1039 + type = SMB_ACL_TYPE_ACCESS;
1041 + SMB_ACL_T sacl_orig, *sacl_new;
1042 + rsync_acl racl_orig, *racl_new;
1043 + int aclidx = find_file_acl_index(file_acl_index_lists(type),
1046 + racl_new = &(rsync_acl_lists(type)->racls[aclidx]);
1047 + sacl_new = &(smb_acl_lists(type)->sacls[aclidx]);
1048 + sacl_orig = sys_acl_get_file(fname, type);
1050 + rprintf(FERROR, "set_acl: sys_acl_get_file(%s, %s): %s\n",
1051 + fname, str_acl_type(type), strerror(errno));
1055 + ok = unpack_smb_acl(&racl_orig, sacl_orig);
1056 + sys_acl_free_acl(sacl_orig);
1061 + ok = rsync_acls_equal(&racl_orig, racl_new);
1062 + rsync_acl_free(&racl_orig);
1065 + if (type == SMB_ACL_TYPE_DEFAULT && !racl_new->count) {
1066 + if (sys_acl_delete_def_file(fname) < 0) {
1067 + rprintf(FERROR, "set_acl: sys_acl_delete_def_file(%s): %s\n",
1068 + fname, strerror(errno));
1073 + /* We set the mask (if it exists) to the file's group
1074 + * permissions (as they currently exist on the disk).
1075 + * This avoids a permission race, particularly for new
1076 + * files (where the current group permissions == 0).
1077 + * If this is not the right value, the upcoming chmod()
1078 + * call will change it. */
1079 + int perms = type == SMB_ACL_TYPE_ACCESS
1080 + ? (int)(old_mode & CHMOD_BITS) : -1;
1082 + && !pack_smb_acl(sacl_new, racl_new, perms)) {
1086 + if (sys_acl_set_file(fname, type, *sacl_new) < 0) {
1087 + rprintf(FERROR, "set_acl: sys_acl_set_file(%s, %s): %s\n",
1088 + fname, str_acl_type(type),
1094 + if (unchanged == 1)
1096 + } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
1101 +/* Enumeration functions for uid mapping: */
1103 +/* Context -- one and only one. Should be cycled through once on uid
1104 + * mapping and once on gid mapping. */
1105 +static rsync_acl_list *_enum_racl_lists[] = {
1106 + &_rsync_acl_lists[0], &_rsync_acl_lists[1], NULL
1109 +static rsync_acl_list **enum_racl_list = &_enum_racl_lists[0];
1110 +static size_t enum_racl_index = 0;
1111 +static size_t enum_race_index = 0;
1113 +/* This returns the next tag_type id from the given acl for the next entry,
1114 + * or it returns 0 if there are no more tag_type ids in the acl. */
1116 +static id_t *next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
1118 + for (; enum_race_index < racl->count; enum_race_index++) {
1119 + rsync_ace *race = &racl->races[enum_race_index++];
1120 + if (race->tag_type == tag_type)
1123 + enum_race_index = 0;
1127 +static id_t *next_acl_id(SMB_ACL_TAG_T tag_type, const rsync_acl_list *racl_list)
1129 + for (; enum_racl_index < racl_list->count; enum_racl_index++) {
1130 + rsync_acl *racl = &racl_list->racls[enum_racl_index];
1131 + id_t *id = next_ace_id(tag_type, racl);
1135 + enum_racl_index = 0;
1139 +static id_t *next_acl_list_id(SMB_ACL_TAG_T tag_type)
1141 + for (; *enum_racl_list; enum_racl_list++) {
1142 + id_t *id = next_acl_id(tag_type, *enum_racl_list);
1146 + enum_racl_list = &_enum_racl_lists[0];
1150 +id_t *next_acl_uid()
1152 + return next_acl_list_id(SMB_ACL_USER);
1155 +id_t *next_acl_gid()
1157 + return next_acl_list_id(SMB_ACL_GROUP);
1160 +#define PERMS_SPLICE(perms,newbits,where) (((perms) & ~(7 << (where))) | ((newbits) << (where)))
1162 +int default_perms_for_dir(const char *dir)
1166 + BOOL ok, saw_mask = False;
1172 + perms = ACCESSPERMS & ~orig_umask;
1173 + /* Read the directory's default ACL. If it has none, this will successfully return an empty ACL. */
1174 + sacl = sys_acl_get_file(dir, SMB_ACL_TYPE_DEFAULT);
1175 + if (sacl == NULL) {
1176 + /* Couldn't get an ACL. Darn. */
1179 + /* ACLs are disabled. We could yell at the user to turn them on, but... */
1183 + /* We're doing a dry run, so the containing directory
1184 + * wasn't actually created. Don't worry about it. */
1187 + /* Otherwise fall through. */
1189 + rprintf(FERROR, "default_perms_for_dir: sys_acl_get_file(%s, %s): %s, falling back on umask\n",
1190 + dir, str_acl_type(SMB_ACL_TYPE_DEFAULT), strerror(errno));
1196 + ok = unpack_smb_acl(&racl, sacl);
1197 + sys_acl_free_acl(sacl);
1199 + rprintf(FERROR, "default_perms_for_dir: unpack_smb_acl failed, falling back on umask\n");
1203 + /* Look at each default ACL entry and possibly modify three bits of `perms' accordingly.
1204 + * If there's "no" default ACL, there will be zero entries and the umask-based perms is unchanged. */
1205 + for (i = 0; i < racl.count; i++) {
1206 + switch (racl.races[i].tag_type) {
1207 + case SMB_ACL_USER_OBJ:
1208 + perms = PERMS_SPLICE(perms, racl.races[i].access, 6);
1210 + case SMB_ACL_GROUP_OBJ:
1212 + perms = PERMS_SPLICE(perms, racl.races[i].access, 3);
1214 + case SMB_ACL_MASK:
1216 + perms = PERMS_SPLICE(perms, racl.races[i].access, 3);
1218 + case SMB_ACL_OTHER:
1219 + perms = PERMS_SPLICE(perms, racl.races[i].access, 0);
1225 + rsync_acl_free(&racl);
1227 + rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
1231 +#endif /* SUPPORT_ACLS */
1234 @@ -28,6 +28,7 @@ extern char *backup_suffix;
1235 extern char *backup_dir;
1238 +extern int preserve_acls;
1239 extern int preserve_devices;
1240 extern int preserve_specials;
1241 extern int preserve_links;
1242 @@ -132,6 +133,10 @@ static int make_bak_dir(char *fullpath)
1244 do_lchown(fullpath, st.st_uid, st.st_gid);
1245 do_chmod(fullpath, st.st_mode);
1246 +#ifdef SUPPORT_ACLS
1247 + if (preserve_acls)
1248 + dup_acl(end, fullpath, st.st_mode);
1253 @@ -185,6 +190,11 @@ static int keep_backup(char *fname)
1254 if (!(buf = get_backup_name(fname)))
1257 +#ifdef SUPPORT_ACLS
1258 + if (preserve_acls)
1259 + push_keep_backup_acl(file, fname, buf);
1262 /* Check to see if this is a device file, or link */
1263 if ((am_root && preserve_devices && IS_DEVICE(file->mode))
1264 || (preserve_specials && IS_SPECIAL(file->mode))) {
1265 @@ -260,6 +270,10 @@ static int keep_backup(char *fname)
1268 set_file_attrs(buf, file, NULL, 0);
1269 +#ifdef SUPPORT_ACLS
1270 + if (preserve_acls)
1271 + cleanup_keep_backup_acl();
1276 --- old/configure.in
1277 +++ new/configure.in
1278 @@ -482,6 +482,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1279 AC_CHECK_LIB(resolv, strcasecmp)
1282 +AC_CHECK_FUNCS(aclsort)
1283 +if test x"$ac_cv_func_aclsort" = x"no"; then
1284 + AC_CHECK_LIB(sec, aclsort)
1287 dnl At the moment we don't test for a broken memcmp(), because all we
1288 dnl need to do is test for equality, not comparison, and it seems that
1289 dnl every platform has a memcmp that can do at least that.
1290 @@ -738,6 +743,77 @@ AC_SUBST(OBJ_RESTORE)
1291 AC_SUBST(CC_SHOBJ_FLAG)
1292 AC_SUBST(BUILD_POPT)
1294 +AC_CHECK_HEADERS(sys/acl.h)
1295 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1296 +#################################################
1297 +# check for ACL support
1299 +AC_MSG_CHECKING(whether to support ACLs)
1300 +AC_ARG_ENABLE(acl-support,
1301 +AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
1302 +[ case "$enableval" in
1305 + case "$host_os" in
1307 + AC_MSG_RESULT(Using UnixWare ACLs)
1308 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1311 + AC_MSG_RESULT(Using solaris ACLs)
1312 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1315 + AC_MSG_RESULT(Using HPUX ACLs)
1316 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1319 + AC_MSG_RESULT(Using IRIX ACLs)
1320 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1323 + AC_MSG_RESULT(Using AIX ACLs)
1324 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1327 + AC_MSG_RESULT(Using Tru64 ACLs)
1328 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1329 + LIBS="$LIBS -lpacl"
1332 + AC_MSG_RESULT(ACLs requested -- running tests)
1333 + AC_CHECK_LIB(acl,acl_get_file)
1334 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1335 + AC_TRY_LINK([#include <sys/types.h>
1336 +#include <sys/acl.h>],
1337 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1338 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1339 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1340 + AC_MSG_RESULT(Using posix ACLs)
1341 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1342 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1343 + AC_TRY_LINK([#include <sys/types.h>
1344 +#include <sys/acl.h>],
1345 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1346 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1347 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1348 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1351 + AC_MSG_ERROR(Failed to find ACL support)
1358 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1361 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1365 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1370 @@ -44,6 +44,7 @@ extern int filesfrom_fd;
1371 extern int one_file_system;
1372 extern int copy_dirlinks;
1373 extern int keep_dirlinks;
1374 +extern int preserve_acls;
1375 extern int preserve_links;
1376 extern int preserve_hard_links;
1377 extern int preserve_devices;
1378 @@ -966,6 +967,10 @@ static struct file_struct *send_file_nam
1379 f == -2 ? SERVER_FILTERS : ALL_FILTERS);
1382 +#ifdef SUPPORT_ACLS
1383 + if (preserve_acls && make_acl(file, fname) < 0)
1387 if (chmod_modes && !S_ISLNK(file->mode))
1388 file->mode = tweak_mode(file->mode, chmod_modes);
1389 @@ -977,6 +982,16 @@ static struct file_struct *send_file_nam
1390 if (file->basename[0]) {
1391 flist->files[flist->count++] = file;
1392 send_file_entry(file, f);
1393 +#ifdef SUPPORT_ACLS
1394 + if (preserve_acls)
1395 + send_acl(file, f);
1398 +#ifdef SUPPORT_ACLS
1399 + /* Cleanup unsent ACL(s). */
1400 + if (preserve_acls)
1401 + send_acl(file, -1);
1406 @@ -1365,6 +1380,11 @@ struct file_list *recv_file_list(int f)
1407 flags |= read_byte(f) << 8;
1408 file = receive_file_entry(flist, flags, f);
1410 +#ifdef SUPPORT_ACLS
1411 + if (preserve_acls)
1412 + receive_acl(file, f);
1415 if (S_ISREG(file->mode) || S_ISLNK(file->mode))
1416 stats.total_size += file->length;
1418 @@ -1387,6 +1407,11 @@ struct file_list *recv_file_list(int f)
1420 clean_flist(flist, relative_paths, 1);
1422 +#ifdef SUPPORT_ACLS
1423 + if (preserve_acls)
1424 + sort_file_acl_index_lists();
1428 recv_uid_list(f, flist);
1432 @@ -85,6 +85,7 @@ extern long block_size; /* "long" becaus
1433 extern int max_delete;
1434 extern int force_delete;
1435 extern int one_file_system;
1436 +extern mode_t orig_umask;
1437 extern struct stats stats;
1438 extern dev_t filesystem_dev;
1439 extern char *backup_dir;
1440 @@ -753,6 +754,7 @@ static int try_dests_non(struct file_str
1443 static int phase = 0;
1444 +static int dflt_perms;
1446 /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
1447 * make sure it exists, and has the right permissions/timestamp info. For
1448 @@ -844,6 +846,10 @@ static void recv_generator(char *fname,
1451 need_fuzzy_dirlist = 1;
1452 +#ifdef SUPPORT_ACLS
1453 + if (!preserve_perms)
1454 + dflt_perms = default_perms_for_dir(dn);
1457 parent_dirname = dn;
1459 @@ -871,7 +877,8 @@ static void recv_generator(char *fname,
1460 if (!preserve_perms) {
1461 int exists = statret == 0
1462 && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
1463 - file->mode = dest_mode(file->mode, st.st_mode, exists);
1464 + file->mode = dest_mode(file->mode, st.st_mode, dflt_perms,
1468 if (S_ISDIR(file->mode)) {
1469 @@ -1343,6 +1350,8 @@ void generate_files(int f_out, struct fi
1470 * notice that and let us know via the redo pipe (or its closing). */
1473 + dflt_perms = (ACCESSPERMS & ~orig_umask);
1475 for (i = 0; i < flist->count; i++) {
1476 struct file_struct *file = flist->files[i];
1478 --- old/lib/sysacls.c
1479 +++ new/lib/sysacls.c
1482 + Unix SMB/CIFS implementation.
1483 + Samba system utilities for ACL support.
1484 + Copyright (C) Jeremy Allison 2000.
1486 + This program is free software; you can redistribute it and/or modify
1487 + it under the terms of the GNU General Public License as published by
1488 + the Free Software Foundation; either version 2 of the License, or
1489 + (at your option) any later version.
1491 + This program is distributed in the hope that it will be useful,
1492 + but WITHOUT ANY WARRANTY; without even the implied warranty of
1493 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1494 + GNU General Public License for more details.
1496 + You should have received a copy of the GNU General Public License
1497 + along with this program; if not, write to the Free Software
1498 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1502 +#include "sysacls.h" /****** ADDED ******/
1504 +/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
1505 +void SAFE_FREE(void *mem)
1511 +char *uidtoname(uid_t uid)
1513 + static char idbuf[12];
1514 + struct passwd *pw;
1516 + if ((pw = getpwuid(uid)) == NULL) {
1517 + slprintf(idbuf, sizeof(idbuf)-1, "%ld", (long)uid);
1520 + return pw->pw_name;
1522 +/****** EXTRAS -- END ******/
1525 + This file wraps all differing system ACL interfaces into a consistent
1526 + one based on the POSIX interface. It also returns the correct errors
1527 + for older UNIX systems that don't support ACLs.
1529 + The interfaces that each ACL implementation must support are as follows :
1531 + int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1532 + int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1533 + int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
1534 + void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
1535 + SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
1536 + SMB_ACL_T sys_acl_get_fd(int fd)
1537 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
1538 + int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
1539 + char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
1540 + SMB_ACL_T sys_acl_init( int count)
1541 + int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1542 + int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1543 + int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
1544 + int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1545 + int sys_acl_valid( SMB_ACL_T theacl )
1546 + int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1547 + int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
1548 + int sys_acl_delete_def_file(const char *path)
1550 + This next one is not POSIX complient - but we *have* to have it !
1551 + More POSIX braindamage.
1553 + int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1555 + The generic POSIX free is the following call. We split this into
1556 + several different free functions as we may need to add tag info
1557 + to structures when emulating the POSIX interface.
1559 + int sys_acl_free( void *obj_p)
1561 + The calls we actually use are :
1563 + int sys_acl_free_text(char *text) - free acl_to_text
1564 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
1565 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
1569 +#if defined(HAVE_POSIX_ACLS)
1571 +/* Identity mapping - easy. */
1573 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1575 + return acl_get_entry( the_acl, entry_id, entry_p);
1578 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1580 + return acl_get_tag_type( entry_d, tag_type_p);
1583 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
1585 + return acl_get_permset( entry_d, permset_p);
1588 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
1590 + return acl_get_qualifier( entry_d);
1593 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
1595 + return acl_get_file( path_p, type);
1598 +SMB_ACL_T sys_acl_get_fd(int fd)
1600 + return acl_get_fd(fd);
1603 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
1605 + return acl_clear_perms(permset);
1608 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1610 + return acl_add_perm(permset, perm);
1613 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1615 +#if defined(HAVE_ACL_GET_PERM_NP)
1617 + * Required for TrustedBSD-based ACL implementations where
1618 + * non-POSIX.1e functions are denoted by a _np (non-portable)
1621 + return acl_get_perm_np(permset, perm);
1623 + return acl_get_perm(permset, perm);
1627 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
1629 + return acl_to_text( the_acl, plen);
1632 +SMB_ACL_T sys_acl_init( int count)
1634 + return acl_init(count);
1637 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1639 + return acl_create_entry(pacl, pentry);
1642 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1644 + return acl_set_tag_type(entry, tagtype);
1647 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
1649 + return acl_set_qualifier(entry, qual);
1652 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1654 + return acl_set_permset(entry, permset);
1657 +int sys_acl_valid( SMB_ACL_T theacl )
1659 + return acl_valid(theacl);
1662 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1664 + return acl_set_file(name, acltype, theacl);
1667 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
1669 + return acl_set_fd(fd, theacl);
1672 +int sys_acl_delete_def_file(const char *name)
1674 + return acl_delete_def_file(name);
1677 +int sys_acl_free_text(char *text)
1679 + return acl_free(text);
1682 +int sys_acl_free_acl(SMB_ACL_T the_acl)
1684 + return acl_free(the_acl);
1687 +int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
1689 + return acl_free(qual);
1692 +#elif defined(HAVE_TRU64_ACLS)
1694 + * The interface to DEC/Compaq Tru64 UNIX ACLs
1695 + * is based on Draft 13 of the POSIX spec which is
1696 + * slightly different from the Draft 16 interface.
1698 + * Also, some of the permset manipulation functions
1699 + * such as acl_clear_perm() and acl_add_perm() appear
1700 + * to be broken on Tru64 so we have to manipulate
1701 + * the permission bits in the permset directly.
1703 +int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1705 + SMB_ACL_ENTRY_T entry;
1707 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
1712 + if ((entry = acl_get_entry(the_acl)) != NULL) {
1717 + return errno ? -1 : 0;
1720 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1722 + return acl_get_tag_type( entry_d, tag_type_p);
1725 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
1727 + return acl_get_permset( entry_d, permset_p);
1730 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
1732 + return acl_get_qualifier( entry_d);
1735 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
1737 + return acl_get_file((char *)path_p, type);
1740 +SMB_ACL_T sys_acl_get_fd(int fd)
1742 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
1745 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
1747 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
1752 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1754 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
1759 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
1764 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1766 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
1769 +char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
1771 + return acl_to_text( the_acl, plen);
1774 +SMB_ACL_T sys_acl_init( int count)
1776 + return acl_init(count);
1779 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1781 + SMB_ACL_ENTRY_T entry;
1783 + if ((entry = acl_create_entry(pacl)) == NULL) {
1791 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1793 + return acl_set_tag_type(entry, tagtype);
1796 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
1798 + return acl_set_qualifier(entry, qual);
1801 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1803 + return acl_set_permset(entry, permset);
1806 +int sys_acl_valid( SMB_ACL_T theacl )
1808 + acl_entry_t entry;
1810 + return acl_valid(theacl, &entry);
1813 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1815 + return acl_set_file((char *)name, acltype, theacl);
1818 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
1820 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
1823 +int sys_acl_delete_def_file(const char *name)
1825 + return acl_delete_def_file((char *)name);
1828 +int sys_acl_free_text(char *text)
1831 + * (void) cast and explicit return 0 are for DEC UNIX
1832 + * which just #defines acl_free_text() to be free()
1834 + (void) acl_free_text(text);
1838 +int sys_acl_free_acl(SMB_ACL_T the_acl)
1840 + return acl_free(the_acl);
1843 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
1845 + return acl_free_qualifier(qual, tagtype);
1848 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
1851 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
1852 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
1856 + * Note that while this code implements sufficient functionality
1857 + * to support the sys_acl_* interfaces it does not provide all
1858 + * of the semantics of the POSIX ACL interfaces.
1860 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
1861 + * from a call to sys_acl_get_entry() should not be assumed to be
1862 + * valid after calling any of the following functions, which may
1863 + * reorder the entries in the ACL.
1866 + * sys_acl_set_file()
1867 + * sys_acl_set_fd()
1871 + * The only difference between Solaris and UnixWare / OpenUNIX is
1872 + * that the #defines for the ACL operations have different names
1874 +#if defined(HAVE_UNIXWARE_ACLS)
1876 +#define SETACL ACL_SET
1877 +#define GETACL ACL_GET
1878 +#define GETACLCNT ACL_CNT
1883 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1885 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
1890 + if (entry_p == NULL) {
1895 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
1899 + if (acl_d->next < 0) {
1904 + if (acl_d->next >= acl_d->count) {
1908 + *entry_p = &acl_d->acl[acl_d->next++];
1913 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
1915 + *type_p = entry_d->a_type;
1920 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
1922 + *permset_p = &entry_d->a_perm;
1927 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
1929 + if (entry_d->a_type != SMB_ACL_USER
1930 + && entry_d->a_type != SMB_ACL_GROUP) {
1935 + return &entry_d->a_id;
1939 + * There is no way of knowing what size the ACL returned by
1940 + * GETACL will be unless you first call GETACLCNT which means
1941 + * making an additional system call.
1943 + * In the hope of avoiding the cost of the additional system
1944 + * call in most cases, we initially allocate enough space for
1945 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
1946 + * be too small then we use GETACLCNT to find out the actual
1947 + * size, reallocate the ACL buffer, and then call GETACL again.
1950 +#define INITIAL_ACL_SIZE 16
1952 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
1955 + int count; /* # of ACL entries allocated */
1956 + int naccess; /* # of access ACL entries */
1957 + int ndefault; /* # of default ACL entries */
1959 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
1964 + count = INITIAL_ACL_SIZE;
1965 + if ((acl_d = sys_acl_init(count)) == NULL) {
1970 + * If there isn't enough space for the ACL entries we use
1971 + * GETACLCNT to determine the actual number of ACL entries
1972 + * reallocate and try again. This is in a loop because it
1973 + * is possible that someone else could modify the ACL and
1974 + * increase the number of entries between the call to
1975 + * GETACLCNT and the call to GETACL.
1977 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
1978 + && errno == ENOSPC) {
1980 + sys_acl_free_acl(acl_d);
1982 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
1986 + if ((acl_d = sys_acl_init(count)) == NULL) {
1992 + sys_acl_free_acl(acl_d);
1997 + * calculate the number of access and default ACL entries
1999 + * Note: we assume that the acl() system call returned a
2000 + * well formed ACL which is sorted so that all of the
2001 + * access ACL entries preceed any default ACL entries
2003 + for (naccess = 0; naccess < count; naccess++) {
2004 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2007 + ndefault = count - naccess;
2010 + * if the caller wants the default ACL we have to copy
2011 + * the entries down to the start of the acl[] buffer
2012 + * and mask out the ACL_DEFAULT flag from the type field
2014 + if (type == SMB_ACL_TYPE_DEFAULT) {
2017 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2018 + acl_d->acl[i] = acl_d->acl[j];
2019 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2022 + acl_d->count = ndefault;
2024 + acl_d->count = naccess;
2030 +SMB_ACL_T sys_acl_get_fd(int fd)
2033 + int count; /* # of ACL entries allocated */
2034 + int naccess; /* # of access ACL entries */
2036 + count = INITIAL_ACL_SIZE;
2037 + if ((acl_d = sys_acl_init(count)) == NULL) {
2041 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2042 + && errno == ENOSPC) {
2044 + sys_acl_free_acl(acl_d);
2046 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2050 + if ((acl_d = sys_acl_init(count)) == NULL) {
2056 + sys_acl_free_acl(acl_d);
2061 + * calculate the number of access ACL entries
2063 + for (naccess = 0; naccess < count; naccess++) {
2064 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2068 + acl_d->count = naccess;
2073 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2080 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2082 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2083 + && perm != SMB_ACL_EXECUTE) {
2088 + if (permset_d == NULL) {
2093 + *permset_d |= perm;
2098 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2100 + return *permset_d & perm;
2103 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2110 + * use an initial estimate of 20 bytes per ACL entry
2111 + * when allocating memory for the text representation
2115 + maxlen = 20 * acl_d->count;
2116 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
2121 + for (i = 0; i < acl_d->count; i++) {
2122 + struct acl *ap = &acl_d->acl[i];
2123 + struct passwd *pw;
2132 + switch (ap->a_type) {
2134 + * for debugging purposes it's probably more
2135 + * useful to dump unknown tag types rather
2136 + * than just returning an error
2139 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
2142 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2147 + case SMB_ACL_USER:
2148 + id = uidtoname(ap->a_id);
2149 + case SMB_ACL_USER_OBJ:
2153 + case SMB_ACL_GROUP:
2154 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2155 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2161 + case SMB_ACL_GROUP_OBJ:
2165 + case SMB_ACL_OTHER:
2169 + case SMB_ACL_MASK:
2175 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
2176 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
2177 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
2180 + /* <tag> : <qualifier> : rwx \n \0 */
2181 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
2184 + * If this entry would overflow the buffer
2185 + * allocate enough additional memory for this
2186 + * entry and an estimate of another 20 bytes
2187 + * for each entry still to be processed
2189 + if ((len + nbytes) > maxlen) {
2190 + char *oldtext = text;
2192 + maxlen += nbytes + 20 * (acl_d->count - i);
2194 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
2195 + SAFE_FREE(oldtext);
2201 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
2202 + len += nbytes - 1;
2211 +SMB_ACL_T sys_acl_init(int count)
2221 + * note that since the definition of the structure pointed
2222 + * to by the SMB_ACL_T includes the first element of the
2223 + * acl[] array, this actually allocates an ACL with room
2224 + * for (count+1) entries
2226 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
2231 + a->size = count + 1;
2239 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
2242 + SMB_ACL_ENTRY_T entry_d;
2244 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
2249 + if (acl_d->count >= acl_d->size) {
2254 + entry_d = &acl_d->acl[acl_d->count++];
2255 + entry_d->a_type = 0;
2256 + entry_d->a_id = -1;
2257 + entry_d->a_perm = 0;
2258 + *entry_p = entry_d;
2263 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
2265 + switch (tag_type) {
2266 + case SMB_ACL_USER:
2267 + case SMB_ACL_USER_OBJ:
2268 + case SMB_ACL_GROUP:
2269 + case SMB_ACL_GROUP_OBJ:
2270 + case SMB_ACL_OTHER:
2271 + case SMB_ACL_MASK:
2272 + entry_d->a_type = tag_type;
2282 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
2284 + if (entry_d->a_type != SMB_ACL_GROUP
2285 + && entry_d->a_type != SMB_ACL_USER) {
2290 + entry_d->a_id = *((id_t *)qual_p);
2295 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
2297 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
2301 + entry_d->a_perm = *permset_d;
2307 + * sort the ACL and check it for validity
2309 + * if it's a minimal ACL with only 4 entries then we
2310 + * need to recalculate the mask permissions to make
2311 + * sure that they are the same as the GROUP_OBJ
2312 + * permissions as required by the UnixWare acl() system call.
2314 + * (note: since POSIX allows minimal ACLs which only contain
2315 + * 3 entries - ie there is no mask entry - we should, in theory,
2316 + * check for this and add a mask entry if necessary - however
2317 + * we "know" that the caller of this interface always specifies
2318 + * a mask so, in practice "this never happens" (tm) - if it *does*
2319 + * happen aclsort() will fail and return an error and someone will
2320 + * have to fix it ...)
2323 +static int acl_sort(SMB_ACL_T acl_d)
2325 + int fixmask = (acl_d->count <= 4);
2327 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
2334 +int sys_acl_valid(SMB_ACL_T acl_d)
2336 + return acl_sort(acl_d);
2339 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
2342 + struct acl *acl_p;
2344 + struct acl *acl_buf = NULL;
2347 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2352 + if (acl_sort(acl_d) != 0) {
2356 + acl_p = &acl_d->acl[0];
2357 + acl_count = acl_d->count;
2360 + * if it's a directory there is extra work to do
2361 + * since the acl() system call will replace both
2362 + * the access ACLs and the default ACLs (if any)
2364 + if (stat(name, &s) != 0) {
2367 + if (S_ISDIR(s.st_mode)) {
2368 + SMB_ACL_T acc_acl;
2369 + SMB_ACL_T def_acl;
2370 + SMB_ACL_T tmp_acl;
2373 + if (type == SMB_ACL_TYPE_ACCESS) {
2375 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
2379 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
2382 + if (tmp_acl == NULL) {
2387 + * allocate a temporary buffer for the complete ACL
2389 + acl_count = acc_acl->count + def_acl->count;
2390 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
2392 + if (acl_buf == NULL) {
2393 + sys_acl_free_acl(tmp_acl);
2399 + * copy the access control and default entries into the buffer
2401 + memcpy(&acl_buf[0], &acc_acl->acl[0],
2402 + acc_acl->count * sizeof(acl_buf[0]));
2404 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
2405 + def_acl->count * sizeof(acl_buf[0]));
2408 + * set the ACL_DEFAULT flag on the default entries
2410 + for (i = acc_acl->count; i < acl_count; i++) {
2411 + acl_buf[i].a_type |= ACL_DEFAULT;
2414 + sys_acl_free_acl(tmp_acl);
2416 + } else if (type != SMB_ACL_TYPE_ACCESS) {
2421 + ret = acl(name, SETACL, acl_count, acl_p);
2423 + SAFE_FREE(acl_buf);
2428 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
2430 + if (acl_sort(acl_d) != 0) {
2434 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
2437 +int sys_acl_delete_def_file(const char *path)
2443 + * fetching the access ACL and rewriting it has
2444 + * the effect of deleting the default ACL
2446 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
2450 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
2452 + sys_acl_free_acl(acl_d);
2457 +int sys_acl_free_text(char *text)
2463 +int sys_acl_free_acl(SMB_ACL_T acl_d)
2469 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2474 +#elif defined(HAVE_HPUX_ACLS)
2478 + * Based on the Solaris/SCO code - with modifications.
2482 + * Note that while this code implements sufficient functionality
2483 + * to support the sys_acl_* interfaces it does not provide all
2484 + * of the semantics of the POSIX ACL interfaces.
2486 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2487 + * from a call to sys_acl_get_entry() should not be assumed to be
2488 + * valid after calling any of the following functions, which may
2489 + * reorder the entries in the ACL.
2492 + * sys_acl_set_file()
2493 + * sys_acl_set_fd()
2496 +/* This checks if the POSIX ACL system call is defined */
2497 +/* which basically corresponds to whether JFS 3.3 or */
2498 +/* higher is installed. If acl() was called when it */
2499 +/* isn't defined, it causes the process to core dump */
2500 +/* so it is important to check this and avoid acl() */
2501 +/* calls if it isn't there. */
2503 +static BOOL hpux_acl_call_presence(void)
2506 + shl_t handle = NULL;
2509 + static BOOL already_checked=0;
2511 + if(already_checked)
2515 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
2517 + if(ret_val != 0) {
2518 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
2519 + ret_val, errno, strerror(errno)));
2520 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
2524 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
2526 + already_checked = True;
2530 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2532 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2537 + if (entry_p == NULL) {
2542 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2546 + if (acl_d->next < 0) {
2551 + if (acl_d->next >= acl_d->count) {
2555 + *entry_p = &acl_d->acl[acl_d->next++];
2560 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2562 + *type_p = entry_d->a_type;
2567 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2569 + *permset_p = &entry_d->a_perm;
2574 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2576 + if (entry_d->a_type != SMB_ACL_USER
2577 + && entry_d->a_type != SMB_ACL_GROUP) {
2582 + return &entry_d->a_id;
2586 + * There is no way of knowing what size the ACL returned by
2587 + * ACL_GET will be unless you first call ACL_CNT which means
2588 + * making an additional system call.
2590 + * In the hope of avoiding the cost of the additional system
2591 + * call in most cases, we initially allocate enough space for
2592 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2593 + * be too small then we use ACL_CNT to find out the actual
2594 + * size, reallocate the ACL buffer, and then call ACL_GET again.
2597 +#define INITIAL_ACL_SIZE 16
2599 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2602 + int count; /* # of ACL entries allocated */
2603 + int naccess; /* # of access ACL entries */
2604 + int ndefault; /* # of default ACL entries */
2606 + if(hpux_acl_call_presence() == False) {
2607 + /* Looks like we don't have the acl() system call on HPUX.
2608 + * May be the system doesn't have the latest version of JFS.
2613 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2618 + count = INITIAL_ACL_SIZE;
2619 + if ((acl_d = sys_acl_init(count)) == NULL) {
2624 + * If there isn't enough space for the ACL entries we use
2625 + * ACL_CNT to determine the actual number of ACL entries
2626 + * reallocate and try again. This is in a loop because it
2627 + * is possible that someone else could modify the ACL and
2628 + * increase the number of entries between the call to
2629 + * ACL_CNT and the call to ACL_GET.
2631 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
2633 + sys_acl_free_acl(acl_d);
2635 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
2639 + if ((acl_d = sys_acl_init(count)) == NULL) {
2645 + sys_acl_free_acl(acl_d);
2650 + * calculate the number of access and default ACL entries
2652 + * Note: we assume that the acl() system call returned a
2653 + * well formed ACL which is sorted so that all of the
2654 + * access ACL entries preceed any default ACL entries
2656 + for (naccess = 0; naccess < count; naccess++) {
2657 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2660 + ndefault = count - naccess;
2663 + * if the caller wants the default ACL we have to copy
2664 + * the entries down to the start of the acl[] buffer
2665 + * and mask out the ACL_DEFAULT flag from the type field
2667 + if (type == SMB_ACL_TYPE_DEFAULT) {
2670 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2671 + acl_d->acl[i] = acl_d->acl[j];
2672 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2675 + acl_d->count = ndefault;
2677 + acl_d->count = naccess;
2683 +SMB_ACL_T sys_acl_get_fd(int fd)
2686 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
2689 + files_struct *fsp = file_find_fd(fd);
2691 + if (fsp == NULL) {
2697 + * We know we're in the same conn context. So we
2698 + * can use the relative path.
2701 + return sys_acl_get_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
2704 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2711 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2713 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2714 + && perm != SMB_ACL_EXECUTE) {
2719 + if (permset_d == NULL) {
2724 + *permset_d |= perm;
2729 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2731 + return *permset_d & perm;
2734 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2741 + * use an initial estimate of 20 bytes per ACL entry
2742 + * when allocating memory for the text representation
2746 + maxlen = 20 * acl_d->count;
2747 + if ((text = SMB_MALLOC(maxlen)) == NULL) {
2752 + for (i = 0; i < acl_d->count; i++) {
2753 + struct acl *ap = &acl_d->acl[i];
2754 + struct passwd *pw;
2763 + switch (ap->a_type) {
2765 + * for debugging purposes it's probably more
2766 + * useful to dump unknown tag types rather
2767 + * than just returning an error
2770 + slprintf(tagbuf, sizeof(tagbuf)-1, "0x%x",
2773 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2778 + case SMB_ACL_USER:
2779 + id = uidtoname(ap->a_id);
2780 + case SMB_ACL_USER_OBJ:
2784 + case SMB_ACL_GROUP:
2785 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2786 + slprintf(idbuf, sizeof(idbuf)-1, "%ld",
2792 + case SMB_ACL_GROUP_OBJ:
2796 + case SMB_ACL_OTHER:
2800 + case SMB_ACL_MASK:
2806 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
2807 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
2808 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
2811 + /* <tag> : <qualifier> : rwx \n \0 */
2812 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
2815 + * If this entry would overflow the buffer
2816 + * allocate enough additional memory for this
2817 + * entry and an estimate of another 20 bytes
2818 + * for each entry still to be processed
2820 + if ((len + nbytes) > maxlen) {
2821 + char *oldtext = text;
2823 + maxlen += nbytes + 20 * (acl_d->count - i);
2825 + if ((text = SMB_REALLOC(oldtext, maxlen)) == NULL) {
2832 + slprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
2833 + len += nbytes - 1;
2842 +SMB_ACL_T sys_acl_init(int count)
2852 + * note that since the definition of the structure pointed
2853 + * to by the SMB_ACL_T includes the first element of the
2854 + * acl[] array, this actually allocates an ACL with room
2855 + * for (count+1) entries
2857 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
2862 + a->size = count + 1;
2870 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
2873 + SMB_ACL_ENTRY_T entry_d;
2875 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
2880 + if (acl_d->count >= acl_d->size) {
2885 + entry_d = &acl_d->acl[acl_d->count++];
2886 + entry_d->a_type = 0;
2887 + entry_d->a_id = -1;
2888 + entry_d->a_perm = 0;
2889 + *entry_p = entry_d;
2894 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
2896 + switch (tag_type) {
2897 + case SMB_ACL_USER:
2898 + case SMB_ACL_USER_OBJ:
2899 + case SMB_ACL_GROUP:
2900 + case SMB_ACL_GROUP_OBJ:
2901 + case SMB_ACL_OTHER:
2902 + case SMB_ACL_MASK:
2903 + entry_d->a_type = tag_type;
2913 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
2915 + if (entry_d->a_type != SMB_ACL_GROUP
2916 + && entry_d->a_type != SMB_ACL_USER) {
2921 + entry_d->a_id = *((id_t *)qual_p);
2926 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
2928 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
2932 + entry_d->a_perm = *permset_d;
2937 +/* Structure to capture the count for each type of ACE. */
2939 +struct hpux_acl_types {
2943 + int n_def_user_obj;
2948 + int n_def_group_obj;
2952 + int n_def_other_obj;
2955 + int n_def_class_obj;
2957 + int n_illegal_obj;
2961 + * Counts the different number of objects in a given array of ACL
2965 + * acl_count - Count of ACLs in the array of ACL strucutres.
2966 + * aclp - Array of ACL structures.
2967 + * acl_type_count - Pointer to acl_types structure. Should already be
2971 + * acl_type_count - This structure is filled up with counts of various
2975 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
2979 + memset(acl_type_count, 0, sizeof(struct hpux_acl_types));
2981 + for(i=0;i<acl_count;i++) {
2982 + switch(aclp[i].a_type) {
2984 + acl_type_count->n_user++;
2987 + acl_type_count->n_user_obj++;
2989 + case DEF_USER_OBJ:
2990 + acl_type_count->n_def_user_obj++;
2993 + acl_type_count->n_group++;
2996 + acl_type_count->n_group_obj++;
2998 + case DEF_GROUP_OBJ:
2999 + acl_type_count->n_def_group_obj++;
3002 + acl_type_count->n_other_obj++;
3004 + case DEF_OTHER_OBJ:
3005 + acl_type_count->n_def_other_obj++;
3008 + acl_type_count->n_class_obj++;
3010 + case DEF_CLASS_OBJ:
3011 + acl_type_count->n_def_class_obj++;
3014 + acl_type_count->n_def_user++;
3017 + acl_type_count->n_def_group++;
3020 + acl_type_count->n_illegal_obj++;
3026 +/* swap_acl_entries: Swaps two ACL entries.
3028 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3031 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3033 + struct acl temp_acl;
3035 + temp_acl.a_type = aclp0->a_type;
3036 + temp_acl.a_id = aclp0->a_id;
3037 + temp_acl.a_perm = aclp0->a_perm;
3039 + aclp0->a_type = aclp1->a_type;
3040 + aclp0->a_id = aclp1->a_id;
3041 + aclp0->a_perm = aclp1->a_perm;
3043 + aclp1->a_type = temp_acl.a_type;
3044 + aclp1->a_id = temp_acl.a_id;
3045 + aclp1->a_perm = temp_acl.a_perm;
3048 +/* prohibited_duplicate_type
3049 + * Identifies if given ACL type can have duplicate entries or
3052 + * Inputs: acl_type - ACL Type.
3058 + * True - If the ACL type matches any of the prohibited types.
3059 + * False - If the ACL type doesn't match any of the prohibited types.
3062 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
3064 + switch(acl_type) {
3075 +/* get_needed_class_perm
3076 + * Returns the permissions of a ACL structure only if the ACL
3077 + * type matches one of the pre-determined types for computing
3078 + * CLASS_OBJ permissions.
3080 + * Inputs: aclp - Pointer to ACL structure.
3083 +static int hpux_get_needed_class_perm(struct acl *aclp)
3085 + switch(aclp->a_type) {
3089 + case DEF_USER_OBJ:
3091 + case DEF_GROUP_OBJ:
3093 + case DEF_CLASS_OBJ:
3094 + case DEF_OTHER_OBJ:
3095 + return aclp->a_perm;
3101 +/* acl_sort for HPUX.
3102 + * Sorts the array of ACL structures as per the description in
3103 + * aclsort man page. Refer to aclsort man page for more details
3107 + * acl_count - Count of ACLs in the array of ACL structures.
3108 + * calclass - If this is not zero, then we compute the CLASS_OBJ
3110 + * aclp - Array of ACL structures.
3114 + * aclp - Sorted array of ACL structures.
3118 + * Returns 0 for success -1 for failure. Prints a message to the Samba
3119 + * debug log in case of failure.
3122 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
3124 +#if !defined(HAVE_HPUX_ACLSORT)
3126 + * The aclsort() system call is availabe on the latest HPUX General
3127 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
3128 + * function. Because, we don't want to update to a new
3129 + * HPUX GR bundle just for aclsort() call.
3132 + struct hpux_acl_types acl_obj_count;
3133 + int n_class_obj_perm = 0;
3137 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
3141 + if(aclp == NULL) {
3142 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
3146 + /* Count different types of ACLs in the ACLs array */
3148 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
3150 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
3151 + * CLASS_OBJ and OTHER_OBJ
3154 + if( (acl_obj_count.n_user_obj != 1) ||
3155 + (acl_obj_count.n_group_obj != 1) ||
3156 + (acl_obj_count.n_class_obj != 1) ||
3157 + (acl_obj_count.n_other_obj != 1)
3159 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
3160 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
3164 + /* If any of the default objects are present, there should be only
3165 + * one of them each.
3168 + if( (acl_obj_count.n_def_user_obj > 1) || (acl_obj_count.n_def_group_obj > 1) ||
3169 + (acl_obj_count.n_def_other_obj > 1) || (acl_obj_count.n_def_class_obj > 1) ) {
3170 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
3171 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
3175 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
3178 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
3179 + * same ACL type, sort by ACL id.
3181 + * I am using the trival kind of sorting method here because, performance isn't
3182 + * really effected by the ACLs feature. More over there aren't going to be more
3183 + * than 17 entries on HPUX.
3186 + for(i=0; i<acl_count;i++) {
3187 + for (j=i+1; j<acl_count; j++) {
3188 + if( aclp[i].a_type > aclp[j].a_type ) {
3189 + /* ACL entries out of order, swap them */
3191 + hpux_swap_acl_entries((aclp+i), (aclp+j));
3193 + } else if ( aclp[i].a_type == aclp[j].a_type ) {
3195 + /* ACL entries of same type, sort by id */
3197 + if(aclp[i].a_id > aclp[j].a_id) {
3198 + hpux_swap_acl_entries((aclp+i), (aclp+j));
3199 + } else if (aclp[i].a_id == aclp[j].a_id) {
3200 + /* We have a duplicate entry. */
3201 + if(hpux_prohibited_duplicate_type(aclp[i].a_type)) {
3202 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
3203 + aclp[i].a_type, aclp[i].a_id));
3212 + /* set the class obj permissions to the computed one. */
3214 + int n_class_obj_index = -1;
3216 + for(i=0;i<acl_count;i++) {
3217 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
3219 + if(aclp[i].a_type == CLASS_OBJ)
3220 + n_class_obj_index = i;
3222 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
3227 + return aclsort(acl_count, calclass, aclp);
3232 + * sort the ACL and check it for validity
3234 + * if it's a minimal ACL with only 4 entries then we
3235 + * need to recalculate the mask permissions to make
3236 + * sure that they are the same as the GROUP_OBJ
3237 + * permissions as required by the UnixWare acl() system call.
3239 + * (note: since POSIX allows minimal ACLs which only contain
3240 + * 3 entries - ie there is no mask entry - we should, in theory,
3241 + * check for this and add a mask entry if necessary - however
3242 + * we "know" that the caller of this interface always specifies
3243 + * a mask so, in practice "this never happens" (tm) - if it *does*
3244 + * happen aclsort() will fail and return an error and someone will
3245 + * have to fix it ...)
3248 +static int acl_sort(SMB_ACL_T acl_d)
3250 + int fixmask = (acl_d->count <= 4);
3252 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
3259 +int sys_acl_valid(SMB_ACL_T acl_d)
3261 + return acl_sort(acl_d);
3264 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3267 + struct acl *acl_p;
3269 + struct acl *acl_buf = NULL;
3272 + if(hpux_acl_call_presence() == False) {
3273 + /* Looks like we don't have the acl() system call on HPUX.
3274 + * May be the system doesn't have the latest version of JFS.
3280 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3285 + if (acl_sort(acl_d) != 0) {
3289 + acl_p = &acl_d->acl[0];
3290 + acl_count = acl_d->count;
3293 + * if it's a directory there is extra work to do
3294 + * since the acl() system call will replace both
3295 + * the access ACLs and the default ACLs (if any)
3297 + if (stat(name, &s) != 0) {
3300 + if (S_ISDIR(s.st_mode)) {
3301 + SMB_ACL_T acc_acl;
3302 + SMB_ACL_T def_acl;
3303 + SMB_ACL_T tmp_acl;
3306 + if (type == SMB_ACL_TYPE_ACCESS) {
3308 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3312 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3315 + if (tmp_acl == NULL) {
3320 + * allocate a temporary buffer for the complete ACL
3322 + acl_count = acc_acl->count + def_acl->count;
3323 + acl_p = acl_buf = SMB_MALLOC_ARRAY(struct acl, acl_count);
3325 + if (acl_buf == NULL) {
3326 + sys_acl_free_acl(tmp_acl);
3332 + * copy the access control and default entries into the buffer
3334 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3335 + acc_acl->count * sizeof(acl_buf[0]));
3337 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3338 + def_acl->count * sizeof(acl_buf[0]));
3341 + * set the ACL_DEFAULT flag on the default entries
3343 + for (i = acc_acl->count; i < acl_count; i++) {
3344 + acl_buf[i].a_type |= ACL_DEFAULT;
3347 + sys_acl_free_acl(tmp_acl);
3349 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3354 + ret = acl(name, ACL_SET, acl_count, acl_p);
3363 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3366 + * HPUX doesn't have the facl call. Fake it using the path.... JRA.
3369 + files_struct *fsp = file_find_fd(fd);
3371 + if (fsp == NULL) {
3376 + if (acl_sort(acl_d) != 0) {
3381 + * We know we're in the same conn context. So we
3382 + * can use the relative path.
3385 + return sys_acl_set_file(fsp->fsp_name, SMB_ACL_TYPE_ACCESS, acl_d);
3388 +int sys_acl_delete_def_file(const char *path)
3394 + * fetching the access ACL and rewriting it has
3395 + * the effect of deleting the default ACL
3397 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3401 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
3403 + sys_acl_free_acl(acl_d);
3408 +int sys_acl_free_text(char *text)
3414 +int sys_acl_free_acl(SMB_ACL_T acl_d)
3420 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
3425 +#elif defined(HAVE_IRIX_ACLS)
3427 +int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3429 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3434 + if (entry_p == NULL) {
3439 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3443 + if (acl_d->next < 0) {
3448 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
3452 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
3457 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3459 + *type_p = entry_d->ae_tag;
3464 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3466 + *permset_p = entry_d;
3471 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3473 + if (entry_d->ae_tag != SMB_ACL_USER
3474 + && entry_d->ae_tag != SMB_ACL_GROUP) {
3479 + return &entry_d->ae_id;
3482 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3486 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
3490 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
3495 + a->freeaclp = True;
3499 +SMB_ACL_T sys_acl_get_fd(int fd)
3503 + if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
3507 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
3512 + a->freeaclp = True;
3516 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3518 + permset_d->ae_perm = 0;
3523 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3525 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3526 + && perm != SMB_ACL_EXECUTE) {
3531 + if (permset_d == NULL) {
3536 + permset_d->ae_perm |= perm;
3541 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3543 + return permset_d->ae_perm & perm;
3546 +char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3548 + return acl_to_text(acl_d->aclp, len_p);
3551 +SMB_ACL_T sys_acl_init(int count)
3560 + if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
3566 + a->freeaclp = False;
3567 + a->aclp = (struct acl *)(&a->aclp + sizeof(struct acl *));
3568 + a->aclp->acl_cnt = 0;
3574 +int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3577 + SMB_ACL_ENTRY_T entry_d;
3579 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3584 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
3589 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
3590 + entry_d->ae_tag = 0;
3591 + entry_d->ae_id = 0;
3592 + entry_d->ae_perm = 0;
3593 + *entry_p = entry_d;
3598 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3600 + switch (tag_type) {
3601 + case SMB_ACL_USER:
3602 + case SMB_ACL_USER_OBJ:
3603 + case SMB_ACL_GROUP:
3604 + case SMB_ACL_GROUP_OBJ:
3605 + case SMB_ACL_OTHER:
3606 + case SMB_ACL_MASK:
3607 + entry_d->ae_tag = tag_type;
3617 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3619 + if (entry_d->ae_tag != SMB_ACL_GROUP
3620 + && entry_d->ae_tag != SMB_ACL_USER) {
3625 + entry_d->ae_id = *((id_t *)qual_p);
3630 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3632 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3636 + entry_d->ae_perm = permset_d->ae_perm;
3641 +int sys_acl_valid(SMB_ACL_T acl_d)
3643 + return acl_valid(acl_d->aclp);
3646 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3648 + return acl_set_file(name, type, acl_d->aclp);
3651 +int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3653 + return acl_set_fd(fd, acl_d->aclp);
3656 +int sys_acl_delete_def_file(const char *name)
3658 + return acl_delete_def_file(name);
3661 +int sys_acl_free_text(char *text)
3663 + return acl_free(text);
3666 +int sys_acl_free_acl(SMB_ACL_T acl_d)
3668 + if (acl_d->freeaclp) {
3669 + acl_free(acl_d->aclp);
3675 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
3680 +#elif defined(HAVE_AIX_ACLS)
3682 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
3684 +int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3686 + struct acl_entry_link *link;
3687 + struct new_acl_entry *entry;
3690 + DEBUG(10,("This is the count: %d\n",theacl->count));
3692 + /* Check if count was previously set to -1. *
3693 + * If it was, that means we reached the end *
3694 + * of the acl last time. */
3695 + if(theacl->count == -1)
3699 + /* To get to the next acl, traverse linked list until index *
3700 + * of acl matches the count we are keeping. This count is *
3701 + * incremented each time we return an acl entry. */
3703 + for(keep_going = 0; keep_going < theacl->count; keep_going++)
3704 + link = link->nextp;
3706 + entry = *entry_p = link->entryp;
3708 + DEBUG(10,("*entry_p is %d\n",entry_p));
3709 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
3711 + /* Increment count */
3713 + if(link->nextp == NULL)
3714 + theacl->count = -1;
3719 +int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
3721 + /* Initialize tag type */
3724 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
3726 + /* Depending on what type of entry we have, *
3727 + * return tag type. */
3728 + switch(entry_d->ace_id->id_type) {
3730 + *tag_type_p = SMB_ACL_USER;
3733 + *tag_type_p = SMB_ACL_GROUP;
3736 + case SMB_ACL_USER_OBJ:
3737 + case SMB_ACL_GROUP_OBJ:
3738 + case SMB_ACL_OTHER:
3739 + *tag_type_p = entry_d->ace_id->id_type;
3749 +int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3751 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
3752 + *permset_p = &entry_d->ace_access;
3753 + DEBUG(10,("**permset_p is %d\n",**permset_p));
3754 + if(!(**permset_p & S_IXUSR) &&
3755 + !(**permset_p & S_IWUSR) &&
3756 + !(**permset_p & S_IRUSR) &&
3757 + (**permset_p != 0))
3760 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
3764 +void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
3766 + return(entry_d->ace_id->id_data);
3769 +SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
3771 + struct acl *file_acl = (struct acl *)NULL;
3772 + struct acl_entry *acl_entry;
3773 + struct new_acl_entry *new_acl_entry;
3774 + struct ace_id *idp;
3775 + struct acl_entry_link *acl_entry_link;
3776 + struct acl_entry_link *acl_entry_link_head;
3781 + /* AIX has no DEFAULT */
3782 + if ( type == SMB_ACL_TYPE_DEFAULT )
3785 + /* Get the acl using statacl */
3787 + DEBUG(10,("Entering sys_acl_get_file\n"));
3788 + DEBUG(10,("path_p is %s\n",path_p));
3790 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
3792 + if(file_acl == NULL) {
3794 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
3798 + memset(file_acl,0,BUFSIZ);
3800 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
3802 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
3803 + SAFE_FREE(file_acl);
3807 + DEBUG(10,("Got facl and returned it\n"));
3809 + /* Point to the first acl entry in the acl */
3810 + acl_entry = file_acl->acl_ext;
3812 + /* Begin setting up the head of the linked list *
3813 + * that will be used for the storing the acl *
3814 + * in a way that is useful for the posix_acls.c *
3817 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
3818 + if(acl_entry_link_head == NULL)
3821 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
3822 + if(acl_entry_link->entryp == NULL) {
3823 + SAFE_FREE(file_acl);
3825 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
3829 + DEBUG(10,("acl_entry is %d\n",acl_entry));
3830 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
3832 + /* Check if the extended acl bit is on. *
3833 + * If it isn't, do not show the *
3834 + * contents of the acl since AIX intends *
3835 + * the extended info to remain unused */
3837 + if(file_acl->acl_mode & S_IXACL){
3838 + /* while we are not pointing to the very end */
3839 + while(acl_entry < acl_last(file_acl)) {
3840 + /* before we malloc anything, make sure this is */
3841 + /* a valid acl entry and one that we want to map */
3842 + idp = id_nxt(acl_entry->ace_id);
3843 + if((acl_entry->ace_type == ACC_SPECIFY ||
3844 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
3845 + acl_entry = acl_nxt(acl_entry);
3849 + idp = acl_entry->ace_id;
3851 + /* Check if this is the first entry in the linked list. *
3852 + * The first entry needs to keep prevp pointing to NULL *
3853 + * and already has entryp allocated. */
3855 + if(acl_entry_link_head->count != 0) {
3856 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
3858 + if(acl_entry_link->nextp == NULL) {
3859 + SAFE_FREE(file_acl);
3861 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
3865 + acl_entry_link->nextp->prevp = acl_entry_link;
3866 + acl_entry_link = acl_entry_link->nextp;
3867 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
3868 + if(acl_entry_link->entryp == NULL) {
3869 + SAFE_FREE(file_acl);
3871 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
3874 + acl_entry_link->nextp = NULL;
3877 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
3879 + /* Don't really need this since all types are going *
3880 + * to be specified but, it's better than leaving it 0 */
3882 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
3884 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
3886 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof(struct ace_id));
3888 + /* The access in the acl entries must be left shifted by *
3889 + * three bites, because they will ultimately be compared *
3890 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
3892 + switch(acl_entry->ace_type){
3895 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
3896 + acl_entry_link->entryp->ace_access <<= 6;
3897 + acl_entry_link_head->count++;
3900 + /* Since there is no way to return a DENY acl entry *
3901 + * change to PERMIT and then shift. */
3902 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
3903 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
3904 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
3905 + acl_entry_link->entryp->ace_access <<= 6;
3906 + acl_entry_link_head->count++;
3912 + DEBUG(10,("acl_entry = %d\n",acl_entry));
3913 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
3915 + acl_entry = acl_nxt(acl_entry);
3917 + } /* end of if enabled */
3919 + /* Since owner, group, other acl entries are not *
3920 + * part of the acl entries in an acl, they must *
3921 + * be dummied up to become part of the list. */
3923 + for( i = 1; i < 4; i++) {
3924 + DEBUG(10,("i is %d\n",i));
3925 + if(acl_entry_link_head->count != 0) {
3926 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
3927 + if(acl_entry_link->nextp == NULL) {
3928 + SAFE_FREE(file_acl);
3930 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
3934 + acl_entry_link->nextp->prevp = acl_entry_link;
3935 + acl_entry_link = acl_entry_link->nextp;
3936 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
3937 + if(acl_entry_link->entryp == NULL) {
3938 + SAFE_FREE(file_acl);
3940 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
3945 + acl_entry_link->nextp = NULL;
3947 + new_acl_entry = acl_entry_link->entryp;
3948 + idp = new_acl_entry->ace_id;
3950 + new_acl_entry->ace_len = sizeof(struct acl_entry);
3951 + new_acl_entry->ace_type = ACC_PERMIT;
3952 + idp->id_len = sizeof(struct ace_id);
3953 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
3954 + memset(idp->id_data,0,sizeof(uid_t));
3958 + new_acl_entry->ace_access = file_acl->g_access << 6;
3959 + idp->id_type = SMB_ACL_GROUP_OBJ;
3963 + new_acl_entry->ace_access = file_acl->o_access << 6;
3964 + idp->id_type = SMB_ACL_OTHER;
3968 + new_acl_entry->ace_access = file_acl->u_access << 6;
3969 + idp->id_type = SMB_ACL_USER_OBJ;
3977 + acl_entry_link_head->count++;
3978 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
3981 + acl_entry_link_head->count = 0;
3982 + SAFE_FREE(file_acl);
3984 + return(acl_entry_link_head);
3987 +SMB_ACL_T sys_acl_get_fd(int fd)
3989 + struct acl *file_acl = (struct acl *)NULL;
3990 + struct acl_entry *acl_entry;
3991 + struct new_acl_entry *new_acl_entry;
3992 + struct ace_id *idp;
3993 + struct acl_entry_link *acl_entry_link;
3994 + struct acl_entry_link *acl_entry_link_head;
3999 + /* Get the acl using fstatacl */
4001 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4002 + DEBUG(10,("fd is %d\n",fd));
4003 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4005 + if(file_acl == NULL) {
4007 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4011 + memset(file_acl,0,BUFSIZ);
4013 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4015 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4016 + SAFE_FREE(file_acl);
4020 + DEBUG(10,("Got facl and returned it\n"));
4022 + /* Point to the first acl entry in the acl */
4024 + acl_entry = file_acl->acl_ext;
4025 + /* Begin setting up the head of the linked list *
4026 + * that will be used for the storing the acl *
4027 + * in a way that is useful for the posix_acls.c *
4030 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4031 + if(acl_entry_link_head == NULL){
4032 + SAFE_FREE(file_acl);
4036 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4038 + if(acl_entry_link->entryp == NULL) {
4040 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4041 + SAFE_FREE(file_acl);
4045 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4046 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4048 + /* Check if the extended acl bit is on. *
4049 + * If it isn't, do not show the *
4050 + * contents of the acl since AIX intends *
4051 + * the extended info to remain unused */
4053 + if(file_acl->acl_mode & S_IXACL){
4054 + /* while we are not pointing to the very end */
4055 + while(acl_entry < acl_last(file_acl)) {
4056 + /* before we malloc anything, make sure this is */
4057 + /* a valid acl entry and one that we want to map */
4059 + idp = id_nxt(acl_entry->ace_id);
4060 + if((acl_entry->ace_type == ACC_SPECIFY ||
4061 + (acl_entry->ace_type == ACC_PERMIT)) && (idp != id_last(acl_entry))) {
4062 + acl_entry = acl_nxt(acl_entry);
4066 + idp = acl_entry->ace_id;
4068 + /* Check if this is the first entry in the linked list. *
4069 + * The first entry needs to keep prevp pointing to NULL *
4070 + * and already has entryp allocated. */
4072 + if(acl_entry_link_head->count != 0) {
4073 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4074 + if(acl_entry_link->nextp == NULL) {
4076 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4077 + SAFE_FREE(file_acl);
4080 + acl_entry_link->nextp->prevp = acl_entry_link;
4081 + acl_entry_link = acl_entry_link->nextp;
4082 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4083 + if(acl_entry_link->entryp == NULL) {
4085 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4086 + SAFE_FREE(file_acl);
4090 + acl_entry_link->nextp = NULL;
4093 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4095 + /* Don't really need this since all types are going *
4096 + * to be specified but, it's better than leaving it 0 */
4098 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4099 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4101 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof(struct ace_id));
4103 + /* The access in the acl entries must be left shifted by *
4104 + * three bites, because they will ultimately be compared *
4105 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4107 + switch(acl_entry->ace_type){
4110 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4111 + acl_entry_link->entryp->ace_access <<= 6;
4112 + acl_entry_link_head->count++;
4115 + /* Since there is no way to return a DENY acl entry *
4116 + * change to PERMIT and then shift. */
4117 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4118 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4119 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4120 + acl_entry_link->entryp->ace_access <<= 6;
4121 + acl_entry_link_head->count++;
4127 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4128 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4130 + acl_entry = acl_nxt(acl_entry);
4132 + } /* end of if enabled */
4134 + /* Since owner, group, other acl entries are not *
4135 + * part of the acl entries in an acl, they must *
4136 + * be dummied up to become part of the list. */
4138 + for( i = 1; i < 4; i++) {
4139 + DEBUG(10,("i is %d\n",i));
4140 + if(acl_entry_link_head->count != 0){
4141 + acl_entry_link->nextp = SMB_MALLOC_P(struct acl_entry_link);
4142 + if(acl_entry_link->nextp == NULL) {
4144 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4145 + SAFE_FREE(file_acl);
4149 + acl_entry_link->nextp->prevp = acl_entry_link;
4150 + acl_entry_link = acl_entry_link->nextp;
4151 + acl_entry_link->entryp = SMB_MALLOC_P(struct new_acl_entry);
4153 + if(acl_entry_link->entryp == NULL) {
4154 + SAFE_FREE(file_acl);
4156 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4161 + acl_entry_link->nextp = NULL;
4163 + new_acl_entry = acl_entry_link->entryp;
4164 + idp = new_acl_entry->ace_id;
4166 + new_acl_entry->ace_len = sizeof(struct acl_entry);
4167 + new_acl_entry->ace_type = ACC_PERMIT;
4168 + idp->id_len = sizeof(struct ace_id);
4169 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4170 + memset(idp->id_data,0,sizeof(uid_t));
4174 + new_acl_entry->ace_access = file_acl->g_access << 6;
4175 + idp->id_type = SMB_ACL_GROUP_OBJ;
4179 + new_acl_entry->ace_access = file_acl->o_access << 6;
4180 + idp->id_type = SMB_ACL_OTHER;
4184 + new_acl_entry->ace_access = file_acl->u_access << 6;
4185 + idp->id_type = SMB_ACL_USER_OBJ;
4192 + acl_entry_link_head->count++;
4193 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4196 + acl_entry_link_head->count = 0;
4197 + SAFE_FREE(file_acl);
4199 + return(acl_entry_link_head);
4202 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
4204 + *permset = *permset & ~0777;
4208 +int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4211 + (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
4215 + DEBUG(10,("This is the permset now: %d\n",*permset));
4219 +char *sys_acl_to_text( SMB_ACL_T theacl, ssize_t *plen)
4224 +SMB_ACL_T sys_acl_init( int count)
4226 + struct acl_entry_link *theacl = NULL;
4228 + DEBUG(10,("Entering sys_acl_init\n"));
4230 + theacl = SMB_MALLOC_P(struct acl_entry_link);
4231 + if(theacl == NULL) {
4233 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
4237 + theacl->count = 0;
4238 + theacl->nextp = NULL;
4239 + theacl->prevp = NULL;
4240 + theacl->entryp = NULL;
4241 + DEBUG(10,("Exiting sys_acl_init\n"));
4245 +int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
4247 + struct acl_entry_link *theacl;
4248 + struct acl_entry_link *acl_entryp;
4249 + struct acl_entry_link *temp_entry;
4252 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
4254 + theacl = acl_entryp = *pacl;
4256 + /* Get to the end of the acl before adding entry */
4258 + for(counting=0; counting < theacl->count; counting++){
4259 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
4260 + temp_entry = acl_entryp;
4261 + acl_entryp = acl_entryp->nextp;
4264 + if(theacl->count != 0){
4265 + temp_entry->nextp = acl_entryp = SMB_MALLOC_P(struct acl_entry_link);
4266 + if(acl_entryp == NULL) {
4268 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
4272 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
4273 + acl_entryp->prevp = temp_entry;
4274 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
4277 + *pentry = acl_entryp->entryp = SMB_MALLOC_P(struct new_acl_entry);
4278 + if(*pentry == NULL) {
4280 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
4284 + memset(*pentry,0,sizeof(struct new_acl_entry));
4285 + acl_entryp->entryp->ace_len = sizeof(struct acl_entry);
4286 + acl_entryp->entryp->ace_type = ACC_PERMIT;
4287 + acl_entryp->entryp->ace_id->id_len = sizeof(struct ace_id);
4288 + acl_entryp->nextp = NULL;
4290 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
4294 +int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
4296 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
4297 + entry->ace_id->id_type = tagtype;
4298 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
4299 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
4302 +int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
4304 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
4305 + memcpy(entry->ace_id->id_data,qual,sizeof(uid_t));
4306 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
4310 +int sys_acl_set_permset( SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
4312 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
4313 + if(!(*permset & S_IXUSR) &&
4314 + !(*permset & S_IWUSR) &&
4315 + !(*permset & S_IRUSR) &&
4319 + entry->ace_access = *permset;
4320 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
4321 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
4325 +int sys_acl_valid( SMB_ACL_T theacl )
4328 + int group_obj = 0;
4329 + int other_obj = 0;
4330 + struct acl_entry_link *acl_entry;
4332 + for(acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
4333 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
4334 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
4335 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
4338 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
4340 + if(user_obj != 1 || group_obj != 1 || other_obj != 1)
4346 +int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
4348 + struct acl_entry_link *acl_entry_link = NULL;
4349 + struct acl *file_acl = NULL;
4350 + struct acl *file_acl_temp = NULL;
4351 + struct acl_entry *acl_entry = NULL;
4352 + struct ace_id *ace_id = NULL;
4359 + DEBUG(10,("Entering sys_acl_set_file\n"));
4360 + DEBUG(10,("File name is %s\n",name));
4362 + /* AIX has no default ACL */
4363 + if(acltype == SMB_ACL_TYPE_DEFAULT)
4366 + acl_length = BUFSIZ;
4367 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4369 + if(file_acl == NULL) {
4371 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
4375 + memset(file_acl,0,BUFSIZ);
4377 + file_acl->acl_len = ACL_SIZ;
4378 + file_acl->acl_mode = S_IXACL;
4380 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
4381 + acl_entry_link->entryp->ace_access >>= 6;
4382 + id_type = acl_entry_link->entryp->ace_id->id_type;
4385 + case SMB_ACL_USER_OBJ:
4386 + file_acl->u_access = acl_entry_link->entryp->ace_access;
4388 + case SMB_ACL_GROUP_OBJ:
4389 + file_acl->g_access = acl_entry_link->entryp->ace_access;
4391 + case SMB_ACL_OTHER:
4392 + file_acl->o_access = acl_entry_link->entryp->ace_access;
4394 + case SMB_ACL_MASK:
4398 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
4399 + acl_length += sizeof(struct acl_entry);
4400 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
4401 + if(file_acl_temp == NULL) {
4402 + SAFE_FREE(file_acl);
4404 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
4408 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
4409 + SAFE_FREE(file_acl);
4410 + file_acl = file_acl_temp;
4413 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
4414 + file_acl->acl_len += sizeof(struct acl_entry);
4415 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
4416 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
4418 + /* In order to use this, we'll need to wait until we can get denies */
4419 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
4420 + acl_entry->ace_type = ACC_SPECIFY; */
4422 + acl_entry->ace_type = ACC_SPECIFY;
4424 + ace_id = acl_entry->ace_id;
4426 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
4427 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
4428 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
4429 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
4430 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof(uid_t));
4433 + rc = chacl(name,file_acl,file_acl->acl_len);
4434 + DEBUG(10,("errno is %d\n",errno));
4435 + DEBUG(10,("return code is %d\n",rc));
4436 + SAFE_FREE(file_acl);
4437 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
4441 +int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
4443 + struct acl_entry_link *acl_entry_link = NULL;
4444 + struct acl *file_acl = NULL;
4445 + struct acl *file_acl_temp = NULL;
4446 + struct acl_entry *acl_entry = NULL;
4447 + struct ace_id *ace_id = NULL;
4453 + DEBUG(10,("Entering sys_acl_set_fd\n"));
4454 + acl_length = BUFSIZ;
4455 + file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
4457 + if(file_acl == NULL) {
4459 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
4463 + memset(file_acl,0,BUFSIZ);
4465 + file_acl->acl_len = ACL_SIZ;
4466 + file_acl->acl_mode = S_IXACL;
4468 + for(acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
4469 + acl_entry_link->entryp->ace_access >>= 6;
4470 + id_type = acl_entry_link->entryp->ace_id->id_type;
4471 + DEBUG(10,("The id_type is %d\n",id_type));
4474 + case SMB_ACL_USER_OBJ:
4475 + file_acl->u_access = acl_entry_link->entryp->ace_access;
4477 + case SMB_ACL_GROUP_OBJ:
4478 + file_acl->g_access = acl_entry_link->entryp->ace_access;
4480 + case SMB_ACL_OTHER:
4481 + file_acl->o_access = acl_entry_link->entryp->ace_access;
4483 + case SMB_ACL_MASK:
4487 + if((file_acl->acl_len + sizeof(struct acl_entry)) > acl_length) {
4488 + acl_length += sizeof(struct acl_entry);
4489 + file_acl_temp = (struct acl *)SMB_MALLOC(acl_length);
4490 + if(file_acl_temp == NULL) {
4491 + SAFE_FREE(file_acl);
4493 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
4497 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
4498 + SAFE_FREE(file_acl);
4499 + file_acl = file_acl_temp;
4502 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
4503 + file_acl->acl_len += sizeof(struct acl_entry);
4504 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
4505 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
4507 + /* In order to use this, we'll need to wait until we can get denies */
4508 + /* if(!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
4509 + acl_entry->ace_type = ACC_SPECIFY; */
4511 + acl_entry->ace_type = ACC_SPECIFY;
4513 + ace_id = acl_entry->ace_id;
4515 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
4516 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
4517 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
4518 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof(uid_t));
4519 + memcpy(ace_id->id_data, &user_id, sizeof(uid_t));
4522 + rc = fchacl(fd,file_acl,file_acl->acl_len);
4523 + DEBUG(10,("errno is %d\n",errno));
4524 + DEBUG(10,("return code is %d\n",rc));
4525 + SAFE_FREE(file_acl);
4526 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
4530 +int sys_acl_delete_def_file(const char *name)
4532 + /* AIX has no default ACL */
4536 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4538 + return(*permset & perm);
4541 +int sys_acl_free_text(char *text)
4546 +int sys_acl_free_acl(SMB_ACL_T posix_acl)
4548 + struct acl_entry_link *acl_entry_link;
4550 + for(acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
4551 + SAFE_FREE(acl_entry_link->prevp->entryp);
4552 + SAFE_FREE(acl_entry_link->prevp);
4555 + SAFE_FREE(acl_entry_link->prevp->entryp);
4556 + SAFE_FREE(acl_entry_link->prevp);
4557 + SAFE_FREE(acl_entry_link->entryp);
4558 + SAFE_FREE(acl_entry_link);
4563 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4568 +#else /* No ACLs. */
4570 +int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
4576 +int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
4582 +int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
4588 +void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
4594 +SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
4597 + return (SMB_ACL_T)NULL;
4600 +SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
4603 + return (SMB_ACL_T)NULL;
4606 +int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
4612 +int sys_acl_add_perm( UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
4618 +int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4621 + return (permset & perm) ? 1 : 0;
4624 +char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
4630 +int sys_acl_free_text(UNUSED(char *text))
4636 +SMB_ACL_T sys_acl_init(UNUSED(int count))
4642 +int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
4648 +int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
4654 +int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
4660 +int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
4666 +int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
4672 +int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
4678 +int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
4684 +int sys_acl_delete_def_file(UNUSED(const char *name))
4690 +int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
4696 +int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
4702 +#endif /* No ACLs. */
4704 +/************************************************************************
4705 + Deliberately outside the ACL defines. Return 1 if this is a "no acls"
4707 +************************************************************************/
4709 +int no_acl_syscall_error(int err)
4711 +#if defined(ENOSYS)
4712 + if (err == ENOSYS) {
4716 +#if defined(ENOTSUP)
4717 + if (err == ENOTSUP) {
4723 --- old/lib/sysacls.h
4724 +++ new/lib/sysacls.h
4726 +#define SMB_MALLOC(cnt) new_array(char, cnt)
4727 +#define SMB_MALLOC_P(obj) new_array(obj, 1)
4728 +#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
4729 +#define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt)
4730 +#define slprintf snprintf
4732 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
4733 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
4734 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
4735 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d);
4736 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type);
4737 +SMB_ACL_T sys_acl_get_fd(int fd);
4738 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
4739 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
4740 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
4741 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen);
4742 +SMB_ACL_T sys_acl_init(int count);
4743 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry);
4744 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype);
4745 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual);
4746 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset);
4747 +int sys_acl_valid(SMB_ACL_T theacl);
4748 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
4749 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl);
4750 +int sys_acl_delete_def_file(const char *name);
4751 +int sys_acl_free_text(char *text);
4752 +int sys_acl_free_acl(SMB_ACL_T the_acl);
4753 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
4756 @@ -58,7 +58,7 @@ BEGIN {
4760 -!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
4761 +!/^OFF_T|^size_t|^off_t|^pid_t|^id_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
4767 @@ -45,6 +45,7 @@ int copy_dirlinks = 0;
4769 int preserve_links = 0;
4770 int preserve_hard_links = 0;
4771 +int preserve_acls = 0;
4772 int preserve_perms = 0;
4773 int preserve_executability = 0;
4774 int preserve_devices = 0;
4775 @@ -194,6 +195,7 @@ static void print_rsync_version(enum log
4776 char const *got_socketpair = "no ";
4777 char const *have_inplace = "no ";
4778 char const *hardlinks = "no ";
4779 + char const *acls = "no ";
4780 char const *links = "no ";
4781 char const *ipv6 = "no ";
4782 STRUCT_STAT *dumstat;
4783 @@ -210,6 +212,10 @@ static void print_rsync_version(enum log
4787 +#ifdef SUPPORT_ACLS
4791 #ifdef SUPPORT_LINKS
4794 @@ -223,9 +229,9 @@ static void print_rsync_version(enum log
4795 rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
4796 rprintf(f, "<http://rsync.samba.org/>\n");
4797 rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
4798 - "%shard links, %ssymlinks, batchfiles,\n",
4799 + "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
4800 (int) (sizeof (OFF_T) * 8),
4801 - got_socketpair, hardlinks, links);
4802 + got_socketpair, hardlinks, acls, links);
4804 /* Note that this field may not have type ino_t. It depends
4805 * on the complicated interaction between largefile feature
4806 @@ -295,6 +301,9 @@ void usage(enum logcode F)
4807 rprintf(F," -H, --hard-links preserve hard links\n");
4808 rprintf(F," -p, --perms preserve permissions\n");
4809 rprintf(F," -E, --executability preserve the file's executability\n");
4810 +#ifdef SUPPORT_ACLS
4811 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
4813 rprintf(F," --chmod=CHMOD change destination permissions\n");
4814 rprintf(F," -o, --owner preserve owner (super-user only)\n");
4815 rprintf(F," -g, --group preserve group\n");
4816 @@ -410,6 +419,9 @@ static struct poptOption long_options[]
4817 {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
4818 {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
4819 {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
4820 + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
4821 + {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
4822 + {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
4823 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
4824 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
4825 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
4826 @@ -1068,6 +1080,23 @@ int parse_arguments(int *argc, const cha
4831 +#ifdef SUPPORT_ACLS
4832 + preserve_acls = preserve_perms = 1;
4835 + /* FIXME: this should probably be ignored with a
4836 + * warning and then countermeasures taken to
4837 + * restrict group and other access in the presence
4838 + * of any more restrictive ACLs, but this is safe
4840 + snprintf(err_buf,sizeof(err_buf),
4841 + "ACLs are not supported on this %s\n",
4842 + am_server ? "server" : "client");
4848 /* A large opt value means that set_refuse_options()
4849 * turned this option off. */
4850 @@ -1511,6 +1540,10 @@ void server_options(char **args,int *arg
4852 if (preserve_hard_links)
4854 +#ifdef SUPPORT_ACLS
4855 + if (preserve_acls)
4856 + argstr[x++] = 'A';
4863 @@ -46,6 +46,7 @@ extern int keep_partial;
4864 extern int checksum_seed;
4866 extern int delay_updates;
4867 +extern mode_t orig_umask;
4868 extern struct stats stats;
4869 extern char *log_format;
4870 extern char *tmpdir;
4871 @@ -344,6 +345,10 @@ int recv_files(int f_in, struct file_lis
4872 int itemizing = am_daemon ? daemon_log_format_has_i
4873 : !am_server && log_format_has_i;
4874 int max_phase = protocol_version >= 29 ? 2 : 1;
4875 + int dflt_perms = (ACCESSPERMS & ~orig_umask);
4876 +#ifdef SUPPORT_ACLS
4877 + char *parent_dirname = "";
4882 @@ -541,7 +546,16 @@ int recv_files(int f_in, struct file_lis
4883 * mode based on the local permissions and some heuristics. */
4884 if (!preserve_perms) {
4885 int exists = fd1 != -1;
4886 - file->mode = dest_mode(file->mode, st.st_mode, exists);
4887 +#ifdef SUPPORT_ACLS
4888 + char *dn = file->dirname ? file->dirname : ".";
4889 + if (parent_dirname != dn
4890 + && strcmp(parent_dirname, dn) != 0) {
4891 + dflt_perms = default_perms_for_dir(dn);
4892 + parent_dirname = dn;
4895 + file->mode = dest_mode(file->mode, st.st_mode,
4896 + dflt_perms, exists);
4899 /* We now check to see if we are writing file "inplace" */
4905 extern int daemon_log_format_has_i;
4906 +extern int preserve_acls;
4907 extern int preserve_perms;
4908 extern int preserve_executability;
4909 extern int preserve_times;
4910 @@ -101,7 +102,8 @@ void free_sums(struct sum_struct *s)
4912 /* This is only called when we aren't preserving permissions. Figure out what
4913 * the permissions should be and return them merged back into the mode. */
4914 -mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int exists)
4915 +mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int dflt_perms,
4918 /* If the file already exists, we'll return the local permissions,
4919 * possibly tweaked by the --executability option. */
4920 @@ -116,7 +118,7 @@ mode_t dest_mode(mode_t flist_mode, mode
4921 cur_mode |= (cur_mode & 0444) >> 2;
4924 - cur_mode = flist_mode & ACCESSPERMS & ~orig_umask;
4925 + cur_mode = flist_mode & ACCESSPERMS & dflt_perms;
4926 if (daemon_chmod_modes && !S_ISLNK(flist_mode))
4927 cur_mode = tweak_mode(cur_mode, daemon_chmod_modes);
4928 return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
4929 @@ -203,6 +205,13 @@ int set_file_attrs(char *fname, struct f
4933 +#ifdef SUPPORT_ACLS
4934 + /* It's OK to call set_acl() now, even for a dir, as the generator
4935 + * will enable owner-writability using chmod, if necessary. */
4936 + if (preserve_acls && set_acl(fname, file, st->st_mode) == 0)
4941 if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
4942 int ret = do_chmod(fname, file->mode);
4945 @@ -658,6 +658,20 @@ struct chmod_mode_struct;
4947 #define UNUSED(x) x __attribute__((__unused__))
4949 +#if HAVE_POSIX_ACLS|HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|\
4950 + HAVE_HPUX_ACLS|HAVE_IRIX_ACLS|HAVE_AIX_ACLS|HAVE_TRU64_ACLS
4951 +#define SUPPORT_ACLS 1
4954 +#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
4955 +#define ACLS_NEED_MASK 1
4958 +#if defined SUPPORT_ACLS && defined HAVE_SYS_ACL_H
4959 +#include <sys/acl.h>
4961 +#include "smb_acls.h"
4965 /* We have replacement versions of these if they're missing. */
4968 @@ -321,6 +321,7 @@ to the detailed description below for a
4969 -H, --hard-links preserve hard links
4970 -p, --perms preserve permissions
4971 -E, --executability preserve executability
4972 + -A, --acls preserve ACLs (implies -p) [non-standard]
4973 --chmod=CHMOD change destination permissions
4974 -o, --owner preserve owner (super-user only)
4975 -g, --group preserve group
4976 @@ -742,7 +743,9 @@ quote(itemize(
4977 permissions, though the bf(--executability) option might change just
4978 the execute permission for the file.
4979 it() New files get their "normal" permission bits set to the source
4980 - file's permissions masked with the receiving end's umask setting, and
4981 + file's permissions masked with the receiving directory's default
4982 + permissions (either the receiving process's umask, or the permissions
4983 + specified via the destination directory's default ACL), and
4984 their special permission bits disabled except in the case where a new
4985 directory inherits a setgid bit from its parent directory.
4987 @@ -773,9 +776,11 @@ The preservation of the destination's se
4988 directories when bf(--perms) is off was added in rsync 2.6.7. Older rsync
4989 versions erroneously preserved the three special permission bits for
4990 newly-created files when bf(--perms) was off, while overriding the
4991 -destination's setgid bit setting on a newly-created directory. (Keep in
4992 -mind that it is the version of the receiving rsync that affects this
4994 +destination's setgid bit setting on a newly-created directory. Default ACL
4995 +observance was added to the ACL patch for rsync 2.6.7, so older (or
4996 +non-ACL-enabled) rsyncs use the umask even if default ACLs are present.
4997 +(Keep in mind that it is the version of the receiving rsync that affects
5000 dit(bf(-E, --executability)) This option causes rsync to preserve the
5001 executability (or non-executability) of regular files when bf(--perms) is
5002 @@ -793,6 +798,10 @@ quote(itemize(
5004 If bf(--perms) is enabled, this option is ignored.
5006 +dit(bf(-A, --acls)) This option causes rsync to update the destination
5007 +ACLs to be the same as the source ACLs. This nonstandard option only
5008 +works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
5010 dit(bf(--chmod)) This option tells rsync to apply one or more
5011 comma-separated "chmod" strings to the permission of the files in the
5012 transfer. The resulting value is treated as though it was the permissions
5017 + Unix SMB/Netbios implementation.
5019 + Portable SMB ACL interface
5020 + Copyright (C) Jeremy Allison 2000
5022 + This program is free software; you can redistribute it and/or modify
5023 + it under the terms of the GNU General Public License as published by
5024 + the Free Software Foundation; either version 2 of the License, or
5025 + (at your option) any later version.
5027 + This program is distributed in the hope that it will be useful,
5028 + but WITHOUT ANY WARRANTY; without even the implied warranty of
5029 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5030 + GNU General Public License for more details.
5032 + You should have received a copy of the GNU General Public License
5033 + along with this program; if not, write to the Free Software
5034 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
5037 +#ifndef _SMB_ACLS_H
5038 +#define _SMB_ACLS_H
5040 +#if defined HAVE_POSIX_ACLS
5042 +/* This is an identity mapping (just remove the SMB_). */
5044 +#define SMB_ACL_TAG_T acl_tag_t
5045 +#define SMB_ACL_TYPE_T acl_type_t
5046 +#define SMB_ACL_PERMSET_T acl_permset_t
5047 +#define SMB_ACL_PERM_T acl_perm_t
5048 +#define SMB_ACL_READ ACL_READ
5049 +#define SMB_ACL_WRITE ACL_WRITE
5050 +#define SMB_ACL_EXECUTE ACL_EXECUTE
5052 +/* Types of ACLs. */
5053 +#define SMB_ACL_USER ACL_USER
5054 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
5055 +#define SMB_ACL_GROUP ACL_GROUP
5056 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
5057 +#define SMB_ACL_OTHER ACL_OTHER
5058 +#define SMB_ACL_MASK ACL_MASK
5060 +#define SMB_ACL_T acl_t
5062 +#define SMB_ACL_ENTRY_T acl_entry_t
5064 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
5065 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
5067 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
5068 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
5070 +#elif defined HAVE_TRU64_ACLS
5072 +/* This is for DEC/Compaq Tru64 UNIX */
5074 +#define SMB_ACL_TAG_T acl_tag_t
5075 +#define SMB_ACL_TYPE_T acl_type_t
5076 +#define SMB_ACL_PERMSET_T acl_permset_t
5077 +#define SMB_ACL_PERM_T acl_perm_t
5078 +#define SMB_ACL_READ ACL_READ
5079 +#define SMB_ACL_WRITE ACL_WRITE
5080 +#define SMB_ACL_EXECUTE ACL_EXECUTE
5082 +/* Types of ACLs. */
5083 +#define SMB_ACL_USER ACL_USER
5084 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
5085 +#define SMB_ACL_GROUP ACL_GROUP
5086 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
5087 +#define SMB_ACL_OTHER ACL_OTHER
5088 +#define SMB_ACL_MASK ACL_MASK
5090 +#define SMB_ACL_T acl_t
5092 +#define SMB_ACL_ENTRY_T acl_entry_t
5094 +#define SMB_ACL_FIRST_ENTRY 0
5095 +#define SMB_ACL_NEXT_ENTRY 1
5097 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
5098 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
5100 +#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS
5102 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
5103 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
5106 +/* SVR4.2 ES/MP ACLs */
5107 +typedef int SMB_ACL_TAG_T;
5108 +typedef int SMB_ACL_TYPE_T;
5109 +typedef ushort *SMB_ACL_PERMSET_T;
5110 +typedef ushort SMB_ACL_PERM_T;
5111 +#define SMB_ACL_READ 4
5112 +#define SMB_ACL_WRITE 2
5113 +#define SMB_ACL_EXECUTE 1
5115 +/* Types of ACLs. */
5116 +#define SMB_ACL_USER USER
5117 +#define SMB_ACL_USER_OBJ USER_OBJ
5118 +#define SMB_ACL_GROUP GROUP
5119 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
5120 +#define SMB_ACL_OTHER OTHER_OBJ
5121 +#define SMB_ACL_MASK CLASS_OBJ
5123 +typedef struct SMB_ACL_T {
5127 + struct acl acl[1];
5130 +typedef struct acl *SMB_ACL_ENTRY_T;
5132 +#define SMB_ACL_FIRST_ENTRY 0
5133 +#define SMB_ACL_NEXT_ENTRY 1
5135 +#define SMB_ACL_TYPE_ACCESS 0
5136 +#define SMB_ACL_TYPE_DEFAULT 1
5138 +#elif defined HAVE_HPUX_ACLS
5141 + * Based on the Solaris & UnixWare code.
5145 +#include <sys/aclv.h>
5147 +/* SVR4.2 ES/MP ACLs */
5148 +typedef int SMB_ACL_TAG_T;
5149 +typedef int SMB_ACL_TYPE_T;
5150 +typedef ushort *SMB_ACL_PERMSET_T;
5151 +typedef ushort SMB_ACL_PERM_T;
5152 +#define SMB_ACL_READ 4
5153 +#define SMB_ACL_WRITE 2
5154 +#define SMB_ACL_EXECUTE 1
5156 +/* Types of ACLs. */
5157 +#define SMB_ACL_USER USER
5158 +#define SMB_ACL_USER_OBJ USER_OBJ
5159 +#define SMB_ACL_GROUP GROUP
5160 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
5161 +#define SMB_ACL_OTHER OTHER_OBJ
5162 +#define SMB_ACL_MASK CLASS_OBJ
5164 +typedef struct SMB_ACL_T {
5168 + struct acl acl[1];
5171 +typedef struct acl *SMB_ACL_ENTRY_T;
5173 +#define SMB_ACL_FIRST_ENTRY 0
5174 +#define SMB_ACL_NEXT_ENTRY 1
5176 +#define SMB_ACL_TYPE_ACCESS 0
5177 +#define SMB_ACL_TYPE_DEFAULT 1
5179 +#elif defined HAVE_IRIX_ACLS
5181 +#define SMB_ACL_TAG_T acl_tag_t
5182 +#define SMB_ACL_TYPE_T acl_type_t
5183 +#define SMB_ACL_PERMSET_T acl_permset_t
5184 +#define SMB_ACL_PERM_T acl_perm_t
5185 +#define SMB_ACL_READ ACL_READ
5186 +#define SMB_ACL_WRITE ACL_WRITE
5187 +#define SMB_ACL_EXECUTE ACL_EXECUTE
5189 +/* Types of ACLs. */
5190 +#define SMB_ACL_USER ACL_USER
5191 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
5192 +#define SMB_ACL_GROUP ACL_GROUP
5193 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
5194 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
5195 +#define SMB_ACL_MASK ACL_MASK
5197 +typedef struct SMB_ACL_T {
5203 +#define SMB_ACL_ENTRY_T acl_entry_t
5205 +#define SMB_ACL_FIRST_ENTRY 0
5206 +#define SMB_ACL_NEXT_ENTRY 1
5208 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
5209 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
5211 +#elif defined HAVE_AIX_ACLS
5213 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
5215 +#include "/usr/include/acl.h"
5217 +typedef uint *SMB_ACL_PERMSET_T;
5219 +struct acl_entry_link{
5220 + struct acl_entry_link *prevp;
5221 + struct new_acl_entry *entryp;
5222 + struct acl_entry_link *nextp;
5226 +struct new_acl_entry{
5227 + unsigned short ace_len;
5228 + unsigned short ace_type;
5229 + unsigned int ace_access;
5230 + struct ace_id ace_id[1];
5233 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
5234 +#define SMB_ACL_T struct acl_entry_link*
5236 +#define SMB_ACL_TAG_T unsigned short
5237 +#define SMB_ACL_TYPE_T int
5238 +#define SMB_ACL_PERM_T uint
5239 +#define SMB_ACL_READ S_IRUSR
5240 +#define SMB_ACL_WRITE S_IWUSR
5241 +#define SMB_ACL_EXECUTE S_IXUSR
5243 +/* Types of ACLs. */
5244 +#define SMB_ACL_USER ACEID_USER
5245 +#define SMB_ACL_USER_OBJ 3
5246 +#define SMB_ACL_GROUP ACEID_GROUP
5247 +#define SMB_ACL_GROUP_OBJ 4
5248 +#define SMB_ACL_OTHER 5
5249 +#define SMB_ACL_MASK 6
5252 +#define SMB_ACL_FIRST_ENTRY 1
5253 +#define SMB_ACL_NEXT_ENTRY 2
5255 +#define SMB_ACL_TYPE_ACCESS 0
5256 +#define SMB_ACL_TYPE_DEFAULT 1
5258 +#else /* No ACLs. */
5260 +/* No ACLS - fake it. */
5261 +#define SMB_ACL_TAG_T int
5262 +#define SMB_ACL_TYPE_T int
5263 +#define SMB_ACL_PERMSET_T mode_t
5264 +#define SMB_ACL_PERM_T mode_t
5265 +#define SMB_ACL_READ S_IRUSR
5266 +#define SMB_ACL_WRITE S_IWUSR
5267 +#define SMB_ACL_EXECUTE S_IXUSR
5269 +/* Types of ACLs. */
5270 +#define SMB_ACL_USER 0
5271 +#define SMB_ACL_USER_OBJ 1
5272 +#define SMB_ACL_GROUP 2
5273 +#define SMB_ACL_GROUP_OBJ 3
5274 +#define SMB_ACL_OTHER 4
5275 +#define SMB_ACL_MASK 5
5277 +typedef struct SMB_ACL_T {
5281 +typedef struct SMB_ACL_ENTRY_T {
5283 +} *SMB_ACL_ENTRY_T;
5285 +#define SMB_ACL_FIRST_ENTRY 0
5286 +#define SMB_ACL_NEXT_ENTRY 1
5288 +#define SMB_ACL_TYPE_ACCESS 0
5289 +#define SMB_ACL_TYPE_DEFAULT 1
5291 +#endif /* No ACLs. */
5292 +#endif /* _SMB_ACLS_H */
5293 --- old/testsuite/default-acls.test
5294 +++ new/testsuite/default-acls.test
5298 +# This program is distributable under the terms of the GNU GPL see
5301 +# Test that rsync obeys default ACLs. -- Matt McCutchen
5303 +. $srcdir/testsuite/rsync.fns
5305 +$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
5306 +setfacl -dm u::rwx,g::---,o::--- "$scratchdir" || test_skipped "Your filesystem has ACLs disabled"
5308 +# Call as: testit <dirname> <default-acl> <file-expected> <program-expected>
5310 + todir="$scratchdir/$1"
5312 + # FIXME This doesn't work on solaris...
5313 + setfacl -k "$todir"
5314 + [ "$2" ] && setfacl -dm "$2" "$todir"
5315 + # Make sure we obey ACLs when creating a directory to hold multiple transferred files,
5316 + # even though the directory itself is outside the transfer
5317 + $RSYNC -rvv "$scratchdir/dir" "$scratchdir/file" "$scratchdir/program" "$todir/to/"
5318 + check_perms "$todir/to" $4 "Target $1"
5319 + check_perms "$todir/to/dir" $4 "Target $1"
5320 + check_perms "$todir/to/file" $3 "Target $1"
5321 + check_perms "$todir/to/program" $4 "Target $1"
5322 + # Make sure get_local_name doesn't mess us up when transferring only one file
5323 + $RSYNC -rvv "$scratchdir/file" "$todir/to/anotherfile"
5324 + check_perms "$todir/to/anotherfile" $3 "Target $1"
5325 + # Make sure we obey default ACLs when not transferring a regular file
5326 + $RSYNC -rvv "$scratchdir/dir/" "$todir/to/anotherdir/"
5327 + check_perms "$todir/to/anotherdir" $4 "Target $1"
5330 +mkdir "$scratchdir/dir"
5331 +echo "File!" >"$scratchdir/file"
5332 +echo "#!/bin/sh" >"$scratchdir/program"
5333 +chmod 777 "$scratchdir/dir"
5334 +chmod 666 "$scratchdir/file"
5335 +chmod 777 "$scratchdir/program"
5337 +# Test some target directories
5339 +testit da777 u::rwx,g::rwx,o::rwx rw-rw-rw- rwxrwxrwx
5340 +testit da775 u::rwx,g::rwx,o::r-x rw-rw-r-- rwxrwxr-x
5341 +testit da750 u::rwx,g::r-x,o::--- rw-r----- rwxr-x---
5342 +testit da770mask u::rwx,g::---,m::rwx,o::--- rw-rw---- rwxrwx---
5343 +testit noda1 '' rw------- rwx------
5345 +testit noda2 '' rw-rw-rw- rwxrwxrwx
5347 +testit noda3 '' rw-r--r-- rwxr-xr-x
5355 extern int preserve_uid;
5356 extern int preserve_gid;
5357 +extern int preserve_acls;
5358 extern int numeric_ids;
5361 @@ -274,7 +275,7 @@ void send_uid_list(int f)
5365 - if (preserve_uid) {
5366 + if (preserve_uid || preserve_acls) {
5368 /* we send sequences of uid/byte-length/name */
5369 for (list = uidlist; list; list = list->next) {
5370 @@ -291,7 +292,7 @@ void send_uid_list(int f)
5374 - if (preserve_gid) {
5375 + if (preserve_gid || preserve_acls) {
5377 for (list = gidlist; list; list = list->next) {
5379 @@ -312,7 +313,7 @@ void recv_uid_list(int f, struct file_li
5383 - if (preserve_uid && !numeric_ids) {
5384 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
5385 /* read the uid list */
5386 while ((id = read_int(f)) != 0) {
5387 int len = read_byte(f);
5388 @@ -324,7 +325,7 @@ void recv_uid_list(int f, struct file_li
5392 - if (preserve_gid && !numeric_ids) {
5393 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
5394 /* read the gid list */
5395 while ((id = read_int(f)) != 0) {
5396 int len = read_byte(f);
5397 @@ -336,6 +337,16 @@ void recv_uid_list(int f, struct file_li
5401 +#ifdef SUPPORT_ACLS
5402 + if (preserve_acls && !numeric_ids) {
5404 + while ((id = next_acl_uid(flist)) != NULL)
5405 + *id = match_uid(*id);
5406 + while ((id = next_acl_gid(flist)) != NULL)
5407 + *id = match_gid(*id);
5411 /* Now convert all the uids/gids from sender values to our values. */
5412 if (am_root && preserve_uid && !numeric_ids) {
5413 for (i = 0; i < flist->count; i++)