git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
95bf60b
)
s3: onefs_acl.c cleanup
author
Dan Sledz
<dsledz@isilon.com>
Tue, 24 Feb 2009 22:12:48 +0000
(14:12 -0800)
committer
Steven Danneman
<steven.danneman@isilon.com>
Tue, 24 Feb 2009 23:53:02 +0000
(15:53 -0800)
Remove some duplicate code.
Add a \n to a debugging statement
source3/modules/onefs_acl.c
patch
|
blob
|
history
diff --git
a/source3/modules/onefs_acl.c
b/source3/modules/onefs_acl.c
index b463722e61f47b7d7d707381313767d667b3a612..b8097b6455ed339c1532446f15d5388066a32104 100644
(file)
--- a/
source3/modules/onefs_acl.c
+++ b/
source3/modules/onefs_acl.c
@@
-273,9
+273,6
@@
onefs_samba_acl_to_acl(SEC_ACL *samba_acl, struct ifs_security_acl **acl,
if (aclu_initialize_acl(acl, aces, num_aces))
goto err_free;
- if (aclu_initialize_acl(acl, aces, num_aces))
- goto err_free;
-
/* Currently aclu_initialize_acl should copy the aces over, allowing
* us to immediately free */
free(aces);
@@
-905,7
+902,7
@@
onefs_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
SNUM(handle->conn));
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(3, ("SD initialization failure: %s", nt_errstr(status)));
+ DEBUG(3, ("SD initialization failure: %s
\n
", nt_errstr(status)));
goto out;
}