From: Steve French <stevef@smf-t60p.smfdom>
Date: Thu, 24 Jul 2008 14:32:53 +0000 (-0500)
Subject: cifs.upcall was not recognizing the newer name "dns_resolver" key type
X-Git-Tag: samba-3.3.0pre1~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22c36b27c60193102b3153e073216865adb1b6c1;p=thirdparty%2Fsamba.git

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
---

diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index e3893260ddc..70dae1a4123 100644
--- a/source/client/cifs.upcall.c
+++ b/source/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;
 	}