summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-06-23 21:15:43 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-06-29 16:59:31 +1000
commitcc7c572b3d87d2bd16cd7ec939a2d8a81bf36ef9 (patch)
tree16b1331d3029c6f5039916597b068aa5012361da /source4/lib
parent48c8896f2ede1c441a1448c2e45106a317b64832 (diff)
downloadsamba-cc7c572b3d87d2bd16cd7ec939a2d8a81bf36ef9.tar.gz
samba-cc7c572b3d87d2bd16cd7ec939a2d8a81bf36ef9.tar.bz2
samba-cc7c572b3d87d2bd16cd7ec939a2d8a81bf36ef9.zip
s4:secrets Ensure secrets.ldb uses the same hooks as the rest of Samba
This ensures that, for example, the utf8 functions are the same, the GUID handler is the same and the NOSYNC flag is applied. Andrew Bartlett
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb-samba/ldb_wrap.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index d7503829b1..80256c9a94 100644
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -168,14 +168,18 @@ static int ldb_wrap_destructor(struct ldb_wrap *w)
"%s/ldb",
lp_modulesdir(lp_ctx)));
- if (ldb_set_opaque(ldb, "sessionInfo", session_info)) {
- talloc_free(ldb);
- return NULL;
+ if (session_info) {
+ if (ldb_set_opaque(ldb, "sessionInfo", session_info)) {
+ talloc_free(ldb);
+ return NULL;
+ }
}
- if (ldb_set_opaque(ldb, "credentials", credentials)) {
- talloc_free(ldb);
- return NULL;
+ if (credentials) {
+ if (ldb_set_opaque(ldb, "credentials", credentials)) {
+ talloc_free(ldb);
+ return NULL;
+ }
}
if (ldb_set_opaque(ldb, "loadparm", lp_ctx)) {