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)

diff --git a/source3/client/cifs.upcall.c b/source3/client/cifs.upcall.c
index e3893260ddc705fce508ebc828510524e91d7347..70dae1a412322bf5543b0976dba96051b955fdb0 100644 (file)
--- 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;
        }