summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/passdb/machine_sid.c7
-rw-r--r--source3/passdb/secrets.c8
3 files changed, 16 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8543014e20..4ca7101298 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -209,7 +209,7 @@ LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o libads/sasl.o \
LIBADS_SERVER_OBJ = libads/util.o libads/kerberos_verify.o
-SECRETS_OBJ = passdb/secrets.o
+SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
libsmb/namequery.o libsmb/conncache.o
@@ -287,7 +287,7 @@ LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
- passdb/machine_sid.o passdb/util_sam_sid.o passdb/pdb_compat.o \
+ passdb/util_sam_sid.o passdb/pdb_compat.o \
passdb/privileges.o passdb/lookup_sid.o @PDB_STATIC@ passdb/pdb_sql.o
XML_OBJ = passdb/pdb_xml.o
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 4e7476781c..1fb3569f76 100644
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -198,3 +198,10 @@ DOM_SID *get_global_sam_sid(void)
return global_sam_sid;
}
+/**
+ * Force get_global_sam_sid to requery the backends
+ */
+void reset_global_sam_sid()
+{
+ SAFE_FREE(global_sam_sid);
+}
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 1b545488cd..308f95f395 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -99,10 +99,16 @@ BOOL secrets_delete(const char *key)
BOOL secrets_store_domain_sid(const char *domain, const DOM_SID *sid)
{
fstring key;
+ BOOL ret;
slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_SID, domain);
strupper_m(key);
- return secrets_store(key, sid, sizeof(DOM_SID));
+ ret = secrets_store(key, sid, sizeof(DOM_SID));
+
+ /* Force a re-query, in case we modified our domain */
+ if (ret)
+ reset_global_sam_sid();
+ return ret;
}
BOOL secrets_fetch_domain_sid(const char *domain, DOM_SID *sid)