svn commit: samba r22656 - in branches/SAMBA_3_0_26/source/libsmb: .

[gd]

Author: gd
Date: 2007-05-03 20:14:50 +0000 (Thu, 03 May 2007)
New Revision: 22656

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

Log:
merge to 3_0_26 as well.

Guenther

Modified:
   branches/SAMBA_3_0_26/source/libsmb/samlogon_cache.c


Changeset:
Modified: branches/SAMBA_3_0_26/source/libsmb/samlogon_cache.c
===================================================================
--- branches/SAMBA_3_0_26/source/libsmb/samlogon_cache.c        2007-05-03 
20:12:00 UTC (rev 22655)
+++ branches/SAMBA_3_0_26/source/libsmb/samlogon_cache.c        2007-05-03 
20:14:50 UTC (rev 22656)
@@ -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
        }