diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-01-10 12:53:07 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-01-10 13:23:38 +1100 |
| commit | a3e089db19384221c65996b158b7fa3aaf512792 (patch) | |
| tree | 2bf7355b70964227e2257215657a8ba4ed15f382 | |
| parent | d5091a1dd9cf669817355bb932249e5337e664b1 (diff) | |
| download | samba-a3e089db19384221c65996b158b7fa3aaf512792.tar.gz samba-a3e089db19384221c65996b158b7fa3aaf512792.tar.bz2 samba-a3e089db19384221c65996b158b7fa3aaf512792.zip | |
s4-ldb: display security descriptors with correct SDL for known SIDs
This makes it much easier to compare SDs
| -rw-r--r-- | source4/lib/ldb-samba/ldif_handlers.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c index 10a733382a..88888bf0a7 100644 --- a/source4/lib/ldb-samba/ldif_handlers.c +++ b/source4/lib/ldb-samba/ldif_handlers.c @@ -406,7 +406,7 @@ static int ldif_write_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ct talloc_free(sd); return -1; } - out->data = (uint8_t *)sddl_encode(mem_ctx, sd, NULL); + out->data = (uint8_t *)sddl_encode(mem_ctx, sd, samdb_domain_sid_cache_only(ldb)); talloc_free(sd); if (out->data == NULL) { return -1; diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 39a460763c..44ae23b26c 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -33,6 +33,7 @@ #include "auth/auth.h" #include "ldb_wrap.h" #include "param/param.h" +#include "dsdb/common/proto.h" #endif static struct ldb_cmdline options; /* needs to be static for older compilers */ @@ -321,6 +322,11 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, goto failed; } +#if (_SAMBA_BUILD_ >= 4) + /* get the domain SID into the cache for SDDL processing */ + samdb_domain_sid(ldb); +#endif + return ret; failed: |