diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-11 02:02:45 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-11 02:02:45 +0000 |
| commit | 91e97f90919fdc3bd2d26a5809cc3d037dbe4b22 (patch) | |
| tree | fc723edfc23724bb456747fbfbee13df1f6a52f0 /source3/lib/sysacls.c | |
| parent | b541683e44ebcfdf3259325d266a60eaaf19dc95 (diff) | |
| download | samba-91e97f90919fdc3bd2d26a5809cc3d037dbe4b22.tar.gz samba-91e97f90919fdc3bd2d26a5809cc3d037dbe4b22.tar.bz2 samba-91e97f90919fdc3bd2d26a5809cc3d037dbe4b22.zip | |
Changed the order of -kPIC and -kpic.
Added patch from Michael Davidson <md@sco.COM> for Solaris/Unixware ACLS.
Jeremy.
(This used to be commit 144a2906810e8d4414d627835eb80f60bd1d88a4)
Diffstat (limited to 'source3/lib/sysacls.c')
| -rw-r--r-- | source3/lib/sysacls.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index b0ba2075ab..778f467c12 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -302,18 +302,19 @@ SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type) while ((count = acl(path_p, GETACL, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) { + sys_acl_free_acl(acl_d); + if ((count = acl(path_p, GETACLCNT, 0, NULL)) < 0) { return NULL; } - sys_acl_free_acl(acl_d); - if ((acl_d = sys_acl_init(count)) == NULL) { return NULL; } } if (count < 0) { + sys_acl_free_acl(acl_d); return NULL; } @@ -365,18 +366,19 @@ SMB_ACL_T sys_acl_get_fd(int fd) while ((count = facl(fd, GETACL, count, &acl_d->acl[0])) < 0 && errno == ENOSPC) { + sys_acl_free_acl(acl_d); + if ((count = facl(fd, GETACLCNT, 0, NULL)) < 0) { return NULL; } - sys_acl_free_acl(acl_d); - if ((acl_d = sys_acl_init(count)) == NULL) { return NULL; } } if (count < 0) { + sys_acl_free_acl(acl_d); return NULL; } |