Changeset 988 for vendor/current/source3/libsmb/namecache.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/namecache.c (modified) (6 diffs)

vendor/current/source3/libsmb/namecache.c

@@ -38 +38 @@
  */
 
-static char* namecache_key(const char *name,
+static char *namecache_key(const char *name,
                                 int name_type)
 {
-        char *keystr;
+        char *keystr = NULL;
         asprintf_strupper_m(&keystr, NBTKEY_FMT, name, name_type);
 
@@ -157 +157 @@
         }
 
-        if (!gencache_get(key, &value, &timeout)) {
+        if (!gencache_get(key, talloc_tos(), &value, &timeout)) {
                 DEBUG(5, ("no entry for %s#%02X found.\n", name, name_type));
                 SAFE_FREE(key);
@@ -171 +171 @@
 
         SAFE_FREE(key);
-        SAFE_FREE(value);
+        TALLOC_FREE(value);
 
         return *num_names > 0; /* true only if some ip has been fetched */
@@ -240 +240 @@
 {
         char addr[INET6_ADDRSTRLEN];
-        char *keystr;
+        char *keystr = NULL;
 
         print_sockaddr(addr, sizeof(addr), keyip);
@@ -295 +295 @@
                 return False;
 
-        if (!gencache_get(key, &value, &timeout)) {
+        if (!gencache_get(key, talloc_tos(), &value, &timeout)) {
                 DEBUG(5, ("namecache_status_fetch: no entry for %s found.\n",
                                         key));
@@ -307 +307 @@
         strlcpy(srvname_out, value, 16);
         SAFE_FREE(key);
-        SAFE_FREE(value);
+        TALLOC_FREE(value);
         return True;
 }