Fix up a security issue with the way we handle domain groups retuned on the

info3.  These are RIDs, and it only makes sense to combine them with the domain
SID returned with them.  This is important for trusted domains, where that sid
might be other than the one we currently reterive from the secrets.tdb.

Also remove the become_root()/unbecome_root() wrapper from around both
remaining TDB users:  Both are now initialised at smbd startup.

Andrew Bartlett

1 files changed, 15 insertions, 9 deletions

diff --git a/source/libsmb/netlogon_unigrp.c b/source/libsmb/netlogon_unigrp.c
index 317a5bc3d0d..d4063242f65 100644
--- a/source/libsmb/netlogon_unigrp.c
+++ b/source/libsmb/netlogon_unigrp.c
@@ -37,18 +37,24 @@ static TDB_CONTEXT *netlogon_unigrp_tdb = NULL;
     array of uint32 where array[0] is number of elements
     and elements are array[1] ... array[array[0]]
 */
+
+BOOL uni_group_cache_init(void)
+{
+	if (!netlogon_unigrp_tdb) {
+		netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0,
+						   TDB_NOLOCK, O_RDWR | O_CREAT, 0644);
+	}
+
+	return (netlogon_unigrp_tdb != NULL);
+}
+
 void uni_group_cache_store_netlogon(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
 {
 	TDB_DATA key,data;
         fstring keystr;
         int i;
-	
-	if (!netlogon_unigrp_tdb) {
-		netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0,
-                				    TDB_NOLOCK, O_RDWR | O_CREAT, 0644);
-	}
 
-	if (!netlogon_unigrp_tdb) {
+	if (!uni_group_cache_init()) {
 		DEBUG(0,("uni_group_cache_store_netlogon: cannot open netlogon_unigrp.tdb for write!\n"));
 		return;
 	}
@@ -145,8 +151,8 @@ uint32* uni_group_cache_fetch(DOM_SID *domain, uint32 user_rid,
 /* Shutdown netlogon_unigrp database */
 void uni_group_cache_shutdown(void)
 {
-    if(netlogon_unigrp_tdb) {
-	tdb_close(netlogon_unigrp_tdb);
-    }
+	if(netlogon_unigrp_tdb) {
+		tdb_close(netlogon_unigrp_tdb);
+	}
 }