summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve French <stevef@smf-t60p.smfdom>2008-07-24 09:32:53 -0500
committerSteve French <stevef@smf-t60p.smfdom>2008-07-24 09:32:53 -0500
commit0732750497dabb441e4657093c329f829d91d58c (patch)
tree6358de69b1ab9721f9bef365e40e7d103ce36f66
parent224f9b839bb5e776ead7d93e8e17b48846f5caf5 (diff)
downloadsamba-0732750497dabb441e4657093c329f829d91d58c.tar.gz
samba-0732750497dabb441e4657093c329f829d91d58c.tar.bz2
samba-0732750497dabb441e4657093c329f829d91d58c.zip
cifs.upcall was not recognizing the newer name "dns_resolver" key type
(as a synonym for the older "cifs.resolver" name) when resolving host names to ip addresses for the kernel. Acked-by: Jeff Layton (This used to be commit 22c36b27c60193102b3153e073216865adb1b6c1)
-rw-r--r--source3/client/cifs.upcall.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/client/cifs.upcall.c b/source3/client/cifs.upcall.c
index e3893260dd..70dae1a412 100644
--- a/source3/client/cifs.upcall.c
+++ b/source3/client/cifs.upcall.c
@@ -262,7 +262,8 @@ int main(const int argc, char *const argv[])
goto out;
}
- if (strncmp(buf, "cifs.resolver", sizeof("cifs.resolver")-1) == 0) {
+ if ((strncmp(buf, "cifs.resolver", sizeof("cifs.resolver")-1) == 0) ||
+ (strncmp(buf, "dns_resolver", sizeof("dns_resolver")-1) == 0)) {
rc = cifs_resolver(key, buf);
goto out;
}