1 After applying this patch, run these commands for a successful build:
5 ./configure --with-acl-support
10 --- orig/Makefile.in 2004-05-15 00:53:53
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-06-30 00:04:05
31 +++ acls.c 2004-06-30 00:04:05
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)
1151 +#endif /* SUPPORT_ACLS */
1152 --- orig/backup.c 2004-06-11 07:47:42
1153 +++ backup.c 2004-07-03 20:11:58
1154 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
1156 do_lchown(fullpath, st.st_uid, st.st_gid);
1157 do_chmod(fullpath, st.st_mode);
1158 + (void)DUP_ACL(end, fullpath, st.st_mode);
1162 @@ -167,6 +168,8 @@ static int keep_backup(char *fname)
1166 + PUSH_KEEP_BACKUP_ACL(file, fname, backup_dir_buf);
1169 /* Check to see if this is a device file, or link */
1170 if (IS_DEVICE(file->mode)) {
1171 @@ -237,6 +240,7 @@ static int keep_backup(char *fname)
1174 set_perms(backup_dir_buf, file, NULL, 0);
1175 + CLEANUP_KEEP_BACKUP_ACL();
1179 --- orig/configure.in 2004-04-30 18:04:07
1180 +++ configure.in 2004-07-03 20:11:58
1181 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
1182 AC_CHECK_LIB(resolv, strcasecmp)
1185 +AC_CHECK_FUNCS(aclsort)
1186 +if test x"$ac_cv_func_aclsort" = x"no"; then
1187 + AC_CHECK_LIB(sec, aclsort)
1190 dnl At the moment we don't test for a broken memcmp(), because all we
1191 dnl need to do is test for equality, not comparison, and it seems that
1192 dnl every platform has a memcmp that can do at least that.
1193 @@ -655,6 +660,74 @@ AC_SUBST(OBJ_RESTORE)
1194 AC_SUBST(CC_SHOBJ_FLAG)
1195 AC_SUBST(BUILD_POPT)
1197 +AC_CHECK_HEADERS(sys/acl.h)
1198 +AC_CHECK_FUNCS(_acl __acl _facl __facl)
1199 +#################################################
1200 +# check for ACL support
1202 +AC_MSG_CHECKING(whether to support ACLs)
1203 +AC_ARG_WITH(acl-support,
1204 +[ --with-acl-support Include ACL support (default=no)],
1205 +[ case "$withval" in
1208 + case "$host_os" in
1210 + AC_MSG_RESULT(Using UnixWare ACLs)
1211 + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs])
1214 + AC_MSG_RESULT(Using solaris ACLs)
1215 + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
1218 + AC_MSG_RESULT(Using HPUX ACLs)
1219 + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
1222 + AC_MSG_RESULT(Using IRIX ACLs)
1223 + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
1226 + AC_MSG_RESULT(Using AIX ACLs)
1227 + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs])
1230 + AC_MSG_RESULT(Using Tru64 ACLs)
1231 + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs])
1232 + LIBS="$LIBS -lpacl"
1235 + AC_CHECK_LIB(acl,acl_get_file)
1236 + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
1237 + AC_TRY_LINK([#include <sys/types.h>
1238 +#include <sys/acl.h>],
1239 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
1240 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
1241 + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
1242 + AC_MSG_RESULT(Using posix ACLs)
1243 + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
1244 + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
1245 + AC_TRY_LINK([#include <sys/types.h>
1246 +#include <sys/acl.h>],
1247 +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);],
1248 +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)])
1249 + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
1250 + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
1258 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1261 + AC_DEFINE(HAVE_NO_ACLS, 1, [true if you don't have ACLs])
1265 AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
1268 --- orig/flist.c 2004-06-18 16:23:07
1269 +++ flist.c 2004-07-03 20:11:58
1270 @@ -945,6 +945,8 @@ void send_file_name(int f, struct file_l
1274 + if (!MAKE_ACL(file, fname))
1277 maybe_emit_filelist_progress(flist);
1279 @@ -956,6 +958,10 @@ void send_file_name(int f, struct file_l
1280 if (file->basename[0]) {
1281 flist->files[flist->count++] = file;
1282 send_file_entry(file, f, base_flags);
1283 + SEND_ACL(file, f);
1285 + /* Cleanup unsent ACL(s). */
1286 + SEND_ACL(file, -1);
1289 if (recursive && S_ISDIR(file->mode)
1290 @@ -1274,6 +1280,8 @@ struct file_list *recv_file_list(int f)
1291 flags |= read_byte(f) << 8;
1292 receive_file_entry(&flist->files[i], flags, flist, f);
1294 + RECEIVE_ACL(flist->files[i], f);
1296 if (S_ISREG(flist->files[i]->mode))
1297 stats.total_size += flist->files[i]->length;
1299 @@ -1296,6 +1304,8 @@ struct file_list *recv_file_list(int f)
1301 clean_flist(flist, relative_paths, 1);
1303 + SORT_FILE_ACL_INDEX_LISTS();
1306 /* Now send the uid/gid list. This was introduced in
1307 * protocol version 15 */
1308 --- orig/generator.c 2004-06-30 07:24:45
1309 +++ generator.c 2004-07-03 20:11:58
1310 @@ -343,6 +343,10 @@ static void recv_generator(char *fname,
1311 if (set_perms(fname, file, statret ? NULL : &st, 0)
1312 && verbose && f_out != -1)
1313 rprintf(FINFO,"%s/\n",fname);
1316 + SET_ACL(fname, file);
1321 --- orig/mkproto.awk 2004-01-01 21:10:50
1322 +++ mkproto.awk 2004-06-30 00:04:06
1323 @@ -58,7 +58,7 @@ BEGIN {
1327 -!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^struct|^BOOL|^void|^time|^const/ {
1328 +!/^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/ {
1332 --- orig/options.c 2004-06-20 19:30:00
1333 +++ options.c 2004-07-03 20:11:58
1334 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
1336 int preserve_links = 0;
1337 int preserve_hard_links = 0;
1338 +int preserve_acls = 0;
1339 int preserve_perms = 0;
1340 int preserve_devices = 0;
1341 int preserve_uid = 0;
1342 @@ -150,6 +151,7 @@ static void print_rsync_version(enum log
1344 char const *got_socketpair = "no ";
1345 char const *hardlinks = "no ";
1346 + char const *acls = "no ";
1347 char const *links = "no ";
1348 char const *ipv6 = "no ";
1349 STRUCT_STAT *dumstat;
1350 @@ -162,6 +164,10 @@ static void print_rsync_version(enum log
1361 @@ -176,9 +182,9 @@ static void print_rsync_version(enum log
1362 "Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
1363 rprintf(f, "<http://rsync.samba.org/>\n");
1364 rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
1365 - "%shard links, %ssymlinks, batchfiles, \n",
1366 + "%shard links, %sacls, %ssymlinks, batchfiles, \n",
1367 (int) (sizeof (OFF_T) * 8),
1368 - got_socketpair, hardlinks, links);
1369 + got_socketpair, hardlinks, acls, links);
1371 /* Note that this field may not have type ino_t. It depends
1372 * on the complicated interaction between largefile feature
1373 @@ -241,6 +247,7 @@ void usage(enum logcode F)
1374 rprintf(F," --safe-links ignore \"unsafe\" symlinks\n");
1375 rprintf(F," -H, --hard-links preserve hard links\n");
1376 rprintf(F," -p, --perms preserve permissions\n");
1377 + rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
1378 rprintf(F," -o, --owner preserve owner (root only)\n");
1379 rprintf(F," -g, --group preserve group\n");
1380 rprintf(F," -D, --devices preserve devices (root only)\n");
1381 @@ -386,6 +393,7 @@ static struct poptOption long_options[]
1382 {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
1383 {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
1384 {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
1385 + {"acls", 'A', POPT_ARG_NONE, &preserve_acls, 0, 0, 0 },
1386 {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 },
1387 {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 },
1388 {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
1389 @@ -596,6 +604,31 @@ int parse_arguments(int *argc, const cha
1395 + preserve_acls = 1;
1396 + preserve_perms = 1;
1398 + /* FIXME: this should probably be ignored with a
1399 + * warning and then countermeasures taken to
1400 + * restrict group and other access in the presence
1401 + * of any more restrictive ACLs, but this is safe
1403 + /* FIXME: Don't say "server" if this is
1404 + * happening on the client. */
1405 + /* FIXME: Why do we have the duplicated
1406 + * rprintf? Everybody who gets this message
1407 + * ought to send it to the client and also to
1409 + snprintf(err_buf,sizeof(err_buf),
1410 + "ACLs are not supported on this %s\n",
1411 + am_server ? "server" : "client");
1412 + rprintf(FERROR,"ERROR: ACLs not supported on this platform\n");
1414 +#endif /* SUPPORT_ACLS */
1419 /* A large opt value means that set_refuse_options()
1420 * turned this option off (opt-BASE is its index). */
1421 @@ -833,6 +866,8 @@ void server_options(char **args,int *arg
1423 if (preserve_hard_links)
1425 + if (preserve_acls)
1426 + argstr[x++] = 'A';
1430 --- orig/rsync.c 2004-07-02 18:06:32
1431 +++ rsync.c 2004-07-03 20:11:58
1432 @@ -204,6 +204,14 @@ int set_perms(char *fname,struct file_st
1436 + /* If this is a directory, SET_ACL() will be called on the cleanup
1437 + * receive_generator() pass--if we called it here, we might clobber
1438 + * writability on the directory. everything else is OK to do now. */
1439 + if (!S_ISDIR(st->st_mode)) {
1440 + if (SET_ACL(fname, file) == 0)
1444 if (verbose > 1 && flags & PERMS_REPORT) {
1446 rprintf(FINFO,"%s\n",fname);
1447 --- orig/rsync.h 2004-05-16 07:58:12
1448 +++ rsync.h 2004-07-03 20:11:58
1449 @@ -538,6 +538,40 @@ static inline int flist_up(struct file_l
1450 #include "lib/permstring.h"
1451 #include "lib/addrinfo.h"
1453 +#define SUPPORT_ACLS HAVE_POSIX_ACLS|HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|\
1454 + HAVE_HPUX_ACLS|HAVE_IRIX_ACLS|HAVE_AIX_ACLS|HAVE_TRU64_ACLS
1456 +#define ACLS_NEED_MASK HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS
1459 +#ifdef HAVE_SYS_ACL_H
1460 +#include <sys/acl.h>
1462 +#define MAKE_ACL(file, fname) make_acl(file, fname)
1463 +#define SEND_ACL(file, f) send_acl(file, f)
1464 +#define RECEIVE_ACL(file, f) receive_acl(file, f)
1465 +#define SORT_FILE_ACL_INDEX_LISTS() sort_file_acl_index_lists()
1466 +#define SET_ACL(fname, file) set_acl(fname, file)
1467 +#define NEXT_ACL_UID() next_acl_uid()
1468 +#define ACL_UID_MAP(uid) acl_uid_map(uid)
1469 +#define PUSH_KEEP_BACKUP_ACL(file, orig, dest) \
1470 + push_keep_backup_acl(file, orig, dest)
1471 +#define CLEANUP_KEEP_BACKUP_ACL() cleanup_keep_backup_acl()
1472 +#define DUP_ACL(orig, dest, mode) dup_acl(orig, dest, mode)
1473 +#else /* SUPPORT_ACLS */
1474 +#define MAKE_ACL(file, fname) 1 /* checked return value */
1475 +#define SEND_ACL(file, f)
1476 +#define RECEIVE_ACL(file, f)
1477 +#define SORT_FILE_ACL_INDEX_LISTS()
1478 +#define SET_ACL(fname, file) 0 /* checked return value */
1479 +#define NEXT_ACL_UID()
1480 +#define ACL_UID_MAP(uid)
1481 +#define PUSH_KEEP_BACKUP_ACL(file, orig, dest)
1482 +#define CLEANUP_KEEP_BACKUP_ACL()
1483 +#define DUP_ACL(src, orig, mode) 0 /* checked return value */
1484 +#endif /* SUPPORT_ACLS */
1485 +#include "smb_acls.h"
1489 /* We have replacement versions of these if they're missing. */
1490 --- orig/rsync.yo 2004-06-17 06:32:00
1491 +++ rsync.yo 2004-07-03 20:11:58
1492 @@ -296,6 +296,7 @@ verb(
1493 --safe-links ignore "unsafe" symlinks
1494 -H, --hard-links preserve hard links
1495 -p, --perms preserve permissions
1496 + -A, --acls preserve ACLs (implies -p) [local option]
1497 -o, --owner preserve owner (root only)
1498 -g, --group preserve group
1499 -D, --devices preserve devices (root only)
1500 @@ -527,6 +528,11 @@ source file's permissions and the umask
1501 other files (including updated files) retain their existing permissions
1502 (which is the same behavior as other file-copy utilities, such as cp).
1504 +dit(bf(-A, --acls)) This option causes rsync to update the remote
1505 +ACLs to be the same as the local ACLs. This will work only if the
1506 +remote machine's rsync supports this option also. This is a non-standard
1509 dit(bf(-o, --owner)) This option causes rsync to set the owner of the
1510 destination file to be the same as the source file. On most systems,
1511 only the super-user can set file ownership. By default, the preservation
1512 --- orig/smb_acls.h 2004-06-30 00:04:07
1513 +++ smb_acls.h 2004-06-30 00:04:07
1516 + Unix SMB/Netbios implementation.
1518 + Portable SMB ACL interface
1519 + Copyright (C) Jeremy Allison 2000
1521 + This program is free software; you can redistribute it and/or modify
1522 + it under the terms of the GNU General Public License as published by
1523 + the Free Software Foundation; either version 2 of the License, or
1524 + (at your option) any later version.
1526 + This program is distributed in the hope that it will be useful,
1527 + but WITHOUT ANY WARRANTY; without even the implied warranty of
1528 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1529 + GNU General Public License for more details.
1531 + You should have received a copy of the GNU General Public License
1532 + along with this program; if not, write to the Free Software
1533 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1536 +#ifndef _SMB_ACLS_H
1537 +#define _SMB_ACLS_H
1539 +#if defined(HAVE_POSIX_ACLS)
1541 +/* This is an identity mapping (just remove the SMB_). */
1543 +#define SMB_ACL_TAG_T acl_tag_t
1544 +#define SMB_ACL_TYPE_T acl_type_t
1545 +#define SMB_ACL_PERMSET_T acl_permset_t
1546 +#define SMB_ACL_PERM_T acl_perm_t
1547 +#define SMB_ACL_READ ACL_READ
1548 +#define SMB_ACL_WRITE ACL_WRITE
1549 +#define SMB_ACL_EXECUTE ACL_EXECUTE
1551 +/* Types of ACLs. */
1552 +#define SMB_ACL_USER ACL_USER
1553 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
1554 +#define SMB_ACL_GROUP ACL_GROUP
1555 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
1556 +#define SMB_ACL_OTHER ACL_OTHER
1557 +#define SMB_ACL_MASK ACL_MASK
1559 +#define SMB_ACL_T acl_t
1561 +#define SMB_ACL_ENTRY_T acl_entry_t
1563 +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY
1564 +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY
1566 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
1567 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
1569 +#elif defined(HAVE_TRU64_ACLS)
1571 +/* This is for DEC/Compaq Tru64 UNIX */
1573 +#define SMB_ACL_TAG_T acl_tag_t
1574 +#define SMB_ACL_TYPE_T acl_type_t
1575 +#define SMB_ACL_PERMSET_T acl_permset_t
1576 +#define SMB_ACL_PERM_T acl_perm_t
1577 +#define SMB_ACL_READ ACL_READ
1578 +#define SMB_ACL_WRITE ACL_WRITE
1579 +#define SMB_ACL_EXECUTE ACL_EXECUTE
1581 +/* Types of ACLs. */
1582 +#define SMB_ACL_USER ACL_USER
1583 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
1584 +#define SMB_ACL_GROUP ACL_GROUP
1585 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
1586 +#define SMB_ACL_OTHER ACL_OTHER
1587 +#define SMB_ACL_MASK ACL_MASK
1589 +#define SMB_ACL_T acl_t
1591 +#define SMB_ACL_ENTRY_T acl_entry_t
1593 +#define SMB_ACL_FIRST_ENTRY 0
1594 +#define SMB_ACL_NEXT_ENTRY 1
1596 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
1597 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
1599 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
1601 + * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
1602 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris.
1605 +/* SVR4.2 ES/MP ACLs */
1606 +typedef int SMB_ACL_TAG_T;
1607 +typedef int SMB_ACL_TYPE_T;
1608 +typedef ushort *SMB_ACL_PERMSET_T;
1609 +typedef ushort SMB_ACL_PERM_T;
1610 +#define SMB_ACL_READ 4
1611 +#define SMB_ACL_WRITE 2
1612 +#define SMB_ACL_EXECUTE 1
1614 +/* Types of ACLs. */
1615 +#define SMB_ACL_USER USER
1616 +#define SMB_ACL_USER_OBJ USER_OBJ
1617 +#define SMB_ACL_GROUP GROUP
1618 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
1619 +#define SMB_ACL_OTHER OTHER_OBJ
1620 +#define SMB_ACL_MASK CLASS_OBJ
1622 +typedef struct SMB_ACL_T {
1626 + struct acl acl[1];
1629 +typedef struct acl *SMB_ACL_ENTRY_T;
1631 +#define SMB_ACL_FIRST_ENTRY 0
1632 +#define SMB_ACL_NEXT_ENTRY 1
1634 +#define SMB_ACL_TYPE_ACCESS 0
1635 +#define SMB_ACL_TYPE_DEFAULT 1
1637 +#elif defined(HAVE_HPUX_ACLS)
1640 + * Based on the Solaris & UnixWare code.
1644 +#include <sys/aclv.h>
1646 +/* SVR4.2 ES/MP ACLs */
1647 +typedef int SMB_ACL_TAG_T;
1648 +typedef int SMB_ACL_TYPE_T;
1649 +typedef ushort *SMB_ACL_PERMSET_T;
1650 +typedef ushort SMB_ACL_PERM_T;
1651 +#define SMB_ACL_READ 4
1652 +#define SMB_ACL_WRITE 2
1653 +#define SMB_ACL_EXECUTE 1
1655 +/* Types of ACLs. */
1656 +#define SMB_ACL_USER USER
1657 +#define SMB_ACL_USER_OBJ USER_OBJ
1658 +#define SMB_ACL_GROUP GROUP
1659 +#define SMB_ACL_GROUP_OBJ GROUP_OBJ
1660 +#define SMB_ACL_OTHER OTHER_OBJ
1661 +#define SMB_ACL_MASK CLASS_OBJ
1663 +typedef struct SMB_ACL_T {
1667 + struct acl acl[1];
1670 +typedef struct acl *SMB_ACL_ENTRY_T;
1672 +#define SMB_ACL_FIRST_ENTRY 0
1673 +#define SMB_ACL_NEXT_ENTRY 1
1675 +#define SMB_ACL_TYPE_ACCESS 0
1676 +#define SMB_ACL_TYPE_DEFAULT 1
1678 +#elif defined(HAVE_IRIX_ACLS)
1680 +#define SMB_ACL_TAG_T acl_tag_t
1681 +#define SMB_ACL_TYPE_T acl_type_t
1682 +#define SMB_ACL_PERMSET_T acl_permset_t
1683 +#define SMB_ACL_PERM_T acl_perm_t
1684 +#define SMB_ACL_READ ACL_READ
1685 +#define SMB_ACL_WRITE ACL_WRITE
1686 +#define SMB_ACL_EXECUTE ACL_EXECUTE
1688 +/* Types of ACLs. */
1689 +#define SMB_ACL_USER ACL_USER
1690 +#define SMB_ACL_USER_OBJ ACL_USER_OBJ
1691 +#define SMB_ACL_GROUP ACL_GROUP
1692 +#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ
1693 +#define SMB_ACL_OTHER ACL_OTHER_OBJ
1694 +#define SMB_ACL_MASK ACL_MASK
1696 +typedef struct SMB_ACL_T {
1702 +#define SMB_ACL_ENTRY_T acl_entry_t
1704 +#define SMB_ACL_FIRST_ENTRY 0
1705 +#define SMB_ACL_NEXT_ENTRY 1
1707 +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
1708 +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
1710 +#elif defined(HAVE_AIX_ACLS)
1712 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
1714 +#include "/usr/include/acl.h"
1716 +typedef uint *SMB_ACL_PERMSET_T;
1718 +struct acl_entry_link{
1719 + struct acl_entry_link *prevp;
1720 + struct new_acl_entry *entryp;
1721 + struct acl_entry_link *nextp;
1725 +struct new_acl_entry{
1726 + unsigned short ace_len;
1727 + unsigned short ace_type;
1728 + unsigned int ace_access;
1729 + struct ace_id ace_id[1];
1732 +#define SMB_ACL_ENTRY_T struct new_acl_entry*
1733 +#define SMB_ACL_T struct acl_entry_link*
1735 +#define SMB_ACL_TAG_T unsigned short
1736 +#define SMB_ACL_TYPE_T int
1737 +#define SMB_ACL_PERM_T uint
1738 +#define SMB_ACL_READ S_IRUSR
1739 +#define SMB_ACL_WRITE S_IWUSR
1740 +#define SMB_ACL_EXECUTE S_IXUSR
1742 +/* Types of ACLs. */
1743 +#define SMB_ACL_USER ACEID_USER
1744 +#define SMB_ACL_USER_OBJ 3
1745 +#define SMB_ACL_GROUP ACEID_GROUP
1746 +#define SMB_ACL_GROUP_OBJ 4
1747 +#define SMB_ACL_OTHER 5
1748 +#define SMB_ACL_MASK 6
1751 +#define SMB_ACL_FIRST_ENTRY 1
1752 +#define SMB_ACL_NEXT_ENTRY 2
1754 +#define SMB_ACL_TYPE_ACCESS 0
1755 +#define SMB_ACL_TYPE_DEFAULT 1
1757 +#else /* No ACLs. */
1759 +/* No ACLS - fake it. */
1760 +#define SMB_ACL_TAG_T int
1761 +#define SMB_ACL_TYPE_T int
1762 +#define SMB_ACL_PERMSET_T mode_t
1763 +#define SMB_ACL_PERM_T mode_t
1764 +#define SMB_ACL_READ S_IRUSR
1765 +#define SMB_ACL_WRITE S_IWUSR
1766 +#define SMB_ACL_EXECUTE S_IXUSR
1768 +/* Types of ACLs. */
1769 +#define SMB_ACL_USER 0
1770 +#define SMB_ACL_USER_OBJ 1
1771 +#define SMB_ACL_GROUP 2
1772 +#define SMB_ACL_GROUP_OBJ 3
1773 +#define SMB_ACL_OTHER 4
1774 +#define SMB_ACL_MASK 5
1776 +typedef struct SMB_ACL_T {
1780 +typedef struct SMB_ACL_ENTRY_T {
1782 +} *SMB_ACL_ENTRY_T;
1784 +#define SMB_ACL_FIRST_ENTRY 0
1785 +#define SMB_ACL_NEXT_ENTRY 1
1787 +#define SMB_ACL_TYPE_ACCESS 0
1788 +#define SMB_ACL_TYPE_DEFAULT 1
1790 +#endif /* No ACLs. */
1791 +#endif /* _SMB_ACLS_H */
1792 --- orig/sysacls.c 2004-06-30 00:04:08
1793 +++ sysacls.c 2004-06-30 00:04:08
1796 + Unix SMB/Netbios implementation.
1798 + Samba system utilities for ACL support.
1799 + Copyright (C) Jeremy Allison 2000.
1801 + This program is free software; you can redistribute it and/or modify
1802 + it under the terms of the GNU General Public License as published by
1803 + the Free Software Foundation; either version 2 of the License, or
1804 + (at your option) any later version.
1806 + This program is distributed in the hope that it will be useful,
1807 + but WITHOUT ANY WARRANTY; without even the implied warranty of
1808 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1809 + GNU General Public License for more details.
1811 + You should have received a copy of the GNU General Public License
1812 + along with this program; if not, write to the Free Software
1813 + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
1819 + This file wraps all differing system ACL interfaces into a consistent
1820 + one based on the POSIX interface. It also returns the correct errors
1821 + for older UNIX systems that don't support ACLs.
1823 + The interfaces that each ACL implementation must support are as follows:
1825 + int sys_acl_get_entry(SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1826 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1827 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p
1828 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
1829 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
1830 + SMB_ACL_T sys_acl_get_fd(int fd)
1831 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
1832 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
1833 + char *sys_acl_to_text(SMB_ACL_T theacl, ssize_t *plen)
1834 + SMB_ACL_T sys_acl_init(int count)
1835 + int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1836 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1837 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
1838 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1839 + int sys_acl_valid(SMB_ACL_T theacl)
1840 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1841 + int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
1842 + int sys_acl_delete_def_file(const char *path)
1844 + This next one is not POSIX complient - but we *have* to have it !
1845 + More POSIX braindamage.
1847 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1849 + The generic POSIX free is the following call. We split this into
1850 + several different free functions as we may need to add tag info
1851 + to structures when emulating the POSIX interface.
1853 + int sys_acl_free(void *obj_p)
1855 + The calls we actually use are:
1857 + int sys_acl_free_text(char *text) - free acl_to_text
1858 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
1859 + int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
1863 +#if defined(HAVE_POSIX_ACLS)
1865 +/* Identity mapping - easy. */
1867 +int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1869 + return acl_get_entry(the_acl, entry_id, entry_p);
1872 +int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
1874 + return acl_get_tag_type(entry_d, tag_type_p);
1877 +int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
1879 + return acl_get_permset(entry_d, permset_p);
1882 +void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
1884 + return acl_get_qualifier(entry_d);
1887 +SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
1889 + return acl_get_file(path_p, type);
1892 +SMB_ACL_T sys_acl_get_fd(int fd)
1894 + return acl_get_fd(fd);
1897 +int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
1899 + return acl_clear_perms(permset);
1902 +int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1904 + return acl_add_perm(permset, perm);
1907 +int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
1909 +#if defined(HAVE_ACL_GET_PERM_NP)
1910 + /* Required for TrustedBSD-based ACL implementations where
1911 + * non-POSIX.1e functions are denoted by a _np (non-portable)
1913 + return acl_get_perm_np(permset, perm);
1915 + return acl_get_perm(permset, perm);
1919 +char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen)
1921 + return acl_to_text(the_acl, plen);
1924 +SMB_ACL_T sys_acl_init(int count)
1926 + return acl_init(count);
1929 +int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
1931 + return acl_create_entry(pacl, pentry);
1934 +int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
1936 + return acl_set_tag_type(entry, tagtype);
1939 +int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
1941 + return acl_set_qualifier(entry, qual);
1944 +int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
1946 + return acl_set_permset(entry, permset);
1949 +int sys_acl_valid(SMB_ACL_T theacl)
1951 + return acl_valid(theacl);
1954 +int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
1956 + return acl_set_file(name, acltype, theacl);
1959 +int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
1961 + return acl_set_fd(fd, theacl);
1964 +int sys_acl_delete_def_file(const char *name)
1966 + return acl_delete_def_file(name);
1969 +int sys_acl_free_text(char *text)
1971 + return acl_free(text);
1974 +int sys_acl_free_acl(SMB_ACL_T the_acl)
1976 + return acl_free(the_acl);
1979 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
1981 + return acl_free(qual);
1984 +#elif defined(HAVE_TRU64_ACLS)
1985 +/* The interface to DEC/Compaq Tru64 UNIX ACLs
1986 + * is based on Draft 13 of the POSIX spec which is
1987 + * slightly different from the Draft 16 interface.
1989 + * Also, some of the permset manipulation functions
1990 + * such as acl_clear_perm() and acl_add_perm() appear
1991 + * to be broken on Tru64 so we have to manipulate
1992 + * the permission bits in the permset directly. */
1993 + int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
1995 + SMB_ACL_ENTRY_T entry;
1997 + if (entry_id == SMB_ACL_FIRST_ENTRY && acl_first_entry(the_acl) != 0) {
2002 + if ((entry = acl_get_entry(the_acl)) != NULL) {
2007 + return errno ? -1 : 0;
2010 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
2012 + return acl_get_tag_type(entry_d, tag_type_p);
2015 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2017 + return acl_get_permset(entry_d, permset_p);
2020 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2022 + return acl_get_qualifier(entry_d);
2025 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2027 + return acl_get_file((char *)path_p, type);
2030 + SMB_ACL_T sys_acl_get_fd(int fd)
2032 + return acl_get_fd(fd, ACL_TYPE_ACCESS);
2035 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
2037 + *permset = 0; /* acl_clear_perm() is broken on Tru64 */
2042 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2044 + if (perm & ~(SMB_ACL_READ | SMB_ACL_WRITE | SMB_ACL_EXECUTE)) {
2049 + *permset |= perm; /* acl_add_perm() is broken on Tru64 */
2054 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
2056 + return *permset & perm; /* Tru64 doesn't have acl_get_perm() */
2059 + char *sys_acl_to_text(SMB_ACL_T the_acl, ssize_t *plen)
2061 + return acl_to_text(the_acl, plen);
2064 + SMB_ACL_T sys_acl_init(int count)
2066 + return acl_init(count);
2069 + int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
2071 + SMB_ACL_ENTRY_T entry;
2073 + if ((entry = acl_create_entry(pacl)) == NULL) {
2081 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
2083 + return acl_set_tag_type(entry, tagtype);
2086 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
2088 + return acl_set_qualifier(entry, qual);
2091 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
2093 + return acl_set_permset(entry, permset);
2096 + int sys_acl_valid(SMB_ACL_T theacl)
2098 + acl_entry_t entry;
2100 + return acl_valid(theacl, &entry);
2103 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
2105 + return acl_set_file((char *)name, acltype, theacl);
2108 + int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
2110 + return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
2113 + int sys_acl_delete_def_file(const char *name)
2115 + return acl_delete_def_file((char *)name);
2118 + int sys_acl_free_text(char *text)
2120 + /* (void) cast and explicit return 0 are for DEC UNIX
2121 + * which just #defines acl_free_text() to be free(). */
2122 + (void) acl_free_text(text);
2126 + int sys_acl_free_acl(SMB_ACL_T the_acl)
2128 + return acl_free(the_acl);
2131 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2133 + return acl_free_qualifier(qual, tagtype);
2136 +#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
2138 +/* Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
2139 + * Modified by Toomas Soome <tsoome@ut.ee> for Solaris. */
2141 +/* Note that while this code implements sufficient functionality
2142 + * to support the sys_acl_* interfaces it does not provide all
2143 + * of the semantics of the POSIX ACL interfaces.
2145 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2146 + * from a call to sys_acl_get_entry() should not be assumed to be
2147 + * valid after calling any of the following functions, which may
2148 + * reorder the entries in the ACL.
2151 + * sys_acl_set_file()
2152 + * sys_acl_set_fd()
2155 +/* The only difference between Solaris and UnixWare / OpenUNIX is
2156 + * that the #defines for the ACL operations have different names. */
2157 +#if defined(HAVE_UNIXWARE_ACLS)
2159 +#define SETACL ACL_SET
2160 +#define GETACL ACL_GET
2161 +#define GETACLCNT ACL_CNT
2166 + int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2168 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2173 + if (entry_p == NULL) {
2178 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2182 + if (acl_d->next < 0) {
2187 + if (acl_d->next >= acl_d->count) {
2191 + *entry_p = &acl_d->acl[acl_d->next++];
2196 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2198 + *type_p = entry_d->a_type;
2203 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2205 + *permset_p = &entry_d->a_perm;
2210 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2212 + if (entry_d->a_type != SMB_ACL_USER
2213 + && entry_d->a_type != SMB_ACL_GROUP) {
2218 + return &entry_d->a_id;
2221 +/* There is no way of knowing what size the ACL returned by
2222 + * GETACL will be unless you first call GETACLCNT which means
2223 + * making an additional system call.
2225 + * In the hope of avoiding the cost of the additional system
2226 + * call in most cases, we initially allocate enough space for
2227 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2228 + * be too small then we use GETACLCNT to find out the actual
2229 + * size, reallocate the ACL buffer, and then call GETACL again. */
2231 +#define INITIAL_ACL_SIZE 16
2233 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2236 + int count; /* # of ACL entries allocated */
2237 + int naccess; /* # of access ACL entries */
2238 + int ndefault; /* # of default ACL entries */
2240 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2245 + count = INITIAL_ACL_SIZE;
2246 + if ((acl_d = sys_acl_init(count)) == NULL) {
2250 + /* If there isn't enough space for the ACL entries we use
2251 + * GETACLCNT to determine the actual number of ACL entries
2252 + * reallocate and try again. This is in a loop because it
2253 + * is possible that someone else could modify the ACL and
2254 + * increase the number of entries between the call to
2255 + * GETACLCNT and the call to GETACL. */
2256 + while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0
2257 + && errno == ENOSPC) {
2259 + sys_acl_free_acl(acl_d);
2261 + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) {
2265 + if ((acl_d = sys_acl_init(count)) == NULL) {
2271 + sys_acl_free_acl(acl_d);
2275 + /* Calculate the number of access and default ACL entries.
2277 + * Note: we assume that the acl() system call returned a
2278 + * well formed ACL which is sorted so that all of the
2279 + * access ACL entries preceed any default ACL entries. */
2280 + for (naccess = 0; naccess < count; naccess++) {
2281 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2284 + ndefault = count - naccess;
2286 + /* If the caller wants the default ACL we have to copy
2287 + * the entries down to the start of the acl[] buffer
2288 + * and mask out the ACL_DEFAULT flag from the type field. */
2289 + if (type == SMB_ACL_TYPE_DEFAULT) {
2292 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2293 + acl_d->acl[i] = acl_d->acl[j];
2294 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2297 + acl_d->count = ndefault;
2299 + acl_d->count = naccess;
2305 + SMB_ACL_T sys_acl_get_fd(int fd)
2308 + int count; /* # of ACL entries allocated */
2309 + int naccess; /* # of access ACL entries */
2311 + count = INITIAL_ACL_SIZE;
2312 + if ((acl_d = sys_acl_init(count)) == NULL) {
2316 + while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0
2317 + && errno == ENOSPC) {
2319 + sys_acl_free_acl(acl_d);
2321 + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) {
2325 + if ((acl_d = sys_acl_init(count)) == NULL) {
2331 + sys_acl_free_acl(acl_d);
2335 + /* Calculate the number of access ACL entries. */
2336 + for (naccess = 0; naccess < count; naccess++) {
2337 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2341 + acl_d->count = naccess;
2346 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2353 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2355 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2356 + && perm != SMB_ACL_EXECUTE) {
2361 + if (permset_d == NULL) {
2366 + *permset_d |= perm;
2371 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2373 + return *permset_d & perm;
2376 + char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2382 + /* Use an initial estimate of 20 bytes per ACL entry
2383 + * when allocating memory for the text representation
2386 + maxlen = 20 * acl_d->count;
2387 + if ((text = malloc(maxlen)) == NULL) {
2392 + for (i = 0; i < acl_d->count; i++) {
2393 + struct acl *ap = &acl_d->acl[i];
2394 + struct passwd *pw;
2403 + switch (ap->a_type) {
2404 + /* For debugging purposes it's probably more
2405 + * useful to dump unknown tag types rather
2406 + * than just returning an error. */
2408 + snprintf(tagbuf, sizeof tagbuf - 1, "0x%x",
2411 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
2416 + case SMB_ACL_USER:
2417 + if ((pw = getpwuid(ap->a_id)) == NULL) {
2418 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
2424 + case SMB_ACL_USER_OBJ:
2428 + case SMB_ACL_GROUP:
2429 + if ((gr = getgrgid(ap->a_id)) == NULL) {
2430 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
2436 + case SMB_ACL_GROUP_OBJ:
2440 + case SMB_ACL_OTHER:
2444 + case SMB_ACL_MASK:
2450 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
2451 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
2452 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
2455 + /* <tag> : <qualifier> : rwx \n \0 */
2456 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
2458 + /* If this entry would overflow the buffer
2459 + * allocate enough additional memory for this
2460 + * entry and an estimate of another 20 bytes
2461 + * for each entry still to be processed. */
2462 + if ((len + nbytes) > maxlen) {
2463 + char *oldtext = text;
2465 + maxlen += nbytes + 20 * (acl_d->count - i);
2467 + if ((text = Realloc(oldtext, maxlen)) == NULL) {
2474 + snprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
2475 + len += nbytes - 1;
2484 + SMB_ACL_T sys_acl_init(int count)
2493 + /* Note that since the definition of the structure pointed
2494 + * to by the SMB_ACL_T includes the first element of the
2495 + * acl[] array, this actually allocates an ACL with room
2496 + * for (count+1) entries. */
2497 + if ((a = malloc(sizeof a[0] + count * sizeof (struct acl))) == NULL) {
2502 + a->size = count + 1;
2510 + int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
2513 + SMB_ACL_ENTRY_T entry_d;
2515 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
2520 + if (acl_d->count >= acl_d->size) {
2525 + entry_d = &acl_d->acl[acl_d->count++];
2526 + entry_d->a_type = 0;
2527 + entry_d->a_id = -1;
2528 + entry_d->a_perm = 0;
2529 + *entry_p = entry_d;
2534 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
2536 + switch (tag_type) {
2537 + case SMB_ACL_USER:
2538 + case SMB_ACL_USER_OBJ:
2539 + case SMB_ACL_GROUP:
2540 + case SMB_ACL_GROUP_OBJ:
2541 + case SMB_ACL_OTHER:
2542 + case SMB_ACL_MASK:
2543 + entry_d->a_type = tag_type;
2553 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
2555 + if (entry_d->a_type != SMB_ACL_GROUP
2556 + && entry_d->a_type != SMB_ACL_USER) {
2561 + entry_d->a_id = *((id_t *)qual_p);
2566 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
2568 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
2572 + entry_d->a_perm = *permset_d;
2577 +/* Sort the ACL and check it for validity.
2579 + * If it's a minimal ACL with only 4 entries then we
2580 + * need to recalculate the mask permissions to make
2581 + * sure that they are the same as the GROUP_OBJ
2582 + * permissions as required by the UnixWare acl() system call.
2584 + * (Note: since POSIX allows minimal ACLs which only contain
2585 + * 3 entries - ie there is no mask entry - we should, in theory,
2586 + * check for this and add a mask entry if necessary - however
2587 + * we "know" that the caller of this interface always specifies
2588 + * a mask so, in practice "this never happens" (tm) - if it *does*
2589 + * happen aclsort() will fail and return an error and someone will
2590 + * have to fix it ...) */
2592 +static int acl_sort(SMB_ACL_T acl_d)
2594 + int fixmask = (acl_d->count <= 4);
2596 + if (aclsort(acl_d->count, fixmask, acl_d->acl) != 0) {
2603 + int sys_acl_valid(SMB_ACL_T acl_d)
2605 + return acl_sort(acl_d);
2608 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
2611 + struct acl *acl_p;
2613 + struct acl *acl_buf = NULL;
2616 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2621 + if (acl_sort(acl_d) != 0) {
2625 + acl_p = &acl_d->acl[0];
2626 + acl_count = acl_d->count;
2628 + /* If it's a directory there is extra work to do since the acl()
2629 + * system call will replace both the access ACLs and the default
2630 + * ACLs (if any). */
2631 + if (stat(name, &s) != 0) {
2634 + if (S_ISDIR(s.st_mode)) {
2635 + SMB_ACL_T acc_acl;
2636 + SMB_ACL_T def_acl;
2637 + SMB_ACL_T tmp_acl;
2640 + if (type == SMB_ACL_TYPE_ACCESS) {
2642 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
2646 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
2649 + if (tmp_acl == NULL) {
2653 + /* Allocate a temporary buffer for the complete ACL. */
2654 + acl_count = acc_acl->count + def_acl->count;
2655 + acl_p = acl_buf = malloc(acl_count * sizeof acl_buf[0]);
2657 + if (acl_buf == NULL) {
2658 + sys_acl_free_acl(tmp_acl);
2663 + /* Copy the access control and default entries into the buffer. */
2664 + memcpy(&acl_buf[0], &acc_acl->acl[0],
2665 + acc_acl->count * sizeof acl_buf[0]);
2667 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
2668 + def_acl->count * sizeof acl_buf[0]);
2670 + /* Set the ACL_DEFAULT flag on the default entries. */
2671 + for (i = acc_acl->count; i < acl_count; i++) {
2672 + acl_buf[i].a_type |= ACL_DEFAULT;
2675 + sys_acl_free_acl(tmp_acl);
2677 + } else if (type != SMB_ACL_TYPE_ACCESS) {
2682 + ret = acl(name, SETACL, acl_count, acl_p);
2689 + int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
2691 + if (acl_sort(acl_d) != 0) {
2695 + return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
2698 + int sys_acl_delete_def_file(const char *path)
2703 + /* Fetching the access ACL and rewriting it has the effect of
2704 + * deleting the default ACL. */
2705 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
2709 + ret = acl(path, SETACL, acl_d->count, acl_d->acl);
2711 + sys_acl_free_acl(acl_d);
2716 + int sys_acl_free_text(char *text)
2722 + int sys_acl_free_acl(SMB_ACL_T acl_d)
2728 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
2733 +#elif defined(HAVE_HPUX_ACLS)
2736 +/* Based on the Solaris/SCO code - with modifications. */
2738 +/* Note that while this code implements sufficient functionality
2739 + * to support the sys_acl_* interfaces it does not provide all
2740 + * of the semantics of the POSIX ACL interfaces.
2742 + * In particular, an ACL entry descriptor (SMB_ACL_ENTRY_T) returned
2743 + * from a call to sys_acl_get_entry() should not be assumed to be
2744 + * valid after calling any of the following functions, which may
2745 + * reorder the entries in the ACL.
2748 + * sys_acl_set_file()
2749 + * sys_acl_set_fd()
2752 +/* This checks if the POSIX ACL system call is defined which basically
2753 + * corresponds to whether JFS 3.3 or higher is installed. If acl() was
2754 + * called when it isn't defined, it causes the process to core dump so
2755 + * it is important to check this and avoid acl() calls if it isn't
2758 +static BOOL hpux_acl_call_presence(void)
2761 + shl_t handle = NULL;
2764 + static BOOL already_checked=0;
2766 + if (already_checked)
2770 + ret_val = shl_findsym(&handle, "acl", TYPE_PROCEDURE, &value);
2772 + if (ret_val != 0) {
2773 + DEBUG(5, ("hpux_acl_call_presence: shl_findsym() returned %d, errno = %d, error %s\n",
2774 + ret_val, errno, strerror(errno)));
2775 + DEBUG(5,("hpux_acl_call_presence: acl() system call is not present. Check if you have JFS 3.3 and above?\n"));
2779 + DEBUG(10,("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
2781 + already_checked = True;
2785 + int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
2787 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
2792 + if (entry_p == NULL) {
2797 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
2801 + if (acl_d->next < 0) {
2806 + if (acl_d->next >= acl_d->count) {
2810 + *entry_p = &acl_d->acl[acl_d->next++];
2815 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
2817 + *type_p = entry_d->a_type;
2822 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
2824 + *permset_p = &entry_d->a_perm;
2829 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
2831 + if (entry_d->a_type != SMB_ACL_USER
2832 + && entry_d->a_type != SMB_ACL_GROUP) {
2837 + return &entry_d->a_id;
2840 +/* There is no way of knowing what size the ACL returned by
2841 + * ACL_GET will be unless you first call ACL_CNT which means
2842 + * making an additional system call.
2844 + * In the hope of avoiding the cost of the additional system
2845 + * call in most cases, we initially allocate enough space for
2846 + * an ACL with INITIAL_ACL_SIZE entries. If this turns out to
2847 + * be too small then we use ACL_CNT to find out the actual
2848 + * size, reallocate the ACL buffer, and then call ACL_GET again.
2851 +#define INITIAL_ACL_SIZE 16
2853 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
2856 + int count; /* # of ACL entries allocated */
2857 + int naccess; /* # of access ACL entries */
2858 + int ndefault; /* # of default ACL entries */
2860 + if (hpux_acl_call_presence() == False) {
2861 + /* Looks like we don't have the acl() system call on HPUX.
2862 + * May be the system doesn't have the latest version of JFS. */
2866 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
2871 + count = INITIAL_ACL_SIZE;
2872 + if ((acl_d = sys_acl_init(count)) == NULL) {
2876 + /* If there isn't enough space for the ACL entries we use
2877 + * ACL_CNT to determine the actual number of ACL entries
2878 + * reallocate and try again. This is in a loop because it
2879 + * is possible that someone else could modify the ACL and
2880 + * increase the number of entries between the call to
2881 + * ACL_CNT and the call to ACL_GET. */
2882 + while ((count = acl(path_p, ACL_GET, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) {
2884 + sys_acl_free_acl(acl_d);
2886 + if ((count = acl(path_p, ACL_CNT, 0, NULL)) < 0) {
2890 + if ((acl_d = sys_acl_init(count)) == NULL) {
2896 + sys_acl_free_acl(acl_d);
2900 + /* Calculate the number of access and default ACL entries.
2902 + * Note: we assume that the acl() system call returned a
2903 + * well formed ACL which is sorted so that all of the
2904 + * access ACL entries preceed any default ACL entries. */
2905 + for (naccess = 0; naccess < count; naccess++) {
2906 + if (acl_d->acl[naccess].a_type & ACL_DEFAULT)
2909 + ndefault = count - naccess;
2911 + /* If the caller wants the default ACL we have to copy
2912 + * the entries down to the start of the acl[] buffer
2913 + * and mask out the ACL_DEFAULT flag from the type field. */
2914 + if (type == SMB_ACL_TYPE_DEFAULT) {
2917 + for (i = 0, j = naccess; i < ndefault; i++, j++) {
2918 + acl_d->acl[i] = acl_d->acl[j];
2919 + acl_d->acl[i].a_type &= ~ACL_DEFAULT;
2922 + acl_d->count = ndefault;
2924 + acl_d->count = naccess;
2930 + SMB_ACL_T sys_acl_get_fd(int fd)
2932 + /* HPUX doesn't have the facl call. Fake it using the path.... JRA. */
2934 + files_struct *fsp = file_find_fd(fd);
2936 + if (fsp == NULL) {
2941 + /* We know we're in the same conn context. So we can use the
2942 + * relative path. */
2944 + return sys_acl_get_file(dos_to_unix_static(fsp->fsp_name), SMB_ACL_TYPE_ACCESS);
2947 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
2954 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2956 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
2957 + && perm != SMB_ACL_EXECUTE) {
2962 + if (permset_d == NULL) {
2967 + *permset_d |= perm;
2972 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
2974 + return *permset_d & perm;
2977 + char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
2983 + /* Use an initial estimate of 20 bytes per ACL entry when
2984 + * allocating memory for the text representation of the ACL. */
2986 + maxlen = 20 * acl_d->count;
2987 + if ((text = malloc(maxlen)) == NULL) {
2992 + for (i = 0; i < acl_d->count; i++) {
2993 + struct acl *ap = &acl_d->acl[i];
2994 + struct passwd *pw;
3003 + switch (ap->a_type) {
3004 + /* For debugging purposes it's probably more
3005 + * useful to dump unknown tag types rather
3006 + * than just returning an error. */
3008 + snprintf(tagbuf, sizeof tagbuf - 1, "0x%x",
3011 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
3016 + case SMB_ACL_USER:
3017 + if ((pw = getpwuid(ap->a_id)) == NULL) {
3018 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
3024 + case SMB_ACL_USER_OBJ:
3028 + case SMB_ACL_GROUP:
3029 + if ((gr = getgrgid(ap->a_id)) == NULL) {
3030 + snprintf(idbuf, sizeof idbuf - 1, "%ld",
3036 + case SMB_ACL_GROUP_OBJ:
3040 + case SMB_ACL_OTHER:
3044 + case SMB_ACL_MASK:
3050 + perms[0] = (ap->a_perm & SMB_ACL_READ) ? 'r' : '-';
3051 + perms[1] = (ap->a_perm & SMB_ACL_WRITE) ? 'w' : '-';
3052 + perms[2] = (ap->a_perm & SMB_ACL_EXECUTE) ? 'x' : '-';
3055 + /* <tag> : <qualifier> : rwx \n \0 */
3056 + nbytes = strlen(tag) + 1 + strlen(id) + 1 + 3 + 1 + 1;
3058 + /* If this entry would overflow the buffer
3059 + * allocate enough additional memory for this
3060 + * entry and an estimate of another 20 bytes
3061 + * for each entry still to be processed. */
3062 + if ((len + nbytes) > maxlen) {
3063 + char *oldtext = text;
3065 + maxlen += nbytes + 20 * (acl_d->count - i);
3067 + if ((text = Realloc(oldtext, maxlen)) == NULL) {
3074 + snprintf(&text[len], nbytes-1, "%s:%s:%s\n", tag, id, perms);
3075 + len += nbytes - 1;
3084 + SMB_ACL_T sys_acl_init(int count)
3093 + /* Note that since the definition of the structure pointed
3094 + * to by the SMB_ACL_T includes the first element of the
3095 + * acl[] array, this actually allocates an ACL with room
3096 + * for (count+1) entries. */
3097 + if ((a = malloc(sizeof a[0] + count * sizeof (struct acl))) == NULL) {
3102 + a->size = count + 1;
3110 + int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3113 + SMB_ACL_ENTRY_T entry_d;
3115 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3120 + if (acl_d->count >= acl_d->size) {
3125 + entry_d = &acl_d->acl[acl_d->count++];
3126 + entry_d->a_type = 0;
3127 + entry_d->a_id = -1;
3128 + entry_d->a_perm = 0;
3129 + *entry_p = entry_d;
3134 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3136 + switch (tag_type) {
3137 + case SMB_ACL_USER:
3138 + case SMB_ACL_USER_OBJ:
3139 + case SMB_ACL_GROUP:
3140 + case SMB_ACL_GROUP_OBJ:
3141 + case SMB_ACL_OTHER:
3142 + case SMB_ACL_MASK:
3143 + entry_d->a_type = tag_type;
3153 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3155 + if (entry_d->a_type != SMB_ACL_GROUP
3156 + && entry_d->a_type != SMB_ACL_USER) {
3161 + entry_d->a_id = *((id_t *)qual_p);
3166 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3168 + if (*permset_d & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3172 + entry_d->a_perm = *permset_d;
3177 +/* Structure to capture the count for each type of ACE. */
3179 +struct hpux_acl_types {
3183 + int n_def_user_obj;
3188 + int n_def_group_obj;
3192 + int n_def_other_obj;
3195 + int n_def_class_obj;
3197 + int n_illegal_obj;
3201 + * Counts the different number of objects in a given array of ACL
3205 + * acl_count - Count of ACLs in the array of ACL strucutres.
3206 + * aclp - Array of ACL structures.
3207 + * acl_type_count - Pointer to acl_types structure. Should already be
3211 + * acl_type_count - This structure is filled up with counts of various
3215 +static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
3219 + memset(acl_type_count, 0, sizeof (struct hpux_acl_types));
3221 + for (i=0;i<acl_count;i++) {
3222 + switch (aclp[i].a_type) {
3224 + acl_type_count->n_user++;
3227 + acl_type_count->n_user_obj++;
3229 + case DEF_USER_OBJ:
3230 + acl_type_count->n_def_user_obj++;
3233 + acl_type_count->n_group++;
3236 + acl_type_count->n_group_obj++;
3238 + case DEF_GROUP_OBJ:
3239 + acl_type_count->n_def_group_obj++;
3242 + acl_type_count->n_other_obj++;
3244 + case DEF_OTHER_OBJ:
3245 + acl_type_count->n_def_other_obj++;
3248 + acl_type_count->n_class_obj++;
3250 + case DEF_CLASS_OBJ:
3251 + acl_type_count->n_def_class_obj++;
3254 + acl_type_count->n_def_user++;
3257 + acl_type_count->n_def_group++;
3260 + acl_type_count->n_illegal_obj++;
3266 +/* swap_acl_entries: Swaps two ACL entries.
3268 + * Inputs: aclp0, aclp1 - ACL entries to be swapped.
3271 +static void hpux_swap_acl_entries(struct acl *aclp0, struct acl *aclp1)
3273 + struct acl temp_acl;
3275 + temp_acl.a_type = aclp0->a_type;
3276 + temp_acl.a_id = aclp0->a_id;
3277 + temp_acl.a_perm = aclp0->a_perm;
3279 + aclp0->a_type = aclp1->a_type;
3280 + aclp0->a_id = aclp1->a_id;
3281 + aclp0->a_perm = aclp1->a_perm;
3283 + aclp1->a_type = temp_acl.a_type;
3284 + aclp1->a_id = temp_acl.a_id;
3285 + aclp1->a_perm = temp_acl.a_perm;
3288 +/* prohibited_duplicate_type
3289 + * Identifies if given ACL type can have duplicate entries or
3292 + * Inputs: acl_type - ACL Type.
3298 + * True - If the ACL type matches any of the prohibited types.
3299 + * False - If the ACL type doesn't match any of the prohibited types.
3302 +static BOOL hpux_prohibited_duplicate_type(int acl_type)
3304 + switch (acl_type) {
3314 +/* get_needed_class_perm
3315 + * Returns the permissions of a ACL structure only if the ACL
3316 + * type matches one of the pre-determined types for computing
3317 + * CLASS_OBJ permissions.
3319 + * Inputs: aclp - Pointer to ACL structure.
3322 +static int hpux_get_needed_class_perm(struct acl *aclp)
3324 + switch (aclp->a_type) {
3328 + case DEF_USER_OBJ:
3330 + case DEF_GROUP_OBJ:
3332 + case DEF_CLASS_OBJ:
3333 + case DEF_OTHER_OBJ:
3334 + return aclp->a_perm;
3340 +/* acl_sort for HPUX.
3341 + * Sorts the array of ACL structures as per the description in
3342 + * aclsort man page. Refer to aclsort man page for more details
3346 + * acl_count - Count of ACLs in the array of ACL structures.
3347 + * calclass - If this is not zero, then we compute the CLASS_OBJ
3349 + * aclp - Array of ACL structures.
3353 + * aclp - Sorted array of ACL structures.
3357 + * Returns 0 for success -1 for failure. Prints a message to the Samba
3358 + * debug log in case of failure.
3361 +static int hpux_acl_sort(int acl_count, int calclass, struct acl *aclp)
3363 +#if !defined(HAVE_HPUX_ACLSORT)
3364 + /* The aclsort() system call is availabe on the latest HPUX General
3365 + * Patch Bundles. So for HPUX, we developed our version of acl_sort
3366 + * function. Because, we don't want to update to a new
3367 + * HPUX GR bundle just for aclsort() call. */
3369 + struct hpux_acl_types acl_obj_count;
3370 + int n_class_obj_perm = 0;
3374 + DEBUG(10,("Zero acl count passed. Returning Success\n"));
3378 + if (aclp == NULL) {
3379 + DEBUG(0,("Null ACL pointer in hpux_acl_sort. Returning Failure. \n"));
3383 + /* Count different types of ACLs in the ACLs array */
3385 + hpux_count_obj(acl_count, aclp, &acl_obj_count);
3387 + /* There should be only one entry each of type USER_OBJ, GROUP_OBJ,
3388 + * CLASS_OBJ and OTHER_OBJ
3391 + if (acl_obj_count.n_user_obj != 1
3392 + || acl_obj_count.n_group_obj != 1
3393 + || acl_obj_count.n_class_obj != 1
3394 + || acl_obj_count.n_other_obj != 1) {
3395 + DEBUG(0,("hpux_acl_sort: More than one entry or no entries for \
3396 +USER OBJ or GROUP_OBJ or OTHER_OBJ or CLASS_OBJ\n"));
3400 + /* If any of the default objects are present, there should be only
3401 + * one of them each.
3404 + if (acl_obj_count.n_def_user_obj > 1 || acl_obj_count.n_def_group_obj > 1 ||
3405 + acl_obj_count.n_def_other_obj > 1 || acl_obj_count.n_def_class_obj > 1) {
3406 + DEBUG(0,("hpux_acl_sort: More than one entry for DEF_CLASS_OBJ \
3407 +or DEF_USER_OBJ or DEF_GROUP_OBJ or DEF_OTHER_OBJ\n"));
3411 + /* We now have proper number of OBJ and DEF_OBJ entries. Now sort the acl
3414 + * Sorting crieteria - First sort by ACL type. If there are multiple entries of
3415 + * same ACL type, sort by ACL id.
3417 + * I am using the trival kind of sorting method here because, performance isn't
3418 + * really effected by the ACLs feature. More over there aren't going to be more
3419 + * than 17 entries on HPUX.
3422 + for (i=0; i<acl_count;i++) {
3423 + for (j=i+1; j<acl_count; j++) {
3424 + if (aclp[i].a_type > aclp[j].a_type) {
3425 + /* ACL entries out of order, swap them */
3427 + hpux_swap_acl_entries((aclp+i), (aclp+j));
3429 + } else if (aclp[i].a_type == aclp[j].a_type) {
3431 + /* ACL entries of same type, sort by id */
3433 + if (aclp[i].a_id > aclp[j].a_id) {
3434 + hpux_swap_acl_entries((aclp+i), (aclp+j));
3435 + } else if (aclp[i].a_id == aclp[j].a_id) {
3436 + /* We have a duplicate entry. */
3437 + if (hpux_prohibited_duplicate_type(aclp[i].a_type)) {
3438 + DEBUG(0, ("hpux_acl_sort: Duplicate entry: Type(hex): %x Id: %d\n",
3439 + aclp[i].a_type, aclp[i].a_id));
3448 + /* set the class obj permissions to the computed one. */
3450 + int n_class_obj_index = -1;
3452 + for (i=0;i<acl_count;i++) {
3453 + n_class_obj_perm |= hpux_get_needed_class_perm((aclp+i));
3455 + if (aclp[i].a_type == CLASS_OBJ)
3456 + n_class_obj_index = i;
3458 + aclp[n_class_obj_index].a_perm = n_class_obj_perm;
3463 + return aclsort(acl_count, calclass, aclp);
3467 +/* Sort the ACL and check it for validity.
3469 + * If it's a minimal ACL with only 4 entries then we
3470 + * need to recalculate the mask permissions to make
3471 + * sure that they are the same as the GROUP_OBJ
3472 + * permissions as required by the UnixWare acl() system call.
3474 + * (Note: since POSIX allows minimal ACLs which only contain
3475 + * 3 entries - ie there is no mask entry - we should, in theory,
3476 + * check for this and add a mask entry if necessary - however
3477 + * we "know" that the caller of this interface always specifies
3478 + * a mask so, in practice "this never happens" (tm) - if it *does*
3479 + * happen aclsort() will fail and return an error and someone will
3480 + * have to fix it ...) */
3482 +static int acl_sort(SMB_ACL_T acl_d)
3484 + int fixmask = (acl_d->count <= 4);
3486 + if (hpux_acl_sort(acl_d->count, fixmask, acl_d->acl) != 0) {
3493 + int sys_acl_valid(SMB_ACL_T acl_d)
3495 + return acl_sort(acl_d);
3498 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3501 + struct acl *acl_p;
3503 + struct acl *acl_buf = NULL;
3506 + if (hpux_acl_call_presence() == False) {
3507 + /* Looks like we don't have the acl() system call on HPUX.
3508 + * May be the system doesn't have the latest version of JFS. */
3513 + if (type != SMB_ACL_TYPE_ACCESS && type != SMB_ACL_TYPE_DEFAULT) {
3518 + if (acl_sort(acl_d) != 0) {
3522 + acl_p = &acl_d->acl[0];
3523 + acl_count = acl_d->count;
3525 + /* If it's a directory there is extra work to do since the acl()
3526 + * system call will replace both the access ACLs and the default
3527 + * ACLs (if any). */
3528 + if (stat(name, &s) != 0) {
3531 + if (S_ISDIR(s.st_mode)) {
3532 + SMB_ACL_T acc_acl;
3533 + SMB_ACL_T def_acl;
3534 + SMB_ACL_T tmp_acl;
3537 + if (type == SMB_ACL_TYPE_ACCESS) {
3539 + def_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_DEFAULT);
3543 + acc_acl = tmp_acl = sys_acl_get_file(name, SMB_ACL_TYPE_ACCESS);
3546 + if (tmp_acl == NULL) {
3550 + /* Allocate a temporary buffer for the complete ACL. */
3551 + acl_count = acc_acl->count + def_acl->count;
3552 + acl_p = acl_buf = malloc(acl_count * sizeof acl_buf[0]);
3554 + if (acl_buf == NULL) {
3555 + sys_acl_free_acl(tmp_acl);
3560 + /* Copy the access control and default entries into the buffer. */
3561 + memcpy(&acl_buf[0], &acc_acl->acl[0],
3562 + acc_acl->count * sizeof acl_buf[0]);
3564 + memcpy(&acl_buf[acc_acl->count], &def_acl->acl[0],
3565 + def_acl->count * sizeof acl_buf[0]);
3567 + /* Set the ACL_DEFAULT flag on the default entries. */
3568 + for (i = acc_acl->count; i < acl_count; i++) {
3569 + acl_buf[i].a_type |= ACL_DEFAULT;
3572 + sys_acl_free_acl(tmp_acl);
3574 + } else if (type != SMB_ACL_TYPE_ACCESS) {
3579 + ret = acl(name, ACL_SET, acl_count, acl_p);
3586 + int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3588 + /* HPUX doesn't have the facl call. Fake it using the path.... JRA. */
3590 + files_struct *fsp = file_find_fd(fd);
3592 + if (fsp == NULL) {
3597 + if (acl_sort(acl_d) != 0) {
3601 + /* We know we're in the same conn context. So we can use the
3602 + * relative path. */
3604 + return sys_acl_set_file(dos_to_unix_static(fsp->fsp_name), SMB_ACL_TYPE_ACCESS, acl_d);
3607 + int sys_acl_delete_def_file(const char *path)
3612 + /* Fetching the access ACL and rewriting it has the effect of
3613 + * deleting the default ACL. */
3614 + if ((acl_d = sys_acl_get_file(path, SMB_ACL_TYPE_ACCESS)) == NULL) {
3618 + ret = acl(path, ACL_SET, acl_d->count, acl_d->acl);
3620 + sys_acl_free_acl(acl_d);
3625 + int sys_acl_free_text(char *text)
3631 + int sys_acl_free_acl(SMB_ACL_T acl_d)
3637 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
3642 +#elif defined(HAVE_IRIX_ACLS)
3644 + int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3646 + if (entry_id != SMB_ACL_FIRST_ENTRY && entry_id != SMB_ACL_NEXT_ENTRY) {
3651 + if (entry_p == NULL) {
3656 + if (entry_id == SMB_ACL_FIRST_ENTRY) {
3660 + if (acl_d->next < 0) {
3665 + if (acl_d->next >= acl_d->aclp->acl_cnt) {
3669 + *entry_p = &acl_d->aclp->acl_entry[acl_d->next++];
3674 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
3676 + *type_p = entry_d->ae_tag;
3681 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3683 + *permset_p = entry_d;
3688 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3690 + if (entry_d->ae_tag != SMB_ACL_USER
3691 + && entry_d->ae_tag != SMB_ACL_GROUP) {
3696 + return &entry_d->ae_id;
3699 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3703 + if ((a = malloc(sizeof a[0])) == NULL) {
3707 + if ((a->aclp = acl_get_file(path_p, type)) == NULL) {
3712 + a->freeaclp = True;
3716 + SMB_ACL_T sys_acl_get_fd(int fd)
3720 + if ((a = malloc(sizeof a[0])) == NULL) {
3724 + if ((a->aclp = acl_get_fd(fd)) == NULL) {
3729 + a->freeaclp = True;
3733 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
3735 + permset_d->ae_perm = 0;
3740 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3742 + if (perm != SMB_ACL_READ && perm != SMB_ACL_WRITE
3743 + && perm != SMB_ACL_EXECUTE) {
3748 + if (permset_d == NULL) {
3753 + permset_d->ae_perm |= perm;
3758 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm)
3760 + return permset_d->ae_perm & perm;
3763 + char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
3765 + return acl_to_text(acl_d->aclp, len_p);
3768 + SMB_ACL_T sys_acl_init(int count)
3777 + if ((a = malloc(sizeof a[0] + sizeof (struct acl))) == NULL) {
3783 + a->freeaclp = False;
3784 + a->aclp = (struct acl *)(&a->aclp + sizeof (struct acl *));
3785 + a->aclp->acl_cnt = 0;
3791 + int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
3794 + SMB_ACL_ENTRY_T entry_d;
3796 + if (acl_p == NULL || entry_p == NULL || (acl_d = *acl_p) == NULL) {
3801 + if (acl_d->aclp->acl_cnt >= ACL_MAX_ENTRIES) {
3806 + entry_d = &acl_d->aclp->acl_entry[acl_d->aclp->acl_cnt++];
3807 + entry_d->ae_tag = 0;
3808 + entry_d->ae_id = 0;
3809 + entry_d->ae_perm = 0;
3810 + *entry_p = entry_d;
3815 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
3817 + switch (tag_type) {
3818 + case SMB_ACL_USER:
3819 + case SMB_ACL_USER_OBJ:
3820 + case SMB_ACL_GROUP:
3821 + case SMB_ACL_GROUP_OBJ:
3822 + case SMB_ACL_OTHER:
3823 + case SMB_ACL_MASK:
3824 + entry_d->ae_tag = tag_type;
3834 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
3836 + if (entry_d->ae_tag != SMB_ACL_GROUP
3837 + && entry_d->ae_tag != SMB_ACL_USER) {
3842 + entry_d->ae_id = *((id_t *)qual_p);
3847 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d)
3849 + if (permset_d->ae_perm & ~(SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
3853 + entry_d->ae_perm = permset_d->ae_perm;
3858 + int sys_acl_valid(SMB_ACL_T acl_d)
3860 + return acl_valid(acl_d->aclp);
3863 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
3865 + return acl_set_file(name, type, acl_d->aclp);
3868 + int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
3870 + return acl_set_fd(fd, acl_d->aclp);
3873 + int sys_acl_delete_def_file(const char *name)
3875 + return acl_delete_def_file(name);
3878 + int sys_acl_free_text(char *text)
3880 + return acl_free(text);
3883 + int sys_acl_free_acl(SMB_ACL_T acl_d)
3885 + if (acl_d->freeaclp) {
3886 + acl_free(acl_d->aclp);
3892 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
3897 +#elif defined(HAVE_AIX_ACLS)
3899 +/* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
3901 + int sys_acl_get_entry(SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
3903 + struct acl_entry_link *link;
3904 + struct new_acl_entry *entry;
3907 + DEBUG(10,("This is the count: %d\n",theacl->count));
3909 + /* Check if count was previously set to -1. If it was, that
3910 + * means we reached the end of the acl last time. */
3911 + if (theacl->count == -1)
3915 + /* To get to the next acl, traverse linked list until index of
3916 + * acl matches the count we are keeping. This count is
3917 + * incremented each time we return an acl entry. */
3919 + for (keep_going = 0; keep_going < theacl->count; keep_going++)
3920 + link = link->nextp;
3922 + entry = *entry_p = link->entryp;
3924 + DEBUG(10,("*entry_p is %d\n",entry_p));
3925 + DEBUG(10,("*entry_p->ace_access is %d\n",entry->ace_access));
3927 + /* Increment count */
3929 + if (link->nextp == NULL)
3930 + theacl->count = -1;
3935 + int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
3937 + /* Initialize tag type */
3940 + DEBUG(10,("the tagtype is %d\n",entry_d->ace_id->id_type));
3942 + /* Depending on what type of entry we have, return tag type. */
3943 + switch (entry_d->ace_id->id_type) {
3945 + *tag_type_p = SMB_ACL_USER;
3948 + *tag_type_p = SMB_ACL_GROUP;
3951 + case SMB_ACL_USER_OBJ:
3952 + case SMB_ACL_GROUP_OBJ:
3953 + case SMB_ACL_OTHER:
3954 + *tag_type_p = entry_d->ace_id->id_type;
3964 + int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p)
3966 + DEBUG(10,("Starting AIX sys_acl_get_permset\n"));
3967 + *permset_p = &entry_d->ace_access;
3968 + DEBUG(10,("**permset_p is %d\n",**permset_p));
3969 + if (!(**permset_p & S_IXUSR)
3970 + && !(**permset_p & S_IWUSR)
3971 + && !(**permset_p & S_IRUSR)
3972 + && **permset_p != 0)
3975 + DEBUG(10,("Ending AIX sys_acl_get_permset\n"));
3979 + void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
3981 + return entry_d->ace_id->id_data;
3984 + SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
3986 + struct acl *file_acl = (struct acl *)NULL;
3987 + struct acl_entry *acl_entry;
3988 + struct new_acl_entry *new_acl_entry;
3989 + struct ace_id *idp;
3990 + struct acl_entry_link *acl_entry_link;
3991 + struct acl_entry_link *acl_entry_link_head;
3996 + /* Get the acl using statacl */
3998 + DEBUG(10,("Entering sys_acl_get_file\n"));
3999 + DEBUG(10,("path_p is %s\n",path_p));
4001 + file_acl = (struct acl *)malloc(BUFSIZ);
4003 + if (file_acl == NULL) {
4005 + DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
4009 + memset(file_acl,0,BUFSIZ);
4011 + rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
4013 + DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
4018 + DEBUG(10,("Got facl and returned it\n"));
4020 + /* Point to the first acl entry in the acl */
4021 + acl_entry = file_acl->acl_ext;
4023 + /* Begin setting up the head of the linked list that will be
4024 + * used for the storing the acl in a way that is useful for the
4025 + * posix_acls.c code. */
4027 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4028 + if (acl_entry_link_head == NULL)
4031 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4032 + if (acl_entry_link->entryp == NULL) {
4035 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4039 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4040 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4042 + /* Check if the extended acl bit is on. If it isn't, do not
4043 + * show the contents of the acl since AIX intends the extended
4044 + * info to remain unused. */
4046 + if (file_acl->acl_mode & S_IXACL){
4047 + /* while we are not pointing to the very end */
4048 + while (acl_entry < acl_last(file_acl)) {
4049 + /* before we malloc anything, make sure this is */
4050 + /* a valid acl entry and one that we want to map */
4051 + idp = id_nxt(acl_entry->ace_id);
4052 + if ((acl_entry->ace_type == ACC_SPECIFY
4053 + || acl_entry->ace_type == ACC_PERMIT)
4054 + && idp != id_last(acl_entry)) {
4055 + acl_entry = acl_nxt(acl_entry);
4059 + idp = acl_entry->ace_id;
4061 + /* Check if this is the first entry in the linked list.
4062 + * The first entry needs to keep prevp pointing to NULL
4063 + * and already has entryp allocated. */
4065 + if (acl_entry_link_head->count != 0) {
4066 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4068 + if (acl_entry_link->nextp == NULL) {
4071 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4075 + acl_entry_link->nextp->prevp = acl_entry_link;
4076 + acl_entry_link = acl_entry_link->nextp;
4077 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4078 + if (acl_entry_link->entryp == NULL) {
4081 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4084 + acl_entry_link->nextp = NULL;
4087 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4089 + /* Don't really need this since all types are going
4090 + * to be specified but, it's better than leaving it 0. */
4092 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4094 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4096 + memcpy(acl_entry_link->entryp->ace_id,idp,sizeof (struct ace_id));
4098 + /* The access in the acl entries must be left shifted by
4099 + * three bites, because they will ultimately be compared
4100 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4102 + switch (acl_entry->ace_type){
4105 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4106 + acl_entry_link->entryp->ace_access <<= 6;
4107 + acl_entry_link_head->count++;
4110 + /* Since there is no way to return a DENY acl entry
4111 + * change to PERMIT and then shift. */
4112 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4113 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4114 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4115 + acl_entry_link->entryp->ace_access <<= 6;
4116 + acl_entry_link_head->count++;
4122 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4123 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4125 + acl_entry = acl_nxt(acl_entry);
4127 + } /* end of if enabled */
4129 + /* Since owner, group, other acl entries are not part of the acl
4130 + * entries in an acl, they must be dummied up to become part of
4133 + for (i = 1; i < 4; i++) {
4134 + DEBUG(10,("i is %d\n",i));
4135 + if (acl_entry_link_head->count != 0) {
4136 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4137 + if (acl_entry_link->nextp == NULL) {
4140 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4144 + acl_entry_link->nextp->prevp = acl_entry_link;
4145 + acl_entry_link = acl_entry_link->nextp;
4146 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4147 + if (acl_entry_link->entryp == NULL) {
4150 + DEBUG(0,("Error in AIX sys_acl_get_file is %d\n",errno));
4155 + acl_entry_link->nextp = NULL;
4157 + new_acl_entry = acl_entry_link->entryp;
4158 + idp = new_acl_entry->ace_id;
4160 + new_acl_entry->ace_len = sizeof (struct acl_entry);
4161 + new_acl_entry->ace_type = ACC_PERMIT;
4162 + idp->id_len = sizeof (struct ace_id);
4163 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4164 + memset(idp->id_data,0,sizeof (uid_t));
4168 + new_acl_entry->ace_access = file_acl->g_access << 6;
4169 + idp->id_type = SMB_ACL_GROUP_OBJ;
4173 + new_acl_entry->ace_access = file_acl->o_access << 6;
4174 + idp->id_type = SMB_ACL_OTHER;
4178 + new_acl_entry->ace_access = file_acl->u_access << 6;
4179 + idp->id_type = SMB_ACL_USER_OBJ;
4187 + acl_entry_link_head->count++;
4188 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4191 + acl_entry_link_head->count = 0;
4194 + return acl_entry_link_head;
4197 + SMB_ACL_T sys_acl_get_fd(int fd)
4199 + struct acl *file_acl = (struct acl *)NULL;
4200 + struct acl_entry *acl_entry;
4201 + struct new_acl_entry *new_acl_entry;
4202 + struct ace_id *idp;
4203 + struct acl_entry_link *acl_entry_link;
4204 + struct acl_entry_link *acl_entry_link_head;
4209 + /* Get the acl using fstatacl */
4211 + DEBUG(10,("Entering sys_acl_get_fd\n"));
4212 + DEBUG(10,("fd is %d\n",fd));
4213 + file_acl = (struct acl *)malloc(BUFSIZ);
4215 + if (file_acl == NULL) {
4217 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4221 + memset(file_acl,0,BUFSIZ);
4223 + rc = fstatacl(fd,0,file_acl,BUFSIZ);
4225 + DEBUG(0,("The fstatacl call returned %d with errno %d\n",rc,errno));
4230 + DEBUG(10,("Got facl and returned it\n"));
4232 + /* Point to the first acl entry in the acl */
4234 + acl_entry = file_acl->acl_ext;
4236 + /* Begin setting up the head of the linked list that will be
4237 + * used for the storing the acl in a way that is useful for the
4238 + * posix_acls.c code. */
4240 + acl_entry_link_head = acl_entry_link = sys_acl_init(0);
4241 + if (acl_entry_link_head == NULL){
4246 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4248 + if (acl_entry_link->entryp == NULL) {
4250 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4255 + DEBUG(10,("acl_entry is %d\n",acl_entry));
4256 + DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
4258 + /* Check if the extended acl bit is on. If it isn't, do not
4259 + * show the contents of the acl since AIX intends the extended
4260 + * info to remain unused. */
4262 + if (file_acl->acl_mode & S_IXACL){
4263 + /* while we are not pointing to the very end */
4264 + while (acl_entry < acl_last(file_acl)) {
4265 + /* before we malloc anything, make sure this is */
4266 + /* a valid acl entry and one that we want to map */
4268 + idp = id_nxt(acl_entry->ace_id);
4269 + if ((acl_entry->ace_type == ACC_SPECIFY
4270 + || acl_entry->ace_type == ACC_PERMIT)
4271 + && (idp != id_last(acl_entry))) {
4272 + acl_entry = acl_nxt(acl_entry);
4276 + idp = acl_entry->ace_id;
4278 + /* Check if this is the first entry in the linked list.
4279 + * The first entry needs to keep prevp pointing to NULL
4280 + * and already has entryp allocated. */
4282 + if (acl_entry_link_head->count != 0) {
4283 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4284 + if (acl_entry_link->nextp == NULL) {
4286 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4290 + acl_entry_link->nextp->prevp = acl_entry_link;
4291 + acl_entry_link = acl_entry_link->nextp;
4292 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4293 + if (acl_entry_link->entryp == NULL) {
4295 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4300 + acl_entry_link->nextp = NULL;
4303 + acl_entry_link->entryp->ace_len = acl_entry->ace_len;
4305 + /* Don't really need this since all types are going
4306 + * to be specified but, it's better than leaving it 0. */
4308 + acl_entry_link->entryp->ace_type = acl_entry->ace_type;
4309 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4311 + memcpy(acl_entry_link->entryp->ace_id, idp, sizeof (struct ace_id));
4313 + /* The access in the acl entries must be left shifted by
4314 + * three bites, because they will ultimately be compared
4315 + * to S_IRUSR, S_IWUSR, and S_IXUSR. */
4317 + switch (acl_entry->ace_type){
4320 + acl_entry_link->entryp->ace_access = acl_entry->ace_access;
4321 + acl_entry_link->entryp->ace_access <<= 6;
4322 + acl_entry_link_head->count++;
4325 + /* Since there is no way to return a DENY acl entry
4326 + * change to PERMIT and then shift. */
4327 + DEBUG(10,("acl_entry->ace_access is %d\n",acl_entry->ace_access));
4328 + acl_entry_link->entryp->ace_access = ~acl_entry->ace_access & 7;
4329 + DEBUG(10,("acl_entry_link->entryp->ace_access is %d\n",acl_entry_link->entryp->ace_access));
4330 + acl_entry_link->entryp->ace_access <<= 6;
4331 + acl_entry_link_head->count++;
4337 + DEBUG(10,("acl_entry = %d\n",acl_entry));
4338 + DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
4340 + acl_entry = acl_nxt(acl_entry);
4342 + } /* end of if enabled */
4344 + /* Since owner, group, other acl entries are not
4345 + * part of the acl entries in an acl, they must
4346 + * be dummied up to become part of the list. */
4348 + for (i = 1; i < 4; i++) {
4349 + DEBUG(10,("i is %d\n",i));
4350 + if (acl_entry_link_head->count != 0){
4351 + acl_entry_link->nextp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4352 + if (acl_entry_link->nextp == NULL) {
4354 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4359 + acl_entry_link->nextp->prevp = acl_entry_link;
4360 + acl_entry_link = acl_entry_link->nextp;
4361 + acl_entry_link->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4363 + if (acl_entry_link->entryp == NULL) {
4366 + DEBUG(0,("Error in sys_acl_get_fd is %d\n",errno));
4371 + acl_entry_link->nextp = NULL;
4373 + new_acl_entry = acl_entry_link->entryp;
4374 + idp = new_acl_entry->ace_id;
4376 + new_acl_entry->ace_len = sizeof (struct acl_entry);
4377 + new_acl_entry->ace_type = ACC_PERMIT;
4378 + idp->id_len = sizeof (struct ace_id);
4379 + DEBUG(10,("idp->id_len = %d\n",idp->id_len));
4380 + memset(idp->id_data,0,sizeof (uid_t));
4384 + new_acl_entry->ace_access = file_acl->g_access << 6;
4385 + idp->id_type = SMB_ACL_GROUP_OBJ;
4389 + new_acl_entry->ace_access = file_acl->o_access << 6;
4390 + idp->id_type = SMB_ACL_OTHER;
4394 + new_acl_entry->ace_access = file_acl->u_access << 6;
4395 + idp->id_type = SMB_ACL_USER_OBJ;
4402 + acl_entry_link_head->count++;
4403 + DEBUG(10,("new_acl_entry->ace_access = %d\n",new_acl_entry->ace_access));
4406 + acl_entry_link_head->count = 0;
4409 + return acl_entry_link_head;
4412 + int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset)
4414 + *permset = *permset & ~0777;
4418 + int sys_acl_add_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4420 + if (perm != 0 && (perm & (S_IXUSR | S_IWUSR | S_IRUSR)) == 0)
4424 + DEBUG(10,("This is the permset now: %d\n",*permset));
4428 + char *sys_acl_to_text(SMB_ACL_T theacl, ssize_t *plen)
4433 + SMB_ACL_T sys_acl_init(int count)
4435 + struct acl_entry_link *theacl = NULL;
4437 + DEBUG(10,("Entering sys_acl_init\n"));
4439 + theacl = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4440 + if (theacl == NULL) {
4442 + DEBUG(0,("Error in sys_acl_init is %d\n",errno));
4446 + theacl->count = 0;
4447 + theacl->nextp = NULL;
4448 + theacl->prevp = NULL;
4449 + theacl->entryp = NULL;
4450 + DEBUG(10,("Exiting sys_acl_init\n"));
4454 + int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
4456 + struct acl_entry_link *theacl;
4457 + struct acl_entry_link *acl_entryp;
4458 + struct acl_entry_link *temp_entry;
4461 + DEBUG(10,("Entering the sys_acl_create_entry\n"));
4463 + theacl = acl_entryp = *pacl;
4465 + /* Get to the end of the acl before adding entry */
4467 + for (counting=0; counting < theacl->count; counting++){
4468 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
4469 + temp_entry = acl_entryp;
4470 + acl_entryp = acl_entryp->nextp;
4473 + if (theacl->count != 0){
4474 + temp_entry->nextp = acl_entryp = (struct acl_entry_link *)malloc(sizeof (struct acl_entry_link));
4475 + if (acl_entryp == NULL) {
4477 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
4481 + DEBUG(10,("The acl_entryp is %d\n",acl_entryp));
4482 + acl_entryp->prevp = temp_entry;
4483 + DEBUG(10,("The acl_entryp->prevp is %d\n",acl_entryp->prevp));
4486 + *pentry = acl_entryp->entryp = (struct new_acl_entry *)malloc(sizeof (struct new_acl_entry));
4487 + if (*pentry == NULL) {
4489 + DEBUG(0,("Error in sys_acl_create_entry is %d\n",errno));
4493 + memset(*pentry,0,sizeof (struct new_acl_entry));
4494 + acl_entryp->entryp->ace_len = sizeof (struct acl_entry);
4495 + acl_entryp->entryp->ace_type = ACC_PERMIT;
4496 + acl_entryp->entryp->ace_id->id_len = sizeof (struct ace_id);
4497 + acl_entryp->nextp = NULL;
4499 + DEBUG(10,("Exiting sys_acl_create_entry\n"));
4503 + int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
4505 + DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
4506 + entry->ace_id->id_type = tagtype;
4507 + DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
4508 + DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
4511 + int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual)
4513 + DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
4514 + memcpy(entry->ace_id->id_data,qual,sizeof (uid_t));
4515 + DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
4519 + int sys_acl_set_permset(SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset)
4521 + DEBUG(10,("Starting AIX sys_acl_set_permset\n"));
4522 + if (!(*permset & S_IXUSR)
4523 + && !(*permset & S_IWUSR)
4524 + && !(*permset & S_IRUSR)
4528 + entry->ace_access = *permset;
4529 + DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
4530 + DEBUG(10,("Ending AIX sys_acl_set_permset\n"));
4534 + int sys_acl_valid(SMB_ACL_T theacl)
4537 + int group_obj = 0;
4538 + int other_obj = 0;
4539 + struct acl_entry_link *acl_entry;
4541 + for (acl_entry=theacl; acl_entry != NULL; acl_entry = acl_entry->nextp) {
4542 + user_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_USER_OBJ);
4543 + group_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_GROUP_OBJ);
4544 + other_obj += (acl_entry->entryp->ace_id->id_type == SMB_ACL_OTHER);
4547 + DEBUG(10,("user_obj=%d, group_obj=%d, other_obj=%d\n",user_obj,group_obj,other_obj));
4549 + if (user_obj != 1 || group_obj != 1 || other_obj != 1)
4555 + int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
4557 + struct acl_entry_link *acl_entry_link = NULL;
4558 + struct acl *file_acl = NULL;
4559 + struct acl *file_acl_temp = NULL;
4560 + struct acl_entry *acl_entry = NULL;
4561 + struct ace_id *ace_id = NULL;
4568 + DEBUG(10,("Entering sys_acl_set_file\n"));
4569 + DEBUG(10,("File name is %s\n",name));
4571 + /* AIX has no default ACL */
4572 + if (acltype == SMB_ACL_TYPE_DEFAULT)
4575 + acl_length = BUFSIZ;
4576 + file_acl = (struct acl *)malloc(BUFSIZ);
4578 + if (file_acl == NULL) {
4580 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
4584 + memset(file_acl,0,BUFSIZ);
4586 + file_acl->acl_len = ACL_SIZ;
4587 + file_acl->acl_mode = S_IXACL;
4589 + for (acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
4590 + acl_entry_link->entryp->ace_access >>= 6;
4591 + id_type = acl_entry_link->entryp->ace_id->id_type;
4593 + switch (id_type) {
4594 + case SMB_ACL_USER_OBJ:
4595 + file_acl->u_access = acl_entry_link->entryp->ace_access;
4597 + case SMB_ACL_GROUP_OBJ:
4598 + file_acl->g_access = acl_entry_link->entryp->ace_access;
4600 + case SMB_ACL_OTHER:
4601 + file_acl->o_access = acl_entry_link->entryp->ace_access;
4603 + case SMB_ACL_MASK:
4607 + if ((file_acl->acl_len + sizeof (struct acl_entry)) > acl_length) {
4608 + acl_length += sizeof (struct acl_entry);
4609 + file_acl_temp = (struct acl *)malloc(acl_length);
4610 + if (file_acl_temp == NULL) {
4613 + DEBUG(0,("Error in sys_acl_set_file is %d\n",errno));
4617 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
4619 + file_acl = file_acl_temp;
4622 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
4623 + file_acl->acl_len += sizeof (struct acl_entry);
4624 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
4625 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
4627 + /* In order to use this, we'll need to wait until we can get denies */
4628 + /* if (!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
4629 + acl_entry->ace_type = ACC_SPECIFY; */
4631 + acl_entry->ace_type = ACC_SPECIFY;
4633 + ace_id = acl_entry->ace_id;
4635 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
4636 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
4637 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
4638 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof (uid_t));
4639 + memcpy(acl_entry->ace_id->id_data, &user_id, sizeof (uid_t));
4642 + rc = chacl((char *)name,file_acl,file_acl->acl_len);
4643 + DEBUG(10,("errno is %d\n",errno));
4644 + DEBUG(10,("return code is %d\n",rc));
4646 + DEBUG(10,("Exiting the sys_acl_set_file\n"));
4650 + int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
4652 + struct acl_entry_link *acl_entry_link = NULL;
4653 + struct acl *file_acl = NULL;
4654 + struct acl *file_acl_temp = NULL;
4655 + struct acl_entry *acl_entry = NULL;
4656 + struct ace_id *ace_id = NULL;
4662 + DEBUG(10,("Entering sys_acl_set_fd\n"));
4663 + acl_length = BUFSIZ;
4664 + file_acl = (struct acl *)malloc(BUFSIZ);
4666 + if (file_acl == NULL) {
4668 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
4672 + memset(file_acl,0,BUFSIZ);
4674 + file_acl->acl_len = ACL_SIZ;
4675 + file_acl->acl_mode = S_IXACL;
4677 + for (acl_entry_link=theacl; acl_entry_link != NULL; acl_entry_link = acl_entry_link->nextp) {
4678 + acl_entry_link->entryp->ace_access >>= 6;
4679 + id_type = acl_entry_link->entryp->ace_id->id_type;
4680 + DEBUG(10,("The id_type is %d\n",id_type));
4682 + switch (id_type) {
4683 + case SMB_ACL_USER_OBJ:
4684 + file_acl->u_access = acl_entry_link->entryp->ace_access;
4686 + case SMB_ACL_GROUP_OBJ:
4687 + file_acl->g_access = acl_entry_link->entryp->ace_access;
4689 + case SMB_ACL_OTHER:
4690 + file_acl->o_access = acl_entry_link->entryp->ace_access;
4692 + case SMB_ACL_MASK:
4696 + if ((file_acl->acl_len + sizeof (struct acl_entry)) > acl_length) {
4697 + acl_length += sizeof (struct acl_entry);
4698 + file_acl_temp = (struct acl *)malloc(acl_length);
4699 + if (file_acl_temp == NULL) {
4702 + DEBUG(0,("Error in sys_acl_set_fd is %d\n",errno));
4706 + memcpy(file_acl_temp,file_acl,file_acl->acl_len);
4708 + file_acl = file_acl_temp;
4711 + acl_entry = (struct acl_entry *)((char *)file_acl + file_acl->acl_len);
4712 + file_acl->acl_len += sizeof (struct acl_entry);
4713 + acl_entry->ace_len = acl_entry_link->entryp->ace_len;
4714 + acl_entry->ace_access = acl_entry_link->entryp->ace_access;
4716 + /* In order to use this, we'll need to wait until we can get denies */
4717 + /* if (!acl_entry->ace_access && acl_entry->ace_type == ACC_PERMIT)
4718 + acl_entry->ace_type = ACC_SPECIFY; */
4720 + acl_entry->ace_type = ACC_SPECIFY;
4722 + ace_id = acl_entry->ace_id;
4724 + ace_id->id_type = acl_entry_link->entryp->ace_id->id_type;
4725 + DEBUG(10,("The id type is %d\n",ace_id->id_type));
4726 + ace_id->id_len = acl_entry_link->entryp->ace_id->id_len;
4727 + memcpy(&user_id, acl_entry_link->entryp->ace_id->id_data, sizeof (uid_t));
4728 + memcpy(ace_id->id_data, &user_id, sizeof (uid_t));
4731 + rc = fchacl(fd,file_acl,file_acl->acl_len);
4732 + DEBUG(10,("errno is %d\n",errno));
4733 + DEBUG(10,("return code is %d\n",rc));
4735 + DEBUG(10,("Exiting sys_acl_set_fd\n"));
4739 + int sys_acl_delete_def_file(const char *name)
4741 + /* AIX has no default ACL */
4745 + int sys_acl_get_perm(SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
4747 + return *permset & perm;
4750 + int sys_acl_free_text(char *text)
4755 + int sys_acl_free_acl(SMB_ACL_T posix_acl)
4757 + struct acl_entry_link *acl_entry_link;
4759 + for (acl_entry_link = posix_acl->nextp; acl_entry_link->nextp != NULL; acl_entry_link = acl_entry_link->nextp) {
4760 + free(acl_entry_link->prevp->entryp);
4761 + free(acl_entry_link->prevp);
4764 + free(acl_entry_link->prevp->entryp);
4765 + free(acl_entry_link->prevp);
4766 + free(acl_entry_link->entryp);
4767 + free(acl_entry_link);
4772 + int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
4777 +#else /* No ACLs. */
4779 + int sys_acl_get_entry(UNUSED(SMB_ACL_T the_acl), UNUSED(int entry_id), UNUSED(SMB_ACL_ENTRY_T *entry_p))
4785 + int sys_acl_get_tag_type(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_TAG_T *tag_type_p))
4791 + int sys_acl_get_permset(UNUSED(SMB_ACL_ENTRY_T entry_d), UNUSED(SMB_ACL_PERMSET_T *permset_p))
4797 + void *sys_acl_get_qualifier(UNUSED(SMB_ACL_ENTRY_T entry_d))
4803 + SMB_ACL_T sys_acl_get_file(UNUSED(const char *path_p), UNUSED(SMB_ACL_TYPE_T type))
4809 + SMB_ACL_T sys_acl_get_fd(UNUSED(int fd))
4815 + int sys_acl_clear_perms(UNUSED(SMB_ACL_PERMSET_T permset))
4821 + int sys_acl_add_perm(UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
4827 + int sys_acl_get_perm(UNUSED(SMB_ACL_PERMSET_T permset), UNUSED(SMB_ACL_PERM_T perm))
4830 + return permset & perm ? 1 : 0;
4833 + char *sys_acl_to_text(UNUSED(SMB_ACL_T the_acl), UNUSED(ssize_t *plen))
4839 + int sys_acl_free_text(UNUSED(char *text))
4845 + SMB_ACL_T sys_acl_init(UNUSED(int count))
4851 + int sys_acl_create_entry(UNUSED(SMB_ACL_T *pacl), UNUSED(SMB_ACL_ENTRY_T *pentry))
4857 + int sys_acl_set_tag_type(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_TAG_T tagtype))
4863 + int sys_acl_set_qualifier(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(void *qual))
4869 + int sys_acl_set_permset(UNUSED(SMB_ACL_ENTRY_T entry), UNUSED(SMB_ACL_PERMSET_T permset))
4875 + int sys_acl_valid(UNUSED(SMB_ACL_T theacl))
4881 + int sys_acl_set_file(UNUSED(const char *name), UNUSED(SMB_ACL_TYPE_T acltype), UNUSED(SMB_ACL_T theacl))
4887 + int sys_acl_set_fd(UNUSED(int fd), UNUSED(SMB_ACL_T theacl))
4893 + int sys_acl_delete_def_file(UNUSED(const char *name))
4899 + int sys_acl_free_acl(UNUSED(SMB_ACL_T the_acl))
4905 + int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
4911 +#endif /* No ACLs. */
4912 --- orig/uidlist.c 2004-04-29 19:37:25
4913 +++ uidlist.c 2004-07-03 20:11:58
4916 extern int preserve_uid;
4917 extern int preserve_gid;
4918 +extern int preserve_acls;
4919 extern int numeric_ids;
4922 @@ -274,7 +275,7 @@ void send_uid_list(int f)
4926 - if (preserve_uid) {
4927 + if (preserve_uid || preserve_acls) {
4929 /* we send sequences of uid/byte-length/name */
4930 for (list = uidlist; list; list = list->next) {
4931 @@ -291,7 +292,7 @@ void send_uid_list(int f)
4935 - if (preserve_gid) {
4936 + if (preserve_gid || preserve_acls) {
4938 for (list = gidlist; list; list = list->next) {
4940 @@ -312,7 +313,7 @@ void recv_uid_list(int f, struct file_li
4944 - if (preserve_uid && !numeric_ids) {
4945 + if ((preserve_uid || preserve_acls) && !numeric_ids) {
4946 /* read the uid list */
4947 while ((id = read_int(f)) != 0) {
4948 int len = read_byte(f);
4949 @@ -325,7 +326,7 @@ void recv_uid_list(int f, struct file_li
4953 - if (preserve_gid && !numeric_ids) {
4954 + if ((preserve_gid || preserve_acls) && !numeric_ids) {
4955 /* read the gid list */
4956 while ((id = read_int(f)) != 0) {
4957 int len = read_byte(f);
4958 @@ -337,6 +338,18 @@ void recv_uid_list(int f, struct file_li
4963 + if (preserve_acls && !numeric_ids) {
4965 + /* the enumerations don't return 0 except to flag the last
4966 + * entry, since uidlist doesn't munge 0 anyway */
4967 + while ((id = next_acl_uid(flist)))
4968 + acl_uid_map(match_uid(id));
4969 + while ((id = next_acl_gid(flist)))
4970 + acl_gid_map(match_gid(id));
4972 +#endif /* SUPPORT_ACLS */
4974 /* now convert the uid/gid of all files in the list to the mapped
4976 if (am_root && preserve_uid && !numeric_ids) {