Index: openafs/src/NTMake9x
diff -c openafs/src/NTMake9x:1.4.2.2 openafs/src/NTMake9x:1.4.2.2.2.1
*** openafs/src/NTMake9x:1.4.2.2 Wed Nov 14 22:38:06 2001
--- openafs/src/NTMake9x Sun Jan 20 04:23:04 2002
***************
*** 42,48 ****
$(MKDIR) $(DESTDIR)
! ENDIF
! config:
echo ***** $@
$(CD) $(OBJ)\$@
$(NTMAKE)
--- 42,48 ----
$(MKDIR) $(DESTDIR)
! ENDIF
! config: start
echo ***** $@
$(CD) $(OBJ)\$@
$(NTMAKE)
***************
*** 315,321 ****
# Fake the version copy so clean will go through the complete cycle with undefines
clean: start
if not exist .\src\config\NTMakefile.version copy .\src\config\NTMakefile.version-NOCML .\src\config\NTMakefile.version
! nmake /nologo /f ntmake9x "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_LIBUTILS = nmake /nologo /f ntmakefile clean" install
$(CD) $(OBJ)\WINNT\install\Win9x
nmake /nologo /f NTMakefile clean
$(CD) ..\..\..\..
--- 315,321 ----
# Fake the version copy so clean will go through the complete cycle with undefines
clean: start
if not exist .\src\config\NTMakefile.version copy .\src\config\NTMakefile.version-NOCML .\src\config\NTMakefile.version
! nmake /nologo /f ntmake9x "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_LIBUTILS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" install
$(CD) $(OBJ)\WINNT\install\Win9x
nmake /nologo /f NTMakefile clean
$(CD) ..\..\..\..
Index: openafs/src/NTMakefile
diff -c openafs/src/NTMakefile:1.4.2.2 openafs/src/NTMakefile:1.4.2.2.2.1
*** openafs/src/NTMakefile:1.4.2.2 Wed Nov 14 22:38:06 2001
--- openafs/src/NTMakefile Sun Jan 20 04:23:04 2002
***************
*** 471,476 ****
--- 471,477 ----
$(CD) $(OBJ)\$@
$(NTMAKE)
$(CD) ..\..
+ echo Build Finished Successfully
install: start finale
***************
*** 487,498 ****
$(CD) ..\..\..\..
media: InstallShield5
-
# Clean target for obj tree
clean: start
! nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" install
$(CD) $(OBJ)\config
nmake /nologo /f ntmakefile clean_version
$(CD) ..\..
--- 488,499 ----
$(CD) ..\..\..\..
media: InstallShield5
+ echo Install Script Finished Successfully
# Clean target for obj tree
clean: start
! nmake /nologo /f ntmakefile "NTMAKE = nmake /nologo /f ntmakefile clean" "NTMAKE_HEADERS = nmake /nologo /f ntmakefile clean" "NTMAKE_OBJS = nmake /nologo /f ntmakefile clean" install
$(CD) $(OBJ)\config
nmake /nologo /f ntmakefile clean_version
$(CD) ..\..
Index: openafs/src/WINNT/afs_setup_utils/afs_setup_utils.cpp
diff -c openafs/src/WINNT/afs_setup_utils/afs_setup_utils.cpp:1.4.2.1 openafs/src/WINNT/afs_setup_utils/afs_setup_utils.cpp:1.4.2.1.2.1
*** openafs/src/WINNT/afs_setup_utils/afs_setup_utils.cpp:1.4.2.1 Wed Nov 14 22:38:47 2001
--- openafs/src/WINNT/afs_setup_utils/afs_setup_utils.cpp Sun Jan 20 04:23:07 2002
***************
*** 419,425 ****
{ TARGETDIR"\\Common\\afsadminutil.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\afsrpc.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\afsauthent.dll", SERVER | CLIENT | LCLIENT | CC },
! { TARGETDIR"\\Common\\pthread.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\TaAfsAppLib.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\afsprocmgmt.dll", SERVER | CLIENT | LCLIENT },
{ TARGETDIR"\\Common\\afs_config.exe", CLIENT | LCLIENT| CC },
--- 419,425 ----
{ TARGETDIR"\\Common\\afsadminutil.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\afsrpc.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\afsauthent.dll", SERVER | CLIENT | LCLIENT | CC },
! { TARGETDIR"\\Common\\afspthread.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\TaAfsAppLib.dll", SERVER | CLIENT | LCLIENT | CC },
{ TARGETDIR"\\Common\\afsprocmgmt.dll", SERVER | CLIENT | LCLIENT },
{ TARGETDIR"\\Common\\afs_config.exe", CLIENT | LCLIENT| CC },
Index: openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC
diff -c openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC:1.2 openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC:1.2.4.1
*** openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC:1.2 Thu Sep 6 22:54:59 2001
--- openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.RC Sun Jan 20 04:23:07 2002
***************
*** 10,16 ****
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
! #include <.\sdrc.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
--- 10,16 ----
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
! #include <sdrc.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Index: openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep
diff -c openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep:1.2 openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep:removed
*** openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep:1.2 Thu Sep 6 22:54:59 2001
--- openafs/src/WINNT/afs_setup_utils/_isuser/_IsUser.dep Wed Jan 30 15:33:06 2002
***************
*** 1,5 ****
- # Microsoft Developer Studio Generated Dependency File, included by _IsUser.mak
-
- .\_Isuser.RC : \
- ".\sdrc.h"\
-
--- 0 ----
Index: openafs/src/WINNT/afs_setup_utils/_isuser/ntmakefile
diff -c openafs/src/WINNT/afs_setup_utils/_isuser/ntmakefile:1.3 openafs/src/WINNT/afs_setup_utils/_isuser/ntmakefile:1.3.4.1
*** openafs/src/WINNT/afs_setup_utils/_isuser/ntmakefile:1.3 Mon Sep 10 11:39:50 2001
--- openafs/src/WINNT/afs_setup_utils/_isuser/ntmakefile Sun Jan 20 04:23:07 2002
***************
*** 30,43 ****
"$(OUTDIR)" ::
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
- HEADERS = ".\sdrc.h"
-
- ".\sdrc.h" : $(IS5ROOT)\INCLUDE\sdrc.h
- $(COPY) $(IS5ROOT)\INCLUDE\sdrc.h .
- ! IF EXIST($(IS5ROOT)\Script\ISRT\Include\sdrc.h)
- $(COPY) $(IS5ROOT)\Script\ISRT\Include\sdrc.h .
- ! ENDIF
-
CPP=cl.exe
CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ISUSER_EXPORTS" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
--- 30,35 ----
***************
*** 85,104 ****
"$(INTDIR)\_isuser.obj" \
"$(INTDIR)\_Isuser.res"
! "$(OUTDIR)\_IsUser.dll" : "$(OUTDIR)" $(HEADERS) $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-
-
- !IF "$(NO_EXTERNAL_DEPS)" != "1"
- !IF EXISTS("_IsUser.dep")
- !INCLUDE "_IsUser.dep"
- !ELSE
- !MESSAGE Warning: cannot find "_IsUser.dep"
- !ENDIF
- !ENDIF
-
SOURCE=.\_isuser.c
--- 77,86 ----
"$(INTDIR)\_isuser.obj" \
"$(INTDIR)\_Isuser.res"
! "$(OUTDIR)\_IsUser.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
SOURCE=.\_isuser.c
Index: openafs/src/WINNT/afsd/NTMakefile
diff -c openafs/src/WINNT/afsd/NTMakefile:1.4.4.2 openafs/src/WINNT/afsd/NTMakefile:1.4.4.2.2.1
*** openafs/src/WINNT/afsd/NTMakefile:1.4.4.2 Wed Nov 21 01:45:40 2001
--- openafs/src/WINNT/afsd/NTMakefile Sun Jan 20 04:23:08 2002
***************
*** 169,175 ****
$(EXEDIR)\tokens.exe \
$(EXEDIR)\unlog.exe $(EXEDIR)\afsd.exe $(EXEDIR)\afsd_service.exe \
$(EXEDIR)\fs.exe $(EXEDIR)\symlink.exe \
! $(LOGON_DLLFILE) $(LOG95_DLLFILE) \
$(EXEDIR)\afsshare.exe \
$(DESTDIR)\bin\kpasswd.exe
--- 169,175 ----
$(EXEDIR)\tokens.exe \
$(EXEDIR)\unlog.exe $(EXEDIR)\afsd.exe $(EXEDIR)\afsd_service.exe \
$(EXEDIR)\fs.exe $(EXEDIR)\symlink.exe \
! $(LOGON_DLLFILE) \
$(EXEDIR)\afsshare.exe \
$(DESTDIR)\bin\kpasswd.exe
***************
*** 306,313 ****
$(DEL) $(DESTDIR)\bin\kpasswd.exe
$(EXECONLINK)
$(EXEPREP)
-
############################################################################
# generate versioninfo resources
--- 306,313 ----
$(DEL) $(DESTDIR)\bin\kpasswd.exe
$(EXECONLINK)
$(EXEPREP)
+
############################################################################
# generate versioninfo resources
Index: openafs/src/WINNT/afsd/afsd_service.c
diff -c openafs/src/WINNT/afsd/afsd_service.c:1.3.4.1 openafs/src/WINNT/afsd/afsd_service.c:1.3.4.1.2.1
*** openafs/src/WINNT/afsd/afsd_service.c:1.3.4.1 Wed Nov 14 22:38:47 2001
--- openafs/src/WINNT/afsd/afsd_service.c Sun Jan 20 04:23:08 2002
***************
*** 137,142 ****
--- 137,144 ----
}
}
+ #if 0
+ /* This code was moved to Drivemap.cpp*/
/* Mount a drive into AFS if the user wants us to */
void CheckMountDrive()
{
***************
*** 177,182 ****
--- 179,185 ----
RegCloseKey(hKey);
}
+ #endif
void afsd_Main()
{
***************
*** 248,254 ****
}
/* Check if we should mount a drive into AFS */
! CheckMountDrive();
WaitForSingleObject(WaitToTerminate, INFINITE);
--- 251,257 ----
}
/* Check if we should mount a drive into AFS */
! /* CheckMountDrive();*/
WaitForSingleObject(WaitToTerminate, INFINITE);
Index: openafs/src/WINNT/afsd/afslogon.c
diff -c openafs/src/WINNT/afsd/afslogon.c:1.2.8.1 openafs/src/WINNT/afsd/afslogon.c:1.2.8.1.2.1
*** openafs/src/WINNT/afsd/afslogon.c:1.2.8.1 Wed Nov 14 22:38:47 2001
--- openafs/src/WINNT/afsd/afslogon.c Sun Jan 20 04:23:08 2002
***************
*** 373,380 ****
if ( ISLOGONINTEGRATED(LogonOption) && (password[0] == 0) ) {
code = GT_PW_NULL;
reason = "zero length password is illegal";
- if (!ISHIGHSECURITY(LogonOption))
- goto checkauth; /*skip the rest if integrated logon and not high security*/
code=0;
}
--- 373,378 ----
***************
*** 385,392 ****
if (code < 0) {
code = KTC_NOCELL;
reason = "unknown cell";
- if (!ISHIGHSECURITY(LogonOption))
- goto checkauth; /*skip the rest if integrated logon and not high security*/
code=0;
}
}
--- 383,388 ----
***************
*** 396,419 ****
afsWillAutoStart = AFSWillAutoStart();
! if ( ISHIGHSECURITY(LogonOption))
! *lpLogonScript = GetLogonScript(GenRandomName(RandomName)); /*only do if high security option is on*/
! /* Possibly loop until AFS is started. */
! while ( (ISHIGHSECURITY(LogonOption) || ISLOGONINTEGRATED(LogonOption))) {
! code=0;
! /* is service started yet?*/
!
! if (ISHIGHSECURITY(LogonOption) && !ISLOGONINTEGRATED(LogonOption)) /* if high security only then check for service started only*/
! {
! if (IsServiceRunning())
! break;
! code = KTC_NOCM;
! if (!afsWillAutoStart)
! break;
! } else if (ISLOGONINTEGRATED(LogonOption) && !ISHIGHSECURITY(LogonOption)) /* if Integrated Logon only */
{
DebugEvent("AFS AfsLogon - ka_UserAuthenticateGeneral2","Code[%x],uame[%s] Cell[%s]",code,uname,cell);
code = ka_UserAuthenticateGeneral2(
--- 392,406 ----
afsWillAutoStart = AFSWillAutoStart();
! *lpLogonScript = GetLogonScript(GenRandomName(RandomName)); /*only do if high security option is on*/
! /* loop until AFS is started. */
! while (TRUE) {
! code=0;
! /* is service started yet?*/
! if (ISLOGONINTEGRATED(LogonOption) && !ISHIGHSECURITY(LogonOption)) /* if Integrated Logon only */
{
DebugEvent("AFS AfsLogon - ka_UserAuthenticateGeneral2","Code[%x],uame[%s] Cell[%s]",code,uname,cell);
code = ka_UserAuthenticateGeneral2(
***************
*** 428,435 ****
uname, "", cell, password,RandomName, 0, &pw_exp, 0,
&reason);
DebugEvent("AFS AfsLogon - (Both)ka_UserAuthenticateGeneral2","Code[%x],RandomName[%s]",code,RandomName);
! } else {
! code = KTC_NOCM; /* we shouldn't ever get here*/
}
/* If we've failed because the client isn't running yet and the
--- 415,426 ----
uname, "", cell, password,RandomName, 0, &pw_exp, 0,
&reason);
DebugEvent("AFS AfsLogon - (Both)ka_UserAuthenticateGeneral2","Code[%x],RandomName[%s]",code,RandomName);
! } else { /*JUST check to see if its running*/
! if (IsServiceRunning())
! break;
! code = KTC_NOCM;
! if (!afsWillAutoStart)
! break;
}
/* If we've failed because the client isn't running yet and the
***************
*** 465,471 ****
retryInterval -= sleepInterval;
}
- checkauth:
if (code) {
char msg[128];
sprintf(msg, "Integrated login failed: %s", reason);
--- 456,461 ----
Index: openafs/src/WINNT/afsd/cm_callback.c
diff -c openafs/src/WINNT/afsd/cm_callback.c:1.4.2.1 openafs/src/WINNT/afsd/cm_callback.c:1.4.2.1.2.1
*** openafs/src/WINNT/afsd/cm_callback.c:1.4.2.1 Sat Oct 13 00:19:06 2001
--- openafs/src/WINNT/afsd/cm_callback.c Sun Jan 20 04:23:08 2002
***************
*** 312,317 ****
--- 312,324 ----
}
/* debug interface: not implemented */
+ SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry *cep)
+ {
+ /* XXXX */
+ return RXGEN_OPCODE;
+ }
+
+ /* debug interface: not implemented */
SRXAFSCB_GetLock(struct rx_call *callp, long index, AFSDBLock *lockp)
{
/* XXXX */
Index: openafs/src/WINNT/afsd/cm_dcache.c
diff -c openafs/src/WINNT/afsd/cm_dcache.c:1.3.4.1 openafs/src/WINNT/afsd/cm_dcache.c:1.3.4.1.2.1
*** openafs/src/WINNT/afsd/cm_dcache.c:1.3.4.1 Sat Oct 13 00:19:06 2001
--- openafs/src/WINNT/afsd/cm_dcache.c Sun Jan 20 04:23:08 2002
***************
*** 1155,1161 ****
afsStatus.UnixModeBits = 0x1ff;
afsStatus.ParentVnode = 0x1;
afsStatus.ParentUnique = 0x1;
! afsStatus.SegSize = 0;
afsStatus.ClientModTime = 0x3b49f6e2;
afsStatus.ServerModTime = 0x3b49f6e2;
afsStatus.Group = 0;
--- 1155,1161 ----
afsStatus.UnixModeBits = 0x1ff;
afsStatus.ParentVnode = 0x1;
afsStatus.ParentUnique = 0x1;
! afsStatus.ResidencyMask = 0;
afsStatus.ClientModTime = 0x3b49f6e2;
afsStatus.ServerModTime = 0x3b49f6e2;
afsStatus.Group = 0;
Index: openafs/src/WINNT/afsd/cm_scache.c
diff -c openafs/src/WINNT/afsd/cm_scache.c:1.3.4.1 openafs/src/WINNT/afsd/cm_scache.c:1.3.4.1.2.1
*** openafs/src/WINNT/afsd/cm_scache.c:1.3.4.1 Sat Oct 13 00:19:06 2001
--- openafs/src/WINNT/afsd/cm_scache.c Sun Jan 20 04:23:08 2002
***************
*** 806,812 ****
statusp->UnixModeBits = 0x1ff;
statusp->ParentVnode = 0x1;
statusp->ParentUnique = 0x1;
! statusp->SegSize = 0;
statusp->ClientModTime = 0x3b49f6e2;
statusp->ServerModTime = 0x3b49f6e2;
statusp->Group = 0;
--- 806,812 ----
statusp->UnixModeBits = 0x1ff;
statusp->ParentVnode = 0x1;
statusp->ParentUnique = 0x1;
! statusp->ResidencyMask = 0;
statusp->ClientModTime = 0x3b49f6e2;
statusp->ServerModTime = 0x3b49f6e2;
statusp->Group = 0;
Index: openafs/src/WINNT/client_config/dlg_automap.cpp
diff -c openafs/src/WINNT/client_config/dlg_automap.cpp:1.3 openafs/src/WINNT/client_config/dlg_automap.cpp:1.3.6.1
*** openafs/src/WINNT/client_config/dlg_automap.cpp:1.3 Wed Apr 4 08:43:45 2001
--- openafs/src/WINNT/client_config/dlg_automap.cpp Sun Jan 20 04:23:09 2002
***************
*** 237,265 ****
BOOL DefineDosDrive(DRIVEMAP *pDrive, DDDACTION dddAction)
{
! TCHAR szAfsPath[MAX_PATH];
! TCHAR szDrive[3] = TEXT("?:");
BOOL fResult = FALSE;
if (!pDrive)
return FALSE;
- szDrive[0] = pDrive->chDrive;
- _stprintf(szAfsPath, TEXT("\\Device\\LanmanRedirector\\%s\\%s-AFS\\%s"), szDrive, szHostName, pDrive->szSubmount);
-
if (dddAction == DDD_REMOVE) {
! fResult = DefineDosDevice(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, szDrive, szAfsPath);
! if (!fResult)
! Message (MB_OK | MB_ICONHAND, IDS_ERROR_UNMAP, IDS_ERROR_UNMAP_DESC, TEXT("%08lX"), GetLastError());
} else if (dddAction == DDD_ADD) {
! fResult = DefineDosDevice(DDD_RAW_TARGET_PATH, szDrive, szAfsPath);
! if (!fResult)
! Message (MB_OK | MB_ICONHAND, IDS_ERROR_MAP, IDS_ERROR_MAP_DESC, TEXT("%08lX"), GetLastError());
}
! if (fResult)
! UpdateRegistry(pDrive, dddAction == DDD_REMOVE);
return fResult;
}
--- 237,275 ----
BOOL DefineDosDrive(DRIVEMAP *pDrive, DDDACTION dddAction)
{
! // TCHAR szAfsPath[MAX_PATH];
! // TCHAR szDrive[3] = TEXT("?:");
BOOL fResult = FALSE;
if (!pDrive)
return FALSE;
if (dddAction == DDD_REMOVE) {
! if (!(fResult=(DisMountDOSDrive(pDrive->chDrive)==NO_ERROR)))
! Message (MB_OK | MB_ICONHAND, IDS_ERROR_UNMAP, IDS_ERROR_UNMAP_DESC, TEXT("%08lX"), GetLastError());
} else if (dddAction == DDD_ADD) {
! if (!(fResult=(MountDOSDrive(pDrive->chDrive, pDrive->szSubmount,FALSE)==NO_ERROR)))
! Message (MB_OK | MB_ICONHAND, IDS_ERROR_MAP, IDS_ERROR_MAP_DESC, TEXT("%08lX"), GetLastError());
}
+ /*
+ Replace this code with Drive mapping routine that doesn't require different formats for each OS
+ szDrive[0] = pDrive->chDrive;
+ _stprintf(szAfsPath, TEXT("\\Device\\LanmanRedirector\\%s\\%s-AFS\\%s"), szDrive, szHostName, pDrive->szSubmount);
! if (dddAction == DDD_REMOVE) {
! fResult = DefineDosDevice(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, szDrive, szAfsPath);
! if (!fResult)
! Message (MB_OK | MB_ICONHAND, IDS_ERROR_UNMAP, IDS_ERROR_UNMAP_DESC, TEXT("%08lX"), GetLastError());
! } else if (dddAction == DDD_ADD) {
! fResult = DefineDosDevice(DDD_RAW_TARGET_PATH, szDrive, szAfsPath);
! if (!fResult)
! Message (MB_OK | MB_ICONHAND, IDS_ERROR_MAP, IDS_ERROR_MAP_DESC, TEXT("%08lX"), GetLastError());
! }
+ */
+ if (fResult)
+ UpdateRegistry(pDrive, dddAction == DDD_REMOVE);
+
return fResult;
}
Index: openafs/src/WINNT/client_config/drivemap.cpp
diff -c openafs/src/WINNT/client_config/drivemap.cpp:1.5.4.2 openafs/src/WINNT/client_config/drivemap.cpp:1.5.4.2.2.1
*** openafs/src/WINNT/client_config/drivemap.cpp:1.5.4.2 Wed Nov 21 01:45:42 2001
--- openafs/src/WINNT/client_config/drivemap.cpp Sun Jan 20 04:23:09 2002
***************
*** 640,646 ****
Resource.lpLocalName = szLocal;
Resource.lpRemoteName = szRemote;
! DWORD rc = WNetAddConnection2 (&Resource, NULL, NULL, ((fPersistent) ? CONNECT_UPDATE_PROFILE : 0));
if (rc == NO_ERROR)
return TRUE;
--- 640,647 ----
Resource.lpLocalName = szLocal;
Resource.lpRemoteName = szRemote;
! // DWORD rc = WNetAddConnection2 (&Resource, NULL, NULL, ((fPersistent) ? CONNECT_UPDATE_PROFILE : 0));
! DWORD rc=MountDOSDrive(chDrive,szSubmount,fPersistent);
if (rc == NO_ERROR)
return TRUE;
***************
*** 652,661 ****
BOOL InactivateDriveMap (TCHAR chDrive, DWORD *pdwStatus)
{
! TCHAR szLocal[ MAX_PATH ] = TEXT("*:");
! szLocal[0] = chDrive;
!
! DWORD rc = WNetCancelConnection (szLocal, FALSE);
if (rc == NO_ERROR)
return TRUE;
--- 653,659 ----
BOOL InactivateDriveMap (TCHAR chDrive, DWORD *pdwStatus)
{
! DWORD rc = DisMountDOSDrive(chDrive, FALSE);
if (rc == NO_ERROR)
return TRUE;
***************
*** 764,771 ****
if (*(++pszSubmount) != TEXT('0'))
return FALSE;
! if (*(++pszSubmount) != TEXT('\\'))
! return FALSE;
for (++pszSubmount; *pszSubmount && (*pszSubmount != TEXT('\\')); ++pszSubmount)
if (!lstrncmpi (pszSubmount, TEXT("-afs\\"), lstrlen(TEXT("-afs\\"))))
break;
--- 762,773 ----
if (*(++pszSubmount) != TEXT('0'))
return FALSE;
! // scan for next "\"
! while (*(++pszSubmount) != TEXT('\\'))
! {
! if (*pszSubmount==0)
! return FALSE;
! }
for (++pszSubmount; *pszSubmount && (*pszSubmount != TEXT('\\')); ++pszSubmount)
if (!lstrncmpi (pszSubmount, TEXT("-afs\\"), lstrlen(TEXT("-afs\\"))))
break;
***************
*** 871,884 ****
BOOL TestAndDoMapShare(DWORD dwState)
{
! if ((dwState!=SERVICE_RUNNING) || (dwOldState!=SERVICE_START_PENDING)
! || (!RWLogonOption(TRUE,LOGON_OPTION_HIGHSECURITY)))
{
dwOldState=dwState;
return TRUE;
}
dwOldState=SERVICE_RUNNING;
! return DoMapShare();
}
BOOL IsServiceActive()
--- 873,887 ----
BOOL TestAndDoMapShare(DWORD dwState)
{
! if ((dwState!=SERVICE_RUNNING) || (dwOldState!=SERVICE_START_PENDING))
{
dwOldState=dwState;
return TRUE;
}
dwOldState=SERVICE_RUNNING;
! if (RWLogonOption(TRUE,LOGON_OPTION_HIGHSECURITY))
! return (DoMapShare() && GlobalMountDrive());
! return GlobalMountDrive();
}
BOOL IsServiceActive()
***************
*** 935,943 ****
if ((lpnrLocal[i].lpLocalName) && (strlen(lpnrLocal[i].lpLocalName)>0))
{
if (drivemap)
! WNetCancelConnection(lpnrLocal[i].lpLocalName,TRUE);
} else
! WNetCancelConnection(lpnrLocal[i].lpRemoteName,TRUE);
DEBUG_EVENT1("AFS DriveUnMap","UnMap-Remote=%x",res);
}
}
--- 938,948 ----
if ((lpnrLocal[i].lpLocalName) && (strlen(lpnrLocal[i].lpLocalName)>0))
{
if (drivemap)
! DisMountDOSDrive(*lpnrLocal[i].lpLocalName);
! //WNetCancelConnection(lpnrLocal[i].lpLocalName,TRUE);
} else
! DisMountDOSDriveFull(lpnrLocal[i].lpRemoteName);
! //WNetCancelConnection(lpnrLocal[i].lpRemoteName,TRUE);
DEBUG_EVENT1("AFS DriveUnMap","UnMap-Remote=%x",res);
}
}
***************
*** 994,1001 ****
}
}
// wasn't on list so lets remove
! sprintf(szPath,"\\\\%s-afs\\%s",szMachine,pSubmount);
! WNetCancelConnection(szPath,TRUE);
nextname:;
}
}
--- 999,1005 ----
}
}
// wasn't on list so lets remove
! DisMountDOSDrive(pSubmount);
nextname:;
}
}
***************
*** 1023,1030 ****
nr.dwType=RESOURCETYPE_DISK;
nr.lpLocalName="";
nr.lpRemoteName=szPath;
! DWORD res=WNetAddConnection2(&nr,NULL,pUser,0);
!
}
return TRUE;
}
--- 1027,1034 ----
nr.dwType=RESOURCETYPE_DISK;
nr.lpLocalName="";
nr.lpRemoteName=szPath;
! //DWORD res=WNetAddConnection2(&nr,NULL,pUser,0);
! DWORD res=MountDOSDrive(0,List.aSubmounts[j].szSubmount,FALSE,pUser);
}
return TRUE;
}
***************
*** 1055,1061 ****
nr.dwType=RESOURCETYPE_DISK;
nr.lpLocalName="";
nr.lpRemoteName=szPath;
! DWORD res=WNetAddConnection2(&nr,NULL,pUserName,0);
DEBUG_EVENT2("AFS DriveMap","Remote[%s]=%x",szPath,res);
if (strcmpi("all",List.aSubmounts[i].szSubmount)==0)
bMappedAll=TRUE;
--- 1059,1066 ----
nr.dwType=RESOURCETYPE_DISK;
nr.lpLocalName="";
nr.lpRemoteName=szPath;
! //DWORD res=WNetAddConnection2(&nr,NULL,pUserName,0);
! DWORD res=MountDOSDrive(0,List.aSubmounts[i].szSubmount,FALSE,pUserName);
DEBUG_EVENT2("AFS DriveMap","Remote[%s]=%x",szPath,res);
if (strcmpi("all",List.aSubmounts[i].szSubmount)==0)
bMappedAll=TRUE;
***************
*** 1069,1097 ****
nr.dwType=RESOURCETYPE_DISK;
nr.lpLocalName="";
nr.lpRemoteName=szPath;
! DWORD res=WNetAddConnection2(&nr,NULL,pUserName,0);
DEBUG_EVENT2("AFS DriveMap","Remote[%s]=%x",szPath,res);
if (res==ERROR_SESSION_CREDENTIAL_CONFLICT)
{
! WNetCancelConnection(szPath,TRUE);
! WNetAddConnection2(&nr,NULL,pUserName,0);
}
}
for (TCHAR chDrive = chDRIVE_A; chDrive <= chDRIVE_Z; ++chDrive)
{
- TCHAR szRemote[3];
if (List.aDriveMap[chDrive-chDRIVE_A].fActive)
{
! sprintf(szRemote,"%c:",chDrive);
! sprintf(szPath,"\\\\%s-afs\\%s",szMachine,List.aDriveMap[chDrive-chDRIVE_A].szSubmount);
! NETRESOURCE nr;
! memset (&nr, 0x00, sizeof(NETRESOURCE));
! nr.dwType=RESOURCETYPE_DISK;
! nr.lpLocalName=szRemote;
! nr.lpRemoteName=szPath;
! DWORD res=WNetAddConnection2(&nr,NULL,NULL,(List.aDriveMap[chDrive-chDRIVE_A].fPersistent)?CONNECT_UPDATE_PROFILE:0);
! DEBUG_EVENT3("AFS DriveMap","Persistant[%d] Remote[%s]=%x",List.aDriveMap[chDrive-chDRIVE_A].fPersistent,szPath,res);
}
}
return TRUE;
}
--- 1074,1182 ----
nr.dwType=RESOURCETYPE_DISK;
nr.lpLocalName="";
nr.lpRemoteName=szPath;
! DWORD res=MountDOSDrive(0,"all",FALSE,pUserName);
DEBUG_EVENT2("AFS DriveMap","Remote[%s]=%x",szPath,res);
if (res==ERROR_SESSION_CREDENTIAL_CONFLICT)
{
! DisMountDOSDrive("all");
! MountDOSDrive(0,"all",FALSE,pUserName);
}
}
for (TCHAR chDrive = chDRIVE_A; chDrive <= chDRIVE_Z; ++chDrive)
{
if (List.aDriveMap[chDrive-chDRIVE_A].fActive)
{
! DWORD res=MountDOSDrive(chDrive
! ,List.aDriveMap[chDrive-chDRIVE_A].szSubmount
! ,List.aDriveMap[chDrive-chDRIVE_A].fPersistent);
}
}
return TRUE;
+ }
+
+ BOOL GlobalMountDrive()
+ {
+ char szDriveToMapTo[5];
+ DWORD dwResult;
+ char szKeyName[256];
+ HKEY hKey;
+ DWORD dwIndex = 0;
+ DWORD dwDriveSize;
+ DWORD dwSubMountSize;
+ char unsigned szSubMount[256];
+ char cm_HostName[200];
+ DWORD dwType=sizeof(cm_HostName);
+ if (!IsServiceActive())
+ return TRUE;
+ if (!GetComputerName(cm_HostName, &dwType))
+ return TRUE;
+ sprintf(szKeyName, "%s\\GlobalAutoMapper", sAFSConfigKeyName);
+
+ dwResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKeyName, 0, KEY_QUERY_VALUE,
+ &hKey);
+ if (dwResult != ERROR_SUCCESS)
+ return TRUE;
+
+ while (1) {
+ dwDriveSize = sizeof(szDriveToMapTo);
+ dwSubMountSize = sizeof(szSubMount);
+ dwResult = RegEnumValue(hKey, dwIndex++, szDriveToMapTo, &dwDriveSize,
+ 0, &dwType, szSubMount, &dwSubMountSize);
+ if (dwResult != ERROR_MORE_DATA) {
+ if (dwResult != ERROR_SUCCESS) {
+ if (dwResult != ERROR_NO_MORE_ITEMS)
+ {
+ DEBUG_EVENT1("AFS DriveMap","Failed to read \GlobalAutoMapper values: %d",dwResult);
+ }
+ break;
+ }
+ }
+ dwResult=MountDOSDrive(*szDriveToMapTo,(const char *)szSubMount,FALSE);
+ }
+ RegCloseKey(hKey);
+ return TRUE;
+ }
+
+ DWORD MountDOSDrive(char chDrive,const char *szSubmount,BOOL bPersistent,const char * pUsername)
+ {
+ TCHAR szPath[MAX_PATH];
+ TCHAR szClient[MAX_PATH];
+ TCHAR szDrive[3] = TEXT("?:");
+ sprintf(szDrive,"%c:",chDrive);
+ GetClientNetbiosName (szClient);
+ sprintf(szPath,"\\\\%s\\%s",szClient,szSubmount);
+ NETRESOURCE nr;
+ memset (&nr, 0x00, sizeof(NETRESOURCE));
+ nr.dwType=RESOURCETYPE_DISK;
+ nr.lpLocalName=szDrive;
+ nr.lpRemoteName=szPath;
+ nr.dwDisplayType = RESOURCEDISPLAYTYPE_GENERIC;
+ nr.dwDisplayType = RESOURCEDISPLAYTYPE_SHARE;
+ DWORD res=WNetAddConnection2(&nr,NULL,pUsername,(bPersistent)?CONNECT_UPDATE_PROFILE:0);
+ DEBUG_EVENT3("AFS DriveMap","Mount %s Remote[%s]=%x",(bPersistent)?"Persistant" : "NonPresistant",szPath,res);
+ return res;
+ }
+
+ DWORD DisMountDOSDriveFull(const char *szPath,BOOL bForce)
+ {
+ DWORD res=WNetCancelConnection(szPath,bForce);
+ DEBUG_EVENT2("AFS DriveMap","Dismount Remote[%s]=%x",szPath,res);
+ return (res==ERROR_NOT_CONNECTED)?NO_ERROR:res;
+ }
+
+ DWORD DisMountDOSDrive(const char *pSubmount,BOOL bForce)
+ {
+ TCHAR szPath[MAX_PATH];
+ TCHAR szClient[MAX_PATH];
+ GetClientNetbiosName (szClient);
+ sprintf(szPath,"\\\\%s\\%s",szClient,pSubmount);
+ return DisMountDOSDriveFull(szPath,bForce);
+ }
+
+
+ DWORD DisMountDOSDrive(const char chDrive,BOOL bForce)
+ {
+ TCHAR szPath[MAX_PATH];
+ sprintf(szPath,"%c:",chDrive);
+ return DisMountDOSDriveFull(szPath,bForce);
}
Index: openafs/src/WINNT/client_config/drivemap.h
diff -c openafs/src/WINNT/client_config/drivemap.h:1.2.8.1 openafs/src/WINNT/client_config/drivemap.h:1.2.8.1.2.1
*** openafs/src/WINNT/client_config/drivemap.h:1.2.8.1 Wed Nov 14 22:38:48 2001
--- openafs/src/WINNT/client_config/drivemap.h Sun Jan 20 04:23:09 2002
***************
*** 91,96 ****
--- 91,101 ----
void DoUnMapShare(BOOL);
BOOL DoMapShareChange();
DWORD RWLogonOption(BOOL read,DWORD value);
+ BOOL GlobalMountDrive();
+ DWORD MountDOSDrive(char chDrive,const char *szSubmount,BOOL bPresistant=TRUE,const char *puser=NULL);
+ DWORD DisMountDOSDrive(const char *szSubmount,BOOL bForce=TRUE);
+ DWORD DisMountDOSDrive(char chDrive,BOOL bForce=TRUE);
+ DWORD DisMountDOSDriveFull(const char *pPath,BOOL bForce=TRUE);
#ifndef DRIVEMAP_DEF_H
extern void TestAndDoUnMapShare();
extern TCHAR pUserName[];
Index: openafs/src/WINNT/client_creds/NTMakefile
diff -c openafs/src/WINNT/client_creds/NTMakefile:1.2 openafs/src/WINNT/client_creds/NTMakefile:1.2.10.1
*** openafs/src/WINNT/client_creds/NTMakefile:1.2 Sat Nov 4 05:02:45 2000
--- openafs/src/WINNT/client_creds/NTMakefile Sun Jan 20 04:23:10 2002
***************
*** 14,20 ****
AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I ..\afsd
# include the primary makefile
-
!INCLUDE ..\..\config\NTMakefile.$(SYS_NAME)
!INCLUDE ..\..\config\NTMakefile.version
--- 14,19 ----
Index: openafs/src/WINNT/client_creds/main.cpp
diff -c openafs/src/WINNT/client_creds/main.cpp:1.2.8.1 openafs/src/WINNT/client_creds/main.cpp:1.2.8.1.2.1
*** openafs/src/WINNT/client_creds/main.cpp:1.2.8.1 Wed Nov 14 22:38:49 2001
--- openafs/src/WINNT/client_creds/main.cpp Sun Jan 20 04:23:10 2002
***************
*** 15,22 ****
#include "afscreds.h"
#include "..\afsreg\afsreg.h" // So we can see if the server's installed
#include "drivemap.h"
-
/*
* DEFINITIONS ________________________________________________________________
*
--- 15,25 ----
#include "afscreds.h"
#include "..\afsreg\afsreg.h" // So we can see if the server's installed
#include "drivemap.h"
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <osilog.h>
+ #include "rxkad.h"
/*
* DEFINITIONS ________________________________________________________________
*
***************
*** 70,75 ****
--- 73,80 ----
return 0;
}
+ #define ISHIGHSECURITY(v) ( ((v) & LOGON_OPTION_HIGHSECURITY)==LOGON_OPTION_HIGHSECURITY)
+ #define REG_CLIENT_PROVIDER_KEY "SYSTEM\\CurrentControlSet\\Services\\TransarcAFSDaemon\\NetworkProvider"
BOOL InitApp (LPSTR pszCmdLineA)
{
***************
*** 117,124 ****
break;
case 'x':
case 'X':
! DoMapShare();
! return 0;
}
while (*pszCmdLineA && (*pszCmdLineA != ' '))
--- 122,140 ----
break;
case 'x':
case 'X':
! DWORD LogonOption;
! DWORD LSPtype, LSPsize;
! HKEY NPKey;
! LSPsize=sizeof(LogonOption);
! (void) RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CLIENT_PROVIDER_KEY,
! 0, KEY_QUERY_VALUE, &NPKey);
! RegQueryValueEx(NPKey, "LogonOptions", NULL,
! &LSPtype, (LPBYTE)&LogonOption, &LSPsize);
! RegCloseKey (NPKey);
! if (ISHIGHSECURITY(LogonOption))
! DoMapShare();
! GlobalMountDrive();
! return 0;
}
while (*pszCmdLineA && (*pszCmdLineA != ' '))
Index: openafs/src/WINNT/install/InstallShield5/Default.txt
diff -c openafs/src/WINNT/install/InstallShield5/Default.txt:1.2.2.1 openafs/src/WINNT/install/InstallShield5/Default.txt:1.2.2.1.2.1
*** openafs/src/WINNT/install/InstallShield5/Default.txt:1.2.2.1 Wed Nov 14 22:38:50 2001
--- openafs/src/WINNT/install/InstallShield5/Default.txt Sun Jan 20 04:23:11 2002
***************
*** 195,201 ****
---Comment---=
(Default)=S,
Class=N,2
! LogonOptions=N,2
Name=S,TransarcAFSDaemon
LogonScript=S,<TARGETDIR>\Client\Program\afscreds.exe -:%s -x
ProviderPath=S,<LOGON_DLL>
--- 195,201 ----
---Comment---=
(Default)=S,
Class=N,2
! LogonOptions=N,0
Name=S,TransarcAFSDaemon
LogonScript=S,<TARGETDIR>\Client\Program\afscreds.exe -:%s -x
ProviderPath=S,<LOGON_DLL>
Index: openafs/src/WINNT/install/InstallShield5/GenFileGroups.bat
diff -c openafs/src/WINNT/install/InstallShield5/GenFileGroups.bat:1.5 openafs/src/WINNT/install/InstallShield5/GenFileGroups.bat:1.5.4.1
*** openafs/src/WINNT/install/InstallShield5/GenFileGroups.bat:1.5 Thu Sep 6 22:55:00 2001
--- openafs/src/WINNT/install/InstallShield5/GenFileGroups.bat Sun Jan 20 04:23:11 2002
***************
*** 54,60 ****
echo file0=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Client_Common_Files.fgl
echo file1=%IS5_DEST%\lib\afsrpc.dll >> Client_Common_Files.fgl
echo file2=%IS5_DEST%\lib\afsauthent.dll >> Client_Common_Files.fgl
! echo file3=%IS5_DEST%\lib\pthread.dll >> Client_Common_Files.fgl
echo file4=%IS5_DEST%\root.server\usr\afs\bin\afsprocmgmt.dll >> Client_Common_Files.fgl
echo file5=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Client_Common_Files.fgl
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Client_Common_Files.fgl
--- 54,60 ----
echo file0=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Client_Common_Files.fgl
echo file1=%IS5_DEST%\lib\afsrpc.dll >> Client_Common_Files.fgl
echo file2=%IS5_DEST%\lib\afsauthent.dll >> Client_Common_Files.fgl
! echo file3=%IS5_DEST%\lib\afspthread.dll >> Client_Common_Files.fgl
echo file4=%IS5_DEST%\root.server\usr\afs\bin\afsprocmgmt.dll >> Client_Common_Files.fgl
echo file5=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Client_Common_Files.fgl
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Client_Common_Files.fgl
***************
*** 130,136 ****
echo file0=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Light_Client_Common_Files.fgl
echo file1=%IS5_DEST%\lib\afsrpc.dll >> Light_Client_Common_Files.fgl
echo file2=%IS5_DEST%\lib\afsauthent.dll >> Light_Client_Common_Files.fgl
! echo file3=%IS5_DEST%\lib\pthread.dll >> Light_Client_Common_Files.fgl
echo file4=%IS5_DEST%\root.server\usr\afs\bin\afsprocmgmt.dll >> Light_Client_Common_Files.fgl
echo file5=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Light_Client_Common_Files.fgl
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Light_Client_Common_Files.fgl
--- 130,136 ----
echo file0=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Light_Client_Common_Files.fgl
echo file1=%IS5_DEST%\lib\afsrpc.dll >> Light_Client_Common_Files.fgl
echo file2=%IS5_DEST%\lib\afsauthent.dll >> Light_Client_Common_Files.fgl
! echo file3=%IS5_DEST%\lib\afspthread.dll >> Light_Client_Common_Files.fgl
echo file4=%IS5_DEST%\root.server\usr\afs\bin\afsprocmgmt.dll >> Light_Client_Common_Files.fgl
echo file5=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Light_Client_Common_Files.fgl
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Light_Client_Common_Files.fgl
***************
*** 188,194 ****
echo file0=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Light95_Client_Common_Files.fgl
echo file1=%IS5_DEST%\lib\afsrpc.dll >> Light95_Client_Common_Files.fgl
echo file2=%IS5_DEST%\lib\afsauthent.dll >> Light95_Client_Common_Files.fgl
! echo file3=%IS5_DEST%\lib\win95\pthread.dll >> Light95_Client_Common_Files.fgl
echo file4=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Light95_Client_Common_Files.fgl
echo file5=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Light95_Client_Common_Files.fgl
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsclientadmin.dll >> Light95_Client_Common_Files.fgl
--- 188,194 ----
echo file0=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Light95_Client_Common_Files.fgl
echo file1=%IS5_DEST%\lib\afsrpc.dll >> Light95_Client_Common_Files.fgl
echo file2=%IS5_DEST%\lib\afsauthent.dll >> Light95_Client_Common_Files.fgl
! echo file3=%IS5_DEST%\lib\win95\afspthread.dll >> Light95_Client_Common_Files.fgl
echo file4=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Light95_Client_Common_Files.fgl
echo file5=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Light95_Client_Common_Files.fgl
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsclientadmin.dll >> Light95_Client_Common_Files.fgl
***************
*** 258,264 ****
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Server_Common_Files.fgl
echo file7=%IS5_DEST%\lib\afsrpc.dll >> Server_Common_Files.fgl
echo file8=%IS5_DEST%\lib\afsauthent.dll >> Server_Common_Files.fgl
! echo file9=%IS5_DEST%\lib\pthread.dll >> Server_Common_Files.fgl
echo file10=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Server_Common_Files.fgl
echo file11=%IS5_DEST%\root.server\usr\afs\bin\afsprocmgmt.dll >> Server_Common_Files.fgl
echo. >> Server_Common_Files.fgl
--- 258,264 ----
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Server_Common_Files.fgl
echo file7=%IS5_DEST%\lib\afsrpc.dll >> Server_Common_Files.fgl
echo file8=%IS5_DEST%\lib\afsauthent.dll >> Server_Common_Files.fgl
! echo file9=%IS5_DEST%\lib\afspthread.dll >> Server_Common_Files.fgl
echo file10=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Server_Common_Files.fgl
echo file11=%IS5_DEST%\root.server\usr\afs\bin\afsprocmgmt.dll >> Server_Common_Files.fgl
echo. >> Server_Common_Files.fgl
***************
*** 312,318 ****
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Control_Center_Common_Files.fgl
echo file7=%IS5_DEST%\lib\afsrpc.dll >> Control_Center_Common_Files.fgl
echo file8=%IS5_DEST%\lib\afsauthent.dll >> Control_Center_Common_Files.fgl
! echo file9=%IS5_DEST%\lib\pthread.dll >> Control_Center_Common_Files.fgl
echo file10=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Control_Center_Common_Files.fgl
echo file11=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Control_Center_Common_Files.fgl
echo. >> Control_Center_Common_Files.fgl
--- 312,318 ----
echo file6=%IS5_DEST%\root.server\usr\afs\bin\afsadminutil.dll >> Control_Center_Common_Files.fgl
echo file7=%IS5_DEST%\lib\afsrpc.dll >> Control_Center_Common_Files.fgl
echo file8=%IS5_DEST%\lib\afsauthent.dll >> Control_Center_Common_Files.fgl
! echo file9=%IS5_DEST%\lib\afspthread.dll >> Control_Center_Common_Files.fgl
echo file10=%IS5_DEST%\root.server\usr\afs\bin\TaAfsAppLib.dll >> Control_Center_Common_Files.fgl
echo file11=%IS5_DEST%\root.client\usr\vice\etc\afs_config.exe >> Control_Center_Common_Files.fgl
echo. >> Control_Center_Common_Files.fgl
Index: openafs/src/WINNT/install/InstallShield5/setup.rul
diff -c openafs/src/WINNT/install/InstallShield5/setup.rul:1.5 openafs/src/WINNT/install/InstallShield5/setup.rul:1.5.4.1
*** openafs/src/WINNT/install/InstallShield5/setup.rul:1.5 Thu Sep 6 22:55:00 2001
--- openafs/src/WINNT/install/InstallShield5/setup.rul Sun Jan 20 04:23:11 2002
***************
*** 442,447 ****
--- 442,448 ----
szErrMsg=" ";
Enable (STATUS);
SetStatusWindow (50, "Now Downloading CellServDB file...");
+ CreateDir(TARGETDIR);
nResult=GetWebPage(szErrMsg,szDestFile,szDefaultWeb);
SetStatusWindow (100, "Downloading completed.");
Delay (2);
Index: openafs/src/WINNT/install/Win9x/NTMakeFile
diff -c openafs/src/WINNT/install/Win9x/NTMakeFile:1.3.2.1 openafs/src/WINNT/install/Win9x/NTMakeFile:1.3.2.1.2.1
*** openafs/src/WINNT/install/Win9x/NTMakeFile:1.3.2.1 Wed Nov 14 22:38:51 2001
--- openafs/src/WINNT/install/Win9x/NTMakeFile Sun Jan 20 04:23:12 2002
***************
*** 29,35 ****
$(DESTDIR)\root.client\usr\vice\etc\libosi.dll \
$(DESTDIR)\root.client\usr\vice\etc\libafsconf.dll \
$(DESTDIR)\root.client\usr\vice\etc\afs_shl_ext.dll \
! $(DESTDIR)\lib\win95\pthread.dll \
$(DESTDIR)\lib\afsrpc.dll
$(COMPONENTS)::
--- 29,35 ----
$(DESTDIR)\root.client\usr\vice\etc\libosi.dll \
$(DESTDIR)\root.client\usr\vice\etc\libafsconf.dll \
$(DESTDIR)\root.client\usr\vice\etc\afs_shl_ext.dll \
! $(DESTDIR)\lib\win95\afspthread.dll \
$(DESTDIR)\lib\afsrpc.dll
$(COMPONENTS)::
Index: openafs/src/WINNT/pthread/NTMakefile
diff -c openafs/src/WINNT/pthread/NTMakefile:1.5 openafs/src/WINNT/pthread/NTMakefile:1.5.4.1
*** openafs/src/WINNT/pthread/NTMakefile:1.5 Sat Sep 8 00:31:27 2001
--- openafs/src/WINNT/pthread/NTMakefile Sun Jan 20 04:23:12 2002
***************
*** 16,24 ****
$(DESTDIR)\include\pthread.h
############################################################################
! # Build standard pthread.dll
! PTHR_DLLFILE = $(DESTDIR)\lib\pthread.dll
PTHR_DLLOBJS = \
pthread.obj \
--- 16,24 ----
$(DESTDIR)\include\pthread.h
############################################################################
! # Build standard afspthread.dll
! PTHR_DLLFILE = $(DESTDIR)\lib\afspthread.dll
PTHR_DLLOBJS = \
pthread.obj \
***************
*** 29,37 ****
$(DLLPREP)
############################################################################
! # Build Windows 95 version of pthread.dll
! PTHR95_DLLFILE = $(DESTDIR)\lib\win95\pthread.dll
PTHR95_DLLOBJS = \
pthread_95.obj \
--- 29,37 ----
$(DLLPREP)
############################################################################
! # Build Windows 95 version of afspthread.dll
! PTHR95_DLLFILE = $(DESTDIR)\lib\win95\afspthread.dll
PTHR95_DLLOBJS = \
pthread_95.obj \
Index: openafs/src/WINNT/pthread/test/NTMakefile
diff -c openafs/src/WINNT/pthread/test/NTMakefile:1.2 openafs/src/WINNT/pthread/test/NTMakefile:1.2.10.1
*** openafs/src/WINNT/pthread/test/NTMakefile:1.2 Sat Nov 4 05:03:05 2000
--- openafs/src/WINNT/pthread/test/NTMakefile Sun Jan 20 04:23:13 2002
***************
*** 10,21 ****
test tests: ptest.exe tsd.exe native.exe
! ptest.exe: ptest.obj $(DESTDIR)/lib/pthread.lib $(DESTDIR)/lib/afs/afsutil.lib
$(EXECONLINK)
! tsd.exe: tsd.obj $(DESTDIR)/lib/pthread.lib $(DESTDIR)/lib/afs/afsutil.lib
$(EXECONLINK)
! native.exe: native.obj $(DESTDIR)/lib/pthread.lib $(DESTDIR)/lib/afs/afsutil.lib
$(EXECONLINK)
--- 10,21 ----
test tests: ptest.exe tsd.exe native.exe
! ptest.exe: ptest.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
$(EXECONLINK)
! tsd.exe: tsd.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
$(EXECONLINK)
! native.exe: native.obj $(DESTDIR)/lib/afspthread.lib $(DESTDIR)/lib/afs/afsutil.lib
$(EXECONLINK)
Index: openafs/src/config/NTDllmap.txt
diff -c openafs/src/config/NTDllmap.txt:1.1 openafs/src/config/NTDllmap.txt:1.1.14.1
*** openafs/src/config/NTDllmap.txt:1.1 Fri Nov 3 21:25:34 2000
--- openafs/src/config/NTDllmap.txt Sun Jan 20 04:23:13 2002
***************
*** 1,4 ****
! pthread.dll 0x61000000 0x00080000
afsrpc.dll 0x61080000 0x00080000
afsauthent.dll 0x61100000 0x00080000
afspioctl.dll 0x61200000 0x00080000
--- 1,4 ----
! afspthread.dll 0x61000000 0x00080000
afsrpc.dll 0x61080000 0x00080000
afsauthent.dll 0x61100000 0x00080000
afspioctl.dll 0x61200000 0x00080000
Index: openafs/src/config/NTMakefile.i386_nt40
diff -c openafs/src/config/NTMakefile.i386_nt40:1.6.2.2 openafs/src/config/NTMakefile.i386_nt40:1.6.2.2.2.1
*** openafs/src/config/NTMakefile.i386_nt40:1.6.2.2 Wed Nov 14 22:38:52 2001
--- openafs/src/config/NTMakefile.i386_nt40 Sun Jan 20 04:23:13 2002
***************
*** 37,43 ****
!ENDIF
#define used in WinNT/2000 installation and program version display
! AFSPRODUCT_VERSION=1.2.2 a
CELLNAME_DEFAULT=Your Cell Name
CELLSERVDB_INSTALL=CellServDB.GrandCentral
CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
--- 37,43 ----
!ENDIF
#define used in WinNT/2000 installation and program version display
! AFSPRODUCT_VERSION=1.2.2 b
CELLNAME_DEFAULT=Your Cell Name
CELLSERVDB_INSTALL=CellServDB.GrandCentral
CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
***************
*** 312,318 ****
RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(AFSPRODUCT_VERSION)\""
# Lex/Yacc macros
! LEX = flex -l
YACC = bison
# Inference rules for building and installing targets
--- 312,318 ----
RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(AFSPRODUCT_VERSION)\""
# Lex/Yacc macros
! LEX =1.2.2 a
YACC = bison
# Inference rules for building and installing targets
Index: openafs/src/config/NTMakefile.i386_win95
diff -c openafs/src/config/NTMakefile.i386_win95:1.3.2.2 openafs/src/config/NTMakefile.i386_win95:1.3.2.2.2.1
*** openafs/src/config/NTMakefile.i386_win95:1.3.2.2 Wed Nov 14 22:38:52 2001
--- openafs/src/config/NTMakefile.i386_win95 Sun Jan 20 04:23:13 2002
***************
*** 37,43 ****
!ENDIF
#define used in Win9x installation and program version display
! AFSPRODUCT_VERSION=1.1.1 a
CELLNAME_DEFAULT=Your Cell Name
CELLSERVDB_INSTALL=CellServDB.GrandCentral
CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
--- 37,43 ----
!ENDIF
#define used in Win9x installation and program version display
! AFSPRODUCT_VERSION=1.2.2 b
CELLNAME_DEFAULT=Your Cell Name
CELLSERVDB_INSTALL=CellServDB.GrandCentral
CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
Index: openafs/src/kauth/kautils.p.h
diff -c openafs/src/kauth/kautils.p.h:1.4.4.1 openafs/src/kauth/kautils.p.h:1.4.4.1.2.1
*** openafs/src/kauth/kautils.p.h:1.4.4.1 Wed Sep 19 18:40:34 2001
--- openafs/src/kauth/kautils.p.h Sun Jan 20 04:23:14 2002
***************
*** 279,284 ****
--- 279,296 ----
char **reasonP
);
+ extern afs_int32 ka_UserAuthenticateGeneral2 (
+ afs_int32 flags,
+ char *name,
+ char *instance,
+ char *realm,
+ char *password,
+ char *smbname,
+ Date lifetime,
+ afs_int32 *password_expires,
+ afs_int32 spare2,
+ char **reasonP
+ );
extern afs_int32 ka_UserAuthenticate (
char *name,
char *instance,
Index: openafs/src/libadmin/adminutil/NTMakefile
diff -c openafs/src/libadmin/adminutil/NTMakefile:1.2 openafs/src/libadmin/adminutil/NTMakefile:1.2.10.1
*** openafs/src/libadmin/adminutil/NTMakefile:1.2 Sat Nov 4 05:04:46 2000
--- openafs/src/libadmin/adminutil/NTMakefile Sun Jan 20 04:23:14 2002
***************
*** 105,111 ****
ILIBDIR = $(DESTDIR)\lib\afs
DLLLIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afsrpc.lib \
$(DESTDIR)\lib\afsauthent.lib
--- 105,111 ----
ILIBDIR = $(DESTDIR)\lib\afs
DLLLIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afsrpc.lib \
$(DESTDIR)\lib\afsauthent.lib
Index: openafs/src/libadmin/bos/NTMakefile
diff -c openafs/src/libadmin/bos/NTMakefile:1.2 openafs/src/libadmin/bos/NTMakefile:1.2.10.1
*** openafs/src/libadmin/bos/NTMakefile:1.2 Sat Nov 4 05:04:48 2000
--- openafs/src/libadmin/bos/NTMakefile Sun Jan 20 04:23:15 2002
***************
*** 35,41 ****
$(DESTDIR)\lib\afs\afsvosadmin.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\pthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:bosadmin.def
--- 35,41 ----
$(DESTDIR)\lib\afs\afsvosadmin.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\afspthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:bosadmin.def
Index: openafs/src/libadmin/cfg/NTMakefile
diff -c openafs/src/libadmin/cfg/NTMakefile:1.2 openafs/src/libadmin/cfg/NTMakefile:1.2.10.1
*** openafs/src/libadmin/cfg/NTMakefile:1.2 Sat Nov 4 05:04:49 2000
--- openafs/src/libadmin/cfg/NTMakefile Sun Jan 20 04:23:15 2002
***************
*** 40,46 ****
afscfgadmin.res
DLLLIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afs\afsbosadmin.lib \
$(DESTDIR)\lib\afs\afskasadmin.lib \
--- 40,46 ----
afscfgadmin.res
DLLLIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afs\afsbosadmin.lib \
$(DESTDIR)\lib\afs\afskasadmin.lib \
Index: openafs/src/libadmin/cfg/test/NTMakefile
diff -c openafs/src/libadmin/cfg/test/NTMakefile:1.2 openafs/src/libadmin/cfg/test/NTMakefile:1.2.10.1
*** openafs/src/libadmin/cfg/test/NTMakefile:1.2 Sat Nov 4 05:04:51 2000
--- openafs/src/libadmin/cfg/test/NTMakefile Sun Jan 20 04:23:16 2002
***************
*** 13,19 ****
test tests: cfgtest.exe
CFGTEST_EXELIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afs\afsclientadmin.lib \
$(DESTDIR)\lib\afs\afscfgadmin.lib \
--- 13,19 ----
test tests: cfgtest.exe
CFGTEST_EXELIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afs\afsclientadmin.lib \
$(DESTDIR)\lib\afs\afscfgadmin.lib \
Index: openafs/src/libadmin/client/NTMakefile
diff -c openafs/src/libadmin/client/NTMakefile:1.2 openafs/src/libadmin/client/NTMakefile:1.2.10.1
*** openafs/src/libadmin/client/NTMakefile:1.2 Sat Nov 4 05:04:51 2000
--- openafs/src/libadmin/client/NTMakefile Sun Jan 20 04:23:18 2002
***************
*** 26,32 ****
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\pthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:clientadmin.def
--- 26,32 ----
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\afspthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:clientadmin.def
Index: openafs/src/libadmin/kas/NTMakefile
diff -c openafs/src/libadmin/kas/NTMakefile:1.2 openafs/src/libadmin/kas/NTMakefile:1.2.10.1
*** openafs/src/libadmin/kas/NTMakefile:1.2 Sat Nov 4 05:04:52 2000
--- openafs/src/libadmin/kas/NTMakefile Sun Jan 20 04:23:18 2002
***************
*** 31,37 ****
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\pthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:kasadmin.def
--- 31,37 ----
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\afspthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:kasadmin.def
Index: openafs/src/libadmin/pts/NTMakefile
diff -c openafs/src/libadmin/pts/NTMakefile:1.2 openafs/src/libadmin/pts/NTMakefile:1.2.10.1
*** openafs/src/libadmin/pts/NTMakefile:1.2 Sat Nov 4 05:04:53 2000
--- openafs/src/libadmin/pts/NTMakefile Sun Jan 20 04:23:19 2002
***************
*** 33,39 ****
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\pthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:ptsadmin.def
--- 33,39 ----
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib \
! $(DESTDIR)\lib\afspthread.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
$(DLLCONLINK) /DEF:ptsadmin.def
Index: openafs/src/libadmin/test/NTMakefile
diff -c openafs/src/libadmin/test/NTMakefile:1.2 openafs/src/libadmin/test/NTMakefile:1.2.10.1
*** openafs/src/libadmin/test/NTMakefile:1.2 Sat Nov 4 05:04:58 2000
--- openafs/src/libadmin/test/NTMakefile Sun Jan 20 04:23:19 2002
***************
*** 13,19 ****
install test tests: afscp.exe
AFSCP_EXELIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afs\afsclientadmin.lib \
$(DESTDIR)\lib\afs\afsbosadmin.lib \
--- 13,19 ----
install test tests: afscp.exe
AFSCP_EXELIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afs\afsclientadmin.lib \
$(DESTDIR)\lib\afs\afsbosadmin.lib \
Index: openafs/src/libadmin/vos/NTMakefile
diff -c openafs/src/libadmin/vos/NTMakefile:1.2 openafs/src/libadmin/vos/NTMakefile:1.2.10.1
*** openafs/src/libadmin/vos/NTMakefile:1.2 Sat Nov 4 05:05:01 2000
--- openafs/src/libadmin/vos/NTMakefile Sun Jan 20 04:23:20 2002
***************
*** 50,56 ****
ILIBDIR = $(DESTDIR)\lib\afs
DLLLIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib
--- 50,56 ----
ILIBDIR = $(DESTDIR)\lib\afs
DLLLIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsadminutil.lib \
$(DESTDIR)\lib\afsauthent.lib \
$(DESTDIR)\lib\afsrpc.lib
Index: openafs/src/libafsauthent/NTMakefile
diff -c openafs/src/libafsauthent/NTMakefile:1.3.4.1 openafs/src/libafsauthent/NTMakefile:1.3.4.1.2.1
*** openafs/src/libafsauthent/NTMakefile:1.3.4.1 Sat Oct 13 00:21:39 2001
--- openafs/src/libafsauthent/NTMakefile Sun Jan 20 04:23:20 2002
***************
*** 209,217 ****
DLLLIBS =\
!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
! $(DESTDIR)\lib\win95\pthread.lib \
!ELSE
! $(DESTDIR)\lib\pthread.lib \
!ENDIF
$(DESTDIR)\lib\afsrpc.lib \
$(DESTDIR)\lib\afsdes.lib \
--- 209,217 ----
DLLLIBS =\
!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
! $(DESTDIR)\lib\win95\afspthread.lib \
!ELSE
! $(DESTDIR)\lib\afspthread.lib \
!ENDIF
$(DESTDIR)\lib\afsrpc.lib \
$(DESTDIR)\lib\afsdes.lib \
Index: openafs/src/libafsrpc/NTMakefile
diff -c openafs/src/libafsrpc/NTMakefile:1.4 openafs/src/libafsrpc/NTMakefile:1.4.6.1
*** openafs/src/libafsrpc/NTMakefile:1.4 Mon Apr 30 03:02:26 2001
--- openafs/src/libafsrpc/NTMakefile Sun Jan 20 04:23:21 2002
***************
*** 257,265 ****
DLLLIBS =\
!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
! $(DESTDIR)\lib\win95\pthread.lib \
!ELSE
! $(DESTDIR)\lib\pthread.lib \
!ENDIF
$(DESTDIR)\lib\afs\afsutil.lib \
$(DESTDIR)\lib\afs\afsreg.lib
--- 257,265 ----
DLLLIBS =\
!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
! $(DESTDIR)\lib\win95\afspthread.lib \
!ELSE
! $(DESTDIR)\lib\afspthread.lib \
!ENDIF
$(DESTDIR)\lib\afs\afsutil.lib \
$(DESTDIR)\lib\afs\afsreg.lib
Index: openafs/src/procmgmt/NTMakefile
diff -c openafs/src/procmgmt/NTMakefile:1.3 openafs/src/procmgmt/NTMakefile:1.3.6.1
*** openafs/src/procmgmt/NTMakefile:1.3 Mon Apr 30 03:03:25 2001
--- openafs/src/procmgmt/NTMakefile Sun Jan 20 04:23:21 2002
***************
*** 27,33 ****
afsprocmgmt.res
DLLLIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afs\afsutil.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
--- 27,33 ----
afsprocmgmt.res
DLLLIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsutil.lib
$(DLLFILE): $(DLLOBJS) $(DLLLIBS)
Index: openafs/src/procmgmt/test/NTMakefile
diff -c openafs/src/procmgmt/test/NTMakefile:1.2 openafs/src/procmgmt/test/NTMakefile:1.2.10.1
*** openafs/src/procmgmt/test/NTMakefile:1.2 Sat Nov 4 05:05:22 2000
--- openafs/src/procmgmt/test/NTMakefile Sun Jan 20 04:23:22 2002
***************
*** 10,16 ****
test tests: pmgttest.exe
PMGTTEST_EXELIBS =\
! $(DESTDIR)\lib\pthread.lib \
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afsutil.lib
--- 10,16 ----
test tests: pmgttest.exe
PMGTTEST_EXELIBS =\
! $(DESTDIR)\lib\afspthread.lib \
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afsutil.lib
Index: openafs/src/tbutc/NTMakefile
diff -c openafs/src/tbutc/NTMakefile:1.6.2.2 openafs/src/tbutc/NTMakefile:1.6.2.2.2.1
*** openafs/src/tbutc/NTMakefile:1.6.2.2 Wed Nov 14 22:30:30 2001
--- openafs/src/tbutc/NTMakefile Sun Jan 20 04:23:24 2002
***************
*** 69,77 ****
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afseventlog.lib \
!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
! $(DESTDIR)\lib\win95\pthread.lib \
!ELSE
! $(DESTDIR)\lib\pthread.lib \
!ENDIF
$(DESTDIR)\lib\afsdes.lib \
$(DESTDIR)\lib\cm_dns.obj
--- 69,77 ----
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afseventlog.lib \
!IF (("$(SYS_NAME)"=="i386_win95" ) || ("$(SYS_NAME)"=="I386_WIN95" ))
! $(DESTDIR)\lib\win95\afspthread.lib \
!ELSE
! $(DESTDIR)\lib\afspthread.lib \
!ENDIF
$(DESTDIR)\lib\afsdes.lib \
$(DESTDIR)\lib\cm_dns.obj
Index: openafs/src/tviced/NTMakefile
diff -c openafs/src/tviced/NTMakefile:1.4 openafs/src/tviced/NTMakefile:1.4.4.1
*** openafs/src/tviced/NTMakefile:1.4 Sun Aug 19 10:44:47 2001
--- openafs/src/tviced/NTMakefile Sun Jan 20 04:23:24 2002
***************
*** 191,197 ****
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afseventlog.lib \
$(DESTDIR)\lib\afs\afsutil.lib \
! $(DESTDIR)\lib\pthread.lib
$(EXEFILE): $(EXEOBJS) $(EXELIBS)
$(EXECONLINK)
--- 191,197 ----
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afseventlog.lib \
$(DESTDIR)\lib\afs\afsutil.lib \
! $(DESTDIR)\lib\afspthread.lib
$(EXEFILE): $(EXEOBJS) $(EXELIBS)
$(EXECONLINK)
Index: openafs/src/vol/NTMakefile
diff -c openafs/src/vol/NTMakefile:1.2 openafs/src/vol/NTMakefile:1.2.10.1
*** openafs/src/vol/NTMakefile:1.2 Sat Nov 4 05:06:21 2000
--- openafs/src/vol/NTMakefile Sun Jan 20 04:23:25 2002
***************
*** 63,69 ****
$(DESTDIR)\lib\afs\afsreg.lib \
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afseventlog.lib \
! $(DESTDIR)\lib\pthread.lib
############################################################################
# build salvager
--- 63,69 ----
$(DESTDIR)\lib\afs\afsreg.lib \
$(DESTDIR)\lib\afs\afsprocmgmt.lib \
$(DESTDIR)\lib\afs\afseventlog.lib \
! $(DESTDIR)\lib\afspthread.lib
############################################################################
# build salvager