From ffb5b960276fb59da08d4312690ff60cc36959e6 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 13 Mar 2004 18:24:14 +0000 Subject: [PATCH] remove-loopback-test-from-smb-20040313 Now that the loopback test is being performed within the LANA Helper library we should not be performing the test in the smb init code. --- src/WINNT/afsd/smb.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index f8650dbbc..32862cd04 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -6550,6 +6550,11 @@ void smb_NetbiosInit() } else { sprintf(s, "Netbios NCBRESET lana %d succeeded", lana_list.lana[i]); afsi_log(s); + +#ifdef COMMENT + /* This code searches for the loopback adapter but + * we already did this during afsd_init + */ memset( ncbp, 0, sizeof (*ncbp) ); ncbp->ncb_command = NCBASTAT; ncbp->ncb_lana_num = lana_list.lana[i]; @@ -6567,12 +6572,16 @@ void smb_NetbiosInit() /* * check to see if this is the Microsoft Loopback Adapter" * if we are running on Windows XP or higher + * or if we only have the loopback adapter because it was + * selected during afsd_init */ if ( Version.dwPlatformId == VER_PLATFORM_WIN32_NT && - ( Version.dwMajorVersion > 5 || - Version.dwMajorVersion == 5 && - Version.dwMinorVersion >= 1 ) - ) + ( lana_list.length == 1 || + ( Version.dwMajorVersion > 5 || + Version.dwMajorVersion == 5 && + Version.dwMinorVersion >= 1 ) + ) + ) { sprintf(s, "Windows Loopback Adapter detected lana %d", lana_list.lana[i]); afsi_log(s); @@ -6588,6 +6597,7 @@ void smb_NetbiosInit() } } } +#endif /* COMMENT */ } } #else -- 2.39.5