<rdar://problem/7323353> BTMM: Need to turn on support for SMB
authormarc@apple.com <marc@apple.com@214c2c4a-bf3b-4dcf-9390-e4dd3010487d>
Fri, 23 Oct 2009 02:35:39 +0000 (02:35 +0000)
committermarc@apple.com <marc@apple.com@214c2c4a-bf3b-4dcf-9390-e4dd3010487d>
Fri, 23 Oct 2009 02:35:39 +0000 (02:35 +0000)
git-svn-id: http://svn.macosforge.org/repository/mDNSResponder/trunk@6753 214c2c4a-bf3b-4dcf-9390-e4dd3010487d

mDNSCore/mDNSEmbeddedAPI.h
mDNSCore/uDNS.c
mDNSShared/uds_daemon.c

index d635b17..587277c 100755 (executable)
@@ -1965,8 +1965,6 @@ extern mStatus mDNS_StartNATOperation(mDNS *const m, NATTraversalInfo *traversal
 extern mStatus mDNS_StopNATOperation(mDNS *const m, NATTraversalInfo *traversal);
 extern mStatus mDNS_StopNATOperation_internal(mDNS *m, NATTraversalInfo *traversal);
 
-extern DomainAuthInfo *GetAuthInfoForName(mDNS *m, const domainname *const name);
-
 // ***************************************************************************
 #if 0
 #pragma mark -
index 8ace2ae..24e0325 100755 (executable)
@@ -356,7 +356,7 @@ mDNSexport DomainAuthInfo *GetAuthInfoForName_internal(mDNS *m, const domainname
        return(GetAuthInfoForName_direct(m, name));
        }
 
-mDNSexport DomainAuthInfo *GetAuthInfoForName(mDNS *m, const domainname *const name)
+mDNSlocal DomainAuthInfo *GetAuthInfoForName(mDNS *m, const domainname *const name)
        {
        DomainAuthInfo *d;
        mDNS_Lock(m);
index d31c9bc..bb17fc4 100644 (file)
@@ -1211,15 +1211,6 @@ mDNSlocal mStatus register_service_instance(request_state *request, const domain
                        }
                }
 
-       // Special-case hack: We don't advertise SMB service in AutoTunnel domains, because AutoTunnel
-       // services have to support IPv6, and our SMB server does not
-       // <rdar://problem/5482322> BTMM: Don't advertise SMB with BTMM because it doesn't support IPv6
-       if (SameDomainName(&request->u.servicereg.type, (const domainname *) "\x4" "_smb" "\x4" "_tcp"))
-               {
-               DomainAuthInfo *AuthInfo = GetAuthInfoForName(&mDNSStorage, domain);
-               if (AuthInfo && AuthInfo->AutoTunnel) return(kDNSServiceErr_Unsupported);
-               }
-
        instance_size = sizeof(*instance);
        if (request->u.servicereg.txtlen > sizeof(RDataBody)) instance_size += (request->u.servicereg.txtlen - sizeof(RDataBody));
        instance = mallocL("service_instance", instance_size);