diff options
| author | Günther Deschner <gd@samba.org> | 2010-08-26 15:48:50 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-09-20 14:04:37 -0700 |
| commit | 4dbd743e467096624961533335afccadc67af0e6 (patch) | |
| tree | 221fd5ed097893d3e48f07c926d7ef9bd8313276 /source3/libsmb | |
| parent | 400616017974f057c8a2e817b62b90b1490d4129 (diff) | |
| download | samba-4dbd743e467096624961533335afccadc67af0e6.tar.gz samba-4dbd743e467096624961533335afccadc67af0e6.tar.bz2 samba-4dbd743e467096624961533335afccadc67af0e6.zip | |
s3-util_sid: use shared dom_sid_compare_auth and dom_sid_equal_X functions.
Guenther
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_xattr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index cc87715d8f..bc329bf226 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/source3/libsmb/libsmb_xattr.c @@ -27,6 +27,7 @@ #include "libsmb_internal.h" #include "../librpc/gen_ndr/ndr_lsa.h" #include "rpc_client/cli_lsarpc.h" +#include "../libcli/security/dom_sid.h" /* @@ -121,8 +122,8 @@ ace_compare(struct security_ace *ace1, return ace2->type - ace1->type; } - if (sid_compare(&ace1->trustee, &ace2->trustee)) { - return sid_compare(&ace1->trustee, &ace2->trustee); + if (dom_sid_compare(&ace1->trustee, &ace2->trustee)) { + return dom_sid_compare(&ace1->trustee, &ace2->trustee); } if (ace1->flags != ace2->flags) { @@ -1608,7 +1609,7 @@ cacl_set(SMBCCTX *context, bool found = False; for (j=0;old->dacl && j<old->dacl->num_aces;j++) { - if (sid_equal(&sd->dacl->aces[i].trustee, + if (dom_sid_equal(&sd->dacl->aces[i].trustee, &old->dacl->aces[j].trustee)) { if (!(flags & SMBC_XATTR_FLAG_CREATE)) { err = EEXIST; |