Changeset 39 for trunk/samba/source/libsmb/samlogon_cache.c

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/libsmb/samlogon_cache.c (modified) (4 diffs)

trunk/samba/source/libsmb/samlogon_cache.c

@@ -195 +195 @@
         
         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, data.dptr, data.dsize, True );
@@ -204 +206 @@
                 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 );
                 }
                         
@@ -228 +230 @@
                         DEBUG(10,("netsamlogon_cache_get: cache entry expired \n"));
                         tdb_delete( netsamlogon_tdb, key );
-                        SAFE_FREE( user );
+                        TALLOC_FREE( user );
                 }
 #endif
@@ -250 +252 @@
 
         talloc_destroy(mem_ctx);
-        SAFE_FREE(user);
 
         return result;