From 93bcb9963bef53b91a0b16c6389cefdb7bea2b0e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 21 Jun 2003 04:05:01 +0000
Subject: merge of the netsamlogon caching code from APPLIANCE_HEAD This
 replaces the universal group caching code (was originally based on that
 code).  Only applies to the the RPC code.

One comment: domain local groups don't show up in 'getent group'
that's easy to fix.

Code has been tested against 2k domain but doesn't change anything
with respect to NT4 domains.

netsamlogon caching works pretty much like the universal group
caching code did but has had much more testing and puts winbind
mostly back in sync between branches.
(This used to be commit aac01dc7bc95c20ee21c93f3581e2375d9a894e1)
---
 source3/libsmb/samlogon_cache.c | 238 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100644 source3/libsmb/samlogon_cache.c

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
new file mode 100644
index 0000000000..7863ad7727
--- /dev/null
+++ b/source3/libsmb/samlogon_cache.c
@@ -0,0 +1,238 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Net_sam_logon info3 helpers
+   Copyright (C) Alexander Bokovoy              2002.
+   Copyright (C) Andrew Bartlett                2002.
+   Copyright (C) Gerald Carter			2003.
+   Copyright (C) Tim Potter			2003.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+#define NETSAMLOGON_TDB	"netsamlogon_cache.tdb"
+
+static TDB_CONTEXT *netsamlogon_tdb = NULL;
+
+/***********************************************************************
+ open the tdb
+ ***********************************************************************/
+ 
+BOOL netsamlogon_cache_init(void)
+{
+	if (!netsamlogon_tdb) {
+		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
+						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
+	}
+
+	return (netsamlogon_tdb != NULL);
+}
+
+
+/***********************************************************************
+ Shutdown samlogon_cache database
+***********************************************************************/
+
+BOOL netsamlogon_cache_shutdown(void)
+{
+	if(netsamlogon_tdb)
+		return (tdb_close(netsamlogon_tdb) == 0);
+		
+	return True;
+}
+
+/***********************************************************************
+ Clear cache getpwnam and getgroups entries from the winbindd cache
+***********************************************************************/
+void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
+{
+	fstring domain;
+	TDB_DATA key;
+	BOOL got_tdb = False;
+
+	/* We may need to call this function from smbd which will not have
+           winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
+
+	if (!tdb) {
+		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
+				   TDB_DEFAULT, O_RDWR, 0600);
+		if (!tdb) {
+			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
+			return;
+		}
+		got_tdb = True;
+	}
+
+	unistr2_to_ascii(domain, &user->uni_logon_dom, sizeof(domain) - 1);
+
+	/* Clear U/DOMAIN/RID cache entry */
+
+	asprintf(&key.dptr, "U/%s/%d", domain, user->user_rid);
+	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
+
+	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
+
+	tdb_delete(tdb, key);
+
+	SAFE_FREE(key.dptr);
+
+	/* Clear UG/DOMAIN/RID cache entry */
+
+	asprintf(&key.dptr, "UG/%s/%d", domain, user->user_rid);
+	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
+
+	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
+
+	tdb_delete(tdb, key);
+
+	SAFE_FREE(key.dptr);
+
+	if (got_tdb)
+		tdb_close(tdb);
+}
+
+/***********************************************************************
+ Store a NET_USER_INFO_3 structure in a tdb for later user 
+***********************************************************************/
+
+BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
+{
+	TDB_DATA 	data;
+        fstring 	keystr;
+	prs_struct 	ps;
+	BOOL 		result = False;
+	DOM_SID		user_sid;
+	time_t		t = time(NULL);
+	
+
+	if (!netsamlogon_cache_init()) {
+		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
+		return False;
+	}
+
+	sid_copy( &user_sid, &user->dom_sid.sid );
+	sid_append_rid( &user_sid, user->user_rid );
+
+	/* Prepare key as DOMAIN-SID/USER-RID string */
+	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
+
+	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
+		
+	/* Prepare data */
+	
+	prs_init( &ps,MAX_PDU_FRAG_LEN , mem_ctx, MARSHALL);
+	
+	if ( !prs_uint32( "timestamp", &ps, 0, (uint32*)&t ) )
+		return False;
+	
+	if ( net_io_user_info3("", user, &ps, 0, 3) ) 
+	{
+		data.dsize = prs_offset( &ps );
+		data.dptr = prs_data_p( &ps );
+
+		if (tdb_store_by_string(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
+			result = True;
+		
+		prs_mem_free( &ps );
+	}
+		
+	return result;
+}
+
+/***********************************************************************
+ Retrieves a NET_USER_INFO_3 structure from a tdb.  Caller must 
+ free the user_info struct (malloc()'d memory)
+***********************************************************************/
+
+NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
+{
+	NET_USER_INFO_3	*user = NULL;
+	TDB_DATA 	data, key;
+	prs_struct	ps;
+        fstring 	keystr;
+	uint32		t;
+	
+	if (!netsamlogon_cache_init()) {
+		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
+		return False;
+	}
+
+	/* Prepare key as DOMAIN-SID/USER-RID string */
+	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(user_sid));
+	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
+	key.dptr = keystr;
+	key.dsize = strlen(keystr)+1;
+	data = tdb_fetch( netsamlogon_tdb, key );
+	
+	if ( data.dptr ) {
+		
+		if ( (user = (NET_USER_INFO_3*)malloc(sizeof(NET_USER_INFO_3))) == NULL )
+			return NULL;
+			
+		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
+		prs_give_memory( &ps, data.dptr, data.dsize, True );
+		
+		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
+			prs_mem_free( &ps );
+			return False;
+		}
+		
+		if ( !net_io_user_info3("", user, &ps, 0, 3) ) {
+			SAFE_FREE( user );
+		}
+			
+		prs_mem_free( &ps );
+
+#if 0	/* The netsamlogon cache needs to hang around.  Something about 
+	   this feels wrong, but it is the only way we can get all of the
+	   groups.  The old universal groups cache didn't expire either.
+	   --jerry */
+	{
+		time_t		now = time(NULL);
+		uint32		time_diff;
+	   
+		/* is the entry expired? */
+		time_diff = now - t;
+		
+		if ( (time_diff < 0 ) || (time_diff > lp_winbind_cache_time()) ) {
+			DEBUG(10,("netsamlogon_cache_get: cache entry expired \n"));
+			tdb_delete( netsamlogon_tdb, key );
+			SAFE_FREE( user );
+		}
+#endif
+	}
+	
+	return user;
+}
+
+BOOL netsamlogon_cache_have(DOM_SID *user_sid)
+{
+	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
+	NET_USER_INFO_3 *user = NULL;
+	BOOL result;
+
+	if (!mem_ctx)
+		return False;
+
+	user = netsamlogon_cache_get(mem_ctx, user_sid);
+
+	result = (user != NULL);
+
+	talloc_destroy(mem_ctx);
+	SAFE_FREE(user);
+
+	return result;
+}
-- 
cgit 


From c674e411c7e7a5d56ef455dab5ecbea2eaa4883e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 10 Jul 2003 20:37:01 +0000
Subject: i guess i'm the only one this ever annyoed...

fix the confusion when we tdb_lock_bystring() but
we retrieve an entry using tdb_fetch_by_string.
It's now always tdb.*bystring()
(This used to be commit 66359531b89368939f0e8f584a45844b5f2f99e7)
---
 source3/libsmb/samlogon_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 7863ad7727..72c10007bf 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -143,7 +143,7 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
 		data.dsize = prs_offset( &ps );
 		data.dptr = prs_data_p( &ps );
 
-		if (tdb_store_by_string(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
+		if (tdb_store_bystring(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
 			result = True;
 		
 		prs_mem_free( &ps );
-- 
cgit 


From 97b200d422ce7e4acc9a6a9e786c4d44b3c6dfc3 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 30 Mar 2004 08:03:32 +0000
Subject: Apply some const (This used to be commit
 8037750df568e6b51b2b0cba9192468110470388)

---
 source3/libsmb/samlogon_cache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 72c10007bf..4cd642c4e3 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -157,7 +157,7 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
  free the user_info struct (malloc()'d memory)
 ***********************************************************************/
 
-NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
+NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
 {
 	NET_USER_INFO_3	*user = NULL;
 	TDB_DATA 	data, key;
@@ -218,7 +218,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, DOM_SID *user_sid)
 	return user;
 }
 
-BOOL netsamlogon_cache_have(DOM_SID *user_sid)
+BOOL netsamlogon_cache_have(const DOM_SID *user_sid)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
 	NET_USER_INFO_3 *user = NULL;
-- 
cgit 


From ed5fd7117e931b2fce2c2a94adc53eeb3d8a8256 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 27 Aug 2004 13:39:09 +0000
Subject: r2086: fix bug with winbindd_getpwnam() caused by Microsoft DC's not
 filling in the username in the user_info3 (This used to be commit
 4703a71fa88dff8bdc932f6c9af3a9d25a88938f)

---
 source3/libsmb/samlogon_cache.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 4cd642c4e3..0105bc08c3 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -106,9 +106,10 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 
 /***********************************************************************
  Store a NET_USER_INFO_3 structure in a tdb for later user 
+ username should be in UTF-8 format
 ***********************************************************************/
 
-BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
+BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user)
 {
 	TDB_DATA 	data;
         fstring 	keystr;
@@ -130,6 +131,14 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
 	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
 
 	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
+	
+	/* only Samba fills in the username, not sure why NT doesn't */
+	/* so we fill it in since winbindd_getpwnam() makes use of it */
+	
+	if ( !user->uni_user_name.buffer ) {
+		init_unistr2( &user->uni_user_name, username, STR_TERMINATE );
+		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
+	}
 		
 	/* Prepare data */
 	
-- 
cgit 


From b9fcb5b961fc4165899487c7cb368ab2d8d15e8a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 29 Nov 2004 19:28:12 +0000
Subject: r4005: Fix for bug #2071 reported by Jason Mader
 <jason@ncac.gwu.edu>. Use correct enum type for comparisons. Jeremy. (This
 used to be commit b926480d053e42205e959b9808a6e3bb90db9ce5)

---
 source3/libsmb/samlogon_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 0105bc08c3..ed2283725c 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -136,7 +136,7 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USE
 	/* so we fill it in since winbindd_getpwnam() makes use of it */
 	
 	if ( !user->uni_user_name.buffer ) {
-		init_unistr2( &user->uni_user_name, username, STR_TERMINATE );
+		init_unistr2( &user->uni_user_name, username, UNI_STR_TERMINATE );
 		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
 	}
 		
-- 
cgit 


From acf9d61421faa6c0055d57fdee7db300dc5431aa Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 7 Dec 2004 18:25:53 +0000
Subject: r4088: Get medieval on our ass about malloc.... :-). Take control of
 all our allocation functions so we can funnel through some well known
 functions. Should help greatly with malloc checking. HEAD patch to follow.
 Jeremy. (This used to be commit 620f2e608f70ba92f032720c031283d295c5c06a)

---
 source3/libsmb/samlogon_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index ed2283725c..fdfc92a750 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -188,7 +188,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	
 	if ( data.dptr ) {
 		
-		if ( (user = (NET_USER_INFO_3*)malloc(sizeof(NET_USER_INFO_3))) == NULL )
+		if ( (user = SMB_MALLOC_P(NET_USER_INFO_3)) == NULL )
 			return NULL;
 			
 		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
-- 
cgit 


From dab71bed4e61b816b112433fc44e5f7259e4d2ab Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Aug 2005 16:19:07 +0000
Subject: r9588: remove netsamlogon_cache interface...everything seems to work
 fine.  Will deal with any fallout from special environments using a non-cache
 solution (This used to be commit e1de6f238f3981d81e49fb41919fdce4f07c8280)

---
 source3/libsmb/samlogon_cache.c | 247 ----------------------------------------
 1 file changed, 247 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index fdfc92a750..e69de29bb2 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -1,247 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Net_sam_logon info3 helpers
-   Copyright (C) Alexander Bokovoy              2002.
-   Copyright (C) Andrew Bartlett                2002.
-   Copyright (C) Gerald Carter			2003.
-   Copyright (C) Tim Potter			2003.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-#define NETSAMLOGON_TDB	"netsamlogon_cache.tdb"
-
-static TDB_CONTEXT *netsamlogon_tdb = NULL;
-
-/***********************************************************************
- open the tdb
- ***********************************************************************/
- 
-BOOL netsamlogon_cache_init(void)
-{
-	if (!netsamlogon_tdb) {
-		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
-						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
-	}
-
-	return (netsamlogon_tdb != NULL);
-}
-
-
-/***********************************************************************
- Shutdown samlogon_cache database
-***********************************************************************/
-
-BOOL netsamlogon_cache_shutdown(void)
-{
-	if(netsamlogon_tdb)
-		return (tdb_close(netsamlogon_tdb) == 0);
-		
-	return True;
-}
-
-/***********************************************************************
- Clear cache getpwnam and getgroups entries from the winbindd cache
-***********************************************************************/
-void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
-{
-	fstring domain;
-	TDB_DATA key;
-	BOOL got_tdb = False;
-
-	/* We may need to call this function from smbd which will not have
-           winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
-
-	if (!tdb) {
-		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
-				   TDB_DEFAULT, O_RDWR, 0600);
-		if (!tdb) {
-			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-			return;
-		}
-		got_tdb = True;
-	}
-
-	unistr2_to_ascii(domain, &user->uni_logon_dom, sizeof(domain) - 1);
-
-	/* Clear U/DOMAIN/RID cache entry */
-
-	asprintf(&key.dptr, "U/%s/%d", domain, user->user_rid);
-	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
-
-	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
-
-	tdb_delete(tdb, key);
-
-	SAFE_FREE(key.dptr);
-
-	/* Clear UG/DOMAIN/RID cache entry */
-
-	asprintf(&key.dptr, "UG/%s/%d", domain, user->user_rid);
-	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
-
-	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
-
-	tdb_delete(tdb, key);
-
-	SAFE_FREE(key.dptr);
-
-	if (got_tdb)
-		tdb_close(tdb);
-}
-
-/***********************************************************************
- Store a NET_USER_INFO_3 structure in a tdb for later user 
- username should be in UTF-8 format
-***********************************************************************/
-
-BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user)
-{
-	TDB_DATA 	data;
-        fstring 	keystr;
-	prs_struct 	ps;
-	BOOL 		result = False;
-	DOM_SID		user_sid;
-	time_t		t = time(NULL);
-	
-
-	if (!netsamlogon_cache_init()) {
-		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
-		return False;
-	}
-
-	sid_copy( &user_sid, &user->dom_sid.sid );
-	sid_append_rid( &user_sid, user->user_rid );
-
-	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
-
-	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
-	
-	/* only Samba fills in the username, not sure why NT doesn't */
-	/* so we fill it in since winbindd_getpwnam() makes use of it */
-	
-	if ( !user->uni_user_name.buffer ) {
-		init_unistr2( &user->uni_user_name, username, UNI_STR_TERMINATE );
-		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
-	}
-		
-	/* Prepare data */
-	
-	prs_init( &ps,MAX_PDU_FRAG_LEN , mem_ctx, MARSHALL);
-	
-	if ( !prs_uint32( "timestamp", &ps, 0, (uint32*)&t ) )
-		return False;
-	
-	if ( net_io_user_info3("", user, &ps, 0, 3) ) 
-	{
-		data.dsize = prs_offset( &ps );
-		data.dptr = prs_data_p( &ps );
-
-		if (tdb_store_bystring(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
-			result = True;
-		
-		prs_mem_free( &ps );
-	}
-		
-	return result;
-}
-
-/***********************************************************************
- Retrieves a NET_USER_INFO_3 structure from a tdb.  Caller must 
- free the user_info struct (malloc()'d memory)
-***********************************************************************/
-
-NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
-{
-	NET_USER_INFO_3	*user = NULL;
-	TDB_DATA 	data, key;
-	prs_struct	ps;
-        fstring 	keystr;
-	uint32		t;
-	
-	if (!netsamlogon_cache_init()) {
-		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
-		return False;
-	}
-
-	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(user_sid));
-	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
-	key.dptr = keystr;
-	key.dsize = strlen(keystr)+1;
-	data = tdb_fetch( netsamlogon_tdb, key );
-	
-	if ( data.dptr ) {
-		
-		if ( (user = SMB_MALLOC_P(NET_USER_INFO_3)) == NULL )
-			return NULL;
-			
-		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
-		prs_give_memory( &ps, data.dptr, data.dsize, True );
-		
-		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
-			prs_mem_free( &ps );
-			return False;
-		}
-		
-		if ( !net_io_user_info3("", user, &ps, 0, 3) ) {
-			SAFE_FREE( user );
-		}
-			
-		prs_mem_free( &ps );
-
-#if 0	/* The netsamlogon cache needs to hang around.  Something about 
-	   this feels wrong, but it is the only way we can get all of the
-	   groups.  The old universal groups cache didn't expire either.
-	   --jerry */
-	{
-		time_t		now = time(NULL);
-		uint32		time_diff;
-	   
-		/* is the entry expired? */
-		time_diff = now - t;
-		
-		if ( (time_diff < 0 ) || (time_diff > lp_winbind_cache_time()) ) {
-			DEBUG(10,("netsamlogon_cache_get: cache entry expired \n"));
-			tdb_delete( netsamlogon_tdb, key );
-			SAFE_FREE( user );
-		}
-#endif
-	}
-	
-	return user;
-}
-
-BOOL netsamlogon_cache_have(const DOM_SID *user_sid)
-{
-	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
-	NET_USER_INFO_3 *user = NULL;
-	BOOL result;
-
-	if (!mem_ctx)
-		return False;
-
-	user = netsamlogon_cache_get(mem_ctx, user_sid);
-
-	result = (user != NULL);
-
-	talloc_destroy(mem_ctx);
-	SAFE_FREE(user);
-
-	return result;
-}
-- 
cgit 


From f02a98d9b67f91fcce8e38717b59a634c2406904 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Aug 2005 16:50:18 +0000
Subject: r9590: forget to remove this from the 3.0 tree (This used to be
 commit 74f8718438c73170d394c61eb91da9d8388f84d0)

---
 source3/libsmb/samlogon_cache.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 source3/libsmb/samlogon_cache.c

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit 


From ce0a1fa159baab4c4bdaac601d0f56e29a406945 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 10 Nov 2005 20:28:23 +0000
Subject: r11652: Reinstate the netsamlogon_cache in order to work around
 failed query_user calls.  This fixes logons to a member of a Samba domain as
 a user from a trusted AD domain.

As per comments on samba-technical, I still need to add

(a) cache the PAC info as werll as NTLM net_user_info_3
(b) expire the cache when the SMB session goes away

Both Jeremy and Guenther have signed off on the idea.
(This used to be commit 0c2bb5ba7b92d9210e7fa9f7b70aa67dfe9faaf4)
---
 source3/libsmb/samlogon_cache.c | 247 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 247 insertions(+)
 create mode 100644 source3/libsmb/samlogon_cache.c

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
new file mode 100644
index 0000000000..ceb7b7c35a
--- /dev/null
+++ b/source3/libsmb/samlogon_cache.c
@@ -0,0 +1,247 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Net_sam_logon info3 helpers
+   Copyright (C) Alexander Bokovoy              2002.
+   Copyright (C) Andrew Bartlett                2002.
+   Copyright (C) Gerald Carter			2003.
+   Copyright (C) Tim Potter			2003.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+#define NETSAMLOGON_TDB	"netsamlogon_cache.tdb"
+
+static TDB_CONTEXT *netsamlogon_tdb = NULL;
+
+/***********************************************************************
+ open the tdb
+ ***********************************************************************/
+ 
+BOOL netsamlogon_cache_init(void)
+{
+	if (!netsamlogon_tdb) {
+		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
+						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
+	}
+
+	return (netsamlogon_tdb != NULL);
+}
+
+
+/***********************************************************************
+ Shutdown samlogon_cache database
+***********************************************************************/
+
+BOOL netsamlogon_cache_shutdown(void)
+{
+	if(netsamlogon_tdb)
+		return (tdb_close(netsamlogon_tdb) == 0);
+		
+	return True;
+}
+
+/***********************************************************************
+ Clear cache getpwnam and getgroups entries from the winbindd cache
+***********************************************************************/
+void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
+{
+	fstring domain;
+	TDB_DATA key;
+	BOOL got_tdb = False;
+
+	/* We may need to call this function from smbd which will not have
+           winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
+
+	if (!tdb) {
+		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
+				   TDB_DEFAULT, O_RDWR, 0600);
+		if (!tdb) {
+			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
+			return;
+		}
+		got_tdb = True;
+	}
+
+	unistr2_to_ascii(domain, &user->uni_logon_dom, sizeof(domain) - 1);
+
+	/* Clear U/DOMAIN/RID cache entry */
+
+	asprintf(&key.dptr, "U/%s/%d", domain, user->user_rid);
+	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
+
+	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
+
+	tdb_delete(tdb, key);
+
+	SAFE_FREE(key.dptr);
+
+	/* Clear UG/DOMAIN/RID cache entry */
+
+	asprintf(&key.dptr, "UG/%s/%d", domain, user->user_rid);
+	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
+
+	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
+
+	tdb_delete(tdb, key);
+
+	SAFE_FREE(key.dptr);
+
+	if (got_tdb)
+		tdb_close(tdb);
+}
+
+/***********************************************************************
+ Store a NET_USER_INFO_3 structure in a tdb for later user 
+ username should be in UTF-8 format
+***********************************************************************/
+
+BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user)
+{
+	TDB_DATA 	data;
+        fstring 	keystr;
+	prs_struct 	ps;
+	BOOL 		result = False;
+	DOM_SID		user_sid;
+	time_t		t = time(NULL);
+	
+
+	if (!netsamlogon_cache_init()) {
+		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
+		return False;
+	}
+
+	sid_copy( &user_sid, &user->dom_sid.sid );
+	sid_append_rid( &user_sid, user->user_rid );
+
+	/* Prepare key as DOMAIN-SID/USER-RID string */
+	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
+
+	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
+	
+	/* only Samba fills in the username, not sure why NT doesn't */
+	/* so we fill it in since winbindd_getpwnam() makes use of it */
+	
+	if ( !user->uni_user_name.buffer ) {
+		init_unistr2( &user->uni_user_name, username, UNI_STR_TERMINATE );
+		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
+	}
+		
+	/* Prepare data */
+	
+	prs_init( &ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+	
+	if ( !prs_uint32( "timestamp", &ps, 0, (uint32*)&t ) )
+		return False;
+	
+	if ( net_io_user_info3("", user, &ps, 0, 3, 0) ) 
+	{
+		data.dsize = prs_offset( &ps );
+		data.dptr = prs_data_p( &ps );
+
+		if (tdb_store_bystring(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
+			result = True;
+		
+		prs_mem_free( &ps );
+	}
+		
+	return result;
+}
+
+/***********************************************************************
+ Retrieves a NET_USER_INFO_3 structure from a tdb.  Caller must 
+ free the user_info struct (malloc()'d memory)
+***********************************************************************/
+
+NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
+{
+	NET_USER_INFO_3	*user = NULL;
+	TDB_DATA 	data, key;
+	prs_struct	ps;
+        fstring 	keystr;
+	uint32		t;
+	
+	if (!netsamlogon_cache_init()) {
+		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
+		return False;
+	}
+
+	/* Prepare key as DOMAIN-SID/USER-RID string */
+	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(user_sid));
+	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
+	key.dptr = keystr;
+	key.dsize = strlen(keystr)+1;
+	data = tdb_fetch( netsamlogon_tdb, key );
+	
+	if ( data.dptr ) {
+		
+		if ( (user = SMB_MALLOC_P(NET_USER_INFO_3)) == NULL )
+			return NULL;
+			
+		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
+		prs_give_memory( &ps, data.dptr, data.dsize, True );
+		
+		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
+			prs_mem_free( &ps );
+			return False;
+		}
+		
+		if ( !net_io_user_info3("", user, &ps, 0, 3, 0) ) {
+			SAFE_FREE( user );
+		}
+			
+		prs_mem_free( &ps );
+
+#if 0	/* The netsamlogon cache needs to hang around.  Something about 
+	   this feels wrong, but it is the only way we can get all of the
+	   groups.  The old universal groups cache didn't expire either.
+	   --jerry */
+	{
+		time_t		now = time(NULL);
+		uint32		time_diff;
+	   
+		/* is the entry expired? */
+		time_diff = now - t;
+		
+		if ( (time_diff < 0 ) || (time_diff > lp_winbind_cache_time()) ) {
+			DEBUG(10,("netsamlogon_cache_get: cache entry expired \n"));
+			tdb_delete( netsamlogon_tdb, key );
+			SAFE_FREE( user );
+		}
+#endif
+	}
+	
+	return user;
+}
+
+BOOL netsamlogon_cache_have(const DOM_SID *user_sid)
+{
+	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
+	NET_USER_INFO_3 *user = NULL;
+	BOOL result;
+
+	if (!mem_ctx)
+		return False;
+
+	user = netsamlogon_cache_get(mem_ctx, user_sid);
+
+	result = (user != NULL);
+
+	talloc_destroy(mem_ctx);
+	SAFE_FREE(user);
+
+	return result;
+}
-- 
cgit 


From a4d729bdfadfc39fece612fcdd68955c3e3845bb Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 11 Nov 2005 03:03:41 +0000
Subject: r11661: Store the INFO3 in the PAC data into the netsamlogon_cache.
 Also remove the mem_ctx from the netsamlogon_cache_store() API.

Guenther, what should we be doing with the other fields in
the PAC_LOGON_INFO?
(This used to be commit 8bead2d2825015fe41ba7d7401a12c06c29ea7f7)
---
 source3/libsmb/samlogon_cache.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index ceb7b7c35a..d0469a1a48 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -109,7 +109,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
  username should be in UTF-8 format
 ***********************************************************************/
 
-BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user)
+BOOL netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 {
 	TDB_DATA 	data;
         fstring 	keystr;
@@ -117,6 +117,7 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USE
 	BOOL 		result = False;
 	DOM_SID		user_sid;
 	time_t		t = time(NULL);
+	TALLOC_CTX 	*mem_ctx;
 	
 
 	if (!netsamlogon_cache_init()) {
@@ -142,6 +143,11 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USE
 		
 	/* Prepare data */
 	
+	if ( !(mem_ctx = TALLOC_P( NULL, int )) ) {
+		DEBUG(0,("netsamlogon_cache_store: talloc() failed!\n"));
+		return False;
+	}
+
 	prs_init( &ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 	
 	if ( !prs_uint32( "timestamp", &ps, 0, (uint32*)&t ) )
@@ -157,6 +163,8 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USE
 		
 		prs_mem_free( &ps );
 	}
+
+	TALLOC_FREE( mem_ctx );
 		
 	return result;
 }
@@ -175,7 +183,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	uint32		t;
 	
 	if (!netsamlogon_cache_init()) {
-		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
+		DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n", NETSAMLOGON_TDB));
 		return False;
 	}
 
-- 
cgit 


From d1f91f7c723733113b4e9792042101c80dfc064c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 3 Dec 2005 06:46:46 +0000
Subject: r12043: It's amazing the warnings you find when compiling on a 64-bit
 box with gcc4 and -O6... Fix a bunch of C99 dereferencing type-punned pointer
 will break strict-aliasing rules errors. Also added prs_int32 (not uint32...)
 as it's needed in one place. Find places where prs_uint32 was being used to
 marshall/unmarshall a time_t (a big no no on 64-bits). More warning fixes to
 come. Thanks to Volker for nudging me to compile like this. Jeremy. (This
 used to be commit c65b752604f8f58abc4e7ae8514dc2c7f086271c)

---
 source3/libsmb/samlogon_cache.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index d0469a1a48..ef60055cf4 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -150,8 +150,12 @@ BOOL netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 
 	prs_init( &ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 	
-	if ( !prs_uint32( "timestamp", &ps, 0, (uint32*)&t ) )
-		return False;
+	{
+		uint32 ts;
+		if ( !prs_uint32( "timestamp", &ps, 0, &ts ) )
+			return False;
+		t = (time_t)ts;
+	}
 	
 	if ( net_io_user_info3("", user, &ps, 0, 3, 0) ) 
 	{
-- 
cgit 


From eae063e965a9ca81c887c2f80c85d85183d16a59 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 7 Mar 2006 21:03:48 +0000
Subject: r13991: Fix Coverity bug # 69 (This used to be commit
 6dc79e6b12e221e9af85a1edf487b5fb5aae222b)

---
 source3/libsmb/samlogon_cache.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index ef60055cf4..cc1c6bd6b2 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -208,6 +208,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 		
 		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
 			prs_mem_free( &ps );
+			SAFE_FREE(user);
 			return False;
 		}
 		
-- 
cgit 


From a1d47f3e999d2a13d77217239c12735a3ef74e29 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 25 Apr 2006 08:03:34 +0000
Subject: r15227: Fix a valgrind error. We are marshalling here, not
 unmarshalling.

Jeremy, can you check this? This was part of your -O6 on 64bit sweep.

Volker
(This used to be commit 4fa5dbcc8dd1f150664e1241b22e3f048d816001)
---
 source3/libsmb/samlogon_cache.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index cc1c6bd6b2..7a6d9a96ad 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -151,10 +151,9 @@ BOOL netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 	prs_init( &ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
 	
 	{
-		uint32 ts;
+		uint32 ts = (uint32)t;
 		if ( !prs_uint32( "timestamp", &ps, 0, &ts ) )
 			return False;
-		t = (time_t)ts;
 	}
 	
 	if ( net_io_user_info3("", user, &ps, 0, 3, 0) ) 
-- 
cgit 


From 257c5c095b60e10323692cd9595a616499a12ed8 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 17 Oct 2006 12:06:17 +0000
Subject: r19368: Use WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE whereever the
 winbindd tdb is opened.

Guenther
(This used to be commit 49e9e1a3e7f6ac1a9cf584c88f3c640ca9d15554)
---
 source3/libsmb/samlogon_cache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 7a6d9a96ad..b242d0ef55 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -67,7 +67,8 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
            winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
 
 	if (!tdb) {
-		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
+		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 
+				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
 				   TDB_DEFAULT, O_RDWR, 0600);
 		if (!tdb) {
 			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-- 
cgit 


From 1c98e62118df05dd87ee71711b20280faeed9053 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 27 Mar 2007 09:30:40 +0000
Subject: r21975: if we use the _bystring() version when storing, we should use
 it on fetch too...

metze
(This used to be commit d105723f063d617ef9f8394e7921749b21f1d755)
---
 source3/libsmb/samlogon_cache.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index b242d0ef55..270ad27deb 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -181,7 +181,7 @@ BOOL netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
 {
 	NET_USER_INFO_3	*user = NULL;
-	TDB_DATA 	data, key;
+	TDB_DATA 	data;
 	prs_struct	ps;
         fstring 	keystr;
 	uint32		t;
@@ -194,9 +194,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	/* Prepare key as DOMAIN-SID/USER-RID string */
 	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(user_sid));
 	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
-	key.dptr = keystr;
-	key.dsize = strlen(keystr)+1;
-	data = tdb_fetch( netsamlogon_tdb, key );
+	data = tdb_fetch_bystring( netsamlogon_tdb, keystr );
 	
 	if ( data.dptr ) {
 		
-- 
cgit 


From cece5a62ae564a8f7f4eeb0e2376e04ff041bdd9 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 28 Mar 2007 10:00:42 +0000
Subject: r21998: Fix tdb keynames in netsamlogon_clear_cached_user().

No point in deleting U/DOMAIN/RID and UG/DOMAIN/RID keys if we only store U/SID
and UG/SID keys :-)

Next we need to verify the need of calling netsamlogon_clear_cached_user() at all.

Guenther
(This used to be commit 78d13f14672b65c2d4798ce94322e945334eea62)
---
 source3/libsmb/samlogon_cache.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 270ad27deb..e82ee8dbb8 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -59,9 +59,10 @@ BOOL netsamlogon_cache_shutdown(void)
 ***********************************************************************/
 void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 {
-	fstring domain;
 	TDB_DATA key;
 	BOOL got_tdb = False;
+	DOM_SID sid;
+	fstring key_str, sid_string;
 
 	/* We may need to call this function from smbd which will not have
            winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
@@ -77,29 +78,24 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 		got_tdb = True;
 	}
 
-	unistr2_to_ascii(domain, &user->uni_logon_dom, sizeof(domain) - 1);
+	sid_copy(&sid, &user->dom_sid.sid);
+	sid_append_rid(&sid, user->user_rid);
 
-	/* Clear U/DOMAIN/RID cache entry */
+	/* Clear U/SID cache entry */
 
-	asprintf(&key.dptr, "U/%s/%d", domain, user->user_rid);
-	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
+	fstr_sprintf(key_str, "U/%s", sid_to_string(sid_string, &sid));
 
-	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
-
-	tdb_delete(tdb, key);
+	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
 
-	SAFE_FREE(key.dptr);
+	tdb_delete(tdb, string_tdb_data(key_str));
 
-	/* Clear UG/DOMAIN/RID cache entry */
+	/* Clear UG/SID cache entry */
 
-	asprintf(&key.dptr, "UG/%s/%d", domain, user->user_rid);
-	key.dsize = strlen(key.dptr) - 1; /* keys are not NULL terminated */
+	fstr_sprintf(key_str, "UG/%s", sid_to_string(sid_string, &sid));
 
 	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
 
-	tdb_delete(tdb, key);
-
-	SAFE_FREE(key.dptr);
+	tdb_delete(tdb, string_tdb_data(key_str));
 
 	if (got_tdb)
 		tdb_close(tdb);
-- 
cgit 


From bc2b6436d0f5f3e9ffdfaeb7f1b32996a83d5478 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 29 Mar 2007 09:35:51 +0000
Subject: r22009: change TDB_DATA from char * to unsigned char *

and fix all compiler warnings in the users

metze
(This used to be commit 3a28443079c141a6ce8182c65b56ca210e34f37f)
---
 source3/libsmb/samlogon_cache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index e82ee8dbb8..61dddb62fd 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -156,7 +156,7 @@ BOOL netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 	if ( net_io_user_info3("", user, &ps, 0, 3, 0) ) 
 	{
 		data.dsize = prs_offset( &ps );
-		data.dptr = prs_data_p( &ps );
+		data.dptr = (uint8 *)prs_data_p( &ps );
 
 		if (tdb_store_bystring(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
 			result = True;
@@ -198,7 +198,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 			return NULL;
 			
 		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
-		prs_give_memory( &ps, data.dptr, data.dsize, True );
+		prs_give_memory( &ps, (char *)data.dptr, data.dsize, True );
 		
 		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
 			prs_mem_free( &ps );
-- 
cgit 


From bcab9254cc65e72dcb885aac8faec095143587e9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Thu, 5 Apr 2007 11:13:25 +0000
Subject: r22091: Fix an uninitialized variable warning (This used to be commit
 a6e1e39f1dcd9ebcb5db199fd152a861b9be929b)

---
 source3/libsmb/samlogon_cache.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 61dddb62fd..3edbbaa2c1 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -59,7 +59,6 @@ BOOL netsamlogon_cache_shutdown(void)
 ***********************************************************************/
 void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 {
-	TDB_DATA key;
 	BOOL got_tdb = False;
 	DOM_SID sid;
 	fstring key_str, sid_string;
@@ -93,7 +92,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 
 	fstr_sprintf(key_str, "UG/%s", sid_to_string(sid_string, &sid));
 
-	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key.dptr));
+	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
 
 	tdb_delete(tdb, string_tdb_data(key_str));
 
-- 
cgit 


From b213b35e08cb53eec47ceae87a52d3b0832a5914 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 3 May 2007 12:29:32 +0000
Subject: r22647: Avoid leaking a full info3 structure on each winbindd cached
 login by making netsamlogon_cache_get() return a talloc'ed structure.

Guenther
(This used to be commit 5b149967cc3ab68057db015e67b688c9b9577f0d)
---
 source3/libsmb/samlogon_cache.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 3edbbaa2c1..0791cd80e4 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -192,10 +192,13 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	data = tdb_fetch_bystring( netsamlogon_tdb, keystr );
 	
 	if ( data.dptr ) {
-		
-		if ( (user = SMB_MALLOC_P(NET_USER_INFO_3)) == NULL )
+
+
+		user = TALLOC_ZERO_P(mem_ctx, NET_USER_INFO_3);
+		if (user == NULL) {
 			return NULL;
-			
+		}
+
 		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
 		prs_give_memory( &ps, (char *)data.dptr, data.dsize, True );
 		
@@ -247,7 +250,6 @@ BOOL netsamlogon_cache_have(const DOM_SID *user_sid)
 	result = (user != NULL);
 
 	talloc_destroy(mem_ctx);
-	SAFE_FREE(user);
 
 	return result;
 }
-- 
cgit 


From e7d06b1c258aa6ea7d039c2d592fbfff96fccafc Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 3 May 2007 20:12:00 +0000
Subject: r22655: Call correct free-macros in netsamlogon_cache_get() error
 paths. Forgot those in the previous commit.

Guenther
(This used to be commit fce2fe9903417f4ee58a1ddc03ad0083109b7c50)
---
 source3/libsmb/samlogon_cache.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 0791cd80e4..106ff21dfe 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -193,7 +193,6 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	
 	if ( data.dptr ) {
 
-
 		user = TALLOC_ZERO_P(mem_ctx, NET_USER_INFO_3);
 		if (user == NULL) {
 			return NULL;
@@ -204,12 +203,12 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 		
 		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
 			prs_mem_free( &ps );
-			SAFE_FREE(user);
+			TALLOC_FREE(user);
 			return False;
 		}
 		
 		if ( !net_io_user_info3("", user, &ps, 0, 3, 0) ) {
-			SAFE_FREE( user );
+			TALLOC_FREE( user );
 		}
 			
 		prs_mem_free( &ps );
@@ -228,7 +227,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 		if ( (time_diff < 0 ) || (time_diff > lp_winbind_cache_time()) ) {
 			DEBUG(10,("netsamlogon_cache_get: cache entry expired \n"));
 			tdb_delete( netsamlogon_tdb, key );
-			SAFE_FREE( user );
+			TALLOC_FREE( user );
 		}
 #endif
 	}
-- 
cgit 


From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 9 Jul 2007 19:25:36 +0000
Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to
 be commit 407e6e695b8366369b7c76af1ff76869b45347b3)

---
 source3/libsmb/samlogon_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 106ff21dfe..c58f3b212d 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
-- 
cgit 


From 5e54558c6dea67b56bbfaba5698f3a434d3dffb6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 00:52:41 +0000
Subject: r23784: use the GPLv3 boilerplate as recommended by the FSF and the
 license text (This used to be commit
 b0132e94fc5fef936aa766fb99a306b3628e9f07)

---
 source3/libsmb/samlogon_cache.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index c58f3b212d..c206922a5e 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-- 
cgit 


From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 18 Oct 2007 17:40:25 -0700
Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in
 various places whilst doing this (places that assumed BOOL == int). I also
 need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to
 be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)

---
 source3/libsmb/samlogon_cache.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index c206922a5e..b1d6c8d8f3 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -30,7 +30,7 @@ static TDB_CONTEXT *netsamlogon_tdb = NULL;
  open the tdb
  ***********************************************************************/
  
-BOOL netsamlogon_cache_init(void)
+bool netsamlogon_cache_init(void)
 {
 	if (!netsamlogon_tdb) {
 		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
@@ -45,7 +45,7 @@ BOOL netsamlogon_cache_init(void)
  Shutdown samlogon_cache database
 ***********************************************************************/
 
-BOOL netsamlogon_cache_shutdown(void)
+bool netsamlogon_cache_shutdown(void)
 {
 	if(netsamlogon_tdb)
 		return (tdb_close(netsamlogon_tdb) == 0);
@@ -58,7 +58,7 @@ BOOL netsamlogon_cache_shutdown(void)
 ***********************************************************************/
 void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 {
-	BOOL got_tdb = False;
+	bool got_tdb = False;
 	DOM_SID sid;
 	fstring key_str, sid_string;
 
@@ -104,12 +104,12 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
  username should be in UTF-8 format
 ***********************************************************************/
 
-BOOL netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
+bool netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 {
 	TDB_DATA 	data;
         fstring 	keystr;
 	prs_struct 	ps;
-	BOOL 		result = False;
+	bool 		result = False;
 	DOM_SID		user_sid;
 	time_t		t = time(NULL);
 	TALLOC_CTX 	*mem_ctx;
@@ -234,11 +234,11 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	return user;
 }
 
-BOOL netsamlogon_cache_have(const DOM_SID *user_sid)
+bool netsamlogon_cache_have(const DOM_SID *user_sid)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
 	NET_USER_INFO_3 *user = NULL;
-	BOOL result;
+	bool result;
 
 	if (!mem_ctx)
 		return False;
-- 
cgit 


From 14ef4cdec1ab6be55c97d0f32780cbddbcdde218 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 15 Dec 2007 22:00:39 +0100
Subject: Replace sid_string_static with sid_to_string

This adds 28 fstrings on the stack, but I think an fstring on the stack is
still far better than a static one.
(This used to be commit c7c885078be8fd3024c186044ac28275d7609679)
---
 source3/libsmb/samlogon_cache.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index b1d6c8d8f3..a15a3b228d 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -107,7 +107,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 bool netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 {
 	TDB_DATA 	data;
-        fstring 	keystr;
+        fstring 	keystr, tmp;
 	prs_struct 	ps;
 	bool 		result = False;
 	DOM_SID		user_sid;
@@ -124,7 +124,7 @@ bool netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 	sid_append_rid( &user_sid, user->user_rid );
 
 	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
+	slprintf(keystr, sizeof(keystr), "%s", sid_to_string(tmp, &user_sid));
 
 	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
 	
@@ -177,7 +177,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	NET_USER_INFO_3	*user = NULL;
 	TDB_DATA 	data;
 	prs_struct	ps;
-        fstring 	keystr;
+        fstring 	keystr, tmp;
 	uint32		t;
 	
 	if (!netsamlogon_cache_init()) {
@@ -186,7 +186,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	}
 
 	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(user_sid));
+	slprintf(keystr, sizeof(keystr), "%s", sid_to_string(tmp, user_sid));
 	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
 	data = tdb_fetch_bystring( netsamlogon_tdb, keystr );
 	
-- 
cgit 


From 2e07c2ade89f4ff281c61f74cb88e09990cf5f46 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 15 Dec 2007 22:47:30 +0100
Subject: s/sid_to_string/sid_to_fstring/

least surprise for callers
(This used to be commit eb523ba77697346a365589101aac379febecd546)
---
 source3/libsmb/samlogon_cache.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index a15a3b228d..4f791f66f6 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -81,7 +81,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 
 	/* Clear U/SID cache entry */
 
-	fstr_sprintf(key_str, "U/%s", sid_to_string(sid_string, &sid));
+	fstr_sprintf(key_str, "U/%s", sid_to_fstring(sid_string, &sid));
 
 	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
 
@@ -89,7 +89,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 
 	/* Clear UG/SID cache entry */
 
-	fstr_sprintf(key_str, "UG/%s", sid_to_string(sid_string, &sid));
+	fstr_sprintf(key_str, "UG/%s", sid_to_fstring(sid_string, &sid));
 
 	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
 
@@ -124,7 +124,7 @@ bool netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
 	sid_append_rid( &user_sid, user->user_rid );
 
 	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s", sid_to_string(tmp, &user_sid));
+	slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, &user_sid));
 
 	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
 	
@@ -186,7 +186,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
 	}
 
 	/* Prepare key as DOMAIN-SID/USER-RID string */
-	slprintf(keystr, sizeof(keystr), "%s", sid_to_string(tmp, user_sid));
+	slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, user_sid));
 	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
 	data = tdb_fetch_bystring( netsamlogon_tdb, keystr );
 	
-- 
cgit 


From 8027b7c25dfa5b4617c4fafbf1e4aaf4f7fee43a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Sun, 17 Feb 2008 01:47:01 +0100
Subject: Use netr_SamInfo3 in samlogon cache and use ndr functions for storing
 the blob.

Guenther
(This used to be commit bf860ae1ac6765b1eb6e2ca9b667b19b4e661fda)
---
 source3/libsmb/samlogon_cache.c | 217 ++++++++++++++++++++++------------------
 1 file changed, 119 insertions(+), 98 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 4f791f66f6..e2a4b3898f 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -1,21 +1,21 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Net_sam_logon info3 helpers
    Copyright (C) Alexander Bokovoy              2002.
    Copyright (C) Andrew Bartlett                2002.
    Copyright (C) Gerald Carter			2003.
    Copyright (C) Tim Potter			2003.
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -29,12 +29,12 @@ static TDB_CONTEXT *netsamlogon_tdb = NULL;
 /***********************************************************************
  open the tdb
  ***********************************************************************/
- 
+
 bool netsamlogon_cache_init(void)
 {
 	if (!netsamlogon_tdb) {
 		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
-						   TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
+					       TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
 	}
 
 	return (netsamlogon_tdb != NULL);
@@ -47,37 +47,39 @@ bool netsamlogon_cache_init(void)
 
 bool netsamlogon_cache_shutdown(void)
 {
-	if(netsamlogon_tdb)
+	if (netsamlogon_tdb) {
 		return (tdb_close(netsamlogon_tdb) == 0);
-		
-	return True;
+	}
+
+	return true;
 }
 
 /***********************************************************************
  Clear cache getpwnam and getgroups entries from the winbindd cache
 ***********************************************************************/
-void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
+
+void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, struct netr_SamInfo3 *info3)
 {
-	bool got_tdb = False;
+	bool got_tdb = false;
 	DOM_SID sid;
 	fstring key_str, sid_string;
 
 	/* We may need to call this function from smbd which will not have
-           winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
+	   winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
 
 	if (!tdb) {
-		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 
+		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
 				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
 				   TDB_DEFAULT, O_RDWR, 0600);
 		if (!tdb) {
 			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
 			return;
 		}
-		got_tdb = True;
+		got_tdb = true;
 	}
 
-	sid_copy(&sid, &user->dom_sid.sid);
-	sid_append_rid(&sid, user->user_rid);
+	sid_copy(&sid, info3->base.domain_sid);
+	sid_append_rid(&sid, info3->base.rid);
 
 	/* Clear U/SID cache entry */
 
@@ -95,157 +97,176 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
 
 	tdb_delete(tdb, string_tdb_data(key_str));
 
-	if (got_tdb)
+	if (got_tdb) {
 		tdb_close(tdb);
+	}
 }
 
 /***********************************************************************
- Store a NET_USER_INFO_3 structure in a tdb for later user 
+ Store a netr_SamInfo3 structure in a tdb for later user
  username should be in UTF-8 format
 ***********************************************************************/
 
-bool netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
+bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3)
 {
-	TDB_DATA 	data;
-        fstring 	keystr, tmp;
-	prs_struct 	ps;
-	bool 		result = False;
-	DOM_SID		user_sid;
-	time_t		t = time(NULL);
-	TALLOC_CTX 	*mem_ctx;
-	
+	TDB_DATA data;
+	fstring keystr, tmp;
+	bool result = false;
+	DOM_SID	user_sid;
+	time_t t = time(NULL);
+	TALLOC_CTX *mem_ctx;
+	DATA_BLOB blob;
+	enum ndr_err_code ndr_err;
+	struct netsamlogoncache_entry r;
+
+	if (!info3) {
+		return false;
+	}
 
 	if (!netsamlogon_cache_init()) {
-		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n", NETSAMLOGON_TDB));
-		return False;
+		DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n",
+			NETSAMLOGON_TDB));
+		return false;
 	}
 
-	sid_copy( &user_sid, &user->dom_sid.sid );
-	sid_append_rid( &user_sid, user->user_rid );
+	sid_copy(&user_sid, info3->base.domain_sid);
+	sid_append_rid(&user_sid, info3->base.rid);
 
 	/* Prepare key as DOMAIN-SID/USER-RID string */
 	slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, &user_sid));
 
 	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
-	
+
+	/* Prepare data */
+
+	if (!(mem_ctx = TALLOC_P( NULL, int))) {
+		DEBUG(0,("netsamlogon_cache_store: talloc() failed!\n"));
+		return false;
+	}
+
 	/* only Samba fills in the username, not sure why NT doesn't */
 	/* so we fill it in since winbindd_getpwnam() makes use of it */
-	
-	if ( !user->uni_user_name.buffer ) {
-		init_unistr2( &user->uni_user_name, username, UNI_STR_TERMINATE );
-		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
+
+	if (!info3->base.account_name.string) {
+		info3->base.account_name.string = talloc_strdup(mem_ctx, username);
 	}
-		
-	/* Prepare data */
-	
-	if ( !(mem_ctx = TALLOC_P( NULL, int )) ) {
-		DEBUG(0,("netsamlogon_cache_store: talloc() failed!\n"));
-		return False;
+
+	r.timestamp = t;
+	r.info3 = *info3;
+
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_DEBUG(netsamlogoncache_entry, &r);
 	}
 
-	prs_init( &ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-	
-	{
-		uint32 ts = (uint32)t;
-		if ( !prs_uint32( "timestamp", &ps, 0, &ts ) )
-			return False;
+	ndr_err = ndr_push_struct_blob(&blob, mem_ctx, &r,
+				       (ndr_push_flags_fn_t)ndr_push_netsamlogoncache_entry);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		DEBUG(0,("netsamlogon_cache_store: failed to push entry to cache\n"));
+		TALLOC_FREE(mem_ctx);
+		return false;
 	}
-	
-	if ( net_io_user_info3("", user, &ps, 0, 3, 0) ) 
-	{
-		data.dsize = prs_offset( &ps );
-		data.dptr = (uint8 *)prs_data_p( &ps );
 
-		if (tdb_store_bystring(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1)
-			result = True;
-		
-		prs_mem_free( &ps );
+	data.dsize = blob.length;
+	data.dptr = blob.data;
+
+	if (tdb_store_bystring(netsamlogon_tdb, keystr, data, TDB_REPLACE) != -1) {
+		result = true;
 	}
 
-	TALLOC_FREE( mem_ctx );
-		
+	TALLOC_FREE(mem_ctx);
+
 	return result;
 }
 
 /***********************************************************************
- Retrieves a NET_USER_INFO_3 structure from a tdb.  Caller must 
+ Retrieves a netr_SamInfo3 structure from a tdb.  Caller must
  free the user_info struct (malloc()'d memory)
 ***********************************************************************/
 
-NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
+struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *user_sid)
 {
-	NET_USER_INFO_3	*user = NULL;
-	TDB_DATA 	data;
-	prs_struct	ps;
-        fstring 	keystr, tmp;
-	uint32		t;
-	
+	struct netr_SamInfo3 *info3 = NULL;
+	TDB_DATA data;
+	fstring keystr, tmp;
+	enum ndr_err_code ndr_err;
+	DATA_BLOB blob;
+	struct netsamlogoncache_entry r;
+
 	if (!netsamlogon_cache_init()) {
-		DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n", NETSAMLOGON_TDB));
-		return False;
+		DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n",
+			NETSAMLOGON_TDB));
+		return false;
 	}
 
 	/* Prepare key as DOMAIN-SID/USER-RID string */
 	slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, user_sid));
 	DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
 	data = tdb_fetch_bystring( netsamlogon_tdb, keystr );
-	
-	if ( data.dptr ) {
 
-		user = TALLOC_ZERO_P(mem_ctx, NET_USER_INFO_3);
-		if (user == NULL) {
-			return NULL;
-		}
+	if (!data.dptr) {
+		return NULL;
+	}
 
-		prs_init( &ps, 0, mem_ctx, UNMARSHALL );
-		prs_give_memory( &ps, (char *)data.dptr, data.dsize, True );
-		
-		if ( !prs_uint32( "timestamp", &ps, 0, &t ) ) {
-			prs_mem_free( &ps );
-			TALLOC_FREE(user);
-			return False;
-		}
-		
-		if ( !net_io_user_info3("", user, &ps, 0, 3, 0) ) {
-			TALLOC_FREE( user );
-		}
-			
-		prs_mem_free( &ps );
+	info3 = TALLOC_ZERO_P(mem_ctx, struct netr_SamInfo3);
+	if (!info3) {
+		goto done;
+	}
+
+	blob.data = (uint8 *)data.dptr;
+	blob.length = data.dsize;
+
+	ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &r,
+				      (ndr_pull_flags_fn_t)ndr_pull_netsamlogoncache_entry);
 
-#if 0	/* The netsamlogon cache needs to hang around.  Something about 
+	if (DEBUGLEVEL >= 10) {
+		NDR_PRINT_DEBUG(netsamlogoncache_entry, &r);
+	}
+
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		DEBUG(0,("netsamlogon_cache_get: failed to pull entry from cache\n"));
+		tdb_delete(netsamlogon_tdb, data);
+		goto done;
+	}
+
+	info3 = talloc_memdup(mem_ctx, &r.info3, sizeof(r.info3));
+
+ done:
+	SAFE_FREE(data.dptr);
+
+	return info3;
+
+#if 0	/* The netsamlogon cache needs to hang around.  Something about
 	   this feels wrong, but it is the only way we can get all of the
 	   groups.  The old universal groups cache didn't expire either.
 	   --jerry */
 	{
 		time_t		now = time(NULL);
 		uint32		time_diff;
-	   
+
 		/* is the entry expired? */
 		time_diff = now - t;
-		
+
 		if ( (time_diff < 0 ) || (time_diff > lp_winbind_cache_time()) ) {
 			DEBUG(10,("netsamlogon_cache_get: cache entry expired \n"));
 			tdb_delete( netsamlogon_tdb, key );
 			TALLOC_FREE( user );
 		}
-#endif
 	}
-	
-	return user;
+#endif
 }
 
 bool netsamlogon_cache_have(const DOM_SID *user_sid)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("netsamlogon_cache_have");
-	NET_USER_INFO_3 *user = NULL;
+	struct netr_SamInfo3 *info3 = NULL;
 	bool result;
 
 	if (!mem_ctx)
 		return False;
 
-	user = netsamlogon_cache_get(mem_ctx, user_sid);
+	info3 = netsamlogon_cache_get(mem_ctx, user_sid);
 
-	result = (user != NULL);
+	result = (info3 != NULL);
 
 	talloc_destroy(mem_ctx);
 
-- 
cgit 


From 6548493de7680dedd429bf851fc57b577e06c673 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 23 Feb 2008 10:50:12 +0100
Subject: Fix a C++ warning (This used to be commit
 ac027a9b2e84d319f961ac0e84654a0e48920138)

---
 source3/libsmb/samlogon_cache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index e2a4b3898f..3cc0dcf0fb 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -228,7 +228,8 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *
 		goto done;
 	}
 
-	info3 = talloc_memdup(mem_ctx, &r.info3, sizeof(r.info3));
+	info3 = (struct netr_SamInfo3 *)talloc_memdup(mem_ctx, &r.info3,
+						      sizeof(r.info3));
 
  done:
 	SAFE_FREE(data.dptr);
-- 
cgit 


From 7269a504fdd06fbbe24c2df8e084b41382d71269 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 27 Feb 2008 19:38:48 +0100
Subject: Add my copyright.

Guenther
(This used to be commit d078a8757182d84dfd3307a2e1b751cf173aaa97)
---
 source3/libsmb/samlogon_cache.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 3cc0dcf0fb..0d855f4c6c 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -5,6 +5,7 @@
    Copyright (C) Andrew Bartlett                2002.
    Copyright (C) Gerald Carter			2003.
    Copyright (C) Tim Potter			2003.
+   Copyright (C) Guenther Deschner		2008.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-- 
cgit 


From bddceee09a12e6308b5e27bf666d8948b2a894d1 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 28 Feb 2008 23:15:11 +0100
Subject: Fix memleak in netsamlogon_cache_get().

Guenther
(This used to be commit b736c77dc6c36dcdb601903fadf0ef7f163052a3)
---
 source3/libsmb/samlogon_cache.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 0d855f4c6c..73b570c383 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -226,6 +226,7 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *
 	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		DEBUG(0,("netsamlogon_cache_get: failed to pull entry from cache\n"));
 		tdb_delete(netsamlogon_tdb, data);
+		TALLOC_FREE(info3);
 		goto done;
 	}
 
-- 
cgit 


From e6a1027757ef08a5a780175b93ebdb314e91cdba Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 25 Mar 2008 22:35:20 +0100
Subject: Fix a valgrind error

In winbind, we're using the info3 struct to send it to the winbind client after
netsamlogon_cache_store. Without this info3->base.account_name.string was
prematurely freed.
(This used to be commit aa4377561b691e2c5108c18aeb34fff39d8775df)
---
 source3/libsmb/samlogon_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 73b570c383..235880910c 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -149,7 +149,7 @@ bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3)
 	/* so we fill it in since winbindd_getpwnam() makes use of it */
 
 	if (!info3->base.account_name.string) {
-		info3->base.account_name.string = talloc_strdup(mem_ctx, username);
+		info3->base.account_name.string = talloc_strdup(info3, username);
 	}
 
 	r.timestamp = t;
-- 
cgit 


From b437f095956165e930d88bb08cb7eb117a41ccbc Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 21 Apr 2008 10:25:28 +0200
Subject: samlogoncache: Use data_blob_const in netsamlogon_cache_get.

Guenther
(This used to be commit f27a20f25c9b2038621a6394821bbedbf17daa73)
---
 source3/libsmb/samlogon_cache.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 235880910c..2d2588f70c 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -213,8 +213,7 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *
 		goto done;
 	}
 
-	blob.data = (uint8 *)data.dptr;
-	blob.length = data.dsize;
+	blob = data_blob_const(data.dptr, data.dsize);
 
 	ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &r,
 				      (ndr_pull_flags_fn_t)ndr_pull_netsamlogoncache_entry);
-- 
cgit 


From 1d26beb7084efdfcadb4a1cebe5a0d7cdcd2b454 Mon Sep 17 00:00:00 2001
From: Ephi Dror <Ephi.Dror@datadomain.com>
Date: Wed, 27 Aug 2008 17:28:34 -0700
Subject: Correct the netsamlogon_clear_cached_user function. (This used to be
 commit bb13312d9d53b1e048b3a0bfeeca088f9db84cd3)

---
 source3/libsmb/samlogon_cache.c | 54 ++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 36 deletions(-)

(limited to 'source3/libsmb/samlogon_cache.c')

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 2d2588f70c..4abe5bb6de 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -59,48 +59,30 @@ bool netsamlogon_cache_shutdown(void)
  Clear cache getpwnam and getgroups entries from the winbindd cache
 ***********************************************************************/
 
-void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, struct netr_SamInfo3 *info3)
+void netsamlogon_clear_cached_user(struct netr_SamInfo3 *info3)
 {
-	bool got_tdb = false;
-	DOM_SID sid;
-	fstring key_str, sid_string;
-
-	/* We may need to call this function from smbd which will not have
-	   winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
-
-	if (!tdb) {
-		tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
-				   TDB_DEFAULT, O_RDWR, 0600);
-		if (!tdb) {
-			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-			return;
-		}
-		got_tdb = true;
-	}
-
-	sid_copy(&sid, info3->base.domain_sid);
-	sid_append_rid(&sid, info3->base.rid);
-
-	/* Clear U/SID cache entry */
-
-	fstr_sprintf(key_str, "U/%s", sid_to_fstring(sid_string, &sid));
-
-	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
-
-	tdb_delete(tdb, string_tdb_data(key_str));
+	DOM_SID	user_sid;
+	fstring keystr, tmp;
 
-	/* Clear UG/SID cache entry */
+	if (!info3) {
+		return;
+	}
 
-	fstr_sprintf(key_str, "UG/%s", sid_to_fstring(sid_string, &sid));
+	if (!netsamlogon_cache_init()) {
+		DEBUG(0,("netsamlogon_clear_cached_user: cannot open "
+			"%s for write!\n",
+			NETSAMLOGON_TDB));
+		return;
+	}
+	sid_copy(&user_sid, info3->base.domain_sid);
+	sid_append_rid(&user_sid, info3->base.rid);
 
-	DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
+	/* Prepare key as DOMAIN-SID/USER-RID string */
+	slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, &user_sid));
 
-	tdb_delete(tdb, string_tdb_data(key_str));
+	DEBUG(10,("netsamlogon_clear_cached_user: SID [%s]\n", keystr));
 
-	if (got_tdb) {
-		tdb_close(tdb);
-	}
+	tdb_delete_bystring(netsamlogon_tdb, keystr);
 }
 
 /***********************************************************************
-- 
cgit