summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-05-03 20:12:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:53 -0500
commite7d06b1c258aa6ea7d039c2d592fbfff96fccafc (patch)
tree49734a679b67eb2f64f9af17554941bd9e34edd5
parentaa454619a2e99e9d7a6760e46ae0b3360c0ece1a (diff)
downloadsamba-e7d06b1c258aa6ea7d039c2d592fbfff96fccafc.tar.gz
samba-e7d06b1c258aa6ea7d039c2d592fbfff96fccafc.tar.bz2
samba-e7d06b1c258aa6ea7d039c2d592fbfff96fccafc.zip
r22655: Call correct free-macros in netsamlogon_cache_get() error paths. Forgot those
in the previous commit. Guenther (This used to be commit fce2fe9903417f4ee58a1ddc03ad0083109b7c50)
-rw-r--r--source3/libsmb/samlogon_cache.c7
1 files changed, 3 insertions, 4 deletions
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
}