Index: openafs/src/WINNT/afsd/afsd_init.c diff -c openafs/src/WINNT/afsd/afsd_init.c:1.40.2.32 openafs/src/WINNT/afsd/afsd_init.c:1.40.2.33 *** openafs/src/WINNT/afsd/afsd_init.c:1.40.2.32 Wed Aug 9 22:46:58 2006 --- openafs/src/WINNT/afsd/afsd_init.c Sat Aug 26 12:13:43 2006 *************** *** 268,274 **** HKEY hkMSV10; HKEY hkClient; DWORD dwType; ! DWORD dwSize, dwAllocSize; DWORD dwValue; PBYTE pHostNames = NULL, pName = NULL; BOOL bNameFound = FALSE; --- 268,274 ---- HKEY hkMSV10; HKEY hkClient; DWORD dwType; ! DWORD dwSize = 0, dwAllocSize = 0; DWORD dwValue; PBYTE pHostNames = NULL, pName = NULL; BOOL bNameFound = FALSE; Index: openafs/src/WINNT/afsd/cm_volume.c diff -c openafs/src/WINNT/afsd/cm_volume.c:1.8.2.6 openafs/src/WINNT/afsd/cm_volume.c:1.8.2.7 *** openafs/src/WINNT/afsd/cm_volume.c:1.8.2.6 Wed Aug 31 20:07:41 2005 --- openafs/src/WINNT/afsd/cm_volume.c Fri Aug 25 11:25:21 2006 *************** *** 436,442 **** break; } } ! osi_panic("Exceeded Max Volumes", __FILE__, __LINE__); } if (volp) { --- 436,443 ---- break; } } ! if (!volp) ! osi_panic("Exceeded Max Volumes", __FILE__, __LINE__); } if (volp) { Index: openafs/src/WINNT/afsd/smb3.c diff -c openafs/src/WINNT/afsd/smb3.c:1.42.2.50 openafs/src/WINNT/afsd/smb3.c:1.42.2.53 *** openafs/src/WINNT/afsd/smb3.c:1.42.2.50 Wed Jun 7 19:30:18 2006 --- openafs/src/WINNT/afsd/smb3.c Wed Aug 30 01:45:12 2006 *************** *** 879,890 **** lock_ReleaseMutex(&unp->mx); uidp = smb_FindUID(vcp, newUid, SMB_FLAG_CREATE); ! lock_ObtainMutex(&uidp->mx); ! uidp->unp = unp; ! osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d],TicketKTCName[%s]",(int)vcp,vcp->lana,vcp->lsn,newUid,osi_LogSaveString(smb_logp, usern)); ! osi_Log4(smb_logp,"smb_ReceiveV3SessionSetupX MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d]",vcp,vcp->lana,vcp->lsn,newUid); ! lock_ReleaseMutex(&uidp->mx); ! smb_ReleaseUID(uidp); } /* Return UID to the client */ --- 879,892 ---- lock_ReleaseMutex(&unp->mx); uidp = smb_FindUID(vcp, newUid, SMB_FLAG_CREATE); ! if (uidp) { ! lock_ObtainMutex(&uidp->mx); ! uidp->unp = unp; ! osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d],TicketKTCName[%s]",(int)vcp,vcp->lana,vcp->lsn,newUid,osi_LogSaveString(smb_logp, usern)); ! osi_Log4(smb_logp,"smb_ReceiveV3SessionSetupX MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d]",vcp,vcp->lana,vcp->lsn,newUid); ! lock_ReleaseMutex(&uidp->mx); ! smb_ReleaseUID(uidp); ! } } /* Return UID to the client */ *************** *** 3948,3953 **** --- 3950,3961 ---- osi_Log3(smb_logp, "...T2 search op %d, id %d, nextCookie 0x%x", p->opcode, dsp->cookie, nextCookie); + if (infoLevel > 0x104) { + osi_Log1(smb_logp, "Unsupported InfoLevel 0x%x", infoLevel); + smb_ReleaseDirSearch(dsp); + return CM_ERROR_INVAL; + } + if (infoLevel >= 0x101) searchFlags &= ~4; /* no resume keys */ Index: openafs/src/WINNT/client_cpa/lang/NTMakefile diff -c openafs/src/WINNT/client_cpa/lang/NTMakefile:1.5 openafs/src/WINNT/client_cpa/lang/NTMakefile:1.5.2.1 *** openafs/src/WINNT/client_cpa/lang/NTMakefile:1.5 Fri Nov 21 02:59:57 2003 --- openafs/src/WINNT/client_cpa/lang/NTMakefile Mon Aug 28 00:29:35 2006 *************** *** 48,54 **** install : $(DLLFILE) clean :: ! $(DEL) *.res RC* RD* $(DLLFILE) ############################################################################ # --- 48,58 ---- install : $(DLLFILE) clean :: ! $(DEL) $(RESFILE) ! $(DEL) RC* ! $(DEL) RD* ! $(DEL) $(DLLFILE) ! $(DEL) AFS_component_version_number.h ############################################################################ # Index: openafs/src/WINNT/client_exp/afs_shl_ext.cpp diff -c openafs/src/WINNT/client_exp/afs_shl_ext.cpp:1.5.2.1 openafs/src/WINNT/client_exp/afs_shl_ext.cpp:1.5.2.2 *** openafs/src/WINNT/client_exp/afs_shl_ext.cpp:1.5.2.1 Sun Oct 2 10:47:20 2005 --- openafs/src/WINNT/client_exp/afs_shl_ext.cpp Mon Aug 28 01:09:18 2006 *************** *** 60,66 **** BOOL CAfsShlExt::InitInstance() { // Load our translated resources ! TaLocale_LoadCorrespondingModule (m_hInstance); // Register all OLE server (factories) as running. This enables the // OLE libraries to create objects from other applications. --- 60,66 ---- BOOL CAfsShlExt::InitInstance() { // Load our translated resources ! TaLocale_LoadCorrespondingModuleByName (m_hInstance, TEXT("afs_shl_ext.dll")); // Register all OLE server (factories) as running. This enables the // OLE libraries to create objects from other applications. Index: openafs/src/WINNT/client_exp/lang/NTMakefile diff -c openafs/src/WINNT/client_exp/lang/NTMakefile:1.5.2.1 openafs/src/WINNT/client_exp/lang/NTMakefile:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/NTMakefile:1.5.2.1 Sun Jun 25 12:56:30 2006 --- openafs/src/WINNT/client_exp/lang/NTMakefile Mon Aug 28 00:29:36 2006 *************** *** 48,54 **** install : $(DLLFILE) clean :: ! $(DEL) $(OUT)\*.res RC* RD* $(DLLFILE) AFS_component_version_number.h ############################################################################ # --- 48,58 ---- install : $(DLLFILE) clean :: ! $(DEL) $(RESFILE) ! $(DEL) RC* ! $(DEL) RD* ! $(DEL) $(DLLFILE) ! $(DEL) AFS_component_version_number.h ############################################################################ # Index: openafs/src/afs/afs_osi.h diff -c openafs/src/afs/afs_osi.h:1.22.2.15 openafs/src/afs/afs_osi.h:1.22.2.16 *** openafs/src/afs/afs_osi.h:1.22.2.15 Sun Aug 20 18:16:46 2006 --- openafs/src/afs/afs_osi.h Fri Aug 25 00:49:23 2006 *************** *** 398,404 **** #ifdef AFS_DARWIN80_ENV #define AFS_UIO_OFFSET(uio) uio_offset(uio) ! #define AFS_UIO_RESID(uio) uio_resid(uio) #define AFS_UIO_SETOFFSET(uio, off) uio_setoffset(uio, off) #define AFS_UIO_SETRESID(uio, val) uio_setresid(uio, val) #else --- 398,404 ---- #ifdef AFS_DARWIN80_ENV #define AFS_UIO_OFFSET(uio) uio_offset(uio) ! #define AFS_UIO_RESID(uio) (int)uio_resid(uio) #define AFS_UIO_SETOFFSET(uio, off) uio_setoffset(uio, off) #define AFS_UIO_SETRESID(uio, val) uio_setresid(uio, val) #else Index: openafs/src/aklog/aklog_main.c diff -c openafs/src/aklog/aklog_main.c:1.1.2.13 openafs/src/aklog/aklog_main.c:1.1.2.14 *** openafs/src/aklog/aklog_main.c:1.1.2.13 Wed Aug 2 15:53:20 2006 --- openafs/src/aklog/aklog_main.c Tue Aug 29 15:19:05 2006 *************** *** 1,5 **** /* ! * $Id: aklog_main.c,v 1.1.2.13 2006/08/02 19:53:20 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" --- 1,5 ---- /* ! * $Id: aklog_main.c,v 1.1.2.14 2006/08/29 19:19:05 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" *************** *** 7,13 **** #if !defined(lint) && !defined(SABER) static char *rcsid = ! "$Id: aklog_main.c,v 1.1.2.13 2006/08/02 19:53:20 shadow Exp $"; #endif /* lint || SABER */ #include --- 7,13 ---- #if !defined(lint) && !defined(SABER) static char *rcsid = ! "$Id: aklog_main.c,v 1.1.2.14 2006/08/29 19:19:05 shadow Exp $"; #endif /* lint || SABER */ #include *************** *** 570,576 **** status = get_credv5(context, name, primary_instance, realm_of_cell, &v5cred); ! if (status == KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN) { if (try_secondary) { if (dflag) { printf("Principal not found, trying alternate " --- 570,576 ---- status = get_credv5(context, name, primary_instance, realm_of_cell, &v5cred); ! if (status == KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN || status == KRB5KRB_ERR_GENERIC) { if (try_secondary) { if (dflag) { printf("Principal not found, trying alternate " Index: openafs/src/cf/linux-test4.m4 diff -c openafs/src/cf/linux-test4.m4:1.20.2.11 openafs/src/cf/linux-test4.m4:1.20.2.12 *** openafs/src/cf/linux-test4.m4:1.20.2.11 Mon Aug 14 18:04:41 2006 --- openafs/src/cf/linux-test4.m4 Fri Aug 25 01:23:39 2006 *************** *** 621,626 **** --- 621,629 ---- [#ifdef CONFIG_KEYS keyctl(KEYCTL_JOIN_SESSION_KEYRING, NULL); request_key(NULL, NULL, NULL); + #if !defined(KEY_POS_VIEW) || !defined(KEY_POS_SEARCH) + #error "Your linux/key.h does not contain KEY_POS_VIEW or KEY_POS_SEARCH" + #endif #else #error rebuild your kernel with CONFIG_KEYS #endif], Index: openafs/src/config/NTMakefile.amd64_w2k diff -c openafs/src/config/NTMakefile.amd64_w2k:1.1.2.39 openafs/src/config/NTMakefile.amd64_w2k:1.1.2.40 *** openafs/src/config/NTMakefile.amd64_w2k:1.1.2.39 Mon Aug 21 01:03:02 2006 --- openafs/src/config/NTMakefile.amd64_w2k Fri Aug 25 11:30:22 2006 *************** *** 80,86 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0200 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 80,86 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0201 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/NTMakefile.i386_nt40 diff -c openafs/src/config/NTMakefile.i386_nt40:1.46.2.54 openafs/src/config/NTMakefile.i386_nt40:1.46.2.55 *** openafs/src/config/NTMakefile.i386_nt40:1.46.2.54 Mon Aug 21 01:03:02 2006 --- openafs/src/config/NTMakefile.i386_nt40 Fri Aug 25 11:30:22 2006 *************** *** 80,86 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0200 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 80,86 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0201 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/config/NTMakefile.i386_w2k diff -c openafs/src/config/NTMakefile.i386_w2k:1.1.2.41 openafs/src/config/NTMakefile.i386_w2k:1.1.2.42 *** openafs/src/config/NTMakefile.i386_w2k:1.1.2.41 Mon Aug 21 01:03:02 2006 --- openafs/src/config/NTMakefile.i386_w2k Fri Aug 25 11:30:22 2006 *************** *** 80,86 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0200 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 80,86 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0201 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/libafs/afs.ppc_darwin_70.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.2.12 openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.2.13 *** openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.2.12 Mon Aug 21 15:36:36 2006 --- openafs/src/libafs/afs.ppc_darwin_70.plist.in Fri Aug 25 01:04:57 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2rc1 CFBundleSignature ???? CFBundleVersion ! 1.4.2rc1 OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2fc2 CFBundleSignature ???? CFBundleVersion ! 1.4.2fc2 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafs/afs.ppc_darwin_80.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.1.2.7 openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.1.2.8 *** openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.1.2.7 Mon Aug 21 15:36:36 2006 --- openafs/src/libafs/afs.ppc_darwin_80.plist.in Fri Aug 25 01:04:57 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2rc1 CFBundleSignature ???? CFBundleVersion ! 1.4.2rc1 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2fc2 CFBundleSignature ???? CFBundleVersion ! 1.4.2fc2 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.ppc_darwin_90.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.2.6 openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.2.7 *** openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.2.6 Mon Aug 21 15:36:36 2006 --- openafs/src/libafs/afs.ppc_darwin_90.plist.in Fri Aug 25 01:04:57 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2rc1 CFBundleSignature ???? CFBundleVersion ! 1.4.2rc1 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2fc2 CFBundleSignature ???? CFBundleVersion ! 1.4.2fc2 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.x86_darwin_80.plist.in diff -c openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.2.6 openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.2.7 *** openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.2.6 Mon Aug 21 15:36:36 2006 --- openafs/src/libafs/afs.x86_darwin_80.plist.in Fri Aug 25 01:04:57 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2rc1 CFBundleSignature ???? CFBundleVersion ! 1.4.2rc1 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2fc2 CFBundleSignature ???? CFBundleVersion ! 1.4.2fc2 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafs/afs.x86_darwin_90.plist.in diff -c openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.2.6 openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.2.7 *** openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.2.6 Mon Aug 21 15:36:36 2006 --- openafs/src/libafs/afs.x86_darwin_90.plist.in Fri Aug 25 01:04:57 2006 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2rc1 CFBundleSignature ???? CFBundleVersion ! 1.4.2rc1 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.4.2fc2 CFBundleSignature ???? CFBundleVersion ! 1.4.2fc2 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/libafsauthent/afsauthent.def diff -c openafs/src/libafsauthent/afsauthent.def:1.3.2.2 openafs/src/libafsauthent/afsauthent.def:1.3.2.3 *** openafs/src/libafsauthent/afsauthent.def:1.3.2.2 Mon Jul 31 17:51:20 2006 --- openafs/src/libafsauthent/afsauthent.def Wed Aug 30 00:41:44 2006 *************** *** 78,90 **** pioctl @77 rx_Init @78 ka_UserAuthenticateGeneral2 @79 ! pr_CreateUser @80 ! pr_SNameToId @81 ! DISK_function_names @83 DATA VOTE_function_names @84 DATA ! rx_Finalize @85 ! pr_End @86 ! VOTE_GetSyncSite @87 ! ubik_RefreshConn @88 --- 78,116 ---- pioctl @77 rx_Init @78 ka_UserAuthenticateGeneral2 @79 ! pr_CreateUser @80 ! pr_SNameToId @81 DISK_function_names @83 DATA VOTE_function_names @84 DATA ! ! pr_End @85 ! PR_INewEntry @86 ! PR_WhereIsIt @87 ! PR_DumpEntry @88 ! PR_AddToGroup @89 ! PR_NameToID @90 ! PR_IDToName @91 ! PR_Delete @92 ! PR_RemoveFromGroup @93 ! PR_GetCPS @94 ! PR_NewEntry @95 ! PR_ListMax @96 ! PR_SetMax @97 ! PR_ListEntry @98 ! PR_ChangeEntry @99 ! PR_ListElements @100 ! PR_IsAMemberOf @101 ! PR_SetFieldsEntry @102 ! PR_ListOwned @103 ! PR_GetCPS2 @104 ! PR_GetHostCPS @105 ! PR_UpdateEntry @106 ! PR_ListEntries @107 ! PR_ListSuperGroups @108 ! ka_AuthSpecificServersConn @109 ! ka_KeyCheckSum @110 ! rx_Finalize @111 ! rx_InitHost @112 ! VOTE_GetSyncSite @113 ! ubik_RefreshConn @114 Index: openafs/src/packaging/MacOS/OpenAFS.Info.plist diff -c openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.2.22 openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.2.23 *** openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.2.22 Mon Aug 21 15:36:37 2006 --- openafs/src/packaging/MacOS/OpenAFS.Info.plist Fri Aug 25 01:04:58 2006 *************** *** 3,15 **** CFBundleGetInfoString ! OpenAFS 1.4.2rc1 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.4.2rc1 IFMajorVersion 1 IFMinorVersion --- 3,15 ---- CFBundleGetInfoString ! OpenAFS 1.4.2fc2 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.4.2fc2 IFMajorVersion 1 IFMinorVersion Index: openafs/src/packaging/MacOS/OpenAFS.info diff -c openafs/src/packaging/MacOS/OpenAFS.info:1.1.4.35 openafs/src/packaging/MacOS/OpenAFS.info:1.1.4.36 *** openafs/src/packaging/MacOS/OpenAFS.info:1.1.4.35 Mon Aug 21 15:36:37 2006 --- openafs/src/packaging/MacOS/OpenAFS.info Fri Aug 25 01:04:58 2006 *************** *** 1,5 **** Title OpenAFS ! Version 1.4.2rc1 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) --- 1,5 ---- Title OpenAFS ! Version 1.4.2fc2 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) Index: openafs/src/packaging/MacOS/afslogo.jpg Index: openafs/src/packaging/MacOS/background.jpg Index: openafs/src/rxgen/rpc_main.c diff -c openafs/src/rxgen/rpc_main.c:1.21.2.2 openafs/src/rxgen/rpc_main.c:1.21.2.3 *** openafs/src/rxgen/rpc_main.c:1.21.2.2 Mon Jul 31 13:07:51 2006 --- openafs/src/rxgen/rpc_main.c Thu Aug 24 11:56:44 2006 *************** *** 37,43 **** #include RCSID ! ("$Header: /cvs/openafs/src/rxgen/rpc_main.c,v 1.21.2.2 2006/07/31 17:07:51 shadow Exp $"); #include #include --- 37,43 ---- #include RCSID ! ("$Header: /cvs/openafs/src/rxgen/rpc_main.c,v 1.21.2.3 2006/08/24 15:56:44 shadow Exp $"); #include #include *************** *** 478,483 **** --- 478,484 ---- f_print(fout, "#ifndef SOCK_DGRAM /* XXXXX */\n"); f_print(fout, "#include \"h/socket.h\"\n"); f_print(fout, "#endif\n"); + f_print(fout, "struct ubik_client;\n"); f_print(fout, "#ifndef DTYPE_SOCKET /* XXXXX */\n"); f_print(fout, "#ifndef AFS_LINUX22_ENV\n"); f_print(fout, "#include \"h/file.h\"\n"); Index: openafs/src/util/winsock_nt.c diff -c openafs/src/util/winsock_nt.c:1.5.2.1 openafs/src/util/winsock_nt.c:1.5.2.2 *** openafs/src/util/winsock_nt.c:1.5.2.1 Sun Jul 2 21:16:37 2006 --- openafs/src/util/winsock_nt.c Tue Aug 29 21:41:41 2006 *************** *** 13,19 **** #include RCSID ! ("$Header: /cvs/openafs/src/util/winsock_nt.c,v 1.5.2.1 2006/07/03 01:16:37 jaltman Exp $"); #ifdef AFS_NT40_ENV #include --- 13,19 ---- #include RCSID ! ("$Header: /cvs/openafs/src/util/winsock_nt.c,v 1.5.2.2 2006/08/30 01:41:41 jaltman Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 25,42 **** * * Returns 0 on success, -1 on error. */ - static int once = 1; - int afs_winsockInit(void) { - if (once) { int code; WSADATA data; WORD sockVersion; - once = 0; - sockVersion = 2; code = WSAStartup(sockVersion, &data); if (code) --- 25,37 ---- *************** *** 44,50 **** if (data.wVersion != 2) return -1; - } return 0; } --- 39,44 ---- *************** *** 52,58 **** afs_winsockCleanup(void) { WSACleanup(); - once = 0; } int --- 46,51 ---- Index: openafs/src/viced/host.c diff -c openafs/src/viced/host.c:1.57.2.42 openafs/src/viced/host.c:1.57.2.43 *** openafs/src/viced/host.c:1.57.2.42 Mon Jul 31 13:42:20 2006 --- openafs/src/viced/host.c Thu Aug 24 00:33:02 2006 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/viced/host.c,v 1.57.2.42 2006/07/31 17:42:20 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/viced/host.c,v 1.57.2.43 2006/08/24 04:33:02 shadow Exp $"); #include #include *************** *** 282,287 **** --- 282,288 ---- if (code) { fprintf(stderr, "libprot: Could not get local cell. [%d]\n", code); + afsconf_Close(tdir); return code; } *************** *** 289,302 **** if (code) { fprintf(stderr, "libprot: Could not locate cell %s in %s/%s\n", cellstr, confDir, AFSDIR_CELLSERVDB_FILE); return code; } - afsconf_Close(tdir); - code = rx_Init(0); if (code) { fprintf(stderr, "libprot: Could not initialize rx.\n"); return code; } --- 290,303 ---- if (code) { fprintf(stderr, "libprot: Could not locate cell %s in %s/%s\n", cellstr, confDir, AFSDIR_CELLSERVDB_FILE); + afsconf_Close(tdir); return code; } code = rx_Init(0); if (code) { fprintf(stderr, "libprot: Could not initialize rx.\n"); + afsconf_Close(tdir); return code; } *************** *** 360,366 **** if (code) { com_err("fileserver", code, "ubik client init failed."); } ! code = rxs_Release(sc[scIndex]); return code; } --- 361,367 ---- if (code) { com_err("fileserver", code, "ubik client init failed."); } ! afsconf_Close(tdir); code = rxs_Release(sc[scIndex]); return code; } Index: openafs/src/viced/viced.c diff -c openafs/src/viced/viced.c:1.58.2.15 openafs/src/viced/viced.c:1.58.2.16 *** openafs/src/viced/viced.c:1.58.2.15 Mon Jul 31 13:15:49 2006 --- openafs/src/viced/viced.c Wed Aug 23 22:35:59 2006 *************** *** 20,26 **** #include RCSID ! ("$Header: /cvs/openafs/src/viced/viced.c,v 1.58.2.15 2006/07/31 17:15:49 shadow Exp $"); #include #include --- 20,26 ---- #include RCSID ! ("$Header: /cvs/openafs/src/viced/viced.c,v 1.58.2.16 2006/08/24 02:35:59 shadow Exp $"); #include #include *************** *** 217,226 **** static void FlagMsg(); - #ifdef AFS_PTHREAD_ENV - pthread_key_t viced_uclient_key; - #endif - /* * Home for the performance statistics. */ --- 217,222 ---- Index: openafs/src/vol/volume.c diff -c openafs/src/vol/volume.c:1.35.2.6 openafs/src/vol/volume.c:1.35.2.8 *** openafs/src/vol/volume.c:1.35.2.6 Mon May 30 06:50:04 2005 --- openafs/src/vol/volume.c Thu Aug 24 16:21:49 2006 *************** *** 20,26 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/volume.c,v 1.35.2.6 2005/05/30 10:50:04 jaltman Exp $"); #include #include --- 20,26 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/volume.c,v 1.35.2.8 2006/08/24 20:21:49 shadow Exp $"); #include #include *************** *** 185,191 **** * defined when not linked with vice, XXXX */ ProgramType programType; /* The type of program using the package */ - #define VOLUME_BITMAP_GROWSIZE 16 /* bytes, => 128vnodes */ /* Must be a multiple of 4 (1 word) !! */ #define VOLUME_HASH_TABLE_SIZE 128 /* Must be a power of 2!! */ --- 185,190 ---- *************** *** 272,277 **** --- 271,277 ---- #endif /* AFS_PTHREAD_ENV */ Lock_Init(&vol_listLock); Lock_Init(&FSYNC_handler_lock); + srandom(time(0)); /* For VGetVolumeInfo */ gettimeofday(&tv, &tz); TimeZoneCorrection = tz.tz_minuteswest * 60; Index: openafs/src/volser/volmain.c diff -c openafs/src/volser/volmain.c:1.18.2.6 openafs/src/volser/volmain.c:1.18.2.7 *** openafs/src/volser/volmain.c:1.18.2.6 Tue Jun 20 16:35:01 2006 --- openafs/src/volser/volmain.c Thu Aug 24 16:21:52 2006 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/volmain.c,v 1.18.2.6 2006/06/20 20:35:01 jaltman Exp $"); #include #ifdef AFS_NT40_ENV --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/volmain.c,v 1.18.2.7 2006/08/24 20:21:52 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 73,78 **** --- 73,79 ---- #define VolserVersion "2.0" #define N_SECURITY_OBJECTS 3 + extern struct Lock localLock; extern struct volser_trans *TransList(); #ifndef AFS_PTHREAD_ENV extern int (*vol_PollProc) (); *************** *** 423,428 **** --- 424,431 ---- } #endif VInitVolumePackage(volumeUtility, 0, 0, CONNECT_FS, 0); + /* For nuke() */ + Lock_Init(&localLock); DInit(40); #ifndef AFS_PTHREAD_ENV vol_PollProc = IOMGR_Poll; /* tell vol pkg to poll io system periodically */