diff options
| author | Andreas Schneider <asn@samba.org> | 2014-11-20 11:37:13 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-12-18 06:47:40 +0100 |
| commit | 48929ca9eb87ddafe2548cb1cbf06de0f2c4b323 (patch) | |
| tree | c70b112c1a6fbaea46c348c5f28df962c79f7d6f | |
| parent | f45c63381469ab33a429a83035e860b2d87638ed (diff) | |
| download | samba-48929ca9eb87ddafe2548cb1cbf06de0f2c4b323.tar.gz | |
s3-libsmb: Remove obsolete support for dns_host_file.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/libsmb/namequery.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 3ee79b68a31..c80e25577d4 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -2307,7 +2307,6 @@ static NTSTATUS resolve_hosts(const char *name, int name_type, struct addrinfo *res = NULL; int ret = -1; int i = 0; - const char *dns_hosts_file; if ( name_type != 0x20 && name_type != 0x0) { DEBUG(5, ("resolve_hosts: not appropriate " @@ -2332,32 +2331,6 @@ static NTSTATUS resolve_hosts(const char *name, int name_type, hints.ai_family = AF_INET; #endif - dns_hosts_file = lp_parm_const_string(-1, "resolv", "host file", NULL); - if (dns_hosts_file) { - struct sockaddr_storage *ss_list; - NTSTATUS status; - TALLOC_CTX *ctx = talloc_stackframe(); - if (!ctx) { - return NT_STATUS_NO_MEMORY; - } - - status = resolve_dns_hosts_file_as_sockaddr(dns_hosts_file, name, false, - ctx, &ss_list, return_count); - if (NT_STATUS_IS_OK(status)) { - if (convert_ss2service(return_iplist, - ss_list, - return_count)) { - talloc_free(ctx); - return NT_STATUS_OK; - } else { - talloc_free(ctx); - return NT_STATUS_NO_MEMORY; - } - } - talloc_free(ctx); - return NT_STATUS_UNSUCCESSFUL; - } - ret = getaddrinfo(name, NULL, &hints, |