Change all references from "workgroup" to "domain"
authorsherscher@apple.com <sherscher@apple.com@214c2c4a-bf3b-4dcf-9390-e4dd3010487d>
Fri, 25 Sep 2009 23:07:24 +0000 (23:07 +0000)
committersherscher@apple.com <sherscher@apple.com@214c2c4a-bf3b-4dcf-9390-e4dd3010487d>
Fri, 25 Sep 2009 23:07:24 +0000 (23:07 +0000)
git-svn-id: http://svn.macosforge.org/repository/mDNSResponder/trunk@6694 214c2c4a-bf3b-4dcf-9390-e4dd3010487d

mDNSWindows/mDNSWin32.c
mDNSWindows/mDNSWin32.h

index f593de4..4eb14b6 100755 (executable)
@@ -2164,7 +2164,7 @@ mStatus   SetupNiceName( mDNS * const inMDNS )
        }
 
        ZeroMemory( inMDNS->p->nbname, sizeof( inMDNS->p->nbname ) );
-       ZeroMemory( inMDNS->p->nbworkgroup, sizeof( inMDNS->p->nbworkgroup ) );
+       ZeroMemory( inMDNS->p->nbdomain, sizeof( inMDNS->p->nbdomain ) );
 
        namelen = sizeof( inMDNS->p->nbname );
        ok = GetComputerNameExA( ComputerNamePhysicalNetBIOS, inMDNS->p->nbname, &namelen );
@@ -2177,9 +2177,9 @@ mStatus   SetupNiceName( mDNS * const inMDNS )
        {
                if ( ( joinStatus == NetSetupWorkgroupName ) || ( joinStatus == NetSetupDomainName ) )
                {
-                       err = TCHARtoUTF8( joinName, inMDNS->p->nbworkgroup, sizeof( inMDNS->p->nbworkgroup ) );
+                       err = TCHARtoUTF8( joinName, inMDNS->p->nbdomain, sizeof( inMDNS->p->nbdomain ) );
                        check( !err );
-                       if ( !err ) dlog( kDebugLevelInfo, DEBUG_NAME "netbios workgroup \"%s\"\n", inMDNS->p->nbworkgroup );
+                       if ( !err ) dlog( kDebugLevelInfo, DEBUG_NAME "netbios domain/workgroup \"%s\"\n", inMDNS->p->nbdomain );
                }
 
                NetApiBufferFree( joinName );
@@ -4622,13 +4622,13 @@ CheckFileShares( mDNS * const m )
                        txtPtr += keyLen;
                        if ( valLen ) { memcpy( txtPtr, m->p->nbname, valLen ); txtPtr += ( mDNSu8 ) valLen; }
 
-                       keyLen = strlen( "workgroup=" );
-                       valLen = strlen( m->p->nbworkgroup );
+                       keyLen = strlen( "domain=" );
+                       valLen = strlen( m->p->nbdomain );
                        require_action( valLen < 32, exit, err = kUnknownErr ); // This should never happen, but check to avoid further memory corruption
                        *txtPtr++ = ( mDNSu8 )( keyLen + valLen );
-                       memcpy( txtPtr, "workgroup=", keyLen );
+                       memcpy( txtPtr, "domain=", keyLen );
                        txtPtr += keyLen;
-                       if ( valLen ) { memcpy( txtPtr, m->p->nbworkgroup, valLen ); txtPtr += valLen; }
+                       if ( valLen ) { memcpy( txtPtr, m->p->nbdomain, valLen ); txtPtr += valLen; }
 
                        dlog( kDebugLevelTrace, DEBUG_NAME "registering smb type\n" );
 
index 7849bee..5b8b27a 100755 (executable)
@@ -122,7 +122,7 @@ struct      mDNS_PlatformSupport_struct
        UnregisterWaitableEventFunc     unregisterWaitableEventFunc;
        time_t                                          nextDHCPLeaseExpires;
        char                                            nbname[ 32 ];
-       char                                            nbworkgroup[ 32 ];
+       char                                            nbdomain[ 32 ];
        mDNSBool                                        smbRegistered;
        mDNSBool                                        smbFileSharing;
        mDNSBool                                        smbPrintSharing;