Index: openafs/src/WINNT/afsadmsvr/NTMakefile diff -c openafs/src/WINNT/afsadmsvr/NTMakefile:1.8 openafs/src/WINNT/afsadmsvr/NTMakefile:1.8.4.1 *** openafs/src/WINNT/afsadmsvr/NTMakefile:1.8 Sun Nov 20 20:56:03 2005 --- openafs/src/WINNT/afsadmsvr/NTMakefile Wed Sep 19 13:58:45 2007 *************** *** 57,64 **** EXERES = $(OUT)\AfsAdmSvr.res ! $(EXERES):$$(@B).rc ! $(RC) $** EXEOBJS = \ $(OUT)\TaAfsAdmSvr.obj \ --- 57,63 ---- EXERES = $(OUT)\AfsAdmSvr.res ! $(EXERES): AfsAdmSvr.rc AFS_component_version_number.h EXEOBJS = \ $(OUT)\TaAfsAdmSvr.obj \ *************** *** 143,149 **** nmake /nologo /f ntmakefile clean $(CD) ..\afsadmsvr ! $(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(EXECONLINK) $(VCLIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) --- 142,148 ---- nmake /nologo /f ntmakefile clean $(CD) ..\afsadmsvr ! $(EXEFILE) : $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) $(VCLIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 161,174 **** if exist ITaAfsAdmSvr*.cpp del ITaAfsAdmSvr*.cpp if exist ITaAfsAdmSvr*.c del ITaAfsAdmSvr*.c if exist ITaAfsAdmSvr*.h del ITaAfsAdmSvr*.h ############################################################################ # # Dependencies # - $(OUT)\AfsAdmSvr.res : AFS_component_version_number.h - mkdir: -mkdir $(OUT)\..\afsapplib cd ..\afsapplib --- 160,173 ---- if exist ITaAfsAdmSvr*.cpp del ITaAfsAdmSvr*.cpp if exist ITaAfsAdmSvr*.c del ITaAfsAdmSvr*.c if exist ITaAfsAdmSvr*.h del ITaAfsAdmSvr*.h + $(DEL) AFS_component_version_number.h + $(DEL) $(EXERES) ############################################################################ # # Dependencies # mkdir: -mkdir $(OUT)\..\afsapplib cd ..\afsapplib Index: openafs/src/WINNT/afsd/afsd_init.c diff -c openafs/src/WINNT/afsd/afsd_init.c:1.79.2.16 openafs/src/WINNT/afsd/afsd_init.c:1.79.2.17 *** openafs/src/WINNT/afsd/afsd_init.c:1.79.2.16 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/afsd_init.c Mon Sep 10 15:08:17 2007 *************** *** 41,46 **** --- 41,47 ---- extern int cm_enableServerLocks; extern int cm_deleteReadOnly; extern afs_int32 cm_BPlusTrees; + extern const char **smb_ExecutableExtensions; osi_log_t *afsd_logp; *************** *** 278,291 **** KEY_READ|KEY_WRITE, &hkMSV10) == ERROR_SUCCESS ) { ! if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0, ! &dwType, NULL, &dwAllocSize) == ERROR_SUCCESS) { dwAllocSize += 1 /* in case the source string is not nul terminated */ + strlen(cm_NetbiosName) + 2; pHostNames = malloc(dwAllocSize); dwSize = dwAllocSize; if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0, &dwType, ! pHostNames, &dwSize) == ERROR_SUCCESS) { for (pName = pHostNames; (pName - pHostNames < dwSize) && *pName ; pName += strlen(pName) + 1) --- 279,295 ---- KEY_READ|KEY_WRITE, &hkMSV10) == ERROR_SUCCESS ) { ! if ((RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0, ! &dwType, NULL, &dwAllocSize) == ERROR_SUCCESS) && ! (dwType == REG_MULTI_SZ)) ! { dwAllocSize += 1 /* in case the source string is not nul terminated */ + strlen(cm_NetbiosName) + 2; pHostNames = malloc(dwAllocSize); dwSize = dwAllocSize; if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0, &dwType, ! pHostNames, &dwSize) == ERROR_SUCCESS) ! { for (pName = pHostNames; (pName - pHostNames < dwSize) && *pName ; pName += strlen(pName) + 1) *************** *** 726,734 **** blockSize = CM_CONFIGDEFAULT_BLOCKSIZE; } if (blockSize > cm_chunkSize) { ! afsi_log("Block size cannot be larger than Chunk size."); blockSize = cm_chunkSize; } afsi_log("Block size %u", blockSize); dummyLen = sizeof(numBkgD); --- 730,744 ---- blockSize = CM_CONFIGDEFAULT_BLOCKSIZE; } if (blockSize > cm_chunkSize) { ! afsi_log("Block size (%d) cannot be larger than Chunk size (%d).", ! blockSize, cm_chunkSize); blockSize = cm_chunkSize; } + if (cm_chunkSize % blockSize != 0) { + afsi_log("Block size (%d) must be a factor of Chunk size (%d).", + blockSize, cm_chunkSize); + blockSize = CM_CONFIGDEFAULT_BLOCKSIZE; + } afsi_log("Block size %u", blockSize); dummyLen = sizeof(numBkgD); *************** *** 1065,1071 **** cm_BPlusTrees = (unsigned short) dwValue; } afsi_log("CM BPlusTrees is %u", cm_BPlusTrees); ! RegCloseKey (parmKey); cacheBlocks = ((afs_uint64)cacheSize * 1024) / blockSize; --- 1075,1113 ---- cm_BPlusTrees = (unsigned short) dwValue; } afsi_log("CM BPlusTrees is %u", cm_BPlusTrees); ! ! if ((RegQueryValueEx( parmKey, "PrefetchExecutableExtensions", 0, ! ®Type, NULL, &dummyLen) == ERROR_SUCCESS) && ! (regType == REG_MULTI_SZ)) ! { ! char * pSz; ! dummyLen += 3; /* in case the source string is not nul terminated */ ! pSz = malloc(dummyLen); ! if ((RegQueryValueEx( parmKey, "PrefetchExecutableExtensions", 0, ®Type, ! pSz, &dummyLen) == ERROR_SUCCESS) && ! (regType == REG_MULTI_SZ)) ! { ! int cnt; ! char * p; ! ! for (cnt = 0, p = pSz; (p - pSz < dummyLen) && *p; cnt++, p += strlen(p) + 1); ! ! smb_ExecutableExtensions = malloc(sizeof(char *) * (cnt+1)); ! ! for (cnt = 0, p = pSz; (p - pSz < dummyLen) && *p; cnt++, p += strlen(p) + 1) ! { ! smb_ExecutableExtensions[cnt] = p; ! afsi_log("PrefetchExecutableExtension: \"%s\"", p); ! } ! smb_ExecutableExtensions[cnt] = NULL; ! } ! ! if (!smb_ExecutableExtensions) ! free(pSz); ! } ! if (!smb_ExecutableExtensions) ! afsi_log("No PrefetchExecutableExtensions"); ! RegCloseKey (parmKey); cacheBlocks = ((afs_uint64)cacheSize * 1024) / blockSize; Index: openafs/src/WINNT/afsd/afsd_service.c diff -c openafs/src/WINNT/afsd/afsd_service.c:1.52.4.16 openafs/src/WINNT/afsd/afsd_service.c:1.52.4.17 *** openafs/src/WINNT/afsd/afsd_service.c:1.52.4.16 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/afsd_service.c Wed Sep 19 23:55:42 2007 *************** *** 76,81 **** --- 76,83 ---- buf_ForceTrace(TRUE); afsi_log("--- begin dump ---"); + cm_MemDumpDirStats(afsi_file, "a", 0); + cm_MemDumpBPlusStats(afsi_file, "a", 0); cm_DumpCells(afsi_file, "a", 0); cm_DumpVolumes(afsi_file, "a", 0); cm_DumpSCache(afsi_file, "a", 0); Index: openafs/src/WINNT/afsd/afskfw-int.h diff -c openafs/src/WINNT/afsd/afskfw-int.h:1.3.14.3 openafs/src/WINNT/afsd/afskfw-int.h:1.3.14.4 *** openafs/src/WINNT/afsd/afskfw-int.h:1.3.14.3 Tue Apr 3 10:50:40 2007 --- openafs/src/WINNT/afsd/afskfw-int.h Wed Aug 29 17:53:36 2007 *************** *** 1,5 **** /* ! * Copyright (c) 2004, 2005, 2006 Secure Endpoints Inc. * Copyright (c) 2003 SkyRope, LLC * All rights reserved. * --- 1,5 ---- /* ! * Copyright (c) 2004, 2005, 2006, 2007 Secure Endpoints Inc. * Copyright (c) 2003 SkyRope, LLC * All rights reserved. * *************** *** 235,241 **** --- 235,246 ---- // cc_get_cache_names(). set to NULL on return ) ); + + #ifdef _WIN64 + #define CCAPI_DLL "krbcc64.dll" + #else #define CCAPI_DLL "krbcc32.dll" + #endif /* Function Prototypes */ DWORD GetServiceStatus(LPSTR, LPSTR, DWORD *); Index: openafs/src/WINNT/afsd/afskfw.c diff -c openafs/src/WINNT/afsd/afskfw.c:1.28.4.9 openafs/src/WINNT/afsd/afskfw.c:1.28.4.11 *** openafs/src/WINNT/afsd/afskfw.c:1.28.4.9 Tue Aug 21 04:44:06 2007 --- openafs/src/WINNT/afsd/afskfw.c Sun Sep 2 12:37:43 2007 *************** *** 56,63 **** */ - #define USE_MS2MIT #undef USE_KRB4 #include "afskfw-int.h" #include "afskfw.h" #include --- 56,68 ---- */ #undef USE_KRB4 + #ifndef _WIN64 + #define USE_KRB524 1 + #endif + #define USE_MS2MIT 1 + #define USE_LEASH 1 + #include "afskfw-int.h" #include "afskfw.h" #include *************** *** 94,99 **** --- 99,105 ---- DECL_FUNC_PTR(cc_get_NC_info); DECL_FUNC_PTR(cc_free_NC_info); + #ifdef USE_LEASH // leash functions DECL_FUNC_PTR(Leash_get_default_lifetime); DECL_FUNC_PTR(Leash_get_default_forwardable); *************** *** 108,113 **** --- 114,120 ---- DECL_FUNC_PTR(Leash_get_default_renew_max); DECL_FUNC_PTR(Leash_get_default_renewable); DECL_FUNC_PTR(Leash_get_default_mslsa_import); + #endif // krb5 functions DECL_FUNC_PTR(krb5_change_password); *************** *** 170,184 **** --- 177,195 ---- DECL_FUNC_PTR(krb5_free_addresses); DECL_FUNC_PTR(krb5_c_random_make_octets); + #ifdef USE_KRB524 // Krb524 functions DECL_FUNC_PTR(krb524_init_ets); DECL_FUNC_PTR(krb524_convert_creds_kdc); + #endif + #ifdef USE_KRB4 // krb4 functions DECL_FUNC_PTR(krb_get_cred); DECL_FUNC_PTR(tkt_string); DECL_FUNC_PTR(krb_get_tf_realm); DECL_FUNC_PTR(krb_mk_req); + #endif // ComErr functions DECL_FUNC_PTR(com_err); *************** *** 219,224 **** --- 230,236 ---- END_FUNC_INFO }; + #ifdef USE_LEASH FUNC_INFO leash_fi[] = { MAKE_FUNC_INFO(Leash_get_default_lifetime), MAKE_FUNC_INFO(Leash_get_default_renew_till), *************** *** 239,244 **** --- 251,257 ---- MAKE_FUNC_INFO(Leash_get_default_mslsa_import), END_FUNC_INFO }; + #endif FUNC_INFO k5_fi[] = { MAKE_FUNC_INFO(krb5_change_password), *************** *** 314,324 **** --- 327,339 ---- }; #endif + #ifdef USE_KRB524 FUNC_INFO k524_fi[] = { MAKE_FUNC_INFO(krb524_init_ets), MAKE_FUNC_INFO(krb524_convert_creds_kdc), END_FUNC_INFO }; + #endif FUNC_INFO profile_fi[] = { MAKE_FUNC_INFO(profile_init), *************** *** 375,381 **** --- 390,398 ---- #ifdef USE_KRB4 static HINSTANCE hKrb4 = 0; #endif /* USE_KRB4 */ + #ifdef USE_KRB524 static HINSTANCE hKrb524 = 0; + #endif #ifdef USE_MS2MIT static HINSTANCE hSecur32 = 0; #endif /* USE_MS2MIT */ *************** *** 383,390 **** --- 400,409 ---- static HINSTANCE hComErr = 0; static HINSTANCE hService = 0; static HINSTANCE hProfile = 0; + #ifdef USE_LEASH static HINSTANCE hLeash = 0; static HINSTANCE hLeashOpt = 0; + #endif static HINSTANCE hCCAPI = 0; static struct principal_ccache_data * princ_cc_data = NULL; static struct cell_principal_map * cell_princ_map = NULL; *************** *** 409,427 **** if ( !inited ) { inited = 1; LoadFuncs(KRB5_DLL, k5_fi, &hKrb5, 0, 1, 0, 0); #ifdef USE_KRB4 LoadFuncs(KRB4_DLL, k4_fi, &hKrb4, 0, 1, 0, 0); #endif /* USE_KRB4 */ - LoadFuncs(COMERR_DLL, ce_fi, &hComErr, 0, 0, 1, 0); LoadFuncs(SERVICE_DLL, service_fi, &hService, 0, 1, 0, 0); #ifdef USE_MS2MIT LoadFuncs(SECUR32_DLL, lsa_fi, &hSecur32, 0, 1, 1, 1); #endif /* USE_MS2MIT */ LoadFuncs(KRB524_DLL, k524_fi, &hKrb524, 0, 1, 1, 1); ! LoadFuncs(PROFILE_DLL, profile_fi, &hProfile, 0, 1, 0, 0); LoadFuncs(LEASH_DLL, leash_fi, &hLeash, 0, 1, 0, 0); - LoadFuncs(CCAPI_DLL, ccapi_fi, &hCCAPI, 0, 1, 0, 0); LoadFuncs(LEASH_DLL, leash_opt_fi, &hLeashOpt, 0, 1, 0, 0); if ( KFW_is_available() ) { char rootcell[MAXCELLCHARS+1]; --- 428,450 ---- if ( !inited ) { inited = 1; LoadFuncs(KRB5_DLL, k5_fi, &hKrb5, 0, 1, 0, 0); + LoadFuncs(COMERR_DLL, ce_fi, &hComErr, 0, 0, 1, 0); + LoadFuncs(PROFILE_DLL, profile_fi, &hProfile, 0, 1, 0, 0); #ifdef USE_KRB4 LoadFuncs(KRB4_DLL, k4_fi, &hKrb4, 0, 1, 0, 0); #endif /* USE_KRB4 */ LoadFuncs(SERVICE_DLL, service_fi, &hService, 0, 1, 0, 0); #ifdef USE_MS2MIT LoadFuncs(SECUR32_DLL, lsa_fi, &hSecur32, 0, 1, 1, 1); #endif /* USE_MS2MIT */ + #ifdef USE_KRB524 LoadFuncs(KRB524_DLL, k524_fi, &hKrb524, 0, 1, 1, 1); ! #endif ! #ifdef USE_LEASH LoadFuncs(LEASH_DLL, leash_fi, &hLeash, 0, 1, 0, 0); LoadFuncs(LEASH_DLL, leash_opt_fi, &hLeashOpt, 0, 1, 0, 0); + #endif + LoadFuncs(CCAPI_DLL, ccapi_fi, &hCCAPI, 0, 1, 0, 0); if ( KFW_is_available() ) { char rootcell[MAXCELLCHARS+1]; *************** *** 444,457 **** void KFW_cleanup(void) { if (hLeashOpt) FreeLibrary(hLeashOpt); - if (hCCAPI) - FreeLibrary(hCCAPI); if (hLeash) FreeLibrary(hLeash); if (hKrb524) FreeLibrary(hKrb524); #ifdef USE_MS2MIT if (hSecur32) FreeLibrary(hSecur32); --- 467,484 ---- void KFW_cleanup(void) { + #ifdef USE_LEASH if (hLeashOpt) FreeLibrary(hLeashOpt); if (hLeash) FreeLibrary(hLeash); + #endif + #ifdef USE_KRB524 if (hKrb524) FreeLibrary(hKrb524); + #endif + if (hCCAPI) + FreeLibrary(hCCAPI); #ifdef USE_MS2MIT if (hSecur32) FreeLibrary(hSecur32); *************** *** 533,540 **** #ifdef USE_MS2MIT hSecur32 && #endif /* USE_MS2MIT */ hKrb524 && ! hProfile && hLeash && hCCAPI ) return TRUE; return FALSE; } --- 560,572 ---- #ifdef USE_MS2MIT hSecur32 && #endif /* USE_MS2MIT */ + #ifdef USE_KRB524 hKrb524 && ! #endif ! #ifdef USE_LEASH ! hLeash && ! #endif ! hProfile && hCCAPI ) return TRUE; return FALSE; } *************** *** 929,939 **** if (!pkrb5_init_context) return; - #ifdef COMMENT - if ( !MSLSA_IsKerberosLogon() ) - return; - #endif - code = pkrb5_init_context(&ctx); if (code) goto cleanup; --- 961,966 ---- *************** *** 1157,1163 **** OutputDebugString("Calling KFW_AFS_klog() to obtain token\n"); } ! code = KFW_AFS_klog(ctx, cc, "afs", cell->data, realm->data, pLeash_get_default_lifetime(),NULL); if ( IsDebuggerPresent() ) { char message[256]; sprintf(message,"KFW_AFS_klog() returns: %d\n",code); --- 1184,1196 ---- OutputDebugString("Calling KFW_AFS_klog() to obtain token\n"); } ! code = KFW_AFS_klog(ctx, cc, "afs", cell->data, realm->data, ! #ifndef USE_LEASH ! 600, ! #else ! pLeash_get_default_lifetime(), ! #endif /* USE_LEASH */ ! NULL); if ( IsDebuggerPresent() ) { char message[256]; sprintf(message,"KFW_AFS_klog() returns: %d\n",code); *************** *** 1283,1300 **** if ( code ) goto cleanup; if ( lifetime == 0 ) lifetime = pLeash_get_default_lifetime(); if ( password && password[0] ) { code = KFW_kinit( ctx, cc, HWND_DESKTOP, pname, password, lifetime, pLeash_get_default_forwardable(), pLeash_get_default_proxiable(), pLeash_get_default_renewable() ? pLeash_get_default_renew_till() : 0, pLeash_get_default_noaddresses(), ! pLeash_get_default_publicip()); if ( IsDebuggerPresent() ) { char message[256]; sprintf(message,"KFW_kinit() returns: %d\n",code); --- 1316,1347 ---- if ( code ) goto cleanup; if ( lifetime == 0 ) + #ifndef USE_LEASH + lifetime = 600; + #else lifetime = pLeash_get_default_lifetime(); + #endif if ( password && password[0] ) { code = KFW_kinit( ctx, cc, HWND_DESKTOP, pname, password, lifetime, + #ifndef USE_LEASH + 1, /* forwardable */ + 0, /* not proxiable */ + 1, /* renewable */ + 1, /* noaddresses */ + 0 /* no public ip */ + #else pLeash_get_default_forwardable(), pLeash_get_default_proxiable(), pLeash_get_default_renewable() ? pLeash_get_default_renew_till() : 0, pLeash_get_default_noaddresses(), ! pLeash_get_default_publicip() ! #endif /* USE_LEASH */ ! ); ! if ( IsDebuggerPresent() ) { char message[256]; sprintf(message,"KFW_kinit() returns: %d\n",code); *************** *** 1889,1895 **** --- 1936,1946 ---- goto cleanup; if (lifetime == 0) + #ifndef USE_LEASH + lifetime = 600; + #else lifetime = pLeash_get_default_lifetime(); + #endif /* USE_LEASH */ lifetime *= 60; if (renew_life > 0) *************** *** 2990,2995 **** --- 3041,3049 ---- goto cleanup; /* We have successfully inserted the token */ try_krb524d: + #ifndef USE_KRB524 + goto cleanup; + #else /* Otherwise, the ticket could have been too large so try to * convert using the krb524d running with the KDC */ *************** *** 3004,3009 **** --- 3058,3064 ---- try_krb5 = 0; goto use_krb4; } + #endif /* USE_KRB524 */ } else { use_krb4: #ifdef USE_KRB4 Index: openafs/src/WINNT/afsd/cm.h diff -c openafs/src/WINNT/afsd/cm.h:1.17.2.5 openafs/src/WINNT/afsd/cm.h:1.17.2.6 *** openafs/src/WINNT/afsd/cm.h:1.17.2.5 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/cm.h Thu Aug 30 22:56:59 2007 *************** *** 302,307 **** --- 302,308 ---- #define CM_ERROR_BAD_LEVEL (CM_ERROR_BASE+52) #define CM_ERROR_NOT_A_DFSLINK (CM_ERROR_BASE+53) #define CM_ERROR_INEXACT_MATCH (CM_ERROR_BASE+54) + #define CM_ERROR_BPLUS_NOMATCH (CM_ERROR_BASE+55) /* Used by cm_FollowMountPoint and cm_GetVolumeByName */ #define RWVOL 0 Index: openafs/src/WINNT/afsd/cm_btree.c diff -c openafs/src/WINNT/afsd/cm_btree.c:1.1.2.4 openafs/src/WINNT/afsd/cm_btree.c:1.1.2.6 *** openafs/src/WINNT/afsd/cm_btree.c:1.1.2.4 Sun Aug 26 20:11:43 2007 --- openafs/src/WINNT/afsd/cm_btree.c Wed Sep 19 23:55:42 2007 *************** *** 198,206 **** sprintf(B->message, "LOOKUP: %s found on page %d value (%d.%d.%d).\n", key.name, getnodenumber(B, findNode), ! data.volume, ! data.vnode, ! data.unique); } else sprintf(B->message, "LOOKUP: not found!\n"); OutputDebugString(B->message); --- 198,206 ---- sprintf(B->message, "LOOKUP: %s found on page %d value (%d.%d.%d).\n", key.name, getnodenumber(B, findNode), ! data.fid.volume, ! data.fid.vnode, ! data.fid.unique); } else sprintf(B->message, "LOOKUP: not found!\n"); OutputDebugString(B->message); *************** *** 1138,1145 **** for ( i=0, node = getfirstallnode(B); node != NONODE && imessage, "%s - data node %d (%d.%d.%d)\n", parent_desc, getnodenumber(B, node), ! data.volume, data.vnode, data.unique); OutputDebugString(B->message); return; } else --- 1309,1315 ---- data = getdatavalue(node); sprintf(B->message, "%s - data node %d (%d.%d.%d)\n", parent_desc, getnodenumber(B, node), ! data.fid.volume, data.fid.vnode, data.fid.unique); OutputDebugString(B->message); return; } else *************** *** 1336,1342 **** prev = getkey(n, slot); data = getdatavalue(getnode(n, slot)); sprintf(B->message, "%8s (%d.%d.%d)\n", ! prev.name, data.volume, data.vnode, data.unique); OutputDebugString(B->message); if (++slot > numentries(n)) n = getnextnode(n), slot = 1; --- 1342,1348 ---- prev = getkey(n, slot); data = getdatavalue(getnode(n, slot)); sprintf(B->message, "%8s (%d.%d.%d)\n", ! prev.name, data.fid.volume, data.fid.vnode, data.fid.unique); OutputDebugString(B->message); if (++slot > numentries(n)) n = getnextnode(n), slot = 1; *************** *** 1453,1467 **** } if (exact) { ! *cfid = getdatavalue(dataNode); rc = 0; bplus_lookup_hits++; } else if (count == 1) { ! *cfid = getdatavalue(firstDataNode); rc = CM_ERROR_INEXACT_MATCH; bplus_lookup_hits_inexact++; } else { ! rc = CM_ERROR_AMBIGUOUS_FILENAME; bplus_lookup_ambiguous++; } } else { --- 1459,1473 ---- } if (exact) { ! *cfid = getdatavalue(dataNode).fid; rc = 0; bplus_lookup_hits++; } else if (count == 1) { ! *cfid = getdatavalue(firstDataNode).fid; rc = CM_ERROR_INEXACT_MATCH; bplus_lookup_hits_inexact++; } else { ! rc = CM_ERROR_AMBIGUOUS_FILENAME; bplus_lookup_ambiguous++; } } else { *************** *** 1489,1495 **** --- 1495,1503 ---- { long rc = 0; keyT key = {entry}; + dataT data; LARGE_INTEGER start, end; + char shortName[13]; if (op->scp->dirBplus == NULL || op->dataVersion != op->scp->dirDataVersion) { *************** *** 1497,1506 **** goto done; } QueryPerformanceCounter(&start); bplus_create_entry++; ! insert(op->scp->dirBplus, key, *cfid); QueryPerformanceCounter(&end); --- 1505,1531 ---- goto done; } + data.fid.cell = cfid->cell; + data.fid.volume = cfid->volume; + data.fid.vnode = cfid->vnode; + data.fid.unique = cfid->unique; + data.longname = NULL; + QueryPerformanceCounter(&start); bplus_create_entry++; ! insert(op->scp->dirBplus, key, data); ! if (!cm_Is8Dot3(entry)) { ! cm_dirFid_t dfid; ! dfid.vnode = htonl(data.fid.vnode); ! dfid.unique = htonl(data.fid.unique); ! ! cm_Gen8Dot3NameInt(entry, &dfid, shortName, NULL); ! ! key.name = shortName; ! data.longname = strdup(entry); ! insert(op->scp->dirBplus, key, data); ! } QueryPerformanceCounter(&end); *************** *** 1522,1527 **** --- 1547,1553 ---- { long rc = 0; keyT key = {entry}; + Nptr leafNode = NONODE; LARGE_INTEGER start, end; if (op->scp->dirBplus == NULL || *************** *** 1535,1541 **** bplus_remove_entry++; if (op->scp->dirBplus) { ! delete(op->scp->dirBplus, key); } QueryPerformanceCounter(&end); --- 1561,1668 ---- bplus_remove_entry++; if (op->scp->dirBplus) { ! if (!cm_Is8Dot3(entry)) { ! cm_dirFid_t dfid; ! cm_fid_t fid; ! char shortName[13]; ! ! leafNode = bplus_Lookup(op->scp->dirBplus, key); ! if (leafNode != NONODE) { ! int slot; ! Nptr firstDataNode, dataNode, nextDataNode; ! int exact = 0; ! int count = 0; ! ! /* Found a leaf that matches the key via a case-insensitive ! * match. There may be one or more data nodes that match. ! * If we have an exact match, return that. ! * If we have an ambiguous match, return an error. ! * If we have only one inexact match, return that. ! */ ! slot = findKey(op->scp->dirBplus, leafNode, 1, numentries(leafNode)); ! firstDataNode = getnode(leafNode, slot); ! ! for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) { ! count++; ! if (!comparekeys(op->scp->dirBplus)(key, getdatakey(dataNode), EXACT_MATCH) ) { ! exact = 1; ! break; ! } ! nextDataNode = getdatanext(dataNode); ! } ! ! if (exact) { ! fid = getdatavalue(dataNode).fid; ! rc = 0; ! } else if (count == 1) { ! fid = getdatavalue(firstDataNode).fid; ! rc = CM_ERROR_INEXACT_MATCH; ! } else { ! rc = CM_ERROR_AMBIGUOUS_FILENAME; ! } ! } ! ! ! if (rc != CM_ERROR_AMBIGUOUS_FILENAME) { ! dfid.vnode = htonl(fid.vnode); ! dfid.unique = htonl(fid.unique); ! cm_Gen8Dot3NameInt(entry, &dfid, shortName, NULL); ! ! /* delete first the long name and then the short name */ ! delete(op->scp->dirBplus, key); ! key.name = shortName; ! delete(op->scp->dirBplus, key); ! } ! } else { ! char * longname = NULL; ! /* We need to lookup the 8dot3 name to determine what the ! * matching long name is ! */ ! leafNode = bplus_Lookup(op->scp->dirBplus, key); ! if (leafNode != NONODE) { ! int slot; ! Nptr firstDataNode, dataNode, nextDataNode; ! int exact = 0; ! int count = 0; ! ! /* Found a leaf that matches the key via a case-insensitive ! * match. There may be one or more data nodes that match. ! * If we have an exact match, return that. ! * If we have an ambiguous match, return an error. ! * If we have only one inexact match, return that. ! */ ! slot = findKey(op->scp->dirBplus, leafNode, 1, numentries(leafNode)); ! firstDataNode = getnode(leafNode, slot); ! ! for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) { ! count++; ! if (!comparekeys(op->scp->dirBplus)(key, getdatakey(dataNode), EXACT_MATCH) ) { ! exact = 1; ! break; ! } ! nextDataNode = getdatanext(dataNode); ! } ! ! if (exact) { ! longname = getdatavalue(dataNode).longname; ! rc = 0; ! } else if (count == 1) { ! longname = getdatavalue(firstDataNode).longname; ! rc = CM_ERROR_INEXACT_MATCH; ! } else { ! rc = CM_ERROR_AMBIGUOUS_FILENAME; ! } ! } ! ! if (rc != CM_ERROR_AMBIGUOUS_FILENAME) { ! if (longname) { ! key.name = longname; ! delete(op->scp->dirBplus, key); ! key.name = entry; ! } ! delete(op->scp->dirBplus, key); ! } ! } } QueryPerformanceCounter(&end); *************** *** 1552,1561 **** void *dummy, osi_hyper_t *entryOffsetp) { keyT key = {dep->name}; ! dataT data = {scp->fid.cell, scp->fid.volume, ntohl(dep->fid.vnode), ntohl(dep->fid.unique)}; /* the Write lock is held in cm_BPlusDirBuildTree() */ insert(scp->dirBplus, key, data); #ifdef BTREE_DEBUG findAllBtreeValues(scp->dirBplus); --- 1679,1706 ---- void *dummy, osi_hyper_t *entryOffsetp) { keyT key = {dep->name}; ! dataT data; ! char shortName[13]; ! ! data.fid.cell = scp->fid.cell; ! data.fid.volume = scp->fid.volume; ! data.fid.vnode = ntohl(dep->fid.vnode); ! data.fid.unique = ntohl(dep->fid.unique); ! data.longname = NULL; /* the Write lock is held in cm_BPlusDirBuildTree() */ insert(scp->dirBplus, key, data); + if (!cm_Is8Dot3(dep->name)) { + cm_dirFid_t dfid; + dfid.vnode = dep->fid.vnode; + dfid.unique = dep->fid.unique; + + cm_Gen8Dot3NameInt(dep->name, &dfid, shortName, NULL); + + key.name = shortName; + data.longname = strdup(dep->name); + insert(scp->dirBplus, key, data); + } #ifdef BTREE_DEBUG findAllBtreeValues(scp->dirBplus); *************** *** 1598,1603 **** --- 1743,1786 ---- return rc; } + int cm_MemDumpBPlusStats(FILE *outputFile, char *cookie, int lock) + { + int zilch; + char output[128]; + + sprintf(output, "%s - B+ Lookup Hits: %-8d\r\n", cookie, bplus_lookup_hits); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Inexact Hits: %-8d\r\n", cookie, bplus_lookup_hits_inexact); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Ambiguous Hits: %-8d\r\n", cookie, bplus_lookup_ambiguous); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Misses: %-8d\r\n", cookie, bplus_lookup_misses); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Create: %-8d\r\n", cookie, bplus_create_entry); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Remove: %-8d\r\n", cookie, bplus_remove_entry); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Build Tree: %-8d\r\n", cookie, bplus_build_tree); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Free Tree: %-8d\r\n", cookie, bplus_free_tree); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - DV Error: %-8d\r\n", cookie, bplus_dv_error); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + + sprintf(output, "%s - B+ Time Lookup: %-16I64d\r\n", cookie, bplus_lookup_time); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Create: %-16I64d\r\n", cookie, bplus_create_time); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Remove: %-16I64d\r\n", cookie, bplus_remove_time); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Build: %-16I64d\r\n", cookie, bplus_build_time); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + sprintf(output, "%s - Free: %-16I64d\r\n", cookie, bplus_free_time); + WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); + + return(0); + } + void cm_BPlusDumpStats(void) { afsi_log("B+ Lookup Hits: %-8d", bplus_lookup_hits); Index: openafs/src/WINNT/afsd/cm_btree.h diff -c openafs/src/WINNT/afsd/cm_btree.h:1.1.2.3 openafs/src/WINNT/afsd/cm_btree.h:1.1.2.5 *** openafs/src/WINNT/afsd/cm_btree.h:1.1.2.3 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/cm_btree.h Wed Sep 19 23:55:42 2007 *************** *** 51,57 **** char *name; } keyT; ! typedef cm_fid_t dataT; typedef struct entry { keyT key; --- 51,61 ---- char *name; } keyT; ! ! typedef struct dirdata { ! cm_fid_t fid; ! char * longname; ! } dataT; typedef struct entry { keyT key; *************** *** 139,144 **** --- 143,149 ---- int cm_BPlusDirDeleteEntry(cm_dirOp_t * op, char *entry); long cm_BPlusDirBuildTree(cm_scache_t *scp, cm_user_t *userp, cm_req_t* reqp); void cm_BPlusDumpStats(void); + int cm_MemDumpBPlusStats(FILE *outputFile, char *cookie, int lock); extern afs_uint32 bplus_free_tree; extern afs_uint32 bplus_dv_error; Index: openafs/src/WINNT/afsd/cm_buf.c diff -c openafs/src/WINNT/afsd/cm_buf.c:1.31.2.18 openafs/src/WINNT/afsd/cm_buf.c:1.31.2.20 *** openafs/src/WINNT/afsd/cm_buf.c:1.31.2.18 Thu Aug 9 01:33:56 2007 --- openafs/src/WINNT/afsd/cm_buf.c Tue Sep 18 12:59:23 2007 *************** *** 622,633 **** * because we aren't going to be able to write this data to the file * server. */ ! if (code == CM_ERROR_NOSUCHFILE){ bp->flags &= ~CM_BUF_DIRTY; bp->flags |= CM_BUF_ERROR; bp->dirty_offset = 0; bp->dirty_length = 0; ! bp->error = CM_ERROR_NOSUCHFILE; bp->dataVersion = -1; /* bad */ bp->dirtyCounter++; } --- 622,633 ---- * because we aren't going to be able to write this data to the file * server. */ ! if (code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BADFD){ bp->flags &= ~CM_BUF_DIRTY; bp->flags |= CM_BUF_ERROR; bp->dirty_offset = 0; bp->dirty_length = 0; ! bp->error = code; bp->dataVersion = -1; /* bad */ bp->dirtyCounter++; } *************** *** 1490,1498 **** lock_ReleaseMutex(&bp->mx); code = (*cm_buf_opsp->Stabilizep)(scp, userp, reqp); ! if (code) goto skip; lock_ObtainWrite(&buf_globalLock); /* actually, we only know that buffer is clean if ref * count is 1, since we don't have buffer itself locked. --- 1490,1512 ---- lock_ReleaseMutex(&bp->mx); code = (*cm_buf_opsp->Stabilizep)(scp, userp, reqp); ! if (code && code != CM_ERROR_BADFD) goto skip; + /* if the scp's FID is bad its because we received VNOVNODE + * when attempting to FetchStatus before the write. This + * page therefore contains data that can no longer be stored. + */ + lock_ObtainMutex(&bp->mx); + bp->flags &= ~CM_BUF_DIRTY; + bp->flags |= CM_BUF_ERROR; + bp->error = code; + bp->dirty_offset = 0; + bp->dirty_length = 0; + bp->dataVersion = -1; /* known bad */ + bp->dirtyCounter++; + lock_ReleaseMutex(&bp->mx); + lock_ObtainWrite(&buf_globalLock); /* actually, we only know that buffer is clean if ref * count is 1, since we don't have buffer itself locked. *************** *** 1509,1515 **** } lock_ReleaseWrite(&buf_globalLock); ! (*cm_buf_opsp->Unstabilizep)(scp, userp); } skip: --- 1523,1530 ---- } lock_ReleaseWrite(&buf_globalLock); ! if (code != CM_ERROR_BADFD) ! (*cm_buf_opsp->Unstabilizep)(scp, userp); } skip: *************** *** 1770,1776 **** for (bp = cm_data.buf_allp; bp; bp=bp->allp, bcount++) { if (!cm_FidCmp(fidp, &bp->fid) && (bp->flags & CM_BUF_DIRTY)) { ! buf_Hold(bp); lock_ObtainMutex(&bp->mx); bp->cmFlags &= ~CM_BUF_CMSTORING; bp->flags &= ~CM_BUF_DIRTY; --- 1785,1791 ---- for (bp = cm_data.buf_allp; bp; bp=bp->allp, bcount++) { if (!cm_FidCmp(fidp, &bp->fid) && (bp->flags & CM_BUF_DIRTY)) { ! buf_Hold(bp); lock_ObtainMutex(&bp->mx); bp->cmFlags &= ~CM_BUF_CMSTORING; bp->flags &= ~CM_BUF_DIRTY; Index: openafs/src/WINNT/afsd/cm_buf.h diff -c openafs/src/WINNT/afsd/cm_buf.h:1.12.4.6 openafs/src/WINNT/afsd/cm_buf.h:1.12.4.7 *** openafs/src/WINNT/afsd/cm_buf.h:1.12.4.6 Thu Aug 9 01:33:56 2007 --- openafs/src/WINNT/afsd/cm_buf.h Mon Sep 10 15:08:17 2007 *************** *** 78,85 **** cm_user_t *userp; /* user who wrote to the buffer last */ /* fields added for the CM; locked by scp->mx */ ! long dataVersion; /* data version of this page */ ! long cmFlags; /* flags for cm */ /* syncop state */ afs_uint32 waitCount; /* number of threads waiting */ --- 78,85 ---- cm_user_t *userp; /* user who wrote to the buffer last */ /* fields added for the CM; locked by scp->mx */ ! afs_uint32 dataVersion; /* data version of this page */ ! afs_uint32 cmFlags; /* flags for cm */ /* syncop state */ afs_uint32 waitCount; /* number of threads waiting */ Index: openafs/src/WINNT/afsd/cm_callback.c diff -c openafs/src/WINNT/afsd/cm_callback.c:1.41.4.18 openafs/src/WINNT/afsd/cm_callback.c:1.41.4.19 *** openafs/src/WINNT/afsd/cm_callback.c:1.41.4.18 Thu Aug 2 16:46:12 2007 --- openafs/src/WINNT/afsd/cm_callback.c Thu Sep 13 13:59:21 2007 *************** *** 231,237 **** */ void cm_RevokeVolumeCallback(struct rx_call *callp, cm_cell_t *cellp, AFSFid *fidp) { ! long hash; cm_scache_t *scp; cm_fid_t tfid; --- 231,237 ---- */ void cm_RevokeVolumeCallback(struct rx_call *callp, cm_cell_t *cellp, AFSFid *fidp) { ! unsigned long hash; cm_scache_t *scp; cm_fid_t tfid; *************** *** 411,417 **** struct sockaddr_in taddr; cm_server_t *tsp; cm_scache_t *scp; ! int hash; int discarded; struct rx_connection *connp; struct rx_peer *peerp; --- 411,417 ---- struct sockaddr_in taddr; cm_server_t *tsp; cm_scache_t *scp; ! afs_uint32 hash; int discarded; struct rx_connection *connp; struct rx_peer *peerp; *************** *** 686,692 **** int SRXAFSCB_GetCE(struct rx_call *callp, long index, AFSDBCacheEntry *cep) { ! int i; cm_scache_t * scp; int code; struct rx_connection *connp; --- 686,692 ---- int SRXAFSCB_GetCE(struct rx_call *callp, long index, AFSDBCacheEntry *cep) { ! afs_uint32 i; cm_scache_t * scp; int code; struct rx_connection *connp; *************** *** 792,798 **** int SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry64 *cep) { ! int i; cm_scache_t * scp; int code; struct rx_connection *connp; --- 792,798 ---- int SRXAFSCB_GetCE64(struct rx_call *callp, long index, AFSDBCacheEntry64 *cep) { ! afs_uint32 i; cm_scache_t * scp; int code; struct rx_connection *connp; *************** *** 1799,1807 **** /* called periodically by cm_daemon to shut down use of expired callbacks */ void cm_CheckCBExpiration(void) { ! int i; cm_scache_t *scp; ! time_t now, downTime = 0; osi_Log0(afsd_logp, "CheckCBExpiration"); --- 1799,1807 ---- /* called periodically by cm_daemon to shut down use of expired callbacks */ void cm_CheckCBExpiration(void) { ! afs_uint32 i; cm_scache_t *scp; ! time_t now, downTime; osi_Log0(afsd_logp, "CheckCBExpiration"); *************** *** 1809,1815 **** lock_ObtainWrite(&cm_scacheLock); for (i=0; inextp) { ! if (scp->cbServerp && scp->cbExpires > 0 && now > scp->cbExpires && (cm_CBServersUp(scp, &downTime) || downTime == 0 || downTime >= scp->cbExpires)) { --- 1809,1815 ---- lock_ObtainWrite(&cm_scacheLock); for (i=0; inextp) { ! downTime = 0; if (scp->cbServerp && scp->cbExpires > 0 && now > scp->cbExpires && (cm_CBServersUp(scp, &downTime) || downTime == 0 || downTime >= scp->cbExpires)) { *************** *** 1835,1860 **** void ! cm_GiveUpAllCallbacks(cm_server_t *tsp) { long code; cm_conn_t *connp; struct rx_connection * rxconnp; ! if (tsp->type == CM_SERVER_FILE && !(tsp->flags & CM_SERVERFLAG_DOWN)) { code = cm_ConnByServer(tsp, cm_rootUserp, &connp); if (code == 0) { rxconnp = cm_GetRxConn(connp); rx_SetConnDeadTime(rxconnp, 10); ! code = RXAFS_GiveUpAllCallBacks(rxconnp); rx_SetConnDeadTime(rxconnp, ConnDeadtimeout); ! rx_PutConnection(rxconnp); } } } void ! cm_GiveUpAllCallbacksAllServers(void) { cm_server_t *tsp; --- 1835,1893 ---- void ! cm_GiveUpAllCallbacks(cm_server_t *tsp, afs_int32 markDown) { long code; cm_conn_t *connp; struct rx_connection * rxconnp; ! if ((tsp->type == CM_SERVER_FILE) && !(tsp->flags & CM_SERVERFLAG_DOWN)) ! { code = cm_ConnByServer(tsp, cm_rootUserp, &connp); if (code == 0) { rxconnp = cm_GetRxConn(connp); rx_SetConnDeadTime(rxconnp, 10); ! code = RXAFS_GiveUpAllCallBacks(rxconnp); rx_SetConnDeadTime(rxconnp, ConnDeadtimeout); ! rx_PutConnection(rxconnp); ! } ! ! if (markDown) { ! cm_server_vols_t * tsrvp; ! cm_volume_t * volp; ! int i; ! ! lock_ObtainMutex(&tsp->mx); ! if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { ! tsp->flags |= CM_SERVERFLAG_DOWN; ! tsp->downTime = osi_Time(); ! } ! cm_ForceNewConnections(tsp); ! lock_ReleaseMutex(&tsp->mx); ! ! /* Now update the volume status */ ! for (tsrvp = tsp->vols; tsrvp; tsrvp = tsrvp->nextp) { ! for (i=0; iids[i] != 0) { ! cm_req_t req; ! ! cm_InitReq(&req); ! ! code = cm_GetVolumeByID(tsp->cellp, tsrvp->ids[i], cm_rootUserp, ! &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp); ! if (code == 0) { ! cm_UpdateVolumeStatus(volp, tsrvp->ids[i]); ! cm_PutVolume(volp); ! } ! } ! } ! } } } } void ! cm_GiveUpAllCallbacksAllServers(afs_int32 markDown) { cm_server_t *tsp; *************** *** 1862,1868 **** for (tsp = cm_allServersp; tsp; tsp = tsp->allNextp) { cm_GetServerNoLock(tsp); lock_ReleaseWrite(&cm_serverLock); ! cm_GiveUpAllCallbacks(tsp); lock_ObtainWrite(&cm_serverLock); cm_PutServerNoLock(tsp); } --- 1895,1901 ---- for (tsp = cm_allServersp; tsp; tsp = tsp->allNextp) { cm_GetServerNoLock(tsp); lock_ReleaseWrite(&cm_serverLock); ! cm_GiveUpAllCallbacks(tsp, markDown); lock_ObtainWrite(&cm_serverLock); cm_PutServerNoLock(tsp); } Index: openafs/src/WINNT/afsd/cm_callback.h diff -c openafs/src/WINNT/afsd/cm_callback.h:1.7.4.2 openafs/src/WINNT/afsd/cm_callback.h:1.7.4.3 *** openafs/src/WINNT/afsd/cm_callback.h:1.7.4.2 Thu Jun 28 00:50:15 2007 --- openafs/src/WINNT/afsd/cm_callback.h Thu Sep 13 13:59:21 2007 *************** *** 68,75 **** extern void cm_CallbackNotifyChange(cm_scache_t *scp); ! extern void cm_GiveUpAllCallbacks(cm_server_t *tsp); ! extern void cm_GiveUpAllCallbacksAllServers(void); #endif /* _CM_CALLBACK_H_ENV__ */ --- 68,75 ---- extern void cm_CallbackNotifyChange(cm_scache_t *scp); ! extern void cm_GiveUpAllCallbacks(cm_server_t *tsp, afs_int32 markDown); ! extern void cm_GiveUpAllCallbacksAllServers(afs_int32 markDown); #endif /* _CM_CALLBACK_H_ENV__ */ Index: openafs/src/WINNT/afsd/cm_conn.c diff -c openafs/src/WINNT/afsd/cm_conn.c:1.49.2.21 openafs/src/WINNT/afsd/cm_conn.c:1.49.2.22 *** openafs/src/WINNT/afsd/cm_conn.c:1.49.2.21 Tue Aug 7 00:00:49 2007 --- openafs/src/WINNT/afsd/cm_conn.c Thu Sep 13 13:59:21 2007 *************** *** 552,559 **** /* mark server as down */ lock_ObtainMutex(&serverp->mx); if (reqp->flags & CM_REQ_NEW_CONN_FORCED) { ! serverp->flags |= CM_SERVERFLAG_DOWN; ! serverp->downTime = osi_Time(); } else { reqp->flags |= CM_REQ_NEW_CONN_FORCED; forcing_new = 1; --- 552,561 ---- /* mark server as down */ lock_ObtainMutex(&serverp->mx); if (reqp->flags & CM_REQ_NEW_CONN_FORCED) { ! if (!(serverp->flags & CM_SERVERFLAG_DOWN)) { ! serverp->flags |= CM_SERVERFLAG_DOWN; ! serverp->downTime = osi_Time(); ! } } else { reqp->flags |= CM_REQ_NEW_CONN_FORCED; forcing_new = 1; Index: openafs/src/WINNT/afsd/cm_dcache.c diff -c openafs/src/WINNT/afsd/cm_dcache.c:1.30.2.16 openafs/src/WINNT/afsd/cm_dcache.c:1.30.2.19 *** openafs/src/WINNT/afsd/cm_dcache.c:1.30.2.16 Thu Aug 9 01:33:56 2007 --- openafs/src/WINNT/afsd/cm_dcache.c Tue Sep 18 12:59:23 2007 *************** *** 57,63 **** */ long code; cm_scache_t *scp = vscp; ! long nbytes; long temp; AFSFetchStatus outStatus; AFSStoreStatus inStatus; --- 57,63 ---- */ long code; cm_scache_t *scp = vscp; ! afs_int32 nbytes; long temp; AFSFetchStatus outStatus; AFSStoreStatus inStatus; *************** *** 68,74 **** struct rx_connection *rxconnp; osi_queueData_t *qdp; cm_buf_t *bufp; ! long wbytes; char *bufferp; cm_conn_t *connp; osi_hyper_t truncPos; --- 68,74 ---- struct rx_connection *rxconnp; osi_queueData_t *qdp; cm_buf_t *bufp; ! afs_uint32 wbytes; char *bufferp; cm_conn_t *connp; osi_hyper_t truncPos; *************** *** 84,96 **** */ lock_ObtainMutex(&scp->mx); - cm_AFSFidFromFid(&tfid, &scp->fid); - if (scp->flags & CM_SCACHEFLAG_DELETED) { lock_ReleaseMutex(&scp->mx); return CM_ERROR_NOSUCHFILE; } code = cm_SetupStoreBIOD(scp, offsetp, length, &biod, userp, reqp); if (code) { osi_Log1(afsd_logp, "cm_SetupStoreBIOD code %x", code); --- 84,96 ---- */ lock_ObtainMutex(&scp->mx); if (scp->flags & CM_SCACHEFLAG_DELETED) { lock_ReleaseMutex(&scp->mx); return CM_ERROR_NOSUCHFILE; } + cm_AFSFidFromFid(&tfid, &scp->fid); + code = cm_SetupStoreBIOD(scp, offsetp, length, &biod, userp, reqp); if (code) { osi_Log1(afsd_logp, "cm_SetupStoreBIOD code %x", code); *************** *** 532,542 **** } /* used when deciding whether to do a prefetch or not */ ! long cm_CheckFetchRange(cm_scache_t *scp, osi_hyper_t *startBasep, long length, ! cm_user_t *up, cm_req_t *reqp, osi_hyper_t *realBasep) { - osi_hyper_t toffset; osi_hyper_t tbase; long code; cm_buf_t *bp; int stop; --- 532,543 ---- } /* used when deciding whether to do a prefetch or not */ ! long cm_CheckFetchRange(cm_scache_t *scp, osi_hyper_t *startBasep, osi_hyper_t *length, ! cm_user_t *userp, cm_req_t *reqp, osi_hyper_t *realBasep) { osi_hyper_t tbase; + osi_hyper_t tlength; + osi_hyper_t tblocksize; long code; cm_buf_t *bp; int stop; *************** *** 545,555 **** * they need work. */ tbase = *startBasep; stop = 0; lock_ObtainMutex(&scp->mx); ! while(length > 0) { /* get callback so we can do a meaningful dataVersion comparison */ ! code = cm_SyncOp(scp, NULL, up, reqp, 0, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); if (code) { scp->flags &= ~CM_SCACHEFLAG_PREFETCHING; --- 546,558 ---- * they need work. */ tbase = *startBasep; + tlength = *length; + tblocksize = ConvertLongToLargeInteger(cm_data.buf_blockSize); stop = 0; lock_ObtainMutex(&scp->mx); ! while (LargeIntegerGreaterThanZero(tlength)) { /* get callback so we can do a meaningful dataVersion comparison */ ! code = cm_SyncOp(scp, NULL, userp, reqp, 0, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); if (code) { scp->flags &= ~CM_SCACHEFLAG_PREFETCHING; *************** *** 580,592 **** if (stop) break; ! toffset.LowPart = cm_data.buf_blockSize; ! toffset.HighPart = 0; ! tbase = LargeIntegerAdd(toffset, tbase); ! length -= cm_data.buf_blockSize; } ! /* if we get here, either everything is fine or stop stopped us at a * particular buffer in the range that definitely needs to be fetched. */ if (stop == 0) { --- 583,593 ---- if (stop) break; ! tbase = LargeIntegerAdd(tbase, tblocksize); ! tlength = LargeIntegerSubtract(tlength, tblocksize); } ! /* if we get here, either everything is fine or 'stop' stopped us at a * particular buffer in the range that definitely needs to be fetched. */ if (stop == 0) { *************** *** 639,657 **** } /* Called with scp locked */ ! void cm_ClearPrefetchFlag(long code, cm_scache_t *scp, osi_hyper_t *base) { ! osi_hyper_t thyper; if (code == 0) { ! thyper.LowPart = cm_chunkSize; ! thyper.HighPart = 0; ! thyper = LargeIntegerAdd(*base, thyper); ! thyper.LowPart &= (-cm_chunkSize); if (LargeIntegerGreaterThan(*base, scp->prefetch.base)) scp->prefetch.base = *base; ! if (LargeIntegerGreaterThan(thyper, scp->prefetch.end)) ! scp->prefetch.end = thyper; } scp->flags &= ~CM_SCACHEFLAG_PREFETCHING; } --- 640,655 ---- } /* Called with scp locked */ ! void cm_ClearPrefetchFlag(long code, cm_scache_t *scp, osi_hyper_t *base, osi_hyper_t *length) { ! osi_hyper_t end; if (code == 0) { ! end = LargeIntegerAdd(*base, *length); if (LargeIntegerGreaterThan(*base, scp->prefetch.base)) scp->prefetch.base = *base; ! if (LargeIntegerGreaterThan(end, scp->prefetch.end)) ! scp->prefetch.end = end; } scp->flags &= ~CM_SCACHEFLAG_PREFETCHING; } *************** *** 662,672 **** cm_BkgPrefetch(cm_scache_t *scp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4, cm_user_t *userp) { ! long length; osi_hyper_t base; long code; cm_buf_t *bp = NULL; - int cpff = 0; /* cleared prefetch flag */ cm_req_t req; cm_InitReq(&req); --- 660,674 ---- cm_BkgPrefetch(cm_scache_t *scp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4, cm_user_t *userp) { ! osi_hyper_t length; osi_hyper_t base; + osi_hyper_t offset; + osi_hyper_t end; + osi_hyper_t fetched; + osi_hyper_t tblocksize; long code; + int mxheld = 0; cm_buf_t *bp = NULL; cm_req_t req; cm_InitReq(&req); *************** *** 674,707 **** /* Retries will be performed by the BkgDaemon thread if appropriate */ req.flags |= CM_REQ_NORETRY; base.LowPart = p1; base.HighPart = p2; ! length = p3; ! osi_Log2(afsd_logp, "Starting BKG prefetch scp 0x%p, base 0x%x", scp, p1); ! code = buf_Get(scp, &base, &bp); ! lock_ObtainMutex(&scp->mx); ! if (code || (bp->cmFlags & CM_BUF_CMFETCHING)) { ! scp->flags &= ~CM_SCACHEFLAG_PREFETCHING; ! lock_ReleaseMutex(&scp->mx); ! if (bp) ! buf_Release(bp); ! return 0; } ! ! code = cm_GetBuffer(scp, bp, &cpff, userp, &req); ! if (!cpff) ! cm_ClearPrefetchFlag(code, scp, &base); lock_ReleaseMutex(&scp->mx); ! buf_Release(bp); return code; } /* a read was issued to offsetp, and we have to determine whether we should ! * do a prefetch. */ void cm_ConsiderPrefetch(cm_scache_t *scp, osi_hyper_t *offsetp, cm_user_t *userp, cm_req_t *reqp) --- 676,740 ---- /* Retries will be performed by the BkgDaemon thread if appropriate */ req.flags |= CM_REQ_NORETRY; + fetched.LowPart = 0; + fetched.HighPart = 0; + tblocksize = ConvertLongToLargeInteger(cm_data.buf_blockSize); base.LowPart = p1; base.HighPart = p2; ! length.LowPart = p3; ! length.HighPart = p4; ! ! end = LargeIntegerAdd(base, length); ! osi_Log3(afsd_logp, "Starting BKG prefetch scp 0x%p, base 0x%x:%x", scp, p2, p1); ! for (code = 0, offset = base; ! code == 0 && LargeIntegerLessThan(offset, end); ! offset = LargeIntegerAdd(offset, tblocksize)) ! { ! if (mxheld) { ! lock_ReleaseMutex(&scp->mx); ! mxheld = 0; ! } ! code = buf_Get(scp, &base, &bp); ! if (!mxheld) { ! lock_ObtainMutex(&scp->mx); ! mxheld = 1; ! } ! if (code || (bp->cmFlags & CM_BUF_CMFETCHING)) { ! code = 0; ! if (bp) { ! buf_Release(bp); ! bp = NULL; ! } ! break; ! } ! code = cm_GetBuffer(scp, bp, NULL, userp, &req); ! if (code == 0) ! fetched = LargeIntegerAdd(fetched, tblocksize); } ! ! if (!mxheld) { ! lock_ObtainMutex(&scp->mx); ! mxheld = 1; ! } ! cm_ClearPrefetchFlag(LargeIntegerGreaterThanZero(fetched) ? 0 : code, ! scp, &base, &fetched); lock_ReleaseMutex(&scp->mx); ! if (bp) { ! buf_Release(bp); ! bp = NULL; ! } ! ! osi_Log4(afsd_logp, "Ending BKG prefetch scp 0x%p, code %d bytes 0x%x:%x", ! scp, code, fetched.HighPart, fetched.LowPart); return code; } /* a read was issued to offsetp, and we have to determine whether we should ! * do a prefetch of the next chunk. */ void cm_ConsiderPrefetch(cm_scache_t *scp, osi_hyper_t *offsetp, cm_user_t *userp, cm_req_t *reqp) *************** *** 709,720 **** --- 742,756 ---- long code; osi_hyper_t realBase; osi_hyper_t readBase; + osi_hyper_t readLength; readBase = *offsetp; /* round up to chunk boundary */ readBase.LowPart += (cm_chunkSize-1); readBase.LowPart &= (-cm_chunkSize); + readLength = ConvertLongToLargeInteger(cm_chunkSize); + lock_ObtainMutex(&scp->mx); if ((scp->flags & CM_SCACHEFLAG_PREFETCHING) || LargeIntegerLessThanOrEqualTo(readBase, scp->prefetch.base)) { *************** *** 731,737 **** lock_ReleaseMutex(&scp->mx); ! code = cm_CheckFetchRange(scp, &readBase, cm_chunkSize, userp, reqp, &realBase); if (code) return; /* can't find something to prefetch */ --- 767,773 ---- lock_ReleaseMutex(&scp->mx); ! code = cm_CheckFetchRange(scp, &readBase, &readLength, userp, reqp, &realBase); if (code) return; /* can't find something to prefetch */ *************** *** 739,746 **** osi_Log2(afsd_logp, "BKG Prefetch request scp 0x%p, base 0x%x", scp, realBase.LowPart); ! cm_QueueBKGRequest(scp, cm_BkgPrefetch, realBase.LowPart, ! realBase.HighPart, cm_chunkSize, 0, userp); } /* scp must be locked; temporarily unlocked during processing. --- 775,784 ---- osi_Log2(afsd_logp, "BKG Prefetch request scp 0x%p, base 0x%x", scp, realBase.LowPart); ! cm_QueueBKGRequest(scp, cm_BkgPrefetch, ! realBase.LowPart, realBase.HighPart, ! readLength.LowPart, readLength.HighPart, ! userp); } /* scp must be locked; temporarily unlocked during processing. *************** *** 783,790 **** bufp = NULL; for (temp = 0; temp < inSize; temp += cm_data.buf_blockSize) { ! thyper.HighPart = 0; ! thyper.LowPart = temp; tbase = LargeIntegerAdd(*inOffsetp, thyper); bufp = buf_Find(scp, &tbase); --- 821,827 ---- bufp = NULL; for (temp = 0; temp < inSize; temp += cm_data.buf_blockSize) { ! thyper = ConvertLongToLargeInteger(temp); tbase = LargeIntegerAdd(*inOffsetp, thyper); bufp = buf_Find(scp, &tbase); *************** *** 799,804 **** --- 836,842 ---- if (code) { lock_ReleaseMutex(&bufp->mx); buf_Release(bufp); + bufp = NULL; buf_UnreserveBuffers(cm_chunkSize / cm_data.buf_blockSize); return code; } *************** *** 846,853 **** /* compute the window surrounding *inOffsetp of size cm_chunkSize */ scanStart = *inOffsetp; scanStart.LowPart &= (-cm_chunkSize); ! thyper.LowPart = cm_chunkSize; ! thyper.HighPart = 0; scanEnd = LargeIntegerAdd(scanStart, thyper); flags = CM_SCACHESYNC_GETSTATUS --- 884,890 ---- /* compute the window surrounding *inOffsetp of size cm_chunkSize */ scanStart = *inOffsetp; scanStart.LowPart &= (-cm_chunkSize); ! thyper = ConvertLongToLargeInteger(cm_chunkSize); scanEnd = LargeIntegerAdd(scanStart, thyper); flags = CM_SCACHESYNC_GETSTATUS *************** *** 856,863 **** | CM_SCACHESYNC_NOWAIT; /* start by looking backwards until scanStart */ ! thyper.HighPart = 0; /* hyper version of cm_data.buf_blockSize */ ! thyper.LowPart = cm_data.buf_blockSize; tbase = LargeIntegerSubtract(firstModOffset, thyper); while(LargeIntegerGreaterThanOrEqualTo(tbase, scanStart)) { /* see if we can find the buffer */ --- 893,900 ---- | CM_SCACHESYNC_NOWAIT; /* start by looking backwards until scanStart */ ! /* hyper version of cm_data.buf_blockSize */ ! thyper = ConvertLongToLargeInteger(cm_data.buf_blockSize); tbase = LargeIntegerSubtract(firstModOffset, thyper); while(LargeIntegerGreaterThanOrEqualTo(tbase, scanStart)) { /* see if we can find the buffer */ *************** *** 916,923 **** } /* while loop looking for pages preceding the one we found */ /* now, find later dirty, contiguous pages, and add them to the list */ ! thyper.HighPart = 0; /* hyper version of cm_data.buf_blockSize */ ! thyper.LowPart = cm_data.buf_blockSize; tbase = LargeIntegerAdd(firstModOffset, thyper); while(LargeIntegerLessThan(tbase, scanEnd)) { /* see if we can find the buffer */ --- 953,960 ---- } /* while loop looking for pages preceding the one we found */ /* now, find later dirty, contiguous pages, and add them to the list */ ! /* hyper version of cm_data.buf_blockSize */ ! thyper = ConvertLongToLargeInteger(cm_data.buf_blockSize); tbase = LargeIntegerAdd(firstModOffset, thyper); while(LargeIntegerLessThan(tbase, scanEnd)) { /* see if we can find the buffer */ *************** *** 984,994 **** * If an error is returned, we don't return any buffers. */ long cm_SetupFetchBIOD(cm_scache_t *scp, osi_hyper_t *offsetp, ! cm_bulkIO_t *biop, cm_user_t *up, cm_req_t *reqp) { long code; cm_buf_t *tbp; ! osi_hyper_t toffset; /* a long long temp variable */ osi_hyper_t pageBase; /* base offset we're looking at */ osi_queueData_t *qdp; /* one temp queue structure */ osi_queueData_t *tqdp; /* another temp queue structure */ --- 1021,1031 ---- * If an error is returned, we don't return any buffers. */ long cm_SetupFetchBIOD(cm_scache_t *scp, osi_hyper_t *offsetp, ! cm_bulkIO_t *biop, cm_user_t *userp, cm_req_t *reqp) { long code; cm_buf_t *tbp; ! osi_hyper_t tblocksize; /* a long long temp variable */ osi_hyper_t pageBase; /* base offset we're looking at */ osi_queueData_t *qdp; /* one temp queue structure */ osi_queueData_t *tqdp; /* another temp queue structure */ *************** *** 1000,1005 **** --- 1037,1044 ---- osi_queueData_t *heldBufListEndp; /* first one */ int reserving; + tblocksize = ConvertLongToLargeInteger(cm_data.buf_blockSize); + biop->scp = scp; /* do not hold; held by caller */ biop->offset = *offsetp; /* null out the list of buffers */ *************** *** 1007,1013 **** biop->reserved = 0; /* first lookup the file's length, so we know when to stop */ ! code = cm_SyncOp(scp, NULL, up, reqp, 0, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); if (code) return code; --- 1046,1052 ---- biop->reserved = 0; /* first lookup the file's length, so we know when to stop */ ! code = cm_SyncOp(scp, NULL, userp, reqp, 0, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); if (code) return code; *************** *** 1061,1070 **** } buf_Release(tbp); ! toffset.HighPart = 0; ! toffset.LowPart = cm_data.buf_blockSize; ! pageBase = LargeIntegerAdd(toffset, pageBase); collected += cm_data.buf_blockSize; } --- 1100,1108 ---- } buf_Release(tbp); + tbp = NULL; ! pageBase = LargeIntegerAdd(tblocksize, pageBase); collected += cm_data.buf_blockSize; } *************** *** 1102,1110 **** break; collected += cm_data.buf_blockSize; ! toffset.HighPart = 0; ! toffset.LowPart = cm_data.buf_blockSize; ! pageBase = LargeIntegerAdd(toffset, pageBase); } /* look at each buffer, adding it into the list if it looks idle and --- 1140,1146 ---- break; collected += cm_data.buf_blockSize; ! pageBase = LargeIntegerAdd(tblocksize, pageBase); } /* look at each buffer, adding it into the list if it looks idle and *************** *** 1140,1146 **** /* wait for the buffer to serialize, if required. Doesn't * release the scp or buffer lock(s) if NOWAIT is specified. */ ! code = cm_SyncOp(scp, tbp, up, reqp, 0, flags); if (code) { lock_ReleaseMutex(&scp->mx); lock_ReleaseMutex(&tbp->mx); --- 1176,1182 ---- /* wait for the buffer to serialize, if required. Doesn't * release the scp or buffer lock(s) if NOWAIT is specified. */ ! code = cm_SyncOp(scp, tbp, userp, reqp, 0, flags); if (code) { lock_ReleaseMutex(&scp->mx); lock_ReleaseMutex(&tbp->mx); *************** *** 1186,1191 **** --- 1222,1228 ---- &qdp->q); osi_QDFree(qdp); buf_Release(tbp); + tbp = NULL; } /* Caller expects this */ *************** *** 1279,1285 **** /* Fetch a buffer. Called with scp locked. * The scp is locked on return. */ ! long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *up, cm_req_t *reqp) { long code; --- 1316,1322 ---- /* Fetch a buffer. Called with scp locked. * The scp is locked on return. */ ! long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *userp, cm_req_t *reqp) { long code; *************** *** 1300,1306 **** cm_bulkIO_t biod; /* bulk IO descriptor */ cm_conn_t *connp; int getroot; ! long t1, t2; int require_64bit_ops = 0; /* now, the buffer may or may not be filled with good data (buf_GetNew --- 1337,1343 ---- cm_bulkIO_t biod; /* bulk IO descriptor */ cm_conn_t *connp; int getroot; ! afs_int32 t1,t2; int require_64bit_ops = 0; /* now, the buffer may or may not be filled with good data (buf_GetNew *************** *** 1321,1330 **** cm_AFSFidFromFid(&tfid, &scp->fid); ! code = cm_SetupFetchBIOD(scp, &bufp->offset, &biod, up, reqp); if (code) { /* couldn't even get the first page setup properly */ ! osi_Log1(afsd_logp, "SetupFetchBIOD failure code %d", code); return code; } --- 1358,1367 ---- cm_AFSFidFromFid(&tfid, &scp->fid); ! code = cm_SetupFetchBIOD(scp, &bufp->offset, &biod, userp, reqp); if (code) { /* couldn't even get the first page setup properly */ ! osi_Log1(afsd_logp, "GetBuffer: SetupFetchBIOD failure code %d", code); return code; } *************** *** 1336,1347 **** * which case we just retry. */ if (bufp->dataVersion == scp->dataVersion || biod.length == 0) { ! osi_Log3(afsd_logp, "Bad DVs %d, %d or length 0x%x", ! bufp->dataVersion, scp->dataVersion, biod.length); ! if ((bufp->dataVersion == -1 ! || bufp->dataVersion < scp->dataVersion) ! && LargeIntegerGreaterThanOrEqualTo(bufp->offset, ! scp->serverLength)) { if (bufp->dataVersion == -1) memset(bufp->datap, 0, cm_data.buf_blockSize); bufp->dataVersion = scp->dataVersion; --- 1373,1384 ---- * which case we just retry. */ if (bufp->dataVersion == scp->dataVersion || biod.length == 0) { ! if ((bufp->dataVersion == -1 || bufp->dataVersion < scp->dataVersion) && ! LargeIntegerGreaterThanOrEqualTo(bufp->offset, scp->serverLength)) ! { ! osi_Log3(afsd_logp, "Bad DVs %d, %d or length 0x%x", ! bufp->dataVersion, scp->dataVersion, biod.length); ! if (bufp->dataVersion == -1) memset(bufp->datap, 0, cm_data.buf_blockSize); bufp->dataVersion = scp->dataVersion; *************** *** 1408,1414 **** bufferp=tbufp->datap; memset(bufferp, 0, cm_data.buf_blockSize); t2 = cm_fakeDirSize - t1; ! if (t2>cm_data.buf_blockSize) t2=cm_data.buf_blockSize; if (t2 > 0) { memcpy(bufferp, cm_FakeRootDir+t1, t2); } else { --- 1445,1452 ---- bufferp=tbufp->datap; memset(bufferp, 0, cm_data.buf_blockSize); t2 = cm_fakeDirSize - t1; ! if (t2> (afs_int32)cm_data.buf_blockSize) ! t2=cm_data.buf_blockSize; if (t2 > 0) { memcpy(bufferp, cm_FakeRootDir+t1, t2); } else { *************** *** 1431,1437 **** /* now make the call */ do { ! code = cm_ConnFromFID(&scp->fid, up, reqp, &connp); if (code) continue; --- 1469,1475 ---- /* now make the call */ do { ! code = cm_ConnFromFID(&scp->fid, userp, reqp, &connp); if (code) continue; *************** *** 1557,1564 **** osi_Wakeup((LONG_PTR) &scp->flags); } if (cpffp && !*cpffp && !osi_QPrev(&qdp->q)) { *cpffp = 1; ! cm_ClearPrefetchFlag(0, scp, &biod.offset); } lock_ReleaseMutex(&scp->mx); --- 1595,1603 ---- osi_Wakeup((LONG_PTR) &scp->flags); } if (cpffp && !*cpffp && !osi_QPrev(&qdp->q)) { + osi_hyper_t tlength = ConvertLongToLargeInteger(biod.length); *cpffp = 1; ! cm_ClearPrefetchFlag(0, scp, &biod.offset, &tlength); } lock_ReleaseMutex(&scp->mx); *************** *** 1623,1629 **** osi_Log0(afsd_logp, "CALL FetchData DONE"); ! } while (cm_Analyze(connp, up, reqp, &scp->fid, &volSync, NULL, NULL, code)); fetchingcompleted: code = cm_MapRPCError(code, reqp); --- 1662,1668 ---- osi_Log0(afsd_logp, "CALL FetchData DONE"); ! } while (cm_Analyze(connp, userp, reqp, &scp->fid, &volSync, NULL, NULL, code)); fetchingcompleted: code = cm_MapRPCError(code, reqp); *************** *** 1658,1664 **** lock_ObtainMutex(&scp->mx); if (code == 0) ! cm_MergeStatus(NULL, scp, &afsStatus, &volSync, up, 0); return code; } --- 1697,1703 ---- lock_ObtainMutex(&scp->mx); if (code == 0) ! cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, 0); return code; } Index: openafs/src/WINNT/afsd/cm_dcache.h diff -c openafs/src/WINNT/afsd/cm_dcache.h:1.4.4.3 openafs/src/WINNT/afsd/cm_dcache.h:1.4.4.4 *** openafs/src/WINNT/afsd/cm_dcache.h:1.4.4.3 Sun Feb 4 10:39:14 2007 --- openafs/src/WINNT/afsd/cm_dcache.h Mon Sep 10 15:08:17 2007 *************** *** 32,38 **** struct cm_user *, struct cm_req *); extern long cm_CheckFetchRange(cm_scache_t *scp, osi_hyper_t *startBasep, ! long length, cm_user_t *up, cm_req_t *reqp, osi_hyper_t *realBasep); extern long cm_SetupFetchBIOD(cm_scache_t *scp, osi_hyper_t *offsetp, cm_bulkIO_t *biop, cm_user_t *up, cm_req_t *reqp); --- 32,39 ---- struct cm_user *, struct cm_req *); extern long cm_CheckFetchRange(cm_scache_t *scp, osi_hyper_t *startBasep, ! osi_hyper_t *length, cm_user_t *up, ! cm_req_t *reqp, osi_hyper_t *realBasep); extern long cm_SetupFetchBIOD(cm_scache_t *scp, osi_hyper_t *offsetp, cm_bulkIO_t *biop, cm_user_t *up, cm_req_t *reqp); Index: openafs/src/WINNT/afsd/cm_dir.c diff -c openafs/src/WINNT/afsd/cm_dir.c:1.4.4.4 openafs/src/WINNT/afsd/cm_dir.c:1.4.4.6 *** openafs/src/WINNT/afsd/cm_dir.c:1.4.4.4 Tue Aug 28 13:50:06 2007 --- openafs/src/WINNT/afsd/cm_dir.c Wed Sep 19 23:55:42 2007 *************** *** 34,45 **** afs_uint64 dir_create_time = 0; afs_uint64 dir_remove_time = 0; ! afs_int32 cm_BPlusTrees = 0; void cm_DirDumpStats(void) { afsi_log("Dir Lookup Hits: %-8d", dir_lookup_hits); afsi_log(" Misses: %-8d", dir_lookup_misses); afsi_log(" Create: %-8d", dir_create_entry); afsi_log(" Remove: %-8d", dir_remove_entry); --- 34,74 ---- afs_uint64 dir_create_time = 0; afs_uint64 dir_remove_time = 0; ! afs_uint64 dir_enums = 0; ! ! afs_int32 cm_BPlusTrees = 1; ! ! int cm_MemDumpDirStats(FILE *outputFile, char *cookie, int lock) ! { ! int zilch; ! char output[128]; ! ! sprintf(output, "%s - Dir Lookup Hits: %-8d\r\n", cookie, dir_lookup_hits); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - Misses: %-8d\r\n", cookie, dir_lookup_misses); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - Enums: %-8d\r\n", cookie, dir_enums); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - Create: %-8d\r\n", cookie, dir_create_entry); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - Remove: %-8d\r\n", cookie, dir_remove_entry); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! ! sprintf(output, "%s - Dir Times Lookup: %-16I64d\r\n", cookie, dir_lookup_time); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - Create: %-16I64d\r\n", cookie, dir_create_time); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! sprintf(output, "%s - Remove: %-16I64d\r\n", cookie, dir_remove_time); ! WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); ! ! return(0); ! } void cm_DirDumpStats(void) { afsi_log("Dir Lookup Hits: %-8d", dir_lookup_hits); afsi_log(" Misses: %-8d", dir_lookup_misses); + afsi_log(" Enums: %-8d", dir_enums); afsi_log(" Create: %-8d", dir_create_entry); afsi_log(" Remove: %-8d", dir_remove_entry); Index: openafs/src/WINNT/afsd/cm_dir.h diff -c openafs/src/WINNT/afsd/cm_dir.h:1.4.4.3 openafs/src/WINNT/afsd/cm_dir.h:1.4.4.5 *** openafs/src/WINNT/afsd/cm_dir.h:1.4.4.3 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/cm_dir.h Wed Sep 19 23:55:42 2007 *************** *** 182,185 **** --- 182,190 ---- extern void cm_DirDumpStats(void); + + extern int + cm_MemDumpDirStats(FILE *outputFile, char *cookie, int lock); + + extern afs_int64 dir_enums; #endif /* __CM_DIR_ENV__ */ Index: openafs/src/WINNT/afsd/cm_ioctl.c diff -c openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.19 openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.20 *** openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.19 Sun Jul 22 19:10:17 2007 --- openafs/src/WINNT/afsd/cm_ioctl.c Wed Sep 19 23:55:42 2007 *************** *** 2756,2761 **** --- 2756,2763 ---- #endif /* dump all interesting data */ + cm_MemDumpDirStats(hLogFile, cookie, 1); + cm_MemDumpBPlusStats(hLogFile, cookie, 1); cm_DumpCells(hLogFile, cookie, 1); cm_DumpVolumes(hLogFile, cookie, 1); cm_DumpSCache(hLogFile, cookie, 1); Index: openafs/src/WINNT/afsd/cm_scache.c diff -c openafs/src/WINNT/afsd/cm_scache.c:1.35.2.42 openafs/src/WINNT/afsd/cm_scache.c:1.35.2.44 *** openafs/src/WINNT/afsd/cm_scache.c:1.35.2.42 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/cm_scache.c Thu Sep 13 13:59:21 2007 *************** *** 474,491 **** cm_SuspendSCache(void) { cm_scache_t * scp; ! cm_GiveUpAllCallbacksAllServers(); lock_ObtainWrite(&cm_scacheLock); ! for ( scp = cm_data.allSCachesp; scp; ! scp = scp->allNextp ) { ! if (scp->cbServerp) { ! cm_PutServer(scp->cbServerp); ! scp->cbServerp = NULL; ! } ! scp->cbExpires = 0; ! scp->flags &= ~CM_SCACHEFLAG_CALLBACK; } lock_ReleaseWrite(&cm_scacheLock); } --- 474,499 ---- cm_SuspendSCache(void) { cm_scache_t * scp; + time_t now; ! cm_GiveUpAllCallbacksAllServers(TRUE); ! ! /* ! * After this call all servers are marked down. ! * Do not clear the callbacks, instead change the ! * expiration time so that the callbacks will be expired ! * when the servers are marked back up. However, we ! * want the callbacks to be preserved as long as the ! * servers are down. That way if the machine resumes ! * without network, the stat cache item will still be ! * considered valid. ! */ ! now = osi_Time(); lock_ObtainWrite(&cm_scacheLock); ! for ( scp = cm_data.allSCachesp; scp; scp = scp->allNextp ) { ! if (scp->cbServerp) ! scp->cbExpires = now+1; } lock_ReleaseWrite(&cm_scacheLock); } *************** *** 524,530 **** } lock_ReleaseWrite(&cm_scacheLock); ! cm_GiveUpAllCallbacksAllServers(); return cm_dnlcShutdown(); } --- 532,538 ---- } lock_ReleaseWrite(&cm_scacheLock); ! cm_GiveUpAllCallbacksAllServers(FALSE); return cm_dnlcShutdown(); } Index: openafs/src/WINNT/afsd/cm_scache.h diff -c openafs/src/WINNT/afsd/cm_scache.h:1.21.2.14 openafs/src/WINNT/afsd/cm_scache.h:1.21.2.15 *** openafs/src/WINNT/afsd/cm_scache.h:1.21.2.14 Thu Aug 23 23:21:49 2007 --- openafs/src/WINNT/afsd/cm_scache.h Mon Sep 10 15:08:17 2007 *************** *** 14,20 **** #include "largeint95.h" #endif /* DJGPP */ ! #define MOUNTPOINTLEN 1024 typedef struct cm_fid { unsigned long cell; --- 14,20 ---- #include "largeint95.h" #endif /* DJGPP */ ! #define MOUNTPOINTLEN 1024 /* max path length for symlink; same as AFSPATHMAX */ typedef struct cm_fid { unsigned long cell; Index: openafs/src/WINNT/afsd/cm_server.c diff -c openafs/src/WINNT/afsd/cm_server.c:1.25.2.12 openafs/src/WINNT/afsd/cm_server.c:1.25.2.13 *** openafs/src/WINNT/afsd/cm_server.c:1.25.2.12 Thu Aug 2 16:46:12 2007 --- openafs/src/WINNT/afsd/cm_server.c Thu Sep 13 13:59:21 2007 *************** *** 152,159 **** } } else { /* mark server as down */ ! tsp->flags |= CM_SERVERFLAG_DOWN; ! tsp->downTime = osi_Time(); if (code != VRESTARTING) cm_ForceNewConnections(tsp); --- 152,161 ---- } } else { /* mark server as down */ ! if (!(tsp->flags & CM_SERVERFLAG_DOWN)) { ! tsp->flags |= CM_SERVERFLAG_DOWN; ! tsp->downTime = osi_Time(); ! } if (code != VRESTARTING) cm_ForceNewConnections(tsp); Index: openafs/src/WINNT/afsd/cm_vnodeops.c diff -c openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.41 openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.44 *** openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.41 Sun Aug 26 20:05:24 2007 --- openafs/src/WINNT/afsd/cm_vnodeops.c Wed Sep 12 21:41:44 2007 *************** *** 666,672 **** return 0; } ! return CM_ERROR_NOSUCHFILE; } #endif } --- 666,672 ---- return 0; } ! return CM_ERROR_BPLUS_NOMATCH; } #endif } *************** *** 1076,1082 **** --- 1076,1084 ---- strncpy(cellNamep, mpNamep+1, cp - mpNamep - 1); strcpy(volNamep, cp+1); /* now look up the cell */ + lock_ReleaseMutex(&scp->mx); cellp = cm_GetCell(cellNamep, CM_FLAG_CREATE); + lock_ObtainMutex(&scp->mx); } else { /* normal mt pt */ *************** *** 1224,1230 **** goto haveFid; } ! return CM_ERROR_NOSUCHFILE; } #endif } --- 1226,1232 ---- goto haveFid; } ! return CM_ERROR_BPLUS_NOMATCH; } #endif } *************** *** 1500,1506 **** #endif { long code; ! char tname[256]; int sysNameIndex = 0; cm_scache_t *scp = NULL; --- 1502,1508 ---- #endif { long code; ! char tname[AFSPATHMAX]; int sysNameIndex = 0; cm_scache_t *scp = NULL; *************** *** 1621,1628 **** else osi_Log0(afsd_logp, "CALL RemoveFile SUCCESS"); ! lock_ObtainWrite(&dscp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&dscp->mx); cm_dnlcRemove(dscp, namep); cm_SyncOpDone(dscp, NULL, sflags); --- 1623,1632 ---- else osi_Log0(afsd_logp, "CALL RemoveFile SUCCESS"); ! if (dirop.scp) { ! lock_ObtainWrite(&dirop.scp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&dscp->mx); cm_dnlcRemove(dscp, namep); cm_SyncOpDone(dscp, NULL, sflags); *************** *** 1814,1820 **** char *tp; /* ptr moving through input buffer */ char tc; /* temp char */ int haveComponent; /* has new component started? */ ! char component[256]; /* this is the new component */ char *cp; /* component name being assembled */ cm_scache_t *tscp; /* current location in the hierarchy */ cm_scache_t *nscp; /* next dude down */ --- 1818,1824 ---- char *tp; /* ptr moving through input buffer */ char tc; /* temp char */ int haveComponent; /* has new component started? */ ! char component[AFSPATHMAX]; /* this is the new component */ char *cp; /* component name being assembled */ cm_scache_t *tscp; /* current location in the hierarchy */ cm_scache_t *nscp; /* next dude down */ *************** *** 1930,1936 **** cm_ReleaseSCache(dirScp); if (psp) cm_FreeSpace(psp); ! if (code == CM_ERROR_NOSUCHFILE && tscp->fileType == CM_SCACHETYPE_SYMLINK) { osi_Log0(afsd_logp,"cm_NameI code CM_ERROR_NOSUCHPATH"); return CM_ERROR_NOSUCHPATH; } else { --- 1934,1942 ---- cm_ReleaseSCache(dirScp); if (psp) cm_FreeSpace(psp); ! if ((code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BPLUS_NOMATCH) && ! tscp->fileType == CM_SCACHETYPE_SYMLINK) ! { osi_Log0(afsd_logp,"cm_NameI code CM_ERROR_NOSUCHPATH"); return CM_ERROR_NOSUCHPATH; } else { *************** *** 2136,2142 **** CM_FLAG_CASEFOLD | CM_FLAG_FOLLOW | CM_FLAG_DIRSEARCH, userp, NULL, reqp, outScpp); ! if (code == CM_ERROR_NOSUCHFILE) code = CM_ERROR_NOSUCHPATH; /* this stuff is allocated no matter what happened on the namei call, --- 2142,2148 ---- CM_FLAG_CASEFOLD | CM_FLAG_FOLLOW | CM_FLAG_DIRSEARCH, userp, NULL, reqp, outScpp); ! if (code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BPLUS_NOMATCH) code = CM_ERROR_NOSUCHPATH; /* this stuff is allocated no matter what happened on the namei call, *************** *** 2688,2695 **** else osi_Log0(afsd_logp, "CALL CreateFile SUCCESS"); ! lock_ObtainWrite(&dscp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { --- 2694,2703 ---- else osi_Log0(afsd_logp, "CALL CreateFile SUCCESS"); ! if (dirop.scp) { ! lock_ObtainWrite(&dirop.scp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { *************** *** 2836,2843 **** else osi_Log0(afsd_logp, "CALL MakeDir SUCCESS"); ! lock_ObtainWrite(&dscp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { --- 2844,2853 ---- else osi_Log0(afsd_logp, "CALL MakeDir SUCCESS"); ! if (dirop.scp) { ! lock_ObtainWrite(&dirop.scp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { *************** *** 2944,2955 **** else osi_Log0(afsd_logp, "CALL Link SUCCESS"); ! lock_ObtainWrite(&dscp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { cm_MergeStatus(NULL, dscp, &updatedDirStatus, &volSync, userp, 0); if (cm_CheckDirOpForSingleChange(&dirop)) { cm_DirCreateEntry(&dirop, namep, &sscp->fid); #ifdef USE_BPLUS --- 2954,2971 ---- else osi_Log0(afsd_logp, "CALL Link SUCCESS"); ! if (dirop.scp) { ! lock_ObtainWrite(&dirop.scp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { cm_MergeStatus(NULL, dscp, &updatedDirStatus, &volSync, userp, 0); + } + lock_ReleaseMutex(&dscp->mx); + + if (code == 0) { if (cm_CheckDirOpForSingleChange(&dirop)) { cm_DirCreateEntry(&dirop, namep, &sscp->fid); #ifdef USE_BPLUS *************** *** 2958,2964 **** } } cm_EndDirOp(&dirop); - lock_ReleaseMutex(&dscp->mx); return code; } --- 2974,2979 ---- *************** *** 3021,3032 **** else osi_Log0(afsd_logp, "CALL Symlink SUCCESS"); ! lock_ObtainWrite(&dscp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { cm_MergeStatus(NULL, dscp, &updatedDirStatus, &volSync, userp, 0); if (cm_CheckDirOpForSingleChange(&dirop)) { newFid.cell = dscp->fid.cell; newFid.volume = dscp->fid.volume; --- 3036,3053 ---- else osi_Log0(afsd_logp, "CALL Symlink SUCCESS"); ! if (dirop.scp) { ! lock_ObtainWrite(&dirop.scp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { cm_MergeStatus(NULL, dscp, &updatedDirStatus, &volSync, userp, 0); + } + lock_ReleaseMutex(&dscp->mx); + + if (code == 0) { if (cm_CheckDirOpForSingleChange(&dirop)) { newFid.cell = dscp->fid.cell; newFid.volume = dscp->fid.volume; *************** *** 3040,3046 **** } } cm_EndDirOp(&dirop); - lock_ReleaseMutex(&dscp->mx); /* now try to create the new dir's entry, too, but be careful to * make sure that we don't merge in old info. Since we weren't locking --- 3061,3066 ---- *************** *** 3119,3126 **** else osi_Log0(afsd_logp, "CALL RemoveDir SUCCESS"); ! lock_ObtainWrite(&dscp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { --- 3139,3148 ---- else osi_Log0(afsd_logp, "CALL RemoveDir SUCCESS"); ! if (dirop.scp) { ! lock_ObtainWrite(&dirop.scp->dirlock); ! dirop.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&dscp->mx); cm_SyncOpDone(dscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) { *************** *** 3311,3318 **** osi_Log0(afsd_logp, "CALL Rename SUCCESS"); /* update the individual stat cache entries for the directories */ ! lock_ObtainWrite(&oldDscp->dirlock); ! oldDirOp.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&oldDscp->mx); cm_SyncOpDone(oldDscp, NULL, CM_SCACHESYNC_STOREDATA); --- 3333,3342 ---- osi_Log0(afsd_logp, "CALL Rename SUCCESS"); /* update the individual stat cache entries for the directories */ ! if (oldDirOp.scp) { ! lock_ObtainWrite(&oldDirOp.scp->dirlock); ! oldDirOp.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&oldDscp->mx); cm_SyncOpDone(oldDscp, NULL, CM_SCACHESYNC_STOREDATA); *************** *** 3353,3360 **** /* and update it for the new one, too, if necessary */ if (!oneDir) { ! lock_ObtainWrite(&newDscp->dirlock); ! newDirOp.lockType = CM_DIRLOCK_WRITE; lock_ObtainMutex(&newDscp->mx); cm_SyncOpDone(newDscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) --- 3377,3386 ---- /* and update it for the new one, too, if necessary */ if (!oneDir) { ! if (newDirOp.scp) { ! lock_ObtainWrite(&newDirOp.scp->dirlock); ! newDirOp.lockType = CM_DIRLOCK_WRITE; ! } lock_ObtainMutex(&newDscp->mx); cm_SyncOpDone(newDscp, NULL, CM_SCACHESYNC_STOREDATA); if (code == 0) Index: openafs/src/WINNT/afsd/smb.c diff -c openafs/src/WINNT/afsd/smb.c:1.118.2.40 openafs/src/WINNT/afsd/smb.c:1.118.2.43 *** openafs/src/WINNT/afsd/smb.c:1.118.2.40 Thu Aug 9 01:33:56 2007 --- openafs/src/WINNT/afsd/smb.c Tue Sep 18 12:59:23 2007 *************** *** 1651,1658 **** /* List available shares */ int smb_ListShares() { ! char sbmtpath[256]; ! char pathName[256]; char shareBuf[4096]; int num_shares=0; char *this_share; --- 1651,1658 ---- /* List available shares */ int smb_ListShares() { ! char sbmtpath[AFSPATHMAX]; ! char pathName[AFSPATHMAX]; char shareBuf[4096]; int num_shares=0; char *this_share; *************** *** 1689,1695 **** /*strcpy(shareNameList[num_shares], this_share);*/ len = GetPrivateProfileString("AFS Submounts", this_share, NULL, ! pathName, 256, sbmtpath); if (!len) return num_shares; --- 1689,1695 ---- /*strcpy(shareNameList[num_shares], this_share);*/ len = GetPrivateProfileString("AFS Submounts", this_share, NULL, ! pathName, AFSPATHMAX, sbmtpath); if (!len) return num_shares; *************** *** 2636,2642 **** outp->res[1] = inSmbp->res[1]; op->inCom = inSmbp->com; } ! outp->reb = SMB_FLAGS_SERVER_TO_CLIENT | SMB_FLAGS_CANONICAL_PATHNAMES; outp->flg2 = SMB_FLAGS2_KNOWS_LONG_NAMES; /* copy fields in generic packet area */ --- 2636,2645 ---- outp->res[1] = inSmbp->res[1]; op->inCom = inSmbp->com; } ! outp->reb = SMB_FLAGS_SERVER_TO_CLIENT; ! #ifdef SEND_CANONICAL_PATHNAMES ! outp->reb |= SMB_FLAGS_CANONICAL_PATHNAMES; ! #endif outp->flg2 = SMB_FLAGS2_KNOWS_LONG_NAMES; /* copy fields in generic packet area */ *************** *** 2744,2750 **** else if (code == CM_ERROR_READONLY) { NTStatus = 0xC00000A2L; /* Write protected */ } ! else if (code == CM_ERROR_NOSUCHFILE) { NTStatus = 0xC000000FL; /* No such file */ } else if (code == CM_ERROR_NOSUCHPATH) { --- 2747,2754 ---- else if (code == CM_ERROR_READONLY) { NTStatus = 0xC00000A2L; /* Write protected */ } ! else if (code == CM_ERROR_NOSUCHFILE || ! code == CM_ERROR_BPLUS_NOMATCH) { NTStatus = 0xC000000FL; /* No such file */ } else if (code == CM_ERROR_NOSUCHPATH) { *************** *** 2918,2924 **** class = 3; error = 19; /* read only */ } ! else if (code == CM_ERROR_NOSUCHFILE) { class = 1; error = 2; /* ENOENT! */ } --- 2922,2929 ---- class = 3; error = 19; /* read only */ } ! else if (code == CM_ERROR_NOSUCHFILE || ! code == CM_ERROR_BPLUS_NOMATCH) { class = 1; error = 2; /* ENOENT! */ } *************** *** 3138,3143 **** --- 3143,3155 ---- if (!fidp) goto send1; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + code = CM_ERROR_NOSUCHFILE; + goto send1a; + } + + pid = ((smb_t *) inp)->pid; { LARGE_INTEGER LOffset, LLength; *************** *** 3780,3786 **** smb_tid_t *tidp; smb_user_t *uidp; unsigned short newTid; ! char shareName[256]; char *sharePath; int shareFound; char *tp; --- 3792,3798 ---- smb_tid_t *tidp; smb_user_t *uidp; unsigned short newTid; ! char shareName[AFSPATHMAX]; char *sharePath; int shareFound; char *tp; *************** *** 5503,5509 **** /* Check if the file already exists; if so return error */ code = cm_Lookup(newDscp,newLastNamep,CM_FLAG_CHECKPATH,userp,&req,&tmpscp); ! if ((code != CM_ERROR_NOSUCHFILE) && (code != CM_ERROR_NOSUCHPATH) && (code != CM_ERROR_NOSUCHVOLUME) ) { osi_Log2(smb_logp, " lookup returns %ld for [%s]", code, osi_LogSaveString(smb_logp, newLastNamep)); --- 5515,5523 ---- /* Check if the file already exists; if so return error */ code = cm_Lookup(newDscp,newLastNamep,CM_FLAG_CHECKPATH,userp,&req,&tmpscp); ! if ((code != CM_ERROR_NOSUCHFILE) && (code != CM_ERROR_BPLUS_NOMATCH) && ! (code != CM_ERROR_NOSUCHPATH) && (code != CM_ERROR_NOSUCHVOLUME) ) ! { osi_Log2(smb_logp, " lookup returns %ld for [%s]", code, osi_LogSaveString(smb_logp, newLastNamep)); *************** *** 5701,5707 **** /* Check if the file already exists; if so return error */ code = cm_Lookup(newDscp,newLastNamep,CM_FLAG_CHECKPATH,userp,&req,&tmpscp); ! if ((code != CM_ERROR_NOSUCHFILE) && (code != CM_ERROR_NOSUCHPATH) && (code != CM_ERROR_NOSUCHVOLUME) ) { osi_Log2(smb_logp, " lookup returns %ld for [%s]", code, osi_LogSaveString(smb_logp, newLastNamep)); --- 5715,5723 ---- /* Check if the file already exists; if so return error */ code = cm_Lookup(newDscp,newLastNamep,CM_FLAG_CHECKPATH,userp,&req,&tmpscp); ! if ((code != CM_ERROR_NOSUCHFILE) && (code != CM_ERROR_BPLUS_NOMATCH) && ! (code != CM_ERROR_NOSUCHPATH) && (code != CM_ERROR_NOSUCHVOLUME) ) ! { osi_Log2(smb_logp, " lookup returns %ld for [%s]", code, osi_LogSaveString(smb_logp, newLastNamep)); *************** *** 5941,5946 **** --- 5957,5968 ---- if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 6699,6704 **** --- 6721,6732 ---- return CM_ERROR_BADFD; } + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 6822,6827 **** --- 6850,6861 ---- fd = smb_GetSMBParm(inp, 0); fidp = smb_FindFID(vcp, fd, 0); + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return; + } + osi_Log3(smb_logp, "Completing Raw Write offset 0x%x:%08x count %x", rwcp->offset.HighPart, rwcp->offset.LowPart, rwcp->count); *************** *** 6941,6946 **** --- 6975,6986 ---- return CM_ERROR_BADFD; } + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + { unsigned pid; cm_key_t key; *************** *** 7084,7089 **** --- 7124,7135 ---- if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 7227,7233 **** lastNamep++; code = cm_Lookup(dscp, lastNamep, 0, userp, &req, &scp); if (scp) cm_ReleaseSCache(scp); ! if (code != CM_ERROR_NOSUCHFILE) { if (code == 0) code = CM_ERROR_EXISTS; cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); --- 7273,7279 ---- lastNamep++; code = cm_Lookup(dscp, lastNamep, 0, userp, &req, &scp); if (scp) cm_ReleaseSCache(scp); ! if (code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { if (code == 0) code = CM_ERROR_EXISTS; cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); *************** *** 7364,7370 **** #endif code = cm_Lookup(dscp, lastNamep, 0, userp, &req, &scp); ! if (code && code != CM_ERROR_NOSUCHFILE) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); return code; --- 7410,7416 ---- #endif code = cm_Lookup(dscp, lastNamep, 0, userp, &req, &scp); ! if (code && code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); return code; *************** *** 7491,7500 **** /* try to find the file descriptor */ fd = smb_ChainFID(fd, inp); fidp = smb_FindFID(vcp, fd, 0); - if (!fidp) return CM_ERROR_BADFD; lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); --- 7537,7551 ---- /* try to find the file descriptor */ fd = smb_ChainFID(fd, inp); fidp = smb_FindFID(vcp, fd, 0); if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 8422,8428 **** return; } else if (code != 0) { #ifndef DJGPP ! char tbuffer[256]; #endif /* terminate silently if shutdown flag is set */ --- 8473,8479 ---- return; } else if (code != 0) { #ifndef DJGPP ! char tbuffer[AFSPATHMAX]; #endif /* terminate silently if shutdown flag is set */ *************** *** 9257,9263 **** ); if (nts != STATUS_SUCCESS && ntsEx != STATUS_SUCCESS) { ! char message[256]; sprintf(message,"MsV1_0SetProcessOption failure: nts 0x%x ntsEx 0x%x", nts, ntsEx); OutputDebugString(message); --- 9308,9314 ---- ); if (nts != STATUS_SUCCESS && ntsEx != STATUS_SUCCESS) { ! char message[AFSPATHMAX]; sprintf(message,"MsV1_0SetProcessOption failure: nts 0x%x ntsEx 0x%x", nts, ntsEx); OutputDebugString(message); Index: openafs/src/WINNT/afsd/smb.h diff -c openafs/src/WINNT/afsd/smb.h:1.41.2.17 openafs/src/WINNT/afsd/smb.h:1.41.2.18 *** openafs/src/WINNT/afsd/smb.h:1.41.2.17 Thu Aug 23 12:46:07 2007 --- openafs/src/WINNT/afsd/smb.h Mon Sep 10 15:08:17 2007 *************** *** 404,409 **** --- 404,410 ---- #define SMB_FID_NTOPEN 0x100 /* have dscp and pathp */ #define SMB_FID_SEQUENTIAL 0x200 #define SMB_FID_RANDOM 0x400 + #define SMB_FID_EXECUTABLE 0x800 #define SMB_FID_SHARE_READ 0x1000 #define SMB_FID_SHARE_WRITE 0x2000 Index: openafs/src/WINNT/afsd/smb3.c diff -c openafs/src/WINNT/afsd/smb3.c:1.95.2.40 openafs/src/WINNT/afsd/smb3.c:1.95.2.46 *** openafs/src/WINNT/afsd/smb3.c:1.95.2.40 Fri Jul 27 22:51:16 2007 --- openafs/src/WINNT/afsd/smb3.c Wed Sep 19 17:29:29 2007 *************** *** 41,46 **** --- 41,48 ---- /* protected by the smb_globalLock */ smb_tran2Packet_t *smb_tran2AssemblyQueuep; + const char **smb_ExecutableExtensions = NULL; + /* retrieve a held reference to a user structure corresponding to an incoming * request */ cm_user_t *smb_GetTran2User(smb_vc_t *vcp, smb_tran2Packet_t *inp) *************** *** 59,64 **** --- 61,88 ---- return up; } + /* + * Return boolean specifying if the path name is thought to be an + * executable file. For now .exe or .dll. + */ + afs_uint32 smb_IsExecutableFileName(const char *name) + { + int i, j, len; + + if ( smb_ExecutableExtensions == NULL || name == NULL) + return 0; + + len = strlen(name); + + for ( i=0; smb_ExecutableExtensions[i]; i++) { + j = len - strlen(smb_ExecutableExtensions[i]); + if (_stricmp(smb_ExecutableExtensions[i], &name[j]) == 0) + return 1; + } + + return 0; + } + /* * Return extended attributes. * Right now, we aren't using any of the "new" bits, so this looks exactly *************** *** 134,140 **** } void OutputDebugHexDump(unsigned char * buffer, int len) { ! int i,j,k,pcts=0; char buf[256]; static char tr[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; --- 158,164 ---- } void OutputDebugHexDump(unsigned char * buffer, int len) { ! int i,j,k; char buf[256]; static char tr[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; *************** *** 159,171 **** buf[j] = tr[k / 16]; buf[j+1] = tr[k % 16]; j = (i%16); ! j = j + 56 + ((j>7)?1:0) + pcts; buf[j] = (k>32 && k<127)?k:'.'; - if (k == '%') { - buf[++j] = k; - pcts++; - } } if(i) { osi_Log0(smb_logp, osi_LogSaveString(smb_logp, buf)); --- 183,191 ---- buf[j] = tr[k / 16]; buf[j+1] = tr[k % 16]; j = (i%16); ! j = j + 56 + ((j>7)?1:0); buf[j] = (k>32 && k<127)?k:'.'; } if(i) { osi_Log0(smb_logp, osi_LogSaveString(smb_logp, buf)); *************** *** 984,990 **** smb_tid_t *tidp; smb_user_t *uidp = NULL; unsigned short newTid; ! char shareName[256]; char *sharePath; int shareFound; char *tp; --- 1004,1010 ---- smb_tid_t *tidp; smb_user_t *uidp = NULL; unsigned short newTid; ! char shareName[AFSPATHMAX]; char *sharePath; int shareFound; char *tp; *************** *** 1500,1506 **** smb_rap_share_info_1_t * shares; USHORT cshare = 0; char * cstrp; ! char thisShare[256]; int i,j; DWORD dw; int nonrootShares; --- 1520,1526 ---- smb_rap_share_info_1_t * shares; USHORT cshare = 0; char * cstrp; ! char thisShare[AFSPATHMAX]; int i,j; DWORD dw; int nonrootShares; *************** *** 2219,2225 **** lastNamep++; code = cm_Lookup(dscp, lastNamep, CM_FLAG_CASEFOLD, userp, &req, &scp); ! if (code && code != CM_ERROR_NOSUCHFILE) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); smb_FreeTran2Packet(outp); --- 2239,2245 ---- lastNamep++; code = cm_Lookup(dscp, lastNamep, CM_FLAG_CASEFOLD, userp, &req, &scp); ! if (code && code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); smb_FreeTran2Packet(outp); *************** *** 2757,2764 **** code = CM_ERROR_NOSUCHFILE; else if (dscp->fileType == CM_SCACHETYPE_DIRECTORY) { cm_buf_t *bp = buf_Find(dscp, &hzero); ! if (bp) buf_Release(bp); else code = CM_ERROR_NOSUCHFILE; } --- 2777,2786 ---- code = CM_ERROR_NOSUCHFILE; else if (dscp->fileType == CM_SCACHETYPE_DIRECTORY) { cm_buf_t *bp = buf_Find(dscp, &hzero); ! if (bp) { buf_Release(bp); + bp = NULL; + } else code = CM_ERROR_NOSUCHFILE; } *************** *** 3025,3032 **** code = CM_ERROR_NOSUCHFILE; else if (dscp->fileType == CM_SCACHETYPE_DIRECTORY) { cm_buf_t *bp = buf_Find(dscp, &hzero); ! if (bp) buf_Release(bp); else code = CM_ERROR_NOSUCHFILE; } --- 3047,3056 ---- code = CM_ERROR_NOSUCHFILE; else if (dscp->fileType == CM_SCACHETYPE_DIRECTORY) { cm_buf_t *bp = buf_Find(dscp, &hzero); ! if (bp) { buf_Release(bp); + bp = NULL; + } else code = CM_ERROR_NOSUCHFILE; } *************** *** 3178,3183 **** --- 3202,3214 ---- return 0; } + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_SendTran2Error(vcp, p, opx, CM_ERROR_NOSUCHFILE); + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return 0; + } + infoLevel = p->parmsp[1]; if (infoLevel == SMB_QUERY_FILE_BASIC_INFO) responseSize = sizeof(qfi.u.QFbasicInfo); *************** *** 3306,3311 **** --- 3337,3349 ---- return 0; } + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_SendTran2Error(vcp, p, opx, CM_ERROR_NOSUCHFILE); + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return 0; + } + infoLevel = p->parmsp[1]; osi_Log2(smb_logp,"ReceiveTran2SetFileInfo type 0x%x fid %d", infoLevel, fid); if (infoLevel > SMB_SET_FILE_END_OF_FILE_INFO || infoLevel < SMB_SET_FILE_BASIC_INFO) { *************** *** 4385,4391 **** /* if a case sensitive match failed, we try a case insensitive one next. */ ! if (code == CM_ERROR_NOSUCHFILE) { code = cm_Lookup(scp, maskp, CM_FLAG_NOMOUNTCHASE | CM_FLAG_CASEFOLD, userp, &req, &targetscp); } --- 4423,4429 ---- /* if a case sensitive match failed, we try a case insensitive one next. */ ! if (code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BPLUS_NOMATCH) { code = cm_Lookup(scp, maskp, CM_FLAG_NOMOUNTCHASE | CM_FLAG_CASEFOLD, userp, &req, &targetscp); } *************** *** 4400,4406 **** smb_ReceiveTran2SearchDir(). */ cm_ReleaseSCache(scp); cm_ReleaseUser(userp); ! if (code != CM_ERROR_NOSUCHFILE) { smb_SendTran2Error(vcp, p, opx, code); code = 0; } --- 4438,4444 ---- smb_ReceiveTran2SearchDir(). */ cm_ReleaseSCache(scp); cm_ReleaseUser(userp); ! if (code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { smb_SendTran2Error(vcp, p, opx, code); code = 0; } *************** *** 4593,4599 **** osi_Log0(smb_logp, "T2SDSingle done."); ! if (code != CM_ERROR_NOSUCHFILE) { if (code) smb_SendTran2Error(vcp, p, opx, code); else --- 4631,4637 ---- osi_Log0(smb_logp, "T2SDSingle done."); ! if (code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { if (code) smb_SendTran2Error(vcp, p, opx, code); else *************** *** 4695,4704 **** --- 4733,4747 ---- /* we only failover if we see a CM_ERROR_NOSUCHFILE */ if (code != CM_ERROR_NOSUCHFILE) { + #ifdef USE_BPLUS + if (code == CM_ERROR_BPLUS_NOMATCH) + code = CM_ERROR_NOSUCHFILE; + #endif return code; } } #endif + dir_enums++; dsp = smb_NewDirSearch(1); dsp->attribute = attribute; *************** *** 5526,5532 **** lastNamep++; code = cm_Lookup(dscp, lastNamep, CM_FLAG_CASEFOLD, userp, &req, &scp); ! if (code && code != CM_ERROR_NOSUCHFILE) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); return code; --- 5569,5575 ---- lastNamep++; code = cm_Lookup(dscp, lastNamep, CM_FLAG_CASEFOLD, userp, &req, &scp); ! if (code && code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); return code; *************** *** 5744,5749 **** --- 5787,5798 ---- if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { osi_Log0(smb_logp, "smb_ReceiveV3Locking BadFD"); *************** *** 6001,6006 **** --- 6050,6061 ---- if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 6078,6083 **** --- 6133,6144 ---- if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 6164,6169 **** --- 6225,6236 ---- if (!fidp) return CM_ERROR_BADFD; + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + lock_ObtainMutex(&fidp->mx); if (fidp->flags & SMB_FID_IOCTL) { lock_ReleaseMutex(&fidp->mx); *************** *** 6301,6306 **** --- 6368,6379 ---- return CM_ERROR_BADFD; } + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + pid = ((smb_t *) inp)->pid; key = cm_GenerateKey(vcp->vcID, pid, fd); { *************** *** 6594,6599 **** --- 6667,6681 ---- cm_ReleaseUser(userp); return CM_ERROR_INVAL; } + + if (baseFidp->scp && (baseFidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + free(realPathp); + cm_ReleaseUser(userp); + smb_CloseFID(vcp, baseFidp, NULL, 0); + smb_ReleaseFID(baseFidp); + return CM_ERROR_NOSUCHPATH; + } + baseDirp = baseFidp->scp; tidPathp = NULL; } *************** *** 6614,6619 **** --- 6696,6703 ---- fidflags |= SMB_FID_SEQUENTIAL; if (createOptions & FILE_RANDOM_ACCESS && !(createOptions & FILE_SEQUENTIAL_ONLY)) fidflags |= SMB_FID_RANDOM; + if (smb_IsExecutableFileName(lastNamep)) + fidflags |= SMB_FID_EXECUTABLE; /* and the share mode */ if (shareAccess & FILE_SHARE_READ) *************** *** 6646,6652 **** #endif /* DFS_SUPPORT */ code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW, userp, &req, &scp); ! if (code == CM_ERROR_NOSUCHFILE) { code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); if (code == 0 && realDirFlag == 1) { --- 6730,6736 ---- #endif /* DFS_SUPPORT */ code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW, userp, &req, &scp); ! if (code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BPLUS_NOMATCH) { code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); if (code == 0 && realDirFlag == 1) { *************** *** 6792,6798 **** CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); } ! if (code && code != CM_ERROR_NOSUCHFILE) { if (dscp) cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); --- 6876,6882 ---- CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); } ! if (code && (code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH)) { if (dscp) cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); *************** *** 6953,6959 **** * it will appear as a directory name of the nul-string * and a code of CM_ERROR_NOSUCHFILE */ ! if ( !*treeStartp && code == CM_ERROR_NOSUCHFILE) code = CM_ERROR_EXISTS; setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; --- 7037,7043 ---- * it will appear as a directory name of the nul-string * and a code of CM_ERROR_NOSUCHFILE */ ! if ( !*treeStartp && (code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BPLUS_NOMATCH)) code = CM_ERROR_EXISTS; setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; *************** *** 7192,7200 **** (scp->fileType == CM_SCACHETYPE_DIRECTORY || scp->fileType == CM_SCACHETYPE_MOUNTPOINT || scp->fileType == CM_SCACHETYPE_INVALID) ? 1 : 0); /* is a dir? */ - lock_ReleaseMutex(&scp->mx); smb_SetSMBDataLength(outp, 0); osi_Log2(smb_logp, "SMB NT CreateX opening fid %d path %s", fidp->fid, osi_LogSaveString(smb_logp, realPathp)); --- 7276,7292 ---- (scp->fileType == CM_SCACHETYPE_DIRECTORY || scp->fileType == CM_SCACHETYPE_MOUNTPOINT || scp->fileType == CM_SCACHETYPE_INVALID) ? 1 : 0); /* is a dir? */ smb_SetSMBDataLength(outp, 0); + if ((fidp->flags & SMB_FID_EXECUTABLE) && + LargeIntegerGreaterThanZero(fidp->scp->length) && + !(scp->flags & CM_SCACHEFLAG_PREFETCHING)) { + cm_QueueBKGRequest(fidp->scp, cm_BkgPrefetch, 0, 0, + fidp->scp->length.LowPart, fidp->scp->length.HighPart, + userp); + } + lock_ReleaseMutex(&scp->mx); + osi_Log2(smb_logp, "SMB NT CreateX opening fid %d path %s", fidp->fid, osi_LogSaveString(smb_logp, realPathp)); *************** *** 7376,7383 **** osi_Log1(smb_logp, "NTTranCreate Invalid fid [%d]", baseFid); free(realPathp); cm_ReleaseUser(userp); ! return CM_ERROR_INVAL; } baseDirp = baseFidp->scp; tidPathp = NULL; } --- 7468,7484 ---- osi_Log1(smb_logp, "NTTranCreate Invalid fid [%d]", baseFid); free(realPathp); cm_ReleaseUser(userp); ! return CM_ERROR_BADFD; } + + if (baseFidp->scp && (baseFidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + free(realPathp); + cm_ReleaseUser(userp); + smb_CloseFID(vcp, baseFidp, NULL, 0); + smb_ReleaseFID(baseFidp); + return CM_ERROR_NOSUCHPATH; + } + baseDirp = baseFidp->scp; tidPathp = NULL; } *************** *** 7396,7401 **** --- 7497,7504 ---- fidflags |= SMB_FID_SEQUENTIAL; if (createOptions & FILE_RANDOM_ACCESS && !(createOptions & FILE_SEQUENTIAL_ONLY)) fidflags |= SMB_FID_RANDOM; + if (smb_IsExecutableFileName(lastNamep)) + fidflags |= SMB_FID_EXECUTABLE; /* And the share mode */ if (shareAccess & FILE_SHARE_READ) *************** *** 7426,7432 **** #endif /* DFS_SUPPORT */ code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW, userp, &req, &scp); ! if (code == CM_ERROR_NOSUCHFILE) { code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); if (code == 0 && realDirFlag == 1) { --- 7529,7535 ---- #endif /* DFS_SUPPORT */ code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW, userp, &req, &scp); ! if (code == CM_ERROR_NOSUCHFILE || code == CM_ERROR_BPLUS_NOMATCH) { code = cm_Lookup(dscp, (lastNamep)?(lastNamep+1):realPathp, CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); if (code == 0 && realDirFlag == 1) { *************** *** 7512,7518 **** CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); } ! if (code && code != CM_ERROR_NOSUCHFILE) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); free(realPathp); --- 7615,7621 ---- CM_FLAG_FOLLOW | CM_FLAG_CASEFOLD, userp, &req, &scp); } ! if (code && code != CM_ERROR_NOSUCHFILE && code != CM_ERROR_BPLUS_NOMATCH) { cm_ReleaseSCache(dscp); cm_ReleaseUser(userp); free(realPathp); *************** *** 7919,7924 **** --- 8022,8037 ---- lock_ReleaseMutex(&scp->mx); } + lock_ObtainMutex(&scp->mx); + if ((fidp->flags & SMB_FID_EXECUTABLE) && + LargeIntegerGreaterThanZero(fidp->scp->length) && + !(scp->flags & CM_SCACHEFLAG_PREFETCHING)) { + cm_QueueBKGRequest(fidp->scp, cm_BkgPrefetch, 0, 0, + fidp->scp->length.LowPart, fidp->scp->length.HighPart, + userp); + } + lock_ReleaseMutex(&scp->mx); + osi_Log1(smb_logp, "SMB NTTranCreate opening fid %d", fidp->fid); cm_ReleaseUser(userp); *************** *** 7949,7954 **** --- 8062,8073 ---- return CM_ERROR_BADFD; } + if (fidp->scp && (fidp->scp->flags & CM_SCACHEFLAG_DELETED)) { + smb_CloseFID(vcp, fidp, NULL, 0); + smb_ReleaseFID(fidp); + return CM_ERROR_NOSUCHFILE; + } + /* Create a copy of the Directory Watch Packet to use when sending the * notification if in the future a matching change is detected. */ *************** *** 8190,8199 **** lastWatch = watch; watch = watch->nextp; continue; ! } ! if (fidp->scp != dscp ! || (filter & notifyFilter) == 0 ! || (!isDirectParent && !wtree)) { osi_Log1(smb_logp," skipping fidp->scp[%x]", fidp->scp); smb_ReleaseFID(fidp); lastWatch = watch; --- 8309,8321 ---- lastWatch = watch; watch = watch->nextp; continue; ! } ! ! if (fidp->scp != dscp || ! fidp->scp->flags & CM_SCACHEFLAG_DELETED || ! (filter & notifyFilter) == 0 || ! (!isDirectParent && !wtree)) ! { osi_Log1(smb_logp," skipping fidp->scp[%x]", fidp->scp); smb_ReleaseFID(fidp); lastWatch = watch; *************** *** 8246,8252 **** lock_ReleaseMutex(&dscp->mx); /* Convert to response packet */ ! ((smb_t *) watch)->reb = SMB_FLAGS_SERVER_TO_CLIENT | SMB_FLAGS_CANONICAL_PATHNAMES; ((smb_t *) watch)->wct = 0; /* out parms */ --- 8368,8377 ---- lock_ReleaseMutex(&dscp->mx); /* Convert to response packet */ ! ((smb_t *) watch)->reb = SMB_FLAGS_SERVER_TO_CLIENT; ! #ifdef SEND_CANONICAL_PATHNAMES ! ((smb_t *) watch)->reb |= SMB_FLAGS_CANONICAL_PATHNAMES; ! #endif ((smb_t *) watch)->wct = 0; /* out parms */ Index: openafs/src/WINNT/aklog/aklog.c diff -c openafs/src/WINNT/aklog/aklog.c:1.14.4.5 openafs/src/WINNT/aklog/aklog.c:1.14.4.6 *** openafs/src/WINNT/aklog/aklog.c:1.14.4.5 Thu Aug 9 18:54:07 2007 --- openafs/src/WINNT/aklog/aklog.c Wed Aug 29 02:46:18 2007 *************** *** 13,18 **** --- 13,22 ---- * or implied warranty. */ + #ifndef _WIN64 + #define HAVE_KRB4 + #endif + #include #include #include *************** *** 21,27 **** --- 25,40 ---- #include #include #include + #ifdef HAVE_KRB4 #include + #else + #define REALM_SZ 64 + #define ANAME_SZ 64 + #define INST_SZ 64 + #define KSUCCESS 0 + + #define CREDENTIALS void + #endif #include #include #include *************** *** 43,52 **** --- 56,67 ---- #define DONT_HAVE_GET_AD_TKT #define MAXSYMLINKS 255 + #ifdef HAVE_KRB4 /* Win32 uses get_krb_err_txt_entry(status) instead of krb_err_txt[status], * so we use a bit of indirection like the GNU CVS sources. */ #define krb_err_text(status) get_krb_err_txt_entry(status) + #endif #define DRIVECOLON ':' /* Drive letter separator */ #define BDIR '\\' /* Other character that divides directories */ *************** *** 257,263 **** if ((*status = ktc_SetToken(aserver, atoken, aclient, 0))) { printf("%s: unable to set tokens for cell %s " ! "(status: %d).\n", progname, cell_to_use, status); *status = AKLOG_TOKEN; return ; } --- 272,278 ---- if ((*status = ktc_SetToken(aserver, atoken, aclient, 0))) { printf("%s: unable to set tokens for cell %s " ! "(status: %d).\n", progname, cell_to_use, *status); *status = AKLOG_TOKEN; return ; } *************** *** 270,276 **** */ if ((*status = pr_Initialize(1L, confname, aserver->cell))) { ! printf("Error %d\n", status); return; } --- 285,291 ---- */ if ((*status = pr_Initialize(1L, confname, aserver->cell))) { ! printf("Error %d\n", *status); return; } *************** *** 356,361 **** --- 371,377 ---- abort(); } + #ifdef HAVE_KRB4 static int get_cred(char *name, char *inst, char *realm, CREDENTIALS *c) { int status; *************** *** 375,380 **** --- 391,397 ---- return (status); } + #endif static int get_v5cred(krb5_context context, char *name, char *inst, char *realm, CREDENTIALS *c, *************** *** 387,393 **** memset((char *)&increds, 0, sizeof(increds)); if ((r = krb5_build_principal(context, &increds.server, ! strlen(realm), realm, name, (inst && strlen(inst)) ? inst : 0, 0))) { --- 404,410 ---- memset((char *)&increds, 0, sizeof(increds)); if ((r = krb5_build_principal(context, &increds.server, ! (int)strlen(realm), realm, name, (inst && strlen(inst)) ? inst : 0, 0))) { *************** *** 414,419 **** --- 431,437 ---- return((int)r); } + #ifdef HAVE_KRB4 /* There is no header for this function. It is supposed to be private */ int krb_get_admhst(char *h,char *r, int n); *************** *** 443,449 **** } return krbrlm; } ! /* As of MIT Kerberos 1.6, krb5_get_host_realm() will return the NUL-string * if there is no domain_realm mapping for the hostname's domain. This is --- 461,467 ---- } return krbrlm; } ! #endif /* As of MIT Kerberos 1.6, krb5_get_host_realm() will return the NUL-string * if there is no domain_realm mapping for the hostname's domain. This is *************** *** 510,541 **** static int get_cellconfig(char *cell, struct afsconf_cell *cellconfig, char *local_cell) { ! int status = AKLOG_SUCCESS; ! struct afsconf_dir *configdir = 0; ! memset(local_cell, 0, sizeof(local_cell)); ! memset(cellconfig, 0, sizeof(*cellconfig)); ! if (GetLocalCell(&configdir, local_cell)) ! { ! fprintf(stderr, "%s: can't determine local cell.\n", progname); ! exit(AKLOG_AFS); ! } ! if ((cell == NULL) || (cell[0] == 0)) ! cell = local_cell; ! if (GetCellInfo(&configdir, cell, &cellconfig)) ! { ! fprintf(stderr, "%s: Can't get information about cell %s.\n", ! progname, cell); ! status = AKLOG_AFS; ! } ! CloseConf(&configdir); ! return(status); } static int get_v5_user_realm(krb5_context context,char *realm) --- 528,559 ---- static int get_cellconfig(char *cell, struct afsconf_cell *cellconfig, char *local_cell) { ! int status = AKLOG_SUCCESS; ! struct afsconf_dir *configdir = 0; ! memset(local_cell, 0, sizeof(local_cell)); ! memset(cellconfig, 0, sizeof(*cellconfig)); ! if (GetLocalCell(&configdir, local_cell)) ! { ! fprintf(stderr, "%s: can't determine local cell.\n", progname); ! exit(AKLOG_AFS); ! } ! if ((cell == NULL) || (cell[0] == 0)) ! cell = local_cell; ! if (GetCellInfo(&configdir, cell, &cellconfig)) ! { ! fprintf(stderr, "%s: Can't get information about cell %s.\n", ! progname, cell); ! status = AKLOG_AFS; ! } ! CloseConf(&configdir); ! return(status); } static int get_v5_user_realm(krb5_context context,char *realm) *************** *** 572,578 **** --- 590,598 ---- char cell_to_use[MAXCELLCHARS+1]; /* Cell to authenticate to */ krb5_creds *v5cred = NULL; + #ifdef HAVE_KRB4 CREDENTIALS c; + #endif struct ktc_principal aserver; struct ktc_principal aclient; struct ktc_token atoken, btoken; *************** *** 646,652 **** if (dflag) printf("Getting v5 tickets: %s/%s@%s\n", name, instance, realm_of_cell); status = get_v5cred(context, name, instance, realm_of_cell, ! use524 ? &c : NULL, &v5cred); if (status == KRB5_ERR_HOST_REALM_UNKNOWN) { realm_fallback = 1; goto try_v5; --- 666,677 ---- if (dflag) printf("Getting v5 tickets: %s/%s@%s\n", name, instance, realm_of_cell); status = get_v5cred(context, name, instance, realm_of_cell, ! #ifdef HAVE_KRB4 ! use524 ? &c : NULL, ! #else ! NULL, ! #endif ! &v5cred); if (status == KRB5_ERR_HOST_REALM_UNKNOWN) { realm_fallback = 1; goto try_v5; *************** *** 658,664 **** if (dflag) printf("Getting v5 tickets: %s@%s\n", name, realm_of_cell); status = get_v5cred(context, name, "", realm_of_cell, ! use524 ? &c : NULL, &v5cred); } if ( status == KRB5KRB_AP_ERR_MSG_TYPE && retry ) { retry = 0; --- 683,694 ---- if (dflag) printf("Getting v5 tickets: %s@%s\n", name, realm_of_cell); status = get_v5cred(context, name, "", realm_of_cell, ! #ifdef HAVE_KRB4 ! use524 ? &c : NULL, ! #else ! NULL, ! #endif ! &v5cred); } if ( status == KRB5KRB_AP_ERR_MSG_TYPE && retry ) { retry = 0; *************** *** 668,673 **** --- 698,704 ---- } else { + #ifdef HAVE_KRB4 if (realm && realm[0]) strcpy(realm_of_cell, realm); else *************** *** 689,694 **** --- 720,728 ---- printf("Getting tickets: %s@%s\n", name, realm_of_cell); status = get_cred(name, "", realm_of_cell, &c); } + #else + return(AKLOG_MISC); + #endif } /* TODO: get k5 error text */ *************** *** 698,705 **** printf("Kerberos error code returned by get_cred: %d\n", status); fprintf(stderr, "%s: Couldn't get %s AFS tickets: %s\n", progname, cell_to_use, ! (usev5)?"": ! krb_err_text(status)); return(AKLOG_KERBEROS); } --- 732,743 ---- printf("Kerberos error code returned by get_cred: %d\n", status); fprintf(stderr, "%s: Couldn't get %s AFS tickets: %s\n", progname, cell_to_use, ! #ifdef HAVE_KRB4 ! (usev5)?"":krb_err_text(status) ! #else ! "" ! #endif ! ); return(AKLOG_KERBEROS); } *************** *** 735,740 **** --- 773,779 ---- atoken.ticketLen = v5cred->ticket.length; memcpy(atoken.ticket, v5cred->ticket.data, atoken.ticketLen); } else { + #ifdef HAVE_KRB4 strcpy (username, c.pname); if (c.pinst[0]) { *************** *** 750,755 **** --- 789,797 ---- memcpy(&atoken.sessionKey, c.session, 8); atoken.ticketLen = c.ticket_st.length; memcpy(atoken.ticket, c.ticket_st.dat, atoken.ticketLen); + #else + return(AKLOG_MISC); + #endif } if (!force && *************** *** 778,789 **** --- 820,835 ---- return(AKLOG_KERBEROS); } } else { + #ifdef HAVE_KRB4 if ((status = krb_get_tf_realm(TKT_FILE, realm_of_user)) != KSUCCESS) { fprintf(stderr, "%s: Couldn't determine realm of user: %s)", progname, krb_err_text(status)); return(AKLOG_KERBEROS); } + #else + return(AKLOG_MISC); + #endif } /* For Khimaira we want to always append the realm to the name */ *************** *** 793,799 **** strcat(username, realm_of_user); } ! ViceIDToUsername(username, realm_of_user, realm_of_cell, cell_to_use, &c, &status, &aclient, &aserver, &atoken); } if (dflag) --- 839,851 ---- strcat(username, realm_of_user); } ! ViceIDToUsername(username, realm_of_user, realm_of_cell, cell_to_use, ! #ifdef HAVE_KRB4 ! &c, ! #else ! NULL, ! #endif ! &status, &aclient, &aserver, &atoken); } if (dflag) *************** *** 810,817 **** int len = min(v5cred->client->realm.length,MAXKTCNAMELEN - 1); strncpy(aclient.cell, v5cred->client->realm.data, len); aclient.cell[len] = '\0'; ! } else strncpy(aclient.cell, c.realm, MAXKTCREALMLEN - 1); for ( i=0; aclient.cell[i]; i++ ) { if ( islower(aclient.cell[i]) ) --- 862,872 ---- int len = min(v5cred->client->realm.length,MAXKTCNAMELEN - 1); strncpy(aclient.cell, v5cred->client->realm.data, len); aclient.cell[len] = '\0'; ! } ! #ifdef HAVE_KRB4 ! else strncpy(aclient.cell, c.realm, MAXKTCREALMLEN - 1); + #endif for ( i=0; aclient.cell[i]; i++ ) { if ( islower(aclient.cell[i]) ) *************** *** 1086,1101 **** "[-d] [[-cell | -c] cell [-k krb_realm]] ", "[[-p | -path] pathname]\n", " [-noprdb] [-force]\n", " [-5 [-m]| -4]\n" ); fprintf(stderr, " -d gives debugging information.\n"); fprintf(stderr, " krb_realm is the kerberos realm of a cell.\n"); fprintf(stderr, " pathname is the name of a directory to which "); fprintf(stderr, "you wish to authenticate.\n"); fprintf(stderr, " -noprdb means don't try to determine AFS ID.\n"); ! fprintf(stderr, " -5 or -4 selects whether to use Kerberos V or Kerberos IV.\n" ! " (default is Kerberos V)\n"); ! fprintf(stderr, " -m means use krb524d to convert Kerberos V tickets.\n"); fprintf(stderr, " No commandline arguments means "); fprintf(stderr, "authenticate to the local cell.\n"); fprintf(stderr, "\n"); --- 1141,1165 ---- "[-d] [[-cell | -c] cell [-k krb_realm]] ", "[[-p | -path] pathname]\n", " [-noprdb] [-force]\n", + #ifdef HAVE_KRB4 " [-5 [-m]| -4]\n" + #else + " [-5]\n" + #endif ); fprintf(stderr, " -d gives debugging information.\n"); fprintf(stderr, " krb_realm is the kerberos realm of a cell.\n"); fprintf(stderr, " pathname is the name of a directory to which "); fprintf(stderr, "you wish to authenticate.\n"); fprintf(stderr, " -noprdb means don't try to determine AFS ID.\n"); ! #ifdef HAVE_KRB4 ! fprintf(stderr, " -5 or -4 selects whether to use Kerberos v5 or Kerberos v4.\n" ! " (default is Kerberos v5)\n"); ! fprintf(stderr, " -m means use krb524d to convert Kerberos v5 tickets.\n"); ! #else ! fprintf(stderr, " -5 use Kerberos v5.\n" ! " (only Kerberos v5 is available)\n"); ! #endif fprintf(stderr, " No commandline arguments means "); fprintf(stderr, "authenticate to the local cell.\n"); fprintf(stderr, "\n"); *************** *** 1152,1161 **** --- 1216,1227 ---- dflag++; else if (strcmp(argv[i], "-5") == 0) usev5++; + #ifdef HAVE_KRB4 else if (strcmp(argv[i], "-m") == 0) use524++; else if (strcmp(argv[i], "-4") == 0) usev5 = 0; + #endif else if (strcmp(argv[i], "-noprdb") == 0) noprdb++; else if (strcmp(argv[i], "-force") == 0) Index: openafs/src/WINNT/client_config/NTMakefile diff -c openafs/src/WINNT/client_config/NTMakefile:1.11.4.3 openafs/src/WINNT/client_config/NTMakefile:1.11.4.5 *** openafs/src/WINNT/client_config/NTMakefile:1.11.4.3 Tue Dec 12 19:26:35 2006 --- openafs/src/WINNT/client_config/NTMakefile Tue Sep 18 02:36:59 2007 *************** *** 21,26 **** --- 21,28 ---- EXEFILE = $(DESTDIR)\root.client\usr\vice\etc\afs_config.exe + MANIFEST = $(EXEFILE).manifest + EXEOBJS = \ $(OUT)\config.obj \ $(OUT)\drivemap.obj \ *************** *** 48,54 **** AFSDOBJS = \ $(OUT)\fs_utils.obj ! AFSD= ..\afsd VCLIBS =\ --- 50,56 ---- AFSDOBJS = \ $(OUT)\fs_utils.obj ! AFSD= ..\afsd VCLIBS =\ *************** *** 107,112 **** --- 109,119 ---- $(EXEFILE) : $(EXEOBJS) $(EXEOBJSc) $(EXERES) $(AFSDOBJS) $(EXELIBS) $(EXEGUILINK) $(VCLIBS) + !IF ("$(AFSVER_CL)" == "1400") + if exist $@.manifest mt.exe -manifest afs_config.exe.manifest $(MANIFEST) -out:$(MANIFEST) + !ELSE + $(COPY) afs_config.exe.manifest $(MANIFEST) + !ENDIF $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 166,171 **** --- 173,179 ---- clean:: $(DEL) $(COPYHEADERS) + $(DEL) $(MANIFEST) $(CD) lang $(DEL) AFS_component_version_number.h if exist $(NTLANG) $(NTLANG) en_US $(MAKECMD) /nologo /e /f NTMakefile clean Index: openafs/src/WINNT/client_config/afs_config.exe.manifest diff -c /dev/null openafs/src/WINNT/client_config/afs_config.exe.manifest:1.1.2.2 *** /dev/null Thu Sep 20 01:06:28 2007 --- openafs/src/WINNT/client_config/afs_config.exe.manifest Tue Sep 18 02:14:23 2007 *************** *** 0 **** --- 1,13 ---- + + + + + + + + + + + Index: openafs/src/WINNT/client_creds/ipaddrchg.c diff -c openafs/src/WINNT/client_creds/ipaddrchg.c:1.4 openafs/src/WINNT/client_creds/ipaddrchg.c:1.4.4.2 *** openafs/src/WINNT/client_creds/ipaddrchg.c:1.4 Sun Aug 14 07:25:23 2005 --- openafs/src/WINNT/client_creds/ipaddrchg.c Sun Sep 2 12:37:44 2007 *************** *** 62,69 **** #include #include ! #define USE_MS2MIT ! #define USE_KRB4 #include #include #include --- 62,69 ---- #include #include ! #define USE_MS2MIT 1 ! #include #include #include Index: openafs/src/WINNT/client_osi/largeint.h diff -c openafs/src/WINNT/client_osi/largeint.h:1.1 openafs/src/WINNT/client_osi/largeint.h:1.1.14.1 *** openafs/src/WINNT/client_osi/largeint.h:1.1 Thu Feb 26 14:22:49 2004 --- openafs/src/WINNT/client_osi/largeint.h Mon Sep 10 15:02:39 2007 *************** *** 29,35 **** // LARGE_INTEGER - WINAPI LargeIntegerAdd ( LARGE_INTEGER Addend1, LARGE_INTEGER Addend2 --- 29,34 ---- *************** *** 40,46 **** // LARGE_INTEGER - WINAPI EnlargedIntegerMultiply ( LONG Multiplicand, LONG Multiplier --- 39,44 ---- *************** *** 51,57 **** // LARGE_INTEGER - WINAPI EnlargedUnsignedMultiply ( ULONG Multiplicand, ULONG Multiplier --- 49,54 ---- *************** *** 62,68 **** // ULONG - WINAPI EnlargedUnsignedDivide ( IN ULARGE_INTEGER Dividend, IN ULONG Divisor, --- 59,64 ---- *************** *** 74,80 **** // LARGE_INTEGER - WINAPI ExtendedMagicDivide ( LARGE_INTEGER Dividend, LARGE_INTEGER MagicDivisor, --- 70,75 ---- *************** *** 86,92 **** // LARGE_INTEGER - WINAPI ExtendedLargeIntegerDivide ( LARGE_INTEGER Dividend, ULONG Divisor, --- 81,86 ---- *************** *** 98,104 **** // LARGE_INTEGER - WINAPI LargeIntegerDivide ( LARGE_INTEGER Dividend, LARGE_INTEGER Divisor, --- 92,97 ---- *************** *** 110,116 **** // LARGE_INTEGER - WINAPI ExtendedIntegerMultiply ( LARGE_INTEGER Multiplicand, LONG Multiplier --- 103,108 ---- *************** *** 121,127 **** // LARGE_INTEGER - WINAPI LargeIntegerNegate ( LARGE_INTEGER Subtrahend ); --- 113,118 ---- *************** *** 131,137 **** // LARGE_INTEGER - WINAPI LargeIntegerSubtract ( LARGE_INTEGER Minuend, LARGE_INTEGER Subtrahend --- 122,127 ---- *************** *** 157,163 **** // LARGE_INTEGER - WINAPI ConvertLongToLargeInteger ( LONG SignedInteger ); --- 147,152 ---- *************** *** 167,173 **** // LARGE_INTEGER - WINAPI ConvertUlongToLargeInteger ( ULONG UnsignedInteger ); --- 156,161 ---- *************** *** 178,198 **** // LARGE_INTEGER - WINAPI LargeIntegerShiftLeft ( LARGE_INTEGER LargeInteger, CCHAR ShiftCount ); LARGE_INTEGER - WINAPI LargeIntegerShiftRight ( LARGE_INTEGER LargeInteger, CCHAR ShiftCount ); LARGE_INTEGER - WINAPI LargeIntegerArithmeticShift ( LARGE_INTEGER LargeInteger, CCHAR ShiftCount --- 166,183 ---- Index: openafs/src/WINNT/client_osi/osi.h diff -c openafs/src/WINNT/client_osi/osi.h:1.5 openafs/src/WINNT/client_osi/osi.h:1.5.14.1 *** openafs/src/WINNT/client_osi/osi.h:1.5 Thu Feb 26 14:22:49 2004 --- openafs/src/WINNT/client_osi/osi.h Mon Sep 10 15:02:39 2007 *************** *** 53,58 **** --- 53,61 ---- #define LargeIntegerEqualTo(a, b) \ ((a).HighPart == (b).HighPart && (a).LowPart == (b).LowPart) + #define LargeIntegerGreaterThanZero(a) \ + ((a).HighPart > 0 || ((a).HighPart == 0 && (a).LowPart != 0)) + #define LargeIntegerGreaterOrEqualToZero(a) ((a).HighPart >= 0) #define LargeIntegerLessThanZero(a) ((a).HighPart < 0) Index: openafs/src/WINNT/client_osi/osiutils.c diff -c openafs/src/WINNT/client_osi/osiutils.c:1.5 openafs/src/WINNT/client_osi/osiutils.c:1.5.4.1 *** openafs/src/WINNT/client_osi/osiutils.c:1.5 Sun Nov 20 20:56:22 2005 --- openafs/src/WINNT/client_osi/osiutils.c Mon Sep 10 15:02:39 2007 *************** *** 76,82 **** } #if (_MSC_VER >= 1300) ! LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b) { LARGE_INTEGER result; int carry; --- 76,82 ---- } #if (_MSC_VER >= 1300) ! LARGE_INTEGER /* WINAPI */ LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b) { LARGE_INTEGER result; int carry; *************** *** 85,91 **** result.HighPart=a.HighPart+b.HighPart+ carry; return result; } ! LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b) { LARGE_INTEGER result; int borrow; --- 85,91 ---- result.HighPart=a.HighPart+b.HighPart+ carry; return result; } ! LARGE_INTEGER /* WINAPI */ LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b) { LARGE_INTEGER result; int borrow; *************** *** 94,100 **** result.HighPart=a.HighPart-b.HighPart- borrow; return result; } ! LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder) { LARGE_INTEGER result; ULONGLONG a1,q1,r1; --- 94,100 ---- result.HighPart=a.HighPart-b.HighPart- borrow; return result; } ! LARGE_INTEGER /* WINAPI */ ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder) { LARGE_INTEGER result; ULONGLONG a1,q1,r1; *************** *** 115,121 **** *remainder=(unsigned long)(r1 & 0xffffffff); return result; } ! LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder) { LARGE_INTEGER result; ULONGLONG a1,b1,q1,r1; --- 115,121 ---- *remainder=(unsigned long)(r1 & 0xffffffff); return result; } ! LARGE_INTEGER /* WINAPI */ LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder) { LARGE_INTEGER result; ULONGLONG a1,b1,q1,r1; *************** *** 144,150 **** return result; } ! LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a) { LARGE_INTEGER result; result.HighPart=0; --- 144,150 ---- return result; } ! LARGE_INTEGER /* WINAPI */ ConvertLongToLargeInteger(unsigned long a) { LARGE_INTEGER result; result.HighPart=0; Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.19 openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.20 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.19 Tue Aug 28 13:52:01 2007 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Wed Sep 19 01:53:46 2007 *************** *** 57,63 ****

OpenAFS for Windows

!

Version 1.5.24

 

--- 57,63 ----

OpenAFS for Windows

!

Version 1.5.25

 

*************** *** 80,86 **** ·         OpenAFS for Windows 1.5.24 Release Notes

--- 80,86 ---- ·         OpenAFS for Windows 1.5.25 Release Notes

Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.19 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.20 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.19 Tue Aug 28 13:52:05 2007 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm Wed Sep 19 01:53:51 2007 *************** *** 18,28 **** .shape {behavior:url(#default#VML);} ! OpenAFS for Windows 1.5.24 Release Notes ! OpenAFS for Windows 1.5.25 Release Notes ! OpenAFS for Windows 1.5.24 Release Notes ! OpenAFS for Windows 1.5.25 Release Notes Jeffrey Altman 3 ! 787 2006-11-29T17:26:00Z 2007-06-22T13:42:00Z ! 38 ! 17429 ! 99346 Secure Endpoints Inc. ! 827 ! 233 ! 116542 11.8132 --- 109,115 ---- ! *************** *** 152,160 **** ! ! ! --- 151,157 ---- ! *************** *** 286,292 **** - --- 283,288 ---- *************** *** 299,305 **** - --- 295,300 ---- *************** *** 309,314 **** --- 304,310 ---- + *************** *** 331,339 **** ! ! ! --- 327,333 ---- ! Index: openafs/src/WINNT/install/wix/files.wxi diff -c openafs/src/WINNT/install/wix/files.wxi:1.22.2.14 openafs/src/WINNT/install/wix/files.wxi:1.22.2.17 *** openafs/src/WINNT/install/wix/files.wxi:1.22.2.14 Tue Aug 28 13:31:09 2007 --- openafs/src/WINNT/install/wix/files.wxi Sun Sep 9 23:34:58 2007 *************** *** 806,811 **** --- 806,815 ---- + + + INSTALLINSTLOOPEXE <> "" + *************** *** 906,912 **** ! ! ! ! ! ! --- 1021,1029 ---- --> ! ! ! *************** *** 1086,1094 **** ! ! ! --- 1084,1090 ---- ! Index: openafs/src/WINNT/install/wix/platform.wxi diff -c openafs/src/WINNT/install/wix/platform.wxi:1.2.2.3 openafs/src/WINNT/install/wix/platform.wxi:1.2.2.4 *** openafs/src/WINNT/install/wix/platform.wxi:1.2.2.3 Tue Aug 28 13:31:09 2007 --- openafs/src/WINNT/install/wix/platform.wxi Thu Aug 30 22:27:38 2007 *************** *** 50,55 **** --- 50,56 ---- + *************** *** 153,158 **** --- 154,160 ---- + Index: openafs/src/WINNT/install/wix/custom/NTMakefile diff -c openafs/src/WINNT/install/wix/custom/NTMakefile:1.5 openafs/src/WINNT/install/wix/custom/NTMakefile:1.5.4.1 *** openafs/src/WINNT/install/wix/custom/NTMakefile:1.5 Sun Nov 20 20:56:28 2005 --- openafs/src/WINNT/install/wix/custom/NTMakefile Wed Sep 19 13:58:47 2007 *************** *** 1,4 **** ! # rcsid : $Id: NTMakefile,v 1.5 2005/11/21 01:56:28 jaltman Exp $ RELDIR=WINNT\install\wix\custom !INCLUDE ..\..\..\..\config\NTMakefile.$(SYS_NAME) --- 1,4 ---- ! # rcsid : $Id: NTMakefile,v 1.5.4.1 2007/09/19 17:58:47 jaltman Exp $ RELDIR=WINNT\install\wix\custom !INCLUDE ..\..\..\..\config\NTMakefile.$(SYS_NAME) *************** *** 8,13 **** --- 8,15 ---- DLLFILE = $(MEDIABINDIR)\afscustom.dll + DLLRES = $(OUT)\afscustom.res + DLLEXPORTS=\ -EXPORT:InstallNetProvider \ -EXPORT:UninstallNetProvider \ *************** *** 28,34 **** $(OUT)\afscustom.obj: afscustom.cpp $(CC) -ML -c /Fo$@ $** ! $(DLLFILE): $(OUT)\afscustom.obj $(LINK) -DLL $(DLLEXPORTS) \ -OUT:$@ $** $(DLLLIBFILES) $(_VC_MANIFEST_EMBED_DLL) --- 30,38 ---- $(OUT)\afscustom.obj: afscustom.cpp $(CC) -ML -c /Fo$@ $** ! $(DLLRES): afscustom.rc AFS_component_version_number.h ! ! $(DLLFILE): $(OUT)\afscustom.obj $(DLLRES) $(LINK) -DLL $(DLLEXPORTS) \ -OUT:$@ $** $(DLLLIBFILES) $(_VC_MANIFEST_EMBED_DLL) *************** *** 36,38 **** --- 40,46 ---- install: $(DLLFILE) clean :: + $(DEL) $(DLLRES) + $(DEL) $(OUT)\afscustom.obj + $(DEL) $(DLLFILE) + $(DEL) AFS_component_version_number.h Index: openafs/src/WINNT/install/wix/custom/afscustom.rc diff -c /dev/null openafs/src/WINNT/install/wix/custom/afscustom.rc:1.1.2.2 *** /dev/null Thu Sep 20 01:06:39 2007 --- openafs/src/WINNT/install/wix/custom/afscustom.rc Wed Sep 19 13:58:47 2007 *************** *** 0 **** --- 1,17 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* Define VERSIONINFO resource */ + + #define AFS_VERINFO_FILE_DESCRIPTION "OpenAFS MSI Custom DLL" + #define AFS_VERINFO_NAME "afscustom" + #define AFS_VERINFO_FILENAME "afscustom.dll" + + #include "AFS_component_version_number.h" + #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/kfw/lib/amd64/leashw64.lib Index: openafs/src/WINNT/license/NTMakefile diff -c openafs/src/WINNT/license/NTMakefile:1.5.4.1 openafs/src/WINNT/license/NTMakefile:1.5.4.2 *** openafs/src/WINNT/license/NTMakefile:1.5.4.1 Tue Jun 6 10:47:10 2006 --- openafs/src/WINNT/license/NTMakefile Wed Sep 19 13:58:48 2007 *************** *** 17,22 **** --- 17,24 ---- EXEFILE = $(DESTDIR)\bin\sgml2rtf.exe + EXERES = $(OUT)\sgml2rtf.res + EXEOBJS = \ $(OUT)\main.obj \ $(OUT)\multistring.obj *************** *** 24,30 **** EXELIBS = \ user32.lib ! $(EXEFILE) : $(EXEOBJS) $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) --- 26,34 ---- EXELIBS = \ user32.lib ! $(EXERES): sgml2rtf.rc AFS_component_version_number.h ! ! $(EXEFILE) : $(EXEOBJS) $(EXERES) $(EXECONLINK) $(EXELIBS) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 44,49 **** --- 48,54 ---- cd .. clean :: + $(DEL) $(EXERES) $(CD) lang @$(MAKECMD) /nologo /f NTMakefile clean $(CD) .. Index: openafs/src/WINNT/license/sgml2rtf.rc diff -c /dev/null openafs/src/WINNT/license/sgml2rtf.rc:1.1.2.2 *** /dev/null Thu Sep 20 01:06:40 2007 --- openafs/src/WINNT/license/sgml2rtf.rc Wed Sep 19 13:58:48 2007 *************** *** 0 **** --- 1,17 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* Define VERSIONINFO resource */ + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS SGML to RTF Conversion Tool" + #define AFS_VERINFO_NAME "sgml2rtf" + #define AFS_VERINFO_FILENAME "sgml2rtf.exe" + + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/netidmgr_plugin/afsfuncs.c diff -c openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.11 openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.12 *** openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.11 Tue Aug 28 12:54:46 2007 --- openafs/src/WINNT/netidmgr_plugin/afsfuncs.c Wed Aug 29 01:32:34 2007 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsfuncs.c,v 1.1.2.11 2007/08/28 16:54:46 jaltman Exp $ */ /* Disable the 'macro redefinition' warning which is getting triggerred by a redefinition of the ENCRYPT and DECRYPT macros. */ --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsfuncs.c,v 1.1.2.12 2007/08/29 05:32:34 jaltman Exp $ */ /* Disable the 'macro redefinition' warning which is getting triggerred by a redefinition of the ENCRYPT and DECRYPT macros. */ *************** *** 840,846 **** increds.keyblock.enctype = ENCTYPE_DES_CBC_CRC; #ifdef KRB5_TC_NOTICKET ! flags = 0; r = pkrb5_cc_set_flags(context, k5cc, flags); #endif retry_retcred: --- 840,846 ---- increds.keyblock.enctype = ENCTYPE_DES_CBC_CRC; #ifdef KRB5_TC_NOTICKET ! flags = KRB5_TC_OPENCLOSE; r = pkrb5_cc_set_flags(context, k5cc, flags); #endif retry_retcred: *************** *** 891,897 **** pkrb5_free_principal(context, client_principal); client_principal = 0; #ifdef KRB5_TC_NOTICKET ! flags = KRB5_TC_NOTICKET; pkrb5_cc_set_flags(context, k5cc, flags); #endif --- 891,897 ---- pkrb5_free_principal(context, client_principal); client_principal = 0; #ifdef KRB5_TC_NOTICKET ! flags = KRB5_TC_OPENCLOSE | KRB5_TC_NOTICKET; pkrb5_cc_set_flags(context, k5cc, flags); #endif Index: openafs/src/WINNT/netidmgr_plugin/krb5common.c diff -c openafs/src/WINNT/netidmgr_plugin/krb5common.c:1.1.2.2 openafs/src/WINNT/netidmgr_plugin/krb5common.c:1.1.2.3 *** openafs/src/WINNT/netidmgr_plugin/krb5common.c:1.1.2.2 Thu Oct 12 17:19:43 2006 --- openafs/src/WINNT/netidmgr_plugin/krb5common.c Wed Aug 29 01:32:34 2007 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: krb5common.c,v 1.1.2.2 2006/10/12 21:19:43 jaltman Exp $ */ #include #include --- 22,28 ---- * SOFTWARE. */ ! /* $Id: krb5common.c,v 1.1.2.3 2007/08/29 05:32:34 jaltman Exp $ */ #include #include *************** *** 93,99 **** LPCSTR functionName; int freeContextFlag; krb5_error_code rc = 0; ! krb5_flags flags = 0; if (pkrb5_init_context == NULL) return 1; --- 93,99 ---- LPCSTR functionName; int freeContextFlag; krb5_error_code rc = 0; ! krb5_flags flags = KRB5_TC_OPENCLOSE; if (pkrb5_init_context == NULL) return 1; Index: openafs/src/afsd/CellServDB diff -c /dev/null openafs/src/afsd/CellServDB:1.1.2.2 *** /dev/null Thu Sep 20 01:06:44 2007 --- openafs/src/afsd/CellServDB Wed Sep 5 17:52:39 2007 *************** *** 0 **** --- 1,589 ---- + >grand.central.org #GCO Public CellServDB 05 Jul 2007 + 18.92.0.108 #grand-opening.mit.edu + 128.2.203.61 #penn.central.org + 130.237.48.87 #andrew.e.kth.se + >wu-wien.ac.at #University of Economics, Vienna, Austria + 137.208.3.33 #goya.wu-wien.ac.at + 137.208.7.57 #caravaggio.wu-wien.ac.at + 137.208.127.57 #vermeer.wu-wien.ac.at + >hephy.at #hephy-vienna + 193.170.243.10 #mowgli.oeaw.ac.at + 193.170.243.12 #baloo.oeaw.ac.at + 193.170.243.14 #akela.oeaw.ac.at + >cgv.tugraz.at #CGV cell + 129.27.224.133 #phobos.cgv.tugraz.at + 129.27.224.134 #deimos.cgv.tugraz.at + 129.27.224.210 #trinculo.cgv.tugraz.at + >itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus + 129.27.161.7 #faepafs1.tu-graz.ac.at + 129.27.161.15 #faepafs2.tu-graz.ac.at + 129.27.161.114 #faepafs3.tu-graz.ac.at + >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi + 132.216.24.122 #germain.sums.math.mcgill.ca + 132.216.24.125 #turing.sums.math.mcgill.ca + >cern.ch #European Laboratory for Particle Physics, Geneva + 137.138.128.148 #afsdb1.cern.ch + 137.138.246.50 #afsdb3.cern.ch + 137.138.246.51 #afsdb2.cern.ch + >ams.cern.ch #AMS Experiment + 137.138.188.185 #ams.cern.ch + 137.138.199.58 #pcamsf4.cern.ch + >epfl.ch #Swiss Federal Institute of Technology at Lausanne + 128.178.109.111 #kd1.epfl.ch + 128.178.109.112 #kd2.epfl.ch + 128.178.109.113 #kd3.epfl.ch + >ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland + 129.132.97.19 #amalthea.ethz.ch + 129.132.97.27 #nethzafs-001.ethz.ch + 129.132.115.3 #himalia.ethz.ch + 129.132.115.37 #nethzafs-005.ethz.ch + 129.132.115.38 #nethzafs-006.ethz.ch + >psi.ch #Paul Scherrer Institut - Villigen, Switzerland + 129.129.190.140 #afs00.psi.ch + 129.129.190.141 #afs01.psi.ch + 129.129.190.142 #afs02.psi.ch + >extundo.com #Simon Josefsson's cell + 195.42.214.241 #slipsten.extundo.com + >membrain.com #membrain.com + 66.93.118.125 #stormy + 130.85.24.11 #weasel + 130.85.24.13 #straykitten + >midnightlinux.com #Midnight Linux, Pittsburgh PA + 208.10.142.82 #outpost.midnightlinux.com + >setfilepointer.com #SetFilePointer.com + 63.224.10.2 #hamlet.SetFilePointer.com + 63.224.10.4 #troilus.SetFilePointer.com + >sodre.cx #Sodre.cx + 128.8.140.165 #greed.sodre.cx + >desy.de #Deutsches Elektronen-Synchrotron + 131.169.40.62 #vayu.desy.de + 131.169.244.60 #solar00.desy.de + >gppc.de #GPP Chemnitz mbH + 213.187.92.33 #gpp1.gppc.de + 213.187.92.34 #paulchen.gppc.de + 213.187.92.35 #lotus.gppc.de + >ifh.de #DESY Zeuthen + 141.34.22.10 #romulus.ifh.de + 141.34.22.11 #remus.ifh.de + 141.34.22.29 #hekate.ifh.de + >lrz-muenchen.de #Leibniz Computing Centre, Germany + 129.187.10.36 #afs1.lrz-muenchen.de + 129.187.10.56 #afs3.lrz-muenchen.de + 129.187.10.57 #afs2.lrz-muenchen.de + >ipp-garching.mpg.de #Institut fuer Plasmaphysik + 130.183.9.5 #afs-db1.rzg.mpg.de + 130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de + 130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de + >mpe.mpg.de #MPE cell + 130.183.130.7 #irafs1.mpe-garching.mpg.de + 130.183.134.20 #irafs2.mpe-garching.mpg.de + >i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen + 137.226.244.79 #remus.informatik.rwth-aachen.de + >tu-bs.de #Technical University of Braunschweig, Germany + 134.169.1.1 #rzafs1.rz.tu-bs.de + 134.169.1.5 #rzafs2.rz.tu-bs.de + 134.169.1.6 #rzafs3.rz.tu-bs.de + >tu-chemnitz.de #Technische Universitaet Chemnitz, Germany + 134.109.2.1 #zuse.hrz.tu-chemnitz.de + 134.109.2.15 #phoenix.hrz.tu-chemnitz.de + 134.109.200.7 #aetius.hrz.tu-chemnitz.de + >e18.ph.tum.de #Experimental Physics, TU Munich, Germany + 129.187.154.223 #hamlet.e18.physik.tu-muenchen.de + >uni-bonn.de #University of Bonn, Computing Center + 131.220.14.198 #work15-eth.rhrz.uni-bonn.de + 131.220.14.205 #node05.rhrz.uni-bonn.de + 131.220.15.197 #afs-db1.rhrz.uni-bonn.de + >atlass01.physik.uni-bonn.de #Bonn ATLAS + 131.220.165.43 #atlass01.physik.uni-bonn.de + >uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg + 132.230.6.235 #sv6.ruf.uni-freiburg.de + 132.230.6.236 #sv7.ruf.uni-freiburg.de + 132.230.6.237 #sv8.ruf.uni-freiburg.de + >physik.uni-freiburg.de #institute of physics, university Freiburg, Germany + 132.230.77.16 #hepafs.physik.uni-freiburg.de + >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) + 129.206.119.10 #afsdb.urz.uni-heidelberg.de + 129.206.119.16 #afsdb1.urz.uni-heidelberg.de + 129.206.119.17 #afsdb2.urz.uni-heidelberg.de + >uni-hohenheim.de #University of Hohenheim + 144.41.2.2 #rs13.serv.uni-hohenheim.de + 144.41.2.3 #rs14.serv.uni-hohenheim.de + 144.41.2.4 #rs15.serv.uni-hohenheim.de + >rz.uni-jena.de #Rechenzentrum University of Jena, Germany + 141.35.2.180 #afs00.rz.uni-jena.de + 141.35.2.181 #afs01.rz.uni-jena.de + 141.35.2.182 #afs02.rz.uni-jena.de + >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. + 134.95.80.39 #forano.meteo.uni-koeln.de + >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology + 134.95.144.22 #afs1.meteo.uni-koeln.de + 134.95.144.24 #afs2.meteo.uni-koeln.de + >rrz.uni-koeln.de #University of Cologne - Reg Comp Center + 134.95.19.3 #afsdb1.rrz.uni-koeln.de + 134.95.19.10 #lyra.rrz.uni-koeln.de + 134.95.67.97 #afs.thp.uni-koeln.de + 134.95.141.243 #agrippina.rrz.uni-koeln.de + >physik.uni-mainz.de #institute of physics, university Mainz, Germany + 134.93.130.93 #hardy.physik.uni-mainz.de + >uni-mannheim.de #Uni Mannheim (Rechenzentrum) + 134.155.97.204 #afsdb1.uni-mannheim.de + 134.155.97.205 #afsdb2.uni-mannheim.de + 134.155.97.206 #afsdb3.uni-mannheim.de + >uni-paderborn.de #University of Paderborn, Germany + 131.234.137.10 #afsdb1.uni-paderborn.de + 131.234.137.11 #afsdb2.uni-paderborn.de + 131.234.137.12 #afsdb3.uni-paderborn.de + >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal + 132.195.104.3 #afs1.physik.uni-wuppertal.de + 132.195.104.230 #afs2.physik.uni-wuppertal.de + >s-et.aau.dk #Aalborg Univ., The Student Society, Denmark + 130.225.196.22 #afs.s-et.aau.dk + >ies.auc.dk #Aalborg Univ., Inst. of Electronic Systems, Denmark + 130.225.51.73 #afsdb1.kom.auc.dk + 130.225.51.74 #afsdb2.kom.auc.dk + 130.225.51.85 #afsdb3.kom.auc.dk + >asu.edu #Arizona State University + 129.219.10.69 #authen2.asu.edu + 129.219.10.70 #authen1.asu.edu + 129.219.10.72 #authen3.asu.edu + 129.219.100.16 #authen4.asu.edu + >hep.caltech.edu #CalTech High Energy Physics + 131.215.126.150 #afs.hep.caltech.edu + >clarkson.edu #Clarkson University, Potsdam, New York USA + 128.153.1.111 #arthur.clarkson.edu + 128.153.9.111 #lancelot.clarkson.edu + 128.153.17.111 #uther.clarkson.edu + >andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell + 128.2.10.2 #vice2.fs.andrew.cmu.edu + 128.2.10.7 #vice7.fs.andrew.cmu.edu + 128.2.10.11 #vice11.fs.andrew.cmu.edu + 128.2.10.28 #vice28.fs.andrew.cmu.edu + 128.2.32.44 #new-vice12.fs.andrew.cmu.edu + >club.cc.cmu.edu #Carnegie Mellon University Computer Club + 128.237.157.11 #sodium.club.cc.cmu.edu + 128.237.157.13 #potassium.club.cc.cmu.edu + >chem.cmu.edu #Carnegie Mellon University - Chemistry Dept. + 128.2.40.134 #afs.chem.cmu.edu + 128.2.40.140 #afs2.chem.cmu.edu + >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. + 128.2.201.46 #strawberry.srv.cs.cmu.edu + 128.2.201.47 #pumpkin.srv.cs.cmu.edu + 128.2.201.48 #cherry.srv.cs.cmu.edu + >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. + 128.2.129.7 #porok.ece.cmu.edu + 128.2.129.8 #vicio.ece.cmu.edu + 128.2.129.9 #e-xing.ece.cmu.edu + >scotch.ece.cmu.edu #CMU ECE CALCM research group + 128.2.134.82 #lagavulin.ece.cmu.edu + >qatar.cmu.edu #Carnegie Mellon University - Qatar + 86.36.46.6 #afs1.qatar.cmu.edu + 86.36.46.7 #afs2.qatar.cmu.edu + >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab + 128.2.179.12 #nihao.sbp.ri.cmu.edu + 128.2.179.113 #youtheman.sbp.ri.cmu.edu + >cnf.cornell.edu #CNF + 128.253.198.9 #hole.cnf.cornell.edu + 128.253.198.27 #smoke.cnf.cornell.edu + >msc.cornell.edu #Cornell University Materials Science Center + 128.84.231.242 #miranda.ccmr.cornell.edu + 128.84.241.35 #co.ccmr.cornell.edu + 128.84.249.78 #dax.ccmr.cornell.edu + >dbic.dartmouth.edu #Dartmouth Brain Imaging Center + 129.170.30.143 #dbicafs1.dartmouth.edu + 129.170.30.144 #dbicafs2.dartmouth.edu + 129.170.30.145 #dbicafs3.dartmouth.edu + >northstar.dartmouth.edu #Dartmouth College Research Computing + 129.170.16.22 #halley.dartmouth.edu + 129.170.16.42 #oort.dartmouth.edu + 129.170.16.43 #cygnusx1.dartmouth.edu + >cs.fhm.edu #Department Computer Science Munich University Of Applied Science + 129.187.208.2 #srv1.informatik.fh-muenchen.de + >eecs.harvard.edu #Harvard - EECS + 140.247.60.61 #zermelo.eecs.harvard.edu + 140.247.60.83 #corfu.eecs.harvard.edu + >iastate.edu #Iowa State University + 129.186.1.243 #afsdb-1.iastate.edu + 129.186.6.243 #afsdb-2.iastate.edu + 129.186.142.243 #afsdb-3.iastate.edu + >athena.mit.edu #MIT/Athena cell + 18.7.1.66 #paris.mit.edu. + 18.7.1.74 #chimera.mit.edu. + 18.158.0.37 #prill.mit.edu. + >dev.mit.edu #MIT/IS Development cell + 18.7.1.70 #wham.mit.edu. + 18.92.1.219 #click.mit.edu. + 18.92.1.220 #whirr.mit.edu. + >net.mit.edu #MIT/Network Group cell + 18.7.7.73 #gracie.mit.edu + 18.7.21.95 #george.mit.edu + >sipb.mit.edu #MIT/SIPB cell + 18.181.0.19 #reynelda.mit.edu. + 18.181.0.22 #rosebud.mit.edu. + 18.181.0.23 #ronald-ann.mit.edu. + >soap.mit.edu #MIT School Of Architecture & Planning + 18.89.1.204 #crypt.mit.edu + 18.89.1.209 #grotto.mit.edu + 18.89.2.156 #ac.mit.edu + >msu.edu #Michigan State University Main Cell + 35.9.7.10 #afsdb0.cl.msu.edu + >nd.edu #University of Notre Dame + 129.74.223.17 #john.helios.nd.edu + 129.74.223.33 #lizardo.helios.nd.edu + 129.74.223.65 #buckaroo.helios.nd.edu + >pitt.edu #University of Pittsburgh + 136.142.8.15 #afs09.srv.cis.pitt.edu + 136.142.8.20 #afs10.srv.cis.pitt.edu + 136.142.8.21 #afs11.srv.cis.pitt.edu + >cs.pitt.edu #University of Pittsburgh - Computer Science + 130.49.220.11 #afs01.cs.pitt.edu + 130.49.220.12 #afs02.cs.pitt.edu + 130.49.220.13 #afs03.cs.pitt.edu + >psc.edu #PSC (Pittsburgh Supercomputing Center) + 128.182.59.182 #shaggy.psc.edu + 128.182.66.184 #velma.psc.edu + 128.182.66.185 #daphne.psc.edu + >scoobydoo.psc.edu #PSC Test Cell + 128.182.59.181 #scooby.psc.edu + >cede.psu.edu #Penn State - Center for Engr. Design & Entrepeneurship + 146.186.218.10 #greenly.cede.psu.edu + 146.186.218.60 #b50.cede.psu.edu + 146.186.218.246 #stalin.cede.psu.edu + >rose-hulman.edu #Rose-Hulman Institute of Technology + 137.112.7.11 #afs1.rose-hulman.edu + 137.112.7.12 #afs2.rose-hulman.edu + 137.112.7.13 #afs3.rose-hulman.edu + >cs.rose-hulman.edu #Rose-Hulman CS Department + 137.112.40.10 #galaxy.cs.rose-hulman.edu + >rpi.edu #Rensselaer Polytechnic Institute + 128.113.22.11 #saul.server.rpi.edu + 128.113.22.12 #joab.server.rpi.edu + 128.113.22.13 #korah.server.rpi.edu + 128.113.22.14 #achan.server.rpi.edu + >hep.sc.edu #University of South Carolina, Dept. of Physics + 129.252.78.77 #cpeven.physics.sc.edu + >cs.stanford.edu #Stanford University Computer Science Department + 171.64.64.10 #cs-afs-1.Stanford.EDU + 171.64.64.66 #cs-afs-2.stanford.edu + 171.64.64.69 #cs-afs-3.stanford.edu + >ir.stanford.edu #Stanford University + 171.64.7.222 #afsdb1.stanford.edu + 171.64.7.234 #afsdb2.stanford.edu + 171.64.7.246 #afsdb3.stanford.edu + >slac.stanford.edu #Stanford Linear Accelerator Center + 134.79.18.25 #afsdb1.slac.stanford.edu + 134.79.18.26 #afsdb2.slac.stanford.edu + 134.79.18.27 #afsdb3.slac.stanford.edu + >ucdavis.edu #University of California at Davis + 169.237.104.100 #afs1.ucdavis.edu + 169.237.235.176 #afs2.ucdavis.edu + 169.237.247.91 #afs3.ucdavis.edu + >home.ucdavis.edu #University of California at Davis home directories + 169.237.105.91 #home1.ucdavis.edu + 169.237.105.92 #home2.ucdavis.edu + 169.237.105.93 #home3.ucdavis.edu + >physics.ucsb.edu #UC Santa Barbara, Physics Dept + 128.111.18.161 #ledzeppelin.physics.ucsb.edu + >cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A + 128.114.123.14 #elan.ucsc.edu + 128.114.123.15 #ichabod.ucsc.edu + 128.114.123.18 #maneki.ucsc.edu + >acm.uiuc.edu #ACM at the University of Illinois + 128.174.251.8 #alnitak.acm.uiuc.edu + 128.174.251.9 #alnilam.acm.uiuc.edu + 128.174.251.10 #mintaka.acm.uiuc.edu + >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory + 128.174.193.200 #ial.illigal.uiuc.edu + 128.174.193.201 #cac.illigal.uiuc.edu + 128.174.193.202 #gcs.illigal.uiuc.edu + >ncsa.uiuc.edu #University of Illinois + 141.142.3.5 #congo.ncsa.uiuc.edu + 141.142.3.8 #nile.ncsa.uiuc.edu + 141.142.3.9 #kaskaskia.ncsa.uiuc.edu + >umbc.edu #University of Maryland, Baltimore County + 130.85.24.23 #db2.afs.umbc.edu + 130.85.24.87 #db3.afs.umbc.edu + 130.85.24.101 #db1.afs.umbc.edu + >glue.umd.edu #University of Maryland - Project Glue + 128.8.70.11 #olmec.umd.edu + 128.8.236.4 #egypt.umd.edu + 128.8.236.230 #babylon.umd.edu + >wam.umd.edu #University of Maryland Network WAM Project + 128.8.70.9 #csc-srv.wam.umd.edu + 128.8.236.5 #avw-srv.wam.umd.edu + 128.8.236.231 #ptx-srv.wam.umd.edu + >umich.edu #University of Michigan - Campus + 141.211.1.32 #fear.ifs.umich.edu + 141.211.1.33 #surprise.ifs.umich.edu + 141.211.1.34 #ruthless.ifs.umich.edu + >atlas.umich.edu #ATLAS group cell in physics at University of Michigan + 141.211.43.102 #linat02.grid.umich.edu + 141.211.43.103 #linat03.grid.umich.edu + 141.211.43.104 #linat04.grid.umich.edu + >citi.umich.edu #Center for Information Technology Integration + 141.211.133.5 #babylon.citi.umich.edu + >lsa.umich.edu #University of Michigan - College of LS&A + 141.211.211.53 #gerow.lsa.umich.edu + 141.211.211.72 #collines.lsa.umich.edu + 141.211.211.153 #hodges.lsa.umich.edu + >sph.umich.edu #University of Michigan -- School of Public Health + 141.211.51.137 #afssph7.sph.umich.edu + 141.211.51.139 #afssph0.sph.umich.edu + 141.211.51.142 #afssph6.sph.umich.edu + >isis.unc.edu #Univ. of NC at Chapel Hill - ITS + 152.2.1.5 #db0.isis.unc.edu + 152.2.1.6 #db1.isis.unc.edu + 152.2.1.7 #db2.isis.unc.edu + >physics.unc.edu #Univ. of NC at Chapel Hill, Dept. of Physics + 152.2.4.1 #who.physics.unc.edu + 152.2.4.3 #what.physics.unc.edu + 152.2.4.5 #when.physics.unc.edu + >uncc.edu #University of NC at Charlotte Mosaic AFS Cell + 152.15.10.70 #as-sm1.uncc.edu + 152.15.93.186 #as-ece1.uncc.edu + 152.15.181.175 #as-me1.uncc.edu + >eng.utah.edu #University of Utah - Engineering + 155.98.111.9 #lenny.eng.utah.edu + 155.98.111.10 #carl.eng.utah.edu + >cs.uwm.edu #University of Wisconsin--Milwaukee + 129.89.38.124 #solomons.cs.uwm.edu + >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. + 128.105.132.14 #timon.cs.wisc.edu + 128.105.132.15 #pumbaa.cs.wisc.edu + 128.105.132.16 #zazu.cs.wisc.edu + >engr.wisc.edu #University of Wisconsin-Madison, College of Engineering + 144.92.13.14 #larry.cae.wisc.edu + 144.92.13.15 #curly.cae.wisc.edu + 144.92.13.16 #moe.cae.wisc.edu + >hep.wisc.edu #University of Wisconsin -- High Energy Physics + 128.104.28.219 #anise.hep.wisc.edu + >physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department + 128.104.160.13 #kendra.physics.wisc.edu + 128.104.160.14 #fray.physics.wisc.edu + 128.104.160.15 #buffy.physics.wisc.edu + >ciemat.es #Ciemat, Madrid, Spain + 130.206.11.42 #afsdb1.ciemat.es + 130.206.11.217 #afsdb2.ciemat.es + 130.206.11.247 #afsdb3.ciemat.es + >ifca.unican.es #Instituto de Fisica de Cantabria (IFCA), Santander, Spain + 193.144.209.20 #gridwall.ifca.unican.es + >ific.uv.es #Instituto de Fisica Corpuscular, Valencia, Spain + 147.156.163.11 #alpha.ific.uv.es + >biocenter.helsinki.fi #University of Helsinki, Institute of Biotechnology + 128.214.58.174 #afsdb1.biocenter.helsinki.fi + 128.214.88.114 #afsdb2.biocenter.helsinki.fi + >dapnia.saclay.cea.fr #CEA DAPNIA + 132.166.32.7 #dphrsg.saclay.cea.fr + 132.166.32.12 #dphrsl.saclay.cea.fr + >grif.fr #GRIF cell + 192.54.208.18 #node03.datagrid.cea.fr + >in2p3.fr #IN2P3 production cell + 134.158.232.11 #ccafsdb1.in2p3.fr + 134.158.232.12 #ccafsdb2.in2p3.fr + 134.158.232.13 #ccafsdb3.in2p3.fr + >anl.gov #Argonne National Laboratory + 146.137.96.33 #arteus.ctd.anl.gov + 146.137.162.88 #agamemnon.ctd.anl.gov + 146.137.194.80 #antenor.ctd.anl.gov + >rhic.bnl.gov #Relativistic Heavy Ion Collider + 130.199.6.51 #rafs03.rcf.bnl.gov + 130.199.6.52 #rafs02.rcf.bnl.gov + 130.199.6.69 #rafs01.rcf.bnl.gov + >usatlas.bnl.gov #US Atlas Tier 1 Facility at BNL + 130.199.48.32 #aafs01.usatlas.bnl.gov + 130.199.48.33 #aafs02.usatlas.bnl.gov + 130.199.48.34 #aafs03.usatlas.bnl.gov + >fnal.gov #Fermi National Acclerator Laboratory + 131.225.68.1 #fsus01.fnal.gov + 131.225.68.4 #fsus03.fnal.gov + 131.225.68.14 #fsus04.fnal.gov + >ic-afs.arc.nasa.gov #Code IC, Ames Research Center + 128.102.105.62 #udanax.arc.nasa.gov + >jpl.nasa.gov #Jet Propulsion Laboratory + 137.78.160.21 #afsdb08.jpl.nasa.gov + 137.78.160.22 #afsdb09.jpl.nasa.gov + 137.78.160.23 #afsdb10.jpl.nasa.gov + >nersc.gov #National Energy Research Supercomputer Center + 128.55.128.250 #mars.nersc.gov + 128.55.128.252 #alfred.nersc.gov + 128.55.128.254 #lurch.nersc.gov + >bme.hu #Budapest University of Technology and Economics + 152.66.241.6 #afs.iit.bme.hu + >kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H + 148.6.8.14 #afs.kfki.hu + >caspur.it #CASPUR Inter-University Computing Consortium, Rome + 193.204.5.45 #pomodoro.caspur.it + 193.204.5.46 #banana.caspur.it + 193.204.5.50 #maslo.caspur.it + >enea.it #ENEA New Tech. Energy & Environment Agency, Italy + 192.107.54.5 #aixfs.frascati.enea.it + 192.107.54.11 #rs2ced.frascati.enea.it + 192.107.54.12 #43p.frascati.enea.it + 192.107.61.235 #serverinfo02.bologna.enea.it + 192.107.71.6 #glauco.casaccia.enea.it + 192.107.96.233 #riscdb.trisaia.enea.it + >fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy + 192.107.90.2 #fusafs1.frascati.enea.it + 192.107.90.3 #fusafs2.frascati.enea.it + 192.107.90.4 #fusafs3.frascati.enea.it + >icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy + 193.204.6.130 #icembfs.caspur.it + >infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia + 131.154.1.7 #afscnaf.infn.it + 141.108.26.75 #afsrm1.roma1.infn.it + 192.84.134.75 #afsna.na.infn.it + >ba.infn.it #INFN, Sezione di Bari + 193.206.185.235 #baafsserver.ba.infn.it + 193.206.185.236 #debsrv.ba.infn.it + >kloe.infn.it #INFN, KLOE experiment at Laboratori di Frascati + 192.135.25.111 #kloeafs1.lnf.infn.it + 192.135.25.112 #kloeafs2.lnf.infn.it + >le.infn.it #INFN, Sezione di Lecce + 192.84.152.40 #afs01.le.infn.it + 192.84.152.148 #afs02.le.infn.it + >lnf.infn.it #INFN, Laboratori Nazionali di Frascati + 193.206.84.121 #afs1.lnf.infn.it + 193.206.84.122 #afs2.lnf.infn.it + 193.206.84.123 #afs3.lnf.infn.it + >lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso + 192.84.135.21 #rsgs05.lngs.infn.it + >pi.infn.it #INFN, Sezione di Pisa + 131.114.134.26 #unknownhost.pi.infn.it + 192.84.133.50 #aix1.pi.infn.it + >psm.it #Progetto San Marco, Universita' di Roma-1 + 151.100.1.65 #atlante.psm.uniroma1.it + >tgrid.it #CASPUR-CILEA-CINECA Grid Cell + 193.204.5.33 #cccgrid.caspur.it + >ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC + 140.105.16.8 #fs1.ictp.trieste.it + 140.105.16.9 #fs2.ictp.trieste.it + >math.unifi.it #math.unifi.it + 150.217.34.182 #xeno.math.unifi.it + >ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria + 151.100.85.253 #alfa.ing.uniroma1.it + >dia.uniroma3.it #University Roma Tre - DIA + 193.204.161.79 #plm.dia.uniroma3.it + 193.204.161.118 #afs.dia.uniroma3.it + >vn.uniroma3.it #University of Rome 3, Area Vasca Navale + 193.204.161.136 #alfa.dia.uniroma3.it + 193.204.161.137 #beta.dia.uniroma3.it + 193.204.161.138 #gamma.dia.uniroma3.it + >italia #Italian public AFS cell + 193.204.5.9 #afs.caspur.it + >cmf.nrl.navy.mil #Naval Research Lab - CCS + 134.207.10.68 #picard.cmf.nrl.navy.mil + 134.207.10.69 #riker.cmf.nrl.navy.mil + 134.207.10.70 #kirk.cmf.nrl.navy.mil + >lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics + 132.250.114.2 #afs1.lcp.nrl.navy.mil + 132.250.114.4 #afs2.lcp.nrl.navy.mil + 132.250.114.6 #afs3.lcp.nrl.navy.mil + >es.net #Energy Sciences Net + 198.128.3.21 #fs1.es.net + 198.128.3.22 #fs2.es.net + 198.128.3.23 #fs3.es.net + >laroia.net #Laroia Networks + 66.66.102.254 #supercore.laroia.net + >sinenomine.net #Sine Nomine Associates + 192.204.203.218 #va.sinenomine.net + >slackers.net #The Slackers' Network + 63.201.48.27 #alexandria.slackers.net + >tproa.net #The People's Republic of Ames + 72.13.4.23 #service-3.tproa.net + 72.13.4.24 #service-4.tproa.net + 72.13.4.25 #service-5.tproa.net + >nikhef.nl #The Dutch National Institute for High Energy Physics + 192.16.185.26 #afs1.nikhef.nl + 192.16.185.27 #afs2.nikhef.nl + >1ts.org #1TS.ORG, Cambridge, MA + 69.25.196.51 #pancake.1ts.org + >acm-csuf.org #California State Univerisity Fullerton ACM + 137.151.29.193 #afs1.acm-csuf.org + >bazquux.org #Baz Quux Organization + 66.207.142.196 #baxquux.org + >coed.org #Adam Pennington's Cell + 66.93.61.184 #vice1.coed.org + 128.237.157.35 #vice3.coed.org + >dementia.org #Dementia Unlimited + 128.2.12.45 #alycia.dementia.org + 128.2.120.216 #meredith.dementia.org + >hackish.org #Hackish.org + 24.167.65.213 #avatar.sys.hackish.org + 128.2.120.138 #kurma.sys.hackish.org + >idahofuturetruck.org #University of Idaho hybrid vehicle development + 12.18.238.210 #dsle210.fsr.net + >nimlabs.org #Nimlabs, Ink. Cell. + 18.238.1.103 #olfin.nimlabs.org + 18.238.1.105 #caerbanog.nimlabs.org + >nomh.org #nomh.org + 204.29.154.12 #iota.nomh.org + 204.29.154.32 #adversity.xi.nomh.org + >oc7.org #The OC7 Project + 128.2.122.140 #knife.oc7.org + 207.22.77.170 #spoon.oc7.org + >kth.se #Royal Institute of Technology, Stockholm, Sweden + 130.237.32.145 #sonen.e.kth.se + 130.237.48.7 #anden.e.kth.se + 130.237.48.244 #fadern.e.kth.se + >hallf.kth.se #Royal Institute of Technology, HALLF + 130.237.24.11 #afs1.hallf.kth.se + 130.237.24.104 #afs2.hallf.kth.se + >isk.kth.se #Royal Institute of Technology, ISK + 130.237.202.3 #afsdb1.isk.kth.se + 130.237.209.5 #afsdb2.isk.kth.se + 130.237.209.9 #afsdb3.isk.kth.se + >it.kth.se #Royal Institute of Technology, IT + 130.237.212.15 #ptah.it.kth.se + 130.237.212.16 #toth.it.kth.se + 130.237.215.7 #isis.it.kth.se + >md.kth.se #Royal Institute of Technology, MMK + 130.237.57.68 #trinity.md.kth.se + 130.237.57.72 #morpheus.md.kth.se + 130.237.67.230 #neo.speech.kth.se + >mech.kth.se #Royal Institute of Technology, MECH + 130.237.233.142 #matterhorn.mech.kth.se + 130.237.233.143 #castor.mech.kth.se + 130.237.233.144 #pollux.mech.kth.se + >nada.kth.se #Royal Institute of Technology, NADA + 130.237.222.20 #kosmos.nada.kth.se + 130.237.223.12 #sputnik.nada.kth.se + 130.237.224.78 #mir.nada.kth.se + 130.237.227.23 #gagarin.nada.kth.se + 130.237.228.28 #laika.nada.kth.se + >pdc.kth.se #Royal Institute of Technology, PDC + 130.237.232.29 #crab.pdc.kth.se + 130.237.232.112 #anna.pdc.kth.se + 130.237.232.114 #hokkigai.pdc.kth.se + >stacken.kth.se #Stacken Computer Club + 130.237.234.3 #milko.stacken.kth.se + 130.237.234.43 #hot.stacken.kth.se + 130.237.234.101 #fishburger.stacken.kth.se + >syd.kth.se #Royal Institute of Technology, KTH-Syd + 130.237.83.23 #afs.haninge.kth.se + >physto.se #Physics department Stockholm University + 130.237.205.36 #sysafs1.physto.se + 130.237.205.72 #sysafs2.physto.se + >sanchin.se #Sanchin Consulting AB, Sweden + 192.195.148.10 #sesan.sanchin.se + >su.se #Stockholm University + 130.237.162.81 #afsdb1.su.se + 130.237.162.82 #afsdb2.su.se + 130.237.162.230 #afsdb3.su.se + >f9.ijs.si #F9, Jozef Stefan Institue + 194.249.156.1 #brenta.ijs.si + >p-ng.si #Nova Gorica Polytechnic + 193.2.120.2 #solkan.p-ng.si + >phy.bris.ac.uk #Bristol University - phyics + 137.222.58.9 #afs1.phy.bris.ac.uk + >inf.ed.ac.uk #School of Informatics, University of Edinburgh + 129.215.64.16 #afsdb0.inf.ed.ac.uk + 129.215.64.17 #afsdb1.inf.ed.ac.uk + 129.215.64.18 #afsdb2.inf.ed.ac.uk + >ic.ac.uk #Imperial College London + 155.198.63.148 #icafs2.cc.ic.ac.uk + 155.198.63.149 #icafs1.cc.ic.ac.uk + >hep.man.ac.uk #Manchester HEP + 194.36.2.3 #afs1.hep.man.ac.uk + 194.36.2.4 #afs2.hep.man.ac.uk + 194.36.2.5 #afs3.hep.man.ac.uk + >rl.ac.uk #Rutherford Appleton Lab, England + 130.246.183.164 #wallace.cc.rl.ac.uk Index: openafs/src/aklog/aklog_main.c diff -c openafs/src/aklog/aklog_main.c:1.12.2.6 openafs/src/aklog/aklog_main.c:1.12.2.8 *** openafs/src/aklog/aklog_main.c:1.12.2.6 Wed Jul 11 00:31:06 2007 --- openafs/src/aklog/aklog_main.c Thu Sep 20 00:53:31 2007 *************** *** 1,13 **** /* ! * $Id: aklog_main.c,v 1.12.2.6 2007/07/11 04:31:06 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" */ #if !defined(lint) && !defined(SABER) static char *rcsid = ! "$Id: aklog_main.c,v 1.12.2.6 2007/07/11 04:31:06 shadow Exp $"; #endif /* lint || SABER */ #include --- 1,42 ---- /* ! * $Id: aklog_main.c,v 1.12.2.8 2007/09/20 04:53:31 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" */ + /* + * Copyright (c) 2005, 2006 + * The Linux Box Corporation + * ALL RIGHTS RESERVED + * + * Permission is granted to use, copy, create derivative works + * and redistribute this software and such derivative works + * for any purpose, so long as the name of the Linux Box + * Corporation is not used in any advertising or publicity + * pertaining to the use or distribution of this software + * without specific, written prior authorization. If the + * above copyright notice or any other identification of the + * Linux Box Corporation is included in any copy of any + * portion of this software, then the disclaimer below must + * also be included. + * + * This software is provided as is, without representation + * from the Linux Box Corporation as to its fitness for any + * purpose, and without warranty by the Linux Box Corporation + * of any kind, either express or implied, including + * without limitation the implied warranties of + * merchantability and fitness for a particular purpose. The + * regents of the Linux Box Corporation shall not be liable + * for any damages, including special, indirect, incidental, or + * consequential damages, with respect to any claim arising + * out of or in connection with the use of the software, even + * if it has been or is hereafter advised of the possibility of + * such damages. + */ #if !defined(lint) && !defined(SABER) static char *rcsid = ! "$Id: aklog_main.c,v 1.12.2.8 2007/09/20 04:53:31 shadow Exp $"; #endif /* lint || SABER */ #include *************** *** 39,65 **** #include #endif /* WINDOWS */ - /* on AIX AFS has an unresolved reference to osi_audit. We will define - * it here as extern. It also trys to call the ntohl and htonl routines - * as routines rather then macros. We need a real routine here. - * We do this before the ntohl and htonl macros are defined in net/in.h - */ - int osi_audit() - { return(0);} - - #if 0 - #ifdef _AIX - u_long htonl(u_long x) - { return(x);} - - u_long ntohl(u_long x) - { return(x);} - #endif - - #include - /* #include */ - #endif /* 0 */ - #include #include --- 68,73 ---- *************** *** 89,94 **** --- 97,109 ---- #include "aklog.h" #include "linked_list.h" + #ifdef HAVE_KRB5_CREDS_KEYBLOCK + #define USING_MIT 1 + #endif + #ifdef HAVE_KRB5_CREDS_SESSION + #define USING_HEIMDAL 1 + #endif + #define AFSKEY "afs" #define AFSINST "" *************** *** 183,188 **** --- 198,238 ---- #error "Must have either krb5_princ_size or krb5_principal_get_comp_string" #endif + #if !defined(HAVE_KRB5_ENCRYPT_TKT_PART) && defined(HAVE_ENCODE_KRB5_ENC_TKT_PART) + krb5_error_code + krb5_encrypt_tkt_part(krb5_context context, + const krb5_keyblock *key, + krb5_ticket *ticket) + { + krb5_data *data = 0; + int code; + size_t enclen; + + if ((code = encode_krb5_enc_tkt_part(ticket->enc_part2, &data))) + goto Done; + if ((code = krb5_c_encrypt_length(context, key->enctype, + data->length, &enclen))) + goto Done; + ticket->enc_part.ciphertext.length = enclen; + if (!(ticket->enc_part.ciphertext.data = malloc(enclen))) { + code = ENOMEM; + goto Done; + } + if ((code = krb5_c_encrypt(context, key, KRB5_KEYUSAGE_KDC_REP_TICKET, + 0, data, &ticket->enc_part))) { + free(ticket->enc_part.ciphertext.data); + ticket->enc_part.ciphertext.data = 0; + } + Done: + if (data) { + if (data->data) + free(data->data); + free(data); + } + return code; + } + #endif + #if defined(HAVE_KRB5_CREDS_KEYBLOCK) #define get_cred_keydata(c) c->keyblock.contents *************** *** 205,210 **** --- 255,304 ---- #define HAVE_NO_KRB5_524 #endif + #if USING_HEIMDAL + #define deref_keyblock_enctype(kb) \ + ((kb)->keytype) + + #define deref_entry_keyblock(entry) \ + entry->keyblock + + #define deref_session_key(creds) \ + creds->session + + #define deref_enc_tkt_addrs(tkt) \ + tkt->caddr + + #define deref_enc_length(enc) \ + ((enc)->cipher.length) + + #define deref_enc_data(enc) \ + ((enc)->cipher.data) + + #define krb5_free_keytab_entry_contents krb5_kt_free_entry + + #else + #define deref_keyblock_enctype(kb) \ + ((kb)->enctype) + + #define deref_entry_keyblock(entry) \ + entry->key + + #define deref_session_key(creds) \ + creds->keyblock + + #define deref_enc_tkt_addrs(tkt) \ + tkt->caddrs + + #define deref_enc_length(enc) \ + ((enc)->ciphertext.length) + + #define deref_enc_data(enc) \ + ((enc)->ciphertext.data) + + #endif + + #define deref_entry_enctype(entry) \ + deref_keyblock_enctype(&deref_entry_keyblock(entry)) #endif /* WINDOWS */ /* *************** *** 222,231 **** static int zsubs = FALSE; /* Are we keeping track of zephyr subs? */ static int hosts = FALSE; /* Are we keeping track of hosts? */ static int noprdb = FALSE; /* Skip resolving name to id? */ ! static int linked = FALSE; /* try for both AFS nodes */ ! static int afssetpag = FALSE; /* setpag for AFS */ static int force = FALSE; /* Bash identical tokens? */ static int do524 = FALSE; /* Should we do 524 instead of rxkad2b? */ static linked_list zsublist; /* List of zephyr subscriptions */ static linked_list hostlist; /* List of host addresses */ static linked_list authedcells; /* List of cells already logged to */ --- 316,327 ---- static int zsubs = FALSE; /* Are we keeping track of zephyr subs? */ static int hosts = FALSE; /* Are we keeping track of hosts? */ static int noprdb = FALSE; /* Skip resolving name to id? */ ! static int linked = FALSE; /* try for both AFS nodes */ ! static int afssetpag = FALSE; /* setpag for AFS */ static int force = FALSE; /* Bash identical tokens? */ static int do524 = FALSE; /* Should we do 524 instead of rxkad2b? */ + static char *keytab = NULL; /* keytab for akimpersonate */ + static char *client = NULL; /* client principal for akimpersonate */ static linked_list zsublist; /* List of zephyr subscriptions */ static linked_list hostlist; /* List of host addresses */ static linked_list authedcells; /* List of cells already logged to */ *************** *** 1331,1336 **** --- 1427,1444 ---- } else usage(); + else if ((strcmp(argv[i], "-keytab") == 0)) + if (++i < argc) { + keytab = argv[i]; + } + else + usage(); + else if ((strcmp(argv[i], "-principal") == 0)) + if (++i < argc) { + client = argv[i]; + } + else + usage(); else if (((strcmp(argv[i], "-path") == 0) || (strcmp(argv[i], "-p") == 0)) && !cmode) #ifndef WINDOWS *************** *** 1582,1604 **** } } static krb5_error_code get_credv5(krb5_context context, ! char *name, char *inst, char *realm, ! krb5_creds **creds) { krb5_creds increds; krb5_error_code r; static krb5_principal client_principal = 0; ! memset((char *)&increds, 0, sizeof(increds)); /* ANL - instance may be ptr to a null string. Pass null then */ if ((r = krb5_build_principal(context, &increds.server, ! strlen(realm), realm, ! name, ! (inst && strlen(inst)) ? inst : (void *) NULL, ! (void *) NULL))) { return r; } if (!_krb425_ccache) { r = krb5_cc_default(context, &_krb425_ccache); --- 1690,2034 ---- } } + static krb5_error_code get_credv5_akimpersonate(krb5_context context, + char* keytab, + krb5_principal service_principal, + krb5_principal client_principal, + time_t starttime, + time_t endtime, + int *allowed_enctypes, + int *paddress, + krb5_creds** out_creds /* out */ ) + { + #if defined(USING_HEIMDAL) || (defined(HAVE_ENCODE_KRB5_ENC_TKT) && defined(HAVE_ENCODE_KRB5_TICKET)) + krb5_error_code code; + krb5_keytab kt = 0; + krb5_kt_cursor cursor[1]; + krb5_keytab_entry entry[1]; + krb5_ccache cc = 0; + krb5_creds *creds = 0; + krb5_enctype enctype; + krb5_kvno kvno; + krb5_keyblock session_key[1]; + #if USING_HEIMDAL + Ticket ticket_reply[1]; + EncTicketPart enc_tkt_reply[1]; + krb5_address address[30]; + krb5_addresses faddr[1]; + int temp_vno[1]; + time_t temp_time[2]; + #else + krb5_ticket ticket_reply[1]; + krb5_enc_tkt_part enc_tkt_reply[1]; + krb5_address address[30], *faddr[30]; + #endif + krb5_data * temp; + int i; + static int any_enctype[] = {0}; + *out_creds = 0; + if (!(creds = malloc(sizeof *creds))) { + code = ENOMEM; + goto cleanup; + } + if (!allowed_enctypes) + allowed_enctypes = any_enctype; + + cc = 0; + enctype = 0; /* AKIMPERSONATE_IGNORE_ENCTYPE */ + kvno = 0; /* AKIMPERSONATE_IGNORE_VNO */ + memset((char*)creds, 0, sizeof *creds); + memset((char*)entry, 0, sizeof *entry); + memset((char*)session_key, 0, sizeof *session_key); + memset((char*)ticket_reply, 0, sizeof *ticket_reply); + memset((char*)enc_tkt_reply, 0, sizeof *enc_tkt_reply); + code = krb5_kt_resolve(context, keytab, &kt); + if (code) { + if (keytab) + com_err(progname, code, "while resolving keytab %s", keytab); + else + com_err(progname, code, "while resolving default keytab"); + goto cleanup; + } + + if (service_principal) { + for (i = 0; (enctype = allowed_enctypes[i]) || !i; ++i) { + code = krb5_kt_get_entry(context, + kt, + service_principal, + kvno, + enctype, + entry); + if (!code) { + if (allowed_enctypes[i]) + deref_keyblock_enctype(session_key) = allowed_enctypes[i]; + break; + } + } + if (code) { + com_err(progname, code,"while scanning keytab entries"); + goto cleanup; + } + } else { + krb5_keytab_entry new[1]; + int best = -1; + memset(new, 0, sizeof *new); + if ((code == krb5_kt_start_seq_get(context, kt, cursor))) { + com_err(progname, code, "while starting keytab scan"); + goto cleanup; + } + while (!(code = krb5_kt_next_entry(context, kt, new, cursor))) { + for (i = 0; + allowed_enctypes[i] && allowed_enctypes[i] + != deref_entry_enctype(new); ++i) + ; + if ((!i || allowed_enctypes[i]) && + (best < 0 || best > i)) { + krb5_free_keytab_entry_contents(context, entry); + *entry = *new; + memset(new, 0, sizeof *new); + } else krb5_free_keytab_entry_contents(context, new); + } + if ((i = krb5_kt_end_seq_get(context, kt, cursor))) { + com_err(progname, i, "while ending keytab scan"); + code = i; + goto cleanup; + } + if (best < 0) { + com_err(progname, code, "while scanning keytab"); + goto cleanup; + } + deref_keyblock_enctype(session_key) = deref_entry_enctype(entry); + } + + /* Make Ticket */ + + #if USING_HEIMDAL + if ((code = krb5_generate_random_keyblock(context, + deref_keyblock_enctype(session_key), session_key))) { + com_err(progname, code, "while making session key"); + goto cleanup; + } + enc_tkt_reply->flags.initial = 1; + enc_tkt_reply->transited.tr_type = DOMAIN_X500_COMPRESS; + enc_tkt_reply->cname = client_principal->name; + enc_tkt_reply->crealm = client_principal->realm; + enc_tkt_reply->key = *session_key; + { + static krb5_data empty_string; + enc_tkt_reply->transited.contents = empty_string; + } + enc_tkt_reply->authtime = starttime; + enc_tkt_reply->starttime = temp_time; + *enc_tkt_reply->starttime = starttime; + #if 0 + enc_tkt_reply->renew_till = temp_time + 1; + *enc_tkt_reply->renew_till = endtime; + #endif + enc_tkt_reply->endtime = endtime; + #else + if ((code = krb5_c_make_random_key(context, + deref_keyblock_enctype(session_key), session_key))) { + com_err(progname, code, "while making session key"); + goto cleanup; + } + enc_tkt_reply->magic = KV5M_ENC_TKT_PART; + #define DATACAST (unsigned char *) + enc_tkt_reply->flags |= TKT_FLG_INITIAL; + enc_tkt_reply->transited.tr_type = KRB5_DOMAIN_X500_COMPRESS; + enc_tkt_reply->session = session_key; + enc_tkt_reply->client = client_principal; + { + static krb5_data empty_string; + enc_tkt_reply->transited.tr_contents = empty_string; + } + enc_tkt_reply->times.authtime = starttime; + enc_tkt_reply->times.starttime = starttime; /* krb524init needs this */ + enc_tkt_reply->times.endtime = endtime; + #endif /* USING_HEIMDAL */ + /* NB: We will discard address for now--ignoring caddr field + in any case. MIT branch does what it always did. */ + + if (paddress && *paddress) { + deref_enc_tkt_addrs(enc_tkt_reply) = faddr; + #if USING_HEIMDAL + faddr->len = 0; + faddr->val = address; + #endif + for (i = 0; paddress[i]; ++i) { + #if USING_HEIMDAL + address[i].addr_type = KRB5_ADDRESS_INET; + address[i].address.data = (void*)(paddress+i); + address[i].address.length = sizeof(paddress[i]); + #else + #if !USING_SSL + address[i].magic = KV5M_ADDRESS; + address[i].addrtype = ADDRTYPE_INET; + #else + address[i].addrtype = AF_INET; + #endif + address[i].contents = (void*)(paddress+i); + address[i].length = sizeof(int); + faddr[i] = address+i; + #endif + } + #if USING_HEIMDAL + faddr->len = i; + #else + faddr[i] = 0; + #endif + } + + #if USING_HEIMDAL + ticket_reply->sname = service_principal->name; + ticket_reply->realm = service_principal->realm; + + { /* crypto block */ + krb5_crypto crypto = 0; + unsigned char *buf = 0; + size_t buf_size, buf_len; + char *what; + + ASN1_MALLOC_ENCODE(EncTicketPart, buf, buf_size, + enc_tkt_reply, &buf_len, code); + if(code) { + com_err(progname, code, "while encoding ticket"); + goto cleanup; + } + + if(buf_len != buf_size) { + com_err(progname, code, + "%d != %d while encoding ticket (internal ASN.1 encoder error", + buf_len, buf_size); + goto cleanup; + } + what = "krb5_crypto_init"; + code = krb5_crypto_init(context, + &deref_entry_keyblock(entry), + deref_entry_enctype(entry), + &crypto); + if(!code) { + what = "krb5_encrypt"; + code = krb5_encrypt_EncryptedData(context, crypto, KRB5_KU_TICKET, + buf, buf_len, entry->vno, &(ticket_reply->enc_part)); + } + if (buf) free(buf); + if (crypto) krb5_crypto_destroy(context, crypto); + if(code) { + com_err(progname, code, "while %s", what); + goto cleanup; + } + } /* crypto block */ + ticket_reply->enc_part.etype = deref_entry_enctype(entry); + ticket_reply->enc_part.kvno = temp_vno; + *ticket_reply->enc_part.kvno = entry->vno; + ticket_reply->tkt_vno = 5; + #else + ticket_reply->server = service_principal; + ticket_reply->enc_part2 = enc_tkt_reply; + if ((code = krb5_encrypt_tkt_part(context, &deref_entry_keyblock(entry), ticket_reply))) { + com_err(progname, code, "while making ticket"); + goto cleanup; + } + ticket_reply->enc_part.kvno = entry->vno; + #endif + + /* Construct Creds */ + + if ((code = krb5_copy_principal(context, service_principal, + &creds->server))) { + com_err(progname, code, "while copying service principal"); + goto cleanup; + } + if ((code = krb5_copy_principal(context, client_principal, + &creds->client))) { + com_err(progname, code, "while copying client principal"); + goto cleanup; + } + if ((code = krb5_copy_keyblock_contents(context, session_key, + &deref_session_key(creds)))) { + com_err(progname, code, "while copying session key"); + goto cleanup; + } + + #if USING_HEIMDAL + creds->times.authtime = enc_tkt_reply->authtime; + creds->times.starttime = *(enc_tkt_reply->starttime); + creds->times.endtime = enc_tkt_reply->endtime; + creds->times.renew_till = 0; /* *(enc_tkt_reply->renew_till) */ + creds->flags.b = enc_tkt_reply->flags; + #else + creds->times = enc_tkt_reply->times; + creds->ticket_flags = enc_tkt_reply->flags; + #endif + if (!deref_enc_tkt_addrs(enc_tkt_reply)) + ; + else if ((code = krb5_copy_addresses(context, + deref_enc_tkt_addrs(enc_tkt_reply), &creds->addresses))) { + com_err(progname, code, "while copying addresses"); + goto cleanup; + } + + #if USING_HEIMDAL + { + size_t creds_tkt_len; + ASN1_MALLOC_ENCODE(Ticket, creds->ticket.data, creds->ticket.length, + ticket_reply, &creds_tkt_len, code); + if(code) { + com_err(progname, code, "while encoding ticket"); + goto cleanup; + } + } + #else + if ((code = encode_krb5_ticket(ticket_reply, &temp))) { + com_err(progname, code, "while encoding ticket"); + goto cleanup; + } + creds->ticket = *temp; + free(temp); + #endif + /* return creds */ + *out_creds = creds; + creds = 0; + cleanup: + if (deref_enc_data(&ticket_reply->enc_part)) + free(deref_enc_data(&ticket_reply->enc_part)); + krb5_free_keytab_entry_contents(context, entry); + if (client_principal) + krb5_free_principal(context, client_principal); + if (service_principal) + krb5_free_principal(context, service_principal); + if (cc) + krb5_cc_close(context, cc); + if (kt) + krb5_kt_close(context, kt); + if (creds) krb5_free_creds(context, creds); + krb5_free_keyblock_contents(context, session_key); + out: + return code; + #else + return -1; + #endif + } + + static krb5_error_code get_credv5(krb5_context context, ! char *name, char *inst, char *realm, ! krb5_creds **creds) { krb5_creds increds; krb5_error_code r; static krb5_principal client_principal = 0; ! memset((char *)&increds, 0, sizeof(increds)); /* ANL - instance may be ptr to a null string. Pass null then */ if ((r = krb5_build_principal(context, &increds.server, ! strlen(realm), realm, ! name, ! (inst && strlen(inst)) ? inst : (void *) NULL, ! (void *) NULL))) { return r; } + if (!_krb425_ccache) { r = krb5_cc_default(context, &_krb425_ccache); *************** *** 1606,1623 **** return r; } if (!client_principal) { ! r = krb5_cc_get_principal(context, _krb425_ccache, &client_principal); if (r) return r; } ! increds.client = client_principal; increds.times.endtime = 0; ! /* Ask for DES since that is what V4 understands */ get_creds_enctype((&increds)) = ENCTYPE_DES_CBC_CRC; ! ! r = krb5_get_credentials(context, 0, _krb425_ccache, &increds, creds); ! return r; } --- 2036,2071 ---- return r; } if (!client_principal) { ! if (client) { ! r = krb5_parse_name(context, client, &client_principal); ! } else { ! r = krb5_cc_get_principal(context, _krb425_ccache, &client_principal); ! } if (r) return r; } ! increds.client = client_principal; increds.times.endtime = 0; ! /* Ask for DES since that is what V4 understands */ get_creds_enctype((&increds)) = ENCTYPE_DES_CBC_CRC; ! ! if (keytab) { ! int allowed_enctypes[] = { ! ENCTYPE_DES_CBC_CRC, 0 ! }; ! ! r = get_credv5_akimpersonate(context, ! keytab, ! increds.server, ! increds.client, ! 300, ((~0U)>>1), ! allowed_enctypes, ! 0 /* paddress */, ! creds /* out */); ! } else { ! r = krb5_get_credentials(context, 0, _krb425_ccache, &increds, creds); ! } return r; } *************** *** 1626,1641 **** { static krb5_principal client_principal = 0; int i; if (!_krb425_ccache) krb5_cc_default(context, &_krb425_ccache); ! if (!client_principal) ! krb5_cc_get_principal(context, _krb425_ccache, &client_principal); i = realm_len(context, client_principal); if (i > REALM_SZ-1) i = REALM_SZ-1; strncpy(realm,realm_data(context, client_principal), i); realm[i] = 0; ! return(0); } --- 2074,2097 ---- { static krb5_principal client_principal = 0; int i; + krb5_error_code r = 0; if (!_krb425_ccache) krb5_cc_default(context, &_krb425_ccache); ! if (!client_principal) { ! if (client) { ! r = krb5_parse_name(context, client, &client_principal); ! } else { ! r = krb5_cc_get_principal(context, _krb425_ccache, &client_principal); ! } ! if (r) ! return r; ! } i = realm_len(context, client_principal); if (i > REALM_SZ-1) i = REALM_SZ-1; strncpy(realm,realm_data(context, client_principal), i); realm[i] = 0; ! return(r); } Index: openafs/src/bucoord/NTMakefile diff -c openafs/src/bucoord/NTMakefile:1.13 openafs/src/bucoord/NTMakefile:1.13.4.1 *** openafs/src/bucoord/NTMakefile:1.13 Sun Nov 20 20:56:40 2005 --- openafs/src/bucoord/NTMakefile Wed Sep 19 13:58:48 2007 *************** *** 37,42 **** --- 37,44 ---- EXEFILE = $(DESTDIR)\etc\backup.exe + EXERES = $(OUT)/backup.res + EXEOBJS =\ $(OUT)\main.obj \ $(OUT)\config.obj \ *************** *** 58,65 **** $(OUT)\dlq.obj \ ! $(OUT)/backup.res:AFS_component_version_number.h ! $(RC) backup.rc $(EXEOBJS):$$(@B).c $(C2OBJ) $** --- 60,66 ---- $(OUT)\dlq.obj \ ! $(EXERES): backup.rc AFS_component_version_number.h $(EXEOBJS):$$(@B).c $(C2OBJ) $** *************** *** 90,96 **** $(DESTDIR)\lib\cm_dns.obj ! $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) --- 91,97 ---- $(DESTDIR)\lib\cm_dns.obj ! $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 119,124 **** --- 120,127 ---- clean:: $(DEL) bc.h bucoord_errs.c + $(DEL) $(EXERES) + $(DEL) AFS_component_version_number.h mkdir: Index: openafs/src/butc/NTMakefile diff -c openafs/src/butc/NTMakefile:1.10 openafs/src/butc/NTMakefile:1.10.4.1 *** openafs/src/butc/NTMakefile:1.10 Sun Nov 20 20:56:43 2005 --- openafs/src/butc/NTMakefile Wed Sep 19 13:58:48 2007 *************** *** 15,20 **** --- 15,22 ---- EXEFILE = $(DESTDIR)\etc\butc.exe + EXERES = $(OUT)\butc.res + EXEOBJS =\ $(OUT)\dbentries.obj \ $(OUT)\tcprocs.obj \ *************** *** 24,31 **** $(OUT)\tcudbprocs.obj \ $(OUT)\dump.obj \ $(OUT)\tcstatus.obj \ ! $(OUT)\tcmain.obj \ ! $(OUT)\butc.res EXELIBS =\ $(DESTDIR)\lib\afs\afsbudb.lib \ --- 26,32 ---- $(OUT)\tcudbprocs.obj \ $(OUT)\dump.obj \ $(OUT)\tcstatus.obj \ ! $(OUT)\tcmain.obj EXELIBS =\ $(DESTDIR)\lib\afs\afsbudb.lib \ *************** *** 53,69 **** $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\cm_dns.obj ! $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) ############################################################################ - # Definitions for generating versioninfo resources - - $(OUT)\butc.res: AFS_component_version_number.h - - ############################################################################ # Install target; primary makefile target install: $(EXEFILE) --- 54,67 ---- $(DESTDIR)\lib\afs\afsreg.lib \ $(DESTDIR)\lib\cm_dns.obj ! $(EXERES): butc.rc AFS_component_version_number.h ! ! $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) ############################################################################ # Install target; primary makefile target install: $(EXEFILE) *************** *** 73,78 **** --- 71,78 ---- # Local clean target; augments predefined clean target clean:: + $(DEL) $(EXERES) + $(DEL) AFS_component_version_number.h ############################################################################ Index: openafs/src/cf/kerberos.m4 diff -c openafs/src/cf/kerberos.m4:1.7.2.2 openafs/src/cf/kerberos.m4:1.7.2.3 *** openafs/src/cf/kerberos.m4:1.7.2.2 Thu Jan 4 22:21:49 2007 --- openafs/src/cf/kerberos.m4 Thu Sep 20 00:53:31 2007 *************** *** 1,5 **** dnl ! dnl $Id: kerberos.m4,v 1.7.2.2 2007/01/05 03:21:49 shadow Exp $ dnl dnl Kerberos autoconf glue dnl --- 1,5 ---- dnl ! dnl $Id: kerberos.m4,v 1.7.2.3 2007/09/20 04:53:31 shadow Exp $ dnl dnl Kerberos autoconf glue dnl *************** *** 58,64 **** CPPFLAGS="$CPPFLAGS $KRB5CFLAGS" save_LIBS="$LIBS" LIBS="$LIBS $KRB5LIBS" ! AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string]) AC_CHECK_FUNCS([krb5_524_convert_creds], , [AC_CHECK_FUNCS([krb524_convert_creds_kdc], , [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc], --- 58,64 ---- CPPFLAGS="$CPPFLAGS $KRB5CFLAGS" save_LIBS="$LIBS" LIBS="$LIBS $KRB5LIBS" ! AC_CHECK_FUNCS([add_to_error_table add_error_table krb5_princ_size krb5_principal_get_comp_string encode_krb5_enc_tkt_part encode_krb5_ticket]) AC_CHECK_FUNCS([krb5_524_convert_creds], , [AC_CHECK_FUNCS([krb524_convert_creds_kdc], , [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc], Index: openafs/src/cf/osconf.m4 diff -c openafs/src/cf/osconf.m4:1.83.2.3 openafs/src/cf/osconf.m4:1.83.2.4 *** openafs/src/cf/osconf.m4:1.83.2.3 Mon Jun 18 14:18:48 2007 --- openafs/src/cf/osconf.m4 Thu Sep 20 00:53:31 2007 *************** *** 488,493 **** --- 488,494 ---- EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" + RANLIB="ranlib -c" ;; *_darwin_90) *************** *** 505,510 **** --- 506,512 ---- EXTRA_VLIBOBJS="fstab.o" SHLIB_LINKER="${MT_CC} -dynamiclib" SHLIB_SUFFIX="dylib" + RANLIB="ranlib -c" ;; ppc_linux*) Index: openafs/src/comerr/NTMakefile diff -c openafs/src/comerr/NTMakefile:1.6 openafs/src/comerr/NTMakefile:1.6.4.1 *** openafs/src/comerr/NTMakefile:1.6 Sun Nov 20 20:56:46 2005 --- openafs/src/comerr/NTMakefile Wed Sep 19 13:58:48 2007 *************** *** 37,42 **** --- 37,44 ---- # build and install the compile_et executable COMPILE_ET_EXEFILE = $(DESTDIR)\bin\compile_et.exe + COMPILE_ET_EXERES = $(OUT)\compile_et.res + prep: $(DESTDIR)\bin\touch et_lex.lex_nt.c $(DESTDIR)\bin\touch error_table_nt.c *************** *** 52,64 **** $(OUT)\compile_et.obj \ $(OUT)\error_table_nt.obj $(COMPILE_ET_EXEOBJS): $$(@B).c $(C2OBJ) $** COMPILE_ET_EXELIBS =\ $(DESTDIR)\lib\afs\afsutil.lib ! $(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) --- 54,68 ---- $(OUT)\compile_et.obj \ $(OUT)\error_table_nt.obj + $(COMPILE_ET_EXERES): compile_et.rc AFS_component_version_number.h + $(COMPILE_ET_EXEOBJS): $$(@B).c $(C2OBJ) $** COMPILE_ET_EXELIBS =\ $(DESTDIR)\lib\afs\afsutil.lib ! $(COMPILE_ET_EXEFILE): $(COMPILE_ET_EXEOBJS) $(COMPILE_ET_EXERES) $(COMPILE_ET_EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 71,76 **** --- 75,81 ---- clean:: $(DEL) $(COMERR_LIBFILE) $(OUT)\AFS_component_version_number.obj $(DEL) $(COMPILE_ET_EXEFILE) + $(DEL) $(COMPILE_ET_EXERES); $(DEL) *~ *.bak \ *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \ *.cp *.fn *.ky *.log *.pg *.tp *.vr \ Index: openafs/src/comerr/compile_et.rc diff -c /dev/null openafs/src/comerr/compile_et.rc:1.1.2.2 *** /dev/null Thu Sep 20 01:06:45 2007 --- openafs/src/comerr/compile_et.rc Wed Sep 19 13:58:48 2007 *************** *** 0 **** --- 1,17 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* Define VERSIONINFO resource */ + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Common Error Table Compilation Tool" + #define AFS_VERINFO_NAME "compile_et" + #define AFS_VERINFO_FILENAME "compile_et.exe" + + #include "AFS_component_version_number.h" + #include "..\config\NTVersioninfo.rc" Index: openafs/src/config/NTMakefile.amd64_w2k diff -c openafs/src/config/NTMakefile.amd64_w2k:1.24.2.28 openafs/src/config/NTMakefile.amd64_w2k:1.24.2.30 *** openafs/src/config/NTMakefile.amd64_w2k:1.24.2.28 Tue Aug 28 13:53:59 2007 --- openafs/src/config/NTMakefile.amd64_w2k Wed Sep 19 23:59:48 2007 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2400 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2500 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.84.2.27 openafs/src/config/NTMakefile.i386_nt40:1.84.2.29 *** openafs/src/config/NTMakefile.i386_nt40:1.84.2.27 Tue Aug 28 13:53:59 2007 --- openafs/src/config/NTMakefile.i386_nt40 Wed Sep 19 23:59:48 2007 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2400 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2500 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.23.2.27 openafs/src/config/NTMakefile.i386_w2k:1.23.2.30 *** openafs/src/config/NTMakefile.i386_w2k:1.23.2.27 Tue Aug 28 13:53:59 2007 --- openafs/src/config/NTMakefile.i386_w2k Wed Sep 19 23:59:48 2007 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2400 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 84,90 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=2500 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) *************** *** 269,274 **** --- 269,275 ---- cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025) cvarsdll = $(cvarsdll:-MDd=-MD) NODEBUG=1 + _VC_MANIFEST_BASENAME = __OAFW !ELSE # CHECKED BUILD cdebug = $(cdebug:-Z7=-Zi) # avoid annoying override warning (D4025) *************** *** 284,289 **** --- 285,302 ---- !ENDIF !UNDEF NODEBUG + _VC_MANIFEST_BASENAME = __OAFW.Debug + !ENDIF + + !IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)" == "1310") + _VC_MANIFEST_EMBED_EXE= \ + if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 + + _VC_MANIFEST_EMBED_DLL= \ + if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2 + !ELSE + _VC_MANIFEST_EMBED_EXE= + _VC_MANIFEST_EMBED_DLL= !ENDIF # Set compiler warning level *************** *** 358,364 **** #################### Link optional build flags set ########### afslflags =\ ! /FIXED:NO /VERBOSE:LIB mfclflags = $(guilflags) mfclflags = $(mfclflags:/NODEFAULTLIB=) --- 371,381 ---- #################### Link optional build flags set ########### afslflags =\ ! /FIXED:NO /VERBOSE:LIB /MACHINE:I386 ! ! !IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1310") ! afslflags = $(afslflags) /MANIFEST ! !ENDIF mfclflags = $(guilflags) mfclflags = $(mfclflags:/NODEFAULTLIB=) Index: openafs/src/libafs/afs.ppc_darwin_70.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.20 openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.21 *** openafs/src/libafs/afs.ppc_darwin_70.plist.in:1.2.10.20 Wed Aug 29 00:08:54 2007 --- openafs/src/libafs/afs.ppc_darwin_70.plist.in Thu Sep 20 00:14:07 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.24 CFBundleSignature ???? CFBundleVersion ! 1.5.24 OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.25 CFBundleSignature ???? CFBundleVersion ! 1.5.25 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.2.4.20 openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.21 *** openafs/src/libafs/afs.ppc_darwin_80.plist.in:1.2.4.20 Wed Aug 29 00:08:54 2007 --- openafs/src/libafs/afs.ppc_darwin_80.plist.in Thu Sep 20 00:14:07 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.24 CFBundleSignature ???? CFBundleVersion ! 1.5.24 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.25 CFBundleSignature ???? CFBundleVersion ! 1.5.25 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.6.20 openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.21 *** openafs/src/libafs/afs.ppc_darwin_90.plist.in:1.1.6.20 Wed Aug 29 00:08:54 2007 --- openafs/src/libafs/afs.ppc_darwin_90.plist.in Thu Sep 20 00:14:07 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.24 CFBundleSignature ???? CFBundleVersion ! 1.5.24 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.25 CFBundleSignature ???? CFBundleVersion ! 1.5.25 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.6.20 openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.21 *** openafs/src/libafs/afs.x86_darwin_80.plist.in:1.1.6.20 Wed Aug 29 00:08:54 2007 --- openafs/src/libafs/afs.x86_darwin_80.plist.in Thu Sep 20 00:14:07 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.24 CFBundleSignature ???? CFBundleVersion ! 1.5.24 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.25 CFBundleSignature ???? CFBundleVersion ! 1.5.25 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.6.20 openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.21 *** openafs/src/libafs/afs.x86_darwin_90.plist.in:1.1.6.20 Wed Aug 29 00:08:54 2007 --- openafs/src/libafs/afs.x86_darwin_90.plist.in Thu Sep 20 00:14:07 2007 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.24 CFBundleSignature ???? CFBundleVersion ! 1.5.24 OSBundleLibraries com.apple.kpi.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.5.25 CFBundleSignature ???? CFBundleVersion ! 1.5.25 OSBundleLibraries com.apple.kpi.bsd Index: openafs/src/packaging/Debian/CellServDB diff -c openafs/src/packaging/Debian/CellServDB:1.1 openafs/src/packaging/Debian/CellServDB:removed *** openafs/src/packaging/Debian/CellServDB:1.1 Thu Mar 23 15:19:06 2006 --- openafs/src/packaging/Debian/CellServDB Thu Sep 20 01:06:53 2007 *************** *** 1,559 **** - >grand.central.org #GCO Public CellServDB 15 Oct 2005 - 18.7.14.88 #grand-opening.mit.edu - 128.2.191.224 #penn.central.org - 130.237.48.87 #andrew.e.kth.se - >wu-wien.ac.at #University of Economics, Vienna, Austria - 137.208.3.33 #afsdb1.wu-wien.ac.at - 137.208.8.12 #caesar.wu-wien.ac.at - 137.208.127.33 #buddy.wu-wien.ac.at - >hephy.at #hephy-vienna - 193.170.243.10 #mowgli.oeaw.ac.at - 193.170.243.12 #baloo.oeaw.ac.at - 193.170.243.14 #akela.oeaw.ac.at - >itp.tugraz.at #Institute for Theoretical Physics, TU Graz, Austria - 129.27.157.6 #fubphsv2.tu-graz.ac.at - 129.27.161.7 #faepsv01.tu-graz.ac.at - 129.27.161.15 #faepsv02.tu-graz.ac.at - >cern.ch #European Laboratory for Particle Physics, Geneva - 137.138.128.148 #afsdb1.cern.ch - 137.138.246.50 #afsdb3.cern.ch - 137.138.246.51 #afsdb2.cern.ch - >ams.cern.ch #AMS Experiment - 137.138.206.77 #pcamsf2.cern.ch - 137.138.206.123 #pcamsf4.cern.ch - >epfl.ch #Swiss Federal Institute of Technology at Lausanne - 128.178.2.6 #kd1.epfl.ch - 128.178.2.7 #kd2.epfl.ch - 128.178.2.8 #kd3.epfl.ch - >ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland - 129.132.97.19 #amalthea.ethz.ch - 129.132.97.27 #nethzafs-001.ethz.ch - 129.132.115.3 #himalia.ethz.ch - 129.132.115.37 #nethzafs-005.ethz.ch - 129.132.115.38 #nethzafs-006.ethz.ch - >psi.ch #Paul Scherrer Institut - Villigen, Switzerland - 129.129.190.140 #afs00.psi.ch - 129.129.190.141 #afs01.psi.ch - 129.129.190.142 #afs02.psi.ch - >extundo.com #Simon Josefsson's cell - 195.42.214.241 #slipsten.extundo.com - >mekinok.com #Mekinok, Inc. - 4.36.43.98 #loggerhead.mekinok.com - >membrain.com #membrain.com - 66.93.118.125 #stormy - 130.85.24.11 #weasel - 130.85.24.13 #straykitten - >midnightlinux.com #Midnight Linux, Pittsburgh PA - 208.10.142.82 #outpost.midnightlinux.com - >setfilepointer.com #SetFilePointer.com - 63.224.10.2 #hamlet.SetFilePointer.com - 63.224.10.4 #troilus.SetFilePointer.com - >sodre.cx #Sodre.cx - 128.8.140.165 #greed.sodre.cx - >desy.de #Deutsches Elektronen-Synchrotron - 131.169.40.62 #vayu.desy.de - 131.169.244.60 #solar00.desy.de - >gppc.de #GPP Chemnitz mbH - 213.187.92.33 #gpp1.gppc.de - 213.187.92.34 #paulchen.gppc.de - 213.187.92.35 #lotus.gppc.de - >ifh.de #DESY Zeuthen - 141.34.22.10 #romulus.ifh.de - 141.34.22.11 #remus.ifh.de - 141.34.22.29 #hekate.ifh.de - >lrz-muenchen.de #Leibniz Computing Centre, Germany - 129.187.10.36 #afs1.lrz-muenchen.de - 129.187.10.56 #afs3.lrz-muenchen.de - 129.187.10.57 #afs2.lrz-muenchen.de - >ipp-garching.mpg.de #Institut fuer Plasmaphysik - 130.183.9.5 #afs-db1.rzg.mpg.de - 130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de - 130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de - >mpe.mpg.de #MPE cell - 130.183.130.7 #irafs1.mpe-garching.mpg.de - 130.183.134.20 #irafs2.mpe-garching.mpg.de - >i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen - 137.226.244.79 #remus.informatik.rwth-aachen.de - >tu-bs.de #Technical University of Braunschweig, Germany - 134.169.1.1 #rzafs1.rz.tu-bs.de - 134.169.1.5 #rzafs2.rz.tu-bs.de - 134.169.1.6 #rzafs3.rz.tu-bs.de - >tu-chemnitz.de #Technische Universitaet Chemnitz, Germany - 134.109.2.1 #zuse.hrz.tu-chemnitz.de - 134.109.2.15 #phoenix.hrz.tu-chemnitz.de - 134.109.200.7 #aetius.hrz.tu-chemnitz.de - >e18.ph.tum.de #Experimental Physics, TU Munich, Germany - 129.187.154.223 #hamlet.e18.physik.tu-muenchen.de - >uni-bonn.de #University of Bonn, Computing Center - 131.220.14.198 #work15-eth.rhrz.uni-bonn.de - 131.220.14.205 #node05.rhrz.uni-bonn.de - 131.220.15.197 #afs-db1.rhrz.uni-bonn.de - >atlass01.physik.uni-bonn.de #Bonn ATLAS - 131.220.165.43 #atlass01.physik.uni-bonn.de - >uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg - 132.230.6.235 #sv6.ruf.uni-freiburg.de - 132.230.6.236 #sv7.ruf.uni-freiburg.de - 132.230.6.237 #sv8.ruf.uni-freiburg.de - >physik.uni-freiburg.de #institute of physics, university Freiburg, Germany - 132.230.77.16 #hepafs.physik.uni-freiburg.de - >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) - 129.206.119.10 #afsdb.urz.uni-heidelberg.de - 129.206.119.16 #afsdb1.urz.uni-heidelberg.de - 129.206.119.17 #afsdb2.urz.uni-heidelberg.de - >uni-hohenheim.de #University of Hohenheim - 144.41.2.2 #rs13.serv.uni-hohenheim.de - 144.41.2.3 #rs14.serv.uni-hohenheim.de - 144.41.2.4 #rs15.serv.uni-hohenheim.de - >rz.uni-jena.de #Rechenzentrum University of Jena, Germany - 141.35.2.160 #lc00.rz.uni-jena.de - 141.35.7.9 #fsuj01.rz.uni-jena.de - 141.35.7.10 #zaphod.rz.uni-jena - >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology - 134.95.144.22 #afs1.meteo.uni-koeln.de - 134.95.144.24 #afs2.meteo.uni-koeln.de - >rrz.uni-koeln.de #University of Cologne - Reg Comp Center - 134.95.19.3 #afsdb1.rrz.uni-koeln.de - 134.95.19.30 #fileserv3.rrz.uni-koeln.de - 134.95.67.97 #afs.thp.uni-koeln.de - 134.95.140.190 #rzkbserv.rrz.uni-koeln.de - >physik.uni-mainz.de #institute of physics, university Mainz, Germany - 134.93.130.93 #hardy.physik.uni-mainz.de - >uni-mannheim.de #Uni Mannheim (Rechenzentrum) - 134.155.97.204 #afsdb1.uni-mannheim.de - 134.155.97.205 #afsdb2.uni-mannheim.de - 134.155.97.206 #afsdb3.uni-mannheim.de - >uni-paderborn.de #University of Paderborn, Germany - 131.234.137.10 #afsdb1.uni-paderborn.de - 131.234.137.11 #afsdb2.uni-paderborn.de - 131.234.137.12 #afsdb3.uni-paderborn.de - >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal - 132.195.104.3 #afs1.physik.uni-wuppertal.de - 132.195.104.230 #afs2.physik.uni-wuppertal.de - >s-et.aau.dk #Aalborg Univ., The Student Society, Denmark - 130.225.196.22 #afs.s-et.aau.dk - >ies.auc.dk #Aalborg Univ., Inst. of Electronic Systems, Denmark - 130.225.51.73 #afsdb1.kom.auc.dk - 130.225.51.74 #afsdb2.kom.auc.dk - 130.225.51.85 #afsdb3.kom.auc.dk - >asu.edu #Arizona State University - 129.219.10.69 #authen2.asu.edu - 129.219.10.70 #authen1.asu.edu - 129.219.10.72 #authen3.asu.edu - 129.219.100.16 #authen4.asu.edu - >hep.caltech.edu #CalTech High Energy Physics - 131.215.126.150 #afs.hep.caltech.edu - >clarkson.edu #Clarkson University, Potsdam, New York USA - 128.153.1.111 #arthur.clarkson.edu - 128.153.9.111 #lancelot.clarkson.edu - 128.153.17.111 #uther.clarkson.edu - >andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell - 128.2.10.2 #vice2.fs.andrew.cmu.edu - 128.2.10.7 #vice7.fs.andrew.cmu.edu - 128.2.10.11 #vice11.fs.andrew.cmu.edu - 128.2.10.28 #vice28.fs.andrew.cmu.edu - 128.2.32.44 #new-vice12.fs.andrew.cmu.edu - >club.cc.cmu.edu #Carnegie Mellon University Computer Club - 128.237.157.11 #sodium.club.cc.cmu.edu - 128.237.157.13 #potassium.club.cc.cmu.edu - >chem.cmu.edu #Carnegie Mellon University - Chemistry Dept. - 128.2.40.134 #afs.chem.cmu.edu - 128.2.40.140 #afs2.chem.cmu.edu - >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. - 128.2.194.178 #cherry.srv.cs.cmu.edu - 128.2.194.179 #pumpkin.srv.cs.cmu.edu - 128.2.194.180 #strawberry.srv.cs.cmu.edu - >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. - 128.2.129.7 #porok.ece.cmu.edu - 128.2.129.8 #vicio.ece.cmu.edu - 128.2.129.9 #e-xing.ece.cmu.edu - >scotch.ece.cmu.edu #CMU ECE CALCM research group - 128.2.134.82 #lagavulin.ece.cmu.edu - >qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell - 204.194.25.7 #afs1.qatar.cmu.edu - 204.194.25.8 #afs2.qatar.cmu.edu - >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab - 128.2.56.129 #nihao.sbp.ri.cmu.edu - 128.2.56.136 #youtheman.sbp.ri.cmu.edu - >msc.cornell.edu #Cornell University Materials Science Center - 128.84.231.242 #miranda.ccmr.cornell.edu - 128.84.241.35 #co.ccmr.cornell.edu - 128.84.249.78 #dax.ccmr.cornell.edu - >dbic.dartmouth.edu #Dartmouth Brain Imaging Center - 129.170.30.143 #dbicafs1.dartmouth.edu - 129.170.30.144 #dbicafs2.dartmouth.edu - 129.170.30.145 #dbicafs3.dartmouth.edu - >northstar.dartmouth.edu #Dartmouth College Research Computing - 129.170.16.22 #halley.dartmouth.edu - 129.170.16.42 #oort.dartmouth.edu - 129.170.16.43 #cygnusx1.dartmouth.edu - >eecs.harvard.edu #Harvard - EECS - 140.247.60.61 #zermelo.eecs.harvard.edu - 140.247.60.83 #corfu.eecs.harvard.edu - >iastate.edu #Iowa State University - 129.186.1.243 #afsdb-1.iastate.edu - 129.186.6.243 #afsdb-2.iastate.edu - 129.186.142.243 #afsdb-3.iastate.edu - >athena.mit.edu #MIT/Athena cell - 18.7.1.66 #paris.mit.edu. - 18.7.1.74 #chimera.mit.edu. - 18.158.0.37 #prill.mit.edu. - >dev.mit.edu #MIT/IS Development cell - 18.7.1.70 #wham.mit.edu. - 18.7.15.89 #rattle.mit.edu. - 18.7.15.93 #hum.mit.edu. - >net.mit.edu #MIT/Network Group cell - 18.7.7.73 #gracie.mit.edu - 18.7.21.95 #george.mit.edu - >sipb.mit.edu #MIT/SIPB cell - 18.181.0.19 #reynelda.mit.edu. - 18.181.0.22 #rosebud.mit.edu. - 18.181.0.23 #ronald-ann.mit.edu. - >soap.mit.edu #MIT School Of Architecture & Planning - 18.89.1.204 #crypt.mit.edu - 18.89.1.209 #grotto.mit.edu - 18.89.2.156 #ac.mit.edu - >msu.edu #Michigan State University Main Cell - 35.9.7.10 #afsdb0.cl.msu.edu - >nd.edu #University of Notre Dame - 129.74.223.17 #john.helios.nd.edu - 129.74.223.33 #lizardo.helios.nd.edu - 129.74.223.65 #buckaroo.helios.nd.edu - >pitt.edu #University of Pittsburgh - 136.142.8.15 #afs09.srv.cis.pitt.edu - 136.142.8.20 #afs10.srv.cis.pitt.edu - 136.142.8.21 #afs11.srv.cis.pitt.edu - >cs.pitt.edu #University of Pittsburgh - Computer Science - 130.49.220.11 #afs01.cs.pitt.edu - 130.49.220.12 #afs02.cs.pitt.edu - 130.49.220.13 #afs03.cs.pitt.edu - >psc.edu #PSC (Pittsburgh Supercomputing Center) - 128.182.59.182 #shaggy.psc.edu - 128.182.66.184 #velma.psc.edu - 128.182.66.185 #daphne.psc.edu - >scoobydoo.psc.edu #PSC Test Cell - 128.182.59.181 #scooby.psc.edu - >cede.psu.edu #Penn State - Center for Engr. Design & Entrepeneurship - 146.186.218.10 #greenly.cede.psu.edu - 146.186.218.60 #b50.cede.psu.edu - 146.186.218.246 #stalin.cede.psu.edu - >rose-hulman.edu #Rose-Hulman Institute of Technology - 137.112.7.11 #afs1.rose-hulman.edu - 137.112.7.12 #afs2.rose-hulman.edu - 137.112.7.13 #afs3.rose-hulman.edu - >cs.rose-hulman.edu #Rose-Hulman CS Department - 137.112.40.10 #galaxy.cs.rose-hulman.edu - >rpi.edu #Rensselaer Polytechnic Institute - 128.113.22.11 #saul.server.rpi.edu - 128.113.22.12 #joab.server.rpi.edu - 128.113.22.13 #korah.server.rpi.edu - 128.113.22.14 #achan.server.rpi.edu - >hep.sc.edu #University of South Carolina, Dept. of Physics - 129.252.78.77 #cpeven.physics.sc.edu - >cs.stanford.edu #Stanford University Computer Science Department - 171.64.64.10 #cs-afs-1.Stanford.EDU - 171.64.64.66 #cs-afs-2.stanford.edu - 171.64.64.69 #cs-afs-3.stanford.edu - >ir.stanford.edu #Stanford University - 171.64.7.222 #afsdb1.stanford.edu - 171.64.7.234 #afsdb2.stanford.edu - 171.64.7.246 #afsdb3.stanford.edu - >slac.stanford.edu #Stanford Linear Accelerator Center - 134.79.18.25 #afsdb1.slac.stanford.edu - 134.79.18.26 #afsdb2.slac.stanford.edu - 134.79.18.27 #afsdb3.slac.stanford.edu - >cats.ucsc.edu #UC Santa Cruz, Comm. and Tech. Services, California U.S.A - 128.114.129.14 #elan.ucsc.edu - 128.114.129.15 #ichabod.ucsc.edu - 128.114.129.18 #maneki.ucsc.edu - >acm.uiuc.edu #ACM at the University of Illinois - 128.174.251.8 #alnitak.acm.uiuc.edu - 128.174.251.9 #alnilam.acm.uiuc.edu - 128.174.251.10 #mintaka.acm.uiuc.edu - >ncsa.uiuc.edu #University of Illinois - 141.142.3.5 #congo.ncsa.uiuc.edu - 141.142.3.8 #nile.ncsa.uiuc.edu - 141.142.3.9 #kaskaskia.ncsa.uiuc.edu - >umbc.edu #University of Maryland, Baltimore County - 130.85.24.23 #db2.afs.umbc.edu - 130.85.24.87 #db3.afs.umbc.edu - 130.85.24.101 #db1.afs.umbc.edu - >glue.umd.edu #University of Maryland - Project Glue - 128.8.70.11 #olmec.umd.edu - 128.8.236.4 #egypt.umd.edu - 128.8.236.230 #babylon.umd.edu - >wam.umd.edu #University of Maryland Network WAM Project - 128.8.70.9 #csc-srv.wam.umd.edu - 128.8.236.5 #avw-srv.wam.umd.edu - 128.8.236.231 #ptx-srv.wam.umd.edu - >umich.edu #University of Michigan - Campus - 141.211.1.32 #fear.ifs.umich.edu - 141.211.1.33 #surprise.ifs.umich.edu - 141.211.1.34 #ruthless.ifs.umich.edu - >atlas.umich.edu #ATLAS group cell in physics at University of Michigan - 141.211.43.102 #linat02.grid.umich.edu - 141.211.43.106 #linat06.grid.umich.edu - 141.211.43.109 #atgrid.grid.umich.edu - >citi.umich.edu #Center for Information Technology Integration - 141.211.133.5 #babylon.citi.umich.edu - >lsa.umich.edu #University of Michigan - College of LS&A - 141.211.211.53 #gerow.lsa.umich.edu - 141.211.211.72 #collines.lsa.umich.edu - 141.211.211.153 #hodges.lsa.umich.edu - >umr.edu #University of Missouri - Rolla - 131.151.1.59 #afsdb1.umr.edu - 131.151.1.70 #afsdb3.umr.edu - 131.151.1.146 #afsdb2.umr.edu - >physics.unc.edu #Univ. of NC at Chapel Hill, Dept. of Physics - 152.2.4.1 #who.physics.unc.edu - 152.2.4.3 #what.physics.unc.edu - 152.2.4.5 #when.physics.unc.edu - >uncc.edu #University of NC at Charlotte Mosaic AFS Cell - 152.15.10.70 #as-sm1.uncc.edu - 152.15.13.7 #as-sm2.uncc.edu - 152.15.30.27 #fs-kenn3.uncc.edu - >eng.utah.edu #University of Utah - Engineering - 155.99.222.9 #lenny.eng.utah.edu - 155.99.222.10 #carl.eng.utah.edu - >cs.uwm.edu #University of Wisconsin--Milwaukee - 129.89.38.124 #solomons.cs.uwm.edu - >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. - 128.105.132.14 #timon.cs.wisc.edu - 128.105.132.15 #pumbaa.cs.wisc.edu - 128.105.132.16 #zazu.cs.wisc.edu - >engr.wisc.edu #University of Wisconsin-Madison, College of Engineering - 144.92.13.14 #larry.cae.wisc.edu - 144.92.13.15 #curly.cae.wisc.edu - 144.92.13.16 #moe.cae.wisc.edu - >hep.wisc.edu #University of Wisconsin -- High Energy Physics - 128.104.28.219 #anise.hep.wisc.edu - >physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department - 128.104.160.13 #kendra.physics.wisc.edu - 128.104.160.14 #fray.physics.wisc.edu - 128.104.160.15 #buffy.physics.wisc.edu - >ciemat.es #Ciemat, Madrid, Spain - 130.206.11.42 #afsdb1.ciemat.es - 130.206.11.217 #afsdb2.ciemat.es - 130.206.11.247 #afsdb3.ciemat.es - >ifca.unican.es #Instituto de Fisica de Cantabria (IFCA), Santander, Spain - 193.144.209.20 #gridwall.ifca.unican.es - >ific.uv.es #Instituto de Fisica Corpuscular, Valencia, Spain - 147.156.163.11 #alpha.ific.uv.es - >biocenter.helsinki.fi #University of Helsinki, Institute of Biotechnology - 128.214.58.174 #afsdb1.biocenter.helsinki.fi - 128.214.88.114 #afsdb2.biocenter.helsinki.fi - >dapnia.saclay.cea.fr #CEA DAPNIA - 132.166.32.7 #dphrsg.saclay.cea.fr - 132.166.32.12 #dphrsl.saclay.cea.fr - >in2p3.fr #IN2P3 production cell - 134.158.232.11 #ccafsdb1.in2p3.fr - 134.158.232.12 #ccafsdb2.in2p3.fr - 134.158.232.13 #ccafsdb3.in2p3.fr - >anl.gov #Argonne National Laboratory - 146.137.96.33 #arteus.ctd.anl.gov - 146.137.162.88 #agamemnon.ctd.anl.gov - 146.137.194.80 #antenor.ctd.anl.gov - >rhic.bnl.gov #Relativistic Heavy Ion Collider - 130.199.6.51 #rafs03.rcf.bnl.gov - 130.199.6.52 #rafs02.rcf.bnl.gov - 130.199.6.69 #rafs01.rcf.bnl.gov - >usatlas.bnl.gov #US Atlas Tier 1 Facility at BNL - 130.199.48.32 #aafs01.usatlas.bnl.gov - 130.199.48.33 #aafs02.usatlas.bnl.gov - 130.199.48.34 #aafs03.usatlas.bnl.gov - >fnal.gov #Fermi National Acclerator Laboratory - 131.225.68.1 #fsus01.fnal.gov - 131.225.68.4 #fsus03.fnal.gov - 131.225.68.14 #fsus04.fnal.gov - >ic-afs.arc.nasa.gov #Code IC, Ames Research Center - 128.102.105.62 #udanax.arc.nasa.gov - >jpl.nasa.gov #Jet Propulsion Laboratory - 137.78.160.21 #afsdb08.jpl.nasa.gov - 137.78.160.22 #afsdb09.jpl.nasa.gov - 137.78.160.23 #afsdb10.jpl.nasa.gov - >nersc.gov #National Energy Research Supercomputer Center - 128.55.128.250 #mars.nersc.gov - 128.55.128.252 #alfred.nersc.gov - 128.55.128.254 #lurch.nersc.gov - >bme.hu #Budapest University of Technology and Economics - 152.66.241.6 #afs.iit.bme.hu - >kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H - 148.6.8.14 #afs.kfki.hu - >caspur.it #CASPUR Inter-University Computing Consortium, Rome - 193.204.5.45 #pomodoro.caspur.it - 193.204.5.46 #banana.caspur.it - 193.204.5.50 #maslo.caspur.it - >enea.it #ENEA New Tech. Energy & Environment Agency, Italy - 192.107.54.5 #aixfs.frascati.enea.it - 192.107.54.11 #rs2ced.frascati.enea.it - 192.107.54.12 #43p.frascati.enea.it - 192.107.61.235 #serverinfo02.bologna.enea.it - 192.107.71.6 #glauco.casaccia.enea.it - 192.107.96.233 #riscdb.trisaia.enea.it - >fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy - 192.107.90.2 #fusafs1.frascati.enea.it - 192.107.90.3 #fusafs2.frascati.enea.it - 192.107.90.4 #fusafs3.frascati.enea.it - >icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy - 193.204.6.130 #icembfs.caspur.it - >infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia - 131.154.1.7 #afscnaf.infn.it - 141.108.26.75 #afsrm1.roma1.infn.it - 192.84.134.75 #afsna.na.infn.it - >ba.infn.it #INFN, Sezione di Bari - 193.206.185.235 #baafsserver.ba.infn.it - >kloe.infn.it #INFN, KLOE experiment at Laboratori di Frascati - 192.135.25.111 #kloeafs1.lnf.infn.it - 192.135.25.112 #kloeafs2.lnf.infn.it - >le.infn.it #INFN, Sezione di Lecce - 192.84.152.40 #afs01.le.infn.it - 192.84.152.148 #afs02.le.infn.it - >lnf.infn.it #INFN, Laboratori Nazionali di Frascati - 193.206.84.121 #afs1.lnf.infn.it - 193.206.84.122 #afs2.lnf.infn.it - 193.206.84.123 #afs3.lnf.infn.it - >lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso - 192.84.135.21 #rsgs05.lngs.infn.it - >pi.infn.it #INFN, Sezione di Pisa - 131.114.134.26 #unknownhost.pi.infn.it - 192.84.133.50 #aix1.pi.infn.it - >psm.it #Progetto San Marco, Universita' di Roma-1 - 151.100.1.65 #atlante.psm.uniroma1.it - >tgrid.it #CASPUR-CILEA-CINECA Grid Cell - 193.204.5.33 #cccgrid.caspur.it - >ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC - 140.105.16.8 #fs1.ictp.trieste.it - 140.105.16.9 #fs2.ictp.trieste.it - >math.unifi.it #math.unifi.it - 150.217.34.182 #xeno.math.unifi.it - >ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria - 151.100.85.253 #alfa.ing.uniroma1.it - >dia.uniroma3.it #University Roma Tre - DIA - 193.204.161.79 #plm.dia.uniroma3.it - 193.204.161.118 #afs.dia.uniroma3.it - >vn.uniroma3.it #University of Rome 3, Area Vasca Navale - 193.204.161.136 #alfa.dia.uniroma3.it - 193.204.161.137 #beta.dia.uniroma3.it - 193.204.161.138 #gamma.dia.uniroma3.it - >italia #Italian public AFS cell - 193.204.5.9 #afs.caspur.it - >cmf.nrl.navy.mil #Naval Research Lab - CCS - 134.207.10.68 #picard.cmf.nrl.navy.mil - 134.207.10.69 #riker.cmf.nrl.navy.mil - 134.207.10.70 #kirk.cmf.nrl.navy.mil - >lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics - 132.250.114.2 #afs1.lcp.nrl.navy.mil - 132.250.114.4 #afs2.lcp.nrl.navy.mil - 132.250.114.6 #afs3.lcp.nrl.navy.mil - >es.net #Energy Sciences Net - 198.128.3.21 #fs1.es.net - 198.128.3.22 #fs2.es.net - 198.128.3.23 #fs3.es.net - >laroia.net #Laroia Networks - 66.66.102.254 #supercore.laroia.net - >sinenomine.net #Sine Nomine Associates - 66.92.236.139 #afs.sinenomine.net - >slackers.net #The Slackers' Network - 63.201.48.27 #alexandria.slackers.net - >tproa.net #The People's Republic of Ames - 209.234.76.70 #service-3.tproa.net - >nikhef.nl #The Dutch National Institute for High Energy Physics - 192.16.185.26 #afs1.nikhef.nl - 192.16.185.27 #afs2.nikhef.nl - >1ts.org #1TS.ORG, Cambridge, MA - 4.36.43.102 #dol-guldur.1ts.org - 69.25.196.51 #pancake.1ts.org - >bazquux.org #Baz Quux Organization - 66.207.142.196 #baxquux.org - >coed.org #Adam Pennington's Cell - 66.93.61.184 #vice1.coed.org - 128.237.157.35 #vice3.coed.org - >dementia.org #Dementia Unlimited - 128.2.12.45 #alycia.dementia.org - 128.2.120.216 #meredith.dementia.org - >hackish.org #Hackish.org - 24.167.65.213 #avatar.sys.hackish.org - 128.2.120.138 #kurma.sys.hackish.org - >idahofuturetruck.org #University of Idaho hybrid vehicle development - 12.18.238.210 #dsle210.fsr.net - >nimlabs.org #Nimlabs, Ink. Cell. - 18.238.1.103 #olfin.nimlabs.org - 18.238.1.105 #caerbanog.nimlabs.org - >nomh.org #nomh.org - 204.29.154.12 #iota.nomh.org - 204.29.154.32 #adversity.xi.nomh.org - >oc7.org #The OC7 Project - 128.2.122.140 #knife.oc7.org - 207.22.77.170 #spoon.oc7.org - >openafs.org #OpenAFS Project - 18.7.14.88 #grand-opening.mit.edu - 128.2.191.224 #penn.central.org - 130.237.48.87 #andrew.e.kth.se - >e.kth.se #Royal Institute of Technology, Elektro - 130.237.32.145 #sonen.e.kth.se - 130.237.48.7 #anden.e.kth.se - 130.237.48.244 #fadern.e.kth.se - >hallf.kth.se #Royal Institute of Technology, HALLF - 130.237.24.141 #rasmus13.hallf.kth.se - 130.237.24.152 #rasmus3.hallf.kth.se - 130.237.24.177 #rasmus29.hallf.kth.se - >isk.kth.se #Royal Institute of Technology, ISK - 130.237.202.12 #afsdb2.isk.kth.se - 130.237.206.13 #afsdb1.isk.kth.se - 130.237.209.141 #afsdb3.isk.kth.se - >it.kth.se #Royal Institute of Technology, IT - 130.237.212.15 #ptah.it.kth.se - 130.237.212.16 #toth.it.kth.se - 130.237.215.7 #isis.it.kth.se - >md.kth.se #Royal Institute of Technology, MMK - 130.237.57.68 #trinity.md.kth.se - 130.237.57.72 #morpheus.md.kth.se - 130.237.67.230 #neo.speech.kth.se - >mech.kth.se #Royal Institute of Technology, MECH - 130.237.233.142 #matterhorn.mech.kth.se - 130.237.233.143 #castor.mech.kth.se - 130.237.233.144 #pollux.mech.kth.se - >nada.kth.se #Royal Institute of Technology, NADA - 130.237.222.20 #kosmos.nada.kth.se - 130.237.223.12 #sputnik.nada.kth.se - 130.237.224.78 #mir.nada.kth.se - 130.237.227.23 #gagarin.nada.kth.se - 130.237.228.28 #laika.nada.kth.se - >pdc.kth.se #Royal Institute of Technology, PDC - 130.237.232.29 #crab.pdc.kth.se - 130.237.232.112 #anna.pdc.kth.se - 130.237.232.114 #hokkigai.pdc.kth.se - >stacken.kth.se #Stacken Computer Club - 130.237.234.3 #milko.stacken.kth.se - 130.237.234.43 #hot.stacken.kth.se - 130.237.237.230 #fishburger.stacken.kth.se - >syd.kth.se #Royal Institute of Technology, KTH-Syd - 130.237.83.23 #afs.haninge.kth.se - >physto.se #Physics department Stockholm University - 130.237.205.36 #sysafs1.physto.se - 130.237.205.72 #sysafs2.physto.se - >sanchin.se #Sanchin Consulting AB, Sweden - 192.195.148.10 #sesan.sanchin.se - >su.se #Stockholm University - 130.237.162.81 #afsdb1.su.se - 130.237.162.82 #afsdb2.su.se - 130.237.162.230 #afsdb3.su.se - >f9.ijs.si #F9, Jozef Stefan Institue - 194.249.156.1 #brenta.ijs.si - >p-ng.si #Nova Gorica Polytechnic - 193.2.120.2 #solkan.p-ng.si - >phy.bris.ac.uk #Bristol University - phyics - 137.222.58.9 #afs1.phy.bris.ac.uk - >hep.man.ac.uk #Manchester HEP - 194.36.2.3 #afs1.hep.man.ac.uk - 194.36.2.4 #afs2.hep.man.ac.uk - 194.36.2.5 #afs3.hep.man.ac.uk - >rl.ac.uk #Rutherford Appleton Lab, England - 130.246.183.164 #wallace.cc.rl.ac.uk - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm - openafs-fileserver: non-standard-dir-perm --- 0 ---- Index: openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB diff -c openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB:1.3.4.3 openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB:removed *** openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB:1.3.4.3 Thu Jul 5 19:47:44 2007 --- openafs/src/packaging/HP-UX/files/usr/vice/etc/CellServDB Thu Sep 20 01:06:54 2007 *************** *** 1,589 **** - >grand.central.org #GCO Public CellServDB 05 Jul 2007 - 18.92.0.108 #grand-opening.mit.edu - 128.2.203.61 #penn.central.org - 130.237.48.87 #andrew.e.kth.se - >wu-wien.ac.at #University of Economics, Vienna, Austria - 137.208.3.33 #goya.wu-wien.ac.at - 137.208.7.57 #caravaggio.wu-wien.ac.at - 137.208.127.57 #vermeer.wu-wien.ac.at - >hephy.at #hephy-vienna - 193.170.243.10 #mowgli.oeaw.ac.at - 193.170.243.12 #baloo.oeaw.ac.at - 193.170.243.14 #akela.oeaw.ac.at - >cgv.tugraz.at #CGV cell - 129.27.224.133 #phobos.cgv.tugraz.at - 129.27.224.134 #deimos.cgv.tugraz.at - 129.27.224.210 #trinculo.cgv.tugraz.at - >itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus - 129.27.161.7 #faepafs1.tu-graz.ac.at - 129.27.161.15 #faepafs2.tu-graz.ac.at - 129.27.161.114 #faepafs3.tu-graz.ac.at - >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi - 132.216.24.122 #germain.sums.math.mcgill.ca - 132.216.24.125 #turing.sums.math.mcgill.ca - >cern.ch #European Laboratory for Particle Physics, Geneva - 137.138.128.148 #afsdb1.cern.ch - 137.138.246.50 #afsdb3.cern.ch - 137.138.246.51 #afsdb2.cern.ch - >ams.cern.ch #AMS Experiment - 137.138.188.185 #ams.cern.ch - 137.138.199.58 #pcamsf4.cern.ch - >epfl.ch #Swiss Federal Institute of Technology at Lausanne - 128.178.109.111 #kd1.epfl.ch - 128.178.109.112 #kd2.epfl.ch - 128.178.109.113 #kd3.epfl.ch - >ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland - 129.132.97.19 #amalthea.ethz.ch - 129.132.97.27 #nethzafs-001.ethz.ch - 129.132.115.3 #himalia.ethz.ch - 129.132.115.37 #nethzafs-005.ethz.ch - 129.132.115.38 #nethzafs-006.ethz.ch - >psi.ch #Paul Scherrer Institut - Villigen, Switzerland - 129.129.190.140 #afs00.psi.ch - 129.129.190.141 #afs01.psi.ch - 129.129.190.142 #afs02.psi.ch - >extundo.com #Simon Josefsson's cell - 195.42.214.241 #slipsten.extundo.com - >membrain.com #membrain.com - 66.93.118.125 #stormy - 130.85.24.11 #weasel - 130.85.24.13 #straykitten - >midnightlinux.com #Midnight Linux, Pittsburgh PA - 208.10.142.82 #outpost.midnightlinux.com - >setfilepointer.com #SetFilePointer.com - 63.224.10.2 #hamlet.SetFilePointer.com - 63.224.10.4 #troilus.SetFilePointer.com - >sodre.cx #Sodre.cx - 128.8.140.165 #greed.sodre.cx - >desy.de #Deutsches Elektronen-Synchrotron - 131.169.40.62 #vayu.desy.de - 131.169.244.60 #solar00.desy.de - >gppc.de #GPP Chemnitz mbH - 213.187.92.33 #gpp1.gppc.de - 213.187.92.34 #paulchen.gppc.de - 213.187.92.35 #lotus.gppc.de - >ifh.de #DESY Zeuthen - 141.34.22.10 #romulus.ifh.de - 141.34.22.11 #remus.ifh.de - 141.34.22.29 #hekate.ifh.de - >lrz-muenchen.de #Leibniz Computing Centre, Germany - 129.187.10.36 #afs1.lrz-muenchen.de - 129.187.10.56 #afs3.lrz-muenchen.de - 129.187.10.57 #afs2.lrz-muenchen.de - >ipp-garching.mpg.de #Institut fuer Plasmaphysik - 130.183.9.5 #afs-db1.rzg.mpg.de - 130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de - 130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de - >mpe.mpg.de #MPE cell - 130.183.130.7 #irafs1.mpe-garching.mpg.de - 130.183.134.20 #irafs2.mpe-garching.mpg.de - >i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen - 137.226.244.79 #remus.informatik.rwth-aachen.de - >tu-bs.de #Technical University of Braunschweig, Germany - 134.169.1.1 #rzafs1.rz.tu-bs.de - 134.169.1.5 #rzafs2.rz.tu-bs.de - 134.169.1.6 #rzafs3.rz.tu-bs.de - >tu-chemnitz.de #Technische Universitaet Chemnitz, Germany - 134.109.2.1 #zuse.hrz.tu-chemnitz.de - 134.109.2.15 #phoenix.hrz.tu-chemnitz.de - 134.109.200.7 #aetius.hrz.tu-chemnitz.de - >e18.ph.tum.de #Experimental Physics, TU Munich, Germany - 129.187.154.223 #hamlet.e18.physik.tu-muenchen.de - >uni-bonn.de #University of Bonn, Computing Center - 131.220.14.198 #work15-eth.rhrz.uni-bonn.de - 131.220.14.205 #node05.rhrz.uni-bonn.de - 131.220.15.197 #afs-db1.rhrz.uni-bonn.de - >atlass01.physik.uni-bonn.de #Bonn ATLAS - 131.220.165.43 #atlass01.physik.uni-bonn.de - >uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg - 132.230.6.235 #sv6.ruf.uni-freiburg.de - 132.230.6.236 #sv7.ruf.uni-freiburg.de - 132.230.6.237 #sv8.ruf.uni-freiburg.de - >physik.uni-freiburg.de #institute of physics, university Freiburg, Germany - 132.230.77.16 #hepafs.physik.uni-freiburg.de - >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) - 129.206.119.10 #afsdb.urz.uni-heidelberg.de - 129.206.119.16 #afsdb1.urz.uni-heidelberg.de - 129.206.119.17 #afsdb2.urz.uni-heidelberg.de - >uni-hohenheim.de #University of Hohenheim - 144.41.2.2 #rs13.serv.uni-hohenheim.de - 144.41.2.3 #rs14.serv.uni-hohenheim.de - 144.41.2.4 #rs15.serv.uni-hohenheim.de - >rz.uni-jena.de #Rechenzentrum University of Jena, Germany - 141.35.2.180 #afs00.rz.uni-jena.de - 141.35.2.181 #afs01.rz.uni-jena.de - 141.35.2.182 #afs02.rz.uni-jena.de - >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. - 134.95.80.39 #forano.meteo.uni-koeln.de - >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology - 134.95.144.22 #afs1.meteo.uni-koeln.de - 134.95.144.24 #afs2.meteo.uni-koeln.de - >rrz.uni-koeln.de #University of Cologne - Reg Comp Center - 134.95.19.3 #afsdb1.rrz.uni-koeln.de - 134.95.19.10 #lyra.rrz.uni-koeln.de - 134.95.67.97 #afs.thp.uni-koeln.de - 134.95.141.243 #agrippina.rrz.uni-koeln.de - >physik.uni-mainz.de #institute of physics, university Mainz, Germany - 134.93.130.93 #hardy.physik.uni-mainz.de - >uni-mannheim.de #Uni Mannheim (Rechenzentrum) - 134.155.97.204 #afsdb1.uni-mannheim.de - 134.155.97.205 #afsdb2.uni-mannheim.de - 134.155.97.206 #afsdb3.uni-mannheim.de - >uni-paderborn.de #University of Paderborn, Germany - 131.234.137.10 #afsdb1.uni-paderborn.de - 131.234.137.11 #afsdb2.uni-paderborn.de - 131.234.137.12 #afsdb3.uni-paderborn.de - >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal - 132.195.104.3 #afs1.physik.uni-wuppertal.de - 132.195.104.230 #afs2.physik.uni-wuppertal.de - >s-et.aau.dk #Aalborg Univ., The Student Society, Denmark - 130.225.196.22 #afs.s-et.aau.dk - >ies.auc.dk #Aalborg Univ., Inst. of Electronic Systems, Denmark - 130.225.51.73 #afsdb1.kom.auc.dk - 130.225.51.74 #afsdb2.kom.auc.dk - 130.225.51.85 #afsdb3.kom.auc.dk - >asu.edu #Arizona State University - 129.219.10.69 #authen2.asu.edu - 129.219.10.70 #authen1.asu.edu - 129.219.10.72 #authen3.asu.edu - 129.219.100.16 #authen4.asu.edu - >hep.caltech.edu #CalTech High Energy Physics - 131.215.126.150 #afs.hep.caltech.edu - >clarkson.edu #Clarkson University, Potsdam, New York USA - 128.153.1.111 #arthur.clarkson.edu - 128.153.9.111 #lancelot.clarkson.edu - 128.153.17.111 #uther.clarkson.edu - >andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell - 128.2.10.2 #vice2.fs.andrew.cmu.edu - 128.2.10.7 #vice7.fs.andrew.cmu.edu - 128.2.10.11 #vice11.fs.andrew.cmu.edu - 128.2.10.28 #vice28.fs.andrew.cmu.edu - 128.2.32.44 #new-vice12.fs.andrew.cmu.edu - >club.cc.cmu.edu #Carnegie Mellon University Computer Club - 128.237.157.11 #sodium.club.cc.cmu.edu - 128.237.157.13 #potassium.club.cc.cmu.edu - >chem.cmu.edu #Carnegie Mellon University - Chemistry Dept. - 128.2.40.134 #afs.chem.cmu.edu - 128.2.40.140 #afs2.chem.cmu.edu - >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. - 128.2.201.46 #strawberry.srv.cs.cmu.edu - 128.2.201.47 #pumpkin.srv.cs.cmu.edu - 128.2.201.48 #cherry.srv.cs.cmu.edu - >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. - 128.2.129.7 #porok.ece.cmu.edu - 128.2.129.8 #vicio.ece.cmu.edu - 128.2.129.9 #e-xing.ece.cmu.edu - >scotch.ece.cmu.edu #CMU ECE CALCM research group - 128.2.134.82 #lagavulin.ece.cmu.edu - >qatar.cmu.edu #Carnegie Mellon University - Qatar - 86.36.46.6 #afs1.qatar.cmu.edu - 86.36.46.7 #afs2.qatar.cmu.edu - >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab - 128.2.179.12 #nihao.sbp.ri.cmu.edu - 128.2.179.113 #youtheman.sbp.ri.cmu.edu - >cnf.cornell.edu #CNF - 128.253.198.9 #hole.cnf.cornell.edu - 128.253.198.27 #smoke.cnf.cornell.edu - >msc.cornell.edu #Cornell University Materials Science Center - 128.84.231.242 #miranda.ccmr.cornell.edu - 128.84.241.35 #co.ccmr.cornell.edu - 128.84.249.78 #dax.ccmr.cornell.edu - >dbic.dartmouth.edu #Dartmouth Brain Imaging Center - 129.170.30.143 #dbicafs1.dartmouth.edu - 129.170.30.144 #dbicafs2.dartmouth.edu - 129.170.30.145 #dbicafs3.dartmouth.edu - >northstar.dartmouth.edu #Dartmouth College Research Computing - 129.170.16.22 #halley.dartmouth.edu - 129.170.16.42 #oort.dartmouth.edu - 129.170.16.43 #cygnusx1.dartmouth.edu - >cs.fhm.edu #Department Computer Science Munich University Of Applied Science - 129.187.208.2 #srv1.informatik.fh-muenchen.de - >eecs.harvard.edu #Harvard - EECS - 140.247.60.61 #zermelo.eecs.harvard.edu - 140.247.60.83 #corfu.eecs.harvard.edu - >iastate.edu #Iowa State University - 129.186.1.243 #afsdb-1.iastate.edu - 129.186.6.243 #afsdb-2.iastate.edu - 129.186.142.243 #afsdb-3.iastate.edu - >athena.mit.edu #MIT/Athena cell - 18.7.1.66 #paris.mit.edu. - 18.7.1.74 #chimera.mit.edu. - 18.158.0.37 #prill.mit.edu. - >dev.mit.edu #MIT/IS Development cell - 18.7.1.70 #wham.mit.edu. - 18.92.1.219 #click.mit.edu. - 18.92.1.220 #whirr.mit.edu. - >net.mit.edu #MIT/Network Group cell - 18.7.7.73 #gracie.mit.edu - 18.7.21.95 #george.mit.edu - >sipb.mit.edu #MIT/SIPB cell - 18.181.0.19 #reynelda.mit.edu. - 18.181.0.22 #rosebud.mit.edu. - 18.181.0.23 #ronald-ann.mit.edu. - >soap.mit.edu #MIT School Of Architecture & Planning - 18.89.1.204 #crypt.mit.edu - 18.89.1.209 #grotto.mit.edu - 18.89.2.156 #ac.mit.edu - >msu.edu #Michigan State University Main Cell - 35.9.7.10 #afsdb0.cl.msu.edu - >nd.edu #University of Notre Dame - 129.74.223.17 #john.helios.nd.edu - 129.74.223.33 #lizardo.helios.nd.edu - 129.74.223.65 #buckaroo.helios.nd.edu - >pitt.edu #University of Pittsburgh - 136.142.8.15 #afs09.srv.cis.pitt.edu - 136.142.8.20 #afs10.srv.cis.pitt.edu - 136.142.8.21 #afs11.srv.cis.pitt.edu - >cs.pitt.edu #University of Pittsburgh - Computer Science - 130.49.220.11 #afs01.cs.pitt.edu - 130.49.220.12 #afs02.cs.pitt.edu - 130.49.220.13 #afs03.cs.pitt.edu - >psc.edu #PSC (Pittsburgh Supercomputing Center) - 128.182.59.182 #shaggy.psc.edu - 128.182.66.184 #velma.psc.edu - 128.182.66.185 #daphne.psc.edu - >scoobydoo.psc.edu #PSC Test Cell - 128.182.59.181 #scooby.psc.edu - >cede.psu.edu #Penn State - Center for Engr. Design & Entrepeneurship - 146.186.218.10 #greenly.cede.psu.edu - 146.186.218.60 #b50.cede.psu.edu - 146.186.218.246 #stalin.cede.psu.edu - >rose-hulman.edu #Rose-Hulman Institute of Technology - 137.112.7.11 #afs1.rose-hulman.edu - 137.112.7.12 #afs2.rose-hulman.edu - 137.112.7.13 #afs3.rose-hulman.edu - >cs.rose-hulman.edu #Rose-Hulman CS Department - 137.112.40.10 #galaxy.cs.rose-hulman.edu - >rpi.edu #Rensselaer Polytechnic Institute - 128.113.22.11 #saul.server.rpi.edu - 128.113.22.12 #joab.server.rpi.edu - 128.113.22.13 #korah.server.rpi.edu - 128.113.22.14 #achan.server.rpi.edu - >hep.sc.edu #University of South Carolina, Dept. of Physics - 129.252.78.77 #cpeven.physics.sc.edu - >cs.stanford.edu #Stanford University Computer Science Department - 171.64.64.10 #cs-afs-1.Stanford.EDU - 171.64.64.66 #cs-afs-2.stanford.edu - 171.64.64.69 #cs-afs-3.stanford.edu - >ir.stanford.edu #Stanford University - 171.64.7.222 #afsdb1.stanford.edu - 171.64.7.234 #afsdb2.stanford.edu - 171.64.7.246 #afsdb3.stanford.edu - >slac.stanford.edu #Stanford Linear Accelerator Center - 134.79.18.25 #afsdb1.slac.stanford.edu - 134.79.18.26 #afsdb2.slac.stanford.edu - 134.79.18.27 #afsdb3.slac.stanford.edu - >ucdavis.edu #University of California at Davis - 169.237.104.100 #afs1.ucdavis.edu - 169.237.235.176 #afs2.ucdavis.edu - 169.237.247.91 #afs3.ucdavis.edu - >home.ucdavis.edu #University of California at Davis home directories - 169.237.105.91 #home1.ucdavis.edu - 169.237.105.92 #home2.ucdavis.edu - 169.237.105.93 #home3.ucdavis.edu - >physics.ucsb.edu #UC Santa Barbara, Physics Dept - 128.111.18.161 #ledzeppelin.physics.ucsb.edu - >cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A - 128.114.123.14 #elan.ucsc.edu - 128.114.123.15 #ichabod.ucsc.edu - 128.114.123.18 #maneki.ucsc.edu - >acm.uiuc.edu #ACM at the University of Illinois - 128.174.251.8 #alnitak.acm.uiuc.edu - 128.174.251.9 #alnilam.acm.uiuc.edu - 128.174.251.10 #mintaka.acm.uiuc.edu - >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory - 128.174.193.200 #ial.illigal.uiuc.edu - 128.174.193.201 #cac.illigal.uiuc.edu - 128.174.193.202 #gcs.illigal.uiuc.edu - >ncsa.uiuc.edu #University of Illinois - 141.142.3.5 #congo.ncsa.uiuc.edu - 141.142.3.8 #nile.ncsa.uiuc.edu - 141.142.3.9 #kaskaskia.ncsa.uiuc.edu - >umbc.edu #University of Maryland, Baltimore County - 130.85.24.23 #db2.afs.umbc.edu - 130.85.24.87 #db3.afs.umbc.edu - 130.85.24.101 #db1.afs.umbc.edu - >glue.umd.edu #University of Maryland - Project Glue - 128.8.70.11 #olmec.umd.edu - 128.8.236.4 #egypt.umd.edu - 128.8.236.230 #babylon.umd.edu - >wam.umd.edu #University of Maryland Network WAM Project - 128.8.70.9 #csc-srv.wam.umd.edu - 128.8.236.5 #avw-srv.wam.umd.edu - 128.8.236.231 #ptx-srv.wam.umd.edu - >umich.edu #University of Michigan - Campus - 141.211.1.32 #fear.ifs.umich.edu - 141.211.1.33 #surprise.ifs.umich.edu - 141.211.1.34 #ruthless.ifs.umich.edu - >atlas.umich.edu #ATLAS group cell in physics at University of Michigan - 141.211.43.102 #linat02.grid.umich.edu - 141.211.43.103 #linat03.grid.umich.edu - 141.211.43.104 #linat04.grid.umich.edu - >citi.umich.edu #Center for Information Technology Integration - 141.211.133.5 #babylon.citi.umich.edu - >lsa.umich.edu #University of Michigan - College of LS&A - 141.211.211.53 #gerow.lsa.umich.edu - 141.211.211.72 #collines.lsa.umich.edu - 141.211.211.153 #hodges.lsa.umich.edu - >sph.umich.edu #University of Michigan -- School of Public Health - 141.211.51.137 #afssph7.sph.umich.edu - 141.211.51.139 #afssph0.sph.umich.edu - 141.211.51.142 #afssph6.sph.umich.edu - >isis.unc.edu #Univ. of NC at Chapel Hill - ITS - 152.2.1.5 #db0.isis.unc.edu - 152.2.1.6 #db1.isis.unc.edu - 152.2.1.7 #db2.isis.unc.edu - >physics.unc.edu #Univ. of NC at Chapel Hill, Dept. of Physics - 152.2.4.1 #who.physics.unc.edu - 152.2.4.3 #what.physics.unc.edu - 152.2.4.5 #when.physics.unc.edu - >uncc.edu #University of NC at Charlotte Mosaic AFS Cell - 152.15.10.70 #as-sm1.uncc.edu - 152.15.93.186 #as-ece1.uncc.edu - 152.15.181.175 #as-me1.uncc.edu - >eng.utah.edu #University of Utah - Engineering - 155.98.111.9 #lenny.eng.utah.edu - 155.98.111.10 #carl.eng.utah.edu - >cs.uwm.edu #University of Wisconsin--Milwaukee - 129.89.38.124 #solomons.cs.uwm.edu - >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. - 128.105.132.14 #timon.cs.wisc.edu - 128.105.132.15 #pumbaa.cs.wisc.edu - 128.105.132.16 #zazu.cs.wisc.edu - >engr.wisc.edu #University of Wisconsin-Madison, College of Engineering - 144.92.13.14 #larry.cae.wisc.edu - 144.92.13.15 #curly.cae.wisc.edu - 144.92.13.16 #moe.cae.wisc.edu - >hep.wisc.edu #University of Wisconsin -- High Energy Physics - 128.104.28.219 #anise.hep.wisc.edu - >physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department - 128.104.160.13 #kendra.physics.wisc.edu - 128.104.160.14 #fray.physics.wisc.edu - 128.104.160.15 #buffy.physics.wisc.edu - >ciemat.es #Ciemat, Madrid, Spain - 130.206.11.42 #afsdb1.ciemat.es - 130.206.11.217 #afsdb2.ciemat.es - 130.206.11.247 #afsdb3.ciemat.es - >ifca.unican.es #Instituto de Fisica de Cantabria (IFCA), Santander, Spain - 193.144.209.20 #gridwall.ifca.unican.es - >ific.uv.es #Instituto de Fisica Corpuscular, Valencia, Spain - 147.156.163.11 #alpha.ific.uv.es - >biocenter.helsinki.fi #University of Helsinki, Institute of Biotechnology - 128.214.58.174 #afsdb1.biocenter.helsinki.fi - 128.214.88.114 #afsdb2.biocenter.helsinki.fi - >dapnia.saclay.cea.fr #CEA DAPNIA - 132.166.32.7 #dphrsg.saclay.cea.fr - 132.166.32.12 #dphrsl.saclay.cea.fr - >grif.fr #GRIF cell - 192.54.208.18 #node03.datagrid.cea.fr - >in2p3.fr #IN2P3 production cell - 134.158.232.11 #ccafsdb1.in2p3.fr - 134.158.232.12 #ccafsdb2.in2p3.fr - 134.158.232.13 #ccafsdb3.in2p3.fr - >anl.gov #Argonne National Laboratory - 146.137.96.33 #arteus.ctd.anl.gov - 146.137.162.88 #agamemnon.ctd.anl.gov - 146.137.194.80 #antenor.ctd.anl.gov - >rhic.bnl.gov #Relativistic Heavy Ion Collider - 130.199.6.51 #rafs03.rcf.bnl.gov - 130.199.6.52 #rafs02.rcf.bnl.gov - 130.199.6.69 #rafs01.rcf.bnl.gov - >usatlas.bnl.gov #US Atlas Tier 1 Facility at BNL - 130.199.48.32 #aafs01.usatlas.bnl.gov - 130.199.48.33 #aafs02.usatlas.bnl.gov - 130.199.48.34 #aafs03.usatlas.bnl.gov - >fnal.gov #Fermi National Acclerator Laboratory - 131.225.68.1 #fsus01.fnal.gov - 131.225.68.4 #fsus03.fnal.gov - 131.225.68.14 #fsus04.fnal.gov - >ic-afs.arc.nasa.gov #Code IC, Ames Research Center - 128.102.105.62 #udanax.arc.nasa.gov - >jpl.nasa.gov #Jet Propulsion Laboratory - 137.78.160.21 #afsdb08.jpl.nasa.gov - 137.78.160.22 #afsdb09.jpl.nasa.gov - 137.78.160.23 #afsdb10.jpl.nasa.gov - >nersc.gov #National Energy Research Supercomputer Center - 128.55.128.250 #mars.nersc.gov - 128.55.128.252 #alfred.nersc.gov - 128.55.128.254 #lurch.nersc.gov - >bme.hu #Budapest University of Technology and Economics - 152.66.241.6 #afs.iit.bme.hu - >kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H - 148.6.8.14 #afs.kfki.hu - >caspur.it #CASPUR Inter-University Computing Consortium, Rome - 193.204.5.45 #pomodoro.caspur.it - 193.204.5.46 #banana.caspur.it - 193.204.5.50 #maslo.caspur.it - >enea.it #ENEA New Tech. Energy & Environment Agency, Italy - 192.107.54.5 #aixfs.frascati.enea.it - 192.107.54.11 #rs2ced.frascati.enea.it - 192.107.54.12 #43p.frascati.enea.it - 192.107.61.235 #serverinfo02.bologna.enea.it - 192.107.71.6 #glauco.casaccia.enea.it - 192.107.96.233 #riscdb.trisaia.enea.it - >fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy - 192.107.90.2 #fusafs1.frascati.enea.it - 192.107.90.3 #fusafs2.frascati.enea.it - 192.107.90.4 #fusafs3.frascati.enea.it - >icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy - 193.204.6.130 #icembfs.caspur.it - >infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia - 131.154.1.7 #afscnaf.infn.it - 141.108.26.75 #afsrm1.roma1.infn.it - 192.84.134.75 #afsna.na.infn.it - >ba.infn.it #INFN, Sezione di Bari - 193.206.185.235 #baafsserver.ba.infn.it - 193.206.185.236 #debsrv.ba.infn.it - >kloe.infn.it #INFN, KLOE experiment at Laboratori di Frascati - 192.135.25.111 #kloeafs1.lnf.infn.it - 192.135.25.112 #kloeafs2.lnf.infn.it - >le.infn.it #INFN, Sezione di Lecce - 192.84.152.40 #afs01.le.infn.it - 192.84.152.148 #afs02.le.infn.it - >lnf.infn.it #INFN, Laboratori Nazionali di Frascati - 193.206.84.121 #afs1.lnf.infn.it - 193.206.84.122 #afs2.lnf.infn.it - 193.206.84.123 #afs3.lnf.infn.it - >lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso - 192.84.135.21 #rsgs05.lngs.infn.it - >pi.infn.it #INFN, Sezione di Pisa - 131.114.134.26 #unknownhost.pi.infn.it - 192.84.133.50 #aix1.pi.infn.it - >psm.it #Progetto San Marco, Universita' di Roma-1 - 151.100.1.65 #atlante.psm.uniroma1.it - >tgrid.it #CASPUR-CILEA-CINECA Grid Cell - 193.204.5.33 #cccgrid.caspur.it - >ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC - 140.105.16.8 #fs1.ictp.trieste.it - 140.105.16.9 #fs2.ictp.trieste.it - >math.unifi.it #math.unifi.it - 150.217.34.182 #xeno.math.unifi.it - >ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria - 151.100.85.253 #alfa.ing.uniroma1.it - >dia.uniroma3.it #University Roma Tre - DIA - 193.204.161.79 #plm.dia.uniroma3.it - 193.204.161.118 #afs.dia.uniroma3.it - >vn.uniroma3.it #University of Rome 3, Area Vasca Navale - 193.204.161.136 #alfa.dia.uniroma3.it - 193.204.161.137 #beta.dia.uniroma3.it - 193.204.161.138 #gamma.dia.uniroma3.it - >italia #Italian public AFS cell - 193.204.5.9 #afs.caspur.it - >cmf.nrl.navy.mil #Naval Research Lab - CCS - 134.207.10.68 #picard.cmf.nrl.navy.mil - 134.207.10.69 #riker.cmf.nrl.navy.mil - 134.207.10.70 #kirk.cmf.nrl.navy.mil - >lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics - 132.250.114.2 #afs1.lcp.nrl.navy.mil - 132.250.114.4 #afs2.lcp.nrl.navy.mil - 132.250.114.6 #afs3.lcp.nrl.navy.mil - >es.net #Energy Sciences Net - 198.128.3.21 #fs1.es.net - 198.128.3.22 #fs2.es.net - 198.128.3.23 #fs3.es.net - >laroia.net #Laroia Networks - 66.66.102.254 #supercore.laroia.net - >sinenomine.net #Sine Nomine Associates - 192.204.203.218 #va.sinenomine.net - >slackers.net #The Slackers' Network - 63.201.48.27 #alexandria.slackers.net - >tproa.net #The People's Republic of Ames - 72.13.4.23 #service-3.tproa.net - 72.13.4.24 #service-4.tproa.net - 72.13.4.25 #service-5.tproa.net - >nikhef.nl #The Dutch National Institute for High Energy Physics - 192.16.185.26 #afs1.nikhef.nl - 192.16.185.27 #afs2.nikhef.nl - >1ts.org #1TS.ORG, Cambridge, MA - 69.25.196.51 #pancake.1ts.org - >acm-csuf.org #California State Univerisity Fullerton ACM - 137.151.29.193 #afs1.acm-csuf.org - >bazquux.org #Baz Quux Organization - 66.207.142.196 #baxquux.org - >coed.org #Adam Pennington's Cell - 66.93.61.184 #vice1.coed.org - 128.237.157.35 #vice3.coed.org - >dementia.org #Dementia Unlimited - 128.2.12.45 #alycia.dementia.org - 128.2.120.216 #meredith.dementia.org - >hackish.org #Hackish.org - 24.167.65.213 #avatar.sys.hackish.org - 128.2.120.138 #kurma.sys.hackish.org - >idahofuturetruck.org #University of Idaho hybrid vehicle development - 12.18.238.210 #dsle210.fsr.net - >nimlabs.org #Nimlabs, Ink. Cell. - 18.238.1.103 #olfin.nimlabs.org - 18.238.1.105 #caerbanog.nimlabs.org - >nomh.org #nomh.org - 204.29.154.12 #iota.nomh.org - 204.29.154.32 #adversity.xi.nomh.org - >oc7.org #The OC7 Project - 128.2.122.140 #knife.oc7.org - 207.22.77.170 #spoon.oc7.org - >kth.se #Royal Institute of Technology, Stockholm, Sweden - 130.237.32.145 #sonen.e.kth.se - 130.237.48.7 #anden.e.kth.se - 130.237.48.244 #fadern.e.kth.se - >hallf.kth.se #Royal Institute of Technology, HALLF - 130.237.24.11 #afs1.hallf.kth.se - 130.237.24.104 #afs2.hallf.kth.se - >isk.kth.se #Royal Institute of Technology, ISK - 130.237.202.3 #afsdb1.isk.kth.se - 130.237.209.5 #afsdb2.isk.kth.se - 130.237.209.9 #afsdb3.isk.kth.se - >it.kth.se #Royal Institute of Technology, IT - 130.237.212.15 #ptah.it.kth.se - 130.237.212.16 #toth.it.kth.se - 130.237.215.7 #isis.it.kth.se - >md.kth.se #Royal Institute of Technology, MMK - 130.237.57.68 #trinity.md.kth.se - 130.237.57.72 #morpheus.md.kth.se - 130.237.67.230 #neo.speech.kth.se - >mech.kth.se #Royal Institute of Technology, MECH - 130.237.233.142 #matterhorn.mech.kth.se - 130.237.233.143 #castor.mech.kth.se - 130.237.233.144 #pollux.mech.kth.se - >nada.kth.se #Royal Institute of Technology, NADA - 130.237.222.20 #kosmos.nada.kth.se - 130.237.223.12 #sputnik.nada.kth.se - 130.237.224.78 #mir.nada.kth.se - 130.237.227.23 #gagarin.nada.kth.se - 130.237.228.28 #laika.nada.kth.se - >pdc.kth.se #Royal Institute of Technology, PDC - 130.237.232.29 #crab.pdc.kth.se - 130.237.232.112 #anna.pdc.kth.se - 130.237.232.114 #hokkigai.pdc.kth.se - >stacken.kth.se #Stacken Computer Club - 130.237.234.3 #milko.stacken.kth.se - 130.237.234.43 #hot.stacken.kth.se - 130.237.234.101 #fishburger.stacken.kth.se - >syd.kth.se #Royal Institute of Technology, KTH-Syd - 130.237.83.23 #afs.haninge.kth.se - >physto.se #Physics department Stockholm University - 130.237.205.36 #sysafs1.physto.se - 130.237.205.72 #sysafs2.physto.se - >sanchin.se #Sanchin Consulting AB, Sweden - 192.195.148.10 #sesan.sanchin.se - >su.se #Stockholm University - 130.237.162.81 #afsdb1.su.se - 130.237.162.82 #afsdb2.su.se - 130.237.162.230 #afsdb3.su.se - >f9.ijs.si #F9, Jozef Stefan Institue - 194.249.156.1 #brenta.ijs.si - >p-ng.si #Nova Gorica Polytechnic - 193.2.120.2 #solkan.p-ng.si - >phy.bris.ac.uk #Bristol University - phyics - 137.222.58.9 #afs1.phy.bris.ac.uk - >inf.ed.ac.uk #School of Informatics, University of Edinburgh - 129.215.64.16 #afsdb0.inf.ed.ac.uk - 129.215.64.17 #afsdb1.inf.ed.ac.uk - 129.215.64.18 #afsdb2.inf.ed.ac.uk - >ic.ac.uk #Imperial College London - 155.198.63.148 #icafs2.cc.ic.ac.uk - 155.198.63.149 #icafs1.cc.ic.ac.uk - >hep.man.ac.uk #Manchester HEP - 194.36.2.3 #afs1.hep.man.ac.uk - 194.36.2.4 #afs2.hep.man.ac.uk - 194.36.2.5 #afs3.hep.man.ac.uk - >rl.ac.uk #Rutherford Appleton Lab, England - 130.246.183.164 #wallace.cc.rl.ac.uk --- 0 ---- Index: openafs/src/packaging/MacOS/CellServDB diff -c openafs/src/packaging/MacOS/CellServDB:1.3.4.3 openafs/src/packaging/MacOS/CellServDB:removed *** openafs/src/packaging/MacOS/CellServDB:1.3.4.3 Thu Jul 5 19:47:44 2007 --- openafs/src/packaging/MacOS/CellServDB Thu Sep 20 01:06:54 2007 *************** *** 1,589 **** - >grand.central.org #GCO Public CellServDB 05 Jul 2007 - 18.92.0.108 #grand-opening.mit.edu - 128.2.203.61 #penn.central.org - 130.237.48.87 #andrew.e.kth.se - >wu-wien.ac.at #University of Economics, Vienna, Austria - 137.208.3.33 #goya.wu-wien.ac.at - 137.208.7.57 #caravaggio.wu-wien.ac.at - 137.208.127.57 #vermeer.wu-wien.ac.at - >hephy.at #hephy-vienna - 193.170.243.10 #mowgli.oeaw.ac.at - 193.170.243.12 #baloo.oeaw.ac.at - 193.170.243.14 #akela.oeaw.ac.at - >cgv.tugraz.at #CGV cell - 129.27.224.133 #phobos.cgv.tugraz.at - 129.27.224.134 #deimos.cgv.tugraz.at - 129.27.224.210 #trinculo.cgv.tugraz.at - >itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus - 129.27.161.7 #faepafs1.tu-graz.ac.at - 129.27.161.15 #faepafs2.tu-graz.ac.at - 129.27.161.114 #faepafs3.tu-graz.ac.at - >sums.math.mcgill.ca #Society of Undergraduate Mathematics Students of McGill Universi - 132.216.24.122 #germain.sums.math.mcgill.ca - 132.216.24.125 #turing.sums.math.mcgill.ca - >cern.ch #European Laboratory for Particle Physics, Geneva - 137.138.128.148 #afsdb1.cern.ch - 137.138.246.50 #afsdb3.cern.ch - 137.138.246.51 #afsdb2.cern.ch - >ams.cern.ch #AMS Experiment - 137.138.188.185 #ams.cern.ch - 137.138.199.58 #pcamsf4.cern.ch - >epfl.ch #Swiss Federal Institute of Technology at Lausanne - 128.178.109.111 #kd1.epfl.ch - 128.178.109.112 #kd2.epfl.ch - 128.178.109.113 #kd3.epfl.ch - >ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland - 129.132.97.19 #amalthea.ethz.ch - 129.132.97.27 #nethzafs-001.ethz.ch - 129.132.115.3 #himalia.ethz.ch - 129.132.115.37 #nethzafs-005.ethz.ch - 129.132.115.38 #nethzafs-006.ethz.ch - >psi.ch #Paul Scherrer Institut - Villigen, Switzerland - 129.129.190.140 #afs00.psi.ch - 129.129.190.141 #afs01.psi.ch - 129.129.190.142 #afs02.psi.ch - >extundo.com #Simon Josefsson's cell - 195.42.214.241 #slipsten.extundo.com - >membrain.com #membrain.com - 66.93.118.125 #stormy - 130.85.24.11 #weasel - 130.85.24.13 #straykitten - >midnightlinux.com #Midnight Linux, Pittsburgh PA - 208.10.142.82 #outpost.midnightlinux.com - >setfilepointer.com #SetFilePointer.com - 63.224.10.2 #hamlet.SetFilePointer.com - 63.224.10.4 #troilus.SetFilePointer.com - >sodre.cx #Sodre.cx - 128.8.140.165 #greed.sodre.cx - >desy.de #Deutsches Elektronen-Synchrotron - 131.169.40.62 #vayu.desy.de - 131.169.244.60 #solar00.desy.de - >gppc.de #GPP Chemnitz mbH - 213.187.92.33 #gpp1.gppc.de - 213.187.92.34 #paulchen.gppc.de - 213.187.92.35 #lotus.gppc.de - >ifh.de #DESY Zeuthen - 141.34.22.10 #romulus.ifh.de - 141.34.22.11 #remus.ifh.de - 141.34.22.29 #hekate.ifh.de - >lrz-muenchen.de #Leibniz Computing Centre, Germany - 129.187.10.36 #afs1.lrz-muenchen.de - 129.187.10.56 #afs3.lrz-muenchen.de - 129.187.10.57 #afs2.lrz-muenchen.de - >ipp-garching.mpg.de #Institut fuer Plasmaphysik - 130.183.9.5 #afs-db1.rzg.mpg.de - 130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de - 130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de - >mpe.mpg.de #MPE cell - 130.183.130.7 #irafs1.mpe-garching.mpg.de - 130.183.134.20 #irafs2.mpe-garching.mpg.de - >i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen - 137.226.244.79 #remus.informatik.rwth-aachen.de - >tu-bs.de #Technical University of Braunschweig, Germany - 134.169.1.1 #rzafs1.rz.tu-bs.de - 134.169.1.5 #rzafs2.rz.tu-bs.de - 134.169.1.6 #rzafs3.rz.tu-bs.de - >tu-chemnitz.de #Technische Universitaet Chemnitz, Germany - 134.109.2.1 #zuse.hrz.tu-chemnitz.de - 134.109.2.15 #phoenix.hrz.tu-chemnitz.de - 134.109.200.7 #aetius.hrz.tu-chemnitz.de - >e18.ph.tum.de #Experimental Physics, TU Munich, Germany - 129.187.154.223 #hamlet.e18.physik.tu-muenchen.de - >uni-bonn.de #University of Bonn, Computing Center - 131.220.14.198 #work15-eth.rhrz.uni-bonn.de - 131.220.14.205 #node05.rhrz.uni-bonn.de - 131.220.15.197 #afs-db1.rhrz.uni-bonn.de - >atlass01.physik.uni-bonn.de #Bonn ATLAS - 131.220.165.43 #atlass01.physik.uni-bonn.de - >uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg - 132.230.6.235 #sv6.ruf.uni-freiburg.de - 132.230.6.236 #sv7.ruf.uni-freiburg.de - 132.230.6.237 #sv8.ruf.uni-freiburg.de - >physik.uni-freiburg.de #institute of physics, university Freiburg, Germany - 132.230.77.16 #hepafs.physik.uni-freiburg.de - >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) - 129.206.119.10 #afsdb.urz.uni-heidelberg.de - 129.206.119.16 #afsdb1.urz.uni-heidelberg.de - 129.206.119.17 #afsdb2.urz.uni-heidelberg.de - >uni-hohenheim.de #University of Hohenheim - 144.41.2.2 #rs13.serv.uni-hohenheim.de - 144.41.2.3 #rs14.serv.uni-hohenheim.de - 144.41.2.4 #rs15.serv.uni-hohenheim.de - >rz.uni-jena.de #Rechenzentrum University of Jena, Germany - 141.35.2.180 #afs00.rz.uni-jena.de - 141.35.2.181 #afs01.rz.uni-jena.de - 141.35.2.182 #afs02.rz.uni-jena.de - >impetus.uni-koeln.de #Univ. of Cologne - Geophysics/Meteorology Inst. - 134.95.80.39 #forano.meteo.uni-koeln.de - >meteo.uni-koeln.de #Univ. of Cologne - Inst. for Geophysics & Meteorology - 134.95.144.22 #afs1.meteo.uni-koeln.de - 134.95.144.24 #afs2.meteo.uni-koeln.de - >rrz.uni-koeln.de #University of Cologne - Reg Comp Center - 134.95.19.3 #afsdb1.rrz.uni-koeln.de - 134.95.19.10 #lyra.rrz.uni-koeln.de - 134.95.67.97 #afs.thp.uni-koeln.de - 134.95.141.243 #agrippina.rrz.uni-koeln.de - >physik.uni-mainz.de #institute of physics, university Mainz, Germany - 134.93.130.93 #hardy.physik.uni-mainz.de - >uni-mannheim.de #Uni Mannheim (Rechenzentrum) - 134.155.97.204 #afsdb1.uni-mannheim.de - 134.155.97.205 #afsdb2.uni-mannheim.de - 134.155.97.206 #afsdb3.uni-mannheim.de - >uni-paderborn.de #University of Paderborn, Germany - 131.234.137.10 #afsdb1.uni-paderborn.de - 131.234.137.11 #afsdb2.uni-paderborn.de - 131.234.137.12 #afsdb3.uni-paderborn.de - >physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal - 132.195.104.3 #afs1.physik.uni-wuppertal.de - 132.195.104.230 #afs2.physik.uni-wuppertal.de - >s-et.aau.dk #Aalborg Univ., The Student Society, Denmark - 130.225.196.22 #afs.s-et.aau.dk - >ies.auc.dk #Aalborg Univ., Inst. of Electronic Systems, Denmark - 130.225.51.73 #afsdb1.kom.auc.dk - 130.225.51.74 #afsdb2.kom.auc.dk - 130.225.51.85 #afsdb3.kom.auc.dk - >asu.edu #Arizona State University - 129.219.10.69 #authen2.asu.edu - 129.219.10.70 #authen1.asu.edu - 129.219.10.72 #authen3.asu.edu - 129.219.100.16 #authen4.asu.edu - >hep.caltech.edu #CalTech High Energy Physics - 131.215.126.150 #afs.hep.caltech.edu - >clarkson.edu #Clarkson University, Potsdam, New York USA - 128.153.1.111 #arthur.clarkson.edu - 128.153.9.111 #lancelot.clarkson.edu - 128.153.17.111 #uther.clarkson.edu - >andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell - 128.2.10.2 #vice2.fs.andrew.cmu.edu - 128.2.10.7 #vice7.fs.andrew.cmu.edu - 128.2.10.11 #vice11.fs.andrew.cmu.edu - 128.2.10.28 #vice28.fs.andrew.cmu.edu - 128.2.32.44 #new-vice12.fs.andrew.cmu.edu - >club.cc.cmu.edu #Carnegie Mellon University Computer Club - 128.237.157.11 #sodium.club.cc.cmu.edu - 128.237.157.13 #potassium.club.cc.cmu.edu - >chem.cmu.edu #Carnegie Mellon University - Chemistry Dept. - 128.2.40.134 #afs.chem.cmu.edu - 128.2.40.140 #afs2.chem.cmu.edu - >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. - 128.2.201.46 #strawberry.srv.cs.cmu.edu - 128.2.201.47 #pumpkin.srv.cs.cmu.edu - 128.2.201.48 #cherry.srv.cs.cmu.edu - >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. - 128.2.129.7 #porok.ece.cmu.edu - 128.2.129.8 #vicio.ece.cmu.edu - 128.2.129.9 #e-xing.ece.cmu.edu - >scotch.ece.cmu.edu #CMU ECE CALCM research group - 128.2.134.82 #lagavulin.ece.cmu.edu - >qatar.cmu.edu #Carnegie Mellon University - Qatar - 86.36.46.6 #afs1.qatar.cmu.edu - 86.36.46.7 #afs2.qatar.cmu.edu - >sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab - 128.2.179.12 #nihao.sbp.ri.cmu.edu - 128.2.179.113 #youtheman.sbp.ri.cmu.edu - >cnf.cornell.edu #CNF - 128.253.198.9 #hole.cnf.cornell.edu - 128.253.198.27 #smoke.cnf.cornell.edu - >msc.cornell.edu #Cornell University Materials Science Center - 128.84.231.242 #miranda.ccmr.cornell.edu - 128.84.241.35 #co.ccmr.cornell.edu - 128.84.249.78 #dax.ccmr.cornell.edu - >dbic.dartmouth.edu #Dartmouth Brain Imaging Center - 129.170.30.143 #dbicafs1.dartmouth.edu - 129.170.30.144 #dbicafs2.dartmouth.edu - 129.170.30.145 #dbicafs3.dartmouth.edu - >northstar.dartmouth.edu #Dartmouth College Research Computing - 129.170.16.22 #halley.dartmouth.edu - 129.170.16.42 #oort.dartmouth.edu - 129.170.16.43 #cygnusx1.dartmouth.edu - >cs.fhm.edu #Department Computer Science Munich University Of Applied Science - 129.187.208.2 #srv1.informatik.fh-muenchen.de - >eecs.harvard.edu #Harvard - EECS - 140.247.60.61 #zermelo.eecs.harvard.edu - 140.247.60.83 #corfu.eecs.harvard.edu - >iastate.edu #Iowa State University - 129.186.1.243 #afsdb-1.iastate.edu - 129.186.6.243 #afsdb-2.iastate.edu - 129.186.142.243 #afsdb-3.iastate.edu - >athena.mit.edu #MIT/Athena cell - 18.7.1.66 #paris.mit.edu. - 18.7.1.74 #chimera.mit.edu. - 18.158.0.37 #prill.mit.edu. - >dev.mit.edu #MIT/IS Development cell - 18.7.1.70 #wham.mit.edu. - 18.92.1.219 #click.mit.edu. - 18.92.1.220 #whirr.mit.edu. - >net.mit.edu #MIT/Network Group cell - 18.7.7.73 #gracie.mit.edu - 18.7.21.95 #george.mit.edu - >sipb.mit.edu #MIT/SIPB cell - 18.181.0.19 #reynelda.mit.edu. - 18.181.0.22 #rosebud.mit.edu. - 18.181.0.23 #ronald-ann.mit.edu. - >soap.mit.edu #MIT School Of Architecture & Planning - 18.89.1.204 #crypt.mit.edu - 18.89.1.209 #grotto.mit.edu - 18.89.2.156 #ac.mit.edu - >msu.edu #Michigan State University Main Cell - 35.9.7.10 #afsdb0.cl.msu.edu - >nd.edu #University of Notre Dame - 129.74.223.17 #john.helios.nd.edu - 129.74.223.33 #lizardo.helios.nd.edu - 129.74.223.65 #buckaroo.helios.nd.edu - >pitt.edu #University of Pittsburgh - 136.142.8.15 #afs09.srv.cis.pitt.edu - 136.142.8.20 #afs10.srv.cis.pitt.edu - 136.142.8.21 #afs11.srv.cis.pitt.edu - >cs.pitt.edu #University of Pittsburgh - Computer Science - 130.49.220.11 #afs01.cs.pitt.edu - 130.49.220.12 #afs02.cs.pitt.edu - 130.49.220.13 #afs03.cs.pitt.edu - >psc.edu #PSC (Pittsburgh Supercomputing Center) - 128.182.59.182 #shaggy.psc.edu - 128.182.66.184 #velma.psc.edu - 128.182.66.185 #daphne.psc.edu - >scoobydoo.psc.edu #PSC Test Cell - 128.182.59.181 #scooby.psc.edu - >cede.psu.edu #Penn State - Center for Engr. Design & Entrepeneurship - 146.186.218.10 #greenly.cede.psu.edu - 146.186.218.60 #b50.cede.psu.edu - 146.186.218.246 #stalin.cede.psu.edu - >rose-hulman.edu #Rose-Hulman Institute of Technology - 137.112.7.11 #afs1.rose-hulman.edu - 137.112.7.12 #afs2.rose-hulman.edu - 137.112.7.13 #afs3.rose-hulman.edu - >cs.rose-hulman.edu #Rose-Hulman CS Department - 137.112.40.10 #galaxy.cs.rose-hulman.edu - >rpi.edu #Rensselaer Polytechnic Institute - 128.113.22.11 #saul.server.rpi.edu - 128.113.22.12 #joab.server.rpi.edu - 128.113.22.13 #korah.server.rpi.edu - 128.113.22.14 #achan.server.rpi.edu - >hep.sc.edu #University of South Carolina, Dept. of Physics - 129.252.78.77 #cpeven.physics.sc.edu - >cs.stanford.edu #Stanford University Computer Science Department - 171.64.64.10 #cs-afs-1.Stanford.EDU - 171.64.64.66 #cs-afs-2.stanford.edu - 171.64.64.69 #cs-afs-3.stanford.edu - >ir.stanford.edu #Stanford University - 171.64.7.222 #afsdb1.stanford.edu - 171.64.7.234 #afsdb2.stanford.edu - 171.64.7.246 #afsdb3.stanford.edu - >slac.stanford.edu #Stanford Linear Accelerator Center - 134.79.18.25 #afsdb1.slac.stanford.edu - 134.79.18.26 #afsdb2.slac.stanford.edu - 134.79.18.27 #afsdb3.slac.stanford.edu - >ucdavis.edu #University of California at Davis - 169.237.104.100 #afs1.ucdavis.edu - 169.237.235.176 #afs2.ucdavis.edu - 169.237.247.91 #afs3.ucdavis.edu - >home.ucdavis.edu #University of California at Davis home directories - 169.237.105.91 #home1.ucdavis.edu - 169.237.105.92 #home2.ucdavis.edu - 169.237.105.93 #home3.ucdavis.edu - >physics.ucsb.edu #UC Santa Barbara, Physics Dept - 128.111.18.161 #ledzeppelin.physics.ucsb.edu - >cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A - 128.114.123.14 #elan.ucsc.edu - 128.114.123.15 #ichabod.ucsc.edu - 128.114.123.18 #maneki.ucsc.edu - >acm.uiuc.edu #ACM at the University of Illinois - 128.174.251.8 #alnitak.acm.uiuc.edu - 128.174.251.9 #alnilam.acm.uiuc.edu - 128.174.251.10 #mintaka.acm.uiuc.edu - >illigal.uiuc.edu #Illinois Genetic Algorithms Labaratory - 128.174.193.200 #ial.illigal.uiuc.edu - 128.174.193.201 #cac.illigal.uiuc.edu - 128.174.193.202 #gcs.illigal.uiuc.edu - >ncsa.uiuc.edu #University of Illinois - 141.142.3.5 #congo.ncsa.uiuc.edu - 141.142.3.8 #nile.ncsa.uiuc.edu - 141.142.3.9 #kaskaskia.ncsa.uiuc.edu - >umbc.edu #University of Maryland, Baltimore County - 130.85.24.23 #db2.afs.umbc.edu - 130.85.24.87 #db3.afs.umbc.edu - 130.85.24.101 #db1.afs.umbc.edu - >glue.umd.edu #University of Maryland - Project Glue - 128.8.70.11 #olmec.umd.edu - 128.8.236.4 #egypt.umd.edu - 128.8.236.230 #babylon.umd.edu - >wam.umd.edu #University of Maryland Network WAM Project - 128.8.70.9 #csc-srv.wam.umd.edu - 128.8.236.5 #avw-srv.wam.umd.edu - 128.8.236.231 #ptx-srv.wam.umd.edu - >umich.edu #University of Michigan - Campus - 141.211.1.32 #fear.ifs.umich.edu - 141.211.1.33 #surprise.ifs.umich.edu - 141.211.1.34 #ruthless.ifs.umich.edu - >atlas.umich.edu #ATLAS group cell in physics at University of Michigan - 141.211.43.102 #linat02.grid.umich.edu - 141.211.43.103 #linat03.grid.umich.edu - 141.211.43.104 #linat04.grid.umich.edu - >citi.umich.edu #Center for Information Technology Integration - 141.211.133.5 #babylon.citi.umich.edu - >lsa.umich.edu #University of Michigan - College of LS&A - 141.211.211.53 #gerow.lsa.umich.edu - 141.211.211.72 #collines.lsa.umich.edu - 141.211.211.153 #hodges.lsa.umich.edu - >sph.umich.edu #University of Michigan -- School of Public Health - 141.211.51.137 #afssph7.sph.umich.edu - 141.211.51.139 #afssph0.sph.umich.edu - 141.211.51.142 #afssph6.sph.umich.edu - >isis.unc.edu #Univ. of NC at Chapel Hill - ITS - 152.2.1.5 #db0.isis.unc.edu - 152.2.1.6 #db1.isis.unc.edu - 152.2.1.7 #db2.isis.unc.edu - >physics.unc.edu #Univ. of NC at Chapel Hill, Dept. of Physics - 152.2.4.1 #who.physics.unc.edu - 152.2.4.3 #what.physics.unc.edu - 152.2.4.5 #when.physics.unc.edu - >uncc.edu #University of NC at Charlotte Mosaic AFS Cell - 152.15.10.70 #as-sm1.uncc.edu - 152.15.93.186 #as-ece1.uncc.edu - 152.15.181.175 #as-me1.uncc.edu - >eng.utah.edu #University of Utah - Engineering - 155.98.111.9 #lenny.eng.utah.edu - 155.98.111.10 #carl.eng.utah.edu - >cs.uwm.edu #University of Wisconsin--Milwaukee - 129.89.38.124 #solomons.cs.uwm.edu - >cs.wisc.edu #Univ. of Wisconsin-Madison, Computer Sciences Dept. - 128.105.132.14 #timon.cs.wisc.edu - 128.105.132.15 #pumbaa.cs.wisc.edu - 128.105.132.16 #zazu.cs.wisc.edu - >engr.wisc.edu #University of Wisconsin-Madison, College of Engineering - 144.92.13.14 #larry.cae.wisc.edu - 144.92.13.15 #curly.cae.wisc.edu - 144.92.13.16 #moe.cae.wisc.edu - >hep.wisc.edu #University of Wisconsin -- High Energy Physics - 128.104.28.219 #anise.hep.wisc.edu - >physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department - 128.104.160.13 #kendra.physics.wisc.edu - 128.104.160.14 #fray.physics.wisc.edu - 128.104.160.15 #buffy.physics.wisc.edu - >ciemat.es #Ciemat, Madrid, Spain - 130.206.11.42 #afsdb1.ciemat.es - 130.206.11.217 #afsdb2.ciemat.es - 130.206.11.247 #afsdb3.ciemat.es - >ifca.unican.es #Instituto de Fisica de Cantabria (IFCA), Santander, Spain - 193.144.209.20 #gridwall.ifca.unican.es - >ific.uv.es #Instituto de Fisica Corpuscular, Valencia, Spain - 147.156.163.11 #alpha.ific.uv.es - >biocenter.helsinki.fi #University of Helsinki, Institute of Biotechnology - 128.214.58.174 #afsdb1.biocenter.helsinki.fi - 128.214.88.114 #afsdb2.biocenter.helsinki.fi - >dapnia.saclay.cea.fr #CEA DAPNIA - 132.166.32.7 #dphrsg.saclay.cea.fr - 132.166.32.12 #dphrsl.saclay.cea.fr - >grif.fr #GRIF cell - 192.54.208.18 #node03.datagrid.cea.fr - >in2p3.fr #IN2P3 production cell - 134.158.232.11 #ccafsdb1.in2p3.fr - 134.158.232.12 #ccafsdb2.in2p3.fr - 134.158.232.13 #ccafsdb3.in2p3.fr - >anl.gov #Argonne National Laboratory - 146.137.96.33 #arteus.ctd.anl.gov - 146.137.162.88 #agamemnon.ctd.anl.gov - 146.137.194.80 #antenor.ctd.anl.gov - >rhic.bnl.gov #Relativistic Heavy Ion Collider - 130.199.6.51 #rafs03.rcf.bnl.gov - 130.199.6.52 #rafs02.rcf.bnl.gov - 130.199.6.69 #rafs01.rcf.bnl.gov - >usatlas.bnl.gov #US Atlas Tier 1 Facility at BNL - 130.199.48.32 #aafs01.usatlas.bnl.gov - 130.199.48.33 #aafs02.usatlas.bnl.gov - 130.199.48.34 #aafs03.usatlas.bnl.gov - >fnal.gov #Fermi National Acclerator Laboratory - 131.225.68.1 #fsus01.fnal.gov - 131.225.68.4 #fsus03.fnal.gov - 131.225.68.14 #fsus04.fnal.gov - >ic-afs.arc.nasa.gov #Code IC, Ames Research Center - 128.102.105.62 #udanax.arc.nasa.gov - >jpl.nasa.gov #Jet Propulsion Laboratory - 137.78.160.21 #afsdb08.jpl.nasa.gov - 137.78.160.22 #afsdb09.jpl.nasa.gov - 137.78.160.23 #afsdb10.jpl.nasa.gov - >nersc.gov #National Energy Research Supercomputer Center - 128.55.128.250 #mars.nersc.gov - 128.55.128.252 #alfred.nersc.gov - 128.55.128.254 #lurch.nersc.gov - >bme.hu #Budapest University of Technology and Economics - 152.66.241.6 #afs.iit.bme.hu - >kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H - 148.6.8.14 #afs.kfki.hu - >caspur.it #CASPUR Inter-University Computing Consortium, Rome - 193.204.5.45 #pomodoro.caspur.it - 193.204.5.46 #banana.caspur.it - 193.204.5.50 #maslo.caspur.it - >enea.it #ENEA New Tech. Energy & Environment Agency, Italy - 192.107.54.5 #aixfs.frascati.enea.it - 192.107.54.11 #rs2ced.frascati.enea.it - 192.107.54.12 #43p.frascati.enea.it - 192.107.61.235 #serverinfo02.bologna.enea.it - 192.107.71.6 #glauco.casaccia.enea.it - 192.107.96.233 #riscdb.trisaia.enea.it - >fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy - 192.107.90.2 #fusafs1.frascati.enea.it - 192.107.90.3 #fusafs2.frascati.enea.it - 192.107.90.4 #fusafs3.frascati.enea.it - >icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy - 193.204.6.130 #icembfs.caspur.it - >infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia - 131.154.1.7 #afscnaf.infn.it - 141.108.26.75 #afsrm1.roma1.infn.it - 192.84.134.75 #afsna.na.infn.it - >ba.infn.it #INFN, Sezione di Bari - 193.206.185.235 #baafsserver.ba.infn.it - 193.206.185.236 #debsrv.ba.infn.it - >kloe.infn.it #INFN, KLOE experiment at Laboratori di Frascati - 192.135.25.111 #kloeafs1.lnf.infn.it - 192.135.25.112 #kloeafs2.lnf.infn.it - >le.infn.it #INFN, Sezione di Lecce - 192.84.152.40 #afs01.le.infn.it - 192.84.152.148 #afs02.le.infn.it - >lnf.infn.it #INFN, Laboratori Nazionali di Frascati - 193.206.84.121 #afs1.lnf.infn.it - 193.206.84.122 #afs2.lnf.infn.it - 193.206.84.123 #afs3.lnf.infn.it - >lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso - 192.84.135.21 #rsgs05.lngs.infn.it - >pi.infn.it #INFN, Sezione di Pisa - 131.114.134.26 #unknownhost.pi.infn.it - 192.84.133.50 #aix1.pi.infn.it - >psm.it #Progetto San Marco, Universita' di Roma-1 - 151.100.1.65 #atlante.psm.uniroma1.it - >tgrid.it #CASPUR-CILEA-CINECA Grid Cell - 193.204.5.33 #cccgrid.caspur.it - >ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC - 140.105.16.8 #fs1.ictp.trieste.it - 140.105.16.9 #fs2.ictp.trieste.it - >math.unifi.it #math.unifi.it - 150.217.34.182 #xeno.math.unifi.it - >ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria - 151.100.85.253 #alfa.ing.uniroma1.it - >dia.uniroma3.it #University Roma Tre - DIA - 193.204.161.79 #plm.dia.uniroma3.it - 193.204.161.118 #afs.dia.uniroma3.it - >vn.uniroma3.it #University of Rome 3, Area Vasca Navale - 193.204.161.136 #alfa.dia.uniroma3.it - 193.204.161.137 #beta.dia.uniroma3.it - 193.204.161.138 #gamma.dia.uniroma3.it - >italia #Italian public AFS cell - 193.204.5.9 #afs.caspur.it - >cmf.nrl.navy.mil #Naval Research Lab - CCS - 134.207.10.68 #picard.cmf.nrl.navy.mil - 134.207.10.69 #riker.cmf.nrl.navy.mil - 134.207.10.70 #kirk.cmf.nrl.navy.mil - >lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics - 132.250.114.2 #afs1.lcp.nrl.navy.mil - 132.250.114.4 #afs2.lcp.nrl.navy.mil - 132.250.114.6 #afs3.lcp.nrl.navy.mil - >es.net #Energy Sciences Net - 198.128.3.21 #fs1.es.net - 198.128.3.22 #fs2.es.net - 198.128.3.23 #fs3.es.net - >laroia.net #Laroia Networks - 66.66.102.254 #supercore.laroia.net - >sinenomine.net #Sine Nomine Associates - 192.204.203.218 #va.sinenomine.net - >slackers.net #The Slackers' Network - 63.201.48.27 #alexandria.slackers.net - >tproa.net #The People's Republic of Ames - 72.13.4.23 #service-3.tproa.net - 72.13.4.24 #service-4.tproa.net - 72.13.4.25 #service-5.tproa.net - >nikhef.nl #The Dutch National Institute for High Energy Physics - 192.16.185.26 #afs1.nikhef.nl - 192.16.185.27 #afs2.nikhef.nl - >1ts.org #1TS.ORG, Cambridge, MA - 69.25.196.51 #pancake.1ts.org - >acm-csuf.org #California State Univerisity Fullerton ACM - 137.151.29.193 #afs1.acm-csuf.org - >bazquux.org #Baz Quux Organization - 66.207.142.196 #baxquux.org - >coed.org #Adam Pennington's Cell - 66.93.61.184 #vice1.coed.org - 128.237.157.35 #vice3.coed.org - >dementia.org #Dementia Unlimited - 128.2.12.45 #alycia.dementia.org - 128.2.120.216 #meredith.dementia.org - >hackish.org #Hackish.org - 24.167.65.213 #avatar.sys.hackish.org - 128.2.120.138 #kurma.sys.hackish.org - >idahofuturetruck.org #University of Idaho hybrid vehicle development - 12.18.238.210 #dsle210.fsr.net - >nimlabs.org #Nimlabs, Ink. Cell. - 18.238.1.103 #olfin.nimlabs.org - 18.238.1.105 #caerbanog.nimlabs.org - >nomh.org #nomh.org - 204.29.154.12 #iota.nomh.org - 204.29.154.32 #adversity.xi.nomh.org - >oc7.org #The OC7 Project - 128.2.122.140 #knife.oc7.org - 207.22.77.170 #spoon.oc7.org - >kth.se #Royal Institute of Technology, Stockholm, Sweden - 130.237.32.145 #sonen.e.kth.se - 130.237.48.7 #anden.e.kth.se - 130.237.48.244 #fadern.e.kth.se - >hallf.kth.se #Royal Institute of Technology, HALLF - 130.237.24.11 #afs1.hallf.kth.se - 130.237.24.104 #afs2.hallf.kth.se - >isk.kth.se #Royal Institute of Technology, ISK - 130.237.202.3 #afsdb1.isk.kth.se - 130.237.209.5 #afsdb2.isk.kth.se - 130.237.209.9 #afsdb3.isk.kth.se - >it.kth.se #Royal Institute of Technology, IT - 130.237.212.15 #ptah.it.kth.se - 130.237.212.16 #toth.it.kth.se - 130.237.215.7 #isis.it.kth.se - >md.kth.se #Royal Institute of Technology, MMK - 130.237.57.68 #trinity.md.kth.se - 130.237.57.72 #morpheus.md.kth.se - 130.237.67.230 #neo.speech.kth.se - >mech.kth.se #Royal Institute of Technology, MECH - 130.237.233.142 #matterhorn.mech.kth.se - 130.237.233.143 #castor.mech.kth.se - 130.237.233.144 #pollux.mech.kth.se - >nada.kth.se #Royal Institute of Technology, NADA - 130.237.222.20 #kosmos.nada.kth.se - 130.237.223.12 #sputnik.nada.kth.se - 130.237.224.78 #mir.nada.kth.se - 130.237.227.23 #gagarin.nada.kth.se - 130.237.228.28 #laika.nada.kth.se - >pdc.kth.se #Royal Institute of Technology, PDC - 130.237.232.29 #crab.pdc.kth.se - 130.237.232.112 #anna.pdc.kth.se - 130.237.232.114 #hokkigai.pdc.kth.se - >stacken.kth.se #Stacken Computer Club - 130.237.234.3 #milko.stacken.kth.se - 130.237.234.43 #hot.stacken.kth.se - 130.237.234.101 #fishburger.stacken.kth.se - >syd.kth.se #Royal Institute of Technology, KTH-Syd - 130.237.83.23 #afs.haninge.kth.se - >physto.se #Physics department Stockholm University - 130.237.205.36 #sysafs1.physto.se - 130.237.205.72 #sysafs2.physto.se - >sanchin.se #Sanchin Consulting AB, Sweden - 192.195.148.10 #sesan.sanchin.se - >su.se #Stockholm University - 130.237.162.81 #afsdb1.su.se - 130.237.162.82 #afsdb2.su.se - 130.237.162.230 #afsdb3.su.se - >f9.ijs.si #F9, Jozef Stefan Institue - 194.249.156.1 #brenta.ijs.si - >p-ng.si #Nova Gorica Polytechnic - 193.2.120.2 #solkan.p-ng.si - >phy.bris.ac.uk #Bristol University - phyics - 137.222.58.9 #afs1.phy.bris.ac.uk - >inf.ed.ac.uk #School of Informatics, University of Edinburgh - 129.215.64.16 #afsdb0.inf.ed.ac.uk - 129.215.64.17 #afsdb1.inf.ed.ac.uk - 129.215.64.18 #afsdb2.inf.ed.ac.uk - >ic.ac.uk #Imperial College London - 155.198.63.148 #icafs2.cc.ic.ac.uk - 155.198.63.149 #icafs1.cc.ic.ac.uk - >hep.man.ac.uk #Manchester HEP - 194.36.2.3 #afs1.hep.man.ac.uk - 194.36.2.4 #afs2.hep.man.ac.uk - 194.36.2.5 #afs3.hep.man.ac.uk - >rl.ac.uk #Rutherford Appleton Lab, England - 130.246.183.164 #wallace.cc.rl.ac.uk --- 0 ---- Index: openafs/src/packaging/MacOS/OpenAFS.Info.plist diff -c openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.21 openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.22 *** openafs/src/packaging/MacOS/OpenAFS.Info.plist:1.2.10.21 Wed Aug 29 00:08:56 2007 --- openafs/src/packaging/MacOS/OpenAFS.Info.plist Thu Sep 20 00:14:07 2007 *************** *** 3,15 **** CFBundleGetInfoString ! OpenAFS 1.5.24 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.5.24 IFMajorVersion 1 IFMinorVersion --- 3,15 ---- CFBundleGetInfoString ! OpenAFS 1.5.25 CFBundleIdentifier org.openafs.OpenAFS.pkg CFBundleName OpenAFS CFBundleShortVersionString ! 1.5.25 IFMajorVersion 1 IFMinorVersion Index: openafs/src/packaging/MacOS/OpenAFS.info diff -c openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.20 openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.21 *** openafs/src/packaging/MacOS/OpenAFS.info:1.1.12.20 Wed Aug 29 00:08:56 2007 --- openafs/src/packaging/MacOS/OpenAFS.info Thu Sep 20 00:14:07 2007 *************** *** 1,5 **** Title OpenAFS ! Version 1.5.24 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.5.25 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/rxgen/NTMakefile diff -c openafs/src/rxgen/NTMakefile:1.6 openafs/src/rxgen/NTMakefile:1.6.4.1 *** openafs/src/rxgen/NTMakefile:1.6 Sun Nov 20 20:57:23 2005 --- openafs/src/rxgen/NTMakefile Wed Sep 19 13:58:48 2007 *************** *** 17,22 **** --- 17,24 ---- # build rxgen EXEFILE = $(DESTDIR)\bin\rxgen.exe + EXERES = $(OUT)\rxgen.res + EXEOBJS =\ $(OUT)\rpc_main.obj \ $(OUT)\rpc_hout.obj \ *************** *** 30,36 **** $(EXEOBJS): $$(@B).c $(C2OBJ) $** ! $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) --- 32,40 ---- $(EXEOBJS): $$(@B).c $(C2OBJ) $** ! $(EXERES): rxgen.rc AFS_component_version_number.h ! ! $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 42,48 **** install9x: install clean:: ! $(DEL) $(EXEFILE) mkdir: --- 46,53 ---- install9x: install clean:: ! $(DEL) $(EXEFILE) ! $(DEL) $(EXERES) mkdir: Index: openafs/src/rxgen/rxgen.rc diff -c /dev/null openafs/src/rxgen/rxgen.rc:1.1.2.2 *** /dev/null Thu Sep 20 01:06:55 2007 --- openafs/src/rxgen/rxgen.rc Wed Sep 19 13:58:48 2007 *************** *** 0 **** --- 1,17 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* Define VERSIONINFO resource */ + + #define AFS_VERINFO_FILE_DESCRIPTION "RX RPC Code Generator" + #define AFS_VERINFO_NAME "rxgen" + #define AFS_VERINFO_FILENAME "rxgen.exe" + + #include "AFS_component_version_number.h" + #include "..\config\NTVersioninfo.rc" Index: openafs/src/viced/NTMakefile diff -c openafs/src/viced/NTMakefile:1.6.2.3 openafs/src/viced/NTMakefile:1.6.2.4 *** openafs/src/viced/NTMakefile:1.6.2.3 Sat Jun 24 10:10:46 2006 --- openafs/src/viced/NTMakefile Wed Sep 19 13:58:48 2007 *************** *** 27,40 **** EXEFILE = $(DESTDIR)\root.server\usr\afs\bin\fileserver.exe EXEOBJS =\ $(OUT)\afsfileprocs.obj \ $(OUT)\callback.obj \ $(OUT)\host.obj \ $(OUT)\physio.obj \ $(OUT)\viced.obj \ ! $(OUT)\AFS_component_version_number.obj \ ! $(OUT)\fileserver.res EXELIBS = \ $(DESTDIR)\lib\afs\afscmd.lib \ --- 27,41 ---- EXEFILE = $(DESTDIR)\root.server\usr\afs\bin\fileserver.exe + EXERES = $(OUT)\fileserver.res + EXEOBJS =\ $(OUT)\afsfileprocs.obj \ $(OUT)\callback.obj \ $(OUT)\host.obj \ $(OUT)\physio.obj \ $(OUT)\viced.obj \ ! $(OUT)\AFS_component_version_number.obj EXELIBS = \ $(DESTDIR)\lib\afs\afscmd.lib \ *************** *** 59,65 **** $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib ! $(EXEFILE): $(EXEOBJS) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) --- 60,66 ---- $(DESTDIR)\lib\afs\afsprocmgmt.lib \ $(DESTDIR)\lib\afs\afseventlog.lib ! $(EXEFILE): $(EXEOBJS) $(EXERES) $(EXELIBS) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) $(EXEPREP) *************** *** 68,85 **** # Build cbd - not generally distributed debugging program CBD = $(DESTDIR)\root.server\usr\afs\bin\cbd.exe $(OUT)\cbd.obj: callback.c AFS_component_version_number.h $(C2OBJ) callback.c -DINTERPRET_DUMP ! $(CBD): $(OUT)\cbd.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) ############################################################################ # generate versioninfo resources ! $(OUT)\fileserver.res: AFS_component_version_number.h ! install: $(INCFILES) $(OUT)\fileserver.res $(CBD) mkdir: --- 69,90 ---- # Build cbd - not generally distributed debugging program CBD = $(DESTDIR)\root.server\usr\afs\bin\cbd.exe + CBDRES = $(OUT)\cbd.res + $(OUT)\cbd.obj: callback.c AFS_component_version_number.h $(C2OBJ) callback.c -DINTERPRET_DUMP ! $(CBD): $(OUT)\cbd.obj $(CBDRES) $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) ############################################################################ # generate versioninfo resources ! $(EXERES): AFS_component_version_number.h ! ! $(CBDRES): AFS_component_version_number.h ! install: $(INCFILES) $(EXERES) $(CBD) $(CBDRES) mkdir: Index: openafs/src/viced/callback.c diff -c openafs/src/viced/callback.c:1.77.2.5 openafs/src/viced/callback.c:1.77.2.6 *** openafs/src/viced/callback.c:1.77.2.5 Tue Aug 21 04:30:27 2007 --- openafs/src/viced/callback.c Mon Sep 3 00:00:21 2007 *************** *** 85,91 **** #include RCSID ! ("$Header: /cvs/openafs/src/viced/callback.c,v 1.77.2.5 2007/08/21 08:30:27 jaltman Exp $"); #include #include /* for malloc() */ --- 85,91 ---- #include RCSID ! ("$Header: /cvs/openafs/src/viced/callback.c,v 1.77.2.6 2007/09/03 04:00:21 shadow Exp $"); #include #include /* for malloc() */ *************** *** 2352,2359 **** goto done; } cbdsk[idx].index = cbi; ! iov[idx].iov_base = (char *)&cbdsk[idx]; ! len += iov[idx].iov_len = sizeof(struct CBDiskEntry); iovcnt++; if ((iovcnt == 16) || (!cb->cnext)) { if (fs_stateWriteV(state, iov, iovcnt)) { --- 2352,2359 ---- goto done; } cbdsk[idx].index = cbi; ! iov[iovcnt].iov_base = (char *)&cbdsk[idx]; ! len += iov[iovcnt].iov_len = sizeof(struct CBDiskEntry); iovcnt++; if ((iovcnt == 16) || (!cb->cnext)) { if (fs_stateWriteV(state, iov, iovcnt)) { Index: openafs/src/viced/cbd.rc diff -c /dev/null openafs/src/viced/cbd.rc:1.1.2.2 *** /dev/null Thu Sep 20 01:06:55 2007 --- openafs/src/viced/cbd.rc Wed Sep 19 13:58:48 2007 *************** *** 0 **** --- 1,17 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* Define VERSIONINFO resource */ + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS File Server Callback Debugging Tool" + #define AFS_VERINFO_NAME "cbd" + #define AFS_VERINFO_FILENAME "cbd.exe" + + #include "AFS_component_version_number.h" + #include "..\config\NTVersioninfo.rc" Index: openafs/src/vol/ihandle.c diff -c openafs/src/vol/ihandle.c:1.19 openafs/src/vol/ihandle.c:1.19.8.2 *** openafs/src/vol/ihandle.c:1.19 Wed Aug 18 20:22:38 2004 --- openafs/src/vol/ihandle.c Mon Sep 10 17:59:14 2007 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/ihandle.c,v 1.19 2004/08/19 00:22:38 kolya Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/ihandle.c,v 1.19.8.2 2007/09/10 21:59:14 jaltman Exp $"); #include #include *************** *** 154,159 **** --- 154,177 ---- } #endif fdCacheSize = MIN(fdMaxCacheSize, FD_DEFAULT_CACHESIZE); + + { + void *ih_sync_thread(); + #ifdef AFS_PTHREAD_ENV + pthread_t syncer; + pthread_attr_t tattr; + + pthread_attr_init(&tattr); + pthread_attr_setdetachstate(&tattr,PTHREAD_CREATE_DETACHED); + + pthread_create(&syncer, &tattr, ih_sync_thread, NULL); + #else /* AFS_PTHREAD_ENV */ + PROCESS syncer; + LWP_CreateProcess(ih_sync_thread, 16*1024, LWP_MAX_PRIORITY - 2, + NULL, "ih_syncer", &syncer); + #endif /* AFS_PTHREAD_ENV */ + } + } /* Make the file descriptor cache as big as possible. Don't this call *************** *** 840,845 **** --- 858,924 ---- return code; } + void + ih_sync_all() { + int ihash; + + IH_LOCK; + for (ihash = 0; ihash < I_HANDLE_HASH_SIZE; ihash++) { + IHandle_t *ihP, *ihPnext; + + ihP = ihashTable[ihash].ihash_head; + if (ihP) + ihP->ih_refcnt++; /* must not disappear over unlock */ + for (; ihP; ihP = ihPnext) { + + if (ihP->ih_synced) { + FdHandle_t *fdP; + + ihP->ih_synced = 0; + IH_UNLOCK; + + fdP = IH_OPEN(ihP); + if (fdP) OS_SYNC(fdP->fd_fd); + FDH_CLOSE(fdP); + + IH_LOCK; + } + + /* when decrementing the refcount, the ihandle might disappear + and we might not even be able to proceed to the next one. + Hence the gymnastics putting a hold on the next one already */ + ihPnext = ihP->ih_next; + if (ihPnext) ihPnext->ih_refcnt++; + + if (ihP->ih_refcnt > 1) { + ihP->ih_refcnt--; + } else { + IH_UNLOCK; + ih_release(ihP); + IH_LOCK; + } + + } + } + IH_UNLOCK; + } + + void * + ih_sync_thread() { + while(1) { + + #ifdef AFS_PTHREAD_ENV + sleep(10); + #else /* AFS_PTHREAD_ENV */ + IOMGR_Sleep(60); + #endif /* AFS_PTHREAD_ENV */ + + #ifndef AFS_NT40_ENV + sync(); + #endif + ih_sync_all(); + } + } /************************************************************************* Index: openafs/src/vol/ihandle.h diff -c openafs/src/vol/ihandle.h:1.10.2.1 openafs/src/vol/ihandle.h:1.10.2.2 *** openafs/src/vol/ihandle.h:1.10.2.1 Thu Jan 4 22:40:34 2007 --- openafs/src/vol/ihandle.h Fri Sep 7 00:03:49 2007 *************** *** 211,216 **** --- 211,217 ---- int ih_vid; /* Parent volume id. */ int ih_dev; /* device id. */ int ih_flags; /* Flags */ + int ih_synced; /* should be synced next time */ Inode ih_ino; /* Inode number */ int ih_refcnt; /* reference count */ struct FdHandle_s *ih_fdhead; /* List of open file desciptors */ *************** *** 466,472 **** #define FDH_WRITE(H, B, S) OS_WRITE((H)->fd_fd, B, S) #define FDH_SEEK(H, O, F) OS_SEEK((H)->fd_fd, O, F) ! #define FDH_SYNC(H) OS_SYNC((H)->fd_fd) #define FDH_TRUNC(H, L) OS_TRUNC((H)->fd_fd, L) #define FDH_SIZE(H) OS_SIZE((H)->fd_fd) --- 467,473 ---- #define FDH_WRITE(H, B, S) OS_WRITE((H)->fd_fd, B, S) #define FDH_SEEK(H, O, F) OS_SEEK((H)->fd_fd, O, F) ! #define FDH_SYNC(H) ((H->fd_ih!=NULL) ? ( H->fd_ih->ih_synced = 1) - 1 : 1) #define FDH_TRUNC(H, L) OS_TRUNC((H)->fd_fd, L) #define FDH_SIZE(H) OS_SIZE((H)->fd_fd) Index: openafs/src/vol/namei_ops.c diff -c openafs/src/vol/namei_ops.c:1.28.2.8 openafs/src/vol/namei_ops.c:1.28.2.10 *** openafs/src/vol/namei_ops.c:1.28.2.8 Mon May 14 17:43:43 2007 --- openafs/src/vol/namei_ops.c Tue Sep 11 11:38:38 2007 *************** *** 13,19 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/namei_ops.c,v 1.28.2.8 2007/05/14 21:43:43 shadow Exp $"); #ifdef AFS_NAMEI_ENV #include --- 13,19 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/namei_ops.c,v 1.28.2.10 2007/09/11 15:38:38 shadow Exp $"); #ifdef AFS_NAMEI_ENV #include *************** *** 604,609 **** --- 604,611 ---- if (p2 == -1 && p3 == VI_LINKTABLE) { /* hack at tmp to setup for set link count call. */ + memset((void *)&tfd, 0, sizeof(FdHandle_t)); /* minimalistic still, but a little cleaner */ + tfd.fd_ih = &tmp; tfd.fd_fd = fd; code = namei_SetLinkCount(&tfd, (Inode) 0, 1, 0); } *************** *** 1445,1450 **** --- 1447,1453 ---- char fpath[512]; struct afs_stat status; int parm, tag; + lb64_string_t check; (void)strcpy(fpath, dpath); (void)strcat(fpath, "/"); *************** *** 1457,1462 **** --- 1460,1469 ---- info->byteCount = status.st_size; info->inodeNumber = (Inode) flipbase64_to_int64(name); + int64_to_flipbase64(check, info->inodeNumber); + if (strcmp(name, check)) + return -1; + GetOGMFromStat(&status, &parm, &tag); if ((info->inodeNumber & NAMEI_INODESPECIAL) == NAMEI_INODESPECIAL) { /* p1 - vid, p2 - -1, p3 - type, p4 - rwvid */ Index: openafs/src/vol/vol-salvage.c diff -c openafs/src/vol/vol-salvage.c:1.51.2.7 openafs/src/vol/vol-salvage.c:1.51.2.8 *** openafs/src/vol/vol-salvage.c:1.51.2.7 Tue Jan 30 07:17:28 2007 --- openafs/src/vol/vol-salvage.c Fri Sep 7 00:03:49 2007 *************** *** 87,93 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/vol-salvage.c,v 1.51.2.7 2007/01/30 12:17:28 jaltman Exp $"); #ifndef AFS_NT40_ENV #include --- 87,93 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/vol-salvage.c,v 1.51.2.8 2007/09/07 04:03:49 shadow Exp $"); #ifndef AFS_NT40_ENV #include *************** *** 2358,2363 **** --- 2358,2364 ---- vnodeIndexOffset(vcp, dir->vnodeNumber), (char *)&vnode, sizeof(vnode)); assert(lcode == sizeof(vnode)); + #if 0 #ifdef AFS_NT40_ENV nt_sync(fileSysDevice); #else *************** *** 2365,2370 **** --- 2366,2374 ---- * an open FD on the file itself to fsync. */ #endif + #else + vnodeInfo[vLarge].handle->ih_synced = 1; + #endif code = IH_DEC(dir->ds_linkH, oldinode, dir->rwVid); assert(code == 0); dir->dirHandle = newdir; *************** *** 2828,2833 **** --- 2832,2842 ---- SalvageDir(volHeader.name, vid, dirVnodeInfo, alinkH, i, &rootdir, &rootdirfound); } + #ifdef AFS_NT40_ENV + nt_sync(fileSysDevice); + #else + sync(); /* This used to be done lower level, for every dir */ + #endif if (Showmode) { IH_RELEASE(h); return 0; Index: openafs/src/vol/volume.c diff -c openafs/src/vol/volume.c:1.43.2.6 openafs/src/vol/volume.c:1.43.2.9 *** openafs/src/vol/volume.c:1.43.2.6 Fri Aug 10 00:13:05 2007 --- openafs/src/vol/volume.c Thu Sep 20 00:09:45 2007 *************** *** 22,28 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/volume.c,v 1.43.2.6 2007/08/10 04:13:05 shadow Exp $"); #include #include --- 22,28 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/volume.c,v 1.43.2.9 2007/09/20 04:09:45 shadow Exp $"); #include #include *************** *** 2723,2752 **** vp = NULL; break; } - if (vp->pending_vol_op && !VVolOpLeaveOnline_r(vp, vp->pending_vol_op)) { - if (client_ec) { - /* see CheckVnode() in afsfileprocs.c for an explanation - * of this error code logic */ - afs_uint32 now = FT_ApproxTime(); - if ((vp->stats.last_vol_op + (10 * 60)) >= now) { - *client_ec = VBUSY; - } else { - *client_ec = VRESTARTING; - } - } - *ec = VOFFLINE; - vp = NULL; - break; - } - - if (V_attachState(vp) == VOL_STATE_UNATTACHED) { - *ec = VOFFLINE; - vp = NULL; - break; - } - #endif /* AFS_DEMAND_ATTACH_FS */ - LoadVolumeHeader(ec, vp); if (*ec) { VGET_CTR_INC(V6); --- 2723,2730 ---- vp = NULL; break; } + #endif LoadVolumeHeader(ec, vp); if (*ec) { VGET_CTR_INC(V6); *************** *** 2770,2775 **** --- 2748,2777 ---- break; } + #ifdef AFS_DEMAND_ATTACH_FS + if (vp->pending_vol_op && !VVolOpLeaveOnline_r(vp, vp->pending_vol_op)) { + if (client_ec) { + /* see CheckVnode() in afsfileprocs.c for an explanation + * of this error code logic */ + afs_uint32 now = FT_ApproxTime(); + if ((vp->stats.last_vol_op + (10 * 60)) >= now) { + *client_ec = VBUSY; + } else { + *client_ec = VRESTARTING; + } + } + *ec = VOFFLINE; + vp = NULL; + break; + } + + if (V_attachState(vp) == VOL_STATE_UNATTACHED) { + *ec = VOFFLINE; + vp = NULL; + break; + } + #endif /* AFS_DEMAND_ATTACH_FS */ + VGET_CTR_INC(V7); if (vp->shuttingDown) { VGET_CTR_INC(V8); *************** *** 4456,4462 **** UpdateList = (VolumeId *) malloc(sizeof(VolumeId) * updateSize); } else { if (nUpdatedVolumes == updateSize) { ! updateSize << 1; if (updateSize > 524288) { Log("warning: there is likely a bug in the volume update scanner\n"); return; --- 4458,4464 ---- UpdateList = (VolumeId *) malloc(sizeof(VolumeId) * updateSize); } else { if (nUpdatedVolumes == updateSize) { ! updateSize <<= 1; if (updateSize > 524288) { Log("warning: there is likely a bug in the volume update scanner\n"); return; *************** *** 6194,6200 **** VOL_LOCK; for (diskP = DiskPartitionList; diskP; diskP = diskP->next) { ! id = diskP->device; vol_count[id] = diskP->vol_list.len; part_exists[id] = 1; } --- 6196,6202 ---- VOL_LOCK; for (diskP = DiskPartitionList; diskP; diskP = diskP->next) { ! id = diskP->index; vol_count[id] = diskP->vol_list.len; part_exists[id] = 1; }