s3: libsmb: Now we only have namecache_store_sa(), rename it back to namecache_store().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 194b7ffa8f9f4c0b662be210ce119489f767a5cd..3641849fbe1333ce5f307c9dc9a81703cb05590a 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -676,7 +676,7 @@ NTSTATUS dos_to_ntstatus(uint8_t eclass, uint32_t ecode);
 
 /* The following definitions come from libsmb/namecache.c  */
 
-bool namecache_store_sa(const char *name,
+bool namecache_store(const char *name,
                        int name_type,
                        size_t num_names,
                        struct samba_sockaddr *sa_list);

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index ffe07e089a4fde73c0a7a887dc983e6d7a6967dd..01e7a42cd772d7c62c557b97b5e87b0554d9f1db 100644 (file)
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -1104,7 +1104,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
                                   mem_ctx, &nt_version, &dc_name, &r);
                if (NT_STATUS_IS_OK(status)) {
                        store_cache = true;
-                       namecache_store_sa(dc_name,
+                       namecache_store(dc_name,
                                        NBT_NAME_SERVER,
                                        1,
                                        &dclist[i].sa);
@@ -1136,7 +1136,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
 
                        map_netlogon_samlogon_response(r);
 
-                       namecache_store_sa(tmp_dc_name,
+                       namecache_store(tmp_dc_name,
                                        NBT_NAME_SERVER,
                                        1,
                                        &dclist[i].sa);

diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index 0cba52233baa5262dd26ff2bd4f4e333bfa02e53..66147bab7f247eb889fdcdab01857e3806088721 100644 (file)
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -220,7 +220,7 @@ static char *namecache_key(TALLOC_CTX *ctx,
  *        ip addresses being stored
  **/
 
-bool namecache_store_sa(const char *name,
+bool namecache_store(const char *name,
                        int name_type,
                        size_t num_names,
                        struct samba_sockaddr *sa_list)

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 0692194c79d8a9f4fac9575cd302351bff9a8fd1..d4c04962e7310fb53d89070112cf09e4a4b03c87 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3486,7 +3486,7 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
                        TALLOC_FREE(frame);
                        return status;
                }
-               namecache_store_sa(name,
+               namecache_store(name,
                                name_type,
                                ret_count,
                                sa_converted_list);

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index df12b81976adf1488250f3381023989aef89b04f..8c1d525237c0bf2ecb84e25e68ffa681aa25bcdd 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1437,7 +1437,7 @@ static bool dcip_check_name(TALLOC_CTX *mem_ctx,
                        if (*name == NULL) {
                                return false;
                        }
-                       namecache_store_sa(*name, 0x20, 1, &sa);
+                       namecache_store(*name, 0x20, 1, &sa);
 
                        DEBUG(10,("dcip_check_name: flags = 0x%x\n", (unsigned int)ads->config.flags));
 
@@ -1498,14 +1498,14 @@ static bool dcip_check_name(TALLOC_CTX *mem_ctx,
                if (*name == NULL) {
                        return false;
                }
-               namecache_store_sa(*name, 0x20, 1, &sa);
+               namecache_store(*name, 0x20, 1, &sa);
                return True;
        }
 
        /* try node status request */
 
        if (name_status_find(domain->name, 0x1c, 0x20, &sa.u.ss, nbtname) ) {
-               namecache_store_sa(nbtname, 0x20, 1, &sa);
+               namecache_store(nbtname, 0x20, 1, &sa);
 
                if (name != NULL) {
                        *name = talloc_strdup(mem_ctx, nbtname);