Merge branch 'v3-3-test' of git+ssh://sfrench@git.samba.org/data/git/samba into v33

(This used to be commit 22afe367fef35d4262d960973933023a0a5ce77d)

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