[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3408-g22afe36

[sfrench at samba.org]

The branch, v3-3-test has been updated
       via  22afe367fef35d4262d960973933023a0a5ce77d (commit)
       via  22c36b27c60193102b3153e073216865adb1b6c1 (commit)
      from  865ea6fcbc089a03e453709fa54ff2a39c0c168e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 22afe367fef35d4262d960973933023a0a5ce77d
Merge: 22c36b27c60193102b3153e073216865adb1b6c1 865ea6fcbc089a03e453709fa54ff2a39c0c168e
Author: Steve French <stevef at smf-t60p.smfdom>
Date:   Thu Jul 24 09:35:20 2008 -0500

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

commit 22c36b27c60193102b3153e073216865adb1b6c1
Author: Steve French <stevef at smf-t60p.smfdom>
Date:   Thu Jul 24 09:32:53 2008 -0500

    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

-----------------------------------------------------------------------

Summary of changes:
 source/client/cifs.upcall.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index e389326..70dae1a 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;
 	}


-- 
Samba Shared Repository