1 After applying this patch, run these commands for a successful build:
5 ./configure --with-acl-support
10 --- orig/Makefile.in 2004-08-13 07:18:58
11 +++ Makefile.in 2004-07-03 20:11:58
12 @@ -25,7 +25,7 @@ VERSION=@VERSION@
16 -HEADERS=byteorder.h config.h errcode.h proto.h rsync.h lib/pool_alloc.h
17 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
18 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
19 lib/permstring.o lib/pool_alloc.o @LIBOBJS@
20 ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
21 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
22 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
23 main.o checksum.o match.o syscall.o log.o backup.o
24 OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
25 - fileio.o batch.o clientname.o
26 + fileio.o batch.o clientname.o sysacls.o acls.o
27 OBJS3=progress.o pipe.o
28 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
29 popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
30 --- orig/acls.c 2004-08-19 17:09:41
31 +++ acls.c 2004-08-19 17:09:41
33 +/* -*- c-file-style: "linux" -*-
34 + Copyright (C) Andrew Tridgell 1996
35 + Copyright (C) Paul Mackerras 1996
37 + This program is free software; you can redistribute it and/or modify
38 + it under the terms of the GNU General Public License as published by
39 + the Free Software Foundation; either version 2 of the License, or
40 + (at your option) any later version.
42 + This program is distributed in the hope that it will be useful,
43 + but WITHOUT ANY WARRANTY; without even the implied warranty of
44 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
45 + GNU General Public License for more details.
47 + You should have received a copy of the GNU General Public License
48 + along with this program; if not, write to the Free Software
49 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
52 +/* handle passing ACLs between systems */
58 +extern int preserve_acls;
65 + SMB_ACL_TAG_T tag_type;
74 +static const rsync_acl rsync_acl_initializer = { 0, 0, NULL };
76 +static void expand_rsync_acl(rsync_acl *racl)
78 + /* first time through, 0 <= 0, so list is expanded:
79 + * diabolical, rsync guys! */
80 + if (racl->malloced <= racl->count) {
83 + racl->malloced += 10;
84 + new_size = racl->malloced * sizeof racl->races[0];
86 + new_ptr = realloc(racl->races, new_size);
88 + new_ptr = malloc(new_size);
90 + rprintf(FINFO, "expand rsync_acl to %.0f bytes, did%s move\n",
92 + racl->races ? "" : " not");
95 + racl->races = (rsync_ace *) new_ptr;
98 + out_of_memory("expand_rsync_acl");
102 +static void rsync_acl_free(rsync_acl *racl)
105 + racl->races = NULL;
107 + racl->malloced = 0;
110 +static int rsync_ace_sorter(const void *r1, const void *r2)
112 + rsync_ace *race1 = (rsync_ace *)r1;
113 + SMB_ACL_TAG_T rtag1 = race1->tag_type;
114 + id_t rid1 = race1->id;
115 + rsync_ace *race2 = (rsync_ace *)r2;
116 + SMB_ACL_TAG_T rtag2 = race2->tag_type;
117 + id_t rid2 = race2->id;
118 + /* start at the extrema */
119 + if (rtag1 == SMB_ACL_USER_OBJ || rtag2 == SMB_ACL_MASK)
121 + if (rtag2 == SMB_ACL_USER_OBJ || rtag1 == SMB_ACL_MASK)
124 + if (rtag1 == SMB_ACL_OTHER)
126 + if (rtag2 == SMB_ACL_OTHER)
128 + /* only SMB_ACL_USERs and SMB_ACL_GROUP*s left */
129 + if (rtag1 == SMB_ACL_USER) {
131 + case SMB_ACL_GROUP:
132 + case SMB_ACL_GROUP_OBJ:
133 + case SMB_ACL_OTHER:
137 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
139 + if (rtag2 == SMB_ACL_USER)
141 + /* only SMB_ACL_GROUP*s to worry about; kick out GROUP_OBJs first */
142 + if (rtag1 == SMB_ACL_GROUP_OBJ)
144 + if (rtag2 == SMB_ACL_GROUP_OBJ)
146 + /* only SMB_ACL_GROUPs left */
147 + return rid1 == rid2 ? 0 : rid1 < rid2 ? -1 : 1;
150 +static void sort_rsync_acl(rsync_acl *racl)
154 + qsort((void **)racl->races, racl->count, sizeof racl->races[0],
155 + &rsync_ace_sorter);
158 +static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
160 + SMB_ACL_ENTRY_T entry;
162 + const char *errfun;
163 + *racl = rsync_acl_initializer;
164 + errfun = "sys_acl_get_entry";
165 + for (rc = sys_acl_get_entry(sacl, SMB_ACL_FIRST_ENTRY, &entry);
167 + rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
168 + SMB_ACL_PERMSET_T permset;
171 + expand_rsync_acl(racl);
172 + race = &racl->races[racl->count++];
173 + if ((rc = sys_acl_get_tag_type(entry, &race->tag_type))) {
174 + errfun = "sys_acl_get_tag_type";
177 + if ((rc = sys_acl_get_permset(entry, &permset))) {
178 + errfun = "sys_acl_get_tag_type";
181 + race->access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
182 + | (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
183 + | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
184 + switch (race->tag_type) {
186 + case SMB_ACL_GROUP:
191 + if (!(qualifier = sys_acl_get_qualifier(entry))) {
192 + errfun = "sys_acl_get_tag_type";
196 + race->id = *((id_t *)qualifier);
197 + sys_acl_free_qualifier(qualifier, race->tag_type);
200 + rprintf(FERROR, "unpack_smb_acl: %s(): %s\n",
201 + errfun, strerror(errno));
202 + rsync_acl_free(racl);
205 + sort_rsync_acl(racl);
209 +static BOOL rsync_acls_equal(const rsync_acl *racl1, const rsync_acl *racl2)
211 + rsync_ace *race1, *race2;
212 + size_t count = racl1->count;
213 + if (count != racl2->count)
215 + race1 = racl1->races;
216 + race2 = racl2->races;
217 + for (; count--; race1++, race2++) {
218 + if (race1->tag_type != race2->tag_type
219 + || race1->access != race2->access
220 + || ((race1->tag_type == SMB_ACL_USER
221 + || race1->tag_type == SMB_ACL_GROUP)
222 + && race1->id != race2->id))
234 +static rsync_acl_list _rsync_acl_lists[] = {
235 + { 0, 0, NULL }, /* SMB_ACL_TYPE_ACCESS */
236 + { 0, 0, NULL } /* SMB_ACL_TYPE_DEFAULT */
239 +static inline rsync_acl_list *rsync_acl_lists(SMB_ACL_TYPE_T type)
241 + return type == SMB_ACL_TYPE_ACCESS ? &_rsync_acl_lists[0]
242 + : &_rsync_acl_lists[1];
245 +static void expand_rsync_acl_list(rsync_acl_list *racl_list)
247 + /* first time through, 0 <= 0, so list is expanded:
248 + * diabolical, rsync guys! */
249 + if (racl_list->malloced <= racl_list->count) {
252 + if (racl_list->malloced < 1000)
253 + racl_list->malloced += 1000;
255 + racl_list->malloced *= 2;
256 + new_size = racl_list->malloced * sizeof racl_list->racls[0];
257 + if (racl_list->racls)
258 + new_ptr = realloc(racl_list->racls, new_size);
260 + new_ptr = malloc(new_size);
261 + if (verbose >= 3) {
262 + rprintf(FINFO, "expand_rsync_acl_list to %.0f bytes, did%s move\n",
264 + racl_list->racls ? "" : " not");
267 + racl_list->racls = (rsync_acl *) new_ptr;
269 + if (!racl_list->racls)
270 + out_of_memory("expand_rsync_acl_list");
275 +static void free_rsync_acl_list(rsync_acl_list *racl_list)
277 + /* run this in reverse, so references are freed before referents, */
278 + /* although not currently necessary */
279 + while (racl_list->count--) {
280 + rsync_acl *racl = &racl_list->racls[racl_list->count];
282 + rsync_acl_free(racl);
284 + free(racl_list->racls);
285 + racl_list->racls = NULL;
286 + racl_list->malloced = 0;
290 +static int find_matching_rsync_acl(SMB_ACL_TYPE_T type,
291 + const rsync_acl_list *racl_list,
292 + const rsync_acl *racl)
294 + static int access_match = -1, default_match = -1;
295 + int *match = (type == SMB_ACL_TYPE_ACCESS) ?
296 + &access_match : &default_match;
297 + size_t count = racl_list->count;
298 + /* if this is the first time through or we didn't match the last
299 + * time, then start at the end of the list, which should be the
300 + * best place to start hunting */
302 + *match = racl_list->count - 1;
304 + if (rsync_acls_equal(&racl_list->racls[*match], racl))
307 + *match = racl_list->count - 1;
313 +/* the general strategy with the tag_type <-> character mapping is that
314 + * lowercase implies that no qualifier follows, where uppercase does.
315 + * same sorta thing for the acl type (access or default) itself, but
316 + * lowercase in this instance means there's no ACL following, so the
317 + * ACL is a repeat, so the receiver should reuse the last of the same
320 +static void send_rsync_acl(int f, const rsync_acl *racl)
323 + size_t count = racl->count;
324 + write_int(f, count);
325 + for (race = racl->races; count--; race++) {
327 + switch (race->tag_type) {
328 + case SMB_ACL_USER_OBJ:
334 + case SMB_ACL_GROUP_OBJ:
337 + case SMB_ACL_GROUP:
340 + case SMB_ACL_OTHER:
348 + "send_rsync_acl: unknown tag_type (%0x) on ACE; disregarding\n",
353 + write_byte(f, race->access);
354 + if (isupper((int)ch)) {
355 + write_int(f, race->id);
356 + /* FIXME: sorta wasteful. we should maybe buffer as
357 + * many ids as max(ACL_USER + ACL_GROUP) objects to
358 + * keep from making so many calls */
367 +static rsync_acl _curr_rsync_acls[2];
370 +static const char *str_acl_type(SMB_ACL_TYPE_T type)
372 + return type == SMB_ACL_TYPE_ACCESS ? "SMB_ACL_TYPE_ACCESS" :
373 + type == SMB_ACL_TYPE_DEFAULT ? "SMB_ACL_TYPE_DEFAULT" :
374 + "unknown SMB_ACL_TYPE_T";
377 +/* generate the ACL(s) for this flist entry;
378 + * ACL(s) are either sent or cleaned-up by send_acl() below */
380 +BOOL make_acl(const struct file_struct *file, const char *fname)
382 + SMB_ACL_TYPE_T *type,
383 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
384 + rsync_acl *curr_racl;
385 + if (!preserve_acls || S_ISLNK(file->mode))
387 + for (type = &types[0], curr_racl = &_curr_rsync_acls[0];
388 + type < &types[0] + sizeof types / sizeof types[0]
389 + && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
390 + type++, curr_racl++) {
393 + *curr_racl = rsync_acl_initializer;
394 + if (!(sacl = sys_acl_get_file(fname, *type))) {
395 + rprintf(FERROR, "send_acl: sys_acl_get_file(%s, %s): %s\n",
396 + fname, str_acl_type(*type), strerror(errno));
399 + ok = unpack_smb_acl(curr_racl, sacl);
400 + sys_acl_free_acl(sacl);
407 +/* send the make_acl()-generated ACLs for this flist entry,
408 + * or clean up after an flist entry that's not being sent (f == -1) */
410 +void send_acl(const struct file_struct *file, int f)
412 + SMB_ACL_TYPE_T *type,
413 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
414 + rsync_acl *curr_racl;
415 + if (!preserve_acls || S_ISLNK(file->mode))
417 + for (type = &types[0], curr_racl = &_curr_rsync_acls[0];
418 + type < &types[0] + sizeof types / sizeof types[0]
419 + && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
420 + type++, curr_racl++) {
422 + rsync_acl_list *racl_list = rsync_acl_lists(*type);
424 + rsync_acl_free(curr_racl);
427 + if ((index = find_matching_rsync_acl(*type, racl_list, curr_racl))
429 + write_byte(f, *type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
430 + write_int(f, index);
431 + rsync_acl_free(curr_racl);
433 + write_byte(f, *type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
434 + send_rsync_acl(f, curr_racl);
435 + expand_rsync_acl_list(racl_list);
436 + racl_list->racls[racl_list->count++] = *curr_racl;
441 +/* the below stuff is only used by the receiver */
443 +/* structure to hold index to rsync_acl_list member corresponding to
444 + * flist->files[i] */
447 + const struct file_struct *file;
454 + file_acl_index *fileaclidxs;
455 +} file_acl_index_list;
457 +static file_acl_index_list _file_acl_index_lists[] = {
458 + {0, 0, NULL },/* SMB_ACL_TYPE_ACCESS */
459 + {0, 0, NULL } /* SMB_ACL_TYPE_DEFAULT */
462 +static inline file_acl_index_list *file_acl_index_lists(SMB_ACL_TYPE_T type)
464 + return type == SMB_ACL_TYPE_ACCESS ?
465 + &_file_acl_index_lists[0] : &_file_acl_index_lists[1];
468 +static void expand_file_acl_index_list(file_acl_index_list *fileaclidx_list)
470 + /* first time through, 0 <= 0, so list is expanded:
471 + * diabolical, rsync guys! */
472 + if (fileaclidx_list->malloced <= fileaclidx_list->count) {
475 + if (fileaclidx_list->malloced < 1000)
476 + fileaclidx_list->malloced += 1000;
478 + fileaclidx_list->malloced *= 2;
479 + new_size = fileaclidx_list->malloced
480 + * sizeof fileaclidx_list->fileaclidxs[0];
481 + if (fileaclidx_list->fileaclidxs)
482 + new_ptr = realloc(fileaclidx_list->fileaclidxs, new_size);
484 + new_ptr = malloc(new_size);
485 + if (verbose >= 3) {
486 + rprintf(FINFO, "expand_file_acl_index_list to %.0f bytes, did%s move\n",
488 + fileaclidx_list->fileaclidxs ? "" : " not");
491 + fileaclidx_list->fileaclidxs = (file_acl_index *) new_ptr;
493 + if (!fileaclidx_list->fileaclidxs)
494 + out_of_memory("expand_file_acl_index_list");
499 +static void free_file_acl_index_list(file_acl_index_list *fileaclidx_list)
501 + free(fileaclidx_list->fileaclidxs);
502 + fileaclidx_list->fileaclidxs = NULL;
503 + fileaclidx_list->malloced = 0;
507 +/* lists to hold the SMB_ACL_Ts corresponding to the rsync_acl_list entries */
515 +static smb_acl_list _smb_acl_lists[] = {
516 + { 0, 0, NULL }, /* SMB_ACL_TYPE_ACCESS */
517 + { 0, 0, NULL } /* SMB_ACL_TYPE_DEFAULT */
520 +static inline smb_acl_list *smb_acl_lists(SMB_ACL_TYPE_T type)
522 + return type == SMB_ACL_TYPE_ACCESS ? &_smb_acl_lists[0] :
523 + &_smb_acl_lists[1];
526 +static void expand_smb_acl_list(smb_acl_list *sacl_list)
528 + /* first time through, 0 <= 0, so list is expanded:
529 + * diabolical, rsync guys! */
530 + if (sacl_list->malloced <= sacl_list->count) {
533 + if (sacl_list->malloced < 1000)
534 + sacl_list->malloced += 1000;
536 + sacl_list->malloced *= 2;
537 + new_size = sacl_list->malloced
538 + * sizeof sacl_list->sacls[0];
539 + if (sacl_list->sacls)
540 + new_ptr = realloc(sacl_list->sacls, new_size);
542 + new_ptr = malloc(new_size);
543 + if (verbose >= 3) {
544 + rprintf(FINFO, "expand_smb_acl_list to %.0f bytes, did%s move\n",
546 + sacl_list->sacls ? "" : " not");
549 + sacl_list->sacls = (SMB_ACL_T *) new_ptr;
551 + if (!sacl_list->sacls)
552 + out_of_memory("expand_smb_acl_list");
557 +static void free_smb_acl_list(SMB_ACL_TYPE_T type)
559 + smb_acl_list *sacl_list = smb_acl_lists(type);
560 + SMB_ACL_T *sacl = sacl_list->sacls;
561 + while (sacl_list->count--) {
563 + sys_acl_free_acl(*sacl++);
565 + free(sacl_list->sacls);
566 + sacl_list->sacls = NULL;
567 + sacl_list->malloced = 0;
571 +/* build an SMB_ACL_T corresponding to an rsync_acl */
572 +static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
574 + size_t count = racl->count;
575 + rsync_ace *race = racl->races;
576 + const char *errfun = NULL;
577 + *smb_acl = sys_acl_init(count);
579 + rprintf(FERROR, "pack_smb_acl: sys_acl_int(): %s\n",
583 + for (; count--; race++) {
584 + SMB_ACL_ENTRY_T entry;
585 + SMB_ACL_PERMSET_T permset;
586 + if (sys_acl_create_entry(smb_acl, &entry)) {
587 + errfun = "sys_acl_create)";
590 + if (sys_acl_set_tag_type(entry, race->tag_type)) {
591 + errfun = "sys_acl_set_tag";
594 + if (race->tag_type == SMB_ACL_USER ||
595 + race->tag_type == SMB_ACL_GROUP)
596 + if (sys_acl_set_qualifier(entry, (void*)&race->id)) {
597 + errfun = "sys_acl_set_qualfier";
600 + if (sys_acl_get_permset(entry, &permset)) {
601 + errfun = "sys_acl_get_permset";
604 + if (sys_acl_clear_perms(permset)) {
605 + errfun = "sys_acl_clear_perms";
608 + if (race->access & 4)
609 + if (sys_acl_add_perm(permset, SMB_ACL_READ)) {
610 + errfun = "sys_acl_add_perm";
613 + if (race->access & 2)
614 + if (sys_acl_add_perm(permset, SMB_ACL_WRITE)) {
615 + errfun = "sys_acl_add_perm";
618 + if (race->access & 1)
619 + if (sys_acl_add_perm(permset, SMB_ACL_EXECUTE)) {
620 + errfun = "sys_acl_add_perm";
623 + if (sys_acl_set_permset(entry, permset)) {
624 + errfun = "sys_acl_set_permset";
629 + sys_acl_free_acl(*smb_acl);
630 + rprintf(FERROR, "pack_smb_acl %s(): %s\n", errfun,
637 +static void receive_rsync_acl(rsync_acl *racl, int f)
640 + uchar required_mask_perm = 0;
641 + BOOL saw_mask = False;
643 + BOOL saw_user_obj = False, saw_group_obj = False,
645 + size_t count = read_int(f);
650 + uchar tag = read_byte(f);
651 + expand_rsync_acl(racl);
652 + race = &racl->races[racl->count++];
655 + race->tag_type = SMB_ACL_USER_OBJ;
656 + saw_user_obj = True;
659 + race->tag_type = SMB_ACL_USER;
662 + race->tag_type = SMB_ACL_GROUP_OBJ;
663 + saw_group_obj = True;
666 + race->tag_type = SMB_ACL_GROUP;
669 + race->tag_type = SMB_ACL_OTHER;
673 + race->tag_type = SMB_ACL_MASK;
679 + rprintf(FERROR, "receive_rsync_acl: unknown tag %c\n",
681 + exit_cleanup(RERR_STREAMIO);
683 + race->access = read_byte(f);
684 + if (race->access & ~ (4 | 2 | 1)) {
685 + rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
687 + exit_cleanup(RERR_STREAMIO);
689 + if (race->tag_type == SMB_ACL_USER ||
690 + race->tag_type == SMB_ACL_GROUP) {
691 + race->id = read_int(f);
693 + required_mask_perm |= race->access;
697 + else if (race->tag_type == SMB_ACL_GROUP_OBJ)
698 + required_mask_perm |= race->access;
702 + if (!saw_user_obj) {
703 + expand_rsync_acl(racl);
704 + race = &racl->races[racl->count++];
705 + race->tag_type = SMB_ACL_USER_OBJ;
708 + if (!saw_group_obj) {
709 + expand_rsync_acl(racl);
710 + race = &racl->races[racl->count++];
711 + race->tag_type = SMB_ACL_GROUP_OBJ;
715 + expand_rsync_acl(racl);
716 + race = &racl->races[racl->count++];
717 + race->tag_type = SMB_ACL_OTHER;
722 + expand_rsync_acl(racl);
723 + race = &racl->races[racl->count++];
724 + race->tag_type = SMB_ACL_MASK;
725 + race->access = required_mask_perm;
729 + if (!(saw_user_obj && saw_group_obj && saw_other && saw_mask))
731 + if (!(saw_user_obj && saw_group_obj && saw_other))
733 + sort_rsync_acl(racl);
736 +/* receive and build the rsync_acl_lists */
738 +void receive_acl(struct file_struct *file, int f)
740 + SMB_ACL_TYPE_T *type,
741 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
743 + if (!preserve_acls || S_ISLNK(file->mode))
745 + fname = f_name(file);
746 + for (type = &types[0];
747 + type < &types[0] + sizeof types / sizeof types[0]
748 + && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
750 + file_acl_index_list *fileaclidx_list =
751 + file_acl_index_lists(*type);
753 + expand_file_acl_index_list(fileaclidx_list);
755 + tag = read_byte(f);
756 + if (tag == 'A' || tag == 'a') {
757 + if (*type != SMB_ACL_TYPE_ACCESS) {
758 + rprintf(FERROR, "receive_acl %s: duplicate access ACL\n",
760 + exit_cleanup(RERR_STREAMIO);
762 + } else if (tag == 'D' || tag == 'd') {
763 + if (*type == SMB_ACL_TYPE_ACCESS) {
764 + rprintf(FERROR, "receive_acl %s: expecting access ACL; got default\n",
766 + exit_cleanup(RERR_STREAMIO);
769 + rprintf(FERROR, "receive_acl %s: unknown ACL type tag: %c\n",
771 + exit_cleanup(RERR_STREAMIO);
773 + if (tag == 'A' || tag == 'D') {
774 + rsync_acl racl = rsync_acl_initializer;
775 + rsync_acl_list *racl_list = rsync_acl_lists(*type);
776 + smb_acl_list *sacl_list = smb_acl_lists(*type);
777 + fileaclidx_list->fileaclidxs[fileaclidx_list->count].
778 + aclidx = racl_list->count;
779 + fileaclidx_list->fileaclidxs[fileaclidx_list->count++].
781 + receive_rsync_acl(&racl, f);
782 + expand_rsync_acl_list(racl_list);
783 + racl_list->racls[racl_list->count++] = racl;
784 + expand_smb_acl_list(sacl_list);
785 + sacl_list->sacls[sacl_list->count++] = NULL;
787 + int index = read_int(f);
788 + rsync_acl_list *racl_list = rsync_acl_lists(*type);
789 + if ((size_t) index >= racl_list->count) {
790 + rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
792 + str_acl_type(*type),
794 + exit_cleanup(RERR_STREAMIO);
796 + fileaclidx_list->fileaclidxs[fileaclidx_list->count].
798 + fileaclidx_list->fileaclidxs[fileaclidx_list->count++].
804 +static int file_acl_index_list_sorter(const void *f1, const void *f2)
806 + const file_acl_index *fileaclidx1 = (const file_acl_index *)f1;
807 + const file_acl_index *fileaclidx2 = (const file_acl_index *)f2;
808 + return fileaclidx1->file == fileaclidx2->file ? 0 :
809 + fileaclidx1->file < fileaclidx2->file ? -1 : 1;
812 +void sort_file_acl_index_lists()
814 + SMB_ACL_TYPE_T *type,
815 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
816 + if (!preserve_acls)
818 + for (type = &types[0];
819 + type < &types[0] + sizeof types / sizeof types[0];
822 + file_acl_index_list *fileaclidx_list =
823 + file_acl_index_lists(*type);
824 + if (!fileaclidx_list->count)
826 + qsort(fileaclidx_list->fileaclidxs, fileaclidx_list->count,
827 + sizeof fileaclidx_list->fileaclidxs[0],
828 + &file_acl_index_list_sorter);
832 +static int find_file_acl_index(const file_acl_index_list *fileaclidx_list,
833 + const struct file_struct *file) {
834 + int low = 0, high = fileaclidx_list->count;
835 + const struct file_struct *file_mid;
839 + int mid = (high + low) / 2;
840 + file_mid = fileaclidx_list->fileaclidxs[mid].file;
841 + if (file_mid == file)
842 + return fileaclidx_list->fileaclidxs[mid].aclidx;
843 + if (file_mid > file)
847 + } while (low < high);
849 + file_mid = fileaclidx_list->fileaclidxs[low].file;
850 + if (file_mid == file)
851 + return fileaclidx_list->fileaclidxs[low].aclidx;
854 + "find_file_acl_index: can't find entry for file in list\n");
855 + exit_cleanup(RERR_STREAMIO);
859 +/* for duplicating ACLs on backups when using backup_dir */
861 +int dup_acl(const char *orig, const char *bak, mode_t mode)
863 + SMB_ACL_TYPE_T *type,
864 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
866 + if (!preserve_acls)
868 + for (type = &types[0];
869 + type < &types[0] + sizeof types / sizeof types[0]
870 + && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(mode));
872 + SMB_ACL_T sacl_orig, sacl_bak;
873 + rsync_acl racl_orig, racl_bak;
874 + if (!(sacl_orig = sys_acl_get_file(orig, *type))) {
875 + rprintf(FERROR, "dup_acl: sys_acl_get_file(%s, %s): %s\n",
876 + orig, str_acl_type(*type), strerror(errno));
880 + if (!(sacl_bak = sys_acl_get_file(orig, *type))) {
881 + rprintf(FERROR, "dup_acl: sys_acl_get_file(%s, %s): %s. ignoring\n",
882 + bak, str_acl_type(*type), strerror(errno));
884 + /* try to forge on through */
886 + if (!unpack_smb_acl(&racl_orig, sacl_orig)) {
888 + goto out_with_sacls;
891 + if (!unpack_smb_acl(&racl_bak, sacl_bak)) {
893 + goto out_with_one_racl;
895 + if (rsync_acls_equal(&racl_orig, &racl_bak))
898 + ; /* presume they're unequal */
900 + if (*type == SMB_ACL_TYPE_DEFAULT && !racl_orig.count) {
901 + if (-1 == sys_acl_delete_def_file(bak)) {
902 + rprintf(FERROR, "dup_acl: sys_acl_delete_def_file(%s): %s\n",
903 + bak, strerror(errno));
906 + } else if (-1 == sys_acl_set_file(bak, *type, sacl_bak)) {
907 + rprintf(FERROR, "dup_acl: sys_acl_set_file(%s, %s): %s\n",
908 + bak, str_acl_type(*type), strerror(errno));
913 + rsync_acl_free(&racl_bak);
915 + rsync_acl_free(&racl_orig);
918 + sys_acl_free_acl(sacl_bak);
919 + /* out_with_one_sacl: */
921 + sys_acl_free_acl(sacl_orig);
926 +/* stuff for redirecting calls to set_acl() from set_perms()
927 + * for keep_backup() */
928 +static const struct file_struct *backup_orig_file = NULL;
929 +static const char null_string[] = "";
930 +static const char *backup_orig_fname = null_string;
931 +static const char *backup_dest_fname = null_string;
932 +static SMB_ACL_T _backup_sacl[] = { NULL, NULL };
934 +void push_keep_backup_acl(const struct file_struct *file,
935 + const char *orig, const char *dest)
937 + if (preserve_acls) {
938 + SMB_ACL_TYPE_T *type,
939 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
941 + backup_orig_file = file;
942 + backup_orig_fname = orig;
943 + backup_dest_fname = dest;
944 + for (type = &types[0], sacl = &_backup_sacl[0];
945 + type < &types[0] + sizeof types / sizeof types[0];
947 + if (*type == SMB_ACL_TYPE_DEFAULT && !S_ISDIR(file->mode))
950 + if (!(*sacl = sys_acl_get_file(orig, *type))) {
951 + rprintf(FERROR, "push_keep_backup_acl: sys_acl_get_file(%s, %s): %s\n",
952 + orig, str_acl_type(*type),
960 +static int set_keep_backup_acl()
962 + if (preserve_acls) {
963 + SMB_ACL_TYPE_T *type,
964 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
967 + for (type = &types[0], sacl = &_backup_sacl[0];
968 + type < &types[0] + sizeof types / sizeof types[0];
971 + if (-1 == sys_acl_set_file(backup_dest_fname,
974 + rprintf(FERROR, "push_keep_backup_acl: sys_acl_get_file(%s, %s): %s\n",
976 + str_acl_type(*type),
987 +void cleanup_keep_backup_acl()
989 + if (preserve_acls) {
990 + SMB_ACL_TYPE_T *type,
991 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
993 + backup_orig_file = NULL;
994 + backup_orig_fname = null_string;
995 + backup_dest_fname = null_string;
996 + for (type = &types[0], sacl = &_backup_sacl[0];
997 + type < &types[0] + sizeof types / sizeof types[0];
1000 + sys_acl_free_acl(*sacl);
1006 +/* set ACL on rsync-ed or keep_backup-ed file */
1008 +int set_acl(const char *fname, const struct file_struct *file)
1011 + SMB_ACL_TYPE_T *type,
1012 + types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
1013 + if (dry_run || !preserve_acls || S_ISLNK(file->mode))
1015 + if (file == backup_orig_file) {
1016 + if (!strcmp(fname, backup_dest_fname))
1017 + return set_keep_backup_acl();
1019 + for (type = &types[0];
1020 + type < &types[0] + sizeof types / sizeof types[0]
1021 + && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(file->mode));
1023 + SMB_ACL_T sacl_orig, *sacl_new;
1024 + rsync_acl racl_orig, *racl_new;
1025 + int aclidx = find_file_acl_index(file_acl_index_lists(*type),
1028 + racl_new = &(rsync_acl_lists(*type)->racls[aclidx]);
1029 + sacl_new = &(smb_acl_lists(*type)->sacls[aclidx]);
1030 + sacl_orig = sys_acl_get_file(fname, *type);
1032 + rprintf(FERROR, "set_acl: sys_acl_get_file(%s, %s): %s\n",
1033 + fname, str_acl_type(*type), strerror(errno));
1037 + ok = unpack_smb_acl(&racl_orig, sacl_orig);
1038 + sys_acl_free_acl(sacl_orig);
1043 + ok = rsync_acls_equal(&racl_orig, racl_new);
1044 + rsync_acl_free(&racl_orig);
1047 + if (*type == SMB_ACL_TYPE_DEFAULT && !racl_new->count) {
1048 + if (-1 == sys_acl_delete_def_file(fname)) {
1049 + rprintf(FERROR, "set_acl: sys_acl_delete_def_file(%s): %s\n",
1050 + fname, strerror(errno));
1056 + if (!pack_smb_acl(sacl_new, racl_new)) {
1060 + if (-1 == sys_acl_set_file(fname, *type, *sacl_new)) {
1061 + rprintf(FERROR, "set_acl: sys_acl_set_file(%s, %s): %s\n",
1062 + fname, str_acl_type(*type),
1074 +/* enumeration functions for uid mapping */
1076 +/* context -- one and only one. should be cycled through once on uid mapping
1077 + * and once on gid mapping */
1078 +static rsync_acl_list *_enum_racl_lists[] = {
1079 + &_rsync_acl_lists[0], &_rsync_acl_lists[1], NULL
1082 +static rsync_acl_list **enum_racl_list = &_enum_racl_lists[0];
1083 +static size_t enum_racl_index = 0;
1084 +static size_t enum_race_index = 0;
1086 +/* this returns the next tag_type id from the given acl for the next entry,
1087 + * or it returns 0 if there are no more tag_type ids in the acl */
1089 +static id_t next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
1091 + for (; enum_race_index < racl->count; enum_race_index++) {
1092 + rsync_ace *race = &racl->races[enum_race_index];
1093 + if (race->tag_type == tag_type)
1096 + enum_race_index = 0;
1100 +static id_t next_acl_id(SMB_ACL_TAG_T tag_type, const rsync_acl_list *racl_list)
1102 + for (; enum_racl_index < racl_list->count; enum_racl_index++) {
1103 + rsync_acl *racl = &racl_list->racls[enum_racl_index];
1104 + id_t id = next_ace_id(tag_type, racl);
1108 + enum_racl_index = 0;
1112 +static id_t next_acl_list_id(SMB_ACL_TAG_T tag_type)
1114 + for (; *enum_racl_list; enum_racl_list++) {
1115 + id_t id = next_acl_id(tag_type, *enum_racl_list);
1119 + enum_racl_list = &_enum_racl_lists[0];
1123 +id_t next_acl_uid()
1125 + return next_acl_list_id(SMB_ACL_USER);
1128 +id_t next_acl_gid()
1130 + return next_acl_list_id(SMB_ACL_GROUP);
1133 +/* referring to the global context enum_entry, sets the entry's id */
1134 +static void set_acl_id(id_t id)
1136 + (*enum_racl_list)->racls[enum_racl_index].races[enum_race_index++].id = id;
1139 +void acl_uid_map(id_t uid)
1144 +void acl_gid_map(id_t gid)
1149 +#endif /* SUPPORT_ACLS */
1150 --- orig/backup.c 2004-07-26 06:19:04
1151 +++ backup.c 2004-07-03 20:11:58
1152 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
1154 do_lchown(fullpath, st.st_uid, st.st_gid);
1155 do_chmod(fullpath, st.st_mode);
1156 + (void)DUP_ACL(end, fullpath, st.st_mode);
1160 @@ -168,6 +169,8 @@ static int keep_backup(char *fname)
1164 + PUSH_KEEP_BACKUP_ACL(file, fname, backup_dir_buf);
1167 /* Check to see if this is a device file, or link */
1168 if (IS_DEVICE(file->mode)) {
1169 @@ -242,6 +245,7 @@ static int keep_backup(char *fname)
1172 set_perms(backup_dir_buf, file, NULL, 0);
1173 + CLEANUP_KEEP_BACKUP_ACL();
1177 --- orig/configure.in 2004-08-13 07:18:59
1178 +++ configure.in 2004-08-19 19:53:27
1179 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1180 AC_CHECK_LIB(resolv, strcasecmp)
1183 +AC_CHECK_FUNCS(aclsort)
1184 +if test x"$ac_cv_func_aclsort" = x"no"; then
1185 + AC_CHECK_LIB(sec, aclsort)
1188 dnl At the moment we don't test for a broken memcmp(), because all we
1189 dnl need to do is test for equality, not comparison, and it seems that
1190 dnl every platform has a memcmp that can do at least that.
1191 @@ -656,6 +661,77 @@ AC_SUBST(OBJ_RESTORE)
1192 AC_SUBST(CC_SHOBJ_FLAG)
1193 AC_SUBST(BUILD_POPT)
1195 +AC_CHECK_HEADERS(sys/acl.h)
1196 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1197 +#################################################
1198 +# check for ACL support
1200 +AC_MSG_CHECKING(whether to support ACLs)
1201 +AC_ARG_WITH(acl-support,
1202 +[ --with-acl-support Include ACL support (default=no)],
1203 +[ case "$withval" in
1206 + case "$host_os" in
1208 + AC_MSG_RESULT(Using UnixWare ACLs)
1209 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1212 + AC_MSG_RESULT(Using solaris ACLs)
1213 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1216 + AC_MSG_RESULT(Using HPUX ACLs)
1217 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1220 + AC_MSG_RESULT(Using IRIX ACLs)
1221 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1224 + AC_MSG_RESULT(Using AIX ACLs)
1225 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1228 + AC_MSG_RESULT(Using Tru64 ACLs)
1229 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1230 + LIBS="$LIBS -lpacl"
1233 + AC_MSG_RESULT(ACLs requested -- running tests)
1234 + AC_CHECK_LIB(acl,acl_get_file)
1235 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1236 + AC_TRY_LINK([#include <sys/types.h>
1237 +#include <sys/acl.h>],
1238 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1239 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1240 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1241 + AC_MSG_RESULT(Using posix ACLs)
1242 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1243 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1244 + AC_TRY_LINK([#include <sys/types.h>
1245 +#include <sys/acl.h>],
1246 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1247 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1248 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1249 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1252 + AC_MSG_ERROR(Failed to find ACL support)
1259 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1262 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1266 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1269 --- orig/flist.c 2004-08-12 18:34:38
1270 +++ flist.c 2004-07-03 20:11:58
1271 @@ -944,6 +944,8 @@ void send_file_name(int f, struct file_l
1275 + if (!MAKE_ACL(file, fname))
1278 maybe_emit_filelist_progress(flist);
1280 @@ -952,6 +954,10 @@ void send_file_name(int f, struct file_l
1281 if (file->basename[0]) {
1282 flist->files[flist->count++] = file;
1283 send_file_entry(file, f, base_flags);
1284 + SEND_ACL(file, f);
1286 + /* Cleanup unsent ACL(s). */
1287 + SEND_ACL(file, -1);
1290 if (recursive && S_ISDIR(file->mode)
1291 @@ -1268,6 +1274,8 @@ struct file_list *recv_file_list(int f)
1292 flags |= read_byte(f) << 8;
1293 receive_file_entry(&flist->files[i], flags, flist, f);
1295 + RECEIVE_ACL(flist->files[i], f);
1297 if (S_ISREG(flist->files[i]->mode))
1298 stats.total_size += flist->files[i]->length;
1300 @@ -1290,6 +1298,8 @@ struct file_list *recv_file_list(int f)
1302 clean_flist(flist, relative_paths, 1);
1304 + SORT_FILE_ACL_INDEX_LISTS();
1307 /* Now send the uid/gid list. This was introduced in
1308 * protocol version 15 */
1309 --- orig/generator.c 2004-08-05 18:24:21
1310 +++ generator.c 2004-07-03 20:11:58
1311 @@ -332,6 +332,10 @@ static void recv_generator(char *fname,
1312 if (set_perms(fname, file, statret ? NULL : &st, 0)
1313 && verbose && f_out != -1)
1314 rprintf(FINFO, "%s/\n", safe_fname(fname));
1317 + SET_ACL(fname, file);
1322 --- orig/mkproto.awk 2004-01-01 21:10:50
1323 +++ mkproto.awk 2004-06-30 00:04:06
1324 @@ -58,7 +58,7 @@ BEGIN {
1328 -!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^const/ {
1329 +!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^const|^SMB_ACL_T|^id_t/ {
1333 --- orig/options.c 2004-08-12 18:34:38
1334 +++ options.c 2004-08-19 17:38:57
1335 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
1337 int preserve_links = 0;
1338 int preserve_hard_links = 0;
1339 +int preserve_acls = 0;
1340 int preserve_perms = 0;
1341 int preserve_devices = 0;
1342 int preserve_uid = 0;
1343 @@ -152,6 +153,7 @@ static void print_rsync_version(enum log
1344 char const *got_socketpair = "no ";
1345 char const *have_inplace = "no ";
1346 char const *hardlinks = "no ";
1347 + char const *acls = "no ";
1348 char const *links = "no ";
1349 char const *ipv6 = "no ";
1350 STRUCT_STAT *dumstat;
1351 @@ -168,6 +170,10 @@ static void print_rsync_version(enum log
1362 @@ -182,9 +188,9 @@ static void print_rsync_version(enum log
1363 "Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
1364 rprintf(f, "<http://rsync.samba.org/>\n");
1365 rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
1366 - "%shard links, %ssymlinks, batchfiles, \n",
1367 + "%shard links, %sACLs, %ssymlinks, batchfiles, \n",
1368 (int) (sizeof (OFF_T) * 8),
1369 - got_socketpair, hardlinks, links);
1370 + got_socketpair, hardlinks, acls, links);
1372 /* Note that this field may not have type ino_t. It depends
1373 * on the complicated interaction between largefile feature
1374 @@ -249,6 +255,7 @@ void usage(enum logcode F)
1375 rprintf(F," --safe-links ignore \"unsafe\" symlinks\n");
1376 rprintf(F," -H, --hard-links preserve hard links\n");
1377 rprintf(F," -p, --perms preserve permissions\n");
1378 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
1379 rprintf(F," -o, --owner preserve owner (root only)\n");
1380 rprintf(F," -g, --group preserve group\n");
1381 rprintf(F," -D, --devices preserve devices (root only)\n");
1382 @@ -358,6 +365,7 @@ static struct poptOption long_options[]
1383 {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
1384 {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
1385 {"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
1386 + {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
1387 {"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
1388 {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
1389 {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
1390 @@ -620,6 +628,24 @@ int parse_arguments(int *argc, const cha
1396 + preserve_acls = 1;
1397 + preserve_perms = 1;
1399 + /* FIXME: this should probably be ignored with a
1400 + * warning and then countermeasures taken to
1401 + * restrict group and other access in the presence
1402 + * of any more restrictive ACLs, but this is safe
1404 + snprintf(err_buf,sizeof(err_buf),
1405 + "ACLs are not supported on this %s\n",
1406 + am_server ? "server" : "client");
1408 +#endif /* SUPPORT_ACLS */
1413 /* A large opt value means that set_refuse_options()
1414 * turned this option off (opt-BASE is its index). */
1415 @@ -932,6 +958,8 @@ void server_options(char **args,int *arg
1417 if (preserve_hard_links)
1419 + if (preserve_acls)
1420 + argstr[x++] = 'A';
1424 --- orig/rsync.c 2004-08-09 21:07:10
1425 +++ rsync.c 2004-07-03 20:11:58
1426 @@ -207,6 +207,14 @@ int set_perms(char *fname,struct file_st
1430 + /* If this is a directory, SET_ACL() will be called on the cleanup
1431 + * receive_generator() pass--if we called it here, we might clobber
1432 + * writability on the directory. everything else is OK to do now. */
1433 + if (!S_ISDIR(st->st_mode)) {
1434 + if (SET_ACL(fname, file) == 0)
1438 if (verbose > 1 && flags & PERMS_REPORT) {
1440 rprintf(FINFO,"%s\n",fname);
1441 --- orig/rsync.h 2004-08-03 15:41:32
1442 +++ rsync.h 2004-07-03 20:11:58
1443 @@ -541,6 +541,40 @@ static inline int flist_up(struct file_l
1444 #include "lib/permstring.h"
1445 #include "lib/addrinfo.h"
1447 +#define SUPPORT_ACLS HAVE_POSIX_ACLS|HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|\
1448 + HAVE_HPUX_ACLS|HAVE_IRIX_ACLS|HAVE_AIX_ACLS|HAVE_TRU64_ACLS
1450 +#define ACLS_NEED_MASK HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
1453 +#ifdef HAVE_SYS_ACL_H
1454 +#include <sys/acl.h>
1456 +#define MAKE_ACL(file, fname) make_acl(file, fname)
1457 +#define SEND_ACL(file, f) send_acl(file, f)
1458 +#define RECEIVE_ACL(file, f) receive_acl(file, f)
1459 +#define SORT_FILE_ACL_INDEX_LISTS() sort_file_acl_index_lists()
1460 +#define SET_ACL(fname, file) set_acl(fname, file)
1461 +#define NEXT_ACL_UID() next_acl_uid()
1462 +#define ACL_UID_MAP(uid) acl_uid_map(uid)
1463 +#define PUSH_KEEP_BACKUP_ACL(file, orig, dest) \
1464 + push_keep_backup_acl(file, orig, dest)
1465 +#define CLEANUP_KEEP_BACKUP_ACL() cleanup_keep_backup_acl()
1466 +#define DUP_ACL(orig, dest, mode) dup_acl(orig, dest, mode)
1467 +#else /* SUPPORT_ACLS */
1468 +#define MAKE_ACL(file, fname) 1 /* checked return value */
1469 +#define SEND_ACL(file, f)
1470 +#define RECEIVE_ACL(file, f)
1471 +#define SORT_FILE_ACL_INDEX_LISTS()
1472 +#define SET_ACL(fname, file) 0 /* checked return value */
1473 +#define NEXT_ACL_UID()
1474 +#define ACL_UID_MAP(uid)
1475 +#define PUSH_KEEP_BACKUP_ACL(file, orig, dest)
1476 +#define CLEANUP_KEEP_BACKUP_ACL()
1477 +#define DUP_ACL(src, orig, mode) 0 /* checked return value */
1478 +#endif /* SUPPORT_ACLS */
1479 +#include "smb_acls.h"
1483 /* We have replacement versions of these if they're missing. */
1484 --- orig/rsync.yo 2004-08-19 16:30:47
1485 +++ rsync.yo 2004-07-03 20:11:58
1486 @@ -326,6 +326,7 @@ verb(
1487 --safe-links ignore "unsafe" symlinks
1488 -H, --hard-links preserve hard links
1489 -p, --perms preserve permissions
1490 + -A, --acls preserve ACLs (implies -p) [local option]
1491 -o, --owner preserve owner (root only)
1492 -g, --group preserve group
1493 -D, --devices preserve devices (root only)
1494 @@ -578,6 +579,11 @@ source file's permissions and the umask
1495 other files (including updated files) retain their existing permissions
1496 (which is the same behavior as other file-copy utilities, such as cp).
1498 +dit(bf(-A, --acls)) This option causes rsync to update the remote
1499 +ACLs to be the same as the local ACLs. This will work only if the
1500 +remote machine's rsync supports this option also. This is a non-standard
1503 dit(bf(-o, --owner)) This option causes rsync to set the owner of the
1504 destination file to be the same as the source file. On most systems,
1505 only the super-user can set file ownership. By default, the preservation
1506 --- orig/smb_acls.h 2004-06-30 00:04:07
1507 +++ smb_acls.h 2004-06-30 00:04:07
1510 + Unix SMB/Netbios implementation.
1512 + Portable SMB ACL interface
1513 + Copyright (C) Jeremy Allison 2000
1515 + This program is free software; you can redistribute it and/or modify
1516 + it under the terms of the GNU General Public License as published by
1517 + the Free Software Foundation; either version 2 of the License, or
1518 + (at your option) any later version.
1520 + This program is distributed in the hope that it will be useful,
1521 + but WITHOUT ANY WARRANTY; without even the implied warranty of
1522 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1523 + GNU General Public License for more details.
1525 + You should have received a copy of the GNU General Public License
1526 + along with this program; if not, write to the Free Software
1527 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1530 +#ifndef _SMB_ACLS_H
1531 +#define _SMB_ACLS_H
1533 +#if defined(HAVE_POSIX_ACLS)
1535 +/* This is an identity mapping (just remove the SMB_). */
1537 +#define SMB_ACL_TAG_T acl_tag_t
1538 +#define SMB_ACL_TYPE_T acl_type_t
1539 +#define SMB_ACL_PERMSET_T acl_permset_t
1540 +#define SMB_ACL_PERM_T acl_perm_t
1541 +#define SMB_ACL_READ ACL_READ
1542 +#define SMB_ACL_WRITE ACL_WRITE
1543 +#define SMB_ACL_EXECUTE ACL_EXECUTE
1545 +/* Types of ACLs. */
1546 +#define SMB_ACL_USER ACL_USER
1547 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
1548 +#define SMB_ACL_GROUP ACL_GROUP
1549 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
1550 +#define SMB_ACL_OTHER ACL_OTHER
1551 +#define SMB_ACL_MASK ACL_MASK
1553 +#define SMB_ACL_T acl_t
1555 +#define SMB_ACL_ENTRY_T acl_entry_t
1557 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
1558 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
1560 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
1561 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
1563 +#elif defined(HAVE_TRU64_ACLS)
1565 +/* This is for DEC/Compaq Tru64 UNIX */
1567 +#define SMB_ACL_TAG_T acl_tag_t
1568 +#define SMB_ACL_TYPE_T acl_type_t
1569 +#define SMB_ACL_PERMSET_T acl_permset_t
1570 +#define SMB_ACL_PERM_T acl_perm_t
1571 +#define SMB_ACL_READ ACL_READ
1572 +#define SMB_ACL_WRITE ACL_WRITE
1573 +#define SMB_ACL_EXECUTE ACL_EXECUTE
1575 +/* Types of ACLs. */
1576 +#define SMB_ACL_USER ACL_USER
1577 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
1578 +#define SMB_ACL_GROUP ACL_GROUP
1579 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
1580 +#define SMB_ACL_OTHER ACL_OTHER
1581 +#define SMB_ACL_MASK ACL_MASK
1583 +#define SMB_ACL_T acl_t
1585 +#define SMB_ACL_ENTRY_T acl_entry_t
1587 +#define SMB_ACL_FIRST_ENTRY 0
1588 +#define SMB_ACL_NEXT_ENTRY 1
1590 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
1591 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
1593 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
1595 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
1596 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
1599 +/* SVR4.2 ES/MP ACLs */
1600 +typedef int SMB_ACL_TAG_T;
1601 +typedef int SMB_ACL_TYPE_T;
1602 +typedef ushort *SMB_ACL_PERMSET_T;
1603 +typedef ushort SMB_ACL_PERM_T;
1604 +#define SMB_ACL_READ 4
1605 +#define SMB_ACL_WRITE 2
1606 +#define SMB_ACL_EXECUTE 1
1608 +/* Types of ACLs. */
1609 +#define SMB_ACL_USER USER
1610 +#define SMB_ACL_USER_OBJ USER_OBJ
1611 +#define SMB_ACL_GROUP GROUP
1612 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
1613 +#define SMB_ACL_OTHER OTHER_OBJ
1614 +#define SMB_ACL_MASK CLASS_OBJ
1616 +typedef struct SMB_ACL_T {
1620 + struct acl acl[1];
1623 +typedef struct acl *SMB_ACL_ENTRY_T;
1625 +#define SMB_ACL_FIRST_ENTRY 0
1626 +#define SMB_ACL_NEXT_ENTRY 1
1628 +#define SMB_ACL_TYPE_ACCESS 0
1629 +#define SMB_ACL_TYPE_DEFAULT 1
1631 +#elif defined(HAVE_HPUX_ACLS)
1634 + * Based on the Solaris & UnixWare code.
1638 +#include <sys/aclv.h>
1640 +/* SVR4.2 ES/MP ACLs */
1641 +typedef int SMB_ACL_TAG_T;
1642 +typedef int SMB_ACL_TYPE_T;
1643 +typedef ushort *SMB_ACL_PERMSET_T;
1644 +typedef ushort SMB_ACL_PERM_T;
1645 +#define SMB_ACL_READ 4
1646 +#define SMB_ACL_WRITE 2
1647 +#define SMB_ACL_EXECUTE 1
1649 +/* Types of ACLs. */
1650 +#define SMB_ACL_USER USER
1651 +#define SMB_ACL_USER_OBJ USER_OBJ
1652 +#define SMB_ACL_GROUP GROUP
1653 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
1654 +#define SMB_ACL_OTHER OTHER_OBJ
1655 +#define SMB_ACL_MASK CLASS_OBJ
1657 +typedef struct SMB_ACL_T {
1661 + struct acl acl[1];
1664 +typedef struct acl *SMB_ACL_ENTRY_T;
1666 +#define SMB_ACL_FIRST_ENTRY 0
1667 +#define SMB_ACL_NEXT_ENTRY 1
1669 +#define SMB_ACL_TYPE_ACCESS 0
1670 +#define SMB_ACL_TYPE_DEFAULT 1
1672 +#elif defined(HAVE_IRIX_ACLS)
1674 +#define SMB_ACL_TAG_T acl_tag_t
1675 +#define SMB_ACL_TYPE_T acl_type_t
1676 +#define SMB_ACL_PERMSET_T acl_permset_t
1677 +#define SMB_ACL_PERM_T acl_perm_t
1678 +#define SMB_ACL_READ ACL_READ
1679 +#define SMB_ACL_WRITE ACL_WRITE
1680 +#define SMB_ACL_EXECUTE ACL_EXECUTE
1682 +/* Types of ACLs. */
1683 +#define SMB_ACL_USER ACL_USER
1684 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
1685 +#define SMB_ACL_GROUP ACL_GROUP
1686 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
1687 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
1688 +#define SMB_ACL_MASK ACL_MASK
1690 +typedef struct SMB_ACL_T {
1696 +#define SMB_ACL_ENTRY_T acl_entry_t
1698 +#define SMB_ACL_FIRST_ENTRY 0
1699 +#define SMB_ACL_NEXT_ENTRY 1
1701 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
1702 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
1704 +#elif defined(HAVE_AIX_ACLS)
1706 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
1708 +#include "/usr/include/acl.h"
1710 +typedef uint *SMB_ACL_PERMSET_T;
1712 +struct acl_entry_link{
1713 + struct acl_entry_link *prevp;
1714 + struct new_acl_entry *entryp;
1715 + struct acl_entry_link *nextp;
1719 +struct new_acl_entry{
1720 + unsigned short ace_len;
1721 + unsigned short ace_type;
1722 + unsigned int ace_access;
1723 + struct ace_id ace_id[1];
1726 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
1727 +#define SMB_ACL_T struct acl_entry_link*
1729 +#define SMB_ACL_TAG_T unsigned short
1730 +#define SMB_ACL_TYPE_T int
1731 +#define SMB_ACL_PERM_T uint
1732 +#define SMB_ACL_READ S_IRUSR
1733 +#define SMB_ACL_WRITE S_IWUSR
1734 +#define SMB_ACL_EXECUTE S_IXUSR
1736 +/* Types of ACLs. */
1737 +#define SMB_ACL_USER ACEID_USER
1738 +#define SMB_ACL_USER_OBJ 3
1739 +#define SMB_ACL_GROUP ACEID_GROUP
1740 +#define SMB_ACL_GROUP_OBJ 4
1741 +#define SMB_ACL_OTHER 5
1742 +#define SMB_ACL_MASK 6
1745 +#define SMB_ACL_FIRST_ENTRY 1
1746 +#define SMB_ACL_NEXT_ENTRY 2
1748 +#define SMB_ACL_TYPE_ACCESS 0
1749 +#define SMB_ACL_TYPE_DEFAULT 1
1751 +#else /* No ACLs. */
1753 +/* No ACLS - fake it. */
1754 +#define SMB_ACL_TAG_T int
1755 +#define SMB_ACL_TYPE_T int
1756 +#define SMB_ACL_PERMSET_T mode_t
1757 +#define SMB_ACL_PERM_T mode_t
1758 +#define SMB_ACL_READ S_IRUSR
1759 +#define SMB_ACL_WRITE S_IWUSR
1760 +#define SMB_ACL_EXECUTE S_IXUSR
1762 +/* Types of ACLs. */
1763 +#define SMB_ACL_USER 0
1764 +#define SMB_ACL_USER_OBJ 1
1765 +#define SMB_ACL_GROUP 2
1766 +#define SMB_ACL_GROUP_OBJ 3
1767 +#define SMB_ACL_OTHER 4
1768 +#define SMB_ACL_MASK 5
1770 +typedef struct SMB_ACL_T {
1774 +typedef struct SMB_ACL_ENTRY_T {
1776 +} *SMB_ACL_ENTRY_T;
1778 +#define SMB_ACL_FIRST_ENTRY 0
1779 +#define SMB_ACL_NEXT_ENTRY 1
1781 +#define SMB_ACL_TYPE_ACCESS 0
1782 +#define SMB_ACL_TYPE_DEFAULT 1
1784 +#endif /* No ACLs. */
1785 +#endif /* _SMB_ACLS_H */
1786 --- orig/sysacls.c 2004-08-19 17:38:21
1787 +++ sysacls.c 2004-08-19 17:38:21
1790 + Unix SMB/Netbios implementation.
1792 + Samba system utilities for ACL support.
1793 + Copyright (C) Jeremy Allison 2000.
1795 + This program is free software; you can redistribute it and/or modify
1796 + it under the terms of the GNU General Public License as published by
1797 + the Free Software Foundation; either version 2 of the License, or
1798 + (at your option) any later version.
1800 + This program is distributed in the hope that it will be useful,
1801 + but WITHOUT ANY WARRANTY; without even the implied warranty of
1802 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1803 + GNU General Public License for more details.
1805 + You should have received a copy of the GNU General Public License
1806 + along with this program; if not, write to the Free Software
1807 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1813 + This file wraps all differing system ACL interfaces into a consistent
1814 + one based on the POSIX interface. It also returns the correct errors
1815 + for older UNIX systems that don't support ACLs.
1817 + The interfaces that each ACL implementation must support are as follows:
1819 + int sys_acl_get_entry(SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1820 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1821 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
1822 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
1823 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
1824 + SMB_ACL_T sys_acl_get_fd(int fd)
1825 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
1826 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
1827 + char *sys_acl_to_text(SMB_ACL_T theacl, ssize_t *plen)
1828 + SMB_ACL_T sys_acl_init(int count)
1829 + int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1830 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1831 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
1832 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1833 + int sys_acl_valid(SMB_ACL_T theacl)
1834 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1835 + int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
1836 + int sys_acl_delete_def_file(const char *path)
1838 + This next one is not POSIX complient - but we *have* to have it !
1839 + More POSIX braindamage.
1841 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1843 + The generic POSIX free is the following call. We split this into
1844 + several different free functions as we may need to add tag info
1845 + to structures when emulating the POSIX interface.
1847 + int sys_acl_free(void *obj_p)
1849 + The calls we actually use are:
1851 + int sys_acl_free_text(char *text) - free acl_to_text
1852 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
1853 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
1857 +#if defined(HAVE_POSIX_ACLS)
1859 +/* Identity mapping - easy. */
1861 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1863 + return acl_get_entry(the_acl, entry_id, entry_p);
1866 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1868 + return acl_get_tag_type(entry_d, tag_type_p);
1871 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
1873 + return acl_get_permset(entry_d, permset_p);
1876 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
1878 + return acl_get_qualifier(entry_d);
1881 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
1883 + return acl_get_file(path_p, type);
1886 +SMB_ACL_T sys_acl_get_fd(int fd)
1888 + return acl_get_fd(fd);
1891 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
1893 + return acl_clear_perms(permset);
1896 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1898 + return acl_add_perm(permset, perm);
1901 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1903 +#if defined(HAVE_ACL_GET_PERM_NP)
1904 + /* Required for TrustedBSD-based ACL implementations where
1905 + * non-POSIX.1e functions are denoted by a _np (non-portable)
1907 + return acl_get_perm_np(permset, perm);
1909 + return acl_get_perm(permset, perm);
1913 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen)
1915 + return acl_to_text(the_acl, plen);
1918 +SMB_ACL_T sys_acl_init(int count)
1920 + return acl_init(count);
1923 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1925 + return acl_create_entry(pacl, pentry);
1928 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1930 + return acl_set_tag_type(entry, tagtype);
1933 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
1935 + return acl_set_qualifier(entry, qual);
1938 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1940 + return acl_set_permset(entry, permset);
1943 +int sys_acl_valid(SMB_ACL_T theacl)
1945 + return acl_valid(theacl);
1948 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1950 + return acl_set_file(name, acltype, theacl);
1953 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
1955 + return acl_set_fd(fd, theacl);
1958 +int sys_acl_delete_def_file(const char *name)
1960 + return acl_delete_def_file(name);
1963 +int sys_acl_free_text(char *text)
1965 + return acl_free(text);
1968 +int sys_acl_free_acl(SMB_ACL_T the_acl)
1970 + return acl_free(the_acl);
1973 +int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
1975 + return acl_free(qual);
1978 +#elif defined(HAVE_TRU64_ACLS)
1979 +/* The interface to DEC/Compaq Tru64 UNIX ACLs
1980 + * is based on Draft 13 of the POSIX spec which is
1981 + * slightly different from the Draft 16 interface.
1983 + * Also, some of the permset manipulation functions
1984 + * such as acl_clear_perm() and acl_add_perm() appear
1985 + * to be broken on Tru64 so we have to manipulate
1986 + * the permission bits in the permset directly. */
1987 + int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1989 + SMB_ACL_ENTRY_T entry;
1991 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
1996 + if ((entry = acl_get_entry(the_acl)) != NULL) {
2001 + return errno ? -1 : 0;
2004 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2006 + return acl_get_tag_type(entry_d, tag_type_p);
2009 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2011 + return acl_get_permset(entry_d, permset_p);
2014 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2016 + return acl_get_qualifier(entry_d);
2019 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2021 + return acl_get_file((char *)path_p, type);
2024 + SMB_ACL_T sys_acl_get_fd(int fd)
2026 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
2029 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2031 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
2036 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2038 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
2043 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
2048 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2050 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
2053 + char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen)
2055 + return acl_to_text(the_acl, plen);
2058 + SMB_ACL_T sys_acl_init(int count)
2060 + return acl_init(count);
2063 + int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2065 + SMB_ACL_ENTRY_T entry;
2067 + if ((entry = acl_create_entry(pacl)) == NULL) {
2075 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2077 + return acl_set_tag_type(entry, tagtype);
2080 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
2082 + return acl_set_qualifier(entry, qual);
2085 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2087 + return acl_set_permset(entry, permset);
2090 + int sys_acl_valid(SMB_ACL_T theacl)
2092 + acl_entry_t entry;
2094 + return acl_valid(theacl, &entry);
2097 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2099 + return acl_set_file((char *)name, acltype, theacl);
2102 + int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
2104 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
2107 + int sys_acl_delete_def_file(const char *name)
2109 + return acl_delete_def_file((char *)name);
2112 + int sys_acl_free_text(char *text)
2114 + /* (void) cast and explicit return 0 are for DEC UNIX
2115 + * which just #defines acl_free_text() to be free(). */
2116 + (void) acl_free_text(text);
2120 + int sys_acl_free_acl(SMB_ACL_T the_acl)
2122 + return acl_free(the_acl);
2125 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2127 + return acl_free_qualifier(qual, tagtype);
2130 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
2132 +/* Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
2133 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris. */
2135 +/* Note that while this code implements sufficient functionality
2136 + * to support the sys_acl_* interfaces it does not provide all
2137 + * of the semantics of the POSIX ACL interfaces.
2139 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2140 + * from a call to sys_acl_get_entry() should not be assumed to be
2141 + * valid after calling any of the following functions, which may
2142 + * reorder the entries in the ACL.
2145 + * sys_acl_set_file()
2146 + * sys_acl_set_fd()
2149 +/* The only difference between Solaris and UnixWare / OpenUNIX is
2150 + * that the #defines for the ACL operations have different names. */
2151 +#if defined(HAVE_UNIXWARE_ACLS)
2153 +#define SETACL ACL_SET
2154 +#define GETACL ACL_GET
2155 +#define GETACLCNT ACL_CNT
2160 + int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2162 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2167 + if (entry_p == NULL) {
2172 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2176 + if (acl_d->next < 0) {
2181 + if (acl_d->next >= acl_d->count) {
2185 + *entry_p = &acl_d->acl[acl_d->next++];
2190 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2192 + *type_p = entry_d->a_type;
2197 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2199 + *permset_p = &entry_d->a_perm;
2204 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2206 + if (entry_d->a_type != SMB_ACL_USER
2207 + && entry_d->a_type != SMB_ACL_GROUP) {
2212 + return &entry_d->a_id;
2215 +/* There is no way of knowing what size the ACL returned by
2216 + * GETACL will be unless you first call GETACLCNT which means
2217 + * making an additional system call.
2219 + * In the hope of avoiding the cost of the additional system
2220 + * call in most cases, we initially allocate enough space for
2221 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2222 + * be too small then we use GETACLCNT to find out the actual
2223 + * size, reallocate the ACL buffer, and then call GETACL again. */
2225 +#define INITIAL_ACL_SIZE 16
2227 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2230 + int count; /* # of ACL entries allocated */
2231 + int naccess; /* # of access ACL entries */
2232 + int ndefault; /* # of default ACL entries */
2234 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2239 + count = INITIAL_ACL_SIZE;
2240 + if ((acl_d = sys_acl_init(count)) == NULL) {
2244 + /* If there isn't enough space for the ACL entries we use
2245 + * GETACLCNT to determine the actual number of ACL entries
2246 + * reallocate and try again. This is in a loop because it
2247 + * is possible that someone else could modify the ACL and
2248 + * increase the number of entries between the call to
2249 + * GETACLCNT and the call to GETACL. */
2250 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
2251 + && errno == ENOSPC) {
2253 + sys_acl_free_acl(acl_d);
2255 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
2259 + if ((acl_d = sys_acl_init(count)) == NULL) {
2265 + sys_acl_free_acl(acl_d);
2269 + /* Calculate the number of access and default ACL entries.
2271 + * Note: we assume that the acl() system call returned a
2272 + * well formed ACL which is sorted so that all of the
2273 + * access ACL entries preceed any default ACL entries. */
2274 + for (naccess = 0; naccess < count; naccess++) {
2275 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2278 + ndefault = count - naccess;
2280 + /* If the caller wants the default ACL we have to copy
2281 + * the entries down to the start of the acl[] buffer
2282 + * and mask out the ACL_DEFAULT flag from the type field. */
2283 + if (type == SMB_ACL_TYPE_DEFAULT) {
2286 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2287 + acl_d->acl[i] = acl_d->acl[j];
2288 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2291 + acl_d->count = ndefault;
2293 + acl_d->count = naccess;
2299 + SMB_ACL_T sys_acl_get_fd(int fd)
2302 + int count; /* # of ACL entries allocated */
2303 + int naccess; /* # of access ACL entries */
2305 + count = INITIAL_ACL_SIZE;
2306 + if ((acl_d = sys_acl_init(count)) == NULL) {
2310 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2311 + && errno == ENOSPC) {
2313 + sys_acl_free_acl(acl_d);
2315 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2319 + if ((acl_d = sys_acl_init(count)) == NULL) {
2325 + sys_acl_free_acl(acl_d);
2329 + /* Calculate the number of access ACL entries. */
2330 + for (naccess = 0; naccess < count; naccess++) {
2331 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2335 + acl_d->count = naccess;
2340 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2347 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2349 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2350 + && perm != SMB_ACL_EXECUTE) {
2355 + if (permset_d == NULL) {
2360 + *permset_d |= perm;
2365 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2367 + return *permset_d & perm;
2370 + char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2376 + /* Use an initial estimate of 20 bytes per ACL entry
2377 + * when allocating memory for the text representation
2380 + maxlen = 20 * acl_d->count;
2381 + if ((text = malloc(maxlen)) == NULL) {
2386 + for (i = 0; i < acl_d->count; i++) {
2387 + struct acl *ap = &acl_d->acl[i];
2388 + struct passwd *pw;
2397 + switch (ap->a_type) {
2398 + /* For debugging purposes it's probably more
2399 + * useful to dump unknown tag types rather
2400 + * than just returning an error. */
2402 + snprintf(tagbuf, sizeof tagbuf - 1, "0x%x",
2405 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
2410 + case SMB_ACL_USER:
2411 + if ((pw = getpwuid(ap->a_id)) == NULL) {
2412 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
2418 + case SMB_ACL_USER_OBJ:
2422 + case SMB_ACL_GROUP:
2423 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2424 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
2430 + case SMB_ACL_GROUP_OBJ:
2434 + case SMB_ACL_OTHER:
2438 + case SMB_ACL_MASK:
2444 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
2445 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
2446 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
2449 + /* <tag> : <qualifier> : rwx \n \0 */
2450 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
2452 + /* If this entry would overflow the buffer
2453 + * allocate enough additional memory for this
2454 + * entry and an estimate of another 20 bytes
2455 + * for each entry still to be processed. */
2456 + if ((len + nbytes) > maxlen) {
2457 + char *oldtext = text;
2459 + maxlen += nbytes + 20 * (acl_d->count - i);
2461 + if ((text = Realloc(oldtext, maxlen)) == NULL) {
2468 + snprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
2469 + len += nbytes - 1;
2478 + SMB_ACL_T sys_acl_init(int count)
2487 + /* Note that since the definition of the structure pointed
2488 + * to by the SMB_ACL_T includes the first element of the
2489 + * acl[] array, this actually allocates an ACL with room
2490 + * for (count+1) entries. */
2491 + if ((a = malloc(sizeof a[0] + count * sizeof (struct acl))) == NULL) {
2496 + a->size = count + 1;
2504 + int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
2507 + SMB_ACL_ENTRY_T entry_d;
2509 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
2514 + if (acl_d->count >= acl_d->size) {
2519 + entry_d = &acl_d->acl[acl_d->count++];
2520 + entry_d->a_type = 0;
2521 + entry_d->a_id = -1;
2522 + entry_d->a_perm = 0;
2523 + *entry_p = entry_d;
2528 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
2530 + switch (tag_type) {
2531 + case SMB_ACL_USER:
2532 + case SMB_ACL_USER_OBJ:
2533 + case SMB_ACL_GROUP:
2534 + case SMB_ACL_GROUP_OBJ:
2535 + case SMB_ACL_OTHER:
2536 + case SMB_ACL_MASK:
2537 + entry_d->a_type = tag_type;
2547 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
2549 + if (entry_d->a_type != SMB_ACL_GROUP
2550 + && entry_d->a_type != SMB_ACL_USER) {
2555 + entry_d->a_id = *((id_t *)qual_p);
2560 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
2562 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
2566 + entry_d->a_perm = *permset_d;
2571 +/* Sort the ACL and check it for validity.
2573 + * If it's a minimal ACL with only 4 entries then we
2574 + * need to recalculate the mask permissions to make
2575 + * sure that they are the same as the GROUP_OBJ
2576 + * permissions as required by the UnixWare acl() system call.
2578 + * (Note: since POSIX allows minimal ACLs which only contain
2579 + * 3 entries - ie there is no mask entry - we should, in theory,
2580 + * check for this and add a mask entry if necessary - however
2581 + * we "know" that the caller of this interface always specifies
2582 + * a mask so, in practice "this never happens" (tm) - if it *does*
2583 + * happen aclsort() will fail and return an error and someone will
2584 + * have to fix it ...) */
2586 +static int acl_sort(SMB_ACL_T acl_d)
2588 + int fixmask = (acl_d->count <= 4);
2590 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
2597 + int sys_acl_valid(SMB_ACL_T acl_d)
2599 + return acl_sort(acl_d);
2602 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
2605 + struct acl *acl_p;
2607 + struct acl *acl_buf = NULL;
2610 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2615 + if (acl_sort(acl_d) != 0) {
2619 + acl_p = &acl_d->acl[0];
2620 + acl_count = acl_d->count;
2622 + /* If it's a directory there is extra work to do since the acl()
2623 + * system call will replace both the access ACLs and the default
2624 + * ACLs (if any). */
2625 + if (stat(name, &s) != 0) {
2628 + if (S_ISDIR(s.st_mode)) {
2629 + SMB_ACL_T acc_acl;
2630 + SMB_ACL_T def_acl;
2631 + SMB_ACL_T tmp_acl;
2634 + if (type == SMB_ACL_TYPE_ACCESS) {
2636 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
2640 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
2643 + if (tmp_acl == NULL) {
2647 + /* Allocate a temporary buffer for the complete ACL. */
2648 + acl_count = acc_acl->count + def_acl->count;
2649 + acl_p = acl_buf = malloc(acl_count * sizeof acl_buf[0]);
2651 + if (acl_buf == NULL) {
2652 + sys_acl_free_acl(tmp_acl);
2657 + /* Copy the access control and default entries into the buffer. */
2658 + memcpy(&acl_buf[0], &acc_acl->acl[0],
2659 + acc_acl->count * sizeof acl_buf[0]);
2661 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
2662 + def_acl->count * sizeof acl_buf[0]);
2664 + /* Set the ACL_DEFAULT flag on the default entries. */
2665 + for (i = acc_acl->count; i < acl_count; i++) {
2666 + acl_buf[i].a_type |= ACL_DEFAULT;
2669 + sys_acl_free_acl(tmp_acl);
2671 + } else if (type != SMB_ACL_TYPE_ACCESS) {
2676 + ret = acl(name, SETACL, acl_count, acl_p);
2683 + int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
2685 + if (acl_sort(acl_d) != 0) {
2689 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
2692 + int sys_acl_delete_def_file(const char *path)
2697 + /* Fetching the access ACL and rewriting it has the effect of
2698 + * deleting the default ACL. */
2699 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
2703 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
2705 + sys_acl_free_acl(acl_d);
2710 + int sys_acl_free_text(char *text)
2716 + int sys_acl_free_acl(SMB_ACL_T acl_d)
2722 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2727 +#elif defined(HAVE_HPUX_ACLS)
2730 +/* Based on the Solaris/SCO code - with modifications. */
2732 +/* Note that while this code implements sufficient functionality
2733 + * to support the sys_acl_* interfaces it does not provide all
2734 + * of the semantics of the POSIX ACL interfaces.
2736 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2737 + * from a call to sys_acl_get_entry() should not be assumed to be
2738 + * valid after calling any of the following functions, which may
2739 + * reorder the entries in the ACL.
2742 + * sys_acl_set_file()
2743 + * sys_acl_set_fd()
2746 +/* This checks if the POSIX ACL system call is defined which basically
2747 + * corresponds to whether JFS 3.3 or higher is installed. If acl() was
2748 + * called when it isn't defined, it causes the process to core dump so
2749 + * it is important to check this and avoid acl() calls if it isn't
2752 +static BOOL hpux_acl_call_presence(void)
2755 + shl_t handle = NULL;
2758 + static BOOL already_checked=0;
2760 + if (already_checked)
2764 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
2766 + if (ret_val != 0) {
2767 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
2768 + ret_val, errno, strerror(errno)));
2769 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
2773 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
2775 + already_checked = True;
2779 + int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2781 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2786 + if (entry_p == NULL) {
2791 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2795 + if (acl_d->next < 0) {
2800 + if (acl_d->next >= acl_d->count) {
2804 + *entry_p = &acl_d->acl[acl_d->next++];
2809 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2811 + *type_p = entry_d->a_type;
2816 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2818 + *permset_p = &entry_d->a_perm;
2823 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2825 + if (entry_d->a_type != SMB_ACL_USER
2826 + && entry_d->a_type != SMB_ACL_GROUP) {
2831 + return &entry_d->a_id;
2834 +/* There is no way of knowing what size the ACL returned by
2835 + * ACL_GET will be unless you first call ACL_CNT which means
2836 + * making an additional system call.
2838 + * In the hope of avoiding the cost of the additional system
2839 + * call in most cases, we initially allocate enough space for
2840 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2841 + * be too small then we use ACL_CNT to find out the actual
2842 + * size, reallocate the ACL buffer, and then call ACL_GET again.
2845 +#define INITIAL_ACL_SIZE 16
2847 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2850 + int count; /* # of ACL entries allocated */
2851 + int naccess; /* # of access ACL entries */
2852 + int ndefault; /* # of default ACL entries */
2854 + if (hpux_acl_call_presence() == False) {
2855 + /* Looks like we don't have the acl() system call on HPUX.
2856 + * May be the system doesn't have the latest version of JFS. */
2860 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2865 + count = INITIAL_ACL_SIZE;
2866 + if ((acl_d = sys_acl_init(count)) == NULL) {
2870 + /* If there isn't enough space for the ACL entries we use
2871 + * ACL_CNT to determine the actual number of ACL entries
2872 + * reallocate and try again. This is in a loop because it
2873 + * is possible that someone else could modify the ACL and
2874 + * increase the number of entries between the call to
2875 + * ACL_CNT and the call to ACL_GET. */
2876 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
2878 + sys_acl_free_acl(acl_d);
2880 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
2884 + if ((acl_d = sys_acl_init(count)) == NULL) {
2890 + sys_acl_free_acl(acl_d);
2894 + /* Calculate the number of access and default ACL entries.
2896 + * Note: we assume that the acl() system call returned a
2897 + * well formed ACL which is sorted so that all of the
2898 + * access ACL entries preceed any default ACL entries. */
2899 + for (naccess = 0; naccess < count; naccess++) {
2900 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2903 + ndefault = count - naccess;
2905 + /* If the caller wants the default ACL we have to copy
2906 + * the entries down to the start of the acl[] buffer
2907 + * and mask out the ACL_DEFAULT flag from the type field. */
2908 + if (type == SMB_ACL_TYPE_DEFAULT) {
2911 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2912 + acl_d->acl[i] = acl_d->acl[j];
2913 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2916 + acl_d->count = ndefault;
2918 + acl_d->count = naccess;
2924 + SMB_ACL_T sys_acl_get_fd(int fd)
2926 + /* HPUX doesn't have the facl call. Fake it using the path.... JRA. */
2928 + files_struct *fsp = file_find_fd(fd);
2930 + if (fsp == NULL) {
2935 + /* We know we're in the same conn context. So we can use the
2936 + * relative path. */
2938 + return sys_acl_get_file(dos_to_unix_static(fsp->fsp_name), SMB_ACL_TYPE_ACCESS);
2941 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2948 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2950 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2951 + && perm != SMB_ACL_EXECUTE) {
2956 + if (permset_d == NULL) {
2961 + *permset_d |= perm;
2966 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2968 + return *permset_d & perm;
2971 + char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2977 + /* Use an initial estimate of 20 bytes per ACL entry when
2978 + * allocating memory for the text representation of the ACL. */
2980 + maxlen = 20 * acl_d->count;
2981 + if ((text = malloc(maxlen)) == NULL) {
2986 + for (i = 0; i < acl_d->count; i++) {
2987 + struct acl *ap = &acl_d->acl[i];
2988 + struct passwd *pw;
2997 + switch (ap->a_type) {
2998 + /* For debugging purposes it's probably more
2999 + * useful to dump unknown tag types rather
3000 + * than just returning an error. */
3002 + snprintf(tagbuf, sizeof tagbuf - 1, "0x%x",
3005 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
3010 + case SMB_ACL_USER:
3011 + if ((pw = getpwuid(ap->a_id)) == NULL) {
3012 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
3018 + case SMB_ACL_USER_OBJ:
3022 + case SMB_ACL_GROUP:
3023 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3024 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
3030 + case SMB_ACL_GROUP_OBJ:
3034 + case SMB_ACL_OTHER:
3038 + case SMB_ACL_MASK:
3044 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3045 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3046 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3049 + /* <tag> : <qualifier> : rwx \n \0 */
3050 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3052 + /* If this entry would overflow the buffer
3053 + * allocate enough additional memory for this
3054 + * entry and an estimate of another 20 bytes
3055 + * for each entry still to be processed. */
3056 + if ((len + nbytes) > maxlen) {
3057 + char *oldtext = text;
3059 + maxlen += nbytes + 20 * (acl_d->count - i);
3061 + if ((text = Realloc(oldtext, maxlen)) == NULL) {
3068 + snprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3069 + len += nbytes - 1;
3078 + SMB_ACL_T sys_acl_init(int count)
3087 + /* Note that since the definition of the structure pointed
3088 + * to by the SMB_ACL_T includes the first element of the
3089 + * acl[] array, this actually allocates an ACL with room
3090 + * for (count+1) entries. */
3091 + if ((a = malloc(sizeof a[0] + count * sizeof (struct acl))) == NULL) {
3096 + a->size = count + 1;
3104 + int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3107 + SMB_ACL_ENTRY_T entry_d;
3109 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3114 + if (acl_d->count >= acl_d->size) {
3119 + entry_d = &acl_d->acl[acl_d->count++];
3120 + entry_d->a_type = 0;
3121 + entry_d->a_id = -1;
3122 + entry_d->a_perm = 0;
3123 + *entry_p = entry_d;
3128 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3130 + switch (tag_type) {
3131 + case SMB_ACL_USER:
3132 + case SMB_ACL_USER_OBJ:
3133 + case SMB_ACL_GROUP:
3134 + case SMB_ACL_GROUP_OBJ:
3135 + case SMB_ACL_OTHER:
3136 + case SMB_ACL_MASK:
3137 + entry_d->a_type = tag_type;
3147 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3149 + if (entry_d->a_type != SMB_ACL_GROUP
3150 + && entry_d->a_type != SMB_ACL_USER) {
3155 + entry_d->a_id = *((id_t *)qual_p);
3160 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3162 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3166 + entry_d->a_perm = *permset_d;
3171 +/* Structure to capture the count for each type of ACE. */
3173 +struct hpux_acl_types {
3177 + int n_def_user_obj;
3182 + int n_def_group_obj;
3186 + int n_def_other_obj;
3189 + int n_def_class_obj;
3191 + int n_illegal_obj;
3195 + * Counts the different number of objects in a given array of ACL
3199 + * acl_count - Count of ACLs in the array of ACL strucutres.
3200 + * aclp - Array of ACL structures.
3201 + * acl_type_count - Pointer to acl_types structure. Should already be
3205 + * acl_type_count - This structure is filled up with counts of various
3209 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
3213 + memset(acl_type_count, 0, sizeof (struct hpux_acl_types));
3215 + for (i=0;i<acl_count;i++) {
3216 + switch (aclp[i].a_type) {
3218 + acl_type_count->n_user++;
3221 + acl_type_count->n_user_obj++;
3223 + case DEF_USER_OBJ:
3224 + acl_type_count->n_def_user_obj++;
3227 + acl_type_count->n_group++;
3230 + acl_type_count->n_group_obj++;
3232 + case DEF_GROUP_OBJ:
3233 + acl_type_count->n_def_group_obj++;
3236 + acl_type_count->n_other_obj++;
3238 + case DEF_OTHER_OBJ:
3239 + acl_type_count->n_def_other_obj++;
3242 + acl_type_count->n_class_obj++;
3244 + case DEF_CLASS_OBJ:
3245 + acl_type_count->n_def_class_obj++;
3248 + acl_type_count->n_def_user++;
3251 + acl_type_count->n_def_group++;
3254 + acl_type_count->n_illegal_obj++;
3260 +/* swap_acl_entries: Swaps two ACL entries.
3262 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3265 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3267 + struct acl temp_acl;
3269 + temp_acl.a_type = aclp0->a_type;
3270 + temp_acl.a_id = aclp0->a_id;
3271 + temp_acl.a_perm = aclp0->a_perm;
3273 + aclp0->a_type = aclp1->a_type;
3274 + aclp0->a_id = aclp1->a_id;
3275 + aclp0->a_perm = aclp1->a_perm;
3277 + aclp1->a_type = temp_acl.a_type;
3278 + aclp1->a_id = temp_acl.a_id;
3279 + aclp1->a_perm = temp_acl.a_perm;
3282 +/* prohibited_duplicate_type
3283 + * Identifies if given ACL type can have duplicate entries or
3286 + * Inputs: acl_type - ACL Type.
3292 + * True - If the ACL type matches any of the prohibited types.
3293 + * False - If the ACL type doesn't match any of the prohibited types.
3296 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
3298 + switch (acl_type) {
3308 +/* get_needed_class_perm
3309 + * Returns the permissions of a ACL structure only if the ACL
3310 + * type matches one of the pre-determined types for computing
3311 + * CLASS_OBJ permissions.
3313 + * Inputs: aclp - Pointer to ACL structure.
3316 +static int hpux_get_needed_class_perm(struct acl *aclp)
3318 + switch (aclp->a_type) {
3322 + case DEF_USER_OBJ:
3324 + case DEF_GROUP_OBJ:
3326 + case DEF_CLASS_OBJ:
3327 + case DEF_OTHER_OBJ:
3328 + return aclp->a_perm;
3334 +/* acl_sort for HPUX.
3335 + * Sorts the array of ACL structures as per the description in
3336 + * aclsort man page. Refer to aclsort man page for more details
3340 + * acl_count - Count of ACLs in the array of ACL structures.
3341 + * calclass - If this is not zero, then we compute the CLASS_OBJ
3343 + * aclp - Array of ACL structures.
3347 + * aclp - Sorted array of ACL structures.
3351 + * Returns 0 for success -1 for failure. Prints a message to the Samba
3352 + * debug log in case of failure.
3355 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
3357 +#if !defined(HAVE_HPUX_ACLSORT)
3358 + /* The aclsort() system call is availabe on the latest HPUX General
3359 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
3360 + * function. Because, we don't want to update to a new
3361 + * HPUX GR bundle just for aclsort() call. */
3363 + struct hpux_acl_types acl_obj_count;
3364 + int n_class_obj_perm = 0;
3368 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
3372 + if (aclp == NULL) {
3373 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
3377 + /* Count different types of ACLs in the ACLs array */
3379 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
3381 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
3382 + * CLASS_OBJ and OTHER_OBJ
3385 + if (acl_obj_count.n_user_obj != 1
3386 + || acl_obj_count.n_group_obj != 1
3387 + || acl_obj_count.n_class_obj != 1
3388 + || acl_obj_count.n_other_obj != 1) {
3389 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
3390 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
3394 + /* If any of the default objects are present, there should be only
3395 + * one of them each.
3398 + if (acl_obj_count.n_def_user_obj > 1 || acl_obj_count.n_def_group_obj > 1 ||
3399 + acl_obj_count.n_def_other_obj > 1 || acl_obj_count.n_def_class_obj > 1) {
3400 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
3401 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
3405 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
3408 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
3409 + * same ACL type, sort by ACL id.
3411 + * I am using the trival kind of sorting method here because, performance isn't
3412 + * really effected by the ACLs feature. More over there aren't going to be more
3413 + * than 17 entries on HPUX.
3416 + for (i=0; i<acl_count;i++) {
3417 + for (j=i+1; j<acl_count; j++) {
3418 + if (aclp[i].a_type > aclp[j].a_type) {
3419 + /* ACL entries out of order, swap them */
3421 + hpux_swap_acl_entries((aclp+i), (aclp+j));
3423 + } else if (aclp[i].a_type == aclp[j].a_type) {
3425 + /* ACL entries of same type, sort by id */
3427 + if (aclp[i].a_id > aclp[j].a_id) {
3428 + hpux_swap_acl_entries((aclp+i), (aclp+j));
3429 + } else if (aclp[i].a_id == aclp[j].a_id) {
3430 + /* We have a duplicate entry. */
3431 + if (hpux_prohibited_duplicate_type(aclp[i].a_type)) {
3432 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
3433 + aclp[i].a_type, aclp[i].a_id));
3442 + /* set the class obj permissions to the computed one. */
3444 + int n_class_obj_index = -1;
3446 + for (i=0;i<acl_count;i++) {
3447 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
3449 + if (aclp[i].a_type == CLASS_OBJ)
3450 + n_class_obj_index = i;
3452 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
3457 + return aclsort(acl_count, calclass, aclp);
3461 +/* Sort the ACL and check it for validity.
3463 + * If it's a minimal ACL with only 4 entries then we
3464 + * need to recalculate the mask permissions to make
3465 + * sure that they are the same as the GROUP_OBJ
3466 + * permissions as required by the UnixWare acl() system call.
3468 + * (Note: since POSIX allows minimal ACLs which only contain
3469 + * 3 entries - ie there is no mask entry - we should, in theory,
3470 + * check for this and add a mask entry if necessary - however
3471 + * we "know" that the caller of this interface always specifies
3472 + * a mask so, in practice "this never happens" (tm) - if it *does*
3473 + * happen aclsort() will fail and return an error and someone will
3474 + * have to fix it ...) */
3476 +static int acl_sort(SMB_ACL_T acl_d)
3478 + int fixmask = (acl_d->count <= 4);
3480 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
3487 + int sys_acl_valid(SMB_ACL_T acl_d)
3489 + return acl_sort(acl_d);
3492 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3495 + struct acl *acl_p;
3497 + struct acl *acl_buf = NULL;
3500 + if (hpux_acl_call_presence() == False) {
3501 + /* Looks like we don't have the acl() system call on HPUX.
3502 + * May be the system doesn't have the latest version of JFS. */
3507 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3512 + if (acl_sort(acl_d) != 0) {
3516 + acl_p = &acl_d->acl[0];
3517 + acl_count = acl_d->count;
3519 + /* If it's a directory there is extra work to do since the acl()
3520 + * system call will replace both the access ACLs and the default
3521 + * ACLs (if any). */
3522 + if (stat(name, &s) != 0) {
3525 + if (S_ISDIR(s.st_mode)) {
3526 + SMB_ACL_T acc_acl;
3527 + SMB_ACL_T def_acl;
3528 + SMB_ACL_T tmp_acl;
3531 + if (type == SMB_ACL_TYPE_ACCESS) {
3533 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3537 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3540 + if (tmp_acl == NULL) {
3544 + /* Allocate a temporary buffer for the complete ACL. */
3545 + acl_count = acc_acl->count + def_acl->count;
3546 + acl_p = acl_buf = malloc(acl_count * sizeof acl_buf[0]);
3548 + if (acl_buf == NULL) {
3549 + sys_acl_free_acl(tmp_acl);
3554 + /* Copy the access control and default entries into the buffer. */
3555 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3556 + acc_acl->count * sizeof acl_buf[0]);
3558 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3559 + def_acl->count * sizeof acl_buf[0]);
3561 + /* Set the ACL_DEFAULT flag on the default entries. */
3562 + for (i = acc_acl->count; i < acl_count; i++) {
3563 + acl_buf[i].a_type |= ACL_DEFAULT;
3566 + sys_acl_free_acl(tmp_acl);
3568 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3573 + ret = acl(name, ACL_SET, acl_count, acl_p);
3580 + int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3582 + /* HPUX doesn't have the facl call. Fake it using the path.... JRA. */
3584 + files_struct *fsp = file_find_fd(fd);
3586 + if (fsp == NULL) {
3591 + if (acl_sort(acl_d) != 0) {
3595 + /* We know we're in the same conn context. So we can use the
3596 + * relative path. */
3598 + return sys_acl_set_file(dos_to_unix_static(fsp->fsp_name), SMB_ACL_TYPE_ACCESS, acl_d);
3601 + int sys_acl_delete_def_file(const char *path)
3606 + /* Fetching the access ACL and rewriting it has the effect of
3607 + * deleting the default ACL. */
3608 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3612 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
3614 + sys_acl_free_acl(acl_d);
3619 + int sys_acl_free_text(char *text)
3625 + int sys_acl_free_acl(SMB_ACL_T acl_d)
3631 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
3636 +#elif defined(HAVE_IRIX_ACLS)
3638 + int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3640 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3645 + if (entry_p == NULL) {
3650 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3654 + if (acl_d->next < 0) {
3659 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
3663 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
3668 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3670 + *type_p = entry_d->ae_tag;
3675 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3677 + *permset_p = entry_d;
3682 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3684 + if (entry_d->ae_tag != SMB_ACL_USER
3685 + && entry_d->ae_tag != SMB_ACL_GROUP) {
3690 + return &entry_d->ae_id;
3693 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3697 + if ((a = malloc(sizeof a[0])) == NULL) {
3701 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
3706 + a->freeaclp = True;
3710 + SMB_ACL_T sys_acl_get_fd(int fd)
3714 + if ((a = malloc(sizeof a[0])) == NULL) {
3718 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
3723 + a->freeaclp = True;
3727 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3729 + permset_d->ae_perm = 0;
3734 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3736 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3737 + && perm != SMB_ACL_EXECUTE) {
3742 + if (permset_d == NULL) {
3747 + permset_d->ae_perm |= perm;
3752 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3754 + return permset_d->ae_perm & perm;
3757 + char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3759 + return acl_to_text(acl_d->aclp, len_p);
3762 + SMB_ACL_T sys_acl_init(int count)
3771 + if ((a = malloc(sizeof a[0] + sizeof (struct acl))) == NULL) {
3777 + a->freeaclp = False;
3778 + a->aclp = (struct acl *)(&a->aclp + sizeof (struct acl *));
3779 + a->aclp->acl_cnt = 0;
3785 + int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3788 + SMB_ACL_ENTRY_T entry_d;
3790 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3795 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
3800 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
3801 + entry_d->ae_tag = 0;
3802 + entry_d->ae_id = 0;
3803 + entry_d->ae_perm = 0;
3804 + *entry_p = entry_d;
3809 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3811 + switch (tag_type) {
3812 + case SMB_ACL_USER:
3813 + case SMB_ACL_USER_OBJ:
3814 + case SMB_ACL_GROUP:
3815 + case SMB_ACL_GROUP_OBJ:
3816 + case SMB_ACL_OTHER:
3817 + case SMB_ACL_MASK:
3818 + entry_d->ae_tag = tag_type;
3828 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3830 + if (entry_d->ae_tag != SMB_ACL_GROUP
3831 + && entry_d->ae_tag != SMB_ACL_USER) {
3836 + entry_d->ae_id = *((id_t *)qual_p);
3841 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3843 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3847 + entry_d->ae_perm = permset_d->ae_perm;
3852 + int sys_acl_valid(SMB_ACL_T acl_d)
3854 + return acl_valid(acl_d->aclp);
3857 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3859 + return acl_set_file(name, type, acl_d->aclp);
3862 + int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3864 + return acl_set_fd(fd, acl_d->aclp);
3867 + int sys_acl_delete_def_file(const char *name)
3869 + return acl_delete_def_file(name);
3872 + int sys_acl_free_text(char *text)
3874 + return acl_free(text);
3877 + int sys_acl_free_acl(SMB_ACL_T acl_d)
3879 + if (acl_d->freeaclp) {
3880 + acl_free(acl_d->aclp);
3886 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
3891 +#elif defined(HAVE_AIX_ACLS)
3893 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
3895 + int sys_acl_get_entry(SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3897 + struct acl_entry_link *link;
3898 + struct new_acl_entry *entry;
3901 + DEBUG(10,("This is the count: %d\n",theacl->count));
3903 + /* Check if count was previously set to -1. If it was, that
3904 + * means we reached the end of the acl last time. */
3905 + if (theacl->count == -1)
3909 + /* To get to the next acl, traverse linked list until index of
3910 + * acl matches the count we are keeping. This count is
3911 + * incremented each time we return an acl entry. */
3913 + for (keep_going = 0; keep_going < theacl->count; keep_going++)
3914 + link = link->nextp;
3916 + entry = *entry_p = link->entryp;
3918 + DEBUG(10,("*entry_p is %d\n",entry_p));
3919 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
3921 + /* Increment count */
3923 + if (link->nextp == NULL)
3924 + theacl->count = -1;
3929 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
3931 + /* Initialize tag type */
3934 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
3936 + /* Depending on what type of entry we have, return tag type. */
3937 + switch (entry_d->ace_id->id_type) {
3939 + *tag_type_p = SMB_ACL_USER;
3942 + *tag_type_p = SMB_ACL_GROUP;
3945 + case SMB_ACL_USER_OBJ:
3946 + case SMB_ACL_GROUP_OBJ:
3947 + case SMB_ACL_OTHER:
3948 + *tag_type_p = entry_d->ace_id->id_type;
3958 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3960 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
3961 + *permset_p = &entry_d->ace_access;
3962 + DEBUG(10,("**permset_p is %d\n",**permset_p));
3963 + if (!(**permset_p & S_IXUSR)
3964 + && !(**permset_p & S_IWUSR)
3965 + && !(**permset_p & S_IRUSR)
3966 + && **permset_p != 0)
3969 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
3973 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3975 + return entry_d->ace_id->id_data;
3978 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3980 + struct acl *file_acl = (struct acl *)NULL;
3981 + struct acl_entry *acl_entry;
3982 + struct new_acl_entry *new_acl_entry;
3983 + struct ace_id *idp;
3984 + struct acl_entry_link *acl_entry_link;
3985 + struct acl_entry_link *acl_entry_link_head;
3990 + /* Get the acl using statacl */
3992 + DEBUG(10,("Entering sys_acl_get_file\n"));
3993 + DEBUG(10,("path_p is %s\n",path_p));
3995 + file_acl = (struct acl *)malloc(BUFSIZ);
3997 + if (file_acl == NULL) {
3999 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
4003 + memset(file_acl,0,BUFSIZ);
4005 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
4007 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
4012 + DEBUG(10,("Got facl and returned it\n"));
4014 + /* Point to the first acl entry in the acl */
4015 + acl_entry = file_acl->acl_ext;
4017 + /* Begin setting up the head of the linked list that will be
4018 + * used for the storing the acl in a way that is useful for the
4019 + * posix_acls.c code. */
4021 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4022 + if (acl_entry_link_head == NULL)
4025 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4026 + if (acl_entry_link->entryp == NULL) {
4029 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4033 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4034 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4036 + /* Check if the extended acl bit is on. If it isn't, do not
4037 + * show the contents of the acl since AIX intends the extended
4038 + * info to remain unused. */
4040 + if (file_acl->acl_mode & S_IXACL){
4041 + /* while we are not pointing to the very end */
4042 + while (acl_entry < acl_last(file_acl)) {
4043 + /* before we malloc anything, make sure this is */
4044 + /* a valid acl entry and one that we want to map */
4045 + idp = id_nxt(acl_entry->ace_id);
4046 + if ((acl_entry->ace_type == ACC_SPECIFY
4047 + || acl_entry->ace_type == ACC_PERMIT)
4048 + && idp != id_last(acl_entry)) {
4049 + acl_entry = acl_nxt(acl_entry);
4053 + idp = acl_entry->ace_id;
4055 + /* Check if this is the first entry in the linked list.
4056 + * The first entry needs to keep prevp pointing to NULL
4057 + * and already has entryp allocated. */
4059 + if (acl_entry_link_head->count != 0) {
4060 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4062 + if (acl_entry_link->nextp == NULL) {
4065 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4069 + acl_entry_link->nextp->prevp = acl_entry_link;
4070 + acl_entry_link = acl_entry_link->nextp;
4071 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4072 + if (acl_entry_link->entryp == NULL) {
4075 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4078 + acl_entry_link->nextp = NULL;
4081 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4083 + /* Don't really need this since all types are going
4084 + * to be specified but, it's better than leaving it 0. */
4086 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4088 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4090 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof (struct ace_id));
4092 + /* The access in the acl entries must be left shifted by
4093 + * three bites, because they will ultimately be compared
4094 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4096 + switch (acl_entry->ace_type){
4099 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4100 + acl_entry_link->entryp->ace_access <<= 6;
4101 + acl_entry_link_head->count++;
4104 + /* Since there is no way to return a DENY acl entry
4105 + * change to PERMIT and then shift. */
4106 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4107 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4108 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4109 + acl_entry_link->entryp->ace_access <<= 6;
4110 + acl_entry_link_head->count++;
4116 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4117 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4119 + acl_entry = acl_nxt(acl_entry);
4121 + } /* end of if enabled */
4123 + /* Since owner, group, other acl entries are not part of the acl
4124 + * entries in an acl, they must be dummied up to become part of
4127 + for (i = 1; i < 4; i++) {
4128 + DEBUG(10,("i is %d\n",i));
4129 + if (acl_entry_link_head->count != 0) {
4130 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4131 + if (acl_entry_link->nextp == NULL) {
4134 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4138 + acl_entry_link->nextp->prevp = acl_entry_link;
4139 + acl_entry_link = acl_entry_link->nextp;
4140 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4141 + if (acl_entry_link->entryp == NULL) {
4144 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4149 + acl_entry_link->nextp = NULL;
4151 + new_acl_entry = acl_entry_link->entryp;
4152 + idp = new_acl_entry->ace_id;
4154 + new_acl_entry->ace_len = sizeof (struct acl_entry);
4155 + new_acl_entry->ace_type = ACC_PERMIT;
4156 + idp->id_len = sizeof (struct ace_id);
4157 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4158 + memset(idp->id_data,0,sizeof (uid_t));
4162 + new_acl_entry->ace_access = file_acl->g_access << 6;
4163 + idp->id_type = SMB_ACL_GROUP_OBJ;
4167 + new_acl_entry->ace_access = file_acl->o_access << 6;
4168 + idp->id_type = SMB_ACL_OTHER;
4172 + new_acl_entry->ace_access = file_acl->u_access << 6;
4173 + idp->id_type = SMB_ACL_USER_OBJ;
4181 + acl_entry_link_head->count++;
4182 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4185 + acl_entry_link_head->count = 0;
4188 + return acl_entry_link_head;
4191 + SMB_ACL_T sys_acl_get_fd(int fd)
4193 + struct acl *file_acl = (struct acl *)NULL;
4194 + struct acl_entry *acl_entry;
4195 + struct new_acl_entry *new_acl_entry;
4196 + struct ace_id *idp;
4197 + struct acl_entry_link *acl_entry_link;
4198 + struct acl_entry_link *acl_entry_link_head;
4203 + /* Get the acl using fstatacl */
4205 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4206 + DEBUG(10,("fd is %d\n",fd));
4207 + file_acl = (struct acl *)malloc(BUFSIZ);
4209 + if (file_acl == NULL) {
4211 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4215 + memset(file_acl,0,BUFSIZ);
4217 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4219 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4224 + DEBUG(10,("Got facl and returned it\n"));
4226 + /* Point to the first acl entry in the acl */
4228 + acl_entry = file_acl->acl_ext;
4230 + /* Begin setting up the head of the linked list that will be
4231 + * used for the storing the acl in a way that is useful for the
4232 + * posix_acls.c code. */
4234 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4235 + if (acl_entry_link_head == NULL){
4240 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4242 + if (acl_entry_link->entryp == NULL) {
4244 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4249 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4250 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4252 + /* Check if the extended acl bit is on. If it isn't, do not
4253 + * show the contents of the acl since AIX intends the extended
4254 + * info to remain unused. */
4256 + if (file_acl->acl_mode & S_IXACL){
4257 + /* while we are not pointing to the very end */
4258 + while (acl_entry < acl_last(file_acl)) {
4259 + /* before we malloc anything, make sure this is */
4260 + /* a valid acl entry and one that we want to map */
4262 + idp = id_nxt(acl_entry->ace_id);
4263 + if ((acl_entry->ace_type == ACC_SPECIFY
4264 + || acl_entry->ace_type == ACC_PERMIT)
4265 + && (idp != id_last(acl_entry))) {
4266 + acl_entry = acl_nxt(acl_entry);
4270 + idp = acl_entry->ace_id;
4272 + /* Check if this is the first entry in the linked list.
4273 + * The first entry needs to keep prevp pointing to NULL
4274 + * and already has entryp allocated. */
4276 + if (acl_entry_link_head->count != 0) {
4277 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4278 + if (acl_entry_link->nextp == NULL) {
4280 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4284 + acl_entry_link->nextp->prevp = acl_entry_link;
4285 + acl_entry_link = acl_entry_link->nextp;
4286 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4287 + if (acl_entry_link->entryp == NULL) {
4289 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4294 + acl_entry_link->nextp = NULL;
4297 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4299 + /* Don't really need this since all types are going
4300 + * to be specified but, it's better than leaving it 0. */
4302 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4303 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4305 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof (struct ace_id));
4307 + /* The access in the acl entries must be left shifted by
4308 + * three bites, because they will ultimately be compared
4309 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4311 + switch (acl_entry->ace_type){
4314 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4315 + acl_entry_link->entryp->ace_access <<= 6;
4316 + acl_entry_link_head->count++;
4319 + /* Since there is no way to return a DENY acl entry
4320 + * change to PERMIT and then shift. */
4321 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4322 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4323 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4324 + acl_entry_link->entryp->ace_access <<= 6;
4325 + acl_entry_link_head->count++;
4331 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4332 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4334 + acl_entry = acl_nxt(acl_entry);
4336 + } /* end of if enabled */
4338 + /* Since owner, group, other acl entries are not
4339 + * part of the acl entries in an acl, they must
4340 + * be dummied up to become part of the list. */
4342 + for (i = 1; i < 4; i++) {
4343 + DEBUG(10,("i is %d\n",i));
4344 + if (acl_entry_link_head->count != 0){
4345 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4346 + if (acl_entry_link->nextp == NULL) {
4348 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4353 + acl_entry_link->nextp->prevp = acl_entry_link;
4354 + acl_entry_link = acl_entry_link->nextp;
4355 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4357 + if (acl_entry_link->entryp == NULL) {
4360 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4365 + acl_entry_link->nextp = NULL;
4367 + new_acl_entry = acl_entry_link->entryp;
4368 + idp = new_acl_entry->ace_id;
4370 + new_acl_entry->ace_len = sizeof (struct acl_entry);
4371 + new_acl_entry->ace_type = ACC_PERMIT;
4372 + idp->id_len = sizeof (struct ace_id);
4373 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4374 + memset(idp->id_data,0,sizeof (uid_t));
4378 + new_acl_entry->ace_access = file_acl->g_access << 6;
4379 + idp->id_type = SMB_ACL_GROUP_OBJ;
4383 + new_acl_entry->ace_access = file_acl->o_access << 6;
4384 + idp->id_type = SMB_ACL_OTHER;
4388 + new_acl_entry->ace_access = file_acl->u_access << 6;
4389 + idp->id_type = SMB_ACL_USER_OBJ;
4396 + acl_entry_link_head->count++;
4397 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4400 + acl_entry_link_head->count = 0;
4403 + return acl_entry_link_head;
4406 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
4408 + *permset = *permset & ~0777;
4412 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4414 + if (perm != 0 && (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
4418 + DEBUG(10,("This is the permset now: %d\n",*permset));
4422 + char *sys_acl_to_text(SMB_ACL_T theacl, ssize_t *plen)
4427 + SMB_ACL_T sys_acl_init(int count)
4429 + struct acl_entry_link *theacl = NULL;
4431 + DEBUG(10,("Entering sys_acl_init\n"));
4433 + theacl = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4434 + if (theacl == NULL) {
4436 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
4440 + theacl->count = 0;
4441 + theacl->nextp = NULL;
4442 + theacl->prevp = NULL;
4443 + theacl->entryp = NULL;
4444 + DEBUG(10,("Exiting sys_acl_init\n"));
4448 + int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
4450 + struct acl_entry_link *theacl;
4451 + struct acl_entry_link *acl_entryp;
4452 + struct acl_entry_link *temp_entry;
4455 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
4457 + theacl = acl_entryp = *pacl;
4459 + /* Get to the end of the acl before adding entry */
4461 + for (counting=0; counting < theacl->count; counting++){
4462 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
4463 + temp_entry = acl_entryp;
4464 + acl_entryp = acl_entryp->nextp;
4467 + if (theacl->count != 0){
4468 + temp_entry->nextp = acl_entryp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4469 + if (acl_entryp == NULL) {
4471 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
4475 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
4476 + acl_entryp->prevp = temp_entry;
4477 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
4480 + *pentry = acl_entryp->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4481 + if (*pentry == NULL) {
4483 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
4487 + memset(*pentry,0,sizeof (struct new_acl_entry));
4488 + acl_entryp->entryp->ace_len = sizeof (struct acl_entry);
4489 + acl_entryp->entryp->ace_type = ACC_PERMIT;
4490 + acl_entryp->entryp->ace_id->id_len = sizeof (struct ace_id);
4491 + acl_entryp->nextp = NULL;
4493 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
4497 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
4499 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
4500 + entry->ace_id->id_type = tagtype;
4501 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
4502 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
4505 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
4507 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
4508 + memcpy(entry->ace_id->id_data,qual,sizeof (uid_t));
4509 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
4513 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
4515 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
4516 + if (!(*permset & S_IXUSR)
4517 + && !(*permset & S_IWUSR)
4518 + && !(*permset & S_IRUSR)
4522 + entry->ace_access = *permset;
4523 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
4524 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
4528 + int sys_acl_valid(SMB_ACL_T theacl)
4531 + int group_obj = 0;
4532 + int other_obj = 0;
4533 + struct acl_entry_link *acl_entry;
4535 + for (acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
4536 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
4537 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
4538 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
4541 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
4543 + if (user_obj != 1 || group_obj != 1 || other_obj != 1)
4549 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
4551 + struct acl_entry_link *acl_entry_link = NULL;
4552 + struct acl *file_acl = NULL;
4553 + struct acl *file_acl_temp = NULL;
4554 + struct acl_entry *acl_entry = NULL;
4555 + struct ace_id *ace_id = NULL;
4562 + DEBUG(10,("Entering sys_acl_set_file\n"));
4563 + DEBUG(10,("File name is %s\n",name));
4565 + /* AIX has no default ACL */
4566 + if (acltype == SMB_ACL_TYPE_DEFAULT)
4569 + acl_length = BUFSIZ;
4570 + file_acl = (struct acl *)malloc(BUFSIZ);
4572 + if (file_acl == NULL) {
4574 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
4578 + memset(file_acl,0,BUFSIZ);
4580 + file_acl->acl_len = ACL_SIZ;
4581 + file_acl->acl_mode = S_IXACL;
4583 + for (acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
4584 + acl_entry_link->entryp->ace_access >>= 6;
4585 + id_type = acl_entry_link->entryp->ace_id->id_type;
4587 + switch (id_type) {
4588 + case SMB_ACL_USER_OBJ:
4589 + file_acl->u_access = acl_entry_link->entryp->ace_access;
4591 + case SMB_ACL_GROUP_OBJ:
4592 + file_acl->g_access = acl_entry_link->entryp->ace_access;
4594 + case SMB_ACL_OTHER:
4595 + file_acl->o_access = acl_entry_link->entryp->ace_access;
4597 + case SMB_ACL_MASK:
4601 + if ((file_acl->acl_len + sizeof (struct acl_entry)) > acl_length) {
4602 + acl_length += sizeof (struct acl_entry);
4603 + file_acl_temp = (struct acl *)malloc(acl_length);
4604 + if (file_acl_temp == NULL) {
4607 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
4611 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
4613 + file_acl = file_acl_temp;
4616 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
4617 + file_acl->acl_len += sizeof (struct acl_entry);
4618 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
4619 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
4621 + /* In order to use this, we'll need to wait until we can get denies */
4622 + /* if (!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
4623 + acl_entry->ace_type = ACC_SPECIFY; */
4625 + acl_entry->ace_type = ACC_SPECIFY;
4627 + ace_id = acl_entry->ace_id;
4629 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
4630 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
4631 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
4632 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof (uid_t));
4633 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof (uid_t));
4636 + rc = chacl((char *)name,file_acl,file_acl->acl_len);
4637 + DEBUG(10,("errno is %d\n",errno));
4638 + DEBUG(10,("return code is %d\n",rc));
4640 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
4644 + int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
4646 + struct acl_entry_link *acl_entry_link = NULL;
4647 + struct acl *file_acl = NULL;
4648 + struct acl *file_acl_temp = NULL;
4649 + struct acl_entry *acl_entry = NULL;
4650 + struct ace_id *ace_id = NULL;
4656 + DEBUG(10,("Entering sys_acl_set_fd\n"));
4657 + acl_length = BUFSIZ;
4658 + file_acl = (struct acl *)malloc(BUFSIZ);
4660 + if (file_acl == NULL) {
4662 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
4666 + memset(file_acl,0,BUFSIZ);
4668 + file_acl->acl_len = ACL_SIZ;
4669 + file_acl->acl_mode = S_IXACL;
4671 + for (acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
4672 + acl_entry_link->entryp->ace_access >>= 6;
4673 + id_type = acl_entry_link->entryp->ace_id->id_type;
4674 + DEBUG(10,("The id_type is %d\n",id_type));
4676 + switch (id_type) {
4677 + case SMB_ACL_USER_OBJ:
4678 + file_acl->u_access = acl_entry_link->entryp->ace_access;
4680 + case SMB_ACL_GROUP_OBJ:
4681 + file_acl->g_access = acl_entry_link->entryp->ace_access;
4683 + case SMB_ACL_OTHER:
4684 + file_acl->o_access = acl_entry_link->entryp->ace_access;
4686 + case SMB_ACL_MASK:
4690 + if ((file_acl->acl_len + sizeof (struct acl_entry)) > acl_length) {
4691 + acl_length += sizeof (struct acl_entry);
4692 + file_acl_temp = (struct acl *)malloc(acl_length);
4693 + if (file_acl_temp == NULL) {
4696 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
4700 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
4702 + file_acl = file_acl_temp;
4705 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
4706 + file_acl->acl_len += sizeof (struct acl_entry);
4707 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
4708 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
4710 + /* In order to use this, we'll need to wait until we can get denies */
4711 + /* if (!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
4712 + acl_entry->ace_type = ACC_SPECIFY; */
4714 + acl_entry->ace_type = ACC_SPECIFY;
4716 + ace_id = acl_entry->ace_id;
4718 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
4719 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
4720 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
4721 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof (uid_t));
4722 + memcpy(ace_id->id_data, &user_id, sizeof (uid_t));
4725 + rc = fchacl(fd,file_acl,file_acl->acl_len);
4726 + DEBUG(10,("errno is %d\n",errno));
4727 + DEBUG(10,("return code is %d\n",rc));
4729 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
4733 + int sys_acl_delete_def_file(const char *name)
4735 + /* AIX has no default ACL */
4739 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4741 + return *permset & perm;
4744 + int sys_acl_free_text(char *text)
4749 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
4751 + struct acl_entry_link *acl_entry_link;
4753 + for (acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
4754 + free(acl_entry_link->prevp->entryp);
4755 + free(acl_entry_link->prevp);
4758 + free(acl_entry_link->prevp->entryp);
4759 + free(acl_entry_link->prevp);
4760 + free(acl_entry_link->entryp);
4761 + free(acl_entry_link);
4766 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4771 +#else /* No ACLs. */
4773 + int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
4779 + int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
4785 + int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
4791 + void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
4797 + SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
4803 + SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
4809 + int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
4815 + int sys_acl_add_perm(UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
4821 + int sys_acl_get_perm(UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
4824 + return permset & perm ? 1 : 0;
4827 + char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
4833 + int sys_acl_free_text(UNUSED(char *text))
4839 + SMB_ACL_T sys_acl_init(UNUSED(int count))
4845 + int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
4851 + int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
4857 + int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
4863 + int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
4869 + int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
4875 + int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
4881 + int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
4887 + int sys_acl_delete_def_file(UNUSED(const char *name))
4893 + int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
4899 + int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
4905 +#endif /* No ACLs. */
4906 --- orig/uidlist.c 2004-04-29 19:37:25
4907 +++ uidlist.c 2004-07-03 20:11:58
4910 extern int preserve_uid;
4911 extern int preserve_gid;
4912 +extern int preserve_acls;
4913 extern int numeric_ids;
4916 @@ -274,7 +275,7 @@ void send_uid_list(int f)
4920 - if (preserve_uid) {
4921 + if (preserve_uid || preserve_acls) {
4923 /* we send sequences of uid/byte-length/name */
4924 for (list = uidlist; list; list = list->next) {
4925 @@ -291,7 +292,7 @@ void send_uid_list(int f)
4929 - if (preserve_gid) {
4930 + if (preserve_gid || preserve_acls) {
4932 for (list = gidlist; list; list = list->next) {
4934 @@ -312,7 +313,7 @@ void recv_uid_list(int f, struct file_li
4938 - if (preserve_uid && !numeric_ids) {
4939 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
4940 /* read the uid list */
4941 while ((id = read_int(f)) != 0) {
4942 int len = read_byte(f);
4943 @@ -325,7 +326,7 @@ void recv_uid_list(int f, struct file_li
4947 - if (preserve_gid && !numeric_ids) {
4948 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
4949 /* read the gid list */
4950 while ((id = read_int(f)) != 0) {
4951 int len = read_byte(f);
4952 @@ -337,6 +338,18 @@ void recv_uid_list(int f, struct file_li
4957 + if (preserve_acls && !numeric_ids) {
4959 + /* the enumerations don't return 0 except to flag the last
4960 + * entry, since uidlist doesn't munge 0 anyway */
4961 + while ((id = next_acl_uid(flist)))
4962 + acl_uid_map(match_uid(id));
4963 + while ((id = next_acl_gid(flist)))
4964 + acl_gid_map(match_gid(id));
4966 +#endif /* SUPPORT_ACLS */
4968 /* now convert the uid/gid of all files in the list to the mapped
4970 if (am_root && preserve_uid && !numeric_ids) {