merge gd netsamlogon talloc fix

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0_RELEASE@22657 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/libsmb/samlogon_cache.c b/source/libsmb/samlogon_cache.c
index 0258f1773828f505219825dadd035dbf236303e5..c3ca9a3b15bcfe4b1215fa61f7e7028d7a4293a2 100644 (file)
--- a/source/libsmb/samlogon_cache.c
+++ b/source/libsmb/samlogon_cache.c
@@ -195,7 +195,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;
@@ -206,12 +205,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 );
@@ -230,7 +229,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
        }