svn commit: samba r22655 - in branches: SAMBA_3_0/source/libsmb SAMBA_3_0_25/source/libsmb

[gd at samba.org]

Author: gd
Date: 2007-05-03 20:12:00 +0000 (Thu, 03 May 2007)
New Revision: 22655

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22655

Log:
Call correct free-macros in netsamlogon_cache_get() error paths. Forgot those
in the previous commit.

Guenther

Modified:
   branches/SAMBA_3_0/source/libsmb/samlogon_cache.c
   branches/SAMBA_3_0_25/source/libsmb/samlogon_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/samlogon_cache.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/samlogon_cache.c	2007-05-03 17:05:25 UTC (rev 22654)
+++ branches/SAMBA_3_0/source/libsmb/samlogon_cache.c	2007-05-03 20:12:00 UTC (rev 22655)
@@ -193,7 +193,6 @@
 	
 	if ( data.dptr ) {
 
-
 		user = TALLOC_ZERO_P(mem_ctx, NET_USER_INFO_3);
 		if (user == NULL) {
 			return NULL;
@@ -204,12 +203,12 @@
 		
 		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 @@
 		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
 	}

Modified: branches/SAMBA_3_0_25/source/libsmb/samlogon_cache.c
===================================================================
--- branches/SAMBA_3_0_25/source/libsmb/samlogon_cache.c	2007-05-03 17:05:25 UTC (rev 22654)
+++ branches/SAMBA_3_0_25/source/libsmb/samlogon_cache.c	2007-05-03 20:12:00 UTC (rev 22655)
@@ -195,7 +195,6 @@
 	
 	if ( data.dptr ) {
 
-
 		user = TALLOC_ZERO_P(mem_ctx, NET_USER_INFO_3);
 		if (user == NULL) {
 			return NULL;
@@ -206,12 +205,12 @@
 		
 		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 );
@@ -230,7 +229,7 @@
 		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
 	}