Index: openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utils.rc:1.2.14.1 *** openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utils.rc:1.2 Thu Apr 1 14:09:30 2004 --- openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utils.rc Tue Oct 28 13:58:59 2008 *************** *** 16,23 **** // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS °²×°ÊµÓóÌÐò DLL" ! #define AFS_VERINFO_NAME "afs_setup_utmls" ! #define AFS_VERINFO_FILENAME "afs_setup_utmls.exe" #define AFS_VERINFO_LANG_CODE 0x804 #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" --- 16,23 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS °²×°ÊµÓóÌÐò DLL" ! #define AFS_VERINFO_NAME "afs_setup_utils" ! #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" #define AFS_VERINFO_LANG_CODE 0x804 #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" Index: openafs/src/WINNT/afsd/NTMakefile diff -c openafs/src/WINNT/afsd/NTMakefile:1.46.2.14 openafs/src/WINNT/afsd/NTMakefile:1.46.2.15 *** openafs/src/WINNT/afsd/NTMakefile:1.46.2.14 Wed Jul 2 08:48:12 2008 --- openafs/src/WINNT/afsd/NTMakefile Sat Oct 18 13:01:19 2008 *************** *** 405,411 **** secur32.lib \ ole32.lib \ oleaut32.lib \ ! iphlpapi.lib shell32.lib AFSD_EXELIBS =\ $(DESTDIR)\lib\libosi.lib \ --- 405,411 ---- secur32.lib \ ole32.lib \ oleaut32.lib \ ! iphlpapi.lib shell32.lib shlwapi.lib AFSD_EXELIBS =\ $(DESTDIR)\lib\libosi.lib \ Index: openafs/src/WINNT/afsd/afsd_init.c diff -c openafs/src/WINNT/afsd/afsd_init.c:1.79.2.52 openafs/src/WINNT/afsd/afsd_init.c:1.79.2.53 *** openafs/src/WINNT/afsd/afsd_init.c:1.79.2.52 Fri Sep 12 10:41:30 2008 --- openafs/src/WINNT/afsd/afsd_init.c Fri Oct 31 23:38:12 2008 *************** *** 543,548 **** --- 543,580 ---- } } + + #ifndef _WIN64 + typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); + + static BOOL + is_wow64(void) + { + static BOOL bChecked = FALSE; + static BOOL bIsWow64 = FALSE; + + if (!bChecked) + { + HANDLE h1 = NULL; + LPFN_ISWOW64PROCESS fnIsWow64Process = NULL; + + h1 = GetModuleHandle("kernel32.dll"); + fnIsWow64Process = + (LPFN_ISWOW64PROCESS)GetProcAddress(h1, "IsWow64Process"); + + /* If we don't find the fnIsWow64Process function then we + * are not running in a broken Wow64 + */ + if (fnIsWow64Process) + fnIsWow64Process(GetCurrentProcess(), &bIsWow64); + + bChecked = TRUE; + } + + return bIsWow64; + } + #endif /* _WIN64 */ + /* * AFSD Initialization */ *************** *** 595,600 **** --- 627,640 ---- code = osi_InitDebug(&debugID); afsi_log("osi_InitDebug code %d", code); + #ifndef _WIN64 + if (is_wow64()) + { + *reasonP = "32-bit OpenAFS Service is incompatible with the WOW64 environment"; + return -1; + } + #endif + // osi_LockTypeSetDefault("stat"); /* comment this out for speed */ if (code != 0) { if (code == RPC_S_NO_PROTSEQS) Index: openafs/src/WINNT/afsd/afsd_service.c diff -c openafs/src/WINNT/afsd/afsd_service.c:1.52.4.30 openafs/src/WINNT/afsd/afsd_service.c:1.52.4.31 *** openafs/src/WINNT/afsd/afsd_service.c:1.52.4.30 Fri Aug 29 22:06:28 2008 --- openafs/src/WINNT/afsd/afsd_service.c Thu Nov 6 14:18:51 2008 *************** *** 1215,1221 **** } /* allow an exit to be called prior to any initialization */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 1215,1221 ---- } /* allow an exit to be called prior to any initialization */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; *************** *** 1287,1293 **** } /* allow an exit to be called post rx initialization */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 1287,1293 ---- } /* allow an exit to be called post rx initialization */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; *************** *** 1335,1341 **** } /* allow an exit to be called post smb initialization */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 1335,1341 ---- } /* allow an exit to be called post smb initialization */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; *************** *** 1381,1387 **** } /* allow an exit to be called when started */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 1381,1387 ---- } /* allow an exit to be called when started */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; *************** *** 1426,1432 **** LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_SERVICE_STOPPING); /* allow an exit to be called prior to stopping the service */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 1426,1432 ---- LogEvent(EVENTLOG_INFORMATION_TYPE, MSG_SERVICE_STOPPING); /* allow an exit to be called prior to stopping the service */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; *************** *** 1486,1492 **** cm_VolStatus_Finalize(); /* allow an exit to be called after stopping the service */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 1486,1492 ---- cm_VolStatus_Finalize(); /* allow an exit to be called after stopping the service */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; Index: openafs/src/WINNT/afsd/afskfw.c diff -c openafs/src/WINNT/afsd/afskfw.c:1.28.4.20 openafs/src/WINNT/afsd/afskfw.c:1.28.4.21 *** openafs/src/WINNT/afsd/afskfw.c:1.28.4.20 Wed Aug 6 01:11:30 2008 --- openafs/src/WINNT/afsd/afskfw.c Mon Nov 3 14:56:03 2008 *************** *** 1341,1346 **** --- 1341,1348 ---- OutputDebugString("\n"); } + memset(&cellconfig, 0, sizeof(cellconfig)); + code = pkrb5_init_context(&ctx); if ( code ) goto cleanup; *************** *** 1446,1451 **** --- 1448,1458 ---- sprintf(message,"found another cell for the same principal: %s\n",cell); OutputDebugString(message); } + + if (cellconfig.linkedCell) { + free(cellconfig.linkedCell); + cellconfig.linkedCell = NULL; + } code = KFW_AFS_get_cellconfig( cells[cell_count], (void*)&cellconfig, local_cell); if ( code ) continue; *************** *** 1476,1481 **** --- 1483,1490 ---- free(pname); if ( cc ) pkrb5_cc_close(ctx, cc); + if ( cellconfig.linkedCell ) + free(cellconfig.linkedCell); if ( code && reasonP ) { *reasonP = (char *)perror_message(code); *************** *** 1627,1632 **** --- 1636,1643 ---- OutputDebugString("KFW_AFS_renew_expiring_tokens\n"); } + memset(&cellconfig, 0, sizeof(cellconfig)); + code = pkrb5_init_context(&ctx); if (code) goto cleanup; *************** *** 1668,1673 **** --- 1679,1688 ---- OutputDebugString(cells[cell_count]); OutputDebugString("\n"); } + if (cellconfig.linkedCell) { + free(cellconfig.linkedCell); + cellconfig.linkedCell = NULL; + } code = KFW_AFS_get_cellconfig( cells[cell_count], (void*)&cellconfig, local_cell); if ( code ) continue; realm = afs_realm_of_cell(ctx, &cellconfig); // do not free *************** *** 1700,1705 **** --- 1715,1722 ---- pkrb5_cc_close(ctx,cc); if ( ctx ) pkrb5_free_context(ctx); + if (cellconfig.linkedCell) + free(cellconfig.linkedCell); return 0; } *************** *** 1744,1749 **** --- 1761,1768 ---- struct afsconf_cell cellconfig; char local_cell[CELL_MAXNAMELEN+1]; + memset(&cellconfig, 0, sizeof(cellconfig)); + while ( count-- ) { code = pkrb5_parse_name(ctx, principals[count], &princ); if (code) goto loop_cleanup; *************** *** 1751,1756 **** --- 1770,1779 ---- code = KFW_get_ccache(ctx, princ, &cc); if (code) goto loop_cleanup; + if (cellconfig.linkedCell) { + free(cellconfig.linkedCell); + cellconfig.linkedCell = NULL; + } code = KFW_AFS_get_cellconfig( cell, (void*)&cellconfig, local_cell); if ( code ) goto loop_cleanup; *************** *** 1814,1819 **** --- 1837,1846 ---- pkrb5_free_principal(ctx, service); princ = 0; } + if (cellconfig.linkedCell) { + free(cellconfig.linkedCell); + cellconfig.linkedCell = NULL; + } KFW_AFS_update_cell_princ_map(ctx, cell, principals[count], code ? FALSE : TRUE); free(principals[count]); *************** *** 1824,1830 **** cleanup: if (ctx) ! pkrb5_free_context(ctx); return (code ? FALSE : TRUE); } --- 1851,1857 ---- cleanup: if (ctx) ! pkrb5_free_context(ctx); return (code ? FALSE : TRUE); } *************** *** 2810,2815 **** --- 2837,2843 ---- if (!pkrb5_init_context) return 0; + memset(&ak_cellconfig, 0, sizeof(ak_cellconfig)); memset(RealmName, '\0', sizeof(RealmName)); memset(CellName, '\0', sizeof(CellName)); memset(ServiceName, '\0', sizeof(ServiceName)); *************** *** 3318,3323 **** --- 3346,3353 ---- pkrb5_cc_close(ctx, cc); if (ctx && (ctx != alt_ctx)) pkrb5_free_context(ctx); + if (ak_cellconfig.linkedCell) + free(ak_cellconfig.linkedCell); return(rc? rc : code); } *************** *** 3365,3370 **** --- 3395,3401 ---- { int rc; char newcell[CELL_MAXNAMELEN+1]; + char linkedcell[CELL_MAXNAMELEN+1]=""; local_cell[0] = (char)0; memset(cellconfig, 0, sizeof(*cellconfig)); *************** *** 3379,3393 **** strcpy(cell, local_cell); /* WIN32: cm_SearchCellFile(cell, pcallback, pdata) */ ! strcpy(cellconfig->name, cell); ! ! rc = cm_SearchCellFile(cell, newcell, get_cellconfig_callback, (void*)cellconfig); #ifdef AFS_AFSDB_ENV if (rc != 0) { int ttl; rc = cm_SearchCellByDNS(cell, newcell, &ttl, get_cellconfig_callback, (void*)cellconfig); } #endif return rc; } --- 3410,3428 ---- strcpy(cell, local_cell); /* WIN32: cm_SearchCellFile(cell, pcallback, pdata) */ ! rc = cm_SearchCellFileEx(cell, newcell, linkedcell, get_cellconfig_callback, (void*)cellconfig); #ifdef AFS_AFSDB_ENV if (rc != 0) { int ttl; rc = cm_SearchCellByDNS(cell, newcell, &ttl, get_cellconfig_callback, (void*)cellconfig); } #endif + + if (rc == 0) { + strcpy(cellconfig->name, newcell); + if (linkedcell[0]) + cellconfig->linkedCell = strdup(linkedcell); + } return rc; } Index: openafs/src/WINNT/afsd/cm_aclent.c diff -c openafs/src/WINNT/afsd/cm_aclent.c:1.14.2.7 openafs/src/WINNT/afsd/cm_aclent.c:1.14.2.8 *** openafs/src/WINNT/afsd/cm_aclent.c:1.14.2.7 Fri Aug 22 14:10:00 2008 --- openafs/src/WINNT/afsd/cm_aclent.c Sat Oct 18 00:45:05 2008 *************** *** 337,339 **** --- 337,365 ---- } lock_ReleaseWrite(&cm_aclLock); } + + /* + * Invalidate ACL info for a user that has just obtained or lost tokens. + */ + void + cm_ResetACLCache(cm_user_t *userp) + { + cm_scache_t *scp; + int hash; + + lock_ObtainWrite(&cm_scacheLock); + for (hash=0; hash < cm_data.scacheHashTableSize; hash++) { + for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { + cm_HoldSCacheNoLock(scp); + lock_ReleaseWrite(&cm_scacheLock); + lock_ObtainWrite(&scp->rw); + cm_InvalidateACLUser(scp, userp); + lock_ReleaseWrite(&scp->rw); + lock_ObtainWrite(&cm_scacheLock); + cm_ReleaseSCacheNoLock(scp); + } + } + lock_ReleaseWrite(&cm_scacheLock); + } + + Index: openafs/src/WINNT/afsd/cm_aclent.h diff -c openafs/src/WINNT/afsd/cm_aclent.h:1.6.2.1 openafs/src/WINNT/afsd/cm_aclent.h:1.6.2.2 *** openafs/src/WINNT/afsd/cm_aclent.h:1.6.2.1 Tue Feb 5 12:11:45 2008 --- openafs/src/WINNT/afsd/cm_aclent.h Sat Oct 18 00:45:05 2008 *************** *** 47,50 **** --- 47,52 ---- extern long cm_ShutdownACLCache(void); + extern void cm_ResetACLCache(cm_user_t *userp); + #endif /* _CM_ACLENT_H_ */ Index: openafs/src/WINNT/afsd/cm_btree.c diff -c openafs/src/WINNT/afsd/cm_btree.c:1.1.2.21 openafs/src/WINNT/afsd/cm_btree.c:1.1.2.22 *** openafs/src/WINNT/afsd/cm_btree.c:1.1.2.21 Wed Jul 23 17:20:45 2008 --- openafs/src/WINNT/afsd/cm_btree.c Sun Oct 19 19:19:33 2008 *************** *** 1588,1593 **** --- 1588,1597 ---- } entry = cm_ClientStringToNormStringAlloc(centry, -1, NULL); + if (!entry) { + rc = EINVAL; + goto done; + } key.name = entry; lock_AssertAny(&op->scp->dirlock); *************** *** 1680,1685 **** --- 1684,1693 ---- } entry = cm_ClientStringToNormStringAlloc(centry, -1, NULL); + if (!entry) { + rc = EINVAL; + goto done; + } key.name = entry; lock_AssertAny(&op->scp->dirlock); *************** *** 1767,1772 **** --- 1775,1784 ---- } normalizedName = cm_ClientStringToNormStringAlloc(entry, -1, NULL); + if (!normalizedName) { + rc = EINVAL; + goto done; + } key.name = normalizedName; lock_AssertWrite(&op->scp->dirlock); *************** *** 1833,1838 **** --- 1845,1854 ---- } normalizedEntry = cm_ClientStringToNormStringAlloc(centry, -1, NULL); + if (!normalizedEntry) { + rc = EINVAL; + goto done; + } key.name = normalizedEntry; lock_AssertWrite(&op->scp->dirlock); *************** *** 2000,2005 **** --- 2016,2027 ---- } data.cname = cm_FsStringToClientStringAlloc(dep->name, -1, NULL); + if (data.cname == NULL) { + #ifdef DEBUG + DebugBreak(); + #endif + return 0; + } data.fsname = cm_FsStrDup(dep->name); data.shortform = FALSE; *************** *** 2017,2027 **** --- 2039,2051 ---- key.name = wshortName; data.cname = cm_FsStringToClientStringAlloc(dep->name, -1, NULL); + if (data.cname) { data.fsname = cm_FsStrDup(dep->name); data.shortform = TRUE; insert(scp->dirBplus, key, data); } + } if (normalized_name) free(normalized_name); Index: openafs/src/WINNT/afsd/cm_cell.c diff -c openafs/src/WINNT/afsd/cm_cell.c:1.23.2.25 openafs/src/WINNT/afsd/cm_cell.c:1.23.2.27 *** openafs/src/WINNT/afsd/cm_cell.c:1.23.2.25 Thu Sep 11 13:05:32 2008 --- openafs/src/WINNT/afsd/cm_cell.c Mon Nov 3 14:56:04 2008 *************** *** 99,105 **** rock.cellp = cp; rock.flags = flags; ! code = cm_SearchCellFile(cp->name, NULL, cm_AddCellProc, &rock); if (code == 0) { lock_ObtainMutex(&cp->mx); cp->timeout = time(0) + 7200; --- 99,105 ---- rock.cellp = cp; rock.flags = flags; ! code = cm_SearchCellFileEx(cp->name, NULL, cp->linkedName, cm_AddCellProc, &rock); if (code == 0) { lock_ObtainMutex(&cp->mx); cp->timeout = time(0) + 7200; *************** *** 158,171 **** cm_cell_t *cp, *cp2; long code; char fullname[CELL_MAXNAMELEN]=""; int hasWriteLock = 0; int hasMutex = 0; afs_uint32 hash; cm_cell_rock_t rock; ! if (!strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH)) return NULL; hash = CM_CELL_NAME_HASH(namep); lock_ObtainRead(&cm_cellLock); --- 158,188 ---- cm_cell_t *cp, *cp2; long code; char fullname[CELL_MAXNAMELEN]=""; + char linkedName[CELL_MAXNAMELEN]=""; + char name[CELL_MAXNAMELEN]=""; int hasWriteLock = 0; int hasMutex = 0; afs_uint32 hash; cm_cell_rock_t rock; + size_t len; ! if (namep == NULL || !namep[0] || !strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH)) return NULL; + /* + * Strip off any trailing dots at the end of the cell name. + * Failure to do so results in an undesireable alias as the + * result of DNS AFSDB record lookups where a trailing dot + * has special meaning. + */ + strncpy(name, namep, CELL_MAXNAMELEN); + for (len = strlen(namep); len > 0 && namep[len-1] == '.'; len--) { + name[len-1] = '\0'; + } + if (len == 0) + return NULL; + namep = name; + hash = CM_CELL_NAME_HASH(namep); lock_ObtainRead(&cm_cellLock); *************** *** 254,263 **** rock.cellp = cp; rock.flags = flags; ! code = cm_SearchCellFile(namep, fullname, cm_AddCellProc, &rock); if (code) { ! osi_Log3(afsd_logp,"in cm_GetCell_gen cm_SearchCellFile(%s) returns code= %d fullname= %s", ! osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname)); #ifdef AFS_AFSDB_ENV if (cm_dnsEnabled) { --- 271,281 ---- rock.cellp = cp; rock.flags = flags; ! code = cm_SearchCellFileEx(namep, fullname, linkedName, cm_AddCellProc, &rock); if (code) { ! osi_Log4(afsd_logp,"in cm_GetCell_gen cm_SearchCellFileEx(%s) returns code= %d fullname= %s linkedName= %s", ! osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname), ! osi_LogSaveString(afsd_logp,linkedName)); #ifdef AFS_AFSDB_ENV if (cm_dnsEnabled) { *************** *** 322,327 **** --- 340,348 ---- strncpy(cp->name, fullname, CELL_MAXNAMELEN); cp->name[CELL_MAXNAMELEN-1] = '\0'; + strncpy(cp->linkedName, linkedName, CELL_MAXNAMELEN); + cp->linkedName[CELL_MAXNAMELEN-1] = '\0'; + cm_AddCellToNameHashTable(cp); cm_AddCellToIDHashTable(cp); lock_ReleaseMutex(&cp->mx); *************** *** 355,360 **** --- 376,401 ---- newnamep[0] = '\0'; } } + + if (cp && cp->linkedName[0]) { + cm_cell_t * linkedCellp = NULL; + + if (!strcmp(cp->name, cp->linkedName)) { + cp->linkedName[0] = '\0'; + } else if (!(flags & CM_FLAG_NOMOUNTCHASE)) { + linkedCellp = cm_GetCell(cp->linkedName, CM_FLAG_CREATE|CM_FLAG_NOPROBE|CM_FLAG_NOMOUNTCHASE); + + lock_ObtainWrite(&cm_cellLock); + if (!linkedCellp || + (linkedCellp->linkedName[0] && strcmp(cp->name, linkedCellp->linkedName))) { + cp->linkedName[0] = '\0'; + } else { + strncpy(linkedCellp->linkedName, cp->name, CELL_MAXNAMELEN); + linkedCellp->linkedName[CELL_MAXNAMELEN-1]='\0'; + } + lock_ReleaseWrite(&cm_cellLock); + } + } return cp; } Index: openafs/src/WINNT/afsd/cm_cell.h diff -c openafs/src/WINNT/afsd/cm_cell.h:1.7.6.10 openafs/src/WINNT/afsd/cm_cell.h:1.7.6.11 *** openafs/src/WINNT/afsd/cm_cell.h:1.7.6.10 Tue Sep 2 16:18:33 2008 --- openafs/src/WINNT/afsd/cm_cell.h Mon Nov 3 14:56:06 2008 *************** *** 27,32 **** --- 27,33 ---- osi_mutex_t mx; /* mutex locking fields (flags) */ long flags; /* locked by mx */ time_t timeout; /* if dns, time at which the server addrs expire (mx) */ + char linkedName[CELL_MAXNAMELEN]; /* linked cell name; cm_cellLock */ } cm_cell_t; /* These are bit flag values */ Index: openafs/src/WINNT/afsd/cm_config.c diff -c openafs/src/WINNT/afsd/cm_config.c:1.26.4.9 openafs/src/WINNT/afsd/cm_config.c:1.26.4.11 *** openafs/src/WINNT/afsd/cm_config.c:1.26.4.9 Wed Aug 13 22:34:32 2008 --- openafs/src/WINNT/afsd/cm_config.c Thu Nov 6 17:09:18 2008 *************** *** 112,125 **** * newCellNamep. Anomaly: if cellNamep is ambiguous, we may modify * newCellNamep but return an error code. * ! * newCellNamep is required to be CELL_MAXNAMELEN in size. */ long cm_SearchCellFile(char *cellNamep, char *newCellNamep, cm_configProc_t *procp, void *rockp) { char wdir[MAX_PATH]=""; FILE *tfilep = NULL, *bestp, *tempp; ! char *tp; char lineBuffer[257]; struct hostent *thp; char *valuep; --- 112,135 ---- * newCellNamep. Anomaly: if cellNamep is ambiguous, we may modify * newCellNamep but return an error code. * ! * Linked Cells: the CellServDB format permits linked cells ! * >cell [linked-cell] #Description ! * ! * newCellNamep and linkedNamep are required to be CELL_MAXNAMELEN in size. */ long cm_SearchCellFile(char *cellNamep, char *newCellNamep, cm_configProc_t *procp, void *rockp) { + return cm_SearchCellFileEx(cellNamep, newCellNamep, NULL, procp, rockp); + } + + long cm_SearchCellFileEx(char *cellNamep, char *newCellNamep, + char *linkedNamep, + cm_configProc_t *procp, void *rockp) + { char wdir[MAX_PATH]=""; FILE *tfilep = NULL, *bestp, *tempp; ! char *tp, *linkp; char lineBuffer[257]; struct hostent *thp; char *valuep; *************** *** 147,152 **** --- 157,163 ---- #endif /* have we seen the cell line for the guy we're looking for? */ while (1) { + linkp = NULL; tp = fgets(lineBuffer, sizeof(lineBuffer), tfilep); if (tracking) (void) fgets(lineBuffer, sizeof(lineBuffer), bestp); *************** *** 182,187 **** --- 193,203 ---- /* skip blank lines */ if (lineBuffer[0] == 0) continue; + /* + * The format is: + * >[cell] [linked-cell] #[Description] + * where linked-cell and Description are optional + */ if (lineBuffer[0] == '>') { if (inRightCell) { fclose(tfilep); *************** *** 189,201 **** return(foundCell ? 0 : -6); } ! /* trim off at white space or '#' chars */ ! tp = strchr(lineBuffer, ' '); ! if (tp) *tp = 0; ! tp = strchr(lineBuffer, '\t'); ! if (tp) *tp = 0; ! tp = strchr(lineBuffer, '#'); ! if (tp) *tp = 0; /* now see if this is the right cell */ if (stricmp(lineBuffer+1, cellNamep) == 0) { --- 205,225 ---- return(foundCell ? 0 : -6); } ! /* ! * terminate the cellname at the first white space ! * leaving 'tp' pointing to the next string if any ! */ ! for (tp = &lineBuffer[1]; tp && !isspace(*tp); tp++); ! if (tp) { ! *tp = '\0'; ! for (tp++ ;tp && isspace(*tp); tp++); ! if (*tp != '#') { ! linkp = tp; ! for (; tp && !isspace(*tp); tp++); ! if (tp) ! *tp = '\0'; ! } ! } /* now see if this is the right cell */ if (stricmp(lineBuffer+1, cellNamep) == 0) { *************** *** 205,210 **** --- 229,239 ---- newCellNamep[CELL_MAXNAMELEN-1] = '\0'; strlwr(newCellNamep); } + if (linkedNamep) { + strncpy(linkedNamep, linkp ? linkp : "", CELL_MAXNAMELEN); + linkedNamep[CELL_MAXNAMELEN-1] = '\0'; + strlwr(linkedNamep); + } inRightCell = 1; tracking = 0; #ifdef CELLSERV_DEBUG *************** *** 224,229 **** --- 253,263 ---- newCellNamep[CELL_MAXNAMELEN-1] = '\0'; strlwr(newCellNamep); } + if (linkedNamep) { + strncpy(linkedNamep, linkp ? linkp : "", CELL_MAXNAMELEN); + linkedNamep[CELL_MAXNAMELEN-1] = '\0'; + strlwr(linkedNamep); + } inRightCell = 0; tracking = 0; partial = 1; *************** *** 265,280 **** } if (!thp) { afs_uint32 ip_addr; ! int c1, c2, c3, c4; /* Since there is no gethostbyname() data * available we will read the IP address * stored in the CellServDB file */ ! code = sscanf(lineBuffer, " %d.%d.%d.%d", &c1, &c2, &c3, &c4); ! if (code == 4) { ! tp = (char *) &ip_addr; *tp++ = c1; *tp++ = c2; *tp++ = c3; --- 299,314 ---- } if (!thp) { afs_uint32 ip_addr; ! unsigned int c1, c2, c3, c4; /* Since there is no gethostbyname() data * available we will read the IP address * stored in the CellServDB file */ ! code = sscanf(lineBuffer, " %u.%u.%u.%u", &c1, &c2, &c3, &c4); ! if (code == 4 && c1<256 && c2<256 && c3<256 && c4<256) { ! tp = (unsigned char *) &ip_addr; *tp++ = c1; *tp++ = c2; *tp++ = c3; Index: openafs/src/WINNT/afsd/cm_config.h diff -c openafs/src/WINNT/afsd/cm_config.h:1.8.6.8 openafs/src/WINNT/afsd/cm_config.h:1.8.6.9 *** openafs/src/WINNT/afsd/cm_config.h:1.8.6.8 Wed Mar 19 20:01:59 2008 --- openafs/src/WINNT/afsd/cm_config.h Mon Nov 3 14:56:06 2008 *************** *** 31,40 **** extern long cm_GetRootCellName(char *namep); extern long cm_SearchCellFile(char *cellNamep, char *newCellNamep, ! cm_configProc_t *procp, void *rockp); extern long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl, ! cm_configProc_t *procp, void *rockp); extern long cm_WriteConfigString(char *labelp, char *valuep); --- 31,44 ---- extern long cm_GetRootCellName(char *namep); extern long cm_SearchCellFile(char *cellNamep, char *newCellNamep, ! cm_configProc_t *procp, void *rockp); ! ! extern long cm_SearchCellFileEx(char *cellNamep, char *newCellNamep, ! char *linkedNamep, ! cm_configProc_t *procp, void *rockp); extern long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl, ! cm_configProc_t *procp, void *rockp); extern long cm_WriteConfigString(char *labelp, char *valuep); Index: openafs/src/WINNT/afsd/cm_daemon.c diff -c openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.31 openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.32 *** openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.31 Fri Aug 22 14:10:01 2008 --- openafs/src/WINNT/afsd/cm_daemon.c Thu Nov 6 14:18:51 2008 *************** *** 533,539 **** } /* allow an exit to be called prior to stopping the service */ ! hHookDll = LoadLibrary(AFSD_HOOK_DLL); if (hHookDll) { BOOL hookRc = TRUE; --- 533,539 ---- } /* allow an exit to be called prior to stopping the service */ ! hHookDll = cm_LoadAfsdHookLib(); if (hHookDll) { BOOL hookRc = TRUE; Index: openafs/src/WINNT/afsd/cm_dir.c diff -c openafs/src/WINNT/afsd/cm_dir.c:1.4.4.20 openafs/src/WINNT/afsd/cm_dir.c:1.4.4.21 *** openafs/src/WINNT/afsd/cm_dir.c:1.4.4.20 Tue Sep 16 07:47:47 2008 --- openafs/src/WINNT/afsd/cm_dir.c Sun Oct 19 19:19:33 2008 *************** *** 1293,1299 **** CM_SCACHESYNC_NEEDCALLBACK | (op->lockType == CM_DIRLOCK_WRITE ? CM_SCACHESYNC_WRITE : CM_SCACHESYNC_READ) | CM_SCACHESYNC_BUFLOCKED); - code = CM_ERROR_NOTINCACHE; } --- 1293,1298 ---- Index: openafs/src/WINNT/afsd/cm_dnlc.c diff -c openafs/src/WINNT/afsd/cm_dnlc.c:1.10.4.10 openafs/src/WINNT/afsd/cm_dnlc.c:1.10.4.11 *** openafs/src/WINNT/afsd/cm_dnlc.c:1.10.4.10 Fri Aug 22 14:10:01 2008 --- openafs/src/WINNT/afsd/cm_dnlc.c Wed Oct 15 21:26:24 2008 *************** *** 114,120 **** int safety; int writeLocked = 0; ! if (!cm_useDnlc) return ; if (!cm_NormStrCmp(nname,_C(".")) || !cm_NormStrCmp(nname,_C(".."))) --- 114,120 ---- int safety; int writeLocked = 0; ! if (!cm_useDnlc || nname == NULL) return ; if (!cm_NormStrCmp(nname,_C(".")) || !cm_NormStrCmp(nname,_C(".."))) *************** *** 197,203 **** cm_nc_t * tnc, * tnc_begin; int safety, match; ! if (!cm_useDnlc) return NULL; if ( cm_debugDnlc ) --- 197,203 ---- cm_nc_t * tnc, * tnc_begin; int safety, match; ! if (!cm_useDnlc || nname == NULL) return NULL; if ( cm_debugDnlc ) *************** *** 344,350 **** normchar_t *ts = nname; cm_nc_t *tnc, *tmp; ! if (!cm_useDnlc) return ; if ( cm_debugDnlc ) --- 344,350 ---- normchar_t *ts = nname; cm_nc_t *tnc, *tmp; ! if (!cm_useDnlc || nname == NULL) return ; if ( cm_debugDnlc ) Index: openafs/src/WINNT/afsd/cm_ioctl.c diff -c openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.62 openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.66 *** openafs/src/WINNT/afsd/cm_ioctl.c:1.73.2.62 Wed Sep 24 18:58:32 2008 --- openafs/src/WINNT/afsd/cm_ioctl.c Mon Nov 3 14:56:07 2008 *************** *** 169,199 **** } /* - * Utility function. Used within this file. - * Invalidate ACL info for a user that has just obtained or lost tokens. - */ - void - cm_ResetACLCache(cm_user_t *userp) - { - cm_scache_t *scp; - int hash; - - lock_ObtainWrite(&cm_scacheLock); - for (hash=0; hash < cm_data.scacheHashTableSize; hash++) { - for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) { - cm_HoldSCacheNoLock(scp); - lock_ReleaseWrite(&cm_scacheLock); - lock_ObtainWrite(&scp->rw); - cm_InvalidateACLUser(scp, userp); - lock_ReleaseWrite(&scp->rw); - lock_ObtainWrite(&cm_scacheLock); - cm_ReleaseSCacheNoLock(scp); - } - } - lock_ReleaseWrite(&cm_scacheLock); - } - - /* * TranslateExtendedChars - This is a fix for TR 54482. * * If an extended character (80 - FF) is entered into a file --- 169,174 ---- *************** *** 482,490 **** clientchar_t * cellname; cellname = cm_FsStringToClientStringAlloc(cellp->name, -1, NULL); ! cm_UnparseIoctlString(ioctlp, NULL, cellname, -1); ! free(cellname); ! code = 0; } else code = CM_ERROR_NOSUCHCELL; } --- 457,469 ---- clientchar_t * cellname; cellname = cm_FsStringToClientStringAlloc(cellp->name, -1, NULL); ! if (cellname == NULL) { ! code = CM_ERROR_NOSUCHCELL; ! } else { ! cm_UnparseIoctlString(ioctlp, NULL, cellname, -1); ! free(cellname); ! code = 0; ! } } else code = CM_ERROR_NOSUCHCELL; } *************** *** 1379,1386 **** ioctlp->outDatap = basep + max * sizeof(afs_int32); cellnamep = cm_FsStringToClientStringAlloc(tcellp->name, -1, NULL); ! cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1); ! free(cellnamep); } if (tcellp) --- 1358,1369 ---- ioctlp->outDatap = basep + max * sizeof(afs_int32); cellnamep = cm_FsStringToClientStringAlloc(tcellp->name, -1, NULL); ! if (cellnamep) { ! cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1); ! free(cellnamep); ! } else { ! tcellp = NULL; ! } } if (tcellp) *************** *** 1421,1427 **** rock.cellp = cp; rock.flags = 0; ! code = cm_SearchCellFile(cp->name, cp->name, cm_AddCellProc, &rock); #ifdef AFS_AFSDB_ENV if (code) { if (cm_dnsEnabled) { --- 1404,1410 ---- rock.cellp = cp; rock.flags = 0; ! code = cm_SearchCellFileEx(cp->name, cp->name, cp->linkedName, cm_AddCellProc, &rock); #ifdef AFS_AFSDB_ENV if (code) { if (cm_dnsEnabled) { *************** *** 1477,1484 **** } else if (cm_data.rootCellp) { clientchar_t * cellnamep = cm_FsStringToClientStringAlloc(cm_data.rootCellp->name, -1, NULL); /* return the default cellname to the caller */ ! cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1); ! free(cellnamep); } else { /* if we don't know our default cell, return failure */ code = CM_ERROR_NOSUCHCELL; --- 1460,1471 ---- } else if (cm_data.rootCellp) { clientchar_t * cellnamep = cm_FsStringToClientStringAlloc(cm_data.rootCellp->name, -1, NULL); /* return the default cellname to the caller */ ! if (cellnamep) { ! cm_UnparseIoctlString(ioctlp, NULL, cellnamep, -1); ! free(cellnamep); ! } else { ! code = CM_ERROR_NOSUCHCELL; ! } } else { /* if we don't know our default cell, return failure */ code = CM_ERROR_NOSUCHCELL; *************** *** 2170,2175 **** --- 2157,2163 ---- int i; char * p, * r; + memset(&info, 0, sizeof(info)); tdir = afsconf_Open(AFSDIR_CLIENT_ETC_DIRPATH); code = afsconf_GetCellInfo(tdir, ucellp->cellp->name, "afsprot", &info); afsconf_Close(tdir); *************** *** 2195,2200 **** --- 2183,2190 ---- code = ubik_ClientInit(serverconns, &pruclient); if (code) { + if (info.linkedCell) + free(info.linkedCell); return code; } *************** *** 2228,2233 **** --- 2218,2225 ---- pruclient = NULL; } + if (info.linkedCell) + free(info.linkedCell); return 0; } #endif /* QUERY_AFSID */ Index: openafs/src/WINNT/afsd/cm_ioctl.h diff -c openafs/src/WINNT/afsd/cm_ioctl.h:1.14.2.9 openafs/src/WINNT/afsd/cm_ioctl.h:1.14.2.10 *** openafs/src/WINNT/afsd/cm_ioctl.h:1.14.2.9 Fri Jul 11 18:27:01 2008 --- openafs/src/WINNT/afsd/cm_ioctl.h Sat Oct 18 00:45:05 2008 *************** *** 141,148 **** extern void cm_InitIoctl(void); - extern void cm_ResetACLCache(cm_user_t *userp); - extern cm_ioctlQueryOptions_t * cm_IoctlGetQueryOptions(struct cm_ioctl *ioctlp, struct cm_user *userp); --- 141,146 ---- Index: openafs/src/WINNT/afsd/cm_nls.c diff -c openafs/src/WINNT/afsd/cm_nls.c:1.3.2.6 openafs/src/WINNT/afsd/cm_nls.c:1.3.2.8 *** openafs/src/WINNT/afsd/cm_nls.c:1.3.2.6 Sat Aug 9 20:01:43 2008 --- openafs/src/WINNT/afsd/cm_nls.c Tue Oct 21 21:25:38 2008 *************** *** 157,163 **** #endif if (cch_src == -1) ! cch_src = wcslen(src) + 1; if ((pIsNormalizedString && (*pIsNormalizedString)(AFS_NORM_FORM, src, cch_src)) || (!pNormalizeString)) { --- 157,163 ---- #endif if (cch_src == -1) ! cch_src = (int)wcslen(src) + 1; if ((pIsNormalizedString && (*pIsNormalizedString)(AFS_NORM_FORM, src, cch_src)) || (!pNormalizeString)) { *************** *** 381,387 **** if (cch_src == -1) { StringCchCopyW(dest, cch_dest, src); ! return wcslen(dest) + 1; } else { int cch_conv = min(cch_src, cch_dest); memcpy(dest, src, cch_conv * sizeof(cm_unichar_t)); --- 381,387 ---- if (cch_src == -1) { StringCchCopyW(dest, cch_dest, src); ! return (int)wcslen(dest) + 1; } else { int cch_conv = min(cch_src, cch_dest); memcpy(dest, src, cch_conv * sizeof(cm_unichar_t)); *************** *** 418,424 **** if (FAILED(StringCchLengthW(src, NLSMAXCCH, &cch))) return E2BIG; ! cch_src = cch+1; } { --- 418,424 ---- if (FAILED(StringCchLengthW(src, NLSMAXCCH, &cch))) return E2BIG; ! cch_src = (int)cch+1; } { *************** *** 550,555 **** --- 550,625 ---- return (int)(dest - odest); } + static int sanitize_utf16char(wchar_t c, wchar_t ** pdest, size_t * pcch) + { + if (*pcch >= 6) { + StringCchPrintfExW(*pdest, *pcch, pdest, pcch, 0, L"%%%04x", (int) c); + return 1; + } else { + return 0; + } + } + + static int sanitize_utf16string(const wchar_t * src, size_t cch_src, + wchar_t * dest, size_t cch_dest) + { + int cch_dest_o = cch_dest; + + if (dest == NULL) { + /* only estimating */ + for (cch_dest = 0; cch_src > 0;) { + if (*src >= 0xd800 && *src < 0xdc00) { + if (cch_src <= 1 || src[1] < 0xdc00 || src[1] > 0xdfff) { + /* dangling surrogate */ + src++; + cch_src --; + cch_dest += 5; + } else { + /* surrogate pair */ + src += 2; + cch_src -= 2; + cch_dest += 2; + } + } else if (*src >= 0xdc00 && *src <= 0xdfff) { + /* dangling surrogate */ + src++; + cch_src --; + cch_dest += 5; + } else { + /* normal char */ + src++; cch_src --; + cch_dest++; + } + } + + return cch_dest; + } + + while (cch_src > 0 && cch_dest > 0) { + if (*src >= 0xd800 && *src < 0xdc00) { + if (cch_src <= 1 || src[1] < 0xdc00 || src[1] > 0xdfff) { + if (!sanitize_utf16char(*src++, &dest, &cch_dest)) + return 0; + cch_src--; + } else { + /* found a surrogate pair */ + *dest++ = *src++; + *dest++ = *src++; + cch_dest -= 2; cch_src -= 2; + } + } else if (*src >= 0xdc00 && *src <= 0xdfff) { + if (!sanitize_utf16char(*src++, &dest, &cch_dest)) + return 0; + cch_src--; + } else { + *dest++ = *src++; + cch_dest--; cch_src--; + } + } + + return (cch_src == 0) ? cch_dest_o - cch_dest : 0; + } + #undef Esc #undef IS_ESCAPED #undef ESCVAL *************** *** 575,587 **** return 1; } if (cch_src == -1) { ! cch_src = strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), wsrcbuf, NLSMAXCCH); if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; --- 645,673 ---- return 1; } + if (dest && cch_dest > 0) { + dest[0] = L'\0'; + } + if (cch_src == -1) { ! cch_src = (int)strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), wsrcbuf, NLSMAXCCH); + if (cch != 0 && !cm_is_valid_utf16(wsrcbuf, cch)) { + wchar_t wsanitized[NLSMAXCCH]; + + /* We successfully converted, but the resulting UTF-16 string + has dangling surrogates. We should try and escape those + next. */ + cch = sanitize_utf16string(wsrcbuf, cch, wsanitized, NLSMAXCCH); + if (cch != 0) { + memcpy(wsrcbuf, wsanitized, cch * sizeof(wchar_t)); + } + } + if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; *************** *** 659,670 **** } if (cch_src == -1) { ! cch_src = strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), wsrcbuf, NLSMAXCCH); if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; --- 745,768 ---- } if (cch_src == -1) { ! cch_src = (int)strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), wsrcbuf, NLSMAXCCH); + if (cch != 0 && !cm_is_valid_utf16(wsrcbuf, cch)) { + wchar_t wsanitized[NLSMAXCCH]; + + /* We successfully converted, but the resulting UTF-16 string + has dangling surrogates. We should try and escape those + next. */ + cch = sanitize_utf16string(wsrcbuf, cch, wsanitized, NLSMAXCCH); + if (cch != 0) { + memcpy(wsrcbuf, wsanitized, cch * sizeof(wchar_t)); + } + } + if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; *************** *** 720,735 **** { int cch; if (!nls_init) cm_InitNormalization(); if (cch_src == -1) { ! cch_src = strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), dest, cch_dest); if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; --- 818,846 ---- { int cch; + if (cch_dest >= 1 && dest != NULL) { + dest[0] = L'\0'; + } + if (!nls_init) cm_InitNormalization(); if (cch_src == -1) { ! cch_src = (int)strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), dest, cch_dest); + if (cch != 0 && !cm_is_valid_utf16(dest, cch)) { + wchar_t wsanitized[NLSMAXCCH]; + + cch = sanitize_utf16string(dest, cch, wsanitized, NLSMAXCCH); + if (cch != 0) { + memcpy(dest, wsanitized, cch * sizeof(wchar_t)); + } + } + if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; *************** *** 786,792 **** } if (cch_src == -1) { ! cch_src = strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, --- 897,903 ---- } if (cch_src == -1) { ! cch_src = (int)strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, *************** *** 838,843 **** --- 949,976 ---- cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), ustr, cch); ustr[cch] = 0; + + if (!cm_is_valid_utf16(ustr, cch)) { + cm_unichar_t * us = NULL; + int cch_s; + + cch_s = sanitize_utf16string(ustr, cch, NULL, 0); + if (cch_s != 0) { + us = malloc(cch_s * sizeof(wchar_t)); + cch_s = sanitize_utf16string(ustr, cch, us, cch_s); + } + + if (cch_s != 0) { + free(ustr); + ustr = us; + us = NULL; + } else { + if (us) + free(us); + free(ustr); + ustr = NULL; + } + } } if (pcch_dest) *************** *** 891,902 **** } if (cch_src == -1) { ! cch_src = strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), wsrcbuf, NLSMAXCCH); if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; --- 1024,1044 ---- } if (cch_src == -1) { ! cch_src = (int)strlen(src) + 1; } cch = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, cch_src * sizeof(char), wsrcbuf, NLSMAXCCH); + if (cch != 0 && !cm_is_valid_utf16(wsrcbuf, cch)) { + wchar_t wsanitized[NLSMAXCCH]; + + cch = sanitize_utf16string(wsrcbuf, cch, wsanitized, NLSMAXCCH); + if (cch != 0) { + memcpy(wsrcbuf, wsanitized, cch * sizeof(wchar_t)); + } + } + if (cch == 0) { if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) { char sanitized[NLSMAXCCH]; *************** *** 1033,1039 **** if (FAILED(StringCchLengthW(str2, len, &cch2))) cch2 = len; ! rv = CompareStringW(nls_lcid, NORM_IGNORECASE, str1, cch1, str2, cch2); if (rv > 0) return (rv - 2); else { --- 1175,1181 ---- if (FAILED(StringCchLengthW(str2, len, &cch2))) cch2 = len; ! rv = CompareStringW(nls_lcid, NORM_IGNORECASE, str1, (int)cch1, str2, (int)cch2); if (rv > 0) return (rv - 2); else { *************** *** 1080,1086 **** if (!nls_init) cm_InitNormalization(); ! len = wcslen(str) + 1; rv = LCMapStringW(nls_lcid, LCMAP_LOWERCASE, str, len, str, len); #ifdef DEBUG if (rv == 0) { --- 1222,1228 ---- if (!nls_init) cm_InitNormalization(); ! len = (int)wcslen(str) + 1; rv = LCMapStringW(nls_lcid, LCMAP_LOWERCASE, str, len, str, len); #ifdef DEBUG if (rv == 0) { *************** *** 1099,1105 **** if (!nls_init) cm_InitNormalization(); ! len = wcslen(str) + 1; rv = LCMapStringW(nls_lcid, LCMAP_UPPERCASE, str, len, str, len); #ifdef DEBUG if (rv == 0) { --- 1241,1247 ---- if (!nls_init) cm_InitNormalization(); ! len = (int)wcslen(str) + 1; rv = LCMapStringW(nls_lcid, LCMAP_UPPERCASE, str, len, str, len); #ifdef DEBUG if (rv == 0) { *************** *** 1191,1197 **** len = LCMapStringW(nls_lcid, LCMAP_UPPERCASE, wstr, len, wstrd, NLSMAXCCH); ! len = WideCharToMultiByte(CP_UTF8, 0, wstrd, -1, str, cbstr, NULL, FALSE); return str; } --- 1333,1339 ---- len = LCMapStringW(nls_lcid, LCMAP_UPPERCASE, wstr, len, wstrd, NLSMAXCCH); ! len = WideCharToMultiByte(CP_UTF8, 0, wstrd, -1, str, (int)cbstr, NULL, FALSE); return str; } *************** *** 1265,1267 **** --- 1407,1455 ---- return (wchar_t *) c; } + int cm_is_valid_utf16(const wchar_t * c, int cch) + { + if (cch < 0) + cch = wcslen(c) + 1; + + for (; cch > 0; c++, cch--) { + if (*c >= 0xd800 && *c < 0xdc00) { + c++; cch--; + if (cch == 0 || *c < 0xdc00 || *c > 0xdfff) + return 0; + } else if (*c >= 0xdc00 && *c <= 0xdfff) { + return 0; + } + } + + return 1; + } + + #ifdef DEBUG + wchar_t * cm_GetRawCharsAlloc(const wchar_t * c, int len) + { + wchar_t * ret; + wchar_t * current; + size_t cb; + + if (len == -1) + len = wcslen(c); + + if (len == 0) + return wcsdup(L"(empty)"); + + cb = len * 5 * sizeof(wchar_t); + current = ret = malloc(cb); + if (ret == NULL) + return NULL; + + for (; len > 0; ++c, --len) { + StringCbPrintfExW(current, cb, ¤t, &cb, 0, + L"%04x", (int) *c); + if (len > 1) + StringCbCatExW(current, cb, L",", ¤t, &cb, 0); + } + + return ret; + } + #endif Index: openafs/src/WINNT/afsd/cm_nls.h diff -c openafs/src/WINNT/afsd/cm_nls.h:1.3.2.3 openafs/src/WINNT/afsd/cm_nls.h:1.3.2.4 *** openafs/src/WINNT/afsd/cm_nls.h:1.3.2.3 Thu Jun 26 12:38:30 2008 --- openafs/src/WINNT/afsd/cm_nls.h Sun Oct 19 19:19:33 2008 *************** *** 132,143 **** --- 132,156 ---- #define cm_NormStrCmp wcscmp #define cm_NormCharUpr towupper + #define cm_IsValidClientString(s) cm_is_valid_utf16((s), -1) + #define cm_IsValidNormString(s) cm_is_valid_utf16((s), -1) + #define cm_Utf16ToClientString cm_Utf16ToUtf16 extern long cm_InitNormalization(void); /* Functions annotated in accordance with sal.h */ + #ifndef __in_z + + #define __out_ecount_full_z(x) + #define __out_ecount_full_z_opt(x) + #define __in_z + #define __out_z + #define __inout_z + + #endif + extern __out_ecount_full_z(*pcch_dest) __checkReturn __success(return != NULL) cm_normchar_t * cm_NormalizeStringAlloc (__in_ecount(cch_src) const cm_unichar_t * s, *************** *** 254,259 **** --- 267,279 ---- extern __out_z cm_unichar_t * cm_strupr_utf16(__inout_z cm_unichar_t * str); + extern int + cm_is_valid_utf16(__in_z const wchar_t * c, int cch); + + #ifdef DEBUG + wchar_t * cm_GetRawCharsAlloc(const wchar_t * c, int len); + #endif + #if 0 extern long cm_NormalizeUtf16StringToUtf8(const wchar_t * src, int cch_src, Index: openafs/src/WINNT/afsd/cm_utils.c diff -c openafs/src/WINNT/afsd/cm_utils.c:1.11.4.16 openafs/src/WINNT/afsd/cm_utils.c:1.11.4.19 *** openafs/src/WINNT/afsd/cm_utils.c:1.11.4.16 Tue Sep 16 07:34:31 2008 --- openafs/src/WINNT/afsd/cm_utils.c Thu Nov 6 14:18:51 2008 *************** *** 12,17 **** --- 12,18 ---- #include #include + #include #include #ifndef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK *************** *** 398,404 **** int sawDot = 0; clientchar_t tc; int charCount = 0; ! /* * can't have a leading dot; * special case for . and .. --- 399,408 ---- int sawDot = 0; clientchar_t tc; int charCount = 0; ! ! if (namep == NULL || !namep[0]) ! return 0; ! /* * can't have a leading dot; * special case for . and .. *************** *** 747,749 **** --- 751,786 ---- return retval; } + BOOL + cm_TargetPerceivedAsDirectory(const fschar_t *target) + { + char * ext; + + ext = PathFindExtension(target); + if (!ext[0]) + return TRUE; + + return FALSE; + } + + HANDLE + cm_LoadAfsdHookLib(void) + { + char dllname[260]; + char *p; + HANDLE hLib; + + if (!GetModuleFileName(NULL, dllname, sizeof(dllname))) + return NULL; + + p = strrchr(dllname, '\\'); + if (p) { + p++; + strcpy(p, AFSD_HOOK_DLL); + hLib = LoadLibrary(dllname); + } else { + hLib = LoadLibrary(AFSD_HOOK_DLL); + } + + return hLib; + } Index: openafs/src/WINNT/afsd/cm_utils.h diff -c openafs/src/WINNT/afsd/cm_utils.h:1.3.20.4 openafs/src/WINNT/afsd/cm_utils.h:1.3.20.6 *** openafs/src/WINNT/afsd/cm_utils.h:1.3.20.4 Thu Jul 31 08:39:24 2008 --- openafs/src/WINNT/afsd/cm_utils.h Thu Nov 6 14:18:51 2008 *************** *** 81,84 **** --- 81,88 ---- extern int cm_MatchMask(clientchar_t *namep, clientchar_t *maskp, int flags); + extern BOOL cm_TargetPerceivedAsDirectory(const fschar_t *target); + + extern HANDLE cm_LoadAfsdHookLib(void); + #endif /* __CM_UTILS_H_ENV__ */ Index: openafs/src/WINNT/afsd/cm_vnodeops.c diff -c openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.91 openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.93 *** openafs/src/WINNT/afsd/cm_vnodeops.c:1.69.2.91 Sat Sep 13 09:51:50 2008 --- openafs/src/WINNT/afsd/cm_vnodeops.c Tue Oct 21 21:25:38 2008 *************** *** 727,733 **** sp = (cm_lookupSearch_t *) rockp; ! cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)); if (sp->caseFold) match = cm_NormStrCmpI(matchName, sp->nsearchNamep); else --- 727,737 ---- sp = (cm_lookupSearch_t *) rockp; ! if (cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)) == 0) { ! /* Can't normalize FS string. */ ! return 0; ! } ! if (sp->caseFold) match = cm_NormStrCmpI(matchName, sp->nsearchNamep); else *************** *** 1040,1046 **** --- 1044,1058 ---- } nnamep = cm_ClientStringToNormStringAlloc(cnamep, -1, NULL); + if (!nnamep) { + code = CM_ERROR_NOSUCHFILE; + goto done; + } fnamep = cm_ClientStringToFsStringAlloc(cnamep, -1, NULL); + if (!fnamep) { + code = CM_ERROR_NOSUCHFILE; + goto done; + } if (flags & CM_FLAG_NOMOUNTCHASE) { /* In this case, we should go and call cm_Dir* functions *************** *** 1235,1241 **** if (nnamep) free(nnamep); nnamep = cm_ClientStringToNormStringAlloc(cnamep, -1, NULL); ! cm_dnlcEnter(dscp, nnamep, tscp); } lock_ReleaseRead(&dscp->rw); } --- 1247,1254 ---- if (nnamep) free(nnamep); nnamep = cm_ClientStringToNormStringAlloc(cnamep, -1, NULL); ! if (nnamep) ! cm_dnlcEnter(dscp, nnamep, tscp); } lock_ReleaseRead(&dscp->rw); } *************** *** 1755,1766 **** --- 1768,1786 ---- StringCchCatA(tsp->data,lengthof(tsp->data), "\\"); StringCchCatA(tsp->data,lengthof(tsp->data), pathSuffixp); } + if (code == 0) { clientchar_t * cpath = cm_FsStringToClientStringAlloc(tsp->data, -1, NULL); + if (cpath != NULL) { cm_ClientStrCpy(tsp->wdata, lengthof(tsp->wdata), cpath); free(cpath); *newSpaceBufferp = tsp; } else { + code = CM_ERROR_NOSUCHPATH; + } + } + + if (code != 0) { cm_FreeSpace(tsp); if (code == CM_ERROR_PATH_NOT_COVERED && reqp->tidPathp && reqp->relPathp) { Index: openafs/src/WINNT/afsd/cm_volstat.c diff -c openafs/src/WINNT/afsd/cm_volstat.c:1.1.2.7 openafs/src/WINNT/afsd/cm_volstat.c:1.1.2.8 *** openafs/src/WINNT/afsd/cm_volstat.c:1.1.2.7 Thu Jun 26 12:38:30 2008 --- openafs/src/WINNT/afsd/cm_volstat.c Sun Oct 19 19:19:33 2008 *************** *** 325,330 **** --- 325,337 ---- cpath = cm_FsStringToClientStringAlloc(path, -1, NULL); cshare = cm_FsStringToClientStringAlloc(share, -1, NULL); + if (cpath == NULL || cshare == NULL) { + osi_Log1(afsd_logp, "Can't convert %s string. Aborting", + (cpath == NULL)? "path" : "share"); + code = CM_ERROR_NOSUCHPATH; + goto done; + } + code = cm_NameI(cm_data.rootSCachep, cpath, CM_FLAG_CASEFOLD | CM_FLAG_FOLLOW, cm_rootUserp, cshare, &req, &scp); *************** *** 385,390 **** --- 392,404 ---- cpath = cm_FsStringToClientStringAlloc(path, -1, NULL); cshare = cm_FsStringToClientStringAlloc(share, -1, NULL); + if (cpath == NULL || cshare == NULL) { + osi_Log1(afsd_logp, "Can't convert %s string. Aborting", + (cpath == NULL)? "path" : "share"); + code = CM_ERROR_NOSUCHPATH; + goto done; + } + code = cm_NameI(cm_data.rootSCachep, cpath, CM_FLAG_CASEFOLD | CM_FLAG_FOLLOW, cm_rootUserp, cshare, &req, &scp); if (code) Index: openafs/src/WINNT/afsd/cm_volume.c diff -c openafs/src/WINNT/afsd/cm_volume.c:1.14.4.55 openafs/src/WINNT/afsd/cm_volume.c:1.14.4.57 *** openafs/src/WINNT/afsd/cm_volume.c:1.14.4.55 Wed Sep 24 18:42:55 2008 --- openafs/src/WINNT/afsd/cm_volume.c Fri Nov 7 16:00:54 2008 *************** *** 750,756 **** /* otherwise, we didn't find it so consult the VLDB */ sprintf(volNameString, "%u", volumeID); code = cm_FindVolumeByName(cellp, volNameString, userp, reqp, ! flags, outVolpp); return code; } --- 750,766 ---- /* otherwise, we didn't find it so consult the VLDB */ sprintf(volNameString, "%u", volumeID); code = cm_FindVolumeByName(cellp, volNameString, userp, reqp, ! flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL, outVolpp); ! ! if (code == CM_ERROR_NOSUCHVOLUME && cellp->linkedName[0] && ! !(flags & CM_GETVOL_FLAG_IGNORE_LINKED_CELL)) { ! cm_cell_t *linkedCellp = cm_GetCell(cellp->linkedName, flags); ! ! if (linkedCellp) ! code = cm_FindVolumeByID(linkedCellp, volumeID, userp, reqp, ! flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL, ! outVolpp); ! } return code; } *************** *** 920,925 **** --- 930,945 ---- cm_PutVolume(volp); lock_ReleaseRead(&cm_volumeLock); } + + if (code == CM_ERROR_NOSUCHVOLUME && cellp->linkedName[0] && + !(flags & CM_GETVOL_FLAG_IGNORE_LINKED_CELL)) { + cm_cell_t *linkedCellp = cm_GetCell(cellp->linkedName, flags); + + if (linkedCellp) + code = cm_FindVolumeByName(linkedCellp, volumeNamep, userp, reqp, + flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL, + outVolpp); + } return code; } Index: openafs/src/WINNT/afsd/cm_volume.h diff -c openafs/src/WINNT/afsd/cm_volume.h:1.5.6.16 openafs/src/WINNT/afsd/cm_volume.h:1.5.6.17 *** openafs/src/WINNT/afsd/cm_volume.h:1.5.6.16 Wed Sep 24 18:42:55 2008 --- openafs/src/WINNT/afsd/cm_volume.h Mon Nov 3 14:56:07 2008 *************** *** 69,74 **** --- 69,75 ---- #define CM_GETVOL_FLAG_CREATE 1 #define CM_GETVOL_FLAG_NO_LRU_UPDATE 2 #define CM_GETVOL_FLAG_NO_RESET 4 + #define CM_GETVOL_FLAG_IGNORE_LINKED_CELL 8 /* hash define. Must not include the cell, since the callback revocation code * doesn't necessarily know the cell in the case of a multihomed server Index: openafs/src/WINNT/afsd/fs.c diff -c openafs/src/WINNT/afsd/fs.c:1.32.4.25 openafs/src/WINNT/afsd/fs.c:1.32.4.26 *** openafs/src/WINNT/afsd/fs.c:1.32.4.25 Tue Sep 2 17:25:55 2008 --- openafs/src/WINNT/afsd/fs.c Mon Nov 3 14:56:07 2008 *************** *** 2027,2032 **** --- 2027,2034 ---- struct ViceIoctl blob; char * parent; + memset(&info, 0, sizeof(info)); + if (as->parms[2].items) /* cell name specified */ cellName = as->parms[2].items->data; else *************** *** 2145,2150 **** --- 2147,2156 ---- #else /* not WIN32 */ code = symlink(space, path); #endif /* not WIN32 */ + + if (info.linkedCell) + free(info.linkedCell); + if (code) { Die(errno, path); return 1; *************** *** 2245,2250 **** --- 2251,2257 ---- struct afsconf_cell info; struct chservinfo checkserv; + memset(&info, 0, sizeof(info)); memset(&checkserv, 0, sizeof(struct chservinfo)); blob.in_size=sizeof(struct chservinfo); blob.in=(caddr_t)&checkserv; *************** *** 2271,2276 **** --- 2278,2285 ---- } strcpy(checkserv.tbuffer,info.name); checkserv.tsize=(int)strlen(info.name)+1; + if (info.linkedCell) + free(info.linkedCell); } else { strcpy(checkserv.tbuffer,"\0"); checkserv.tsize=0; *************** *** 3077,3082 **** --- 3086,3092 ---- } args; int error = 0; + memset(&info, 0, sizeof(info)); memset(&args, 0, sizeof(args)); /* avoid Purify UMR error */ for(ti=as->parms[0].items; ti; ti=ti->next) { /* once per cell */ *************** *** 3087,3092 **** --- 3097,3104 ---- error = 1; continue; } + if (info.linkedCell) + free(info.linkedCell); blob.in_size = 1+(long)strlen(info.name); blob.in = info.name; code = pioctl_utf8(0, VIOC_GETCELLSTATUS, &blob, 1); *************** *** 3127,3132 **** --- 3139,3146 ---- } args; int error = 0; + memset(&info, 0, sizeof(info)); + /* Check arguments. */ if (as->parms[1].items && as->parms[2].items) { fprintf(stderr, "Cannot specify both -suid and -nosuid.\n"); *************** *** 3160,3165 **** --- 3174,3181 ---- error = 1; continue; } + if (info.linkedCell) + free(info.linkedCell); strcpy(args.cname, info.name); blob.in_size = sizeof(args); blob.in = (caddr_t) &args; Index: openafs/src/WINNT/afsd/libafsconf.def diff -c openafs/src/WINNT/afsd/libafsconf.def:1.4.6.1 openafs/src/WINNT/afsd/libafsconf.def:1.4.6.2 *** openafs/src/WINNT/afsd/libafsconf.def:1.4.6.1 Fri Feb 1 16:39:41 2008 --- openafs/src/WINNT/afsd/libafsconf.def Mon Nov 3 14:56:07 2008 *************** *** 24,26 **** --- 24,27 ---- afs_uuid_create @17 afs_uuid_equal @18 cm_GetCellServDB @19 + cm_SearchCellFileEx @20 Index: openafs/src/WINNT/afsd/smb.c diff -c openafs/src/WINNT/afsd/smb.c:1.118.2.98 openafs/src/WINNT/afsd/smb.c:1.118.2.105 *** openafs/src/WINNT/afsd/smb.c:1.118.2.98 Wed Sep 3 16:41:04 2008 --- openafs/src/WINNT/afsd/smb.c Tue Oct 21 21:25:38 2008 *************** *** 236,278 **** { const char * s; switch ( code ) { ! case 0x01: s = "llegal buffer length"; break; ! case 0x03: s = "illegal command"; break; ! case 0x05: s = "command timed out"; break; ! case 0x06: s = "message incomplete, issue another command"; break; ! case 0x07: s = "illegal buffer address"; break; ! case 0x08: s = "session number out of range"; break; ! case 0x09: s = "no resource available"; break; ! case 0x0a: s = "session closed"; break; ! case 0x0b: s = "command cancelled"; break; ! case 0x0d: s = "duplicate name"; break; ! case 0x0e: s = "name table full"; break; ! case 0x0f: s = "no deletions, name has active sessions"; break; ! case 0x11: s = "local session table full"; break; ! case 0x12: s = "remote session table full"; break; ! case 0x13: s = "illegal name number"; break; ! case 0x14: s = "no callname"; break; ! case 0x15: s = "cannot put * in NCB_NAME"; break; ! case 0x16: s = "name in use on remote adapter"; break; ! case 0x17: s = "name deleted"; break; ! case 0x18: s = "session ended abnormally"; break; ! case 0x19: s = "name conflict detected"; break; ! case 0x21: s = "interface busy, IRET before retrying"; break; ! case 0x22: s = "too many commands outstanding, retry later";break; ! case 0x23: s = "ncb_lana_num field invalid"; break; ! case 0x24: s = "command completed while cancel occurring "; break; ! case 0x26: s = "command not valid to cancel"; break; ! case 0x30: s = "name defined by anther local process"; break; ! case 0x34: s = "environment undefined. RESET required"; break; ! case 0x35: s = "required OS resources exhausted"; break; ! case 0x36: s = "max number of applications exceeded"; break; ! case 0x37: s = "no saps available for netbios"; break; ! case 0x38: s = "requested resources are not available"; break; ! case 0x39: s = "invalid ncb address or length > segment"; break; ! case 0x3B: s = "invalid NCB DDID"; break; ! case 0x3C: s = "lock of user area failed"; break; ! case 0x3f: s = "NETBIOS not loaded"; break; ! case 0x40: s = "system error"; break; default: s = "unknown error"; } return s; --- 236,278 ---- { const char * s; switch ( code ) { ! case 0x01: s = "NRC_BUFLEN llegal buffer length"; break; ! case 0x03: s = "NRC_ILLCMD illegal command"; break; ! case 0x05: s = "NRC_CMDTMO command timed out"; break; ! case 0x06: s = "NRC_INCOMP message incomplete, issue another command"; break; ! case 0x07: s = "NRC_BADDR illegal buffer address"; break; ! case 0x08: s = "NRC_SNUMOUT session number out of range"; break; ! case 0x09: s = "NRC_NORES no resource available"; break; ! case 0x0a: s = "NRC_SCLOSED asession closed"; break; ! case 0x0b: s = "NRC_CMDCAN command cancelled"; break; ! case 0x0d: s = "NRC_DUPNAME duplicate name"; break; ! case 0x0e: s = "NRC_NAMTFUL name table full"; break; ! case 0x0f: s = "NRC_ACTSES no deletions, name has active sessions"; break; ! case 0x11: s = "NRC_LOCTFUL local session table full"; break; ! case 0x12: s = "NRC_REMTFUL remote session table full"; break; ! case 0x13: s = "NRC_ILLNN illegal name number"; break; ! case 0x14: s = "NRC_NOCALL no callname"; break; ! case 0x15: s = "NRC_NOWILD cannot put * in NCB_NAME"; break; ! case 0x16: s = "NRC_INUSE name in use on remote adapter"; break; ! case 0x17: s = "NRC_NAMERR name deleted"; break; ! case 0x18: s = "NRC_SABORT session ended abnormally"; break; ! case 0x19: s = "NRC_NAMCONF name conflict detected"; break; ! case 0x21: s = "NRC_IFBUSY interface busy, IRET before retrying"; break; ! case 0x22: s = "NRC_TOOMANY too many commands outstanding, retry later";break; ! case 0x23: s = "NRC_BRIDGE ncb_lana_num field invalid"; break; ! case 0x24: s = "NRC_CANOCCR command completed while cancel occurring "; break; ! case 0x26: s = "NRC_CANCEL command not valid to cancel"; break; ! case 0x30: s = "NRC_DUPENV name defined by anther local process"; break; ! case 0x34: s = "NRC_ENVNOTDEF xenvironment undefined. RESET required"; break; ! case 0x35: s = "NRC_OSRESNOTAV required OS resources exhausted"; break; ! case 0x36: s = "NRC_MAXAPPS max number of applications exceeded"; break; ! case 0x37: s = "NRC_NOSAPS no saps available for netbios"; break; ! case 0x38: s = "NRC_NORESOURCES requested resources are not available"; break; ! case 0x39: s = "NRC_INVADDRESS invalid ncb address or length > segment"; break; ! case 0x3B: s = "NRC_INVDDID invalid NCB DDID"; break; ! case 0x3C: s = "NRC_LOCKFAILlock of user area failed"; break; ! case 0x3f: s = "NRC_OPENERR NETBIOS not loaded"; break; ! case 0x40: s = "NRC_SYSTEM system error"; break; default: s = "unknown error"; } return s; *************** *** 1763,1776 **** smb_findShare_rock_t * vrock = (smb_findShare_rock_t *) rockp; normchar_t normName[MAX_PATH]; ! cm_FsStringToNormString(dep->name, -1, normName, sizeof(normName)/sizeof(normName[0])); if (!cm_ClientStrCmpNI(normName, vrock->shareName, 12)) { if(!cm_ClientStrCmpI(normName, vrock->shareName)) matchType = SMB_FINDSHARE_EXACT_MATCH; else matchType = SMB_FINDSHARE_PARTIAL_MATCH; ! if(vrock->match) free(vrock->match); vrock->match = cm_FsStringToClientStringAlloc(dep->name, -1, NULL); vrock->matchType = matchType; --- 1763,1781 ---- smb_findShare_rock_t * vrock = (smb_findShare_rock_t *) rockp; normchar_t normName[MAX_PATH]; ! if (cm_FsStringToNormString(dep->name, -1, normName, sizeof(normName)/sizeof(normName[0])) == 0) { ! osi_Log1(smb_logp, "Skipping entry [%s]. Can't normalize FS string", ! osi_LogSaveString(smb_logp, dep->name)); ! return 0; ! } if (!cm_ClientStrCmpNI(normName, vrock->shareName, 12)) { if(!cm_ClientStrCmpI(normName, vrock->shareName)) matchType = SMB_FINDSHARE_EXACT_MATCH; else matchType = SMB_FINDSHARE_PARTIAL_MATCH; ! if(vrock->match) ! free(vrock->match); vrock->match = cm_FsStringToClientStringAlloc(dep->name, -1, NULL); vrock->matchType = matchType; *************** *** 1956,1961 **** --- 1961,1968 ---- thyper.LowPart = 0; vrock.shareName = cm_ClientStringToNormStringAlloc(shareName, -1, NULL); + if (vrock.shareName == NULL) + return 0; vrock.match = NULL; vrock.matchType = 0; *************** *** 1996,2008 **** if (code == 0) { clientchar_t temp[1024]; ! cm_FsStringToClientString(ftemp, -1, temp, 1024); cm_ClientStrPrintfN(pathName, (int)lengthof(pathName), rw ? _C("/.%S/") : _C("/%S/"), temp); *pathNamep = cm_ClientStrDup(cm_ClientStrLwr(pathName)); return 1; } } /* failure */ *pathNamep = NULL; return 0; --- 2003,2016 ---- if (code == 0) { clientchar_t temp[1024]; ! if (cm_FsStringToClientString(ftemp, -1, temp, 1024) != 0) { cm_ClientStrPrintfN(pathName, (int)lengthof(pathName), rw ? _C("/.%S/") : _C("/%S/"), temp); *pathNamep = cm_ClientStrDup(cm_ClientStrLwr(pathName)); return 1; } } + } /* failure */ *pathNamep = NULL; return 0; *************** *** 3752,3765 **** osi_panic("afsd: invalid smb_vc_t detected in smb_allVCsp", __FILE__, __LINE__); nextp = vcp->nextp; ! if (vcp->flags & SMB_VCFLAG_ALREADYDEAD) continue; - smb_HoldVCNoLock(vcp); - if (nextp) - smb_HoldVCNoLock(nextp); smb_FormatResponsePacket(vcp, NULL, outp); smbp = (smb_t *)outp; outp->inCom = smbp->com = 0x2b /* Echo */; --- 3760,3783 ---- osi_panic("afsd: invalid smb_vc_t detected in smb_allVCsp", __FILE__, __LINE__); + /* on the first pass hold 'vcp' which was not held as 'nextp' */ + if (vcp != nextp) + smb_HoldVCNoLock(vcp); + + /* + * obtain a reference to 'nextp' now because we drop the + * smb_rctLock later and the list contents could change + * or 'vcp' could be destroyed when released. + */ nextp = vcp->nextp; + if (nextp) + smb_HoldVCNoLock(nextp); ! if (vcp->flags & SMB_VCFLAG_ALREADYDEAD) { ! smb_ReleaseVCNoLock(vcp); continue; + } smb_FormatResponsePacket(vcp, NULL, outp); smbp = (smb_t *)outp; outp->inCom = smbp->com = 0x2b /* Echo */; *************** *** 3778,3785 **** lock_ObtainWrite(&smb_rctLock); smb_ReleaseVCNoLock(vcp); - if (nextp) - smb_ReleaseVCNoLock(nextp); } lock_ReleaseWrite(&smb_rctLock); smb_FreePacket(outp); --- 3796,3801 ---- *************** *** 4372,4388 **** switch (scp->fileType) { case CM_SCACHETYPE_DIRECTORY: case CM_SCACHETYPE_MOUNTPOINT: - case CM_SCACHETYPE_SYMLINK: case CM_SCACHETYPE_INVALID: attr = SMB_ATTR_DIRECTORY; break; default: /* if we get here we either have a normal file * or we have a file for which we have never * received status info. In this case, we can * check the even/odd value of the entry's vnode. ! * even means it is to be treated as a directory ! * and odd means it is to be treated as a file. */ if (mustFake && (scp->fid.vnode & 0x1)) attr = SMB_ATTR_DIRECTORY; --- 4388,4409 ---- switch (scp->fileType) { case CM_SCACHETYPE_DIRECTORY: case CM_SCACHETYPE_MOUNTPOINT: case CM_SCACHETYPE_INVALID: attr = SMB_ATTR_DIRECTORY; break; + case CM_SCACHETYPE_SYMLINK: + if (cm_TargetPerceivedAsDirectory(scp->mountPointStringp)) + attr = SMB_ATTR_DIRECTORY; + else + attr = SMB_ATTR_NORMAL; + break; default: /* if we get here we either have a normal file * or we have a file for which we have never * received status info. In this case, we can * check the even/odd value of the entry's vnode. ! * odd means it is to be treated as a directory ! * and even means it is to be treated as a file. */ if (mustFake && (scp->fid.vnode & 0x1)) attr = SMB_ATTR_DIRECTORY; *************** *** 4673,4679 **** code = 0; returnedNames = 0; while (1) { ! clientchar_t *actualName; clientchar_t shortName[13]; clientchar_t *shortNameEnd; --- 4694,4701 ---- code = 0; returnedNames = 0; while (1) { ! clientchar_t *actualName = NULL; ! int free_actualName = 0; clientchar_t shortName[13]; clientchar_t *shortNameEnd; *************** *** 4818,4826 **** /* Compute 8.3 name if necessary */ actualName = cm_FsStringToClientStringAlloc(dep->name, -1, NULL); if (dep->fid.vnode != 0 && !cm_Is8Dot3(actualName)) { ! free(actualName); cm_Gen8Dot3NameInt(dep->name, &dep->fid, shortName, &shortNameEnd); actualName = shortName; } osi_Log3(smb_logp, "SMB search dir vn %d name %s (%S)", --- 4840,4859 ---- /* Compute 8.3 name if necessary */ actualName = cm_FsStringToClientStringAlloc(dep->name, -1, NULL); if (dep->fid.vnode != 0 && !cm_Is8Dot3(actualName)) { ! if (actualName) ! free(actualName); cm_Gen8Dot3NameInt(dep->name, &dep->fid, shortName, &shortNameEnd); actualName = shortName; + free_actualName = 0; + } else { + free_actualName = 1; + } + + if (actualName == NULL) { + /* Couldn't convert the name for some reason */ + osi_Log1(smb_logp, "SMB search dir skipping entry :[%s]", + osi_LogSaveString(smb_logp, dep->name)); + goto nextEntry; } osi_Log3(smb_logp, "SMB search dir vn %d name %s (%S)", *************** *** 4921,4926 **** --- 4954,4964 ---- } /* if we're including this name */ nextEntry: + if (free_actualName && actualName) { + free(actualName); + actualName = NULL; + } + /* and adjust curOffset to be where the new cookie is */ thyper.HighPart = 0; thyper.LowPart = CM_DIR_CHUNKSIZE * numDirChunks; *************** *** 5307,5327 **** cm_SyncOpDone(newScp, NULL, CM_SCACHESYNC_NEEDCALLBACK | CM_SCACHESYNC_GETSTATUS); - #ifdef undef - /* use smb_Attributes instead. Also the fact that a file is - * in a readonly volume doesn't mean it shojuld be marked as RO - */ - if (newScp->fileType == CM_SCACHETYPE_DIRECTORY || - newScp->fileType == CM_SCACHETYPE_MOUNTPOINT || - newScp->fileType == CM_SCACHETYPE_INVALID) - attrs = SMB_ATTR_DIRECTORY; - else - attrs = 0; - if ((newScp->unixModeBits & 0222) == 0 || (newScp->flags & CM_SCACHEFLAG_RO)) - attrs |= SMB_ATTR_READONLY; /* turn on read-only flag */ - #else attrs = smb_Attributes(newScp); - #endif smb_SetSMBParm(outp, 0, attrs); --- 5345,5351 ---- *************** *** 5398,5403 **** --- 5422,5442 ---- } #endif + if (!cm_IsValidClientString(pathp)) { + #ifdef DEBUG + clientchar_t * hexp; + + hexp = cm_GetRawCharsAlloc(pathp, -1); + osi_Log1(smb_logp, "CoreOpen rejecting invalid name. [%S]", + osi_LogSaveClientString(smb_logp, hexp)); + if (hexp) + free(hexp); + #else + osi_Log0(smb_logp, "CoreOpen rejecting invalid name"); + #endif + return CM_ERROR_BADNTFILENAME; + } + share = smb_GetSMBParm(inp, 0); attribute = smb_GetSMBParm(inp, 1); *************** *** 5539,5545 **** if (!(rockp->vcp->flags & SMB_VCFLAG_USEV3)) caseFold |= CM_FLAG_8DOT3; ! cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)); match = cm_MatchMask(matchName, rockp->maskp, caseFold); if (!match && (rockp->flags & SMB_MASKFLAG_TILDE) && --- 5578,5590 ---- if (!(rockp->vcp->flags & SMB_VCFLAG_USEV3)) caseFold |= CM_FLAG_8DOT3; ! if (cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)) == 0) { ! /* Can't convert name */ ! osi_Log1(smb_logp, "Skipping entry [%s]. Can't normalize FS string.", ! osi_LogSaveString(smb_logp, dep->name)); ! return 0; ! } ! match = cm_MatchMask(matchName, rockp->maskp, caseFold); if (!match && (rockp->flags & SMB_MASKFLAG_TILDE) && *************** *** 5585,5590 **** --- 5630,5636 ---- cm_req_t req; smb_InitReq(&req); + memset(&rock, 0, sizeof(rock)); attribute = smb_GetSMBParm(inp, 0); *************** *** 5633,5638 **** --- 5679,5688 ---- rock.any = 0; rock.maskp = cm_ClientStringToNormStringAlloc(smb_FindMask(pathp), -1, NULL); + if (!rock.maskp) { + code = CM_ERROR_NOSUCHFILE; + goto done; + } rock.flags = ((cm_ClientStrChr(rock.maskp, '~') != NULL) ? SMB_MASKFLAG_TILDE : 0); thyper.LowPart = 0; *************** *** 5673,5678 **** --- 5723,5730 ---- osi_Log1(smb_logp, "Unlinking %s", osi_LogSaveString(smb_logp, entry->name)); + /* We assume this works because entry->name was + successfully converted in smb_UnlinkProc() once. */ cm_FsStringToNormString(entry->name, -1, normalizedName, lengthof(normalizedName)); *************** *** 5687,5696 **** --- 5739,5752 ---- cm_DirEntryListFree(&rock.matches); + done: + if (userp) cm_ReleaseUser(userp); + if (dscp) cm_ReleaseSCache(dscp); + if (rock.maskp) free(rock.maskp); if (code == 0 && !rock.any) *************** *** 5722,5728 **** rockp = (smb_renameRock_t *) vrockp; ! cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)); caseFold = ((rockp->flags & SMB_MASKFLAG_CASEFOLD)? CM_FLAG_CASEFOLD : 0); if (!(rockp->vcp->flags & SMB_VCFLAG_USEV3)) caseFold |= CM_FLAG_8DOT3; --- 5778,5790 ---- rockp = (smb_renameRock_t *) vrockp; ! if (cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)) == 0) { ! /* Can't convert string */ ! osi_Log1(smb_logp, "Skpping entry [%s]. Can't normalize FS string", ! osi_LogSaveString(smb_logp, dep->name)); ! return 0; ! } ! caseFold = ((rockp->flags & SMB_MASKFLAG_CASEFOLD)? CM_FLAG_CASEFOLD : 0); if (!(rockp->vcp->flags & SMB_VCFLAG_USEV3)) caseFold |= CM_FLAG_8DOT3; *************** *** 5776,5781 **** --- 5838,5845 ---- } smb_InitReq(&req); + memset(&rock, 0, sizeof(rock)); + spacep = inp->spacep; smb_StripLastComponent(spacep->wdata, &oldLastNamep, oldPathp); *************** *** 5841,5859 **** /* TODO: The old name could be a wildcard. The new name must not be */ - /* do the vnode call */ - rock.odscp = oldDscp; - rock.ndscp = newDscp; - rock.userp = userp; - rock.reqp = &req; - rock.vcp = vcp; - rock.maskp = cm_ClientStringToNormStringAlloc(oldLastNamep, -1, NULL); - rock.flags = ((cm_ClientStrChr(oldLastNamep, '~') != NULL) ? SMB_MASKFLAG_TILDE : 0); - rock.newNamep = newLastNamep; - rock.fsOldName[0] = '\0'; - rock.clOldName[0] = '\0'; - rock.any = 0; - /* 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) && --- 5905,5910 ---- *************** *** 5887,5901 **** if (tmpscp != NULL) cm_ReleaseSCache(tmpscp); - cm_ReleaseSCache(newDscp); - cm_ReleaseSCache(oldDscp); - cm_ReleaseUser(userp); ! free(rock.maskp); ! rock.maskp = NULL; ! return code; } /* Now search the directory for the pattern, and do the appropriate rename when found */ thyper.LowPart = 0; /* search dir from here */ thyper.HighPart = 0; --- 5938,5964 ---- if (tmpscp != NULL) cm_ReleaseSCache(tmpscp); ! goto done; } + /* do the vnode call */ + rock.odscp = oldDscp; + rock.ndscp = newDscp; + rock.userp = userp; + rock.reqp = &req; + rock.vcp = vcp; + rock.maskp = cm_ClientStringToNormStringAlloc(oldLastNamep, -1, NULL); + if (!rock.maskp) { + code = CM_ERROR_NOSUCHFILE; + goto done; + } + rock.flags = ((cm_ClientStrChr(oldLastNamep, '~') != NULL) ? SMB_MASKFLAG_TILDE : 0); + rock.newNamep = newLastNamep; + rock.fsOldName[0] = '\0'; + rock.clOldName[0] = '\0'; + rock.any = 0; + /* Now search the directory for the pattern, and do the appropriate rename when found */ thyper.LowPart = 0; /* search dir from here */ thyper.HighPart = 0; *************** *** 5947,5960 **** } } if (tmpscp != NULL) cm_ReleaseSCache(tmpscp); cm_ReleaseUser(userp); cm_ReleaseSCache(oldDscp); cm_ReleaseSCache(newDscp); ! free(rock.maskp); - rock.maskp = NULL; return code; } --- 6010,6026 ---- } } + done: if (tmpscp != NULL) cm_ReleaseSCache(tmpscp); + if (userp) cm_ReleaseUser(userp); + if (oldDscp) cm_ReleaseSCache(oldDscp); + if (newDscp) cm_ReleaseSCache(newDscp); ! if (rock.maskp) free(rock.maskp); return code; } *************** *** 6132,6137 **** --- 6198,6218 ---- osi_LogSaveClientString(smb_logp, oldPathp), osi_LogSaveClientString(smb_logp, newPathp)); + if (!cm_IsValidClientString(newPathp)) { + #ifdef DEBUG + clientchar_t * hexp; + + hexp = cm_GetRawCharsAlloc(newPathp, -1); + osi_Log1(smb_logp, "CoreRename rejecting invalid name. [%S]", + osi_LogSaveClientString(smb_logp, hexp)); + if (hexp) + free(hexp); + #else + osi_Log0(smb_logp, "CoreRename rejecting invalid name"); + #endif + return CM_ERROR_BADNTFILENAME; + } + code = smb_Rename(vcp,inp,oldPathp,newPathp,0); osi_Log1(smb_logp, "smb rename returns 0x%x", code); *************** *** 6159,6165 **** rockp = (smb_rmdirRock_t *) vrockp; ! cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)); if (rockp->flags & SMB_MASKFLAG_CASEFOLD) match = (cm_ClientStrCmpI(matchName, rockp->maskp) == 0); else --- 6240,6251 ---- rockp = (smb_rmdirRock_t *) vrockp; ! if (cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)) == 0) { ! osi_Log1(smb_logp, "Skipping entry [%s]. Can't normalize FS string", ! osi_LogSaveString(smb_logp, dep->name)); ! return 0; ! } ! if (rockp->flags & SMB_MASKFLAG_CASEFOLD) match = (cm_ClientStrCmpI(matchName, rockp->maskp) == 0); else *************** *** 6196,6201 **** --- 6282,6288 ---- cm_req_t req; smb_InitReq(&req); + memset(&rock, 0, sizeof(rock)); tp = smb_GetSMBData(inp, NULL); pathp = smb_ParseASCIIBlock(inp, tp, &tp, SMB_STRF_ANSIPATH); *************** *** 6240,6245 **** --- 6327,6336 ---- rock.any = 0; rock.maskp = cm_ClientStringToNormStringAlloc(lastNamep, -1, NULL); + if (!rock.maskp) { + code = CM_ERROR_NOSUCHFILE; + goto done; + } rock.flags = ((cm_ClientStrChr(rock.maskp, '~') != NULL) ? SMB_MASKFLAG_TILDE : 0); thyper.LowPart = 0; *************** *** 6264,6269 **** --- 6355,6362 ---- for (entry = rock.matches; code == 0 && entry; entry = entry->nextp) { clientchar_t clientName[MAX_PATH]; + /* We assume this will succeed because smb_RmdirProc() + successfully converted entry->name once above. */ cm_FsStringToClientString(entry->name, -1, clientName, lengthof(clientName)); osi_Log1(smb_logp, "Removing directory %s", *************** *** 6278,6294 **** } } cm_DirEntryListFree(&rock.matches); cm_ReleaseUser(userp); cm_ReleaseSCache(dscp); if (code == 0 && !rock.any) code = CM_ERROR_NOSUCHFILE; free(rock.maskp); - rock.maskp = NULL; return code; } --- 6371,6391 ---- } } + done: + if (rock.matches) cm_DirEntryListFree(&rock.matches); + if (userp) cm_ReleaseUser(userp); + if (dscp) cm_ReleaseSCache(dscp); if (code == 0 && !rock.any) code = CM_ERROR_NOSUCHFILE; + if (rock.maskp) free(rock.maskp); return code; } *************** *** 6363,6369 **** vrockp = (struct smb_FullNameRock *)rockp; ! cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)); if (!cm_Is8Dot3(matchName)) { clientchar_t shortName[13]; --- 6460,6470 ---- vrockp = (struct smb_FullNameRock *)rockp; ! if (cm_FsStringToNormString(dep->name, -1, matchName, lengthof(matchName)) == 0) { ! osi_Log1(smb_logp, "Skipping entry [%s]. Can't normalize FS string", ! osi_LogSaveString(smb_logp, dep->name)); ! return 0; ! } if (!cm_Is8Dot3(matchName)) { clientchar_t shortName[13]; *************** *** 7707,7712 **** --- 7808,7828 ---- tp = smb_GetSMBData(inp, NULL); pathp = smb_ParseASCIIBlock(inp, tp, &tp, SMB_STRF_ANSIPATH); + if (!cm_IsValidClientString(pathp)) { + #ifdef DEBUG + clientchar_t * hexp; + + hexp = cm_GetRawCharsAlloc(pathp, -1); + osi_Log1(smb_logp, "CoreCreate rejecting invalid name. [%S]", + osi_LogSaveClientString(smb_logp, hexp)); + if (hexp) + free(hexp); + #else + osi_Log0(smb_logp, "CoreCreate rejecting invalid name"); + #endif + return CM_ERROR_BADNTFILENAME; + } + spacep = inp->spacep; smb_StripLastComponent(spacep->wdata, &lastNamep, pathp); *************** *** 8057,8062 **** --- 8173,8211 ---- newTime = GetTickCount(); osi_Log2(smb_logp, "Dispatch %s duration %d ms", opName, newTime - oldTime); + /* ReceiveV3Tran2A handles its own logging */ + if (inp->inCom != 0x32 && newTime - oldTime > 45000) { + smb_user_t *uidp; + smb_fid_t *fidp; + clientchar_t *treepath = NULL; /* do not free */ + clientchar_t *pathname = NULL; + cm_fid_t afid = {0,0,0,0,0}; + + uidp = smb_FindUID(vcp, smbp->uid, 0); + smb_LookupTIDPath(vcp,((smb_t *)inp)->tid, &treepath); + fidp = smb_FindFID(vcp, inp->fid, 0); + + if (fidp && fidp->NTopen_pathp) + pathname = fidp->NTopen_pathp; + else if (inp->stringsp->wdata) + pathname = inp->stringsp->wdata; + + if (fidp && fidp->scp) + afid = fidp->scp->fid; + + afsi_log("Request %s duration %d ms user %S tid \"%S\" path? \"%S\" afid (%d.%d.%d.%d)", + opName, newTime - oldTime, + uidp ? uidp->unp->name : NULL, + treepath, + pathname, + afid.cell, afid.volume, afid.vnode, afid.unique); + + if (uidp) + smb_ReleaseUID(uidp); + if (fidp) + smb_ReleaseFID(fidp); + } + if (oldGen != sessionGen) { LogEvent(EVENTLOG_WARNING_TYPE, MSG_BAD_SMB_WRONG_SESSION, newTime - oldTime, ncbp->ncb_length); *************** *** 8721,8726 **** --- 8870,8877 ---- int cnamelen = MAX_COMPUTERNAME_LENGTH+1; INT_PTR lana = (INT_PTR) parmp; char eventName[MAX_PATH]; + int bridgeCount = 0; + int nowildCount = 0; sprintf(eventName,"smb_Listener_lana_%d", (unsigned char)lana); ListenerShutdown[lana] = thrd_CreateEvent(NULL, FALSE, FALSE, eventName); *************** *** 8754,8762 **** code = Netbios(ncbp); if (code == NRC_NAMERR) { /* An smb shutdown or Vista resume must have taken place */ ! osi_Log2(smb_logp, "NCBLISTEN lana=%d failed with NRC_NAMERR.", ! ncbp->ncb_lana_num, code); if (lock_TryMutex(&smb_StartedLock)) { lana_list.lana[i] = LANA_INVALID; --- 8905,8914 ---- code = Netbios(ncbp); if (code == NRC_NAMERR) { /* An smb shutdown or Vista resume must have taken place */ ! osi_Log1(smb_logp, "NCBLISTEN lana=%d failed with NRC_NAMERR.", ! ncbp->ncb_lana_num); ! afsi_log("NCBLISTEN lana=%d failed with NRC_NAMERR.", ncbp->ncb_lana_num); if (lock_TryMutex(&smb_StartedLock)) { lana_list.lana[i] = LANA_INVALID; *************** *** 8766,8771 **** --- 8918,8946 ---- } else if (code == NRC_BRIDGE || code != 0) { int lanaRemaining = 0; + if (code == NRC_BRIDGE) { + if (++bridgeCount <= 5) { + afsi_log("NCBLISTEN lana=%d failed with NRC_BRIDGE, retrying ...", ncbp->ncb_lana_num); + continue; + } + } else if (code == NRC_NOWILD) { + if (++nowildCount <= 5) { + afsi_log("NCBLISTEN lana=%d failed with NRC_NOWILD, retrying ...", ncbp->ncb_lana_num); + + if (bridgeCount > 0) { + memset(ncbp, 0, sizeof(*ncbp)); + ncbp->ncb_command = NCBADDNAME; + ncbp->ncb_lana_num = (UCHAR)lana; + /* pad out with spaces instead of null termination */ + len = (long)strlen(smb_localNamep); + strncpy(ncbp->ncb_name, smb_localNamep, NCBNAMSZ); + for (i=len; incb_name[i] = ' '; + code = Netbios(ncbp); + } + continue; + } + } + while (!lock_TryMutex(&smb_StartedLock)) { if (smb_ListenerState == SMB_LISTENER_STOPPED || smbShutdownFlag == 1) goto exit_thread; *************** *** 8775,8780 **** --- 8950,8957 ---- osi_Log2(smb_logp, "NCBLISTEN lana=%d failed with %s. Listener thread exiting.", ncbp->ncb_lana_num, ncb_error_string(code)); + afsi_log("NCBLISTEN lana=%d failed with %s. Listener thread exiting.", + ncbp->ncb_lana_num, ncb_error_string(code)); for (i = 0; i < lana_list.length; i++) { if (lana_list.lana[i] == lana) { *************** *** 8829,8834 **** --- 9006,9015 ---- } #endif /* 0 */ + /* a successful packet received. clear bridge error count */ + bridgeCount = 0; + nowildCount = 0; + /* check for remote conns */ /* first get remote name and insert null terminator */ memcpy(rname, ncbp->ncb_callname, NCBNAMSZ); *************** *** 9064,9071 **** SUCCEEDED(lana_GetUncServerNameEx(NetbiosName, &lanaNum, &bGateway, LANA_NETBIOS_NAME_FULL)) && lanaNum != LANA_INVALID && smb_LANadapter != lanaNum) { ! if ( isGateway != bGateway || ! strcmp(cm_NetbiosName, NetbiosName) ) { change = 1; } else { NCB *ncbp = smb_GetNCB(); --- 9245,9257 ---- SUCCEEDED(lana_GetUncServerNameEx(NetbiosName, &lanaNum, &bGateway, LANA_NETBIOS_NAME_FULL)) && lanaNum != LANA_INVALID && smb_LANadapter != lanaNum) { ! if ( isGateway != bGateway ) { ! afsi_log("Lan Adapter Change detected (%d != %d): gateway %d != %d", ! smb_LANadapter, lanaNum, isGateway, bGateway); ! change = 1; ! } else if (strcmp(cm_NetbiosName, NetbiosName) ) { ! afsi_log("Lan Adapter Change detected (%d != %d): name %s != %s", ! smb_LANadapter, lanaNum, cm_NetbiosName, NetbiosName); change = 1; } else { NCB *ncbp = smb_GetNCB(); *************** *** 9074,9084 **** ncbp->ncb_length = sizeof(temp_list); code = Netbios(ncbp); if (code == 0) { ! if (temp_list.length != lana_list.length) change = 1; ! else { for (i=0; incb_length = sizeof(temp_list); code = Netbios(ncbp); if (code == 0) { ! if (temp_list.length != lana_list.length) { ! afsi_log("Lan Adapter Change detected (%d != %d): lan list length changed %d != %d", ! smb_LANadapter, lanaNum, temp_list.length, lana_list.length); change = 1; ! } else { for (i=0; incb_name,smb_sharename,NCBNAMSZ); code = Netbios(ncbp); ! afsi_log("Netbios NCBDELNAME lana=%d code=%d retcode=%d complete=%d", lana, code, ncbp->ncb_retcode, ncbp->ncb_cmd_cplt); /* and then reset the LANA; this will cause the listener threads to exit */ --- 9538,9544 ---- memcpy(ncbp->ncb_name,smb_sharename,NCBNAMSZ); code = Netbios(ncbp); ! afsi_log("StopListener: Netbios NCBDELNAME lana=%d code=%d retcode=%d complete=%d", lana, code, ncbp->ncb_retcode, ncbp->ncb_cmd_cplt); /* and then reset the LANA; this will cause the listener threads to exit */ *************** *** 9361,9369 **** if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { ! afsi_log("Netbios NCBRESET lana %d error code %d", lana, code); } else { ! afsi_log("Netbios NCBRESET lana %d succeeded", lana); } if (wait) --- 9550,9558 ---- if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { ! afsi_log("StopListener: Netbios NCBRESET lana %d error code %d", lana, code); } else { ! afsi_log("StopListener: Netbios NCBRESET lana %d succeeded", lana); } if (wait) *************** *** 9841,9847 **** if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { ! fprintf(stderr, "Netbios NCBDELNAME lana %d error code %d", ncbp->ncb_lana_num, code); } fflush(stderr); --- 10030,10036 ---- if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { ! fprintf(stderr, "Shutdown: Netbios NCBDELNAME lana %d error code %d", ncbp->ncb_lana_num, code); } fflush(stderr); Index: openafs/src/WINNT/afsd/smb3.c diff -c openafs/src/WINNT/afsd/smb3.c:1.95.2.80 openafs/src/WINNT/afsd/smb3.c:1.95.2.83 *** openafs/src/WINNT/afsd/smb3.c:1.95.2.80 Thu Oct 2 08:14:04 2008 --- openafs/src/WINNT/afsd/smb3.c Sun Oct 19 19:19:33 2008 *************** *** 2116,2121 **** --- 2116,2122 ---- int dataCount; int firstPacket; long code = 0; + DWORD oldTime, newTime; /* We sometimes see 0 word count. What to do? */ if (*inp->wctp == 0) { *************** *** 2188,2193 **** --- 2189,2196 ---- osi_QRemove((osi_queue_t **) &smb_tran2AssemblyQueuep, &asp->q); lock_ReleaseWrite(&smb_globalLock); + oldTime = GetTickCount(); + /* now dispatch it */ if ( asp->opcode >= 0 && asp->opcode < 20 && smb_tran2DispatchTable[asp->opcode].procp) { osi_Log4(smb_logp,"AFS Server - Dispatch-2 %s vcp[%p] lana[%d] lsn[%d]",myCrt_2Dispatch(asp->opcode),vcp,vcp->lana,vcp->lsn); *************** *** 2207,2212 **** --- 2210,2248 ---- smb_SendTran2Error(vcp, asp, outp, code); } + newTime = GetTickCount(); + if (newTime - oldTime > 45000) { + smb_user_t *uidp; + smb_fid_t *fidp; + clientchar_t *treepath = NULL; /* do not free */ + clientchar_t *pathname = NULL; + cm_fid_t afid = {0,0,0,0,0}; + + uidp = smb_FindUID(vcp, asp->uid, 0); + smb_LookupTIDPath(vcp, asp->tid, &treepath); + fidp = smb_FindFID(vcp, inp->fid, 0); + + if (fidp && fidp->NTopen_pathp) + pathname = fidp->NTopen_pathp; + else if (inp->stringsp->wdata) + pathname = inp->stringsp->wdata; + + if (fidp && fidp->scp) + afid = fidp->scp->fid; + + afsi_log("Request %s duration %d ms user %S tid \"%S\" path? \"%S\" afid (%d.%d.%d.%d)", + myCrt_2Dispatch(asp->opcode), newTime - oldTime, + uidp ? uidp->unp->name : NULL, + treepath, + pathname, + afid.cell, afid.volume, afid.vnode, afid.unique); + + if (uidp) + smb_ReleaseUID(uidp); + if (fidp) + smb_ReleaseFID(fidp); + } + /* free the input tran 2 packet */ smb_FreeTran2Packet(asp); } *************** *** 2325,2330 **** --- 2361,2382 ---- return 0; } + if (!cm_IsValidClientString(pathp)) { + #ifdef DEBUG + clientchar_t * hexp; + + hexp = cm_GetRawCharsAlloc(pathp, -1); + osi_Log1(smb_logp, "Tran2Open rejecting invalid name. [%S]", + osi_LogSaveClientString(smb_logp, hexp)); + if (hexp) + free(hexp); + #else + osi_Log0(smb_logp, "Tran2Open rejecting invalid name"); + #endif + smb_FreeTran2Packet(outp); + return CM_ERROR_BADNTFILENAME; + } + #ifdef DEBUG_VERBOSE { char *hexp, *asciip; *************** *** 2764,2770 **** rockp = vrockp; ! cm_FsStringToNormString(dep->name, -1, normName, sizeof(normName)/sizeof(clientchar_t)); /* compare both names and vnodes, though probably just comparing vnodes * would be safe enough. --- 2816,2826 ---- rockp = vrockp; ! if (cm_FsStringToNormString(dep->name, -1, normName, sizeof(normName)/sizeof(clientchar_t)) == 0) { ! osi_Log1(smb_logp, "Skipping entry [%s]. Can't normalize FS string", ! osi_LogSaveString(smb_logp, dep->name)); ! return 0; ! } /* compare both names and vnodes, though probably just comparing vnodes * would be safe enough. *************** *** 4128,4144 **** switch (scp->fileType) { case CM_SCACHETYPE_DIRECTORY: case CM_SCACHETYPE_MOUNTPOINT: - case CM_SCACHETYPE_SYMLINK: case CM_SCACHETYPE_INVALID: fa->extFileAttributes = SMB_ATTR_DIRECTORY; break; default: /* if we get here we either have a normal file * or we have a file for which we have never * received status info. In this case, we can * check the even/odd value of the entry's vnode. ! * even means it is to be treated as a directory ! * and odd means it is to be treated as a file. */ if (mustFake && (scp->fid.vnode & 0x1)) fa->extFileAttributes = SMB_ATTR_DIRECTORY; --- 4184,4205 ---- switch (scp->fileType) { case CM_SCACHETYPE_DIRECTORY: case CM_SCACHETYPE_MOUNTPOINT: case CM_SCACHETYPE_INVALID: fa->extFileAttributes = SMB_ATTR_DIRECTORY; break; + case CM_SCACHETYPE_SYMLINK: + if (cm_TargetPerceivedAsDirectory(scp->mountPointStringp)) + fa->extFileAttributes = SMB_ATTR_DIRECTORY; + else + fa->extFileAttributes = SMB_ATTR_NORMAL; + break; default: /* if we get here we either have a normal file * or we have a file for which we have never * received status info. In this case, we can * check the even/odd value of the entry's vnode. ! * odd means it is to be treated as a directory ! * and even means it is to be treated as a file. */ if (mustFake && (scp->fid.vnode & 0x1)) fa->extFileAttributes = SMB_ATTR_DIRECTORY; *************** *** 4163,4172 **** switch (scp->fileType) { case CM_SCACHETYPE_DIRECTORY: case CM_SCACHETYPE_MOUNTPOINT: - case CM_SCACHETYPE_SYMLINK: case CM_SCACHETYPE_INVALID: fa->attributes = SMB_ATTR_DIRECTORY; break; default: /* if we get here we either have a normal file * or we have a file for which we have never --- 4224,4238 ---- switch (scp->fileType) { case CM_SCACHETYPE_DIRECTORY: case CM_SCACHETYPE_MOUNTPOINT: case CM_SCACHETYPE_INVALID: fa->attributes = SMB_ATTR_DIRECTORY; break; + case CM_SCACHETYPE_SYMLINK: + if (cm_TargetPerceivedAsDirectory(scp->mountPointStringp)) + fa->attributes = SMB_ATTR_DIRECTORY; + else + fa->attributes = SMB_ATTR_NORMAL; + break; default: /* if we get here we either have a normal file * or we have a file for which we have never *************** *** 4233,4239 **** /* Copy attributes */ lattr = smb_ExtAttributes(scp); ! if (code == CM_ERROR_NOSUCHPATH && scp->fileType == CM_SCACHETYPE_SYMLINK || code == CM_ERROR_PATH_NOT_COVERED && scp->fileType == CM_SCACHETYPE_DFSLINK) { if (lattr == SMB_ATTR_NORMAL) lattr = SMB_ATTR_DIRECTORY; --- 4299,4307 ---- /* Copy attributes */ lattr = smb_ExtAttributes(scp); ! if ((code == CM_ERROR_NOSUCHPATH && ! (scp->fileType == CM_SCACHETYPE_SYMLINK && ! cm_TargetPerceivedAsDirectory(scp->mountPointStringp))) || code == CM_ERROR_PATH_NOT_COVERED && scp->fileType == CM_SCACHETYPE_DFSLINK) { if (lattr == SMB_ATTR_NORMAL) lattr = SMB_ATTR_DIRECTORY; *************** *** 5239,5246 **** if (dep->fid.vnode == 0) goto nextEntry; /* This entry is not in use */ ! cm_FsStringToClientString(dep->name, -1, cfileName, lengthof(cfileName)); ! cm_ClientStringToNormString(cfileName, -1, normName, lengthof(normName)); /* Need 8.3 name? */ NeedShortName = 0; --- 5307,5319 ---- if (dep->fid.vnode == 0) goto nextEntry; /* This entry is not in use */ ! if (cm_FsStringToClientString(dep->name, -1, cfileName, lengthof(cfileName)) == 0 || ! cm_ClientStringToNormString(cfileName, -1, normName, lengthof(normName)) == 0) { ! ! osi_Log1(smb_logp, "Skipping entry [%s]. Can't convert or normalize FS String", ! osi_LogSaveString(smb_logp, dep->name)); ! goto nextEntry; ! } /* Need 8.3 name? */ NeedShortName = 0; *************** *** 5652,5657 **** --- 5725,5745 ---- return 0; } + if (!cm_IsValidClientString(pathp)) { + #ifdef DEBUG + clientchar_t * hexp; + + hexp = cm_GetRawCharsAlloc(pathp, -1); + osi_Log1(smb_logp, "NTOpenX rejecting invalid name. [%S]", + osi_LogSaveClientString(smb_logp, hexp)); + if (hexp) + free(hexp); + #else + osi_Log0(smb_logp, "NTOpenX rejecting invalid name"); + #endif + return CM_ERROR_BADNTFILENAME; + } + #ifdef DEBUG_VERBOSE { char *hexp, *asciip; *************** *** 6810,6824 **** return 0; } ! #ifdef DEBUG_VERBOSE ! { ! char *hexp, *asciip; ! asciip = (lastNamep? lastNamep : realPathp); ! hexp = osi_HexifyString( asciip ); ! DEBUG_EVENT2("AFS", "NTCreateX H[%s] A[%s]", hexp, asciip); free(hexp); ! } #endif userp = smb_GetUserFromVCP(vcp, inp); if (!userp) { --- 6898,6918 ---- return 0; } ! if (!cm_IsValidClientString(realPathp)) { ! #ifdef DEBUG ! clientchar_t * hexp; ! ! hexp = cm_GetRawCharsAlloc(realPathp, -1); ! osi_Log1(smb_logp, "NTCreateX rejecting invalid name. [%S]", ! osi_LogSaveClientString(smb_logp, hexp)); ! if (hexp) free(hexp); ! #else ! osi_Log0(smb_logp, "NTCreateX rejecting invalid name"); #endif + free(realPathp); + return CM_ERROR_BADNTFILENAME; + } userp = smb_GetUserFromVCP(vcp, inp); if (!userp) { *************** *** 7631,7645 **** * Will add it if necessary. */ ! #ifdef DEBUG_VERBOSE ! { ! char *hexp, *asciip; ! asciip = (lastNamep? lastNamep : realPathp); ! hexp = osi_HexifyString( asciip ); ! DEBUG_EVENT2("AFS", "NTTranCreate H[%s] A[%s]", hexp, asciip); free(hexp); ! } #endif userp = smb_GetUserFromVCP(vcp, inp); if (!userp) { --- 7725,7745 ---- * Will add it if necessary. */ ! if (!cm_IsValidClientString(realPathp)) { ! #ifdef DEBUG ! clientchar_t * hexp; ! ! hexp = cm_GetRawCharsAlloc(realPathp, -1); ! osi_Log1(smb_logp, "NTTranCreate rejecting invalid name. [%S]", ! osi_LogSaveClientString(smb_logp, hexp)); ! if (hexp) free(hexp); ! #else ! osi_Log0(smb_logp, "NTTranCreate rejecting invalid name."); #endif + free(realPathp); + return CM_ERROR_BADNTFILENAME; + } userp = smb_GetUserFromVCP(vcp, inp); if (!userp) { Index: openafs/src/WINNT/afsreg/afsreg.h diff -c openafs/src/WINNT/afsreg/afsreg.h:1.6.4.2 openafs/src/WINNT/afsreg/afsreg.h:1.6.4.3 *** openafs/src/WINNT/afsreg/afsreg.h:1.6.4.2 Fri Feb 8 21:32:22 2008 --- openafs/src/WINNT/afsreg/afsreg.h Sat Oct 18 00:09:56 2008 *************** *** 19,30 **** /* Do not change AFSREG_{CLT,SVR}_SW_NAME unless the installation * name in the installers is also changed to match */ ! #define AFSREG_SVR_SVC_NAME "TransarcAFSServer" ! #define AFSREG_SVR_SW_NAME "AFS Server" ! #define AFSREG_CLT_SVC_NAME "TransarcAFSDaemon" ! #define AFSREG_CLT_SW_NAME "AFS Client" ! #define AFSREG_CLT_TOOLS_SW_NAME "AFS Client 32-Bit Binaries" /* ---- NT system configuration information ---- */ --- 19,30 ---- /* Do not change AFSREG_{CLT,SVR}_SW_NAME unless the installation * name in the installers is also changed to match */ ! #define AFSREG_SVR_SVC_NAME TEXT("TransarcAFSServer") ! #define AFSREG_SVR_SW_NAME TEXT("AFS Server") ! #define AFSREG_CLT_SVC_NAME TEXT("TransarcAFSDaemon") ! #define AFSREG_CLT_SW_NAME TEXT("AFS Client") ! #define AFSREG_CLT_TOOLS_SW_NAME TEXT("AFS Client 32-Bit Binaries") /* ---- NT system configuration information ---- */ *************** *** 43,60 **** */ #define AFSREG_IPSRV_KEY \ ! "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services" /* Adapter list subkey and subkey values */ ! #define AFSREG_IPSRV_IFACELIST_SUBKEY "Tcpip\\Linkage" ! #define AFSREG_IPSRV_IFACELIST_BIND_VALUE "Bind" /* Per-adapter subkey and subkey values */ ! #define AFSREG_IPSRV_ADAPTER_PARAM_SUBKEY "Parameters\\Tcpip" ! #define AFSREG_IPSRV_ADAPTER_PARAM_ADDR_VALUE "IPAddress" ! #define AFSREG_IPSRV_ADAPTER_PARAM_MASK_VALUE "SubnetMask" ! #define AFSREG_IPSRV_ADAPTER_PARAM_DHCPADDR_VALUE "DhcpIPAddress" ! #define AFSREG_IPSRV_ADAPTER_PARAM_DHCPMASK_VALUE "DhcpSubnetMask" /* * Event logging registry keys and values of interest: --- 43,60 ---- */ #define AFSREG_IPSRV_KEY \ ! TEXT("HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Services") /* Adapter list subkey and subkey values */ ! #define AFSREG_IPSRV_IFACELIST_SUBKEY TEXT("Tcpip\\Linkage") ! #define AFSREG_IPSRV_IFACELIST_BIND_VALUE TEXT("Bind") /* Per-adapter subkey and subkey values */ ! #define AFSREG_IPSRV_ADAPTER_PARAM_SUBKEY TEXT("Parameters\\Tcpip") ! #define AFSREG_IPSRV_ADAPTER_PARAM_ADDR_VALUE TEXT("IPAddress") ! #define AFSREG_IPSRV_ADAPTER_PARAM_MASK_VALUE TEXT("SubnetMask") ! #define AFSREG_IPSRV_ADAPTER_PARAM_DHCPADDR_VALUE TEXT("DhcpIPAddress") ! #define AFSREG_IPSRV_ADAPTER_PARAM_DHCPMASK_VALUE TEXT("DhcpSubnetMask") /* * Event logging registry keys and values of interest: *************** *** 69,82 **** */ #define AFSREG_APPLOG_SUBKEY \ ! "System\\CurrentControlSet\\Services\\EventLog\\Application" ! #define AFSREG_APPLOG_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_APPLOG_SUBKEY /* AFS event source subkey and subkey values -- client and server services */ #define AFSREG_SVR_APPLOG_SUBKEY AFSREG_SVR_SW_NAME #define AFSREG_CLT_APPLOG_SUBKEY AFSREG_CLT_SW_NAME ! #define AFSREG_APPLOG_MSGFILE_VALUE "EventMessageFile" ! #define AFSREG_APPLOG_MSGTYPE_VALUE "TypesSupported" --- 69,82 ---- */ #define AFSREG_APPLOG_SUBKEY \ ! TEXT("System\\CurrentControlSet\\Services\\EventLog\\Application") ! #define AFSREG_APPLOG_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_APPLOG_SUBKEY /* AFS event source subkey and subkey values -- client and server services */ #define AFSREG_SVR_APPLOG_SUBKEY AFSREG_SVR_SW_NAME #define AFSREG_CLT_APPLOG_SUBKEY AFSREG_CLT_SW_NAME ! #define AFSREG_APPLOG_MSGFILE_VALUE TEXT("EventMessageFile") ! #define AFSREG_APPLOG_MSGTYPE_VALUE TEXT("TypesSupported") *************** *** 93,109 **** */ #define AFSREG_SVR_SW_SUBKEY \ ! "Software\\TransarcCorporation\\" AFSREG_SVR_SW_NAME ! #define AFSREG_SVR_SW_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_SVR_SW_SUBKEY ! #define AFSREG_SVR_SW_VERSION_KEY AFSREG_SVR_SW_KEY "\\CurrentVersion" ! #define AFSREG_SVR_SW_VERSION_SUBKEY AFSREG_SVR_SW_SUBKEY "\\CurrentVersion" /* AFSREG_SVR_SW_VERSION_KEY values */ ! #define AFSREG_SVR_SW_VERSION_DIR_VALUE "PathName" ! #define AFSREG_SVR_SW_VERSION_MAJOR_VALUE "MajorVersion" ! #define AFSREG_SVR_SW_VERSION_MINOR_VALUE "MinorVersion" ! #define AFSREG_SVR_SW_VERSION_PATCH_VALUE "PatchLevel" /* HKEY_LOCAL_MACHINE\SOFTWARE\TransarcCorporation\AFSREG_CLT_SW_NAME --- 93,109 ---- */ #define AFSREG_SVR_SW_SUBKEY \ ! TEXT("Software\\TransarcCorporation\\") AFSREG_SVR_SW_NAME ! #define AFSREG_SVR_SW_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_SVR_SW_SUBKEY ! #define AFSREG_SVR_SW_VERSION_KEY AFSREG_SVR_SW_KEY TEXT("\\CurrentVersion") ! #define AFSREG_SVR_SW_VERSION_SUBKEY AFSREG_SVR_SW_SUBKEY TEXT("\\CurrentVersion") /* AFSREG_SVR_SW_VERSION_KEY values */ ! #define AFSREG_SVR_SW_VERSION_DIR_VALUE TEXT("PathName") ! #define AFSREG_SVR_SW_VERSION_MAJOR_VALUE TEXT("MajorVersion") ! #define AFSREG_SVR_SW_VERSION_MINOR_VALUE TEXT("MinorVersion") ! #define AFSREG_SVR_SW_VERSION_PATCH_VALUE TEXT("PatchLevel") /* HKEY_LOCAL_MACHINE\SOFTWARE\TransarcCorporation\AFSREG_CLT_SW_NAME *************** *** 116,139 **** */ #define AFSREG_CLT_SW_SUBKEY \ ! "Software\\TransarcCorporation\\" AFSREG_CLT_SW_NAME ! #define AFSREG_CLT_SW_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_CLT_SW_SUBKEY ! #define AFSREG_CLT_SW_VERSION_KEY AFSREG_CLT_SW_KEY "\\CurrentVersion" ! #define AFSREG_CLT_SW_VERSION_SUBKEY AFSREG_CLT_SW_SUBKEY "\\CurrentVersion" #define AFSREG_CLT_TOOLS_SW_SUBKEY \ ! "Software\\TransarcCorporation\\" AFSREG_CLT_TOOLS_SW_NAME ! #define AFSREG_CLT_TOOLS_SW_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_CLT_TOOLS_SW_SUBKEY ! #define AFSREG_CLT_TOOLS_SW_VERSION_KEY AFSREG_CLT_TOOLS_SW_KEY "\\CurrentVersion" ! #define AFSREG_CLT_TOOLS_SW_VERSION_SUBKEY AFSREG_CLT_TOOLS_SW_SUBKEY "\\CurrentVersion" /* AFSREG_CLT_SW_VERSION_KEY values */ ! #define AFSREG_CLT_SW_VERSION_DIR_VALUE "PathName" ! #define AFSREG_CLT_SW_VERSION_MAJOR_VALUE "MajorVersion" ! #define AFSREG_CLT_SW_VERSION_MINOR_VALUE "MinorVersion" ! #define AFSREG_CLT_SW_VERSION_PATCH_VALUE "PatchLevel" --- 116,139 ---- */ #define AFSREG_CLT_SW_SUBKEY \ ! TEXT("Software\\TransarcCorporation\\") AFSREG_CLT_SW_NAME ! #define AFSREG_CLT_SW_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_CLT_SW_SUBKEY ! #define AFSREG_CLT_SW_VERSION_KEY AFSREG_CLT_SW_KEY TEXT("\\CurrentVersion") ! #define AFSREG_CLT_SW_VERSION_SUBKEY AFSREG_CLT_SW_SUBKEY TEXT("\\CurrentVersion") #define AFSREG_CLT_TOOLS_SW_SUBKEY \ ! TEXT("Software\\TransarcCorporation\\") AFSREG_CLT_TOOLS_SW_NAME ! #define AFSREG_CLT_TOOLS_SW_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_CLT_TOOLS_SW_SUBKEY ! #define AFSREG_CLT_TOOLS_SW_VERSION_KEY AFSREG_CLT_TOOLS_SW_KEY TEXT("\\CurrentVersion") ! #define AFSREG_CLT_TOOLS_SW_VERSION_SUBKEY AFSREG_CLT_TOOLS_SW_SUBKEY TEXT("\\CurrentVersion") /* AFSREG_CLT_SW_VERSION_KEY values */ ! #define AFSREG_CLT_SW_VERSION_DIR_VALUE TEXT("PathName") ! #define AFSREG_CLT_SW_VERSION_MAJOR_VALUE TEXT("MajorVersion") ! #define AFSREG_CLT_SW_VERSION_MINOR_VALUE TEXT("MinorVersion") ! #define AFSREG_CLT_SW_VERSION_PATCH_VALUE TEXT("PatchLevel") *************** *** 149,164 **** * DeviceName:REG_SZ: */ ! #define AFSREG_SVR_SVC_DISPLAYNAME_DATA "OpenAFS Server" ! #define AFSREG_SVR_SVC_IMAGENAME_DATA "bosctlsvc.exe" ! #define AFSREG_SVR_SVC_SUBKEY "System\\CurrentControlSet\\Services\\" AFSREG_SVR_SVC_NAME ! #define AFSREG_SVR_SVC_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_SVR_SVC_SUBKEY ! #define AFSREG_SVR_SVC_AFSTAB_KEY AFSREG_SVR_SVC_KEY "\\Afstab" /* AFSREG_SVR_SVC_AFSTAB_KEY partition subkey values */ ! #define AFSREG_SVR_SVC_AFSTAB_DEVNAME_VALUE "DeviceName" /* HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\AFSREG_CLT_SVC_NAME --- 149,164 ---- * DeviceName:REG_SZ: */ ! #define AFSREG_SVR_SVC_DISPLAYNAME_DATA TEXT("OpenAFS Server") ! #define AFSREG_SVR_SVC_IMAGENAME_DATA TEXT("bosctlsvc.exe") ! #define AFSREG_SVR_SVC_SUBKEY TEXT("System\\CurrentControlSet\\Services\\") AFSREG_SVR_SVC_NAME ! #define AFSREG_SVR_SVC_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_SVR_SVC_SUBKEY ! #define AFSREG_SVR_SVC_AFSTAB_KEY AFSREG_SVR_SVC_KEY TEXT("\\Afstab") /* AFSREG_SVR_SVC_AFSTAB_KEY partition subkey values */ ! #define AFSREG_SVR_SVC_AFSTAB_DEVNAME_VALUE TEXT("DeviceName") /* HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\AFSREG_CLT_SVC_NAME *************** *** 170,195 **** * Cell:REG_SZ: */ ! #define AFSREG_CLT_SVC_DISPLAYNAME_DATA "OpenAFS Client" ! #define AFSREG_CLT_SVC_IMAGENAME_DATA "afsd_service.exe" ! #define AFSREG_CLT_SVC_SUBKEY "System\\CurrentControlSet\\Services\\" AFSREG_CLT_SVC_NAME ! #define AFSREG_CLT_SVC_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_CLT_SVC_SUBKEY ! #define AFSREG_CLT_SVC_PARAM_KEY AFSREG_CLT_SVC_KEY "\\Parameters" ! #define AFSREG_CLT_SVC_PARAM_SUBKEY AFSREG_CLT_SVC_SUBKEY "\\Parameters" ! #define AFSREG_CLT_SVC_PROVIDER_KEY AFSREG_CLT_SVC_KEY "\\NetworkProvider" ! #define AFSREG_CLT_SVC_PROVIDER_SUBKEY AFSREG_CLT_SVC_SUBKEY "\\NetworkProvider" /* AFSREG_CLT_SVC_PARAM_KEY values */ ! #define AFSREG_CLT_SVC_PARAM_CELL_VALUE "Cell" ! #define AFSREG_CLT_OPENAFS_SUBKEY "Software\\OpenAFS\\Client" ! #define AFSREG_CLT_OPENAFS_KEY "HKEY_LOCAL_MACHINE\\" AFSREG_CLT_OPENAFS_SUBKEY ! #define AFSREG_CLT_OPENAFS_CELLSERVDB_DIR_VALUE "CellServDBDir" ! #define AFSREG_USER_OPENAFS_SUBKEY "Software\\OpenAFS\\Client" ! #define AFSREG_USER_OPENAFS_KEY "HKEY_CURRENT_USER" AFSREG_USER_OPENAFS_SUBKEY /* Extended (alternative) versions of registry access functions */ --- 170,195 ---- * Cell:REG_SZ: */ ! #define AFSREG_CLT_SVC_DISPLAYNAME_DATA TEXT("OpenAFS Client") ! #define AFSREG_CLT_SVC_IMAGENAME_DATA TEXT("afsd_service.exe") ! #define AFSREG_CLT_SVC_SUBKEY TEXT("System\\CurrentControlSet\\Services\\") AFSREG_CLT_SVC_NAME ! #define AFSREG_CLT_SVC_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_CLT_SVC_SUBKEY ! #define AFSREG_CLT_SVC_PARAM_KEY AFSREG_CLT_SVC_KEY TEXT("\\Parameters") ! #define AFSREG_CLT_SVC_PARAM_SUBKEY AFSREG_CLT_SVC_SUBKEY TEXT("\\Parameters") ! #define AFSREG_CLT_SVC_PROVIDER_KEY AFSREG_CLT_SVC_KEY TEXT("\\NetworkProvider") ! #define AFSREG_CLT_SVC_PROVIDER_SUBKEY AFSREG_CLT_SVC_SUBKEY TEXT("\\NetworkProvider") /* AFSREG_CLT_SVC_PARAM_KEY values */ ! #define AFSREG_CLT_SVC_PARAM_CELL_VALUE TEXT("Cell") ! #define AFSREG_CLT_OPENAFS_SUBKEY TEXT("Software\\OpenAFS\\Client") ! #define AFSREG_CLT_OPENAFS_KEY TEXT("HKEY_LOCAL_MACHINE\\") AFSREG_CLT_OPENAFS_SUBKEY ! #define AFSREG_CLT_OPENAFS_CELLSERVDB_DIR_VALUE TEXT("CellServDBDir") ! #define AFSREG_USER_OPENAFS_SUBKEY TEXT("Software\\OpenAFS\\Client") ! #define AFSREG_USER_OPENAFS_KEY TEXT("HKEY_CURRENT_USER") AFSREG_USER_OPENAFS_SUBKEY /* Extended (alternative) versions of registry access functions */ Index: openafs/src/WINNT/aklog/aklog.c diff -c openafs/src/WINNT/aklog/aklog.c:1.14.4.13 openafs/src/WINNT/aklog/aklog.c:1.14.4.14 *** openafs/src/WINNT/aklog/aklog.c:1.14.4.13 Sun Mar 30 12:21:07 2008 --- openafs/src/WINNT/aklog/aklog.c Fri Nov 7 00:41:11 2008 *************** *** 184,191 **** } cellinfo_t; - struct afsconf_cell ak_cellconfig; /* General information about the cell */ - static char *progname = NULL; /* Name of this program */ static int dflag = FALSE; /* Give debugging information */ static int noprdb = FALSE; /* Skip resolving name to id? */ --- 184,189 ---- *************** *** 562,578 **** } - static char *copy_string(char *string) - { - char *new_string; - - if (new_string = (char *)calloc(strlen(string) + 1, sizeof(char))) - (void) strcpy(new_string, string); - - return (new_string); - } - - static int get_cellconfig(char *cell, struct afsconf_cell *cellconfig, char *local_cell) { --- 560,565 ---- *************** *** 598,603 **** --- 585,592 ---- status = AKLOG_AFS; } + if (cellconfig->linkedCell) + cellconfig->linkedCell = strdup(cellconfig->linkedCell); CloseConf(&configdir); *************** *** 669,675 **** --- 658,666 ---- struct ktc_principal aserver; struct ktc_principal aclient; struct ktc_token atoken, btoken; + struct afsconf_cell ak_cellconfig; /* General information about the cell */ int i; + int getLinkedCell = 0; /* try to avoid an expensive call to get_cellconfig */ if (cell && ll_string_check(&authedcells, cell)) *************** *** 683,701 **** memset(instance, 0, sizeof(instance)); memset(realm_of_user, 0, sizeof(realm_of_user)); memset(realm_of_cell, 0, sizeof(realm_of_cell)); /* NULL or empty cell returns information on local cell */ if (status = get_cellconfig(cell, &ak_cellconfig, local_cell)) return(status); ! strncpy(cell_to_use, ak_cellconfig.name, MAXCELLCHARS); cell_to_use[MAXCELLCHARS] = 0; if (ll_string_check(&authedcells, cell_to_use)) { if (dflag) printf("Already authenticated to %s (or tried to)\n", cell_to_use); ! return(AKLOG_SUCCESS); } /* --- 674,698 ---- memset(instance, 0, sizeof(instance)); memset(realm_of_user, 0, sizeof(realm_of_user)); memset(realm_of_cell, 0, sizeof(realm_of_cell)); + memset(&ak_cellconfig, 0, sizeof(ak_cellconfig)); /* NULL or empty cell returns information on local cell */ if (status = get_cellconfig(cell, &ak_cellconfig, local_cell)) return(status); ! linkedCell: ! if (getLinkedCell) ! strncpy(cell_to_use, ak_cellconfig.linkedCell, MAXCELLCHARS); ! else ! strncpy(cell_to_use, ak_cellconfig.name, MAXCELLCHARS); cell_to_use[MAXCELLCHARS] = 0; if (ll_string_check(&authedcells, cell_to_use)) { if (dflag) printf("Already authenticated to %s (or tried to)\n", cell_to_use); ! status = AKLOG_SUCCESS; ! goto done2; } /* *************** *** 726,738 **** if ((status = get_v5_user_realm(context, realm_of_user)) != KSUCCESS) { fprintf(stderr, "%s: Couldn't determine realm of user: %d\n", progname, status); ! return(AKLOG_KERBEROS); } if ( strchr(name,'.') != NULL ) { fprintf(stderr, "%s: Can't support principal names including a dot.\n", progname); ! return(AKLOG_MISC); } try_v5: --- 723,737 ---- if ((status = get_v5_user_realm(context, realm_of_user)) != KSUCCESS) { fprintf(stderr, "%s: Couldn't determine realm of user: %d\n", progname, status); ! status = AKLOG_KERBEROS; ! goto done; } if ( strchr(name,'.') != NULL ) { fprintf(stderr, "%s: Can't support principal names including a dot.\n", progname); ! status = AKLOG_MISC; ! goto done; } try_v5: *************** *** 838,844 **** status = get_cred(name, "", realm_of_cell, &c); } #else ! return(AKLOG_MISC); #endif } --- 837,844 ---- status = get_cred(name, "", realm_of_cell, &c); } #else ! status = AKLOG_MISC; ! goto done; #endif } *************** *** 855,861 **** "" #endif ); ! return(AKLOG_KERBEROS); } strncpy(aserver.name, AFSKEY, MAXKTCNAMELEN - 1); --- 855,862 ---- "" #endif ); ! status = AKLOG_KERBEROS; ! goto done; } strncpy(aserver.name, AFSKEY, MAXKTCNAMELEN - 1); *************** *** 907,913 **** atoken.ticketLen = c.ticket_st.length; memcpy(atoken.ticket, c.ticket_st.dat, atoken.ticketLen); #else ! return(AKLOG_MISC); #endif } --- 908,915 ---- atoken.ticketLen = c.ticket_st.length; memcpy(atoken.ticket, c.ticket_st.dat, atoken.ticketLen); #else ! status = AKLOG_MISC; ! goto done; #endif } *************** *** 920,926 **** { if (dflag) printf("Identical tokens already exist; skipping.\n"); ! return 0; } if (noprdb) --- 922,929 ---- { if (dflag) printf("Identical tokens already exist; skipping.\n"); ! status = AKLOG_SUCCESS; ! goto done2; } if (noprdb) *************** *** 936,945 **** { fprintf(stderr, "%s: Couldn't determine realm of user: %s)", progname, krb_err_text(status)); ! return(AKLOG_KERBEROS); } #else ! return(AKLOG_MISC); #endif } --- 939,950 ---- { fprintf(stderr, "%s: Couldn't determine realm of user: %s)", progname, krb_err_text(status)); ! status = AKLOG_KERBEROS; ! goto done; } #else ! status = AKLOG_MISC; ! goto done; #endif } *************** *** 991,996 **** --- 996,1016 ---- status = AKLOG_TOKEN; } + done2: + if (ak_cellconfig.linkedCell && !getLinkedCell) { + getLinkedCell = 1; + goto linkedCell; + } + + done: + #if 0 + /* + * intentionally leak the linkedCell field because it was allocated + * using a different C RTL version. + */ + if (ak_cellconfig.linkedCell) + free(ak_cellconfig.linkedCell); + #endif return(status); } *************** *** 1448,1454 **** if (cur_node = ll_add_node(&paths, ll_tail)) { char *new_path; ! if (new_path = copy_string(path)) ll_add_data(cur_node, new_path); else { --- 1468,1474 ---- if (cur_node = ll_add_node(&paths, ll_tail)) { char *new_path; ! if (new_path = strdup(path)) ll_add_data(cur_node, new_path); else { Index: openafs/src/WINNT/client_creds/ipaddrchg.c diff -c openafs/src/WINNT/client_creds/ipaddrchg.c:1.4.4.2 openafs/src/WINNT/client_creds/ipaddrchg.c:1.4.4.3 *** openafs/src/WINNT/client_creds/ipaddrchg.c:1.4.4.2 Sun Sep 2 12:37:44 2007 --- openafs/src/WINNT/client_creds/ipaddrchg.c Mon Nov 3 14:56:08 2008 *************** *** 177,183 **** pp.host.retry = 0; pp.verbose = 1; ! /* WIN32: cm_SearchCellFile(cell, pcallback, pdata) */ rc = pcm_SearchCellFile(cell, newcell, pingFS, (void *)&pp); } #endif /* USE_FSPROBE */ --- 177,183 ---- pp.host.retry = 0; pp.verbose = 1; ! /* WIN32: cm_SearchCellFile(cell, newcell, linkedCell, pcallback, pdata) */ rc = pcm_SearchCellFile(cell, newcell, pingFS, (void *)&pp); } #endif /* USE_FSPROBE */ Index: openafs/src/WINNT/client_exp/gui2fs.cpp diff -c openafs/src/WINNT/client_exp/gui2fs.cpp:1.19.4.7 openafs/src/WINNT/client_exp/gui2fs.cpp:1.19.4.8 *** openafs/src/WINNT/client_exp/gui2fs.cpp:1.19.4.7 Fri May 9 11:10:13 2008 --- openafs/src/WINNT/client_exp/gui2fs.cpp Sat Oct 18 00:12:35 2008 *************** *** 1200,1206 **** DWORD dummyLen; DWORD enabled = 0; ! code = RegOpenKeyExA(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY, 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey); if (code == ERROR_SUCCESS) { dummyLen = sizeof(buffer); --- 1200,1206 ---- DWORD dummyLen; DWORD enabled = 0; ! code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY, 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey); if (code == ERROR_SUCCESS) { dummyLen = sizeof(buffer); Index: openafs/src/WINNT/client_exp/shell_ext.cpp diff -c openafs/src/WINNT/client_exp/shell_ext.cpp:1.12.4.5 openafs/src/WINNT/client_exp/shell_ext.cpp:1.12.4.6 *** openafs/src/WINNT/client_exp/shell_ext.cpp:1.12.4.5 Fri May 9 11:10:13 2008 --- openafs/src/WINNT/client_exp/shell_ext.cpp Sat Oct 18 00:12:35 2008 *************** *** 76,82 **** m_bIsOverlayEnabled=FALSE; if (FAILED(hr)) m_pAlloc = NULL; ! RegOpenKeyExA(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &NPKey); LSPsize=sizeof(ShellOption); code=RegQueryValueEx(NPKey, _T("ShellOption"), NULL, &LSPtype, (LPBYTE)&ShellOption, &LSPsize); --- 76,82 ---- m_bIsOverlayEnabled=FALSE; if (FAILED(hr)) m_pAlloc = NULL; ! RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &NPKey); LSPsize=sizeof(ShellOption); code=RegQueryValueEx(NPKey, _T("ShellOption"), NULL, &LSPtype, (LPBYTE)&ShellOption, &LSPsize); Index: openafs/src/WINNT/client_exp/submounts_dlg.cpp diff -c openafs/src/WINNT/client_exp/submounts_dlg.cpp:1.5.6.2 openafs/src/WINNT/client_exp/submounts_dlg.cpp:1.5.6.3 *** openafs/src/WINNT/client_exp/submounts_dlg.cpp:1.5.6.2 Fri May 9 11:10:13 2008 --- openafs/src/WINNT/client_exp/submounts_dlg.cpp Sat Oct 18 00:12:35 2008 *************** *** 45,54 **** TCHAR pathName[1024]; HKEY hkSubmounts; ! RegCreateKeyExA( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts", 0, ! "AFS", REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ, NULL, --- 45,54 ---- TCHAR pathName[1024]; HKEY hkSubmounts; ! RegCreateKeyEx( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"), 0, ! TEXT("AFS"), REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ, NULL, *************** *** 166,175 **** DWORD dwIndex; DWORD dwSubmounts; ! RegCreateKeyExA( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts", 0, ! "AFS", REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ|KEY_WRITE|KEY_QUERY_VALUE, NULL, --- 166,175 ---- DWORD dwIndex; DWORD dwSubmounts; ! RegCreateKeyEx( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"), 0, ! TEXT("AFS"), REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_READ|KEY_WRITE|KEY_QUERY_VALUE, NULL, *************** *** 248,257 **** HOURGLASS hourglass; HKEY hkSubmounts; ! RegCreateKeyExA( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts", 0, ! "AFS", REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE, NULL, --- 248,257 ---- HOURGLASS hourglass; HKEY hkSubmounts; ! RegCreateKeyEx( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"), 0, ! TEXT("AFS"), REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE, NULL, *************** *** 271,280 **** HOURGLASS hourglass; HKEY hkSubmounts; ! RegCreateKeyExA( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY "\\Submounts", 0, ! "AFS", REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE, NULL, --- 271,280 ---- HOURGLASS hourglass; HKEY hkSubmounts; ! RegCreateKeyEx( HKEY_LOCAL_MACHINE, ! AFSREG_CLT_OPENAFS_SUBKEY TEXT("\\Submounts"), 0, ! TEXT("AFS"), REG_OPTION_NON_VOLATILE, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_WRITE, NULL, 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.39 openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.40 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.39 Tue Oct 7 18:09:54 2008 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Fri Nov 7 19:06:39 2008 *************** *** 57,63 ****

OpenAFS for Windows

!

Version 1.5.54

 

--- 57,63 ----

OpenAFS for Windows

!

Version 1.5.55

 

*************** *** 78,84 **** ·         OpenAFS for Windows 1.5.54 Release Notes

--- 78,84 ---- ·         OpenAFS for Windows 1.5.55 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.37 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.38 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm:1.1.6.37 Tue Oct 7 18:10:00 2008 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/logo.htm Fri Nov 7 19:06:51 2008 *************** *** 18,24 **** .shape {behavior:url(#default#VML);} ! OpenAFS for Windows 1.5.54 Release Notes ! OpenAFS for Windows 1.5.55 Release Notes ! OpenAFS for Windows 1.5.54 Release Notes ! OpenAFS for Windows 1.5.55 Release Notes ! ! netidmgr_main

The Network Identity Manager replaces the former KFW ticket manager, Leash”, and when combined with the OpenAFS Provider, it is intended to --- 1805,1811 ---- mso-wrap-style:square'> netidmgr_main

The Network Identity Manager replaces the former KFW ticket manager, Leash”, and when combined with the OpenAFS Provider, it is intended to *************** *** 1778,1784 **** height:294.75pt;visibility:visible;mso-wrap-style:square'> netidmgr_afs_opt

The AFS configuration panel for each Kerberos v5 identity is used to configure which cells credentials should be obtained for and how they --- 1820,1826 ---- height:294.75pt;visibility:visible;mso-wrap-style:square'> netidmgr_afs_opt

The AFS configuration panel for each Kerberos v5 identity is used to configure which cells credentials should be obtained for and how they *************** *** 1793,1799 **** height:294.75pt;visibility:visible;mso-wrap-style:square'> netidmgr_afs_cfg

The OpenAFS Provider configuration panel can be used to check the status of the AFS Client Service and its version. netidmgr_afs_cfg

The OpenAFS Provider configuration panel can be used to check the status of the AFS Client Service and its version.   A shortcut to the OpenAFS Control Panel is also provided.

!

3.2. Use of the Microsoft Loopback Adapter ! by the AFS Client Service

By itself the OpenAFS Client Service does not provide robust behavior in a plug-n-play network environment.  Changes to the number of --- 1844,1858 ---- login.   A shortcut to the OpenAFS Control Panel is also provided.

!

3.3. ! Use of the Microsoft Loopback Adapter by the AFS Client Service

By itself the OpenAFS Client Service does not provide robust behavior in a plug-n-play network environment.  Changes to the number of *************** *** 1865,1878 **** the AFS Client Service is simply "AFS" and portable UNC paths of the form \\AFS\cellname\path can now be used on all machines.

!

3.3. Using Freelance (Dynamic Root) Mode to ! Improve Mobility

Traditionally, when the OpenAFS Client Service starts it must be able to access the "root.afs" volume of the default --- 1908,1922 ---- the AFS Client Service is simply "AFS" and portable UNC paths of the form \\AFS\cellname\path can now be used on all machines.

!

3.4. ! Using Freelance (Dynamic Root) Mode to Improve Mobility

Traditionally, when the OpenAFS Client Service starts it must be able to access the "root.afs" volume of the default *************** *** 1902,1921 **** preserved in the registry at key:

HKLM\SOFTWARE\OpenAFS\Client\Freelance

Additional mount points may be manually created using the "fs mkmount" command.  Mount points may be removed using the "fs rmmount" command.

!

>fs mkmount \\AFS\athena.mit.edu ! root.cell athena.mit.edu

>fs mkmount \\AFS\.athena.mit.edu root.cell athena.mit.edu -rw

--- 1946,1968 ---- preserved in the registry at key:

HKLM\SOFTWARE\OpenAFS\Client\Freelance

Additional mount points may be manually created using the "fs mkmount" command.  Mount points may be removed using the "fs rmmount" command.

!

>fs mkmount ! \\AFS\athena.mit.edu root.cell athena.mit.edu

>fs mkmount \\AFS\.athena.mit.edu root.cell athena.mit.edu -rw

*************** *** 1943,1978 ****

The symlinks are stored in the registry at:

HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks 

! !

3.4. Locating AFS Volume Database Servers ! via DNS

The OpenAFS for Windows client will use DNS AFSDB records to discover the location of AFS Volume Database servers when entries for the cell are not present in the client's CellServDB file (\%PROGRAMFILES%\OpenAFS\Client\CellServDB).

!

3.5. Obtaining AFS Tokens as a Integrated ! Part of Windows Logon

OpenAFS for Windows installs a WinLogon Network Provider to provide Single Sign-On functionality (aka Integrated Logon.)  Integrated --- 1990,2031 ----

The symlinks are stored in the registry at:

HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks 

! !

3.5. ! Locating AFS Volume Database Servers via DNS !

The OpenAFS for Windows client will use DNS AFSDB records to discover the location of AFS Volume Database servers when entries for the cell are not present in the client's CellServDB file (\%PROGRAMFILES%\OpenAFS\Client\CellServDB).

!

3.6. ! Obtaining AFS Tokens as a Integrated Part of Windows Logon

OpenAFS for Windows installs a WinLogon Network Provider to provide Single Sign-On functionality (aka Integrated Logon.)  Integrated *************** *** 2003,2010 **** value.

Integrated Logon will not transfer Kerberos v5 tickets into ! the user’s logon session credential cache. KFW 3.1 and above provides that functionality ! on its own.

Integrated Logon does not have the ability to cache the user's username and password for the purpose of obtaining tokens if the --- 2056,2063 ---- value.

Integrated Logon will not transfer Kerberos v5 tickets into ! the user’s logon session credential cache. KFW 3.1 and above provides that ! functionality on its own.

Integrated Logon does not have the ability to cache the user's username and password for the purpose of obtaining tokens if the *************** *** 2027,2039 **** color:#365F91;text-decoration:none;text-underline:none'>der.

!

3.6. AFS System Tray Command Line Options

The AFS System Tray Tool (afscreds.exe) has been deprecated in favor of Network Identity Manager.der.

!

3.7. ! AFS System Tray Command Line Options

The AFS System Tray Tool (afscreds.exe) has been deprecated in favor of Network Identity Manager.Appendix A.

!

3.7. The “AFS Client Admins” Authorization ! Group

The OpenAFS for Windows client supports a local Windows authorization group named "AFS Client Admins".  This group is --- 2146,2160 ---- style='font-size:14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration: none;text-underline:none'>Appendix A.

!

3.8. ! The “AFS Client Admins” Authorization Group

The OpenAFS for Windows client supports a local Windows authorization group named "AFS Client Admins".  This group is *************** *** 2162,2169 **** Freelance “root.afs” volume are also restricted to members of the “AFS Client Admins” group.

!

The initial membership of the "AFS Client Admins" group ! when created by the installer is equivalent to the local "Administrators" group.  If a user is added to the "Administrators" group after the creation of the "AFS Client Admin" group, that user will not be an AFS Client Administrator.  --- 2218,2225 ---- Freelance “root.afs” volume are also restricted to members of the “AFS Client Admins” group.

!

The initial membership of the "AFS Client Admins" ! group when created by the installer is equivalent to the local "Administrators" group.  If a user is added to the "Administrators" group after the creation of the "AFS Client Admin" group, that user will not be an AFS Client Administrator.  *************** *** 2177,2189 **** none;text-underline:none'>registry and not via "fs sysname".

!

3.8. OpenAFS support for UNC paths

The OpenAFS client supports UNC paths everywhere.  UNC --- 2233,2247 ---- none;text-underline:none'>registry and not via "fs sysname".

!

3.9. ! OpenAFS support for UNC paths

The OpenAFS client supports UNC paths everywhere.  UNC *************** *** 2212,2224 **** text-underline:none'>http://www.jpsoft.com.

!

3.9. aklog.exe

The OpenAFS Client ships with its own version of aklog.exe which should be used in preference to those obtained by other sources.  --- 2270,2284 ---- text-underline:none'>http://www.jpsoft.com.

!

3.10. ! aklog.exe

The OpenAFS Client ships with its own version of aklog.exe which should be used in preference to those obtained by other sources.  *************** *** 2257,2270 ****

   -m = use krb524d to convert Kerberos V tickets to Kerberos IV

!

3.10. OpenAFS Servers on Windows are ! Unsupported

The AFS Server functionality provided as part of the OpenAFS install package might work but should be considered highly experimental.  --- 2317,2331 ----

   -m = use krb524d to convert Kerberos V tickets to Kerberos IV

!

3.11. ! OpenAFS Servers on Windows are Unsupported

The AFS Server functionality provided as part of the OpenAFS install package might work but should be considered highly experimental.  *************** *** 2275,2284 **** and dynamic network configuration.  Salvager is also known to crash.

!

3.10.1. OpenAFS Server Installation

When the OpenAFS Server is installed, the TransarcAFSServer service (bosctlsvc.exe) will be installed and configured.  Salvager is also known to crash.

!

3.11.1. ! OpenAFS Server Installation

When the OpenAFS Server is installed, the TransarcAFSServer service (bosctlsvc.exe) will be installed and configured.  Instead, Active Directory or some other Kerberos v5 KDC should be used in its place.

!

3.10.2. Using the AFS Client Service when the Server is ! installed

A few notes on the usage of the AFS Client Service if it is going to be used with the OpenAFS AFS Server:

--- 2360,2370 ---- style='mso-spacerun:yes'>  Instead, Active Directory or some other Kerberos v5 KDC should be used in its place.

!

3.11.2. ! Using the AFS Client Service when the Server is installed

A few notes on the usage of the AFS Client Service if it is going to be used with the OpenAFS AFS Server:

*************** *** 2336,2348 **** not be shutdown or suspended unexpectedly.   An inadvertent shutdown will corrupt volume data.

!

3.11. OpenAFS Debugging Symbol files

The OpenAFS for Windows installers include Debugging Symbol files which should be installed if you are experiencing problems and need to --- 2398,2412 ---- not be shutdown or suspended unexpectedly.   An inadvertent shutdown will corrupt volume data.

!

3.12. ! OpenAFS Debugging Symbol files

The OpenAFS for Windows installers include Debugging Symbol files which should be installed if you are experiencing problems and need to *************** *** 2363,2370 ****

·       whether ! or not fs trace logging is turned on by ! default (release: no, debug: yes)

··       whether ! or not fs trace logging is turned on ! by default (release: no, debug: yes)

·3.12. Large File (64-bit) Support

As of release 1.5.3, OpenAFS for Windows supports files larger than 2GB.  The maximum file size is now 16777216 terabytes when the AFS File Server supports large files.   If the AFS File Server does not support 64-bit file sizes, then the maximum file size remains 2GB.

!

3.13. Encrypted AFS Network Communication

The OpenAFS for Windows installer by default activates a weak form of encrypted data transfer between the AFS client and the AFS --- 2437,2466 ---- or not additional debug statements were compiled into the binaries (release: no, debug: yes)

!

3.13. ! Large File (64-bit) Support

As of release 1.5.3, OpenAFS for Windows supports files larger than 2GB.  The maximum file size is now 16777216 terabytes when the AFS File Server supports large files.   If the AFS File Server does not support 64-bit file sizes, then the maximum file size remains 2GB.

!

3.14. ! Encrypted AFS Network Communication

The OpenAFS for Windows installer by default activates a weak form of encrypted data transfer between the AFS client and the AFS *************** *** 2400,2413 **** Transitions between “crypt” and “non-crypt” modes are logged to the Windows Application Event Log.

!

3.14. Authenticated Access to the OpenAFS ! Client Service

OpenAFS authenticates SMB connections using either NTLM or GSS SPNEGO (NTLM).  In previous versions of OpenAFS, the SMB connections --- 2469,2483 ---- Transitions between “crypt” and “non-crypt” modes are logged to the Windows Application Event Log.

!

3.15. ! Authenticated Access to the OpenAFS Client Service

OpenAFS authenticates SMB connections using either NTLM or GSS SPNEGO (NTLM).  In previous versions of OpenAFS, the SMB connections *************** *** 2426,2438 **** Instead, Windows will internally recognize the request as coming from a local logon session.

!

3.15. No More INI Files

Previous AFS clients for Windows stored configuration data in Windows .INI files.   The OpenAFS client does not use Windows .INI --- 2496,2510 ---- Instead, Windows will internally recognize the request as coming from a local logon session.

!

3.16. ! No More INI Files

Previous AFS clients for Windows stored configuration data in Windows .INI files.   The OpenAFS client does not use Windows .INI *************** *** 2454,2467 **** “afs_freelance.ini” file to the Windows registry.   OpenAFS will not process the contents of the “afsddbmt.ini”.

!

3.16. Microsoft Windows Internet Connection ! Firewall

The OpenAFS Client is compatible with the Internet Connection Firewall that debuted with Windows XP SP2 and Windows 2003 --- 2526,2540 ---- “afs_freelance.ini” file to the Windows registry.   OpenAFS will not process the contents of the “afsddbmt.ini”.

!

3.17. ! Microsoft Windows Internet Connection Firewall

The OpenAFS Client is compatible with the Internet Connection Firewall that debuted with Windows XP SP2 and Windows 2003 *************** *** 2471,2499 **** to allow SMB authentication to be performed across the Microsoft Loopback Adapter.

!

3.17. Browsing AFS from the Explorer Shell ! and Office

The OpenAFS Client Service implements the CIFS Remote Admin Protocol which allows Explorer to browse server and share information. This significantly enhances the interoperability of AFS volumes within the Explorer Shell and Microsoft Office applications.

!

3.18. Byte Range ! Locking

Many applications on Windows (e.g. Microsoft Office) require the use of byte range locks applied to a file either to protect against --- 2544,2574 ---- to allow SMB authentication to be performed across the Microsoft Loopback Adapter.

!

3.18. ! Browsing AFS from the Explorer Shell and Office

The OpenAFS Client Service implements the CIFS Remote Admin Protocol which allows Explorer to browse server and share information. This significantly enhances the interoperability of AFS volumes within the Explorer Shell and Microsoft Office applications.

!

3.19. ! Byte Range Locking

Many applications on Windows (e.g. Microsoft Office) require the use of byte range locks applied to a file either to protect against *************** *** 2543,2550 **** shared lock, the CIFS-AFS server will grant the lock request without asking the AFS file server.

  • If the ! file is located on a read-only volume and the application opens the file ! with write access and requests an exclusive lock, the CIFS-AFS server will refuse the lock request and return a read only error.
  • If the file is located on a read-only volume and the application opens the file --- 2618,2625 ---- shared lock, the CIFS-AFS server will grant the lock request without asking the AFS file server.
  • If the ! file is located on a read-only volume and the application opens the file with ! write access and requests an exclusive lock, the CIFS-AFS server will refuse the lock request and return a read only error.
  • If the file is located on a read-only volume and the application opens the file *************** *** 2565,2572 **** the request.
  • If the file is located on a read-write volume and the application requests a ! shared lock, the CIFS-AFS server will request a read lock from the AFS ! file server.  If granted by the file server, then the CIFS-AFS server grants the lock request.  If the request is denied due to an access denied error and the user has the lookup and read privileges but not the lock privilege, then the CIFS-AFS server will grant the request even --- 2640,2647 ---- the request.
  • If the file is located on a read-write volume and the application requests a ! shared lock, the CIFS-AFS server will request a read lock from the AFS file ! server.  If granted by the file server, then the CIFS-AFS server grants the lock request.  If the request is denied due to an access denied error and the user has the lookup and read privileges but not the lock privilege, then the CIFS-AFS server will grant the request even *************** *** 2590,2603 **** style='font-size:14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration: none;text-underline:none'>EnableServerLocks registry value.

    !

    3.19. Automatic Discarding of AFS Tokens at ! Logoff

    The OpenAFS Client will automatically forget a user's tokens upon Logoff unless the user's profile was loaded from an AFS volume.  In --- 2665,2679 ---- style='font-size:14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration: none;text-underline:none'>EnableServerLocks registry value.

    !

    3.20. ! Automatic Discarding of AFS Tokens at Logoff

    The OpenAFS Client will automatically forget a user's tokens upon Logoff unless the user's profile was loaded from an AFS volume.  In *************** *** 2615,2627 **** class=Heading1Char>Appendix A.)

    !

    3.20. Windows Terminal Server installations

    When installing the NSIS (.exe) installer under Terminal Server, you must execute it from within the Add/Remove Programs Control --- 2691,2705 ---- class=Heading1Char>Appendix A.)

    !

    3.21. ! Windows Terminal Server installations

    When installing the NSIS (.exe) installer under Terminal Server, you must execute it from within the Add/Remove Programs Control *************** *** 2629,2641 **** The AFS Server should not be installed on a machine with Terminal Server installed.

    !

    3.21. Hidden Dot Files

    AFS is a UNIX native file system.  The OpenAFS client attempts to treat the files stored in AFS as they would be on UNIX.  File --- 2707,2721 ---- The AFS Server should not be installed on a machine with Terminal Server installed.

    !

    3.22. ! Hidden Dot Files

    AFS is a UNIX native file system.  The OpenAFS client attempts to treat the files stored in AFS as they would be on UNIX.  File *************** *** 2646,2668 **** 14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration:none;text-underline: none'>HideDotFiles registry value.

    !

    3.22. Status Cache Limits

    The Status Cache (AFS Configuration Control Panel: Advanced Page) is defined to have a maximum number of entries.  Each entry ! represents a single file or directory entry accessed within the AFS file ! system.  When the maximum number of entries are allocated, entries will ! begin to be reused according to a least recently used (LRU) algorithm.  If ! the number of files or directories being accessed repeatedly by your ! applications is greater then the maximum number of entries, your host will ! begin to experience thrashing of the Status Cache and all requests will result ! in network operations.

    If you are experiencing poor performance try increasing the maximum number of Status Cache entries.  Each entry requires approximately --- 2726,2750 ---- 14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration:none;text-underline: none'>HideDotFiles registry value.

    !

    3.23. ! Status Cache Limits

    The Status Cache (AFS Configuration Control Panel: Advanced Page) is defined to have a maximum number of entries.  Each entry ! represents a single file or directory entry accessed within the AFS file system.  ! When the maximum number of entries are allocated, entries will begin to be ! reused according to a least recently used (LRU) algorithm.  If the number ! of files or directories being accessed repeatedly by your applications is ! greater then the maximum number of entries, your host will begin to experience ! thrashing of the Status Cache and all requests will result in network ! operations.

    If you are experiencing poor performance try increasing the maximum number of Status Cache entries.  Each entry requires approximately *************** *** 2672,2699 **** mso-fareast-font-family:"MS Mincho";text-decoration:none;text-underline:none'>Stats registry value.

    !

    3.23. NETBIOS over TCP/IP must be enabled

    ! !

    "Netbios over TCP/IP" must be active on the ! machine in order for communication with the AFS Client Service to ! succeed.  If "Netbios over TCP/IP" is disabled on the machine, ! then communication with the AFS Client Service will be impossible.  If you are using the Microsoft Loopback ! Adapter, configure the “Netbios over TCP/IP” setting for the adapter.

    ! !

    3.24. OpenAFS binaries are digitally signed

    The OpenAFS Client Service and related binaries distributed by OpenAFS.org are digitally signed by "Secure Endpoints Inc.".  --- 2754,2785 ---- mso-fareast-font-family:"MS Mincho";text-decoration:none;text-underline:none'>Stats registry value.

    !

    3.24. ! NETBIOS over TCP/IP must be enabled

    ! !

    "Netbios over TCP/IP" must be active on the machine ! in order for communication with the AFS Client Service to succeed.  If ! "Netbios over TCP/IP" is disabled on the machine, then communication ! with the AFS Client Service will be impossible.  ! If you are using the Microsoft Loopback Adapter, configure the “Netbios ! over TCP/IP” setting for the adapter.

    ! !

    3.25. ! OpenAFS binaries are digitally signed

    The OpenAFS Client Service and related binaries distributed by OpenAFS.org are digitally signed by "Secure Endpoints Inc.".  *************** *** 2706,2758 **** releases. 

    Appendix A ! documents the "VerifyServiceSignature" registry value which can be used to disable the signature check.  The file version check cannot be disabled.

    !

    3.25. Maximum Size of the AFSCache File

    The maximum cache size on 32-bit Windows is approximately 1.3GB.  This is the largest contiguous block of memory in the 2GB process address space which can be used for constructing a memory mapped file.  ! Due to fragmentation of the process space caused by the loading of libraries required ! by the digital signature verification code, any attempt to specify a cache size ! greater then 700MB will result in the automatic disabling of the signature ! check.  Significantly larger cache sizes ! can be used on 64-bit Windows.

    ! !

    3.26. Filename Character Sets

    OpenAFS for Windows implements an SMB server which is used as a gateway to the AFS filesystem.  Because of limitations of the SMB ! implementation in pre-1.5.50 releases, Windows stored all files into AFS using OEM code pages such as ! CP437 (United States) or CP850 (Western Europe).  These code pages are ! incompatible with the ISO Latin-1 or Unicode (UTF-8) character sets typically used as the default ! on UNIX systems in both the United States ! and Western Europe.  Filenames stored by ! OpenAFS for Windows were therefore unreadable on UNIX systems if they include ! any of the following characters:

    --- 2792,2857 ---- releases. 

    Appendix A documents the ! "VerifyServiceSignature" registry value which can be used to disable the signature check.  The file version check cannot be disabled.

    !

    3.26. ! Maximum Size of the AFSCache File

    The maximum cache size on 32-bit Windows is approximately 1.3GB.  This is the largest contiguous block of memory in the 2GB process address space which can be used for constructing a memory mapped file.  ! Due to fragmentation of the process space caused by the loading of libraries ! required by the digital signature verification code, any attempt to specify a ! cache size greater then 700MB will result in the automatic disabling of the ! signature check.  Significantly larger ! cache sizes can be used on 64-bit Windows.

    ! !

    3.27. ! Filename Character Sets

    ! !

    This section describes functionality ! and concerns related to pre-1.5.50 releases of OpenAFS for Windows.   This release stores all file names on the ! file servers as Unicode encoded using UTF-8.

    OpenAFS for Windows implements an SMB server which is used as a gateway to the AFS filesystem.  Because of limitations of the SMB ! implementation in pre-1.5.50 releases, Windows stored all files into AFS using ! OEM code pages such as CP437 (United States) or CP850 (Western Europe).  ! These code pages are incompatible with the ISO Latin-1 or Unicode (UTF-8) ! character sets typically used as the default on UNIX systems in both the United States and Western ! Europe.  Filenames stored by OpenAFS for Windows were ! therefore unreadable on UNIX systems if they include any of the following ! characters:

    *************** *** 2806,2813 ****

         [ò]  149  09/05  225  95  o grave

         ! [û]  150  ! 09/06  226  96  u circumflex

         [ù]  151  09/07  227  97  u grave

         --- 2905,2912 ----

         [ò]  149  09/05  225  95  o grave

         ! [û]  150  09/06  ! 226  96  u circumflex

         [ù]  151  09/07  227  97  u grave

         *************** *** 2835,2885 ****

     

    !

    The pre-1.5.50 OpenAFS Client provided an optional registry value, StoreAnsiFilenames, that could be ! set to instruct OpenAFS to store filenames using the ANSI Code Page instead of ! the OEM Code Page.  The ANSI Code Page is a compatible superset of Latin-1.  This setting is not the default setting because making this change would prevent OpenAFS for Windows from being able to access filenames containing the above characters which were created without this setting.

    !

    ! All versions of OpenAFS for Windows 1.5.50 and above exchange file names with ! Microsoft Windows using the Unicode character set. All file names are read from ! and stored to AFS file servers using the UTF-8 encoding of Unicode. As a result ! the StoreAnsiFilenames option is no ! longer supported. !

    ! !

    3.27. Known Character Set Issues with ! Roaming Profiles

    There is a known issue with storing Windows Roaming Profiles when the profile contains either directories or files with names which cannot be represented in the local OEM character set.  In this case, attempts to write the profile back to AFS will fail during the character set ! conversion.  The OpenAFS Client’s CIFS gateway does not support UNICODE.  To avoid this problem some sites run custom logoff scripts (assigned by group policy) which rename all files to use only the supported characters for the locale.

    !

    3.28. The AFSCache File

    The AFS Cache file is stored by default at %TEMP%\AFSCache in a persistent file marked with the Hidden and System attributes.  The --- 2934,2993 ----

     

    !

    The pre-1.5.50 OpenAFS Client provided an optional registry ! value, StoreAnsiFilenames, that could ! be set to instruct OpenAFS to store filenames using the ANSI Code Page instead ! of the OEM Code Page.  The ANSI Code Page is a compatible superset of Latin-1.  This setting is not the default setting because making this change would prevent OpenAFS for Windows from being able to access filenames containing the above characters which were created without this setting.

    !

    All versions of OpenAFS for Windows 1.5.50 and above ! exchange file names with Microsoft Windows using the Unicode character set. All ! file names are read from and stored to AFS file servers using the UTF-8 ! encoding of Unicode. As a result the StoreAnsiFilenames ! option is no longer supported.

    ! !

    3.28. ! Character Set Issues with Roaming Profiles

    ! !

    This section describes functionality ! and concerns related to pre-1.5.50 releases of OpenAFS for Windows.   This release stores all file names on the ! file servers as Unicode encoded using UTF-8.

    There is a known issue with storing Windows Roaming Profiles when the profile contains either directories or files with names which cannot be represented in the local OEM character set.  In this case, attempts to write the profile back to AFS will fail during the character set ! conversion.  The pre-1.5.50 OpenAFS Client’s CIFS gateway did not support UNICODE.  To avoid this problem some sites run custom logoff scripts (assigned by group policy) which rename all files to use only the supported characters for the locale.

    !

    Versions of OpenAFS for Windows 1.5.50 and above do not ! suffer from these issues.

    ! !

    3.29. ! The AFSCache File

    The AFS Cache file is stored by default at %TEMP%\AFSCache in a persistent file marked with the Hidden and System attributes.  The *************** *** 2888,2908 **** servers. 

    The performance of the AFS Client Service is significantly ! affected by the access times associated with the AFSCache paging ! file.   When given the choice, the AFSCache file should be placed on ! a fast disk, preferably NTFS, the file should not be compressed and should ! consist of as few fragments as possible.   Significant performance ! gains can be achieved by defragmenting the AFSCache file with Sysinternal's ! Contig utility while the AFS Client Service is stopped.

    ! !

    3.29. Restricting OpenAFS Client Service ! Start and Stop

    A new command line tool, afsdacl.exe, can be used to restrict the ability to start and stop the OpenAFS Client Service.

    --- 2996,3017 ---- servers. 

    The performance of the AFS Client Service is significantly ! affected by the access times associated with the AFSCache paging file.   ! When given the choice, the AFSCache file should be placed on a fast disk, ! preferably NTFS, the file should not be compressed and should consist of as few ! fragments as possible.   Significant performance gains can be ! achieved by defragmenting the AFSCache file with SysInternal's Contig utility ! while the AFS Client Service is stopped.

    ! !

    3.30. ! Restricting OpenAFS Client Service Start and Stop

    A new command line tool, afsdacl.exe, can be used to restrict the ability to start and stop the OpenAFS Client Service.

    *************** *** 2927,2963 ****

              -show  : Show current DACL (SDSF)

    !

    3.30. The @sys Name List

    The default @sys name list in the OpenAFS Client is set to "x86_win32 i386_w2k i386_nt40" for 32-bit x86 systems.  The default is "amd64_win64" for amd 64-bit versions of Windows.

    !

    3.31. Symlinks to AFS UNC paths

    In OpenAFS, symlinks to AFS UNC paths, \\AFS[\all]\..., are ! treated the same as symlinks to /afs/...  However, please use /afs/... as the ! Windows UNC form will not work on UNIX client.

    !

    3.32. Cache Manager Debugging

    The OpenAFS Client implements the Cache Manager Debugging RPC Interface.  The CM debugger can be queried with cmdebug.exe.          -show  : Show current DACL (SDSF)

    !

    3.31. ! The @sys Name List

    The default @sys name list in the OpenAFS Client is set to "x86_win32 i386_w2k i386_nt40" for 32-bit x86 systems.  The default is "amd64_win64" for amd 64-bit versions of Windows.

    !

    3.32. ! Symlinks to AFS UNC paths

    In OpenAFS, symlinks to AFS UNC paths, \\AFS[\all]\..., are ! treated the same as symlinks to /afs/...  However, please use /afs/... as ! the Windows UNC form will not work on UNIX client.

    !

    3.33. ! Cache Manager Debugging

    The OpenAFS Client implements the Cache Manager Debugging RPC Interface.  The CM debugger can be queried with cmdebug.exe.

           ! -callbacks   print only cache entries ! with callbacks

           -ctime       print human readable expiration time

           ! -addrs       print only host ! interfaces

           -cache       print only cache --- 3092,3106 ---- entries with positive reference counts

           ! -callbacks   print only cache ! entries with callbacks

           -ctime       print human readable expiration time

           ! -addrs       print only host interfaces

           -cache       print only cache *************** *** 2996,3022 **** -cellservdb  print only cellservdb info

    !

    3.33. Windows Logon Caching vs. Kerberos ! Logons

    If you are a site which utilizes MIT/Heimdal Kerberos principals to logon to Windows via a cross-realm relationship with a multi-domain Windows forest, you must enable Windows logon caching unless the workstation is Windows Vista.

    !

    3.34. Initial Server Preferences

    VLDB and File Server Preferences can now be provided initial values using registry keys.  This is useful for managed machines in a --- 3110,3139 ---- -cellservdb  print only cellservdb info

    !

    3.34. ! Windows Logon Caching vs. Kerberos Logons

    If you are a site which utilizes MIT/Heimdal Kerberos principals to logon to Windows via a cross-realm relationship with a multi-domain Windows forest, you must enable Windows logon caching unless the workstation is Windows Vista.

    !

    3.35. ! Initial Server Preferences

    VLDB and File Server Preferences can now be provided initial values using registry keys.  This is useful for managed machines in a *************** *** 3028,3040 **** style='font-size:14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration: none;text-underline:none'>Server Preferences" keys.

    !

    3.35. File Timestamps

    The OpenAFS Client reports timestamps on files stored in AFS in UTC all year round.  In locales with daylight savings time, previous --- 3145,3160 ---- style='font-size:14.0pt;mso-fareast-font-family:"MS Mincho";text-decoration: none;text-underline:none'>Server Preferences" keys.

    !

    3.36. ! File Timestamps and Daylight ! Saving Time

    The OpenAFS Client reports timestamps on files stored in AFS in UTC all year round.  In locales with daylight savings time, previous *************** *** 3054,3107 **** timestamp from the Windows explorer.  During DST, these two times will no longer agree even though they are in fact representing the same moment in time.

    !

    3.36. Windows RPC client support must be ! installed

    If the installer refuses to install and complains about an RPC configuration error, check to ensure that the following registry entries are present and that they refer to the dll "rpcrt4.dll":

    !

       HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" ! "ncacn_np"

       HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_ip_tcp"

    !

       HKLM ! "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncadg_ip_udp"

       HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http"

    !

    3.37. Generating Minidumps of the OpenAFS ! Client Service

    OpenAFS 1.4 added a new command, "fs ! minidump".  This command can be used at any time to generate a mini ! dump file containing the current stack of the afsd_service.exe ! process.   This output can be very helpful when debugging the AFS ! Client Service when it is unresponsive to SMB/CIFS requests.

    ! !

    3.38. AFS Client Universally Unique ! Identifiers (UUIDs) vs. System Cloning

    The OpenAFS Client implements Universally Unique Identifiers (UUIDs).  They are used to provide the AFS file server with a method of --- 3174,3231 ---- timestamp from the Windows explorer.  During DST, these two times will no longer agree even though they are in fact representing the same moment in time.

    !

    3.37. ! Windows RPC client support must be installed !

    If the installer refuses to install and complains about an RPC configuration error, check to ensure that the following registry entries are present and that they refer to the dll "rpcrt4.dll":

    !

       HKLM ! "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_np"

       HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_ip_tcp"

    !

       HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" ! "ncadg_ip_udp"

       HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http"

    !

    3.38. ! Generating Minidumps of the OpenAFS Client Service

    OpenAFS 1.4 added a new command, "fs ! minidump".  This command can be used at any time to generate a mini dump ! file containing the current stack of the afsd_service.exe process.   ! This output can be very helpful when debugging the AFS Client Service when it ! is unresponsive to SMB/CIFS requests.

    ! !

    3.39. ! AFS Client Universally Unique Identifiers (UUIDs) vs. System Cloning

    The OpenAFS Client implements Universally Unique Identifiers (UUIDs).  They are used to provide the AFS file server with a method of *************** *** 3118,3126 **** automatically if the Windows Machine SID is re-generated using Microsoft SysPrep. If the SID is not being re-generated either the AFSCache file should be deleted or the command fs uuid -generate must be executed after the ! the clone is created. Multiple AFS clients reporting the same UUID will not ! only result in horrible AFS client performance and cache inconsistencies, but ! they will also put a tremendous strain on the AFS file servers.

    For lab environments that wish to erase all cached data on each restart, the fs uuid -generate must be executed after the ! the clone is created. Multiple AFS clients reporting ! the same UUID will not only result in horrible AFS client performance and cache ! inconsistencies, but they will also put a tremendous strain on the AFS file ! servers.

    For lab environments that wish to erase all cached data on each restart, the msiexec.exe /a.

    !

    3.39. ! Delayed Write Errors with Microsoft Office Applications

    Microsoft Office makes heavy use of asynchronous input/output methods for reading and writing to file streams.  This can result in hundreds of requests being simultaneously queued for service by the CIFS client with a fixed timeout period.  As the AFS CIFS server is local ! to the machine the Windows CIFS client believes that it can respond almost ! instantaneously to write requests as the actual writing to the AFS file server ! is performed by a background daemon thread.  When the actual network ! bandwidth to the AFS file server is slow and the file size is large it is ! possible for the CIFS client to time out the connection.  When this ! happens a “delayed write error” will be reported to the user and the ! application may crash.  The only workaround at the current time is to save ! first to a local disk and subsequently copy the file to AFS as copying a file ! with the explorer shell does not use asynchronous i/o.

    The CIFS session timeout defaults to 45 seconds and can be increased by modifying the msiexec.exe /a.

    !

    3.40. Delayed Write Errors with Microsoft ! Office Applications

    Microsoft Office makes heavy use of asynchronous input/output methods for reading and writing to file streams.  This can result in hundreds of requests being simultaneously queued for service by the CIFS client with a fixed timeout period.  As the AFS CIFS server is local ! to the machine the Windows CIFS client believes that it can respond almost instantaneously ! to write requests as the actual writing to the AFS file server is performed by ! a background daemon thread.  When the actual network bandwidth to the AFS ! file server is slow and the file size is large it is possible for the CIFS ! client to time out the connection.  When this happens a “delayed write ! error” will be reported to the user and the application may crash.  The ! only workaround at the current time is to save first to a local disk and ! subsequently copy the file to AFS as copying a file with the explorer shell ! does not use asynchronous i/o.

    The CIFS session timeout defaults to 45 seconds and can be increased by modifying the SMBAsyncStoreSize registry value.  Asynchronous store operations can also be ! disabled using the EnableSMBAsyncStore registry value in which case all writes received by the cache manager block until the Rx StoreData operation completes.

    !

    3.40. ! Global Drives (aka Service ! Drive Letters) are no longer supported by ! Microsoft

    The Global DriveAuto-mount feature has been deprecated due to the following Microsoft KB article.

    http://msdn.microsoft.com/library/en-us/dllproc/base/services_and_redirected_drives.asp

    It says that services mounting drive letters are no longer supported by Microsoft and may act unpredictably.  The experience other --- 3310,3356 ---- now defaults to 32KB and is configurable using the SMBAsyncStoreSize registry ! value.  Asynchronous store operations can ! also be disabled using the EnableSMBAsyncStore registry value in which case all writes received by the cache manager block until the Rx StoreData operation completes.

    !

    3.41. Global Drives (aka Service ! Drive Letters) are no longer supported by ! Microsoft

    The Global DriveAuto-mount feature has been deprecated due to the following Microsoft KB article.

    http://msdn.microsoft.com/library/en-us/dllproc/base/services_and_redirected_drives.asp

    It says that services mounting drive letters are no longer supported by Microsoft and may act unpredictably.  The experience other *************** *** 3229,3240 **** applications should be modified to use of \\AFS\<cellname>\<path> instead of drive letters.

    !

    3.41. ! 64-bit Microsoft Windows Installations

    Although 64-bit Windows platforms support both 64-bit and 32-bit applications, the OpenAFS Service installed on the machine must be --- 3362,3374 ---- applications should be modified to use of \\AFS\<cellname>\<path> instead of drive letters.

    !

    3.42. 64-bit Microsoft Windows Installations

    Although 64-bit Windows platforms support both 64-bit and 32-bit applications, the OpenAFS Service installed on the machine must be *************** *** 3249,3263 **** Without this restriction the AFS Cache File can become arbitrarily large limited only by available disk space.

    !

    3.42. ! Known Issues with Microsoft Windows Vista

    OpenAFS for Windows works with Microsoft Windows Vista from both the command prompt and the Explorer Shell. !

    3.43. Known Issues with Microsoft Windows Vista

    OpenAFS for Windows works with Microsoft Windows Vista from both the command prompt and the Explorer Shell.  When a Vista user account that is a member of the “Administrators” group is used to access ! the AFS Control Panel (afs_config.exe), the process must be “Run as Administrator”.   Otherwise, attempts to modify the OpenAFS ! configuration will appear to succeed but in reality will have failed due to Vista’s system file and registry virtualization feature.

    The help files provided with OpenAFS are in .HLP format.   When a Vista user account that is a member of the “Administrators” group is used to access ! the AFS Control Panel (afs_config.exe), the process must be “Run as ! Administrator”.   Otherwise, attempts to ! modify the OpenAFS configuration will appear to succeed but in reality will ! have failed due to Vista’s system file and ! registry virtualization feature.

    The help files provided with OpenAFS are in .HLP format. Windows Vista does not include a help engine for this format.

    !

    3.43. New AFS Share Name Syntax Provides ! Direct Access to Volumes

    Starting with the 1.5.21 release of OpenAFS for Windows, the following syntax can be used to --- 3443,3457 ---- none;text-underline:none'>Windows Vista does not include a help engine for this format.

    !

    3.44. New AFS Share Name Syntax Provides Direct Access to ! Volumes

    Starting with the 1.5.21 release of OpenAFS for Windows, the following syntax can be used to *************** *** 3338,3348 ****

                \\AFS\athena.mit.edu# 537235559\

    !

    3.44. Differences between Windows and UNIX ! “fs examine”

    The OpenAFS for Windows version of “fs examine” provide two additional lines of output when --- 3477,3488 ----

                \\AFS\athena.mit.edu# 537235559\

    !

    3.45. Differences between Windows and UNIX “fs examine”

    The OpenAFS for Windows version of “fs examine” provide two additional lines of output when *************** *** 3363,3405 **** normal'>

    3.45. Literal evaluation of AFS objects via ! fs commands

    Beginning with the 1.5.31 release, the fs commands examine, flush, whereis, and whichcell ! provide a new command-line parameter, -literal.  When specified, if the evaluated object is a ! symlink or a mountpoint the resulting output will describe the specified object ! and not the object that is the target of the symlink or mountpoint.

    3.46. Out of Quota errors

    Prior to the 1.5.31 release, out of quota ! errors were reported to the calling application as an out of space error.  As of 1.5.31, an out of space error will indicate that the partition on which the volume is located is in fact out of space.  Whereas an out of quota error indicates that the user does not have permission to allocate additional space.

    4. How to Debug Problems with OpenAFS for ! Windows

    OpenAFS for Windows provides a wide range of tools to assist you in debugging --- 3503,3605 ---- normal'>

    3.46. Literal evaluation of AFS objects via fs commands

    Beginning with the 1.5.31 release, the fs commands examine, flush, whereis, and whichcell ! provide a new command-line parameter, -literal. !  When specified, if the evaluated object ! is a symlink or a mountpoint the resulting output will describe the specified ! object and not the object that is the target of the symlink or mountpoint.

    3.47. Out of Quota errors

    Prior to the 1.5.31 release, out of quota ! errors were reported to the calling application as an out of space error.  As of 1.5.31, an out of space error will indicate that the partition on which the volume is located is in fact out of space.  Whereas an out of quota error indicates that the user does not have permission to allocate additional space.

    +

    3.48. Linked Cells

    + +

    The 1.5.55 release adds support for linked + cells as implemented in the Unix OpenAFS client.  When two cells are linked, a volume lookup in + one cell that fails is retried in the linked cell.  This functionality can be used to implement:

    + +

    ·         + a test cell which provides substitutes for a + subset of the volumes in the linked production cell

    + +

    ·         + a cell renaming

    + +

    ·         + a cell splitting

    + +

    ·         + a cell merger

    + +

    Two cells are linked in the CellServDB file:

    + +

    >cell-one      cell-two       #Description
    + …
    + >cell-two      cell-one       #Description
    + …

    + +

    aklog and Network Identity Manager will + automatically obtain tokens for the linked cell when tokens for the other cell + is specified.

    +

    4. ! How to Debug Problems with OpenAFS for Windows

    OpenAFS for Windows provides a wide range of tools to assist you in debugging *************** *** 3407,3427 **** range of issues that have been discovered over the years.

    4.1. pioctl debugging (IoctlDebug ! registry key)

    pioctl (path-based ioctl) calls are used by various tools to communicate with the AFS --- 3607,3632 ---- range of issues that have been discovered over the years.

    4.1. ! pioctl debugging (IoctlDebug ! registry key)

    pioctl (path-based ioctl) calls are used by various tools to communicate with the AFS *************** *** 3500,3511 **** system.

    4.2. afsd_service initialization log ! (%WinDir%\TEMP\afsd_init.log)

    Every time the AFS Client Service starts it appends data about its progress and --- 3705,3717 ---- system.

    4.2. ! afsd_service initialization log (%WinDir%\TEMP\afsd_init.log)

    Every time the AFS Client Service starts it appends data about its progress and *************** *** 3514,3521 **** the process terminates due to a panic condition it will write to this file the source code file and line number of the error.  In many cases the panic condition is due to a misconfiguration of the machine.  In other cases it ! might be due to a programming error in the software.  A quick review of the ! location in the source code will quickly reveal the reason for the termination.

    The

    The

    4.3. afsd_service debug logs (fs trace {-on, ! -off, -dump} ->%WinDir%\TEMP\afsd.log)

    When attempting to debug the behavior of the SMB/CIFS Server and the Cache Manager --- 3734,3747 ---- to grow indefinitely.

    4.3. ! afsd_service debug logs (fs trace {-on, -off, -dump} ! ->%WinDir%\TEMP\afsd.log)

    When attempting to debug the behavior of the SMB/CIFS Server and the Cache Manager *************** *** 3555,3566 **** -dump" to output the contents of the log to the file.

    4.4. Using SysInternal’s Debug Viewer, ! Process Monitor and Process Explorer Tools

    An alternatve option to the use of "fs trace -dump" to capture internal --- 3764,3776 ---- -dump" to output the contents of the log to the file.

    4.4. ! Using SysInternal’s Debug Viewer, Process Monitor and Process Explorer Tools

    An alternatve option to the use of "fs trace -dump" to capture internal *************** *** 3596,3604 **** success or failure.  

    In ! Process Monitor, set a filter to include only events on file paths that refer to ! the AFS name space. Be sure to include both the UNC path as well as any drive ! letters mapped to AFS.

    Turn on the Clock Time and Show Milliseconds options in both tools to --- 3806,3814 ---- success or failure.  

    In ! Process Monitor, set a filter to include only events on file paths that refer ! to the AFS name space. Be sure to include both the UNC path as well as any ! drive letters mapped to AFS.

    Turn on the Clock Time and Show Milliseconds options in both tools to *************** *** 3625,3635 **** will be stuck in a call to osi_TWait().

    4.5. ! Microsoft MiniDumps
    ! (fs minidump -> %WinDir%\TEMP\afsd.dmp)

    If the AFS Client Service become unresponsive to any form of communication there --- 3835,3846 ---- will be stuck in a call to osi_TWait().

    4.5. Microsoft MiniDumps
    ! (fs minidump -> %WinDir%\TEMP\afsd.dmp)

    If the AFS Client Service become unresponsive to any form of communication there *************** *** 3654,3665 **** privacy concerns, do not produce a MiniDump with heap.

    4.6. Single Sign-on (Integrated Logon) ! debugging

    If you are having trouble with the Integrated Logon operations it is often useful --- 3865,3877 ---- privacy concerns, do not produce a MiniDump with heap.

    4.6. ! Single Sign-on (Integrated Logon) debugging

    If you are having trouble with the Integrated Logon operations it is often useful *************** *** 3680,3690 **** Logon".

    4.7. RX (AFS RPC) debugging (rxdebug)

    The rxdebug.exe tool can be used to query a variety of information about the AFS --- 3892,3904 ---- Logon".

    4.7. ! RX (AFS RPC) debugging (rxdebug)

    The rxdebug.exe tool can be used to query a variety of information about the AFS *************** *** 3736,3746 **** -peers           show peers

    4.8. Cache Manager debugging (cmdebug)

    The cmdebug.exe tool can be used to query the state of the AFS Cache Manager on a --- 3950,3962 ---- -peers           show peers

    4.8. ! Cache Manager debugging (cmdebug)

    The cmdebug.exe tool can be used to query the state of the AFS Cache Manager on a *************** *** 3783,3793 **** style='mso-spacerun:yes'>  print only cellservdb info

    4.9. Persistent Cache consistency check

    The persistent cache is stored in a Hidden System file at --- 3999,4011 ---- style='mso-spacerun:yes'>  print only cellservdb info

    4.9. ! Persistent Cache consistency check

    The persistent cache is stored in a Hidden System file at *************** *** 3799,3808 **** afsd_service.exe --validate-cache <cache-path>

    4.10. ! Token Acquisition Debugging

    If you are having trouble obtaining tokens with the Network Identity Manager AFS --- 4017,4027 ---- afsd_service.exe --validate-cache <cache-path>

    4.10. Token Acquisition Debugging

    If you are having trouble obtaining tokens with the Network Identity Manager AFS *************** *** 3815,3826 **** diagnosing Kerberos v5 related problems.

    5. Reporting Bugs

    Bug reports should be sent to

    5. ! Reporting Bugs

    Bug reports should be sent to openafs-bugs@openafs.org.  Please include as much information as possible about the issue.  If you are reporting a crash, please install the debugging symbols by re-running the ! installer.  If a dump file is available for the problem, ! %WINDIR%\TEMP\afsd.dmp, include it along with the AFS Client Trace file  %WINDIR%\TEMP\afsd.log.  The AFS Client startup log is %WINDIR%\TEMP\afsd_init.log.  Send the last continuous block of  log information from this file.

    --- 4050,4057 ---- text-decoration:none;text-underline:none'>openafs-bugs@openafs.org.  Please include as much information as possible about the issue.  If you are reporting a crash, please install the debugging symbols by re-running the ! installer.  If a dump file is available for the problem, %WINDIR%\TEMP\afsd.dmp, ! include it along with the AFS Client Trace file  %WINDIR%\TEMP\afsd.log.  The AFS Client startup log is %WINDIR%\TEMP\afsd_init.log.  Send the last continuous block of  log information from this file.

    *************** *** 3913,3959 **** including the address of the crash and the stack dump.

    Once ! you have the Dr. Watson's logfile and minidump, zip them and attach them to ! your e-mail.

    When reporting a error, please be sure to include the version of OpenAFS.

    6. How to Contribute to ! the Development of OpenAFS for Windows

    Contributions ! to the development of OpenAFS for Windows are continuously needed.  ! Contributions may take many forms including cash donations, support contracts, donated developer time, and even donated tech writer time.

    6.1. ! The USENIX OpenAFS Fund

    USENIX, ! a 501c3 non-profit corporation, has formed the USENIX OpenAFS Fund in order to ! accept tax deductible donations on behalf of the OpenAFS Elders. The donated ! funds will be allocated by the OpenAFS Elders to fund OpenAFS development, documentation, project management, and maintaining openafs.org.

    --- 4134,4187 ---- including the address of the crash and the stack dump.

    Once ! you have the Dr. Watson's logfile and minidump, zip them and attach them to your ! e-mail.

    When reporting a error, please be sure to include the version of OpenAFS.

    6. How to Contribute to the Development of ! OpenAFS for Windows

    Contributions ! to the development of OpenAFS for Windows are continuously needed.  Contributions ! may take many forms including cash donations, support contracts, donated developer time, and even donated tech writer time.

    6.1. The USENIX OpenAFS ! Fund

    USENIX, a 501c3 ! non-profit corporation, has formed the USENIX OpenAFS Fund in order to accept ! tax deductible donations on behalf of the OpenAFS Elders. The donated funds ! will be allocated by the OpenAFS Elders to fund OpenAFS development, documentation, project management, and maintaining openafs.org.

    *************** *** 3984,4014 **** text-decoration:none;text-underline:none'>donation online.

    6.2. Secure Endpoints ! Inc.

    Secure Endpoints Inc. ! provides development and support services for OpenAFS for Windows and MIT Kerberos for Windows.  Donations provided to Secure Endpoints Inc. for the development of OpenAFS are used to cover the OpenAFS gatekeeper responsibilities; providing support to the OpenAFS community via the OpenAFS mailing lists; and furthering ! development of desired features that are either too small to be financed by development ! contracts.

    Secure Endpoints Inc. accepts software development agreements from organizations who --- 4212,4247 ---- text-decoration:none;text-underline:none'>donation online.

    6.2. Secure Endpoints Inc. !

    Secure Endpoints Inc. provides ! development and support services for OpenAFS for Windows and MIT Kerberos for Windows.  Donations provided to Secure Endpoints Inc. for the development of OpenAFS are used to cover the OpenAFS gatekeeper responsibilities; providing support to the OpenAFS community via the OpenAFS mailing lists; and furthering ! development of desired features that are either too small to be financed by ! development contracts.

    Secure Endpoints Inc. accepts software development agreements from organizations who *************** *** 4021,4034 **** none;text-underline:none'>MIT Kerberos for Windows products.

    6.3. Direct contributions of code and/or ! documentation

    Organizations that use OpenAFS in house and have development staffs are encouraged to --- 4254,4269 ---- none;text-underline:none'>MIT Kerberos for Windows products.

    6.3. ! Direct contributions of code and/or documentation !

    Organizations that use OpenAFS in house and have development staffs are encouraged to *************** *** 4037,4049 **** documentation are highly desired.

    6.4. OpenAFS for ! Windows Mailing Lists

    If you wish to participate in OpenAFS for Windows development please join the

    6.4. OpenAFS for Windows Mailing Lists

    If you wish to participate in OpenAFS for Windows development please join the

    https://lists.openafs.org/mailman/listinfo/openafs-win32-devel

    User questions should be sent to the

    https://lists.openafs.org/mailman/listinfo/openafs-win32-devel

    User questions should be sent to the

    https://lists.openafs.org/mailman/listinfo/openafs-info

    You must join the mailing lists if you wish to post to the list without incurring a moderation delay.

    7. ! MSI Deployment Guide

    !
    !

    7.1. ! Introduction

    A MSI installer option is available for those who wish to use Windows Installer ! for installing OpenAFS and for organizations that wish to deploy OpenAFS through ! Group Policy.  The first version of OpenAFS for Windows available as an ! MSI was 1.3.65.

    This document provides a guide for authoring transforms used to customize the MSI --- 4303,4350 ---- mailing list. 

    https://lists.openafs.org/mailman/listinfo/openafs-info

    You must join the mailing lists if you wish to post to the list without incurring a moderation delay.

    7. MSI Deployment Guide

    !
    !

    7.1. Introduction

    A MSI installer option is available for those who wish to use Windows Installer ! for installing OpenAFS and for organizations that wish to deploy OpenAFS ! through Group Policy.  The first version of OpenAFS for Windows available ! as an MSI was 1.3.65.

    This document provides a guide for authoring transforms used to customize the MSI *************** *** 4113,4130 **** is already installed will pick up these customizations.

    7.1.1 Requirements

    The information in this document applies to MSI packages distributed with OpenAFS for Windows releases from 1.3.65 and onwards or MSI packages built from ! corresponding source releases.  Not all releases support all the configuration ! options documented here.

    Authoring a "Windows Installer" transform requires additional software for --- 4355,4373 ---- is already installed will pick up these customizations.

    7.1.1 Requirements

    The information in this document applies to MSI packages distributed with OpenAFS for Windows releases from 1.3.65 and onwards or MSI packages built from ! corresponding source releases.  Not all releases support all the ! configuration options documented here.

    Authoring a "Windows Installer" transform requires additional software for *************** *** 4142,4167 ****

        http://msdn.microsoft.com/library/en-us/msi/setup/windows_installer_start_page.asp

    For general information about authoring MSI transforms, refer to:

        http://msdn.microsoft.com/library/en-us/msi/setup/transforms.asp

    The remainder of this document assumes some familiarity with authoring --- 4385,4416 ----

        http://msdn.microsoft.com/library/en-us/msi/setup/windows_installer_start_page.asp

    For general information about authoring MSI transforms, refer to:

        http://msdn.microsoft.com/library/en-us/msi/setup/transforms.asp

    The remainder of this document assumes some familiarity with authoring *************** *** 4173,4194 ****

        http://msdn.microsoft.com/library/en-us/msi/setup/a_customization_transform_example.asp

    7.1.2 Authoring a ! Transform

    Transforms describe a set of modifications to be performed on an existing MSI for the --- 4422,4446 ----

        http://msdn.microsoft.com/library/en-us/msi/setup/a_customization_transform_example.asp

    7.1.2 Authoring a Transform

    Transforms describe a set of modifications to be performed on an existing MSI for the *************** *** 4244,4256 **** directly when editing openafs-modified.msi.  More details are given below.

    7.2. ! Configuration Options

    The logic necessary to implement many of the settings described in

    7.2. Configuration ! Options

    The logic necessary to implement many of the settings described in

    7.2.1 Configurable ! Properties

    Most configurable properties correspond to registry keys or values.  Due to the --- 4518,4530 ---- are below.

    7.2.1 Configurable Properties

    Most configurable properties correspond to registry keys or values.  Due to the *************** *** 4341,4367 ****

    --- 4595,4621 ---- *************** *** 4382,4388 ****
    (Service parameters):

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]
    (Network provider):

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]
    (OpenAFS Client):

    [HKLM\SOFTWARE\OpenAFS\Client]
    (Service parameters):

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]
    (Network provider):

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]
    (OpenAFS Client):

    [HKLM\SOFTWARE\OpenAFS\Client]
    AFSCACHEPATH

    Registry key    :

    AFSCACHEPATH

    Registry key    :

    AFSCACHESIZE

    Registry key    :

    AFSCACHESIZE

    Registry key    :

    AFSCELLNAME

    Registry key    :

    AFSCELLNAME

    Registry key    :

    FREELANCEMODE

    Registry key    :

    FREELANCEMODE

    Registry key    :

    HIDEDOTFILES

    Registry key    :

    HIDEDOTFILES

    Registry key    :

    LOGONOPTIONS

    Registry key    :

    LOGONOPTIONS

    Registry key    :

    MOUNTROOT

    Registry key    :

    MOUNTROOT

    Registry key    :

    NETBIOSNAME

    Registry key    :

    NETBIOSNAME

    Registry key    :

    NOFINDLANABYNAME

    Registry key    :

    NOFINDLANABYNAME

    Registry key    :

    RXMAXMTU

    Registry key    :

    RXMAXMTU

    Registry key    :

    SECURITYLEVEL

    Registry key    :

    SECURITYLEVEL

    Registry key    :

    SMBAUTHTYPE

    Registry key    :

    SMBAUTHTYPE

    Registry key    :

    STOREANSIFILENAMES

    Registry key    :

    STOREANSIFILENAMES

    Registry key    : StoreAnsiFilenames

    Valid values    : '0' or '1'

    !

    This option is no longer supported as of 1.5.50 now that all file names ! are stored to AFS file servers using the UTF-8 encoding of Unicode.
    USEDNS

    Registry key    : StoreAnsiFilenames

    Valid values    : '0' or '1'

    !

    This option is no longer supported as of 1.5.50 now that ! all file names are stored to AFS file servers using the UTF-8 encoding of ! Unicode.
    USEDNS

    Registry key    : 7.2.1.2.2 AFSCreds.exe Properties

    These ! properties are combined to add a command line option to the shortcut that will be ! created in the Start:Programs:OpenAFS and Start:Programs:Startup folders (see ! CREDSSTARTUP).  The method of specifying the option was chosen for easy ! integration with the Windows Installer user interface.  Although other ! methods can be used to specify options to AFSCREDS.EXE, it is advised that they ! be avoided as transforms including such options may not apply to future ! releases of OpenAFS.

    CREDSSTARTUP

    Valid values    : '1' or '0'

    Controls whether AFSCreds.exe starts up automatically when the user logs on.  When CREDSSTARTUP is '1' a shortcut is added to the ! 'Startup' folder in the 'Program menu' which starts AFSCREDS.EXE with the ! options that are determined by the other CREDS* properties.
    CREDSAUTOINIT

    Valid values    : '-a' or ''

    --- 4877,4909 ---- style='mso-bookmark:_Toc152605126'>7.2.1.2.2 AFSCreds.exe Properties

    These ! properties are combined to add a command line option to the shortcut that will ! be created in the Start:Programs:OpenAFS and Start:Programs:Startup folders ! (see CREDSSTARTUP).  The method of specifying the option was chosen for ! easy integration with the Windows Installer user interface.  Although ! other methods can be used to specify options to AFSCREDS.EXE, it is advised ! that they be avoided as transforms including such options may not apply to ! future releases of OpenAFS.

    CREDSSTARTUP

    Valid values    : '1' or '0'

    Controls whether AFSCreds.exe starts up automatically when the user logs on.  When CREDSSTARTUP is '1' a shortcut is added to the ! 'Startup' folder in the 'Program menu' which starts AFSCREDS.EXE with the options ! that are determined by the other CREDS* properties.
    CREDSAUTOINIT

    Valid values    : '-a' or ''

    *************** *** 4658,4664 ****
    CREDSIPCHDET

    Valid values    : '-n' or ''

    --- 4913,4919 ----
    CREDSIPCHDET

    Valid values    : '-n' or ''

    *************** *** 4668,4674 ****
    CREDSQUIET

    Valid values    : '-q' or ''

    --- 4923,4929 ----
    CREDSQUIET

    Valid values    : '-q' or ''

    *************** *** 4678,4684 ****
    CREDSRENEWDRMAP

    Valid values    : '-m' or '’

    --- 4933,4939 ----
    CREDSRENEWDRMAP

    Valid values    : '-m' or '’

    *************** *** 4688,4694 ****
    CREDSSHOW

    Valid values    : '-s' or ''

    --- 4943,4949 ----
    CREDSSHOW

    Valid values    : '-s' or ''

    *************** *** 4699,4727 ****

    7.2.2 Existing Registry ! Entries

    You ! can change existing registry values subject to the restrictions mentioned in the ! Windows Platform SDK.  Pay special attention to component key paths and ! try to only change the 'Value' column in the 'Registry' table.  If you want to add additional registry keys please refer to section 3 (Additional resources).

    7.2.3 Replacing Configuration ! Files

    The OpenAFS configuration files (CellServDB) can be replaced by your own --- 4954,4982 ----

    7.2.2 Existing Registry Entries

    You ! can change existing registry values subject to the restrictions mentioned in ! the Windows Platform SDK.  Pay special attention to component key paths ! and try to only change the 'Value' column in the 'Registry' table.  If you want to add additional registry keys please refer to section 3 (Additional resources).

    7.2.3 Replacing Configuration Files

    The OpenAFS configuration files (CellServDB) can be replaced by your own *************** *** 4756,4763 ****

    1.2.   In ! the Component table, locate the component you need to change ( Ctrl-F invokes the ! 'Find' dialog).  The component names are listed below in section 7.2.3.1.  For this example, --- 5011,5018 ----

    1.2.   In ! the Component table, locate the component you need to change ( Ctrl-F invokes ! the 'Find' dialog).  The component names are listed below in section 7.2.3.1.  For this example, *************** *** 4865,4878 ****

    Note ! that the ComponentId is an uppercase GUID.  You can generate one using GUIDGEN.EXE ! or UUIDGEN.EXE, both of which are included in the Platform SDK.

    The Attributes value of 144 is a sum of msidbComponentAttributesPermanent (16) and ! msidbComponentAttributesNeverOverwrite (128).  This ensures that local modifications ! are not overwritten or lost during an installation or uninstallation.  ! These are the same settings used on the default configuration files.

                'fil_my_CellServDB' is a key into the 'File' table which we will fill later.

    --- 5120,5134 ----

    Note ! that the ComponentId is an uppercase GUID.  You can generate one using ! GUIDGEN.EXE or UUIDGEN.EXE, both of which are included in the Platform SDK.

    The Attributes value of 144 is a sum of msidbComponentAttributesPermanent (16) and ! msidbComponentAttributesNeverOverwrite (128).  This ensures that local ! modifications are not overwritten or lost during an installation or ! uninstallation.  These are the same settings used on the default ! configuration files.

                'fil_my_CellServDB' is a key into the 'File' table which we will fill later.

    *************** *** 5120,5129 ****     (leave other fields blank)

    The ! 'Attributes' value is msidbFileAttributesNonCompressed (8192).  This is because ! we will be placing this file in the same directory as the MSI instead of ! embedding the file in it.  Transforms do not support updating compressed ! sources or adding new cabinet streams.

    Finally, the 'Sequence' value of 1000 will be used later to distinguish the file as --- 5376,5385 ----     (leave other fields blank)

    The ! 'Attributes' value is msidbFileAttributesNonCompressed (8192).  This is ! because we will be placing this file in the same directory as the MSI instead ! of embedding the file in it.  Transforms do not support updating ! compressed sources or adding new cabinet streams.

    Finally, the 'Sequence' value of 1000 will be used later to distinguish the file as *************** *** 5184,5196 **** 'cpf_CellServDB' (ID {D5BA4C15-DBEC-4292-91FC-B54C30F24F2A})

    7.2.4 Adding Domain ! Specific Registry Keys

    Following is an example for adding domain specific registry keys.

    --- 5440,5452 ---- 'cpf_CellServDB' (ID {D5BA4C15-DBEC-4292-91FC-B54C30F24F2A})

    7.2.4 Adding Domain Specific Registry Keys

    Following is an example for adding domain specific registry keys.

    *************** *** 5286,5295 **** : 2
                Key                 ! : ! 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain'
    !             Component     ! : 'rcm_DomainKeys'

    --- 5542,5550 ---- : 2
                Key                 ! : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain'
    !             ! Component     : 'rcm_DomainKeys'

    *************** *** 5304,5311 **** : 2
                Key                 ! : ! 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain'
                Name              : '*'
    --- 5559,5565 ---- : 2
                Key                 ! : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain'
                Name              : '*'
    *************** *** 5343,5349 ****             Root                : 2
    !             Key                 : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\ATHENA.MIT.EDU'
                --- 5597,5604 ----             Root                : 2
    !             ! Key                 : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\ATHENA.MIT.EDU'
                *************** *** 5389,5396 **** : 2
                Key                 ! : ! 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST'
                Name              : 'LogonOptions'
    --- 5644,5650 ---- : 2
                Key                 ! : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST'
                Name              : 'LogonOptions'
    *************** *** 5411,5417 ****             Root                : 2
    !             Key                 : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST'
                --- 5665,5672 ----             Root                : 2
    !             ! Key                 : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST'
                *************** *** 5433,5445 **** logon) and 'LOCALHOST' (disable integrated logon and fail logins silently).

    7.2.5 Adding Site ! Specific Freelance Registry Keys

    Following is an example for adding site specific Freelance registry keys to pre-populate --- 5688,5701 ---- logon) and 'LOCALHOST' (disable integrated logon and fail logins silently).

    7.2.5 Adding Site Specific Freelance ! Registry Keys

    Following is an example for adding site specific Freelance registry keys to pre-populate *************** *** 5483,5490 **** !

        !         (new row)
                Component     : 'rcm_FreelanceKeys'
                --- 5739,5746 ---- !

                ! (new row)
                Component     : 'rcm_FreelanceKeys'
                *************** *** 5653,5665 **** using symlinks.

    7.3 Additional Resources

    If you want to add registry keys or files you need to create new components and --- 5909,5923 ---- using symlinks.

    7.3 ! Additional Resources

    If you want to add registry keys or files you need to create new components and *************** *** 5707,5719 **** MSITRAN.EXE.

    7.4. ! Upgrades

    The MSI package is designed to uninstall previous versions of OpenAFS for Windows --- 5965,5978 ---- MSITRAN.EXE.

    7.4. Upgrades

    The MSI package is designed to uninstall previous versions of OpenAFS for Windows *************** *** 5757,5792 **** "vomus".

    Appendix ! A: Registry Values

    A.1. ! Service parameters

    The service parameters primarily affect the behavior of the AFS client service (afsd_service.exe).

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    --- 6016,6054 ---- "vomus".

    Appendix A: Registry Values

    A.1. Service parameters

    The service parameters primarily affect the behavior of the AFS client service (afsd_service.exe).

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    *************** *** 5794,5800 **** --- 6753,6760 ---- DWORD (seconds)
    Default: 60

    This value controls how frequently ! the AFS cache manager checks for invalid file locks.

    *************** *** 6644,6652 ****

    Determines whether or not the AFS Cache Manager will give up all callbacks prior to the service being suspended or shutdown.  ! Doing so will have significant performance benefits for the file ! servers.  However, file servers older ! than 1.4.6 can become unstable if the GiveUpAllCallBacks RPC is executed.

    0: do not perform GiveUpAllCallBacks RPCs

    1: --- 6911,6919 ----

    Determines whether or not the AFS Cache Manager will give up all callbacks prior to the service being suspended or shutdown.  ! Doing so will have significant performance benefits for the file servers.  However, file servers older than 1.4.6 can ! become unstable if the GiveUpAllCallBacks RPC is executed.

    0: do not perform GiveUpAllCallBacks RPCs

    1: *************** *** 6686,6698 ****

    Value: LANadapter

    Type: DWORD
    --- 6056,6062 ----

    Value: LANadapter

    Type: DWORD
    *************** *** 5813,5821 ****

    Value: CacheSize

    Type: DWORD
    Default: 98304 (CM_CONFIGDEFAULT_CACHESIZE)
    Variable: cm_initParams.cacheSize

    --- 6075,6083 ----
    Value: CacheSize

    Type: DWORD
    Default: 98304 (CM_CONFIGDEFAULT_CACHESIZE)
    Variable: cm_initParams.cacheSize

    *************** *** 5826,5832 ****
    Value: ChunkSize

    Type: DWORD
    --- 6088,6094 ----

    Value: ChunkSize

    Type: DWORD
    *************** *** 5840,5846 ****

    Value: Daemons

    Type: DWORD
    --- 6102,6108 ----

    Value: Daemons

    Type: DWORD
    *************** *** 5854,5860 ****

    Value: ServerThreads

    Type: DWORD
    --- 6116,6122 ----

    Value: ServerThreads

    Type: DWORD
    *************** *** 5868,5875 ****

    Value: Stats

    Type: DWORD
    --- 6130,6137 ----

    Value: Stats

    Type: DWORD
    *************** *** 5905,5913 ****

    Value: LogoffPreserveTokens

    Type: DWORD {1,0}
    Default : 0

    If enabled (set to 1), the Logoff Event handler will not --- 6167,6176 ----

    Value: ! LogoffPreserveTokens

    Type: DWORD {1,0}
    Default : 0

    If enabled (set to 1), the Logoff Event handler will not *************** *** 5919,5925 ****

    Value: RootVolume

    Type: REG_SZ
    --- 6182,6188 ----

    Value: RootVolume

    Type: REG_SZ
    *************** *** 5932,5940 ****

    Value: MountRoot

    Type: REG_SZ
    Default: "/afs"
    Variable: cm_mountRoot

    --- 6195,6203 ----
    Value: MountRoot

    Type: REG_SZ
    Default: "/afs"
    Variable: cm_mountRoot

    *************** *** 5952,5960 ****
    Value: CachePath

    Type: REG_SZ or REG_EXPAND_SZ
    Default: "%TEMP%\AFSCache"
    Variable: cm_CachePath

    --- 6215,6223 ----
    Value: CachePath

    Type: REG_SZ or REG_EXPAND_SZ
    Default: "%TEMP%\AFSCache"
    Variable: cm_CachePath

    *************** *** 5967,5973 ****
    Value: NonPersistentCaching

    Type: DWORD [0..1]
    --- 6230,6236 ----

    Value: NonPersistentCaching

    Type: DWORD [0..1]
    *************** *** 5983,5989 ****

    Value: ValidateCache

    Type: DWORD [0..2]
    --- 6246,6252 ----

    Value: ValidateCache

    Type: DWORD [0..2]
    *************** *** 6000,6006 ****

    Value: TrapOnPanic

    Type: DWORD {1,0}
    --- 6263,6269 ----

    Value: TrapOnPanic

    Type: DWORD {1,0}
    *************** *** 6014,6022 ****

    Value: NetbiosName

    Type: REG_EXPAND_SZ
    Default: "AFS"
    Variable: cm_NetbiosName

    --- 6277,6285 ----
    Value: NetbiosName

    Type: REG_EXPAND_SZ
    Default: "AFS"
    Variable: cm_NetbiosName

    *************** *** 6029,6035 ****
    Value: IsGateway

    Type: DWORD {1,0}
    --- 6292,6298 ----

    Value: IsGateway

    Type: DWORD {1,0}
    *************** *** 6049,6055 ****

    Value: ReportSessionStartups

    Type: DWORD {1,0}
    --- 6312,6318 ----

    Value: ReportSessionStartups

    Type: DWORD {1,0}
    *************** *** 6064,6072 ****

    Value: TraceBufferSize

    Type: DWORD
    Default: 10000 (CM_CONFIGDEFAULT_TRACEBUFSIZE)
    Variable: traceBufSize

    --- 6327,6336 ----
    Value: ! TraceBufferSize

    Type: DWORD
    Default: 10000 (CM_CONFIGDEFAULT_TRACEBUFSIZE)
    Variable: traceBufSize

    *************** *** 6077,6085 ****
    Value: SysName

    Type: REG_SZ
    Default: "x86_win32 i386_w2k i386_nt40" (X86)
    “amd64_win64 x86_win32 i386_w2k” (AMD64)
    --- 6341,6349 ----

    Value: SysName

    Type: REG_SZ
    Default: "x86_win32 i386_w2k i386_nt40" (X86)
    “amd64_win64 x86_win32 i386_w2k” (AMD64)
    *************** *** 6093,6101 ****

    Value: SecurityLevel

    Type: DWORD {1,0}
    Default: 0
    Variable: cryptall

    --- 6357,6365 ----
    Value: SecurityLevel

    Type: DWORD {1,0}
    Default: 0
    Variable: cryptall

    *************** *** 6106,6113 ****
    Value: UseDNS

    Type: DWORD {1,0}
    Default: 1
    --- 6370,6377 ----

    Value: UseDNS

    Type: DWORD {1,0}
    Default: 1
    *************** *** 6119,6127 ****

    Value: FreelanceClient

    Type: DWORD {1,0}
    Default: 0
    Variable: cm_freelanceEnabled

    --- 6383,6392 ----
    Value: ! FreelanceClient

    Type: DWORD {1,0}
    Default: 0
    Variable: cm_freelanceEnabled

    *************** *** 6132,6140 ****
    Value: HideDotFiles

    Type: DWORD {1,0}
    Default: 1
    --- 6397,6405 ----

    Value: HideDotFiles

    Type: DWORD {1,0}
    Default: 1
    *************** *** 6148,6154 ****

    Value: MaxMpxRequests

    Type: DWORD
    --- 6413,6419 ----

    Value: MaxMpxRequests

    Type: DWORD
    *************** *** 6162,6168 ****

    Value: MaxVCPerServer

    Type: DWORD
    --- 6427,6433 ----

    Value: MaxVCPerServer

    Type: DWORD
    *************** *** 6175,6182 ****

    Value: Cell

    Type: REG_SZ
    Default: <none>
    --- 6440,6447 ----

    Value: Cell

    Type: REG_SZ
    Default: <none>
    *************** *** 6225,6233 ****

    Value: RxMaxMTU

    Type: DWORD
    Default: 0
    Variable: rx_mtu

    --- 6490,6498 ----
    Value: RxMaxMTU

    Type: DWORD
    Default: 0
    Variable: rx_mtu

    *************** *** 6241,6248 ****
    !
    Value: RxNoJumbo

    Type: DWORD {0,1}
    Default: 0
    Variable: rx_nojumbo

    --- 6506,6513 ----
    !
    Value: RxNoJumbo

    Type: DWORD {0,1}
    Default: 0
    Variable: rx_nojumbo

    *************** *** 6254,6262 ****
    Value: ConnDeadTimeout

    Type: DWORD
    Default: 0 (seconds)
    Variable: ConnDeadtimeout

    --- 6519,6528 ----
    Value: ! ConnDeadTimeout

    Type: DWORD
    Default: 0 (seconds)
    Variable: ConnDeadtimeout

    *************** *** 6268,6274 ****
    Value: HardDeadTimeout

    Type: DWORD
    --- 6534,6540 ----

    Value: HardDeadTimeout

    Type: DWORD
    *************** *** 6291,6300 ****

    Value: TraceOption

    Type: DWORD {0-15}
    Default: 0

    --- 6557,6566 ----
    Value: TraceOption

    Type: DWORD {0-15}
    Default: 0

    *************** *** 6317,6323 **** height:98.5pt'>
    Value: AllSubmount

    Type: --- 6583,6589 ---- height:98.5pt'>

    Value: AllSubmount

    Type: *************** *** 6335,6344 ****

    Value: NoFindLanaByName

    Type: DWORD {0, 1}
    Default: 0

    --- 6601,6611 ----
    Value: ! NoFindLanaByName

    Type: DWORD {0, 1}
    Default: 0

    *************** *** 6352,6377 **** height:78.5pt'>
    Value: MaxCPUs

    Type: DWORD {1..32} or {1..64} depending on the architecture
    Default: <no default>

    If ! this value is specified, afsd_service.exe will restrict itself to executing ! on the specified number of CPUs if there are a greater number installed in ! the machine. 

    Value: smbAuthType

    Type: DWORD {0..2}
    Default: 2

    --- 6619,6644 ---- height:78.5pt'>
    Value: MaxCPUs

    Type: DWORD {1..32} or {1..64} depending on the architecture
    Default: <no default>

    If ! this value is specified, afsd_service.exe will restrict itself to executing on ! the specified number of CPUs if there are a greater number installed in the ! machine. 

    Value: smbAuthType

    Type: DWORD {0..2}
    Default: 2

    *************** *** 6390,6399 ****
    Value: MaxLogSize

    Type: DWORD {0 .. MAXDWORD}
    Default: 100K

    --- 6657,6666 ----
    Value: MaxLogSize

    Type: DWORD {0 .. MAXDWORD}
    Default: 100K

    *************** *** 6409,6415 **** height:65.75pt'>
    Value: FlushOnHibernate

    Type: --- 6676,6682 ---- height:65.75pt'>

    Value: FlushOnHibernate

    Type: *************** *** 6486,6493 **** DWORD (seconds)
    Default: 60

    This value controls how ! frequently the AFS cache manager checks for invalid file locks.

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters\GlobalAutoMapper]

    --- 6953,6966 ----

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters\GlobalAutoMapper]

    *************** *** 6701,6707 ****
    Value: <Drive Letter:> for example "G:"
    --- 6969,6975 ----
    Value: <Drive Letter:> for example "G:"
    *************** *** 6715,6727 ****

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client]

    --- 6983,6996 ----

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client]

    *************** *** 6729,6772 **** --- 7125,7139 ---- to store filenames using the Windows system's ANSI character set instead of the OEM Code Page character set which has traditionally been used by SMB file systems. 

    !

    Note: The use of ANSI characters will render ! access to files with 8-bit OEM file names inaccessible from Windows.  ! This option is of use primarily when you wish to allow file names produced on ! Windows to be accessible from Latin-1 UNIX systems and vice versa.

    *************** *** 6872,6884 ****
    Value: CellServDBDir

    Type: REG_SZ
    Default: <not defined>

    Specifies the directory containing the CellServDB file.  When this value is not specified, the ProgramData directory is ! searched and if the CellServDB file is not found, the AFS Client install ! directory is used.
    Value: VerifyServiceSignature

    Type: REG_DWORD
    Default: 0x1

    This value can be used to disable the runtime verification of the digital signatures applied to afsd_service.exe and the ! OpenAFS DLLs it loads.  This test is performed to verify ! that   the DLLs which are loaded by afsd_service.exe are from the ! same distribution as afsd_service.exe.  This is to prevent random errors ! caused when DLLs from one distribution of AFS are loaded by another ! one.  This is not a security test.  The reason for disabling this ! test is to free up additional memory which can be used for a large cache ! size.
    Value: IoctlDebug

    Type: REG_DWORD
    Default: 0x0

    --- 6998,7041 ----
    Value: CellServDBDir

    Type: REG_SZ
    Default: <not defined>

    Specifies the directory containing the CellServDB file.  When this value is not specified, the ProgramData directory is ! searched and if the CellServDB file is not found, the AFS Client install directory ! is used.
    Value: ! VerifyServiceSignature

    Type: REG_DWORD
    Default: 0x1

    This value can be used to disable the runtime verification of the digital signatures applied to afsd_service.exe and the ! OpenAFS DLLs it loads.  This test is performed to verify that   ! the DLLs which are loaded by afsd_service.exe are from the same distribution ! as afsd_service.exe.  This is to prevent random errors caused when DLLs ! from one distribution of AFS are loaded by another one.  This is not a ! security test.  The reason for disabling this test is to free up ! additional memory which can be used for a large cache size.
    Value: IoctlDebug

    Type: REG_DWORD
    Default: 0x0

    *************** *** 6781,6787 ****
    Value: MiniDumpType

    Type: REG_DWORD
    --- 7050,7056 ----

    Value: MiniDumpType

    Type: REG_DWORD
    *************** *** 6796,6803 **** most recent release of "Microsoft Debugging ! Tools for Windows".  See the Microsoft Developer Library for further information.

    MiniDumpNormal = 0x00000000,
    MiniDumpWithDataSegs = 0x00000001,
    --- 7065,7072 ---- most recent release of "Microsoft Debugging Tools ! for Windows".  See the Microsoft Developer Library for further information.

    MiniDumpNormal = 0x00000000,
    MiniDumpWithDataSegs = 0x00000001,
    *************** *** 6819,6827 ****

    !
    Value: EnableSMBAsyncStore

    Type: REG_DWORD
    Default: 0x1

    --- 7088,7096 ----
    !
    Value: EnableSMBAsyncStore

    Type: REG_DWORD
    Default: 0x1

    *************** *** 6856,6870 **** to store filenames using the Windows system's ANSI character set instead of the OEM Code Page character set which has traditionally been used by SMB file systems. 

    !

    Note: The ! use of ANSI characters will render access to files with 8-bit OEM file names ! inaccessible from Windows.  This option is of use primarily when you ! wish to allow file names produced on Windows to be accessible from Latin-1 ! UNIX systems and vice versa.

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\CSCPolicy]

    --- 7141,7154 ----

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\CSCPolicy]

    *************** *** 6887,6914 ****
    Value: "smb/cifs share name"

    Type: REG_SZ
    Default: <none>

    !

    This key is used to map SMB/CIFS shares to Client Side ! Caching (off-line access) policies. For each share one of the following ! policies may be used: "manual", "programs", ! "documents", "disable". 

    These values used to be stored in afsdsbmt.ini

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance]

    --- 7157,7185 ----
    Value: "smb/cifs share name"

    Type: REG_SZ
    Default: <none>

    !

    This key is used to map SMB/CIFS shares to Client Side Caching ! (off-line access) policies. For each share one of the following policies may ! be used: "manual", "programs", "documents", ! "disable". 

    These values used to be stored in afsdsbmt.ini

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance]

    *************** *** 6917,6923 ****
    Value: "numeric value"

    Type: REG_SZ
    --- 7188,7194 ----

    Value: "numeric value"

    Type: REG_SZ
    *************** *** 6933,6946 ****

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks]

    --- 7204,7217 ----

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks]

    *************** *** 6949,6962 ****
    Value: "numeric value"

    Type: REG_SZ
    Default: <none>

    !

    This key is used to store a dot terminated symlink ! strings for use in constructing the fake root.afs volume when Freelance ! (dynamic roots) mode is activated.

    "linkname:destination-path."

    "athena:athena.mit.edu."

    "home:athena.mit.edu\user\j\a\jaltman."

    --- 7220,7233 ----
    Value: "numeric value"

    Type: REG_SZ
    Default: <none>

    !

    This key is used to store a dot terminated symlink strings ! for use in constructing the fake root.afs volume when Freelance (dynamic ! roots) mode is activated.

    "linkname:destination-path."

    "athena:athena.mit.edu."

    "home:athena.mit.edu\user\j\a\jaltman."

    *************** *** 6966,6978 ****

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Realms]

    The Realms key is used to provide initialization data to be used when new --- 7237,7250 ----

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Realms]

    The Realms key is used to provide initialization data to be used when new *************** *** 6983,6993 **** configuration for the identity.

    Regkey:
    [HKLM\SOFTWARE\OpenAFS\Client\Realms\”Realm ! Name”]

    In addition to the optional values, this key contains one subkey for each cell --- 7255,7266 ---- configuration for the identity.

    Regkey:
    [HKLM\SOFTWARE\OpenAFS\Client\Realms\”Realm ! Name”]

    In addition to the optional values, this key contains one subkey for each cell *************** *** 7001,7032 ****

    Value: AFSEnabled

    Type: REG_DWORD
    Default: 0x01

    !

    This key is used to specify whether the new identity should ! be configured to obtain AFS credentials.  ! In general, it is only specified when disabling the acquisition of AFS ! credentials is desired.  The default is ! to obtain AFS credentials.

    Regkey:
    [HKLM\SOFTWARE\OpenAFS\Client\Realms\”Realm ! Name”\”Cell Name”]

    --- 7274,7305 ----
    Value: AFSEnabled

    Type: REG_DWORD
    Default: 0x01

    !

    This key is used to specify whether the new identity ! should be configured to obtain AFS credentials.  In general, it is only specified when ! disabling the acquisition of AFS credentials is desired.  The default is to obtain AFS credentials.

    Regkey:
    [HKLM\SOFTWARE\OpenAFS\Client\Realms\”Realm ! Name”\”Cell Name”]

    *************** *** 7061,7082 **** italic'>

    Type: REG_SZ
    Default: <none>

    !

    This key is used ! to specify the realm to be used when acquiring AFS tokens.  If not specified, the realm will be ! determined by performing a domain to realm mapping on the domain of a random ! volume location database server for the cell.

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Submounts]

    --- 7334,7356 ---- italic'>

    Type: REG_SZ
    Default: <none>

    !

    This key is ! used to specify the realm to be used when acquiring AFS tokens.  If not specified, the realm will be ! determined by performing a domain to realm mapping on the domain of a random volume ! location database server for the cell.

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Submounts]

    *************** *** 7106,7116 ****

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Server Preferences\VLDB]

    --- 7380,7391 ----

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Server Preferences\VLDB]

    *************** *** 7119,7125 ****
    Value: "hostname or ip address"

    Type: REG_DWORD
    --- 7394,7400 ----

    Value: "hostname or ip address"

    Type: REG_DWORD
    *************** *** 7134,7146 ****

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Server Preferences\File]

    --- 7409,7422 ----

    Regkey:
    ! [HKLM\SOFTWARE\OpenAFS\Client\Server Preferences\File]

    *************** *** 7149,7155 ****
    Value: "hostname or ip address"

    Type: REG_DWORD
    --- 7425,7431 ----

    Value: "hostname or ip address"

    Type: REG_DWORD
    *************** *** 7157,7188 ****

    This key is used to specify a default set of File server preferences. For each entry the value name will be either the IP address of a server or a fully qualified domain name.  The value will be the ! ranking.  The ranking will be adjusted by a random value between 0 and ! 256 prior to the preference being set.

    A.2. ! Integrated Logon Network provider parameters

    Affects the network provider (afslogon.dll).

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    --- 7433,7467 ----

    This key is used to specify a default set of File server preferences. For each entry the value name will be either the IP address of a server or a fully qualified domain name.  The value will be the ! ranking.  The ranking will be adjusted by a random value between 0 and 256 ! prior to the preference being set.

    A.2. Integrated Logon ! Network provider parameters

    Affects the network provider (afslogon.dll).

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    *************** *** 7191,7197 ****
    Value: FailLoginsSilently

    Type: DWORD
    --- 7470,7476 ----

    Value: FailLoginsSilently

    Type: DWORD
    *************** *** 7202,7214 ****

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

    --- 7481,7494 ----

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

    *************** *** 7216,7222 ****
    Value: NoWarnings

    Type: DWORD
    --- 7496,7502 ----

    Value: NoWarnings

    Type: DWORD
    *************** *** 7228,7234 ****

    Value: AuthentProviderPath

    Type: REG_SZ
    --- 7508,7514 ----

    Value: AuthentProviderPath

    Type: REG_SZ
    *************** *** 7241,7247 ****

    Value: Class

    Type: DWORD
    --- 7521,7527 ----

    Value: Class

    Type: DWORD
    *************** *** 7253,7259 ****

    Value: DependOnGroup

    Type: REG_MULTI_SZ
    --- 7533,7539 ----

    Value: DependOnGroup

    Type: REG_MULTI_SZ
    *************** *** 7268,7274 ****

    Value: DependOnService

    Type: REG_MULTI_SZ
    --- 7548,7554 ----

    Value: DependOnService

    Type: REG_MULTI_SZ
    *************** *** 7282,7288 ****

    Value: Name

    Type: REG_SZ
    --- 7562,7568 ----

    Value: Name

    Type: REG_SZ
    *************** *** 7294,7300 ****

    Value: ProviderPath

    Type: REG_SZ
    --- 7574,7580 ----

    Value: ProviderPath

    Type: REG_SZ
    *************** *** 7305,7317 ****

    A.2.1 ! Domain specific configuration keys for the Network Provider

    The network provider can be configured to have different behavior depending on the --- 7585,7599 ----

    A.2.1 ! Domain specific configuration keys for the Network Provider

    The network provider can be configured to have different behavior depending on the *************** *** 7326,7382 **** specific registry keys are:

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

      (NP key)

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain]

      (Domains key)

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\"domain ! name"]

      (Specific domain key. One per domain.)

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

      (Localhost key)

    Example:

     HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider

    --- 7608,7669 ---- specific registry keys are:

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

      (NP key)

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain]

      (Domains key)

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\"domain ! name"]

      (Specific domain key. One per domain.)

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

      (Localhost key)

    Example:

     HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider

    *************** *** 7400,7412 **** 2.1.1.  The effective values are chosen as described in 2.1.2.

    A.2.1.1 Domain specific ! configuration values

    A.2.1.1 Domain specific configuration values

    Value: LogonOptions

    Type: DWORD
    Default: 0x01

    NSIS/WiX: depends on user configuration

    --- 7711,7719 ----

    Value: LogonOptions

    Type: DWORD
    Default: 0x01

    NSIS/WiX: depends on user configuration

    *************** *** 7446,7452 ****
    Value: FailLoginsSilentl

    Type: DWORD (1|0)
    --- 7733,7739 ----

    Value: FailLoginsSilentl

    Type: DWORD (1|0)
    *************** *** 7460,7466 ****

    Value: LogonScript

    Type: REG_SZ or REG_EXPAND_SZ
    --- 7747,7753 ----

    Value: LogonScript

    Type: REG_SZ or REG_EXPAND_SZ
    *************** *** 7479,7485 ****

    Value: LoginRetryInterval

    Type: DWORD
    --- 7766,7772 ----

    Value: LoginRetryInterval

    Type: DWORD
    *************** *** 7495,7501 ****

    Value: LoginSleepInterval

    Type: DWORD
    --- 7782,7788 ----

    Value: LoginSleepInterval

    Type: DWORD
    *************** *** 7513,7529 **** NSIS: <not set>

    When Kerberos v5 is being used, Realm specifies the Kerberos v5 realm that should be appended to the first component of the ! Domain logon username to construct the Kerberos v5 principal for which AFS tokens ! should be obtained.

    Value: TheseCells

    Type: REG_MULTI_SZ
    NSIS: <not set>

    When Kerberos v5 is being used, TheseCells provides a --- 7800,7816 ---- NSIS: <not set>

    When Kerberos v5 is being used, Realm specifies the Kerberos v5 realm that should be appended to the first component of the ! Domain logon username to construct the Kerberos v5 principal for which AFS ! tokens should be obtained.

    Value: TheseCells

    Type: REG_MULTI_SZ
    NSIS: <not set>

    When Kerberos v5 is being used, TheseCells provides a *************** *** 7534,7552 ****

    A.2.1.2 Selection of ! effective values for domain specific configuration

    During login to domain X, where X is the domain passed into NPLogonNotify as lpAuthentInfo->LogonDomainName or the string 'LOCALHOST' if ! lpAuthentInfo->LogonDomainName equals the name of the computer, the ! following keys will be looked up.

    1.      --- 7821,7840 ----

    A.2.1.2 Selection of effective values for ! domain specific configuration

    During login to domain X, where X is the domain passed into NPLogonNotify as lpAuthentInfo->LogonDomainName or the string 'LOCALHOST' if ! lpAuthentInfo->LogonDomainName equals the name of the computer, the following ! keys will be looked up.

    1.      *************** *** 7576,7588 **** this rule are stated below.

    A.2.1.3 Exceptions to ! A.2.1.2

    To retain backwards compatibility, the following exceptions are made to 2.1.2.

    --- 7864,7876 ---- this rule are stated below.

    A.2.1.3 Exceptions to A.2.1.2

    To retain backwards compatibility, the following exceptions are made to 2.1.2.

    *************** *** 7615,7639 **** setting this value.

    A.3. ! AFS Credentials System Tray Tool parameters

    Affects the behavior of afscreds.exe

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    --- 7903,7930 ---- setting this value.

    A.3. AFS Credentials ! System Tray Tool parameters

    Affects the behavior of afscreds.exe

    Regkey:
    ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    *************** *** 7641,7647 ****
    Value: Gateway

    Type: REG_SZ
    --- 7932,7938 ----

    Value: Gateway

    Type: REG_SZ
    *************** *** 7655,7661 ****

    Value: Cell

    Type: REG_SZ
    --- 7946,7952 ----

    Value: Cell

    Type: REG_SZ
    *************** *** 7668,7681 ****

    Regkey:
    [HKLM\SOFTWARE\OpenAFS\Client]
    ! [HKCU\SOFTWARE\OpenAFS\Client]

    --- 7959,7973 ----

    Regkey:
    [HKLM\SOFTWARE\OpenAFS\Client]
    ! [HKCU\SOFTWARE\OpenAFS\Client]

    *************** *** 7683,7697 ****
    Value: ShowTrayIcon

    Type: DWORD {0, 1}
    Default: 1
    Function: InitApp(), Main_OnCheckTerminate()

    !

    This value is used to determine whether or not a shortcut ! should be maintained in the user's Start Menu->Programs->Startup ! folder.

    This value used to be stored at [HKLM\Software\TransarcCorporation\AFS Client\AfsCreds].

    The current user value is checked first; if it does not --- 7975,7989 ----

    Value: ShowTrayIcon

    Type: DWORD {0, 1}
    Default: 1
    Function: InitApp(), Main_OnCheckTerminate()

    !

    This value is used to determine whether or not a ! shortcut should be maintained in the user's Start ! Menu->Programs->Startup folder.

    This value used to be stored at [HKLM\Software\TransarcCorporation\AFS Client\AfsCreds].

    The current user value is checked first; if it does not *************** *** 7702,7709 ****

    Value: EnableKFW

    Type: DWORD {0, 1}
    --- 7994,8001 ----

    Value: EnableKFW

    Type: DWORD {0, 1}
    *************** *** 7733,7749 **** href="mailto:user/admin@REALM">user/admin@REALM" are ! interpreted as the same user identity within the cell.  To enable both ! names to be sent to the server by AFSCreds or Integrated Logon, set this value ! to 1.
    !
    Value: Use524

    Type: DWORD {0, 1}
    Default: 0
    --- 8025,8041 ---- href="mailto:user/admin@REALM">user/admin@REALM" are ! interpreted as the same user identity within the cell.  To enable both names ! to be sent to the server by AFSCreds or Integrated Logon, set this value to ! 1.
    !
    Value: Use524

    Type: DWORD {0, 1}
    Default: 0
    *************** *** 7759,7767 ****

    Value: AfscredsShortcutParams

    Type: REG_SZ
    Default: "-A -M -N -Q"
    Function: Shortcut_FixStartup

    --- 8051,8060 ----
    Value: ! AfscredsShortcutParams

    Type: REG_SZ
    Default: "-A -M -N -Q"
    Function: Shortcut_FixStartup

    *************** *** 7786,7798 ****

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client]

    --- 8079,8092 ----

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client]

    *************** *** 7801,7807 ****
    Value: Authentication Cell

    Type: REG_SZ
    --- 8095,8101 ----

    Value: Authentication Cell

    Type: REG_SZ
    *************** *** 7814,7826 ****

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client\Reminders]

    --- 8108,8121 ----

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client\Reminders]

    *************** *** 7829,7835 ****
    Value: "afs cell name"

    Type: DWORD {0, 1}
    --- 8124,8130 ----

    Value: "afs cell name"

    Type: DWORD {0, 1}
    *************** *** 7844,7856 ****

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client\Active Maps]

    --- 8139,8152 ----

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client\Active Maps]

    *************** *** 7859,7865 ****
    Value: "upper case drive letter"

    Type: DWORD {0, 1}
    --- 8155,8161 ----

    Value: "upper case drive letter"

    Type: DWORD {0, 1}
    *************** *** 7872,7884 ****

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client\Mappings]

    --- 8168,8181 ----

    Regkey:
    ! [HKCU\SOFTWARE\OpenAFS\Client\Mappings]

    *************** *** 7887,7893 ****
    Value: "upper case drive letter"

    Type: REG_SZ
    --- 8184,8190 ----

    Value: "upper case drive letter"

    Type: REG_SZ
    *************** *** 7900,7921 ****

    A.4 OpenAFS Client Service Environment ! Variables

    Variable: AFS_RPC_ENCRYPT

    Values:   "OFF" disables the use of --- 8197,8219 ----

    A.4 OpenAFS Client Service Environment Variables

    Variable: AFS_RPC_ENCRYPT

    Values:   "OFF" disables the use of *************** *** 7926,7932 ****

    Variable: AFS_RPC_PROTSEQ

    Values:            --- 8224,8230 ----

    Variable: AFS_RPC_PROTSEQ

    Values:            Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.38 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.39 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.38 Tue Oct 7 18:10:01 2008 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm Fri Nov 7 19:06:52 2008 *************** *** 1,41 **** ! ! ! OpenAFS for Windows 1.5.54 Table of Contents ! ! ! ! ! ! ! !

    1. ! Installer Options

    ! !

    2. ! System Requirements

    ! !

    2.1 ! Supported Operating Systems

    ! !

    2.1.1 ! Unsupported Operating Systems

    ! !

    2.2 ! Disk Space

    ! !

    2.3 ! Additional Software Packages

    ! !

    3. ! Operational Notes

    ! !

    3.0.Unicode ! Support

    ! !

    3.1. ! Requirements for Kerberos v5 Authentication

    ! !

    3.1.1. ! Active Directory

    ! !

    3.1.2. ! Using the krb524 service

    ! !

    3.1.3. ! Network Identity Manager Provider

    ! !

    3.2. ! Use of the Microsoft Loopback Adapter by the AFS Client Service

    ! !

    3.3. ! Using Freelance (Dynamic Root) Mode to Improve Mobility

    ! !

    3.4. ! Locating AFS Volume Database Servers via DNS

    ! !

    3.5. ! Obtaining AFS Tokens as a Integrated Part of Windows Logon

    ! !

    3.6. ! AFS System Tray Command Line Options

    ! !

    3.7. ! The “AFS Client Admins” Authorization Group

    ! !

    3.8. ! OpenAFS support for UNC paths

    ! !

    3.9. ! aklog.exe

    ! !

    3.10. ! OpenAFS Servers on Windows are Unsupported

    ! !

    3.10.1. ! OpenAFS Server Installation

    ! !

    3.10.2. ! Using the AFS Client Service when the Server is installed

    ! !

    3.11. ! OpenAFS Debugging Symbol files

    ! !

    3.12. ! Large File (64-bit) Support

    ! !

    3.13. ! Encrypted AFS Network Communication

    ! !

    3.14. ! Authenticated Access to the OpenAFS Client Service

    ! !

    3.15. ! No More INI Files

    ! !

    3.16. ! Microsoft Windows Internet Connection Firewall

    ! !

    3.17. ! Browsing AFS from the Explorer Shell and Office

    ! !

    3.18. ! Byte Range Locking

    ! !

    3.19. ! Automatic Discarding of AFS Tokens at Logoff

    ! !

    3.20. ! Windows Terminal Server installations

    ! !

    3.21. ! Hidden Dot Files

    ! !

    3.22. ! Status Cache Limits

    ! !

    3.23. ! NETBIOS over TCP/IP must be enabled

    ! !

    3.24. ! OpenAFS binaries are digitally signed

    ! !

    3.25. ! Maximum Size of the AFSCache File

    ! !

    3.26. ! Filename Character Sets

    ! !

    3.27. ! Known Character Set Issues with Roaming Profiles

    ! !

    3.28. ! The AFSCache File

    ! !

    3.29. ! Restricting OpenAFS Client Service Start and Stop

    ! !

    3.30. ! The @sys Name List

    ! !

    3.31. ! Symlinks to AFS UNC paths

    ! !

    3.32. ! Cache Manager Debugging

    ! !

    3.33. ! Windows Logon Caching vs. Kerberos Logons

    ! !

    3.34. ! Initial Server Preferences

    ! !

    3.35. ! File Timestamps

    ! !

    3.36. ! Windows RPC client support must be installed

    ! !

    3.37. ! Generating Minidumps of the OpenAFS Client Service

    ! !

    3.38. ! AFS Client Universally Unique Identifiers (UUIDs) vs. System Cloning

    ! !

    3.39. ! Delayed Write Errors with Microsoft Office Applications

    ! !

    3.40. ! Global Drives (aka Service Drive Letters) are no longer supported by Microsoft

    ! !

    3.41. ! 64-bit Microsoft Windows Installations

    ! !

    3.42. ! Known Issues with Microsoft Windows Vista

    ! !

    3.43. ! New AFS Share Name Syntax Provides Direct Access to Volumes

    ! !

    3.44. ! Differences between Windows and UNIX “fs examine”

    ! !

    3.45. ! Literal evaluation of AFS objects via fs commands

    ! !

    3.46. ! Out of Quota errors

    ! !

    4. ! How to Debug Problems with OpenAFS for Windows

    ! !

    4.1. ! pioctl debugging (IoctlDebug registry key)

    ! !

    4.2. ! afsd_service initialization log (%WinDir%\TEMP\afsd_init.log)

    ! !

    4.3. ! afsd_service debug logs (fs trace {-on, -off, -dump} ! ->%WinDir%\TEMP\afsd.log)

    ! !

    4.4. ! Using SysInternal’s DbgView and ProcMon or FileMon Tools

    ! !

    4.5. ! Microsoft MiniDumps  (fs minidump -> ! %WinDir%\TEMP\afsd.dmp)

    ! !

    4.6. ! Single Sign-on (Integrated Logon) debugging

    ! !

    4.7. ! RX (AFS RPC) debugging (rxdebug)

    ! !

    4.8. ! Cache Manager debugging (cmdebug)

    ! !

    4.9. ! Persistent Cache consistency check

    ! !

    4.10. ! Token Acquisition Debugging

    ! !

    5. ! Reporting Bugs

    ! !

    6. ! How to Contribute to the Development of OpenAFS for Windows

    ! !

    6.1. ! The USENIX OpenAFS Fund

    ! !

    6.2. ! Secure Endpoints Inc.

    ! !

    6.3. ! Direct contributions of code and/or documentation

    ! !

    6.4. ! OpenAFS for Windows Mailing Lists

    ! !

    7. ! MSI Deployment Guide

    ! !

    7.1. ! Introduction

    ! !

    7.1.1 ! Requirements

    ! !

    7.1.2 ! Authoring a Transform

    ! !

    7.2. ! Configuration Options

    ! !

    7.2.1 ! Configurable Properties

    ! !

    7.2.1.1 ! Setting Properties

    ! !

    7.2.1.2 ! OpenAFS for Windows Properties

    ! !

    (Service ! parameters):

    ! !

    (Network ! provider):

    ! !

    (OpenAFS ! Client):

    ! !

    7.2.1.2.1 ! Registry Properties

    ! !

    AFSCACHEPATH

    ! !

    AFSCACHESIZE

    ! !

    AFSCELLNAME

    ! !

    FREELANCEMODE

    ! !

    HIDEDOTFILES

    ! !

    LOGONOPTIONS

    ! !

    MOUNTROOT

    ! !

    NETBIOSNAME

    ! !

    NOFINDLANABYNAME

    ! !

    RXMAXMTU

    ! !

    SECURITYLEVEL

    ! !

    SMBAUTHTYPE

    ! !

    STOREANSIFILENAMES

    ! !

    USEDNS

    ! !

    7.2.1.2.2 ! AFSCreds.exe Properties

    ! !

    CREDSSTARTUP

    ! !

    CREDSAUTOINIT

    ! !

    CREDSIPCHDET

    ! !

    CREDSQUIET

    ! !

    CREDSRENEWDRMAP

    ! !

    CREDSSHOW

    ! !

    7.2.2 ! Existing Registry Entries

    ! !

    7.2.3 ! Replacing Configuration Files

    ! !

    7.2.3.1 ! Components for Configuration Files

    ! !

    7.2.4 ! Adding Domain Specific Registry Keys

    ! !

    7.2.5 ! Adding Site Specific Freelance Registry Keys

    ! !

    7.3 ! Additional Resources

    ! !

    7.4. ! Upgrades

    ! !

    Appendix ! A: Registry Values

    ! !

    A.1. ! Service parameters

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    ! !

    Value: ! LANadapter

    ! !

    Value: ! CacheSize

    ! !

    Value: ! ChunkSize

    ! !

    Value: ! Daemons

    ! !

    Value: ! ServerThreads

    ! !

    Value: ! Stats

    ! !

    Value: ! LogoffPreserveTokens

    ! !

    Value: ! RootVolume

    ! !

    Value: ! MountRoot

    ! !

    Value: ! CachePath

    ! !

    Value: ! NonPersistentCaching

    ! !

    Value: ! ValidateCache

    ! !

    Value: ! TrapOnPanic

    ! !

    Value: ! NetbiosName

    ! !

    Value: ! IsGateway

    ! !

    Value: ! ReportSessionStartups

    ! !

    Value: ! TraceBufferSize

    ! !

    Value: ! SysName

    ! !

    Value: ! SecurityLevel

    ! !

    Value: ! UseDNS

    ! !

    Value: ! FreelanceClient

    ! !

    Value: ! HideDotFiles

    ! !

    Value: ! MaxMpxRequests

    ! !

    Value: ! MaxVCPerServer

    ! !

    Value: ! Cell

    ! !

    Value: ! RxNoJumbo

    ! !

    Value: ! RxMaxMTU

    ! !

    Value: ! ConnDeadTimeout

    ! !

    Value: ! HardDeadTimeout

    ! !

    Value: ! TraceOption

    ! !

    Value: ! AllSubmount

    ! !

    Value: ! NoFindLanaByName

    ! !

    Value: ! MaxCPUs

    ! !

    Value: ! smbAuthType

    ! !

    Value: ! MaxLogSize

    ! !

    Value: ! FlushOnHibernate

    ! !

    Value: ! daemonCheckDownInterval

    ! !

    Value: ! daemonCheckUpInterval

    ! !

    Value: ! daemonCheckVolInterval

    ! !

    Value: ! daemonCheckCBInterval

    ! !

    Value: ! daemonCheckLockInterval

    ! !

    Value: ! daemonCheckTokenInterval

    ! !

    Value: ! daemonCheckOfflineVolInterval

    ! !

    Value: ! CallBackPort

    ! !

    Value: ! EnableServerLocks

    ! !

    Value: ! DeleteReadOnly

    ! !

    Value: ! BPlusTrees

    ! !

    Value: ! PrefetchExecutableExtensions

    ! !

    Value: ! OfflineReadOnlyIsValid

    ! !

    Value: ! GiveUpAllCallBacks

    ! !

    Value: ! FollowBackupPath

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters\GlobalAutoMapper]

    ! !

    Value: ! <Drive Letter:> for example "G:"

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client]

    ! !

    Value: ! CellServDBDir

    ! !

    Value: ! VerifyServiceSignature

    ! !

    Value: ! IoctlDebug

    ! !

    Value: ! MiniDumpType

    ! !

    Value: ! EnableSMBAsyncStore

    ! !

    Value: ! SMBAsyncStoreSize

    ! !

    Value: ! StoreAnsiFilenames

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\CSCPolicy]

    ! !

    Value: ! "smb/cifs share name"

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance]

    ! !

    Value: ! "numeric value"

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks]

    ! !

    Value: ! "numeric value"

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Realms]

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Realms”Realm ! Name”]

    ! !

    Value: ! AFSEnabled

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Realms”Realm ! Name””Cell Name”]

    ! !

    Value: ! MethodName

    ! !

    Value: ! Realm

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Submounts]

    ! !

    Value: ! "submount name"

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Server Preferences\VLDB]

    ! !

    Value: ! "hostname or ip address"

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client\Server Preferences\File]

    ! !

    Value: ! "hostname or ip address"

    ! !

    A.2. ! Integrated Logon Network provider parameters

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    ! !

    Value: ! FailLoginsSilently

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

    ! !

    Value: ! NoWarnings

    ! !

    Value: ! AuthentProviderPath

    ! !

    Value: ! Class

    ! !

    Value: ! DependOnGroup

    ! !

    Value: ! DependOnService

    ! !

    Value: ! Name

    ! !

    Value: ! ProviderPath

    ! !

    A.2.1 ! Domain specific configuration keys for the Network Provider

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain]

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain"domain ! name"]

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

    ! !

    Example:

    ! !

    A.2.1.1 ! Domain specific configuration values

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain"domain ! name"] ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

    ! !

    Value: ! LogonOptions

    ! !

    Value: ! FailLoginsSilentl

    ! !

    Value: ! LogonScript

    ! !

    Value: ! LoginRetryInterval

    ! !

    Value: ! LoginSleepInterval

    ! !

    Value: ! Realm

    ! !

    Value: ! TheseCells

    ! !

    A.2.1.2 ! Selection of effective values for domain specific configuration

    ! !

    A.2.1.3 ! Exceptions to A.2.1.2

    ! !

    2.1.3.1 ! 'FailLoginsSilently'

    ! !

    2.1.3.2 ! 'LogonScript'

    ! !

    A.3. ! AFS Credentials System Tray Tool parameters

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    ! !

    Value: ! Gateway

    ! !

    Value: ! Cell

    ! !

    Regkey: ! [HKLM\SOFTWARE\OpenAFS\Client] [HKCU\SOFTWARE\OpenAFS\Client]

    ! !

    Value: ! ShowTrayIcon

    ! !

    Value: ! EnableKFW

    ! !

    Value: ! AcceptDottedPrincipalNames

    ! !

    Value: ! Use524

    ! !

    Value: ! AfscredsShortcutParams

    ! !

    Regkey: ! [HKCU\SOFTWARE\OpenAFS\Client]

    ! !

    Value: ! Authentication Cell

    ! !

    Regkey: ! [HKCU\SOFTWARE\OpenAFS\Client\Reminders]

    ! !

    Value: ! "afs cell name"

    ! !

    Regkey: ! [HKCU\SOFTWARE\OpenAFS\Client\Active Maps]

    ! !

    Value: ! "upper case drive letter"

    ! !

    Regkey: ! [HKCU\SOFTWARE\OpenAFS\Client\Mappings]

    ! !

    Value: ! "upper case drive letter"

    ! !

    A.4 OpenAFS Client Service Environment ! Variables

    ! !

    Variable: ! AFS_RPC_ENCRYPT

    ! !

    Variable: ! AFS_RPC_PROTSEQ

     

    - -

     

    --- 426,2222 ---- mso-tstyle-rowband-size:0; mso-tstyle-colband-size:0; mso-style-noshow:yes; + mso-style-priority:99; + mso-style-qformat:yes; mso-style-parent:""; ! mso-padding-alt:0in 5.4pt 0in 5.4pt; ! mso-para-margin:0in; mso-para-margin-bottom:.0001pt; mso-pagination:widow-orphan; font-size:10.0pt; ! font-family:"Times New Roman","serif";} ! !

    1. ! Installer Options

    ! !

    2. System Requirements

    ! !

    2.1 Supported Operating Systems

    ! !

    2.1.1 Unsupported Operating Systems

    ! !

    2.2 Disk Space

    ! !

    2.3 Additional Software Packages

    ! !

    3. Operational Notes

    ! !

    3.1.Unicode Support

    ! !

    3.2. Requirements for Kerberos v5 Authentication

    ! !

    3.2.1. Active Directory

    ! !

    3.2.2. Using the krb524 service

    ! !

    3.2.3. Network Identity Manager Provider

    ! !

    3.3. Use of the Microsoft Loopback Adapter by the AFS Client ! Service

    ! !

    3.4. Using Freelance (Dynamic Root) Mode to Improve Mobility

    ! !

    3.45. Locating AFS Volume Database Servers via DNS

    ! !

    3.6. Obtaining AFS Tokens as a Integrated Part of Windows ! Logon

    ! !

    3.7. AFS System Tray Command Line Options

    ! !

    3.8. The “AFS Client Admins” Authorization Group

    ! !

    3.9. OpenAFS support for UNC paths

    ! !

    3.10. aklog.exe

    ! !

    3.11. OpenAFS Servers on Windows are Unsupported

    ! !

    3.11.1. OpenAFS Server Installation

    ! !

    3.11.2. Using the AFS Client Service when the Server is ! installed

    ! !

    3.12. OpenAFS Debugging Symbol files

    ! !

    3.13. Large File (64-bit) Support

    ! !

    3.14. Encrypted AFS Network Communication

    ! !

    3.15. Authenticated Access to the OpenAFS Client Service

    ! !

    3.16. No More INI Files

    ! !

    3.17. Microsoft Windows Internet Connection Firewall

    ! !

    3.18. Browsing AFS from the Explorer Shell and Office

    ! !

    3.19. Byte Range Locking

    ! !

    3.20. Automatic Discarding of AFS Tokens at Logoff

    ! !

    3.21. Windows Terminal Server installations

    ! !

    3.22. Hidden Dot Files

    ! !

    3.23. Status Cache Limits

    ! !

    3.24. NETBIOS over TCP/IP must be enabled

    ! !

    3.25. OpenAFS binaries are digitally signed

    ! !

    3.26. Maximum Size of the AFSCache File

    ! !

    3.27. Filename Character Sets

    ! !

    3.28. Known Character Set Issues with Roaming Profiles

    ! !

    3.29. The AFSCache File

    ! !

    3.30. Restricting OpenAFS Client Service Start and Stop

    ! !

    3.31. The @sys Name List

    ! !

    3.32. Symlinks to AFS UNC paths

    ! !

    3.33. Cache Manager Debugging

    ! !

    3.34. Windows Logon Caching vs. Kerberos Logons

    ! !

    3.35. Initial Server Preferences

    ! !

    3.36. File Timestamps

    ! !

    3.37. Windows RPC client support must be installed

    ! !

    3.38. Generating Minidumps of the OpenAFS Client Service

    ! !

    3.39. AFS Client Universally Unique Identifiers (UUIDs) vs. ! System Cloning

    ! !

    3.40. Delayed Write Errors with Microsoft Office ! Applications

    ! !

    3.41. Global Drives (aka Service Drive Letters) are no ! longer supported by Microsoft

    ! !

    3.42. 64-bit Microsoft Windows Installations

    ! !

    3.43. Known Issues with Microsoft Windows Vista

    ! !

    3.44. New AFS Share Name Syntax Provides Direct Access to ! Volumes

    ! !

    3.45. Differences between Windows and UNIX “fs examine”

    ! !

    3.46. Literal evaluation of AFS objects via fs commands

    ! !

    3.47. Out of Quota errors

    ! !

    3.48. Linked Cells

    ! !

    4. How to Debug Problems with OpenAFS for Windows

    ! !

    4.1. pioctl debugging (IoctlDebug registry key)

    ! !

    4.2. afsd_service initialization log ! (%WinDir%\TEMP\afsd_init.log)

    ! !

    4.3. afsd_service debug logs (fs trace {-on, -off, -dump} ! ->%WinDir%\TEMP\afsd.log)

    ! !

    4.4. Using SysInternal’s DbgView and ProcMon or FileMon ! Tools

    ! !

    4.5. Microsoft MiniDumps  ! (fs minidump -> %WinDir%\TEMP\afsd.dmp)

    ! !

    4.6. Single Sign-on (Integrated Logon) debugging

    ! !

    4.7. RX (AFS RPC) debugging (rxdebug)

    ! !

    4.8. Cache Manager debugging (cmdebug)

    ! !

    4.9. Persistent Cache consistency check

    ! !

    4.10. Token Acquisition Debugging

    ! !

    5. Reporting Bugs

    ! !

    6. How to Contribute to the Development of OpenAFS for ! Windows

    ! !

    6.1. The USENIX OpenAFS Fund

    ! !

    6.2. Secure Endpoints Inc.

    ! !

    6.3. Direct contributions of code and/or documentation

    ! !

    6.4. OpenAFS for Windows Mailing Lists

    ! !

    7. MSI Deployment Guide

    ! !

    7.1. Introduction

    ! !

    7.1.1 Requirements

    ! !

    7.1.2 Authoring a Transform

    ! !

    7.2. Configuration Options

    ! !

    7.2.1 Configurable Properties

    ! !

    7.2.1.1 Setting Properties

    ! !

    7.2.1.2 OpenAFS for Windows Properties

    ! !

    (Service parameters):

    ! !

    (Network provider):

    ! !

    (OpenAFS Client):

    ! !

    7.2.1.2.1 Registry Properties

    ! !

    AFSCACHEPATH

    ! !

    AFSCACHESIZE

    ! !

    AFSCELLNAME

    ! !

    FREELANCEMODE

    ! !

    HIDEDOTFILES

    ! !

    LOGONOPTIONS

    ! !

    MOUNTROOT

    ! !

    NETBIOSNAME

    ! !

    NOFINDLANABYNAME

    ! !

    RXMAXMTU

    ! !

    SECURITYLEVEL

    ! !

    SMBAUTHTYPE

    ! !

    STOREANSIFILENAMES

    ! !

    USEDNS

    ! !

    7.2.1.2.2 AFSCreds.exe Properties

    ! !

    CREDSSTARTUP

    ! !

    CREDSAUTOINIT

    ! !

    CREDSIPCHDET

    ! !

    CREDSQUIET

    ! !

    CREDSRENEWDRMAP

    ! !

    CREDSSHOW

    ! !

    7.2.2 Existing Registry Entries

    ! !

    7.2.3 Replacing Configuration Files

    ! !

    7.2.3.1 Components for Configuration Files

    ! !

    7.2.4 Adding Domain Specific Registry Keys

    ! !

    7.2.5 Adding Site Specific Freelance Registry Keys

    ! !

    7.3 Additional Resources

    ! !

    7.4. Upgrades

    ! !

    Appendix A: Registry Values

    ! !

    A.1. Service parameters

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    ! !

    Value: LANadapter

    ! !

    Value: CacheSize

    ! !

    Value: ChunkSize

    ! !

    Value: Daemons

    ! !

    Value: ServerThreads

    ! !

    Value: Stats

    ! !

    Value: LogoffPreserveTokens

    ! !

    Value: RootVolume

    ! !

    Value: MountRoot

    ! !

    Value: CachePath

    ! !

    Value: NonPersistentCaching

    ! !

    Value: ValidateCache

    ! !

    Value: TrapOnPanic

    ! !

    Value: NetbiosName

    ! !

    Value: IsGateway

    ! !

    Value: ReportSessionStartups

    ! !

    Value: TraceBufferSize

    ! !

    Value: SysName

    ! !

    Value: SecurityLevel

    ! !

    Value: UseDNS

    ! !

    Value: FreelanceClient

    ! !

    Value: HideDotFiles

    ! !

    Value: MaxMpxRequests

    ! !

    Value: MaxVCPerServer

    ! !

    Value: Cell

    ! !

    Value: RxNoJumbo

    ! !

    Value: RxMaxMTU

    ! !

    Value: ConnDeadTimeout

    ! !

    Value: HardDeadTimeout

    ! !

    Value: TraceOption

    ! !

    Value: AllSubmount

    ! !

    Value: NoFindLanaByName

    ! !

    Value: MaxCPUs

    ! !

    Value: smbAuthType

    ! !

    Value: MaxLogSize

    ! !

    Value: FlushOnHibernate

    ! !

    Value: daemonCheckDownInterval

    ! !

    Value: daemonCheckUpInterval

    ! !

    Value: daemonCheckVolInterval

    ! !

    Value: daemonCheckCBInterval

    ! !

    Value: daemonCheckLockInterval

    ! !

    Value: daemonCheckTokenInterval

    ! !

    Value: daemonCheckOfflineVolInterval

    ! !

    Value: CallBackPort

    ! !

    Value: EnableServerLocks

    ! !

    Value: DeleteReadOnly

    ! !

    Value: BPlusTrees

    ! !

    Value: PrefetchExecutableExtensions

    ! !

    Value: OfflineReadOnlyIsValid

    ! !

    Value: GiveUpAllCallBacks

    ! !

    Value: FollowBackupPath

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters\GlobalAutoMapper]

    ! !

    Value: <Drive Letter:> for example "G:"

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client]

    ! !

    Value: CellServDBDir

    ! !

    Value: VerifyServiceSignature

    ! !

    Value: IoctlDebug

    ! !

    Value: MiniDumpType

    ! !

    Value: EnableSMBAsyncStore

    ! !

    Value: SMBAsyncStoreSize

    ! !

    Value: StoreAnsiFilenames

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\CSCPolicy]

    ! !

    Value: "smb/cifs share name"

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Freelance]

    ! !

    Value: "numeric value"

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Freelance\Symlinks]

    ! !

    Value: "numeric value"

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Realms]

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Realms”Realm Name”]

    ! !

    Value: AFSEnabled

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Realms”Realm Name””Cell Name”]

    ! !

    Value: MethodName

    ! !

    Value: Realm

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Submounts]

    ! !

    Value: "submount name"

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Server ! Preferences\VLDB]

    ! !

    Value: "hostname or ip address"

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client\Server ! Preferences\File]

    ! !

    Value: "hostname or ip address"

    ! !

    A.2. Integrated Logon Network provider parameters

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    ! !

    Value: FailLoginsSilently

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

    ! !

    Value: NoWarnings

    ! !

    Value: AuthentProviderPath

    ! !

    Value: Class

    ! !

    Value: DependOnGroup

    ! !

    Value: DependOnService

    ! !

    Value: Name

    ! !

    Value: ProviderPath

    ! !

    A.2.1 Domain specific configuration keys for the Network Provider

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain]

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain"domain ! name"]

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

    ! !

    Example:

    ! !

    A.2.1.1 Domain specific configuration values

    ! !

    [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain"domain ! name"] [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST]

    ! !

    Value: LogonOptions

    ! !

    Value: FailLoginsSilentl

    ! !

    Value: LogonScript

    ! !

    Value: LoginRetryInterval

    ! !

    Value: LoginSleepInterval

    ! !

    Value: Realm

    ! !

    Value: TheseCells

    ! !

    A.2.1.2 Selection of effective values for domain specific ! configuration

    ! !

    A.2.1.3 Exceptions to A.2.1.2

    ! !

    2.1.3.1 'FailLoginsSilently'

    ! !

    2.1.3.2 'LogonScript'

    ! !

    A.3. AFS Credentials System Tray Tool parameters

    ! !

    Regkey: ! [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters]

    ! !

    Value: Gateway

    ! !

    Value: Cell

    ! !

    Regkey: [HKLM\SOFTWARE\OpenAFS\Client] ! [HKCU\SOFTWARE\OpenAFS\Client]

    ! !

    Value: ShowTrayIcon

    ! !

    Value: EnableKFW

    ! !

    Value: AcceptDottedPrincipalNames

    ! !

    Value: Use524

    ! !

    Value: AfscredsShortcutParams

    ! !

    Regkey: [HKCU\SOFTWARE\OpenAFS\Client]

    ! !

    Value: Authentication Cell

    ! !

    Regkey: [HKCU\SOFTWARE\OpenAFS\Client\Reminders]

    ! !

    Value: "afs cell name"

    ! !

    Regkey: [HKCU\SOFTWARE\OpenAFS\Client\Active Maps]

    ! !

    Value: "upper case drive letter"

    ! !

    Regkey: [HKCU\SOFTWARE\OpenAFS\Client\Mappings]

    ! !

    Value: "upper case drive letter"

    ! !

    A.4 OpenAFS Client Service Environment ! Variables

    ! !

    Variable: AFS_RPC_ENCRYPT

    ! !

    Variable: AFS_RPC_PROTSEQ

     

     

    Index: openafs/src/WINNT/install/NSIS/CellServDB diff -c openafs/src/WINNT/install/NSIS/CellServDB:1.6.4.5 openafs/src/WINNT/install/NSIS/CellServDB:1.6.4.6 *** openafs/src/WINNT/install/NSIS/CellServDB:1.6.4.5 Wed Apr 23 23:08:31 2008 --- openafs/src/WINNT/install/NSIS/CellServDB Fri Nov 7 21:29:26 2008 *************** *** 1,4 **** ! >grand.central.org #GCO Public CellServDB 23 Apr 2008 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se --- 1,4 ---- ! >grand.central.org #GCO Public CellServDB 07 Nov 2008 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se *************** *** 11,19 **** 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 --- 11,19 ---- 193.170.243.12 #baloo.oeaw.ac.at 193.170.243.14 #akela.oeaw.ac.at >cgv.tugraz.at #CGV cell ! 129.27.218.30 #phobos.cgv.tugraz.at ! 129.27.218.31 #deimos.cgv.tugraz.at ! 129.27.218.32 #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 *************** *** 44,49 **** --- 44,51 ---- 129.129.190.142 #afs02.psi.ch >extundo.com #Simon Josefsson's cell 195.42.214.241 #slipsten.extundo.com + >freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA + 66.210.104.254 #afs0.freedaemon.com >membrain.com #membrain.com 66.93.118.125 #stormy 130.85.24.11 #weasel *************** *** 57,64 **** 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz >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 --- 59,75 ---- 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz + >ics.muni.cz #Masaryk university + 147.251.3.11 #grond.ics.muni.cz + 147.251.3.15 #nimloth.ics.muni.cz + 147.251.3.19 #sirion.ics.muni.cz + >zcu.cz #University of West Bohemia, Czech Republic + 147.228.10.18 #sauron.zcu.cz + 147.228.52.10 #oknos.zcu.cz + 147.228.52.17 #nic.zcu.cz >desy.de #Deutsches Elektronen-Synchrotron ! 131.169.2.19 #afsdb2.desy.de ! 131.169.2.20 #afsdb3.desy.de 131.169.244.60 #solar00.desy.de >gppc.de #GPP Chemnitz mbH 213.187.92.33 #gpp1.gppc.de *************** *** 155,160 **** --- 166,175 ---- 129.219.10.70 #authen1.asu.edu 129.219.10.72 #authen3.asu.edu 129.219.100.16 #authen4.asu.edu + >mars.asu.edu #Mars Space Flight Facility - ASU Mars Research + 149.169.146.57 #kdc1.mars.asu.edu + 149.169.146.58 #kdc2.mars.asu.edu + 149.169.146.59 #kdc3.mars.asu.edu >eecs.berkeley.edu #University of California, Berkeley - EECS Dept. 128.32.139.34 #greed.eecs.berkeley.edu 128.32.139.35 #gluttony.eecs.berkeley.edu *************** *** 223,242 **** 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 --- 238,257 ---- 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 *************** *** 342,351 **** 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 --- 357,362 ---- *************** *** 377,382 **** --- 388,395 ---- 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 + 144.92.180.7 #rosemary.hep.wisc.edu + 144.92.180.30 #fennel.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 *************** *** 398,403 **** --- 411,418 ---- >grif.fr #GRIF cell 192.54.208.18 #node03.datagrid.cea.fr >in2p3.fr #IN2P3 production cell + 134.158.104.11 #ccafsdb01.in2p3.fr + 134.158.104.12 #ccafsdb02.in2p3.fr 134.158.232.11 #ccafsdb1.in2p3.fr 134.158.232.12 #ccafsdb2.in2p3.fr 134.158.232.13 #ccafsdb3.in2p3.fr *************** *** 431,436 **** --- 446,453 ---- 128.55.128.250 #mars.nersc.gov 128.55.128.252 #alfred.nersc.gov 128.55.128.254 #lurch.nersc.gov + >doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary + 193.6.179.31 #afs.doe.atomki.hu >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 *************** *** 474,479 **** --- 491,498 ---- >pi.infn.it #INFN, Sezione di Pisa 131.114.134.26 #unknownhost.pi.infn.it 192.84.133.50 #aix1.pi.infn.it + >roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia + 193.205.159.17 #afsrm3.roma3.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 *************** *** 514,522 **** >slackers.net #The Slackers' Network 199.4.150.159 #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 >interdose.net #Interdose Ltd. & Co. KG, Germany 80.190.171.42 #bfd9000.tow5.interdose.net 217.111.69.188 #bfd9001.z2.interdose.net --- 533,541 ---- >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 204.11.35.83 #service-3.tproa.net ! 204.11.35.84 #service-4.tproa.net ! 204.11.35.85 #service-5.tproa.net >interdose.net #Interdose Ltd. & Co. KG, Germany 80.190.171.42 #bfd9000.tow5.interdose.net 217.111.69.188 #bfd9001.z2.interdose.net *************** *** 544,552 **** --- 563,576 ---- 128.2.120.138 #kurma.sys.hackish.org >idahofuturetruck.org #University of Idaho hybrid vehicle development 12.18.238.210 #dsle210.fsr.net + >mrow.org #MROW.ORG and RITLUG Cell + 88.198.46.111 #mrow.org + 129.21.205.119 #mirror.rit.edu >mrph.org #Mrph 66.207.133.1 #sanber.mrph.org 128.2.99.209 #hernandarias.mrph.org + >mstacm.org #Missouri Science & Technology - ACM + 131.151.88.2 #acmwork.device.mst.edu >nimlabs.org #Nimlabs, Ink. Cell. 18.238.1.103 #olfin.nimlabs.org 18.238.1.105 #caerbanog.nimlabs.org *************** *** 567,582 **** 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.209.5 #afsdb2.isk.kth.se - 130.237.209.9 #afsdb3.isk.kth.se 130.237.216.17 #afsdb1.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 --- 591,605 ---- 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.209.5 #afsdb2.isk.kth.se 130.237.216.17 #afsdb1.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.21 #euler.md.kth.se 130.237.57.68 #trinity.md.kth.se 130.237.57.72 #morpheus.md.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 *************** *** 627,629 **** --- 650,655 ---- 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 + 130.246.183.203 #afs1.gridpp.rl.ac.uk + 130.246.183.204 #afs2.gridpp.rl.ac.uk + 130.246.183.205 #afs3.gridpp.rl.ac.uk Index: openafs/src/WINNT/install/NSIS/OpenAFS.nsi diff -c openafs/src/WINNT/install/NSIS/OpenAFS.nsi:1.88.4.20 openafs/src/WINNT/install/NSIS/OpenAFS.nsi:1.88.4.21 *** openafs/src/WINNT/install/NSIS/OpenAFS.nsi:1.88.4.20 Tue Jul 15 19:59:33 2008 --- openafs/src/WINNT/install/NSIS/OpenAFS.nsi Thu Oct 16 21:41:37 2008 *************** *** 50,56 **** VIAddVersionKey "ProductVersion" ${AFS_VERSION} VIAddVersionKey "FileVersion" ${AFS_VERSION} VIAddVersionKey "FileDescription" "OpenAFS for Windows Installer" ! VIAddVersionKey "LegalCopyright" "(C)2000-2007" !ifdef DEBUG VIAddVersionKey "PrivateBuild" "Checked/Debug" !endif ; End DEBUG --- 50,56 ---- VIAddVersionKey "ProductVersion" ${AFS_VERSION} VIAddVersionKey "FileVersion" ${AFS_VERSION} VIAddVersionKey "FileDescription" "OpenAFS for Windows Installer" ! VIAddVersionKey "LegalCopyright" "(C)2000-2008" !ifdef DEBUG VIAddVersionKey "PrivateBuild" "Checked/Debug" !endif ; End DEBUG *************** *** 575,589 **** !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afslogon.dll" "$INSTDIR\Client\Program\afslogon.dll" "$INSTDIR" File "${AFS_CLIENT_BUILDDIR}\afscpcc.exe" ! !ifdef AFSIFS ! SetOutPath "$SYSDIR" ! !ifndef DEBUG ! !insertmacro ReplaceDLL "..\..\afsrdr\objfre_w2K_x86\i386\afsrdr.sys" "$SYSDIR\DRIVERS\afsrdr.sys" "$INSTDIR" ! !else ! !insertmacro ReplaceDLL "..\..\afsrdr\objchk_w2K_x86\i386\afsrdr.sys" "$SYSDIR\DRIVERS\afsrdr.sys" "$INSTDIR" ! !endif ! !endif ! Call AFSLangFiles ; Get AFS CellServDB file --- 575,586 ---- !insertmacro ReplaceDLL "${AFS_CLIENT_BUILDDIR}\afslogon.dll" "$INSTDIR\Client\Program\afslogon.dll" "$INSTDIR" File "${AFS_CLIENT_BUILDDIR}\afscpcc.exe" ! ; Remove the binaries from the old location if present ! Delete /REBOOTOK "$SYSDIR\afslogon.dll" ! Delete "$SYSDIR\afscpcc.exe" ! Delete "$SYSDIR\afslogon.pdb" ! Delete "$SYSDIR\afscpcc.pdb" ! Call AFSLangFiles ; Get AFS CellServDB file *************** *** 790,796 **** ; WinLogon Event Notification WriteRegDWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Asynchronous" 0 WriteRegDWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Impersonate" 1 ! WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "DLLName" "afslogon.dll" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Logon" "AFS_Logon_Event" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Logoff" "AFS_Logoff_Event" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Startup" "AFS_Startup_Event" --- 787,793 ---- ; WinLogon Event Notification WriteRegDWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Asynchronous" 0 WriteRegDWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Impersonate" 1 ! WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "DLLName" "$INSTDIR\Client\Program\afslogon.dll" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Logon" "AFS_Logon_Event" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Logoff" "AFS_Logoff_Event" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Startup" "AFS_Startup_Event" Index: openafs/src/WINNT/install/wix/CellServDB diff -c openafs/src/WINNT/install/wix/CellServDB:1.6.4.5 openafs/src/WINNT/install/wix/CellServDB:1.6.4.6 *** openafs/src/WINNT/install/wix/CellServDB:1.6.4.5 Wed Apr 23 23:08:35 2008 --- openafs/src/WINNT/install/wix/CellServDB Fri Nov 7 21:29:30 2008 *************** *** 1,4 **** ! >grand.central.org #GCO Public CellServDB 23 Apr 2008 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se --- 1,4 ---- ! >grand.central.org #GCO Public CellServDB 07 Nov 2008 18.92.0.108 #grand-opening.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se *************** *** 11,19 **** 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 --- 11,19 ---- 193.170.243.12 #baloo.oeaw.ac.at 193.170.243.14 #akela.oeaw.ac.at >cgv.tugraz.at #CGV cell ! 129.27.218.30 #phobos.cgv.tugraz.at ! 129.27.218.31 #deimos.cgv.tugraz.at ! 129.27.218.32 #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 *************** *** 44,49 **** --- 44,51 ---- 129.129.190.142 #afs02.psi.ch >extundo.com #Simon Josefsson's cell 195.42.214.241 #slipsten.extundo.com + >freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA + 66.210.104.254 #afs0.freedaemon.com >membrain.com #membrain.com 66.93.118.125 #stormy 130.85.24.11 #weasel *************** *** 57,64 **** 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz >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 --- 59,75 ---- 195.113.0.36 #asterix.ruk.cuni.cz 195.113.0.37 #obelix.ruk.cuni.cz 195.113.0.40 #sal.ruk.cuni.cz + >ics.muni.cz #Masaryk university + 147.251.3.11 #grond.ics.muni.cz + 147.251.3.15 #nimloth.ics.muni.cz + 147.251.3.19 #sirion.ics.muni.cz + >zcu.cz #University of West Bohemia, Czech Republic + 147.228.10.18 #sauron.zcu.cz + 147.228.52.10 #oknos.zcu.cz + 147.228.52.17 #nic.zcu.cz >desy.de #Deutsches Elektronen-Synchrotron ! 131.169.2.19 #afsdb2.desy.de ! 131.169.2.20 #afsdb3.desy.de 131.169.244.60 #solar00.desy.de >gppc.de #GPP Chemnitz mbH 213.187.92.33 #gpp1.gppc.de *************** *** 155,160 **** --- 166,175 ---- 129.219.10.70 #authen1.asu.edu 129.219.10.72 #authen3.asu.edu 129.219.100.16 #authen4.asu.edu + >mars.asu.edu #Mars Space Flight Facility - ASU Mars Research + 149.169.146.57 #kdc1.mars.asu.edu + 149.169.146.58 #kdc2.mars.asu.edu + 149.169.146.59 #kdc3.mars.asu.edu >eecs.berkeley.edu #University of California, Berkeley - EECS Dept. 128.32.139.34 #greed.eecs.berkeley.edu 128.32.139.35 #gluttony.eecs.berkeley.edu *************** *** 223,242 **** 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 --- 238,257 ---- 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 *************** *** 342,351 **** 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 --- 357,362 ---- *************** *** 377,382 **** --- 388,395 ---- 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 + 144.92.180.7 #rosemary.hep.wisc.edu + 144.92.180.30 #fennel.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 *************** *** 398,403 **** --- 411,418 ---- >grif.fr #GRIF cell 192.54.208.18 #node03.datagrid.cea.fr >in2p3.fr #IN2P3 production cell + 134.158.104.11 #ccafsdb01.in2p3.fr + 134.158.104.12 #ccafsdb02.in2p3.fr 134.158.232.11 #ccafsdb1.in2p3.fr 134.158.232.12 #ccafsdb2.in2p3.fr 134.158.232.13 #ccafsdb3.in2p3.fr *************** *** 431,436 **** --- 446,453 ---- 128.55.128.250 #mars.nersc.gov 128.55.128.252 #alfred.nersc.gov 128.55.128.254 #lurch.nersc.gov + >doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary + 193.6.179.31 #afs.doe.atomki.hu >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 *************** *** 474,479 **** --- 491,498 ---- >pi.infn.it #INFN, Sezione di Pisa 131.114.134.26 #unknownhost.pi.infn.it 192.84.133.50 #aix1.pi.infn.it + >roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia + 193.205.159.17 #afsrm3.roma3.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 *************** *** 514,522 **** >slackers.net #The Slackers' Network 199.4.150.159 #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 >interdose.net #Interdose Ltd. & Co. KG, Germany 80.190.171.42 #bfd9000.tow5.interdose.net 217.111.69.188 #bfd9001.z2.interdose.net --- 533,541 ---- >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames ! 204.11.35.83 #service-3.tproa.net ! 204.11.35.84 #service-4.tproa.net ! 204.11.35.85 #service-5.tproa.net >interdose.net #Interdose Ltd. & Co. KG, Germany 80.190.171.42 #bfd9000.tow5.interdose.net 217.111.69.188 #bfd9001.z2.interdose.net *************** *** 544,552 **** --- 563,576 ---- 128.2.120.138 #kurma.sys.hackish.org >idahofuturetruck.org #University of Idaho hybrid vehicle development 12.18.238.210 #dsle210.fsr.net + >mrow.org #MROW.ORG and RITLUG Cell + 88.198.46.111 #mrow.org + 129.21.205.119 #mirror.rit.edu >mrph.org #Mrph 66.207.133.1 #sanber.mrph.org 128.2.99.209 #hernandarias.mrph.org + >mstacm.org #Missouri Science & Technology - ACM + 131.151.88.2 #acmwork.device.mst.edu >nimlabs.org #Nimlabs, Ink. Cell. 18.238.1.103 #olfin.nimlabs.org 18.238.1.105 #caerbanog.nimlabs.org *************** *** 567,582 **** 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.209.5 #afsdb2.isk.kth.se - 130.237.209.9 #afsdb3.isk.kth.se 130.237.216.17 #afsdb1.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 --- 591,605 ---- 130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK 130.237.209.5 #afsdb2.isk.kth.se 130.237.216.17 #afsdb1.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.21 #euler.md.kth.se 130.237.57.68 #trinity.md.kth.se 130.237.57.72 #morpheus.md.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 *************** *** 627,629 **** --- 650,655 ---- 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 + 130.246.183.203 #afs1.gridpp.rl.ac.uk + 130.246.183.204 #afs2.gridpp.rl.ac.uk + 130.246.183.205 #afs3.gridpp.rl.ac.uk Index: openafs/src/WINNT/netidmgr_plugin/afsfuncs.c diff -c openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.18 openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.21 *** openafs/src/WINNT/netidmgr_plugin/afsfuncs.c:1.1.2.18 Sat Mar 29 23:36:57 2008 --- openafs/src/WINNT/netidmgr_plugin/afsfuncs.c Fri Nov 7 13:19:51 2008 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsfuncs.c,v 1.1.2.18 2008/03/30 03:36:57 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.21 2008/11/07 18:19:51 jaltman Exp $ */ /* Disable the 'macro redefinition' warning which is getting triggerred by a redefinition of the ENCRYPT and DECRYPT macros. */ *************** *** 728,741 **** char *realm, int LifeTime, afs_tk_method method, ! time_t * tok_expiration) { long rc; CREDENTIALS creds; struct ktc_principal aserver; struct ktc_principal aclient; ! char realm_of_user[REALM_SZ]; /* Kerberos realm of user */ ! char realm_of_cell[REALM_SZ]; /* Kerberos realm of cell */ char local_cell[MAXCELLCHARS+1]; char Dmycell[MAXCELLCHARS+1]; struct ktc_token atoken; --- 728,742 ---- char *realm, int LifeTime, afs_tk_method method, ! time_t * tok_expiration, ! char *linkedCell) { long rc; CREDENTIALS creds; struct ktc_principal aserver; struct ktc_principal aclient; ! char realm_of_user[MAXKTCREALMLEN]; /* Kerberos realm of user */ ! char realm_of_cell[MAXKTCREALMLEN]; /* Kerberos realm of cell */ char local_cell[MAXCELLCHARS+1]; char Dmycell[MAXCELLCHARS+1]; struct ktc_token atoken; *************** *** 763,768 **** --- 764,770 ---- if ( !cell ) cell = ""; if ( !service ) service = ""; + memset(&ak_cellconfig, 0, sizeof(ak_cellconfig)); memset(RealmName, '\0', sizeof(RealmName)); memset(CellName, '\0', sizeof(CellName)); memset(ServiceName, '\0', sizeof(ServiceName)); *************** *** 784,789 **** --- 786,795 ---- return(rc); } + if (linkedCell && ak_cellconfig.linkedCell) + StringCbCopyA(linkedCell, MAXCELLCHARS, + ak_cellconfig.linkedCell); + StringCbCopyA(realm_of_cell, sizeof(realm_of_cell), afs_realm_of_cell(&ak_cellconfig, FALSE)); *************** *** 831,838 **** pkrb5_cc_get_principal(context, k5cc, &client_principal); i = krb5_princ_realm(context, client_principal)->length; ! if (i > REALM_SZ-1) ! i = REALM_SZ-1; StringCchCopyNA(realm_of_user, ARRAYLENGTH(realm_of_user), krb5_princ_realm(context, client_principal)->data, i); --- 837,844 ---- pkrb5_cc_get_principal(context, k5cc, &client_principal); i = krb5_princ_realm(context, client_principal)->length; ! if (i > MAXKTCREALMLEN-1) ! i = MAXKTCREALMLEN-1; StringCchCopyNA(realm_of_user, ARRAYLENGTH(realm_of_user), krb5_princ_realm(context, client_principal)->data, i); *************** *** 1061,1067 **** _reportf(L"Same token already exists"); ! return 0; } // * Reset the "aclient" structure before we call ktc_SetToken. --- 1067,1074 ---- _reportf(L"Same token already exists"); ! rc = 0; ! goto cleanup; } // * Reset the "aclient" structure before we call ktc_SetToken. *************** *** 1105,1111 **** if (context) pkrb5_free_context(context); ! return 0; } _reportf(L"SetToken returns code %d", rc); --- 1112,1118 ---- if (context) pkrb5_free_context(context); ! goto cleanup; } _reportf(L"SetToken returns code %d", rc); *************** *** 1151,1156 **** --- 1158,1164 ---- _reportf(L"Kerberos 4 not configured"); if (!bGotCreds && supports_krb4 && + strlen(RealmName) < REALM_SZ && (method == AFS_TOKEN_AUTO || method == AFS_TOKEN_KRB4)) { *************** *** 1238,1244 **** !memcmp(atoken.ticket, btoken.ticket, atoken.ticketLen)) { /* success! */ ! return(0); } // Reset the "aclient" structure before we call ktc_SetToken. --- 1246,1253 ---- !memcmp(atoken.ticket, btoken.ticket, atoken.ticketLen)) { /* success! */ ! rc = 0; ! goto cleanup; } // Reset the "aclient" structure before we call ktc_SetToken. *************** *** 1263,1269 **** if (rc = ktc_SetToken(&aserver, &atoken, &aclient, 0)) { afs_report_error(rc, "ktc_SetToken()"); ! return(rc); } } else if (method == AFS_TOKEN_AUTO || method >= AFS_TOKEN_USER) { --- 1272,1278 ---- if (rc = ktc_SetToken(&aserver, &atoken, &aclient, 0)) { afs_report_error(rc, "ktc_SetToken()"); ! goto cleanup; } } else if (method == AFS_TOKEN_AUTO || method >= AFS_TOKEN_USER) { *************** *** 1293,1298 **** --- 1302,1311 ---- } } + cleanup: + if (ak_cellconfig.linkedCell) + free(ak_cellconfig.linkedCell); + return rc; } *************** *** 1303,1309 **** afs_realm_of_cell(afs_conf_cell *cellconfig, BOOL referral_fallback) { char krbhst[MAX_HSTNM]=""; ! static char krbrlm[REALM_SZ+1]=""; krb5_context ctx = 0; char ** realmlist=NULL; krb5_error_code r = 0; --- 1316,1322 ---- afs_realm_of_cell(afs_conf_cell *cellconfig, BOOL referral_fallback) { char krbhst[MAX_HSTNM]=""; ! static char krbrlm[MAXKTCREALMLEN+1]=""; krb5_context ctx = 0; char ** realmlist=NULL; krb5_error_code r = 0; *************** *** 1384,1390 **** if (strlen(cell) == 0) StringCbCopyA(cell, (MAXCELLCHARS+1) * sizeof(char), local_cell); ! /* WIN32: cm_SearchCellFile(cell, pcallback, pdata) */ StringCbCopyA(cellconfig->name, (MAXCELLCHARS+1) * sizeof(char), cell); rc = cm_SearchCellFile(cell, NULL, afs_get_cellconfig_callback, --- 1397,1403 ---- if (strlen(cell) == 0) StringCbCopyA(cell, (MAXCELLCHARS+1) * sizeof(char), local_cell); ! /* WIN32: cm_SearchCellFile(cell, newcell, pcallback, pdata) */ StringCbCopyA(cellconfig->name, (MAXCELLCHARS+1) * sizeof(char), cell); rc = cm_SearchCellFile(cell, NULL, afs_get_cellconfig_callback, *************** *** 1592,1603 **** --- 1605,1619 ---- int rc; ZeroMemory(local_cell, sizeof(local_cell)); + ZeroMemory(&cellconfig, sizeof(cellconfig)); rc = afs_get_cellconfig(cell, &cellconfig, local_cell); if (rc) return FALSE; realm = afs_realm_of_cell(&cellconfig, FALSE); + if (cellconfig.linkedCell) + free(cellconfig.linkedCell); if (realm == NULL) return FALSE; Index: openafs/src/WINNT/netidmgr_plugin/afsfuncs.h diff -c openafs/src/WINNT/netidmgr_plugin/afsfuncs.h:1.1.2.5 openafs/src/WINNT/netidmgr_plugin/afsfuncs.h:1.1.2.6 *** openafs/src/WINNT/netidmgr_plugin/afsfuncs.h:1.1.2.5 Sat May 5 17:14:48 2007 --- openafs/src/WINNT/netidmgr_plugin/afsfuncs.h Fri Nov 7 11:36:03 2008 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsfuncs.h,v 1.1.2.5 2007/05/05 21:14:48 jaltman Exp $ */ #ifndef __KHIMAIRA_AFSFUNCS_H #define __KHIMAIRA_AFSFUNCS_H --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsfuncs.h,v 1.1.2.6 2008/11/07 16:36:03 jaltman Exp $ */ #ifndef __KHIMAIRA_AFSFUNCS_H #define __KHIMAIRA_AFSFUNCS_H *************** *** 50,57 **** char *realm, int LifeTime, afs_tk_method method, ! time_t * tok_expiration /* OUT: expiration time of new ! token */ ); int --- 50,57 ---- char *realm, int LifeTime, afs_tk_method method, ! time_t * tok_expiration,/* OUT: expiration time of new token */ ! char *linkedCell /* OUT: name of linkedCell (if any) */ ); int Index: openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c diff -c openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c:1.1.2.7 openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c:1.1.2.9 *** openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c:1.1.2.7 Tue Jan 8 12:06:39 2008 --- openafs/src/WINNT/netidmgr_plugin/afsnewcreds.c Fri Nov 7 13:19:51 2008 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afsnewcreds.c,v 1.1.2.7 2008/01/08 17:06:39 jaltman Exp $ */ #include #include --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afsnewcreds.c,v 1.1.2.9 2008/11/07 18:19:51 jaltman Exp $ */ #include #include *************** *** 1563,1568 **** --- 1563,1572 ---- SendDlgItemMessage(hwnd, IDC_NCAFS_OBTAIN, BM_SETCHECK, BST_CHECKED, 0); + SendDlgItemMessage(hwnd, IDC_NCAFS_CELL, CB_LIMITTEXT, MAXCELLCHARS-1, 0); + SendDlgItemMessage(hwnd, IDC_NCAFS_REALM, CB_LIMITTEXT, MAXKTCREALMLEN-1, 0); + SendDlgItemMessage(hwnd, IDC_NCAFS_METHOD, CB_LIMITTEXT, KCDB_MAXCCH_NAME-1, 0); + LeaveCriticalSection(&d->cs); /* the cells and realms combo boxes need to be filled *************** *** 2654,2660 **** for(i=0; in_rows; i++) { int code; char cell[MAXCELLCHARS]; ! char realm[MAXCELLCHARS]; khm_handle ctoken; FILETIME ft_old; FILETIME ft_new; --- 2658,2665 ---- for(i=0; in_rows; i++) { int code; char cell[MAXCELLCHARS]; ! char realm[MAXKTCREALMLEN]; ! char linkedCell[MAXCELLCHARS]=""; khm_handle ctoken; FILETIME ft_old; FILETIME ft_new; *************** *** 2662,2667 **** --- 2667,2673 ---- khm_size cb; khm_int32 method = AFS_TOKEN_AUTO; khm_handle csp_cell = NULL; + BOOL bgetLinked = 0; if (l->rows[i].flags & (DLGROW_FLAG_DONE | DLGROW_FLAG_DELETED)) *************** *** 2709,2724 **** method = l->rows[i].method; } _report_cs3(KHERR_INFO, L"Getting tokens for cell %1!S! with realm %2!S! using method %3!d!", ! _cstr(cell), _cstr(realm), _int32(method)); _resolve(); /* make the call */ ! code = afs_klog(ident, "", cell, realm, 0, ! method, &new_exp); _report_cs1(KHERR_INFO, L"klog returns code %1!d!", --- 2715,2734 ---- method = l->rows[i].method; } + getLinked: _report_cs3(KHERR_INFO, L"Getting tokens for cell %1!S! with realm %2!S! using method %3!d!", ! _cstr((bgetLinked ? linkedCell: cell)), _cstr(realm), _int32(method)); _resolve(); /* make the call */ ! code = afs_klog(ident, "", ! bgetLinked ? linkedCell : cell, ! realm, 0, ! method, &new_exp, ! bgetLinked ? NULL :linkedCell); _report_cs1(KHERR_INFO, L"klog returns code %1!d!", *************** *** 2769,2774 **** --- 2779,2789 ---- ident_renew_triggered = TRUE; } } + + if ( !bgetLinked && linkedCell[0] ) { + bgetLinked = TRUE; + goto getLinked; + } } } Index: openafs/src/WINNT/netidmgr_plugin/afspext.h diff -c openafs/src/WINNT/netidmgr_plugin/afspext.h:1.1.2.3 openafs/src/WINNT/netidmgr_plugin/afspext.h:1.1.2.4 *** openafs/src/WINNT/netidmgr_plugin/afspext.h:1.1.2.3 Mon Oct 16 09:55:35 2006 --- openafs/src/WINNT/netidmgr_plugin/afspext.h Fri Nov 7 13:19:51 2008 *************** *** 22,28 **** * SOFTWARE. */ ! /* $Id: afspext.h,v 1.1.2.3 2006/10/16 13:55:35 jaltman Exp $ */ #ifndef __AFSPLUGIN_EXT_H #define __AFSPLUGIN_EXT_H --- 22,28 ---- * SOFTWARE. */ ! /* $Id: afspext.h,v 1.1.2.4 2008/11/07 18:19:51 jaltman Exp $ */ #ifndef __AFSPLUGIN_EXT_H #define __AFSPLUGIN_EXT_H *************** *** 40,47 **** @{*/ ! #define MAXCELLCHARS 64 ! #define MAXHOSTCHARS 64 #define MAXHOSTSPERCELL 8 #define TRANSARCAFSDAEMON "TransarcAFSDaemon" --- 40,47 ---- @{*/ ! #define MAXCELLCHARS 256 ! #define MAXHOSTCHARS 256 #define MAXHOSTSPERCELL 8 #define TRANSARCAFSDAEMON "TransarcAFSDaemon" Index: openafs/src/WINNT/netidmgr_plugin/lang/en_us/langres.rc diff -c openafs/src/WINNT/netidmgr_plugin/lang/en_us/langres.rc:1.1.2.6 openafs/src/WINNT/netidmgr_plugin/lang/en_us/langres.rc:1.1.2.7 *** openafs/src/WINNT/netidmgr_plugin/lang/en_us/langres.rc:1.1.2.6 Thu Apr 12 10:13:48 2007 --- openafs/src/WINNT/netidmgr_plugin/lang/en_us/langres.rc Fri Nov 7 13:19:51 2008 *************** *** 61,71 **** CONTROL "Obtain &AFS credentials",IDC_NCAFS_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,19,140,12 GROUPBOX "Credential for",IDC_STATIC,7,32,286,54 LTEXT "&Cell",IDC_STATIC,12,41,42,10 ! COMBOBOX IDC_NCAFS_CELL,57,38,152,48,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Realm",IDC_STATIC,12,57,42,10 ! COMBOBOX IDC_NCAFS_REALM,57,54,152,48,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Method",IDC_STATIC,12,73,42,10 ! COMBOBOX IDC_NCAFS_METHOD,57,70,152,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Add/Update",IDC_NCAFS_ADD_TOKEN,213,38,77,13,BS_NOTIFY PUSHBUTTON "&Delete",IDC_NCAFS_DELETE_TOKEN,213,70,77,13,BS_NOTIFY CONTROL "",IDC_NCAFS_TOKENLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,88,286,71 --- 61,71 ---- CONTROL "Obtain &AFS credentials",IDC_NCAFS_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,19,140,12 GROUPBOX "Credential for",IDC_STATIC,7,32,286,54 LTEXT "&Cell",IDC_STATIC,12,41,42,10 ! COMBOBOX IDC_NCAFS_CELL,57,38,152,48,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Realm",IDC_STATIC,12,57,42,10 ! COMBOBOX IDC_NCAFS_REALM,57,54,152,48,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Method",IDC_STATIC,12,73,42,10 ! COMBOBOX IDC_NCAFS_METHOD,57,70,152,48,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Add/Update",IDC_NCAFS_ADD_TOKEN,213,38,77,13,BS_NOTIFY PUSHBUTTON "&Delete",IDC_NCAFS_DELETE_TOKEN,213,70,77,13,BS_NOTIFY CONTROL "",IDC_NCAFS_TOKENLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,88,286,71 *************** *** 88,98 **** CONTROL "Obtain &AFS credentials",IDC_NCAFS_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,140,12 GROUPBOX "Credential for",IDC_STATIC,7,18,221,56 LTEXT "&Cell",IDC_STATIC,13,28,42,10 ! COMBOBOX IDC_NCAFS_CELL,57,25,109,48,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Realm",IDC_STATIC,13,44,42,10 ! COMBOBOX IDC_NCAFS_REALM,57,41,109,48,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Method",IDC_STATIC,13,60,42,10 ! COMBOBOX IDC_NCAFS_METHOD,57,57,109,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Add/Update",IDC_NCAFS_ADD_TOKEN,174,26,50,13,BS_NOTIFY PUSHBUTTON "&Delete",IDC_NCAFS_DELETE_TOKEN,174,56,50,13,BS_NOTIFY CONTROL "",IDC_NCAFS_TOKENLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,75,221,69 --- 88,98 ---- CONTROL "Obtain &AFS credentials",IDC_NCAFS_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,140,12 GROUPBOX "Credential for",IDC_STATIC,7,18,221,56 LTEXT "&Cell",IDC_STATIC,13,28,42,10 ! COMBOBOX IDC_NCAFS_CELL,57,25,109,48,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Realm",IDC_STATIC,13,44,42,10 ! COMBOBOX IDC_NCAFS_REALM,57,41,109,48,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Method",IDC_STATIC,13,60,42,10 ! COMBOBOX IDC_NCAFS_METHOD,57,57,109,48,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Add/Update",IDC_NCAFS_ADD_TOKEN,174,26,50,13,BS_NOTIFY PUSHBUTTON "&Delete",IDC_NCAFS_DELETE_TOKEN,174,56,50,13,BS_NOTIFY CONTROL "",IDC_NCAFS_TOKENLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,75,221,69 Index: openafs/src/WINNT/pthread/pthread.c diff -c openafs/src/WINNT/pthread/pthread.c:1.11.2.1 openafs/src/WINNT/pthread/pthread.c:1.11.2.2 *** openafs/src/WINNT/pthread/pthread.c:1.11.2.1 Tue Dec 25 18:06:14 2007 --- openafs/src/WINNT/pthread/pthread.c Fri Oct 17 16:24:49 2008 *************** *** 33,38 **** --- 33,39 ---- #include #include #include + #include #include #include *************** *** 213,218 **** --- 214,414 ---- return rc; } + int pthread_rwlock_destroy(pthread_rwlock_t *rwp) + { + int rc = 0; + + if (rwp != NULL) { + pthread_mutex_destroy(&rwp->read_access_completion_mutex); + pthread_mutex_destroy(&rwp->write_access_mutex); + pthread_cond_destroy(&rwp->read_access_completion_wait); + } else { + #ifdef PTHREAD_DEBUG + DebugBreak(); + #endif + rc = EINVAL; + } + + return rc; + } + + int pthread_rwlock_init(pthread_rwlock_t *rwp, const pthread_rwlockattr_t *attr) + { + int rc = 0; + + if (rwp == NULL) + return EINVAL; + + rwp->readers = 0; + + rc = pthread_mutex_init(&rwp->write_access_mutex, NULL); + if (rc) + return rc; + + rc = pthread_mutex_init(&rwp->read_access_completion_mutex, NULL); + if (rc) + goto error1; + + rc = pthread_cond_init(&rwp->read_access_completion_wait, NULL); + if (rc == 0) + return 0; /* success */ + + pthread_mutex_destroy(&rwp->read_access_completion_mutex); + + error1: + pthread_mutex_destroy(&rwp->write_access_mutex); + + return rc; + } + + int pthread_rwlock_wrlock(pthread_rwlock_t *rwp) + { + int rc = 0; + + if (rwp == NULL) + return EINVAL; + + if ((rc = pthread_mutex_lock(&rwp->write_access_mutex)) != 0) + return rc; + + if ((rc = pthread_mutex_lock(&rwp->read_access_completion_mutex)) != 0) + { + pthread_mutex_unlock(&rwp->write_access_mutex); + return rc; + } + + while (rc == 0 && rwp->readers > 0) { + rc = pthread_cond_wait( &rwp->read_access_completion_wait, + &rwp->read_access_completion_mutex); + } + + pthread_mutex_unlock(&rwp->read_access_completion_mutex); + + if (rc) + pthread_mutex_unlock(&rwp->write_access_mutex); + + return rc; + } + + int pthread_rwlock_rdlock(pthread_rwlock_t *rwp) + { + int rc = 0; + + if (rwp == NULL) + return EINVAL; + + if ((rc = pthread_mutex_lock(&rwp->write_access_mutex)) != 0) + return rc; + + if ((rc = pthread_mutex_lock(&rwp->read_access_completion_mutex)) != 0) + { + pthread_mutex_unlock(&rwp->write_access_mutex); + return rc; + } + + rwp->readers++; + + pthread_mutex_unlock(&rwp->read_access_completion_mutex); + + pthread_mutex_unlock(&rwp->write_access_mutex); + + return rc; + + } + + int pthread_rwlock_tryrdlock(pthread_rwlock_t *rwp) + { + int rc = 0; + + if (rwp == NULL) + return EINVAL; + + if ((rc = pthread_mutex_trylock(&rwp->write_access_mutex)) != 0) + return rc; + + if ((rc = pthread_mutex_trylock(&rwp->read_access_completion_mutex)) != 0) { + pthread_mutex_unlock(&rwp->write_access_mutex); + return rc; + } + + rwp->readers++; + + pthread_mutex_unlock(&rwp->read_access_completion_mutex); + + pthread_mutex_unlock(&rwp->write_access_mutex); + + return rc; + } + + int pthread_rwlock_trywrlock(pthread_rwlock_t *rwp) + { + int rc = 0; + + if (rwp == NULL) + return EINVAL; + + if ((rc = pthread_mutex_trylock(&rwp->write_access_mutex)) != 0) + return rc; + + if ((rc = pthread_mutex_trylock(&rwp->read_access_completion_mutex)) != 0) + { + pthread_mutex_unlock(&rwp->write_access_mutex); + return rc; + } + + if (rwp->readers > 0) + rc = EBUSY; + + pthread_mutex_unlock(&rwp->read_access_completion_mutex); + + if (rc) + pthread_mutex_unlock(&rwp->write_access_mutex); + + return rc; + } + + int pthread_rwlock_unlock(pthread_rwlock_t *rwp) + { + int rc = 0; + + if (rwp == NULL) + return EINVAL; + + rc = pthread_mutex_trylock(&rwp->write_access_mutex); + if (rc != EDEADLK) + { + /* unlock a read lock */ + if (rc == 0) + pthread_mutex_unlock(&rwp->write_access_mutex); + + if ((rc = pthread_mutex_lock(&rwp->read_access_completion_mutex)) != 0) + { + pthread_mutex_unlock(&rwp->write_access_mutex); + return rc; + } + + if (rwp->readers <= 0) + { + rc = EINVAL; + } + else + { + if (--rwp->readers == 0) + pthread_cond_broadcast(&rwp->read_access_completion_wait); + } + + pthread_mutex_unlock(&rwp->read_access_completion_mutex); + } + else + { + /* unlock a write lock */ + rc = pthread_mutex_unlock(&rwp->write_access_mutex); + } + + return rc; + } + + /* * keys is used to keep track of which keys are currently * in use by the threads library. pthread_tsd_mutex is used Index: openafs/src/WINNT/pthread/pthread.def diff -c openafs/src/WINNT/pthread/pthread.def:1.2 openafs/src/WINNT/pthread/pthread.def:1.2.2.1 *** openafs/src/WINNT/pthread/pthread.def:1.2 Mon Apr 24 10:25:12 2006 --- openafs/src/WINNT/pthread/pthread.def Fri Oct 17 16:24:49 2008 *************** *** 26,28 **** --- 26,35 ---- pthread_attr_setdetachstate @24 pthread_exit @25 DllMain @26 + pthread_rwlock_destroy @27 + pthread_rwlock_init @28 + pthread_rwlock_rdlock @29 + pthread_rwlock_wrlock @30 + pthread_rwlock_tryrdlock @31 + pthread_rwlock_trywrlock @32 + pthread_rwlock_unlock @33 Index: openafs/src/WINNT/pthread/pthread.h diff -c openafs/src/WINNT/pthread/pthread.h:1.2 openafs/src/WINNT/pthread/pthread.h:1.2.32.1 *** openafs/src/WINNT/pthread/pthread.h:1.2 Sat Nov 4 05:03:05 2000 --- openafs/src/WINNT/pthread/pthread.h Fri Oct 17 16:24:49 2008 *************** *** 31,36 **** --- 31,37 ---- typedef int pthread_condattr_t; typedef int pthread_mutexattr_t; + typedef int pthread_rwlockattr_t; typedef int pthread_key_t; typedef void *pthread_t; *************** *** 56,61 **** --- 57,69 ---- struct rx_queue waiting_threads; } pthread_cond_t; + typedef struct { + pthread_mutex_t write_access_mutex; + pthread_mutex_t read_access_completion_mutex; + pthread_cond_t read_access_completion_wait; + int readers; + } pthread_rwlock_t; + #define PTHREAD_ONCE_INIT {0,1} extern int pthread_cond_broadcast(pthread_cond_t *cond); *************** *** 69,79 **** --- 77,97 ---- extern int pthread_join(pthread_t target_thread, void **status); extern int pthread_key_create(pthread_key_t *keyp, void (*destructor)(void *value)); extern int pthread_key_delete(pthread_key_t key); + extern int pthread_mutex_destroy(pthread_mutex_t *mp); extern int pthread_mutex_init(pthread_mutex_t *mp, const pthread_mutexattr_t *attr); extern int pthread_mutex_lock(pthread_mutex_t *mp); extern int pthread_mutex_trylock(pthread_mutex_t *mp); extern int pthread_mutex_unlock(pthread_mutex_t *mp); + + extern int pthread_rwlock_destroy(pthread_rwlock_t *rwp); + extern int pthread_rwlock_init(pthread_rwlock_t *rwp, const pthread_rwlockattr_t *attr); + extern int pthread_rwlock_rdlock(pthread_rwlock_t *rwp); + extern int pthread_rwlock_wrlock(pthread_rwlock_t *rwp); + extern int pthread_rwlock_tryrdlock(pthread_rwlock_t *rwp); + extern int pthread_rwlock_trywrlock(pthread_rwlock_t *rwp); + extern int pthread_rwlock_unlock(pthread_rwlock_t *rwp); + extern int pthread_once(pthread_once_t *once_control, void (*init_routine)(void)); extern int pthread_setspecific(pthread_key_t key, const void *value); extern pthread_t pthread_self(void); Index: openafs/src/afs/afs.h diff -c openafs/src/afs/afs.h:1.85.2.10 openafs/src/afs/afs.h:1.85.2.14 *** openafs/src/afs/afs.h:1.85.2.10 Mon Sep 22 15:35:26 2008 --- openafs/src/afs/afs.h Sat Nov 8 11:34:42 2008 *************** *** 187,193 **** afs_int32 uid; /* user id making the request */ afs_int32 busyCount; /* how many busies we've seen so far */ afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */ ! char initd; /* if non-zero, non-uid fields meaningful */ char accessError; /* flags for overriding error return code */ char volumeError; /* encountered a missing or busy volume */ char networkError; /* encountered network problems */ --- 187,193 ---- afs_int32 uid; /* user id making the request */ afs_int32 busyCount; /* how many busies we've seen so far */ afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */ ! char initd; /* if non-zero, Error fields meaningful */ char accessError; /* flags for overriding error return code */ char volumeError; /* encountered a missing or busy volume */ char networkError; /* encountered network problems */ *************** *** 562,568 **** --- 562,572 ---- #define CUnlinkedDel 0x00040000 #define CVFlushed 0x00080000 #define CCore1 0x00100000 /* osf1 core file; not same as CCore above */ + #ifdef AFS_LINUX22_ENV + #define CPageWrite 0x00200000 /* to detect vm deadlock - linux */ + #else #define CWritingUFS 0x00200000 /* to detect vm deadlock - used by sgi */ + #endif #define CCreating 0x00400000 /* avoid needless store after open truncate */ #define CPageHog 0x00800000 /* AIX - dumping large cores is a page hog. */ #define CDCLock 0x02000000 /* Vnode lock held over call to GetDownD */ *************** *** 1001,1006 **** --- 1005,1014 ---- afs_int32 fid; /* is adc->index, the cache file number */ afs_inode_t inode; /* is adc->f.inode, the inode number of the cac\ he file */ + #if defined(LINUX_USE_FH) + struct fid fh; /* Opaque file handle */ + int fh_type; /* Opaque file handle type */ + #endif afs_int32 page; afs_int32 accesstime; struct buffer *hashNext; *************** *** 1023,1028 **** --- 1031,1040 ---- afs_inode_t inode; /* Unix inode for this chunk */ afs_int32 chunkBytes; /* Num bytes in this chunk */ char states; /* Has this chunk been modified? */ + #if defined(LINUX_USE_FH) + struct fid fh; /* File handle */ + int fh_type; /* File handle type */ + #endif }; #endif Index: openafs/src/afs/afs_analyze.c diff -c openafs/src/afs/afs_analyze.c:1.22.14.9 openafs/src/afs/afs_analyze.c:1.22.14.12 *** openafs/src/afs/afs_analyze.c:1.22.14.9 Fri Aug 22 14:52:57 2008 --- openafs/src/afs/afs_analyze.c Mon Oct 27 19:53:44 2008 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_analyze.c,v 1.22.14.9 2008/08/22 18:52:57 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_analyze.c,v 1.22.14.12 2008/10/27 23:53:44 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 255,275 **** areq->skipserver[i] = 1; } if (tvp->serverHost[i] && ! !(tvp->serverHost[i]->addr->sa_flags & SRVR_ISDOWN)) { areq->skipserver[i] = 1; } } afs_PutVolume(tvp, READ_LOCK); } } ! for (i = 0; i < MAXHOSTS; i++) { ! if (areq->skipserver[i] == 0) { ! serversleft = 1; ! break; ! } ! } ! return serversleft; } --- 255,276 ---- areq->skipserver[i] = 1; } if (tvp->serverHost[i] && ! (tvp->serverHost[i]->addr->sa_flags & SRVR_ISDOWN)) { areq->skipserver[i] = 1; } } afs_PutVolume(tvp, READ_LOCK); + for (i = 0; i < MAXHOSTS; i++) { + if (tvp->serverHost[i] && areq->skipserver[i] == 0) { + serversleft = 1; + break; + } + } + return serversleft; } } ! return 1; } Index: openafs/src/afs/afs_buffer.c diff -c openafs/src/afs/afs_buffer.c:1.22.4.1 openafs/src/afs/afs_buffer.c:1.22.4.3 *** openafs/src/afs/afs_buffer.c:1.22.4.1 Thu Dec 13 14:18:29 2007 --- openafs/src/afs/afs_buffer.c Sat Nov 8 11:34:42 2008 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_buffer.c,v 1.22.4.1 2007/12/13 19:18:29 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_buffer.c,v 1.22.4.3 2008/11/08 16:34:42 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" *************** *** 232,238 **** --- 232,242 ---- MReleaseWriteLock(&tb->lock); return NULL; } + #if defined(LINUX_USE_FH) + tfile = afs_CFileOpen(&adc->f.fh, adc->f.fh_type); + #else tfile = afs_CFileOpen(adc->f.inode); + #endif code = afs_CFileRead(tfile, tb->page * AFS_BUFFER_PAGESIZE, tb->data, AFS_BUFFER_PAGESIZE); *************** *** 344,350 **** if (lp->dirty) { /* see DFlush for rationale for not getting and locking the dcache */ ! tfile = afs_CFileOpen(lp->inode); afs_CFileWrite(tfile, lp->page * AFS_BUFFER_PAGESIZE, lp->data, AFS_BUFFER_PAGESIZE); lp->dirty = 0; --- 348,358 ---- if (lp->dirty) { /* see DFlush for rationale for not getting and locking the dcache */ ! #if defined(LINUX_USE_FH) ! tfile = afs_CFileOpen(&lp->fh, lp->fh_type); ! #else ! tfile = afs_CFileOpen(lp->inode); ! #endif afs_CFileWrite(tfile, lp->page * AFS_BUFFER_PAGESIZE, lp->data, AFS_BUFFER_PAGESIZE); lp->dirty = 0; *************** *** 354,360 **** --- 362,373 ---- /* Now fill in the header. */ lp->fid = adc->index; + #if defined(LINUX_USE_FH) + memcpy(&lp->fh, &adc->f.fh, sizeof(struct fid)); + lp->fh_type = adc->f.fh_type; + #else lp->inode = adc->f.inode; + #endif lp->page = apage; lp->accesstime = timecounter++; FixupBucket(lp); /* move to the right hash bucket */ *************** *** 430,440 **** return AFS_BUFFER_PAGESIZE * bp->page + (int)(((char *)ap) - bp->data); } ! /* 1/1/91 - I've modified the hash function to take the page as well * as the *fid, so that lookup will be a bit faster. That presents some * difficulties for Zap, which now has to have some knowledge of the nature * of the hash function. Oh well. This should use the list traversal * method of DRead... */ void DZap(struct dcache *adc) --- 443,458 ---- return AFS_BUFFER_PAGESIZE * bp->page + (int)(((char *)ap) - bp->data); } ! /*! ! * Zap one dcache entry: destroy one FID's buffers. ! * ! * 1/1/91 - I've modified the hash function to take the page as well * as the *fid, so that lookup will be a bit faster. That presents some * difficulties for Zap, which now has to have some knowledge of the nature * of the hash function. Oh well. This should use the list traversal * method of DRead... + * + * \param adc The dcache entry to be zapped. */ void DZap(struct dcache *adc) *************** *** 486,492 **** --- 504,514 ---- * we cannot lock afs_xdcache). In addition, we cannot obtain * a dcache lock while holding the tb->lock of the same file * since that can deadlock with DRead/DNew */ + #if defined(LINUX_USE_FH) + tfile = afs_CFileOpen(&tb->fh, tb->fh_type); + #else tfile = afs_CFileOpen(tb->inode); + #endif afs_CFileWrite(tfile, tb->page * AFS_BUFFER_PAGESIZE, tb->data, AFS_BUFFER_PAGESIZE); tb->dirty = 0; /* Clear the dirty flag */ Index: openafs/src/afs/afs_cell.c diff -c openafs/src/afs/afs_cell.c:1.34.4.7 openafs/src/afs/afs_cell.c:1.34.4.9 *** openafs/src/afs/afs_cell.c:1.34.4.7 Sun Jan 27 20:39:18 2008 --- openafs/src/afs/afs_cell.c Sat Nov 8 11:34:42 2008 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_cell.c,v 1.34.4.7 2008/01/28 01:39:18 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_cell.c,v 1.34.4.9 2008/11/08 16:34:42 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 50,55 **** --- 50,58 ---- char *cellname; } afsdb_req; + /*! + * Terminate the AFSDB handler, used on shutdown. + */ void afs_StopAFSDB() { *************** *** 61,66 **** --- 64,77 ---- } } + /*! + * \brief Entry point for user-space AFSDB request handler. + * Reads cell data from kerlenMsg and add new cell, or alias. + * \param acellName Cell name. If a cell is found, it's name will be filled in here. + * \param acellNameLen Cell name length. + * \param kernelMsg Buffer containing data about host count, time out, and cell hosts ids. + * \return 0 for success, < 0 for error. + */ int afs_AFSDBHandler(char *acellName, int acellNameLen, afs_int32 * kernelMsg) { *************** *** 135,140 **** --- 146,156 ---- return 0; } + /*! + * \brief Query the AFSDB handler and wait for response. + * \param acellName + * \return 0 for success. < 0 is error. + */ static int afs_GetCellHostsAFSDB(char *acellName) { *************** *** 168,173 **** --- 184,194 ---- } #endif + + /*! + * Look up AFSDB for given cell name and create locally. + * \param acellName Cell name. + */ void afs_LookupAFSDB(char *acellName) { *************** *** 194,204 **** --- 215,237 ---- */ struct cell_name *afs_cellname_head; /* Export for kdump */ + #if defined(LINUX_USE_FH) + struct fid afs_cellname_fh; + int afs_cellname_fh_type; + static int afs_cellname_fh_set; + #else static ino_t afs_cellname_inode; static int afs_cellname_inode_set; + #endif static int afs_cellname_dirty; static afs_int32 afs_cellnum_next; + /*! + * Create a new cell name, optional cell number. + * \param name Name of cell. + * \param cellnum Cellname number. + * \return Initialized structure. + */ static struct cell_name * afs_cellname_new(char *name, afs_int32 cellnum) { *************** *** 220,225 **** --- 253,263 ---- return cn; } + /*! + * Look up a cell name by id. + * \param cellnum + * \return + */ static struct cell_name * afs_cellname_lookup_id(afs_int32 cellnum) { *************** *** 232,237 **** --- 270,280 ---- return NULL; } + /*! + * Look up a cell name. + * \param name Cell name. + * \return + */ static struct cell_name * afs_cellname_lookup_name(char *name) { *************** *** 244,249 **** --- 287,296 ---- return NULL; } + /*! + * Note that this cell name was referenced somewhere. + * \param cn + */ static void afs_cellname_ref(struct cell_name *cn) { *************** *** 253,260 **** --- 300,317 ---- } } + /*! + * \brief Load the list of cells from given inode. + * \param inode Source inode. + * \param lookupcode + * \return 0 for success. < 0 for error. + */ int + #if defined(LINUX_USE_FH) + afs_cellname_init(struct fid *fh, int fh_type, int lookupcode) + #else afs_cellname_init(ino_t inode, int lookupcode) + #endif { struct osi_file *tfile; int cc, off = 0; *************** *** 273,286 **** --- 330,353 ---- return lookupcode; } + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(fh, fh_type); + #else tfile = osi_UFSOpen(inode); + #endif if (!tfile) { ReleaseWriteLock(&afs_xcell); return EIO; } + #if defined(LINUX_USE_FH) + memcpy(&afs_cellname_fh, fh, sizeof(struct fid)); + afs_cellname_fh_type = fh_type; + afs_cellname_fh_set = 1; + #else afs_cellname_inode = inode; afs_cellname_inode_set = 1; + #endif while (1) { afs_int32 cellnum, clen, magic; *************** *** 331,336 **** --- 398,406 ---- return 0; } + /*! + * Write in-kernel list of cells to disk. + */ int afs_cellname_write(void) { *************** *** 338,344 **** --- 408,418 ---- struct cell_name *cn; int off; + #if defined(LINUX_USE_FH) + if (!afs_cellname_dirty || !afs_cellname_fh_set) + #else if (!afs_cellname_dirty || !afs_cellname_inode_set) + #endif return 0; if (afs_initState != 300) return 0; *************** *** 346,352 **** --- 420,430 ---- ObtainWriteLock(&afs_xcell, 693); afs_cellname_dirty = 0; off = 0; + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(&afs_cellname_fh, afs_cellname_fh_type); + #else tfile = osi_UFSOpen(afs_cellname_inode); + #endif if (!tfile) { ReleaseWriteLock(&afs_xcell); return EIO; *************** *** 401,406 **** --- 479,489 ---- static afs_int32 afs_cellalias_index; static int afs_CellOrAliasExists_nl(char *aname); /* Forward declaration */ + /*! + * Look up cell alias by alias name. + * \param alias + * \return Found struct or NULL. + */ static struct cell_alias * afs_FindCellAlias(char *alias) { *************** *** 412,417 **** --- 495,505 ---- return tc; } + /*! + * Get cell alias by index (starting at 0). + * \param index Cell index. + * \return Found struct or null. + */ struct cell_alias * afs_GetCellAlias(int index) { *************** *** 426,437 **** --- 514,537 ---- return tc; } + + /*! + * Put back a cell alias returned by Find or Get. + * \param a Alias. + * \return + */ void afs_PutCellAlias(struct cell_alias *a) { return; } + /*! + * Create new cell alias entry and update dynroot vnode. + * \param alias + * \param cell + * \return + */ afs_int32 afs_NewCellAlias(char *alias, char *cell) { *************** *** 485,490 **** --- 585,594 ---- static char *afs_thiscell; afs_int32 afs_cellindex; /* Export for kdump */ + /*! + * Bump given cell up to the front of the LRU queue. + * \param c Cell to set. + */ static void afs_UpdateCellLRU(struct cell *c) { *************** *** 494,499 **** --- 598,608 ---- ReleaseWriteLock(&afs_xcell); } + /*! + * Look up cell information in AFSDB if timeout expired + * \param ac Cell to be refreshed. + * \return + */ static void afs_RefreshCell(struct cell *ac) { *************** *** 503,508 **** --- 612,625 ---- afs_LookupAFSDB(ac->cellName); } + /*! + * Execute a callback for each existing cell, without a lock on afs_xcell. + * Iterate on CellLRU, and execute a callback for each cell until given arguments are met. + * \see afs_TraverseCells + * \param cb Traversal callback for each cell. + * \param arg Callback arguments. + * \return Found data or NULL. + */ static void * afs_TraverseCells_nl(void *(*cb) (struct cell *, void *), void *arg) { *************** *** 528,533 **** --- 645,657 ---- return ret; } + /*! + * Execute a callback for each existing cell, with a lock on afs_xcell. + * \see afs_TraverseCells_nl + * \param cb Traversal callback for each cell. + * \param arg + * \return Found data or NULL. + */ void * afs_TraverseCells(void *(*cb) (struct cell *, void *), void *arg) { *************** *** 540,545 **** --- 664,675 ---- return ret; } + /*! + * Useful traversal callback: Match by name. + * \param cell + * \param arg Cell name (compared with cell->cellName). + * \return Returns found cell or NULL. + */ static void * afs_choose_cell_by_name(struct cell *cell, void *arg) { *************** *** 551,556 **** --- 681,692 ---- } } + /*! + * Useful traversal callback: Match by handle. + * \param cell + * \param arg Cell handle (compared with cell->cellHandle). + * \return Returns found cell or NULL. + */ static void * afs_choose_cell_by_handle(struct cell *cell, void *arg) { *************** *** 562,591 **** --- 698,759 ---- } } + /*! + * Useful traversal callback: Match by cell number. + * \param cell + * \param arg Cell number (compared with cell->cellNum). + * \return Returns found cell or NULL. + */ static void * afs_choose_cell_by_num(struct cell *cell, void *arg) { return (cell->cellNum == *((afs_int32 *) arg)) ? cell : NULL; } + /*! + * Useful traversal callback: Match by index. + * \param cell + * \param arg Cell index (compared with cell->cellIndex). + * \return Returns found cell or NULL. + */ static void * afs_choose_cell_by_index(struct cell *cell, void *arg) { return (cell->cellIndex == *((afs_int32 *) arg)) ? cell : NULL; } + /*! + * Return a cell with a given name, if it exists. No lock version. + * Does not check AFSDB. + * \param acellName Cell name. + * \param locktype Type of lock to be used (not used). + * \return + */ static struct cell * afs_FindCellByName_nl(char *acellName, afs_int32 locktype) { return afs_TraverseCells_nl(&afs_choose_cell_by_name, acellName); } + /*! + * Return a cell with a given name, if it exists.It uses locks. + * Does not check AFSDB. + * \param acellName Cell name. + * \param locktype Type of lock to be used. + * \return + */ static struct cell * afs_FindCellByName(char *acellName, afs_int32 locktype) { return afs_TraverseCells(&afs_choose_cell_by_name, acellName); } + /*! + * Same as FindCellByName but tries AFSDB if not found. + * \param acellName Cell name. + * \param locktype Type of lock to be used. + * \return + */ struct cell * afs_GetCellByName(char *acellName, afs_int32 locktype) { *************** *** 605,610 **** --- 773,784 ---- return tc; } + /*! + * Return a cell with a given cell number. + * \param cellnum Cell number. + * \param locktype Lock to be used. + * \return + */ struct cell * afs_GetCell(afs_int32 cellnum, afs_int32 locktype) { *************** *** 624,629 **** --- 798,809 ---- return tc; } + /*! + * Same as GetCell, but does not try to refresh the data. + * \param cellnum Cell number. + * \param locktype What lock should be used. + * \return + */ struct cell * afs_GetCellStale(afs_int32 cellnum, afs_int32 locktype) { *************** *** 637,642 **** --- 817,828 ---- return tc; } + /*! + * Return a cell with a given index number (starting at 0). Update CellLRU as well. + * \param index + * \param locktype Type of lock used. + * \return + */ struct cell * afs_GetCellByIndex(afs_int32 index, afs_int32 locktype) { *************** *** 648,653 **** --- 834,845 ---- return tc; } + /*! + * Return a cell with a given handle.. + * \param index + * \param locktype Type of lock used. + * \return + */ struct cell * afs_GetCellByHandle(void *handle, afs_int32 locktype) { *************** *** 659,670 **** --- 851,872 ---- return tc; } + /*! + * Return primary cell, if any. + * \param locktype Type of lock used. + * \return + */ struct cell * afs_GetPrimaryCell(afs_int32 locktype) { return afs_GetCellByName(afs_thiscell, locktype); } + /*! + * Returns true if the given cell is the primary cell. + * \param cell + * \return + */ int afs_IsPrimaryCell(struct cell *cell) { *************** *** 682,687 **** --- 884,894 ---- } } + /*! + * Returns afs_IsPrimaryCell(afs_GetCell(cellnum)). + * \param cellnum + * \return + */ int afs_IsPrimaryCellNum(afs_int32 cellnum) { *************** *** 697,702 **** --- 904,914 ---- return primary; } + /*! + * Set the primary cell name to the given cell name. + * \param acellName Cell name. + * \return 0 for success, < 0 for error. + */ afs_int32 afs_SetPrimaryCell(char *acellName) { *************** *** 708,713 **** --- 920,936 ---- return 0; } + /*! + * Create or update a cell entry. + * \param acellName Name of cell. + * \param acellHosts Array of hosts that this cell has. + * \param aflags Cell flags. + * \param linkedcname + * \param fsport File server port. + * \param vlport Volume server port. + * \param timeout Cell timeout value, 0 means static AFSDB entry. + * \return + */ afs_int32 afs_NewCell(char *acellName, afs_int32 * acellHosts, int aflags, char *linkedcname, u_short fsport, u_short vlport, int timeout) *************** *** 780,788 **** } tc->states |= aflags; tc->timeout = timeout; ! memset((char *)tc->cellHosts, 0, sizeof(tc->cellHosts)); for (i = 0; i < MAXCELLHOSTS; i++) { struct server *ts; afs_uint32 temp = acellHosts[i]; if (!temp) --- 1003,1012 ---- } tc->states |= aflags; tc->timeout = timeout; ! memset((char *)tc->cellHosts, 0, sizeof(tc->cellHosts)); for (i = 0; i < MAXCELLHOSTS; i++) { + /* Get server for each host and link this cell in.*/ struct server *ts; afs_uint32 temp = acellHosts[i]; if (!temp) *************** *** 790,800 **** ts = afs_GetServer(&temp, 1, 0, tc->vlport, WRITE_LOCK, NULL, 0); ts->cell = tc; ts->flags &= ~SRVR_ISGONE; tc->cellHosts[i] = ts; afs_PutServer(ts, WRITE_LOCK); } afs_SortServers(tc->cellHosts, MAXCELLHOSTS); /* randomize servers */ ! if (newc) { struct cell_name *cn; --- 1014,1026 ---- ts = afs_GetServer(&temp, 1, 0, tc->vlport, WRITE_LOCK, NULL, 0); ts->cell = tc; ts->flags &= ~SRVR_ISGONE; + /* Set the server as a host of the new cell. */ tc->cellHosts[i] = ts; afs_PutServer(ts, WRITE_LOCK); } afs_SortServers(tc->cellHosts, MAXCELLHOSTS); /* randomize servers */ ! ! /* New cell: Build and add to LRU cell queue. */ if (newc) { struct cell_name *cn; *************** *** 836,841 **** --- 1062,1070 ---- * afs_CellNumValid: check if a cell number is valid (also set the used flag) */ + /*! + * Perform whatever initialization is necessary. + */ void afs_CellInit() { *************** *** 850,855 **** --- 1079,1087 ---- afs_cellalias_index = 0; } + /*! + * Called on shutdown, should deallocate memory, etc. + */ void shutdown_cell() { *************** *** 880,885 **** --- 1112,1122 ---- } } + /*! + * Remove a server from a cell's server list. + * \param srvp Server to be removed. + * \return + */ void afs_RemoveCellEntry(struct server *srvp) { *************** *** 908,913 **** --- 1145,1155 ---- ReleaseWriteLock(&tc->lock); } + /*! + * Check if the given name exists as a cell or alias. Does not lock afs_xcell. + * \param aname + * \return + */ static int afs_CellOrAliasExists_nl(char *aname) { *************** *** 929,934 **** --- 1171,1181 ---- return 0; } + /*! + * Check if the given name exists as a cell or alias. Locks afs_xcell. + * \param aname + * \return + */ int afs_CellOrAliasExists(char *aname) { *************** *** 941,946 **** --- 1188,1198 ---- return ret; } + /*! + * Check if a cell number is valid (also set the used flag). + * \param cellnum + * \return 1 - true, 0 - false + */ int afs_CellNumValid(afs_int32 cellnum) { Index: openafs/src/afs/afs_chunkops.h diff -c openafs/src/afs/afs_chunkops.h:1.7 openafs/src/afs/afs_chunkops.h:1.7.4.1 *** openafs/src/afs/afs_chunkops.h:1.7 Wed Aug 17 12:16:50 2005 --- openafs/src/afs/afs_chunkops.h Sat Nov 8 11:34:42 2008 *************** *** 55,62 **** --- 55,66 ---- #if defined(AFS_SUN57_64BIT_ENV) || defined(AFS_SGI62_ENV) void *(*open) (ino_t ainode); #else + #if defined(LINUX_USE_FH) + void *(*open) (struct fid *fh, int fh_type); + #else void *(*open) (afs_int32 ainode); #endif + #endif int (*truncate) (struct osi_file * fp, afs_int32 len); int (*fread) (struct osi_file * fp, int offset, void *buf, afs_int32 len); int (*fwrite) (struct osi_file * fp, afs_int32 offset, void *buf, *************** *** 84,90 **** --- 88,98 ---- }; /* Ideally we should have used consistent naming - like COP_OPEN, COP_TRUNCATE, etc. */ + #if defined(LINUX_USE_FH) + #define afs_CFileOpen(fh, fh_type) (void *)(*(afs_cacheType->open))(fh, fh_type) + #else #define afs_CFileOpen(inode) (void *)(*(afs_cacheType->open))(inode) + #endif #define afs_CFileTruncate(handle, size) (*(afs_cacheType->truncate))((handle), size) #define afs_CFileRead(file, offset, data, size) (*(afs_cacheType->fread))(file, offset, data, size) #define afs_CFileWrite(file, offset, data, size) (*(afs_cacheType->fwrite))(file, offset, data, size) Index: openafs/src/afs/afs_conn.c diff -c openafs/src/afs/afs_conn.c:1.14.8.4 openafs/src/afs/afs_conn.c:1.14.8.7 *** openafs/src/afs/afs_conn.c:1.14.8.4 Mon Sep 22 15:29:54 2008 --- openafs/src/afs/afs_conn.c Mon Oct 20 12:40:48 2008 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_conn.c,v 1.14.8.4 2008/09/22 19:29:54 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_conn.c,v 1.14.8.7 2008/10/20 16:40:48 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 52,57 **** --- 52,68 ---- unsigned int VNOSERVERS = 0; + + /** + * Try setting up a connection to the server containing the specified fid. + * Gets the volume, checks if it's up and does the connection by server address. + * + * @param afid + * @param areq Request filled in by the caller. + * @param locktype Type of lock that will be used. + * + * @return The conn struct, or NULL. + */ struct conn * afs_Conn(register struct VenusFid *afid, register struct vrequest *areq, afs_int32 locktype) *************** *** 66,71 **** --- 77,83 ---- struct srvAddr *sa1p; AFS_STATCNT(afs_Conn); + /* Get fid's volume. */ tv = afs_GetVolume(afid, areq, READ_LOCK); if (!tv) { if (areq) { *************** *** 132,137 **** --- 144,162 ---- } /*afs_Conn */ + /** + * Connects to a server by it's server address. + * + * @param sap Server address. + * @param aport Server port. + * @param acell + * @param tu Connect as this user. + * @param force_if_down + * @param create + * @param locktype Specifies type of lock to be used for this function. + * + * @return The new connection. + */ struct conn * afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell, struct unixuser *tu, int force_if_down, afs_int32 create, *************** *** 148,153 **** --- 173,179 ---- } ObtainSharedLock(&afs_xconn, 15); + /* Get conn by port and user. */ for (tc = sap->conns; tc; tc = tc->next) { if (tc->user == tu && tc->port == aport) { break; *************** *** 155,160 **** --- 181,187 ---- } if (!tc && !create) { + /* Not found and can't create a new one. */ ReleaseSharedLock(&afs_xconn); return NULL; } *************** *** 187,193 **** afs_ActivateServer(sap); ConvertWToSLock(&afs_xconn); ! } tc->refCount++; if (tu->states & UTokensBad) { --- 214,220 ---- afs_ActivateServer(sap); ConvertWToSLock(&afs_xconn); ! } /* end of if (!tc) */ tc->refCount++; if (tu->states & UTokensBad) { *************** *** 251,270 **** if (csec) rxs_Release(csec); ConvertWToSLock(&afs_xconn); ! } ReleaseSharedLock(&afs_xconn); return tc; } ! /* ! * afs_ConnByHost ! * * forceConnectFS is set whenever we must recompute the connection. UTokensBad * is true only if we know that the tokens are bad. We thus clear this flag * when we get a new set of tokens.. * Having force... true and UTokensBad true simultaneously means that the tokens * went bad and we're supposed to create a new, unauthenticated, connection. */ struct conn * afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell, --- 278,304 ---- if (csec) rxs_Release(csec); ConvertWToSLock(&afs_xconn); ! } /* end of if (tc->forceConnectFS)*/ ReleaseSharedLock(&afs_xconn); return tc; } ! /** * forceConnectFS is set whenever we must recompute the connection. UTokensBad * is true only if we know that the tokens are bad. We thus clear this flag * when we get a new set of tokens.. * Having force... true and UTokensBad true simultaneously means that the tokens * went bad and we're supposed to create a new, unauthenticated, connection. + * + * @param aserver Server to connect to. + * @param aport Connection port. + * @param acell The cell where all of this happens. + * @param areq The request. + * @param aforce Force connection? + * @param locktype Type of lock to be used. + * + * @return The established connection. */ struct conn * afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell, *************** *** 313,318 **** --- 347,364 ---- } /*afs_ConnByHost */ + /** + * Connect by multiple hosts. + * Try to connect to one of the hosts from the ahosts array. + * + * @param ahosts Multiple hosts to connect to. + * @param aport Connection port. + * @param acell The cell where all of this happens. + * @param areq The request. + * @param locktype Type of lock to be used. + * + * @return The established connection or NULL. + */ struct conn * afs_ConnByMHosts(struct server *ahosts[], unsigned short aport, afs_int32 acell, register struct vrequest *areq, *************** *** 337,342 **** --- 383,393 ---- } /*afs_ConnByMHosts */ + /** + * Decrement reference count to this connection. + * @param ac + * @param locktype + */ void afs_PutConn(register struct conn *ac, afs_int32 locktype) { *************** *** 345,354 **** } /*afs_PutConn */ ! /* for multi homed clients, an RPC may timeout because of a ! client network interface going down. We need to reopen new ! connections in this case ! */ void ForceNewConnections(struct srvAddr *sap) { --- 396,408 ---- } /*afs_PutConn */ ! /** ! * For multi homed clients, a RPC may timeout because of a ! * client network interface going down. We need to reopen new ! * connections in this case. ! * ! * @param sap Server address. ! */ void ForceNewConnections(struct srvAddr *sap) { Index: openafs/src/afs/afs_dcache.c diff -c openafs/src/afs/afs_dcache.c:1.64.4.11 openafs/src/afs/afs_dcache.c:1.64.4.13 *** openafs/src/afs/afs_dcache.c:1.64.4.11 Mon Sep 22 15:35:26 2008 --- openafs/src/afs/afs_dcache.c Sat Nov 8 11:34:42 2008 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.64.4.11 2008/09/22 19:35:26 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.64.4.13 2008/11/08 16:34:42 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 38,85 **** * --------------------- Exported definitions --------------------- */ /* For split cache */ ! afs_int32 afs_blocksUsed_0; /*1K blocks in cache - in theory is zero */ ! afs_int32 afs_blocksUsed_1; /*1K blocks in cache */ ! afs_int32 afs_blocksUsed_2; /*1K blocks in cache */ afs_int32 afs_pct1 = -1; afs_int32 afs_pct2 = -1; afs_uint32 afs_tpct1 = 0; afs_uint32 afs_tpct2 = 0; afs_uint32 splitdcache = 0; ! afs_lock_t afs_xdcache; /*Lock: alloc new disk cache entries */ ! afs_int32 afs_freeDCList; /*Free list for disk cache entries */ ! afs_int32 afs_freeDCCount; /*Count of elts in freeDCList */ ! afs_int32 afs_discardDCList; /*Discarded disk cache entries */ ! afs_int32 afs_discardDCCount; /*Count of elts in discardDCList */ ! struct dcache *afs_freeDSList; /*Free list for disk slots */ ! struct dcache *afs_Initial_freeDSList; /*Initial list for above */ ! ino_t cacheInode; /*Inode for CacheItems file */ ! struct osi_file *afs_cacheInodep = 0; /* file for CacheItems inode */ ! struct afs_q afs_DLRU; /*dcache LRU */ afs_int32 afs_dhashsize = 1024; ! afs_int32 *afs_dvhashTbl; /*Data cache hash table */ ! afs_int32 *afs_dchashTbl; /*Data cache hash table */ ! afs_int32 *afs_dvnextTbl; /*Dcache hash table links */ ! afs_int32 *afs_dcnextTbl; /*Dcache hash table links */ ! struct dcache **afs_indexTable; /*Pointers to dcache entries */ ! afs_hyper_t *afs_indexTimes; /*Dcache entry Access times */ ! afs_int32 *afs_indexUnique; /*dcache entry Fid.Unique */ ! unsigned char *afs_indexFlags; /*(only one) Is there data there? */ ! afs_hyper_t afs_indexCounter; /*Fake time for marking index * entries */ ! afs_int32 afs_cacheFiles = 0; /*Size of afs_indexTable */ ! afs_int32 afs_cacheBlocks; /*1K blocks in cache */ ! afs_int32 afs_cacheStats; /*Stat entries in cache */ ! afs_int32 afs_blocksUsed; /*Number of blocks in use */ ! afs_int32 afs_blocksDiscarded; /*Blocks freed but not truncated */ ! afs_int32 afs_fsfragsize = 1023; /*Underlying Filesystem minimum unit *of disk allocation usually 1K *this value is (truefrag -1 ) to *save a bunch of subtracts... */ #ifdef AFS_64BIT_CLIENT #ifdef AFS_VM_RDWR_ENV ! afs_size_t afs_vmMappingEnd; /* for large files (>= 2GB) the VM * mapping an 32bit addressing machines * can only be used below the 2 GB * line. From this point upwards we --- 38,90 ---- * --------------------- Exported definitions --------------------- */ /* For split cache */ ! afs_int32 afs_blocksUsed_0; /*!< 1K blocks in cache - in theory is zero */ ! afs_int32 afs_blocksUsed_1; /*!< 1K blocks in cache */ ! afs_int32 afs_blocksUsed_2; /*!< 1K blocks in cache */ afs_int32 afs_pct1 = -1; afs_int32 afs_pct2 = -1; afs_uint32 afs_tpct1 = 0; afs_uint32 afs_tpct2 = 0; afs_uint32 splitdcache = 0; ! afs_lock_t afs_xdcache; /*!< Lock: alloc new disk cache entries */ ! afs_int32 afs_freeDCList; /*!< Free list for disk cache entries */ ! afs_int32 afs_freeDCCount; /*!< Count of elts in freeDCList */ ! afs_int32 afs_discardDCList; /*!< Discarded disk cache entries */ ! afs_int32 afs_discardDCCount; /*!< Count of elts in discardDCList */ ! struct dcache *afs_freeDSList; /*!< Free list for disk slots */ ! struct dcache *afs_Initial_freeDSList; /*!< Initial list for above */ ! #if defined(LINUX_USE_FH) ! struct fid cacheitems_fh; ! int cacheitems_fh_type; ! #else ! ino_t cacheInode; /*!< Inode for CacheItems file */ ! #endif ! struct osi_file *afs_cacheInodep = 0; /*!< file for CacheItems inode */ ! struct afs_q afs_DLRU; /*!< dcache LRU */ afs_int32 afs_dhashsize = 1024; ! afs_int32 *afs_dvhashTbl; /*!< Data cache hash table: hashed by FID + chunk number. */ ! afs_int32 *afs_dchashTbl; /*!< Data cache hash table: hashed by FID. */ ! afs_int32 *afs_dvnextTbl; /*!< Dcache hash table links */ ! afs_int32 *afs_dcnextTbl; /*!< Dcache hash table links */ ! struct dcache **afs_indexTable; /*!< Pointers to dcache entries */ ! afs_hyper_t *afs_indexTimes; /*!< Dcache entry Access times */ ! afs_int32 *afs_indexUnique; /*!< dcache entry Fid.Unique */ ! unsigned char *afs_indexFlags; /*!< (only one) Is there data there? */ ! afs_hyper_t afs_indexCounter; /*!< Fake time for marking index * entries */ ! afs_int32 afs_cacheFiles = 0; /*!< Size of afs_indexTable */ ! afs_int32 afs_cacheBlocks; /*!< 1K blocks in cache */ ! afs_int32 afs_cacheStats; /*!< Stat entries in cache */ ! afs_int32 afs_blocksUsed; /*!< Number of blocks in use */ ! afs_int32 afs_blocksDiscarded; /*!= 2GB) the VM * mapping an 32bit addressing machines * can only be used below the 2 GB * line. From this point upwards we *************** *** 96,109 **** int afs_TruncateDaemonRunning = 0; int afs_CacheTooFull = 0; ! afs_int32 afs_dcentries; /* In-memory dcache entries */ int dcacheDisabled = 0; static int afs_UFSCacheFetchProc(), afs_UFSCacheStoreProc(); struct afs_cacheOps afs_UfsCacheOps = { osi_UFSOpen, osi_UFSTruncate, afs_osi_Read, afs_osi_Write, --- 101,118 ---- int afs_TruncateDaemonRunning = 0; int afs_CacheTooFull = 0; ! afs_int32 afs_dcentries; /*!< In-memory dcache entries */ int dcacheDisabled = 0; static int afs_UFSCacheFetchProc(), afs_UFSCacheStoreProc(); struct afs_cacheOps afs_UfsCacheOps = { + #if defined(LINUX_USE_FH) + osi_UFSOpen_fh, + #else osi_UFSOpen, + #endif osi_UFSTruncate, afs_osi_Read, afs_osi_Write, *************** *** 135,140 **** --- 144,156 ---- int cacheDiskType; /*Type of backing disk for cache */ struct afs_cacheOps *afs_cacheType; + /*! + * Where is this vcache's entry associated dcache located/ + * \param avc The vcache entry. + * \return Bucket index: + * 1 : main + * 2 : RO + */ static afs_int32 afs_DCGetBucket(struct vcache *avc) { *************** *** 153,158 **** --- 169,182 ---- return 1; } + /*! + * Readjust a dcache's size. + * + * \param adc The dcache to be adjusted. + * \param oldSize Old size for the dcache. + * \param newSize The new size to be adjusted to. + * + */ static void afs_DCAdjustSize(struct dcache *adc, afs_int32 oldSize, afs_int32 newSize) { *************** *** 180,191 **** --- 204,224 ---- return; } + /*! + * Move a dcache from one bucket to another. + * + * \param adc Operate on this dcache. + * \param size Size in bucket (?). + * \param newBucket Destination bucket. + * + */ static void afs_DCMoveBucket(struct dcache *adc, afs_int32 size, afs_int32 newBucket) { if (!splitdcache) return; + /* Substract size from old bucket. */ switch (adc->bucket) { case 0: *************** *** 199,204 **** --- 232,238 ---- break; } + /* Set new bucket and increase destination bucket size. */ adc->bucket = newBucket; switch (adc->bucket) *************** *** 217,228 **** --- 251,270 ---- return; } + /*! + * Init split caches size. + */ static void afs_DCSizeInit(void) { afs_blocksUsed_0 = afs_blocksUsed_1 = afs_blocksUsed_2 = 0; } + + /*! + * \param phase + * \param bucket + */ static afs_int32 afs_DCWhichBucket(afs_int32 phase, afs_int32 bucket) { *************** *** 244,264 **** } ! /* ! * afs_StoreWarn * ! * Description: ! * Warn about failing to store a file. * ! * Parameters: ! * acode : Associated error code. ! * avolume : Volume involved. ! * aflags : How to handle the output: ! * aflags & 1: Print out on console ! * aflags & 2: Print out on controlling tty ! * ! * Environment: ! * Call this from close call when vnodeops is RCS unlocked. */ void --- 286,301 ---- } ! /*! ! * Warn about failing to store a file. * ! * \param acode Associated error code. ! * \param avolume Volume involved. ! * \param aflags How to handle the output: ! * aflags & 1: Print out on console ! * aflags & 2: Print out on controlling tty * ! * \note Environment: Call this from close call when vnodeops is RCS unlocked. */ void *************** *** 316,321 **** --- 353,361 ---- } } /*afs_StoreWarn */ + /*! + * Try waking up truncation daemon, if it's worth it. + */ void afs_MaybeWakeupTruncateDaemon(void) { *************** *** 329,335 **** } } ! /* Keep statistics on run time for afs_CacheTruncateDaemon. This is a * struct so we need only export one symbol for AIX. */ static struct CTD_stats { --- 369,378 ---- } } ! /*! ! * /struct CTD_stats ! * ! * Keep statistics on run time for afs_CacheTruncateDaemon. This is a * struct so we need only export one symbol for AIX. */ static struct CTD_stats { *************** *** 341,346 **** --- 384,395 ---- } CTD_stats; u_int afs_min_cache = 0; + + /*! + * Keeps the cache clean and free by truncating uneeded files, when used. + * \param + * \return + */ void afs_CacheTruncateDaemon(void) { *************** *** 374,380 **** } if (!afs_CacheIsTooFull()) afs_CacheTooFull = 0; ! } MReleaseWriteLock(&afs_xdcache); /* --- 423,429 ---- } if (!afs_CacheIsTooFull()) afs_CacheTooFull = 0; ! } /* end of cache cleanup */ MReleaseWriteLock(&afs_xdcache); /* *************** *** 431,450 **** } ! /* ! * afs_AdjustSize ! * ! * Description: ! * Make adjustment for the new size in the disk cache entry * ! * Major Assumptions Here: * Assumes that frag size is an integral power of two, less one, * and that this is a two's complement machine. I don't * know of any filesystems which violate this assumption... * ! * Parameters: ! * adc : Ptr to dcache entry. ! * anewsize : New size desired. */ void --- 480,496 ---- } ! /*! ! * Make adjustment for the new size in the disk cache entry * ! * \note Major Assumptions Here: * Assumes that frag size is an integral power of two, less one, * and that this is a two's complement machine. I don't * know of any filesystems which violate this assumption... * ! * \param adc Ptr to dcache entry. ! * \param anewsize New size desired. ! * */ void *************** *** 471,488 **** } ! /* ! * afs_GetDownD ! * ! * Description: ! * This routine is responsible for moving at least one entry (but up ! * to some number of them) from the LRU queue to the free queue. * ! * Parameters: ! * anumber : Number of entries that should ideally be moved. ! * aneedSpace : How much space we need (1K blocks); * ! * Environment: * The anumber parameter is just a hint; at least one entry MUST be * moved, or we'll panic. We must be called with afs_xdcache * write-locked. We should try to satisfy both anumber and aneedspace, --- 517,530 ---- } ! /*! ! * This routine is responsible for moving at least one entry (but up ! * to some number of them) from the LRU queue to the free queue. * ! * \param anumber Number of entries that should ideally be moved. ! * \param aneedSpace How much space we need (1K blocks); * ! * \note Environment: * The anumber parameter is just a hint; at least one entry MUST be * moved, or we'll panic. We must be called with afs_xdcache * write-locked. We should try to satisfy both anumber and aneedspace, *************** *** 491,497 **** * the whole set of MAXATONCE. * 2. dynamically choose MAXATONCE to reflect severity of * demand: something like (*aneedSpace >> (logChunk - 9)) ! * N.B. if we're called with aneedSpace <= 0 and anumber > 0, that * indicates that the cache is not properly configured/tuned or * something. We should be able to automatically correct that problem. */ --- 533,540 ---- * the whole set of MAXATONCE. * 2. dynamically choose MAXATONCE to reflect severity of * demand: something like (*aneedSpace >> (logChunk - 9)) ! * ! * \note N.B. if we're called with aneedSpace <= 0 and anumber > 0, that * indicates that the cache is not properly configured/tuned or * something. We should be able to automatically correct that problem. */ *************** *** 793,799 **** } } afs_PutDCache(tdc); ! } if (phase < 5) { /* Phase is 0 and no one was found, so try phase 1 (ignore --- 836,842 ---- } } afs_PutDCache(tdc); ! } /* end of for victims loop */ if (phase < 5) { /* Phase is 0 and no one was found, so try phase 1 (ignore *************** *** 820,833 **** } /*afs_GetDownD */ ! /* ! * Description: remove adc from any hash tables that would allow it to be located * again by afs_FindDCache or afs_GetDCache. * ! * Parameters: adc -- pointer to dcache entry to remove from hash tables. ! * zap -- zap the given dcache ? * - * Locks: Must have the afs_xdcache lock write-locked to call this function. */ int afs_HashOutDCache(struct dcache *adc, int zap) --- 863,876 ---- } /*afs_GetDownD */ ! /*! ! * Remove adc from any hash tables that would allow it to be located * again by afs_FindDCache or afs_GetDCache. * ! * \param adc Pointer to dcache entry to remove from hash tables. ! * ! * \note Locks: Must have the afs_xdcache lock write-locked to call this function. * */ int afs_HashOutDCache(struct dcache *adc, int zap) *************** *** 895,915 **** return 0; } /*afs_HashOutDCache */ ! /* ! * afs_FlushDCache ! * ! * Description: ! * Flush the given dcache entry, pulling it from hash chains ! * and truncating the associated cache file. * ! * Arguments: ! * adc: Ptr to dcache entry to flush. * ! * Environment: * This routine must be called with the afs_xdcache lock held ! * (in write mode) */ - void afs_FlushDCache(register struct dcache *adc) { --- 938,953 ---- return 0; } /*afs_HashOutDCache */ ! /*! ! * Flush the given dcache entry, pulling it from hash chains ! * and truncating the associated cache file. * ! * \param adc Ptr to dcache entry to flush. * ! * \note Environment: * This routine must be called with the afs_xdcache lock held ! * (in write mode). */ void afs_FlushDCache(register struct dcache *adc) { *************** *** 944,957 **** } /*afs_FlushDCache */ ! /* ! * afs_FreeDCache ! * ! * Description: put a dcache entry on the free dcache entry list. * ! * Parameters: adc -- dcache entry to free * ! * Environment: called with afs_xdcache lock write-locked. */ static void afs_FreeDCache(register struct dcache *adc) --- 982,993 ---- } /*afs_FlushDCache */ ! /*! ! * Put a dcache entry on the free dcache entry list. * ! * \param adc dcache entry to free. * ! * \note Environment: called with afs_xdcache lock write-locked. */ static void afs_FreeDCache(register struct dcache *adc) *************** *** 974,998 **** afs_osi_Wakeup(&afs_WaitForCacheDrain); } } ! } ! /* ! * afs_DiscardDCache ! * ! * Description: ! * Discard the cache element by moving it to the discardDCList. ! * This puts the cache element into a quasi-freed state, where ! * the space may be reused, but the file has not been truncated. * ! * Major Assumptions Here: * Assumes that frag size is an integral power of two, less one, * and that this is a two's complement machine. I don't * know of any filesystems which violate this assumption... * ! * Parameters: ! * adc : Ptr to dcache entry. * ! * Environment: * Must be called with afs_xdcache write-locked. */ --- 1010,1030 ---- afs_osi_Wakeup(&afs_WaitForCacheDrain); } } ! } /* afs_FreeDCache */ ! /*! ! * Discard the cache element by moving it to the discardDCList. ! * This puts the cache element into a quasi-freed state, where ! * the space may be reused, but the file has not been truncated. * ! * \note Major Assumptions Here: * Assumes that frag size is an integral power of two, less one, * and that this is a two's complement machine. I don't * know of any filesystems which violate this assumption... * ! * \param adr Ptr to dcache entry. * ! * \note Environment: * Must be called with afs_xdcache write-locked. */ *************** *** 1027,1037 **** } /*afs_DiscardDCache */ ! /* ! * afs_FreeDiscardedDCache ! * ! * Description: ! * Free the next element on the list of discarded cache elements. */ static void afs_FreeDiscardedDCache(void) --- 1059,1066 ---- } /*afs_DiscardDCache */ ! /*! ! * Free the next element on the list of discarded cache elements. */ static void afs_FreeDiscardedDCache(void) *************** *** 1068,1074 **** --- 1097,1107 ---- /* * Truncate the element to reclaim its space */ + #if defined(LINUX_USE_FH) + tfile = afs_CFileOpen(&tdc->f.fh, tdc->f.fh_type); + #else tfile = afs_CFileOpen(tdc->f.inode); + #endif afs_CFileTruncate(tfile, 0); afs_CFileClose(tfile); afs_AdjustSize(tdc, 0); *************** *** 1086,1100 **** MReleaseWriteLock(&afs_xdcache); } ! /* ! * afs_MaybeFreeDiscardedDCache ! * ! * Description: ! * Free as many entries from the list of discarded cache elements ! * as we need to get the free space down below CM_WAITFORDRAINPCT (98%). * ! * Parameters: ! * None */ int afs_MaybeFreeDiscardedDCache(void) --- 1119,1129 ---- MReleaseWriteLock(&afs_xdcache); } ! /*! ! * Free as many entries from the list of discarded cache elements ! * as we need to get the free space down below CM_WAITFORDRAINPCT (98%). * ! * \return 0 */ int afs_MaybeFreeDiscardedDCache(void) *************** *** 1110,1126 **** return 0; } ! /* ! * afs_GetDownDSlot ! * ! * Description: ! * Try to free up a certain number of disk slots. * ! * Parameters: ! * anumber : Targeted number of disk slots to free up. * ! * Environment: * Must be called with afs_xdcache write-locked. */ static void afs_GetDownDSlot(int anumber) --- 1139,1152 ---- return 0; } ! /*! ! * Try to free up a certain number of disk slots. * ! * \param anumber Targeted number of disk slots to free up. * ! * \note Environment: * Must be called with afs_xdcache write-locked. + * */ static void afs_GetDownDSlot(int anumber) *************** *** 1703,1709 **** --- 1729,1739 ---- afs_stats_cmperf.cacheBlocksDiscarded = afs_blocksDiscarded; if (lock & 2) { /* Truncate the chunk so zeroes get filled properly */ + #if defined(LINUX_USE_FH) + file = afs_CFileOpen(&tdc->f.fh, tdc->f.fh_type); + #else file = afs_CFileOpen(tdc->f.inode); + #endif afs_CFileTruncate(file, 0); afs_CFileClose(file); afs_AdjustSize(tdc, 0); *************** *** 2121,2127 **** --- 2151,2161 ---- /* no data in file to read at this position */ UpgradeSToWLock(&tdc->lock, 607); + #if defined(LINUX_USE_FH) + file = afs_CFileOpen(&tdc->f.fh, tdc->f.fh_type); + #else file = afs_CFileOpen(tdc->f.inode); + #endif afs_CFileTruncate(file, 0); afs_CFileClose(file); afs_AdjustSize(tdc, 0); *************** *** 2308,2314 **** --- 2342,2352 ---- * fetch the whole file. */ DZap(tdc); /* pages in cache may be old */ + #if defined(LINUX_USE_FH) + file = afs_CFileOpen(&tdc->f.fh, tdc->f.fh_type); + #else file = afs_CFileOpen(tdc->f.inode); + #endif afs_RemoveVCB(&avc->fid); tdc->f.states |= DWriting; tdc->dflags |= DFFetching; *************** *** 3188,3205 **** ! /* ! * afs_WriteDCache ! * ! * Description: ! * write a particular dcache entry back to its home in the ! * CacheInfo file. * ! * Parameters: ! * adc : Pointer to the dcache entry to write. ! * atime : If true, set the modtime on the file to the current time. * ! * Environment: * Must be called with the afs_xdcache lock at least read-locked, * and dcache entry at least read-locked. * The reference count is not changed. --- 3226,3239 ---- ! /*! ! * Write a particular dcache entry back to its home in the ! * CacheInfo file. * ! * \param adc Pointer to the dcache entry to write. ! * \param atime If true, set the modtime on the file to the current time. * ! * \note Environment: * Must be called with the afs_xdcache lock at least read-locked, * and dcache entry at least read-locked. * The reference count is not changed. *************** *** 3232,3251 **** ! /* ! * afs_wakeup ! * ! * Description: ! * Wake up users of a particular file waiting for stores to take ! * place. * ! * Parameters: ! * avc : Ptr to related vcache entry. * ! * Environment: * Nothing interesting. */ - int afs_wakeup(register struct vcache *avc) { --- 3266,3280 ---- ! /*! ! * Wake up users of a particular file waiting for stores to take ! * place. * ! * \param avc Ptr to related vcache entry. * ! * \note Environment: * Nothing interesting. */ int afs_wakeup(register struct vcache *avc) { *************** *** 3281,3302 **** } ! /* ! * afs_InitCacheFile ! * ! * Description: ! * Given a file name and inode, set up that file to be an ! * active member in the AFS cache. This also involves checking ! * the usability of its data. * ! * Parameters: ! * afile : Name of the cache file to initialize. ! * ainode : Inode of the file. * ! * Environment: * This function is called only during initialization. */ - int afs_InitCacheFile(char *afile, ino_t ainode) { --- 3310,3326 ---- } ! /*! ! * Given a file name and inode, set up that file to be an ! * active member in the AFS cache. This also involves checking ! * the usability of its data. * ! * \param afile Name of the cache file to initialize. ! * \param ainode Inode of the file. * ! * \note Environment: * This function is called only during initialization. */ int afs_InitCacheFile(char *afile, ino_t ainode) { *************** *** 3311,3316 **** --- 3335,3343 ---- struct osi_file *tfile; struct osi_stat tstat; register struct dcache *tdc; + #if defined(LINUX_USE_FH) + int max_len = sizeof(struct fid); + #endif AFS_STATCNT(afs_InitCacheFile); index = afs_stats_cmperf.cacheNumEntries; *************** *** 3338,3345 **** * UFS file system, and just record the inode number. */ #ifdef AFS_LINUX22_ENV ! tdc->f.inode = VTOI(filevp->d_inode)->i_number; ! dput(filevp); #else tdc->f.inode = afs_vnodeToInumber(filevp); AFS_RELE(filevp); --- 3365,3375 ---- * UFS file system, and just record the inode number. */ #ifdef AFS_LINUX22_ENV ! #if defined(LINUX_USE_FH) ! tdc->f.fh_type = osi_get_fh(filevp, &tdc->f.fh, &max_len); ! #else ! tdc->f.inode = VTOI(filevp->d_inode)->i_number; ! #endif #else tdc->f.inode = afs_vnodeToInumber(filevp); AFS_RELE(filevp); *************** *** 3350,3356 **** fileIsBad = 0; if ((tdc->f.states & DWriting) || tdc->f.fid.Fid.Volume == 0) fileIsBad = 1; ! tfile = osi_UFSOpen(tdc->f.inode); code = afs_osi_Stat(tfile, &tstat); if (code) osi_Panic("initcachefile stat"); --- 3380,3390 ---- fileIsBad = 0; if ((tdc->f.states & DWriting) || tdc->f.fid.Fid.Volume == 0) fileIsBad = 1; ! #if defined(LINUX_USE_FH) ! tfile = osi_UFSOpen_fh(&tdc->f.fh, tdc->f.fh_type); ! #else ! tfile = osi_UFSOpen(ainode); ! #endif code = afs_osi_Stat(tfile, &tstat); if (code) osi_Panic("initcachefile stat"); *************** *** 3436,3446 **** */ #define DDSIZE 200 ! /* ! * afs_dcacheInit * - * Description: - * Initialize dcache related variables. */ void afs_dcacheInit(int afiles, int ablocks, int aDentries, int achunk, int aflags) --- 3470,3484 ---- */ #define DDSIZE 200 ! /*! ! * Initialize dcache related variables. ! * ! * \param afiles ! * \param ablocks ! * \param aDentries ! * \param achunk ! * \param aflags * */ void afs_dcacheInit(int afiles, int ablocks, int aDentries, int achunk, int aflags) *************** *** 3564,3571 **** QInit(&afs_DLRU); } ! /* ! * shutdown_dcache * */ void --- 3602,3609 ---- QInit(&afs_DLRU); } ! /*! ! * Shuts down the cache. * */ void Index: openafs/src/afs/afs_init.c diff -c openafs/src/afs/afs_init.c:1.37.4.8 openafs/src/afs/afs_init.c:1.37.4.9 *** openafs/src/afs/afs_init.c:1.37.4.8 Mon Sep 22 15:29:54 2008 --- openafs/src/afs/afs_init.c Sat Nov 8 11:34:42 2008 *************** *** 17,23 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_init.c,v 1.37.4.8 2008/09/22 19:29:54 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 17,23 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_init.c,v 1.37.4.9 2008/11/08 16:34:42 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 252,260 **** --- 252,270 ---- { ino_t inode; int code; + #if defined(LINUX_USE_FH) + struct fid fh; + int fh_type; + int max_len = sizeof(struct fid); + struct dentry *dp; + #endif #ifdef AFS_CACHE_VNODE_PATH return afs_cellname_init(AFS_CACHE_CELLS_INODE, code); + #elif defined(LINUX_USE_FH) + code = gop_lookupname(afile, AFS_UIOSYS, 0, &dp); + fh_type = osi_get_fh(dp, &fh, &max_len); + return afs_cellname_init(&fh, fh_type, code); #else code = LookupInodeByPath(afile, &inode, NULL); return afs_cellname_init(inode, code); *************** *** 282,287 **** --- 292,301 ---- { int code; struct osi_file *tfile; + #if defined(LINUX_USE_FH) + int max_len = sizeof(struct fid); + struct dentry *dp; + #endif AFS_STATCNT(afs_InitVolumeInfo); #if defined(AFS_XBSD_ENV) *************** *** 301,312 **** --- 315,333 ---- code = LookupInodeByPath(afile, &volumeInode, &volumeVnode); #elif defined(AFS_CACHE_VNODE_PATH) volumeInode = AFS_CACHE_VOLUME_INODE; + #elif defined(LINUX_USE_FH) + code = gop_lookupname(afile, AFS_UIOSYS, 0, &dp); + volumeinfo_fh_type = osi_get_fh(dp, &volumeinfo_fh, &max_len); #else code = LookupInodeByPath(afile, &volumeInode, NULL); #endif if (code) return code; + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(&volumeinfo_fh, volumeinfo_fh_type); + #else tfile = afs_CFileOpen(volumeInode); + #endif afs_CFileTruncate(tfile, 0); afs_CFileClose(tfile); return 0; *************** *** 443,449 **** --- 464,474 ---- #endif /* AFS_LINUX20_ENV */ AFS_RELE(filevp); #endif /* AFS_LINUX22_ENV */ + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(&cacheitems_fh, cacheitems_fh_type); + #else tfile = osi_UFSOpen(cacheInode); + #endif afs_osi_Stat(tfile, &tstat); cacheInfoModTime = tstat.mtime; code = afs_osi_Read(tfile, -1, &theader, sizeof(theader)); *************** *** 668,675 **** cacheDev.held_vnode = NULL; } #endif cacheInode = volumeInode = (ino_t) 0; ! cacheInfoModTime = 0; afs_fsfragsize = 1023; --- 693,701 ---- cacheDev.held_vnode = NULL; } #endif + #if !defined(LINUX_USE_FH) cacheInode = volumeInode = (ino_t) 0; ! #endif cacheInfoModTime = 0; afs_fsfragsize = 1023; Index: openafs/src/afs/afs_osi_gcpags.c diff -c openafs/src/afs/afs_osi_gcpags.c:1.1.2.6 openafs/src/afs/afs_osi_gcpags.c:1.1.2.8 *** openafs/src/afs/afs_osi_gcpags.c:1.1.2.6 Tue Apr 3 14:54:15 2007 --- openafs/src/afs/afs_osi_gcpags.c Sun Oct 12 14:44:36 2008 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osi_gcpags.c,v 1.1.2.6 2007/04/03 18:54:15 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osi_gcpags.c,v 1.1.2.8 2008/10/12 18:44:36 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 234,250 **** { #if !defined(LINUX_KEYRING_SUPPORT) struct task_struct *p; ! #ifdef EXPORTED_TASKLIST_LOCK if (&tasklist_lock) ! read_lock(&tasklist_lock); ! #endif ! #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ! #ifdef EXPORTED_TASKLIST_LOCK else ! #endif rcu_read_lock(); ! #endif ! #ifdef DEFINED_FOR_EACH_PROCESS for_each_process(p) if (p->pid) { #ifdef STRUCT_TASK_STRUCT_HAS_EXIT_STATE --- 234,251 ---- { #if !defined(LINUX_KEYRING_SUPPORT) struct task_struct *p; ! ! #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) if (&tasklist_lock) ! read_lock(&tasklist_lock); ! #endif /* EXPORTED_TASKLIST_LOCK */ ! #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ! #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) else ! #endif /* EXPORTED_TASKLIST_LOCK && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) */ rcu_read_lock(); ! #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */ ! #ifdef DEFINED_FOR_EACH_PROCESS for_each_process(p) if (p->pid) { #ifdef STRUCT_TASK_STRUCT_HAS_EXIT_STATE *************** *** 268,283 **** afs_GCPAGs_perproc_func(p); } #endif ! #ifdef EXPORTED_TASKLIST_LOCK if (&tasklist_lock) ! read_unlock(&tasklist_lock); ! #endif ! #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ! #ifdef EXPORTED_TASKLIST_LOCK else ! #endif rcu_read_unlock(); ! #endif #endif } #endif --- 269,284 ---- afs_GCPAGs_perproc_func(p); } #endif ! #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) if (&tasklist_lock) ! read_unlock(&tasklist_lock); ! #endif /* EXPORTED_TASKLIST_LOCK */ ! #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) ! #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) else ! #endif /* EXPORTED_TASKLIST_LOCK && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) */ rcu_read_unlock(); ! #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */ #endif } #endif Index: openafs/src/afs/afs_osi_pag.c diff -c openafs/src/afs/afs_osi_pag.c:1.29.4.12 openafs/src/afs/afs_osi_pag.c:1.29.4.14 *** openafs/src/afs/afs_osi_pag.c:1.29.4.12 Fri Jan 4 13:38:34 2008 --- openafs/src/afs/afs_osi_pag.c Mon Oct 20 15:29:36 2008 *************** *** 23,29 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osi_pag.c,v 1.29.4.12 2008/01/04 18:38:34 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 23,29 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osi_pag.c,v 1.29.4.14 2008/10/20 19:29:36 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 430,441 **** --- 430,448 ---- afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred) { int code; + int i = 0; AFS_STATCNT(afs_InitReq); memset(av, 0, sizeof(*av)); if (afs_shuttingdown) return EIO; + av->idleError = 0; + av->tokenError = 0; + while (i < MAXHOSTS) { + av->skipserver[i] = 0; + i++; + } #ifdef AFS_LINUX26_ENV #if !defined(AFS_NONFSTRANS) if (osi_linux_nfs_initreq(av, acred, &code)) Index: openafs/src/afs/afs_osidnlc.c diff -c openafs/src/afs/afs_osidnlc.c:1.13.2.2 openafs/src/afs/afs_osidnlc.c:1.13.2.3 *** openafs/src/afs/afs_osidnlc.c:1.13.2.2 Tue Aug 26 10:01:31 2008 --- openafs/src/afs/afs_osidnlc.c Fri Oct 10 19:24:28 2008 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osidnlc.c,v 1.13.2.2 2008/08/26 14:01:31 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_osidnlc.c,v 1.13.2.3 2008/10/10 23:24:28 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 25,31 **** * look into interactions of dnlc and readdir. * cache larger names, perhaps by using a better,longer key (SHA) and discarding * the actual name itself. ! * precompute a key and stuff for @sys, and combine the HandleAtName function with * this, since we're looking at the name anyway. */ --- 25,31 ---- * look into interactions of dnlc and readdir. * cache larger names, perhaps by using a better,longer key (SHA) and discarding * the actual name itself. ! * precompute a key and stuff for \sys, and combine the HandleAtName function with * this, since we're looking at the name anyway. */ *************** *** 412,421 **** return 0; } ! /* remove anything pertaining to this directory. I can invalidate * things without the lock, since I am just looking through the array, * but to move things off the lists or into the freelist, I need the ! * write lock */ int osi_dnlc_purgedp(struct vcache *adp) { --- 412,426 ---- return 0; } ! /*! ! * Remove anything pertaining to this directory. I can invalidate * things without the lock, since I am just looking through the array, * but to move things off the lists or into the freelist, I need the ! * write lock ! * ! * \param adp vcache entry for the directory to be purged. ! * \return 0 ! */ int osi_dnlc_purgedp(struct vcache *adp) { *************** *** 454,460 **** return 0; } ! /* remove anything pertaining to this file */ int osi_dnlc_purgevp(struct vcache *avc) { --- 459,470 ---- return 0; } ! /*! ! * Remove anything pertaining to this file ! * ! * \param File vcache entry. ! * \return 0 ! */ int osi_dnlc_purgevp(struct vcache *avc) { Index: openafs/src/afs/afs_pioctl.c diff -c openafs/src/afs/afs_pioctl.c:1.110.2.20 openafs/src/afs/afs_pioctl.c:1.110.2.21 *** openafs/src/afs/afs_pioctl.c:1.110.2.20 Mon Sep 22 15:35:26 2008 --- openafs/src/afs/afs_pioctl.c Fri Oct 10 19:27:02 2008 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.110.2.20 2008/09/22 19:35:26 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.110.2.21 2008/10/10 23:27:02 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV *************** *** 41,46 **** --- 41,61 ---- afs_int32 afs_in_sync = 0; #endif + /*! + * \defgroup pioctl Path IOCTL functions + * + * DECL_PIOCTL is a macro defined to contain the following parameters for functions: + * + * \param[in] avc the AFS vcache structure in use by pioctl + * \param[in] afun not in use + * \param[in] areq the AFS vrequest structure + * \param[in] ain as defined by the function + * \param[in] aout as defined by the function + * \param[in] ainSize size of ain + * \param[in] aoutSize size of aout + * \param[in] acred UNIX credentials structure underlying the operation + */ + #define DECL_PIOCTL(x) static int x(struct vcache *avc, int afun, struct vrequest *areq, \ char *ain, char *aout, afs_int32 ainSize, afs_int32 *aoutSize, \ struct AFS_UCRED **acred) *************** *** 1127,1132 **** --- 1142,1159 ---- return afs_CheckCode(code, &treq, 41); } + /*! + * VIOCETFID (22) - Get file ID quickly + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the initial arguments aren't set + * + * \post get the file id of some file + */ DECL_PIOCTL(PGetFID) { AFS_STATCNT(PGetFID); *************** *** 1137,1142 **** --- 1164,1186 ---- return 0; } + /*! + * VIOCSETAL (1) - Set access control list + * + * \ingroup pioctl + * + * \param[in] ain the ACL being set + * \param[out] aout the ACL being set returned + * + * \retval EINVAL Error if some of the standard args aren't set + * + * \post Changed ACL, via direct writing to the wire + */ + int dummy_PSetAcl(char *ain, char *aout) + { + return 0; + } + DECL_PIOCTL(PSetAcl) { register afs_int32 code; *************** *** 1182,1187 **** --- 1226,1244 ---- int afs_defaultAsynchrony = 0; + /*! + * VIOC_STOREBEHIND (47) Adjust store asynchrony + * + * \ingroup pioctl + * + * \param[in] ain sbstruct (store behind structure) input + * \param[out] aout resulting sbstruct + * + * \retval EPERM Error if the user doesn't have super-user credentials + * \retval EACCES Error if there isn't enough access to not check the mode bits + * + * \post sets asynchrony based on a file, from a struct sbstruct "I THINK" + */ DECL_PIOCTL(PStoreBehind) { afs_int32 code = 0; *************** *** 1213,1218 **** --- 1270,1287 ---- return code; } + /*! + * VIOC_GCPAGS (48) - Disable automatic PAG gc'ing + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EACCES Error if the user doesn't have super-user credentials + * + * \post set the gcpags to GCPAGS_USERDISABLED + */ DECL_PIOCTL(PGCPAGs) { if (!afs_osi_suser(*acred)) { *************** *** 1222,1227 **** --- 1291,1312 ---- return 0; } + /*! + * VIOCGETAL (2) - Get access control list + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout the ACL + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval ERANGE Error if the vnode of the file id is too large + * \retval -1 Error if getting the ACL failed + * + * \post Obtain the ACL, based on file ID + * + * \notes there is a hack to tell which type of ACL is being returned, checks the top 2-bytes to judge what type of ACL it is, only for dfs xlat or ACLs + */ DECL_PIOCTL(PGetAcl) { struct AFSOpaque acl; *************** *** 1272,1289 **** --- 1357,1403 ---- return code; } + /*! + * PNoop returns success. Used for functions which are not implemented or are no longer in use. + * + * \ingroup pioctl + * + * \notes Functions involved in this: 17 (VIOCENGROUP) -- used to be enable group; 18 (VIOCDISGROUP) -- used to be disable group; 2 (?) -- get/set cache-bypass size threshold + */ DECL_PIOCTL(PNoop) { AFS_STATCNT(PNoop); return 0; } + /*! + * PBogus returns fail. Used for functions which are not implemented or are no longer in use. + * + * \ingroup pioctl + * + * \retval EINVAL Error if some of the standard args aren't set + * + * \notes Functions involved in this: 0 (?); 4 (?); 6 (?); 7 (VIOCSTAT); 8 (?); 13 (VIOCGETTIME) -- used to be quick check time; 15 (VIOCPREFETCH) -- prefetch is now special-cased; see pioctl code!; 16 (VIOCNOP) -- used to be testing code; 19 (VIOCLISTGROUPS) -- used to be list group; 23 (VIOCWAITFOREVER) -- used to be waitforever; 57 (VIOC_FPRIOSTATUS) -- arla: set file prio; 58 (VIOC_FHGET) -- arla: fallback getfh; 59 (VIOC_FHOPEN) -- arla: fallback fhopen; 60 (VIOC_XFSDEBUG) -- arla: controls xfsdebug; 61 (VIOC_ARLADEBUG) -- arla: controls arla debug; 62 (VIOC_AVIATOR) -- arla: debug interface; 63 (VIOC_XFSDEBUG_PRINT) -- arla: print xfs status; 64 (VIOC_CALCULATE_CACHE) -- arla: force cache check; 65 (VIOC_BREAKCELLBACK) -- arla: break callback; 68 (?) -- arla: fetch stats; + */ DECL_PIOCTL(PBogus) { AFS_STATCNT(PBogus); return EINVAL; } + /*! + * VIOC_FILE_CELL_NAME (30) - Get cell in which file lives + * + * \ingroup pioctl + * + * \param[in] ain not in use (avc used to pass in file id) + * \param[out] aout cell name + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval ESRCH Error if the file isn't part of a cell + * + * \post Get a cell based on a passed in file id + */ DECL_PIOCTL(PGetFileCell) { register struct cell *tcell; *************** *** 1300,1305 **** --- 1414,1432 ---- return 0; } + /*! + * VIOC_GET_WS_CELL (31) - Get cell in which workstation lives + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout cell name + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval ESRCH Error if the machine isn't part of a cell, for whatever reason + * + * \post Get the primary cell that the machine is a part of. + */ DECL_PIOCTL(PGetWSCell) { struct cell *tcell = NULL; *************** *** 1317,1322 **** --- 1444,1461 ---- return 0; } + /*! + * VIOC_GET_PRIMARY_CELL (33) - Get primary cell for caller + * + * \ingroup pioctl + * + * \param[in] ain not in use (user id found via areq) + * \param[out] aout cell name + * + * \retval ESRCH Error if the user id doesn't have a primary cell specified + * + * \post Get the primary cell for a certain user, based on the user's uid + */ DECL_PIOCTL(PGetUserCell) { register afs_int32 i; *************** *** 1355,1360 **** --- 1494,1514 ---- return 0; } + /*! + * VIOCSETTOK (3) - Set authentication tokens + * + * \ingroup pioctl + * + * \param[in] ain the krb tickets from which to set the afs tokens + * \param[out] aout not in use + * + * \retval EINVAL Error if the ticket is either too long or too short + * \retval EIO Error if the AFS initState is below 101 + * \retval ESRCH Error if the cell for which the Token is being set can't be found + * + * \post Set the Tokens for a specific cell name, unless there is none set, then default to primary + * + */ DECL_PIOCTL(PSetTokens) { afs_int32 i; *************** *** 1469,1474 **** --- 1623,1640 ---- } } + /*! + * VIOCGETVOLSTAT (4) - Get volume status + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout status of the volume + * + * \retval EINVAL Error if some of the standard args aren't set + * + * \post The status of a volume (based on the FID of the volume), or an offline message /motd + */ DECL_PIOCTL(PGetVolumeStatus) { char volName[32]; *************** *** 1524,1529 **** --- 1690,1710 ---- return code; } + /*! + * VIOCSETVOLSTAT (5) - Set volume status + * + * \ingroup pioctl + * + * \param[in] ain values to set the status at, offline message, message of the day, volume name, minimum quota, maximum quota + * \param[out] aout status of a volume, offlines messages, minimum quota, maximumm quota + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval EROFS Error if the volume is read only, or a backup volume + * \retval ENODEV Error if the volume can't be accessed + * \retval E2BIG Error if the volume name, offline message, and motd are too big + * + * \post Set the status of a volume, including any offline messages, a minimum quota, and a maximum quota + */ DECL_PIOCTL(PSetVolumeStatus) { char volName[32]; *************** *** 1621,1626 **** --- 1802,1819 ---- return code; } + /*! + * VIOCFLUSH (6) - Invalidate cache entry + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the standard args aren't set + * + * \post Flush any information the cache manager has on an entry + */ DECL_PIOCTL(PFlush) { AFS_STATCNT(PFlush); *************** *** 1648,1653 **** --- 1841,1860 ---- return 0; } + /*! + * VIOC_AFS_STAT_MT_PT (29) - Stat mount point + * + * \ingroup pioctl + * + * \param[in] ain the last component in a path, related to mountpoint that we're looking for information about + * \param[out] aout volume, cell, link data + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval ENOTDIR Error if the 'mount point' argument isn't a directory + * \retval EIO Error if the link data can't be accessed + * + * \post Get the volume, and cell, as well as the link data for a mount point + */ DECL_PIOCTL(PNewStatMount) { register afs_int32 code; *************** *** 1719,1724 **** --- 1926,1948 ---- return code; } + /*! + * VIOCGETTOK (8) - Get authentication tokens + * + * \ingroup pioctl + * + * \param[in] ain userid + * \param[out] aout token + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EDOM Error if the input parameter is out of the bounds of the available tokens + * \retval ENOTCONN Error if there aren't tokens for this cell + * + * \post If the input paramater exists, get the token that corresponds to the parameter value, if there is no token at this value, get the token for the first cell + * + * \notes "it's a weird interface (from comments in the code)" + */ + DECL_PIOCTL(PGetTokens) { register struct cell *tcell; *************** *** 1806,1811 **** --- 2030,2050 ---- return 0; } + /*! + * VIOCUNLOG (9) - Invalidate tokens + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EIO Error if the afs daemon hasn't been started yet + * + * \post remove tokens from a user, specified by the user id + * + * \notes sets the token's time to 0, which then causes it to be removed + * \notes Unlog is the same as un-pag in OpenAFS + */ DECL_PIOCTL(PUnlog) { register afs_int32 i; *************** *** 1849,1854 **** --- 2088,2105 ---- return 0; } + /*! + * VIOC_AFS_MARINER_HOST (32) - Get/set mariner (cache manager monitor) host + * + * \ingroup pioctl + * + * \param[in] ain host address to be set + * \param[out] aout old host address + * + * \post depending on whether or not a variable is set, either get the host for the cache manager monitor, or set the old address and give it a new address + * + * \notes Errors turn off mariner + */ DECL_PIOCTL(PMariner) { afs_int32 newHostAddr; *************** *** 1874,1879 **** --- 2125,2144 ---- return 0; } + /*! + * VIOCCKSERV (10) - Check that servers are up + * + * \ingroup pioctl + * + * \param[in] ain name of the cell + * \param[out] aout current down server list + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EACCES Error if the user doesn't have super-user credentials + * \retval ENOENT Error if we are unable to obtain the cell + * + * \post Either a fast check (where it doesn't contact servers) or a local check (checks local cell only) + */ DECL_PIOCTL(PCheckServers) { register char *cp = 0; *************** *** 1952,1957 **** --- 2217,2234 ---- return 0; } + /*! + * VIOCCKBACK (11) - Check backup volume mappings + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EIO Error if the afs daemon hasn't started yet + * + * \post Check the root volume, and then check the names if the volume check variable is set to force, has expired, is busy, or if the mount points variable is set + */ DECL_PIOCTL(PCheckVolNames) { AFS_STATCNT(PCheckVolNames); *************** *** 1964,1969 **** --- 2241,2260 ---- return 0; } + /*! + * VIOCCKCONN (12) - Check connections for a user + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EACCESS Error if no user is specififed, the user has no tokens set, or if the user's tokens are bad + * + * \post check to see if a user has the correct authentication. If so, allow access. + * + * \notes Check the connections to all the servers specified + */ DECL_PIOCTL(PCheckAuth) { int i; *************** *** 2036,2041 **** --- 2327,2347 ---- return 0; } + /*! + * VIOCWHEREIS (14) - Find out where a volume is located + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout volume location + * + * \retval EINVAL Error if some of the default arguments don't exist + * \retval ENODEV Error if there is no such volume + * + * \post fine a volume, based on a volume file id + * + * \notes check each of the servers specified + */ DECL_PIOCTL(PFindVolume) { register struct volume *tvp; *************** *** 2069,2074 **** --- 2375,2393 ---- return ENODEV; } + /*! + * VIOCACCESS (20) - Access using PRS_FS bits + * + * \ingroup pioctl + * + * \param[in] ain PRS_FS bits + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the initial arguments aren't set + * \retval EACCES Error if access is denied + * + * \post check to make sure access is allowed + */ DECL_PIOCTL(PViceAccess) { register afs_int32 code; *************** *** 2100,2105 **** --- 2419,2439 ---- return 0; } + /*! + * VIOCSETCACHESIZE (24) - Set venus cache size in 1000 units + * + * \ingroup pioctl + * + * \param[in] ain the size the venus cache should be set to + * \param[out] aout not in use + * + * \retval EACCES Error if the user doesn't have super-user credentials + * \retval EROFS Error if the cache is set to be in memory + * + * \post Set the cache size based on user input. If no size is given, set it to the default OpenAFS cache size. + * + * \notes recompute the general cache parameters for every single block allocated + */ DECL_PIOCTL(PSetCacheSize) { afs_int32 newValue; *************** *** 2131,2136 **** --- 2465,2480 ---- } #define MAXGCSTATS 16 + /*! + * VIOCGETCACHEPARMS (40) - Get cache stats + * + * \ingroup pioctl + * + * \param[in] ain afs index flags + * \param[out] aout cache blocks, blocks used, blocks files (in an array) + * + * \post Get the cache blocks, and how many of the cache blocks there are + */ DECL_PIOCTL(PGetCacheSize) { afs_int32 results[MAXGCSTATS]; *************** *** 2184,2189 **** --- 2528,2546 ---- return 0; } + /*! + * VIOCFLUSHCB (25) - Flush callback only + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval 0 0 returned if the volume is set to read-only + * + * \post Flushes callbacks, by setting the length of callbacks to one, setting the next callback to be sent to the CB_DROPPED value, and then dequeues everything else. + */ DECL_PIOCTL(PRemoveCallBack) { register struct conn *tc; *************** *** 2231,2236 **** --- 2588,2607 ---- return 0; } + /*! + * VIOCNEWCELL (26) - Configure new cell + * + * \ingroup pioctl + * + * \param[in] ain the name of the cell, the hosts that will be a part of the cell, whether or not it's linked with another cell, the other cell it's linked with, the file server port, and the volume server port + * \param[out] aout not in use + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EACCES Error if the user doesn't have super-user cedentials + * \retval EINVAL Error if some 'magic' var doesn't have a certain bit set + * + * \post creates a new cell + */ DECL_PIOCTL(PNewCell) { /* create a new cell */ *************** *** 2307,2312 **** --- 2678,2696 ---- return code; } + /*! + * VIOCGETCELL (27) - Get cell info + * + * \ingroup pioctl + * + * \param[in] ain The cell index of a specific cell + * \param[out] aout list of servers in the cell + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EDOM Error if there is no cell asked about + * + * \post Lists the cell's server names and and addresses + */ DECL_PIOCTL(PListCells) { afs_int32 whichCell; *************** *** 2373,2378 **** --- 2757,2776 ---- return EDOM; } + /*! + * VIOC_AFS_DELETE_MT_PT (28) - Delete mount point + * + * \ingroup pioctl + * + * \param[in] ain the name of the file in this dir to remove + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval ENOTDIR Error if the argument to remove is not a directory + * \retval ENOENT Error if there is no cache to remove the mount point from or if a vcache doesn't exist + * + * \post Ensure that everything is OK before deleting the mountpoint. If not, don't delete. Delete a mount point based on a file id. + */ DECL_PIOCTL(PRemoveMount) { register afs_int32 code; *************** *** 2494,2504 **** --- 2892,2924 ---- return code; } + /*! + * VIOC_VENUSLOG (34) - Enable/Disable venus logging + * + * \ingroup pioctl + * + * \retval EINVAL Error if some of the standard args aren't set + * + * \notes Obsoleted, perhaps should be PBogus + */ DECL_PIOCTL(PVenusLogging) { return EINVAL; /* OBSOLETE */ } + /*! + * VIOC_GETCELLSTATUS (35) - Get cell status info + * + * \ingroup pioctl + * + * \param[in] ain The cell you want status information on + * \param[out] aout cell state (as a struct) + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval ENOENT Error if the cell doesn't exist + * + * \post Returns the state of the cell as defined in a struct cell + */ DECL_PIOCTL(PGetCellStatus) { register struct cell *tcell; *************** *** 2518,2523 **** --- 2938,2956 ---- return 0; } + /*! + * VIOC_SETCELLSTATUS (36) - Set corresponding info + * + * \ingroup pioctl + * + * \param[in] ain The cell you want to set information about, and the values you want to set + * \param[out] aout not in use + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EACCES Error if the user doesn't have super-user credentials + * + * \post Set the state of the cell in a defined struct cell, based on whether or not SetUID is allowed + */ DECL_PIOCTL(PSetCellStatus) { register struct cell *tcell; *************** *** 2540,2545 **** --- 2973,2993 ---- return 0; } + /*! + * VIOC_FLUSHVOLUME (37) - Flush whole volume's data + * + * \ingroup pioctl + * + * \param[in] ain not in use (args in avc) + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the standard args aren't set + * \retval EIO Error if the afs daemon hasn't started yet + * + * \post Wipe everything on the volume. This is done dependent on which platform this is for. + * + * \notes Does not flush a file that a user has open and is using, because it will be re-created on next write. Also purges the dnlc, because things are screwed up. + */ DECL_PIOCTL(PFlushVolumeData) { register afs_int32 i; *************** *** 2678,2684 **** } ! DECL_PIOCTL(PGetVnodeXStatus) { register afs_int32 code; --- 3126,3144 ---- } ! /*! ! * VIOCGETVCXSTATUS (41) - gets vnode x status ! * ! * \ingroup pioctl ! * ! * \param[in] ain not in use (avc used) ! * \param[out] aout vcxstat: the file id, the data version, any lock, the parent vnode, the parent unique id, the trunc position, the callback, cbExpires, what access is being made, what files are open, any users executing/writing, the flock ount, the states, the move stat ! * ! * \retval EINVAL Error if some of the initial default arguments aren't set ! * \retval EACCES Error if access to check the mode bits is denied ! * ! * \post gets stats for the vnode, a struct listed in vcxstat ! */ DECL_PIOCTL(PGetVnodeXStatus) { register afs_int32 code; *************** *** 2759,2768 **** return 0; } ! /* We require root for local sysname changes, but not for remote */ ! /* (since we don't really believe remote uids anyway) */ ! /* outname[] shouldn't really be needed- this is left as an excercise */ ! /* for the reader. */ DECL_PIOCTL(PSetSysName) { char *cp, *cp2 = NULL, inname[MAXSYSNAME], outname[MAXSYSNAME]; --- 3219,3241 ---- return 0; } ! ! /*! ! * VIOC_AFS_SYSNAME (38) - Change @sys value ! * ! * \ingroup pioctl ! * ! * \param[in] ain new value for @sys ! * \param[out] aout count, entry, list (debug values?) ! * ! * \retval EINVAL Error if afsd isn't running, the new sysname is too large, the new sysname causes issues (starts with a .0 or ..0), there is no PAG set in the credentials, the user of a PAG can't be found, (!(exporter = au->exporter)) "NOT SURE ON THIS" ! * \retval ENODEV Error if there isn't already a system named that ("I THINK") ! * \retval EACCES Error if the user doesn't have super-user credentials ! * ! * \post Set the value of @sys if these things work: if the input isn't too long or if input doesn't start with .0 or ..0 ! * ! * \notes We require root for local sysname changes, but not for remote (since we don't really believe remote uids anyway) outname[] shouldn't really be needed- this is left as an exercise for the reader. ! */ DECL_PIOCTL(PSetSysName) { char *cp, *cp2 = NULL, inname[MAXSYSNAME], outname[MAXSYSNAME]; *************** *** 3039,3046 **** return 0; } ! /* Note that this may only be performed by the local root user. ! */ DECL_PIOCTL(PSetSPrefs) { struct setspref *ssp; --- 3512,3529 ---- return 0; } ! /*! ! * VIOC_SETPREFS (46) - Set server ranks ! * ! * \param[in] ain the sprefs value you want the sprefs to be set to ! * \param[out] aout not in use ! * ! * \retval EIO Error if the afs daemon hasn't started yet ! * \retval EACCES Error if the user doesn't have super-user credentials ! * \retval EINVAL Error if the struct setsprefs is too large or if it multiplied by the number of servers is too large ! * ! * \post set the sprefs using the afs_setsprefs() function ! */ DECL_PIOCTL(PSetSPrefs) { struct setspref *ssp; *************** *** 3064,3069 **** --- 3547,3565 ---- return 0; } + /* + * VIOC_SETPREFS33 (42) - Set server ranks (deprecated) + * + * \param[in] ain the server preferences to be set + * \param[out] aout not in use + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EACCES Error if the user doesn't have super-user credentials + * + * \post set the server preferences, calling a function + * + * \notes this may only be performed by the local root user. + */ DECL_PIOCTL(PSetSPrefs33) { struct spref *sp; *************** *** 3080,3091 **** return 0; } ! /* some notes on the following code... ! * in the hash table of server structs, all servers with the same IP address ! * will be on the same overflow chain. ! * This could be sped slightly in some circumstances by having it cache the ! * immediately previous slot in the hash table and some supporting information ! * Only reports file servers now. */ DECL_PIOCTL(PGetSPrefs) { --- 3576,3595 ---- return 0; } ! /* ! * VIOC_GETSPREFS (43) - Get server ranks ! * ! * \ingroup pioctl ! * ! * \param[in] ain the server preferences to get ! * \param[out] aout the server preferences information ! * ! * \retval EIO Error if the afs daemon hasn't started yet ! * \retval ENOENT Error if the sprefrequest is too large ! * ! * \post Get the sprefs ! * ! * \notes in the hash table of server structs, all servers with the same IP address; will be on the same overflow chain; This could be sped slightly in some circumstances by having it cache the immediately previous slot in the hash table and some supporting information; Only reports file servers now. */ DECL_PIOCTL(PGetSPrefs) { *************** *** 3160,3165 **** --- 3664,3684 ---- /* Enable/Disable the specified exporter. Must be root to disable an exporter */ int afs_NFSRootOnly = 1; + /*! + * VIOC_EXPORTAFS (39) - Export afs to nfs clients + * + * \ingroup pioctl + * + * \param[in] ain a struct Vic * EIOctl containing export values needed to change between nfs and afs + * \param[out] aout a struct of the exporter states (exporter->exp_states) + * + * \retval ENODEV Error if the exporter doesn't exist + * \retval EACCES Error if the user doesn't have super-user credentials + * + * \post Changes the state of various values to reflect the change of the export values between nfs and afs. + * + * \notes Legacy code obtained from IBM. + */ DECL_PIOCTL(PExportAfs) { afs_int32 export, newint = *************** *** 3270,3275 **** --- 3789,3806 ---- return 0; } + /*! + * VIOC_GAG (44) - Silence Cache Manager + * + * \ingroup pioctl + * + * \param[in] ain the flags to either gag or de-gag the cache manager + * \param[out] aout not in use + * + * \retval EACCES Error if the user doesn't have super-user credentials + * + * \post set the gag flags, then show these flags + */ DECL_PIOCTL(PGag) { struct gaginfo *gagflags; *************** *** 3283,3289 **** return 0; } ! DECL_PIOCTL(PTwiddleRx) { struct rxparams *rxp; --- 3814,3831 ---- return 0; } ! /*! ! * VIOC_TWIDDLE (45) - Adjust RX knobs ! * ! * \ingroup pioctl ! * ! * \param[in] ain the previous settings of the 'knobs' ! * \param[out] aout not in use ! * ! * \retval EACCES Error if the user doesn't have super-user credentials ! * ! * \post build out the struct rxp, from a struct rx ! */ DECL_PIOCTL(PTwiddleRx) { struct rxparams *rxp; *************** *** 3317,3322 **** --- 3859,3876 ---- return 0; } + /*! + * VIOC_GETINITPARAMS (49) - Get initial cache manager parameters + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout initial cache manager params + * + * \retval E2BIG Error if the initial parameters are bigger than some PIGGYSIZE + * + * \post return the initial cache manager parameters + */ DECL_PIOCTL(PGetInitParams) { if (sizeof(struct cm_initparams) > PIGGYSIZE) *************** *** 3342,3347 **** --- 3896,3911 ---- } #endif + /*! + * VIOC_GETRXKCRYPT (55) - Get rxkad encryption flag + * + * \ingroup pioctl + * + * \param[in] ain not in use + * \param[out] aout value of cryptall + * + * \post get the value of cryptall (presumably whether or not things should be encrypted) + */ DECL_PIOCTL(PGetRxkcrypt) { memcpy(aout, (char *)&cryptall, sizeof(afs_int32)); *************** *** 3349,3354 **** --- 3913,3933 ---- return 0; } + /*! + * VIOC_SETRXKCRYPT (56) - Set rxkad encryption flag + * + * \ingroup pioctl + * + * \param[in] ain the argument whether or not things should be encrypted + * \param[out] aout not in use + * + * \retval EPERM Error if the user doesn't have super-user credentials + * \retval EINVAL Error if the input is too big, or if the input is outside the bounds of what it can be set to + * + * \post set whether or not things should be encrypted + * + * \notes may need to be modified at a later date to take into account other values for cryptall (beyond true or false) + */ DECL_PIOCTL(PSetRxkcrypt) { afs_int32 tmpval; *************** *** 3527,3534 **** } #endif /* AFS_NEED_CLIENTCONTEXT */ - /* get all interface addresses of this client */ DECL_PIOCTL(PGetCPrefs) { struct sprefrequest *spin; /* input */ --- 4106,4125 ---- } #endif /* AFS_NEED_CLIENTCONTEXT */ + /*! + * VIOC_GETCPREFS (50) - Get client interface + * + * \ingroup pioctl + * + * \param[in] ain sprefrequest input + * \param[out] aout spref information + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EINVAL Error if some of the standard args aren't set + * + * \post get all interface addresses and other information of the client interface + */ DECL_PIOCTL(PGetCPrefs) { struct sprefrequest *spin; /* input */ *************** *** 3571,3576 **** --- 4162,4181 ---- return 0; } + /*! + * VIOC_SETCPREFS (51) - Set client interface + * + * \ingroup pioctl + * + * \param[in] ain the interfaces you want set + * \param[out] aout not in use + * + * \retval EIO Error if the afs daemon hasn't started yet + * \retval EINVAL Error if the input is too large for the struct + * \retval ENOMEM Error if there are too many servers + * + * \post set the callbak interfaces addresses to those of the hosts + */ DECL_PIOCTL(PSetCPrefs) { struct setspref *sin; *************** *** 3600,3605 **** --- 4205,4224 ---- return 0; } + /*! + * VIOC_AFS_FLUSHMOUNT (52) - Flush mount symlink data + * + * \ingroup pioctl + * + * \param[in] ain the last part of a path to a mount point, which tells us what to flush + * \param[out] aout not in use + * + * \retval EINVAL Error if some of the initial arguments aren't set + * \retval ENOTDIR Error if the initial argument for the mount point isn't a directory + * \retval ENOENT Error if the dcache entry isn't set + * + * \post remove all of the mount data from the dcache regarding a certain mount point + */ DECL_PIOCTL(PFlushMount) { register afs_int32 code; *************** *** 3675,3680 **** --- 4294,4312 ---- return code; } + /*! + * VIOC_RXSTAT_PROC (53) - Control process RX statistics + * + * \ingroup pioctl + * + * \param[in] ain the flags that control which stats to use + * \param[out] aout not in use + * + * \retval EACCES Error if the user doesn't have super-user credentials + * \retval EINVAL Error if the flag input is too long + * + * \post either enable process RPCStats, disable process RPCStats, or clear the process RPCStats + */ DECL_PIOCTL(PRxStatProc) { int code = 0; *************** *** 3708,3713 **** --- 4340,4358 ---- } + /*! + * VIOC_RXSTAT_PEER (54) - Control peer RX statistics + * + * \ingroup pioctl + * + * \param[in] ain the flags that control which statistics to use + * \param[out] aout not in use + * + * \retval EACCES Error if the user doesn't have super-user credentials + * \retval EINVAL Error if the flag input is too long + * + * \post either enable peer RPCStatws, disable peer RPCStats, or clear the peer RPCStats + */ DECL_PIOCTL(PRxStatPeer) { int code = 0; Index: openafs/src/afs/afs_prototypes.h diff -c openafs/src/afs/afs_prototypes.h:1.74.2.18 openafs/src/afs/afs_prototypes.h:1.74.2.19 *** openafs/src/afs/afs_prototypes.h:1.74.2.18 Mon Sep 22 15:29:54 2008 --- openafs/src/afs/afs_prototypes.h Sat Nov 8 11:34:42 2008 *************** *** 129,135 **** --- 129,139 ---- extern void afs_CellInit(void); extern void shutdown_cell(void); + #if defined(LINUX_USE_FH) + extern int afs_cellname_init(struct fid *fh, int fh_type, int lookupcode); + #else extern int afs_cellname_init(ino_t inode, int lookupcode); + #endif extern int afs_cellname_write(void); extern afs_int32 afs_NewCell(char *acellName, afs_int32 * acellHosts, int aflags, char *linkedcname, u_short fsport, *************** *** 231,237 **** --- 235,246 ---- extern afs_uint32 afs_tpct1, afs_tpct2, splitdcache; extern unsigned char *afs_indexFlags; extern struct afs_cacheOps *afs_cacheType; + #if defined(LINUX_USE_FH) + extern struct fid cacheitems_fh; + extern int cacheitems_fh_type; + #else extern ino_t cacheInode; + #endif extern struct osi_file *afs_cacheInodep; extern void afs_dcacheInit(int afiles, int ablocks, int aDentries, int achunk, int aflags); *************** *** 627,634 **** --- 636,648 ---- #if defined(AFS_SUN57_64BIT_ENV) || defined(AFS_SGI62_ENV) extern void *osi_UFSOpen(ino_t ainode); #else + #if defined(LINUX_USE_FH) + extern void *osi_UFSOpen_fh(struct fid *fh, int fh_type); + extern int osi_get_fh(struct dentry *dp, struct fid *fh, int *max_len); + #else extern void *osi_UFSOpen(afs_int32 ainode); #endif + #endif extern int afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat); extern int osi_UFSClose(register struct osi_file *afile); *************** *** 1111,1117 **** --- 1125,1136 ---- extern afs_int32 afs_volCounter; extern afs_rwlock_t afs_xvolume; extern struct volume *afs_volumes[NVOLS]; + #if defined(LINUX_USE_FH) + extern struct fid volumeinfo_fh; + extern int volumeinfo_fh_type; + #else extern ino_t volumeInode; + #endif extern struct volume *afs_FindVolume(struct VenusFid *afid, afs_int32 locktype); extern struct volume *afs_freeVolList; Index: openafs/src/afs/afs_segments.c diff -c openafs/src/afs/afs_segments.c:1.22.8.3 openafs/src/afs/afs_segments.c:1.22.8.4 *** openafs/src/afs/afs_segments.c:1.22.8.3 Mon Sep 22 15:29:54 2008 --- openafs/src/afs/afs_segments.c Sat Nov 8 11:34:42 2008 *************** *** 14,20 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.22.8.3 2008/09/22 19:29:54 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 14,20 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.22.8.4 2008/11/08 16:34:42 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 432,438 **** --- 432,442 ---- shouldwake = &nomore; } } + #if defined(LINUX_USE_FH) + tfile = afs_CFileOpen(&tdc->f.fh, tdc->f.fh_type); + #else tfile = afs_CFileOpen(tdc->f.inode); + #endif #ifndef AFS_NOSTATS xferP = &(afs_stats_cmfullperf.rpc. *************** *** 1045,1051 **** --- 1049,1059 ---- ObtainSharedLock(&tdc->lock, 672); if (newSize < tdc->f.chunkBytes) { UpgradeSToWLock(&tdc->lock, 673); + #if defined(LINUX_USE_FH) + tfile = afs_CFileOpen(&tdc->f.fh, tdc->f.fh_type); + #else tfile = afs_CFileOpen(tdc->f.inode); + #endif afs_CFileTruncate(tfile, newSize); afs_CFileClose(tfile); afs_AdjustSize(tdc, newSize); Index: openafs/src/afs/afs_vcache.c diff -c openafs/src/afs/afs_vcache.c:1.114.2.12 openafs/src/afs/afs_vcache.c:1.114.2.14 *** openafs/src/afs/afs_vcache.c:1.114.2.12 Mon Sep 22 15:35:26 2008 --- openafs/src/afs/afs_vcache.c Sun Oct 12 14:07:01 2008 *************** *** 41,47 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.114.2.12 2008/09/22 19:35:26 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ --- 41,47 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.114.2.14 2008/10/12 18:07:01 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ *************** *** 83,92 **** /* Forward declarations */ static afs_int32 afs_QueueVCB(struct vcache *avc); ! /* ! * afs_HashCBRFid ! * * Generate an index into the hash table for a given Fid. */ static int afs_HashCBRFid(struct AFSFid *fid) --- 83,92 ---- /* Forward declarations */ static afs_int32 afs_QueueVCB(struct vcache *avc); ! /*! * Generate an index into the hash table for a given Fid. + * \param fid + * \return The hash value. */ static int afs_HashCBRFid(struct AFSFid *fid) *************** *** 94,104 **** return (fid->Volume + fid->Vnode + fid->Unique) % CBRSIZE; } ! /* ! * afs_InsertHashCBR ! * * Insert a CBR entry into the hash table. * Must be called with afs_xvcb held. */ static void afs_InsertHashCBR(struct afs_cbr *cbr) --- 94,104 ---- return (fid->Volume + fid->Vnode + fid->Unique) % CBRSIZE; } ! /*! * Insert a CBR entry into the hash table. * Must be called with afs_xvcb held. + * \param cbr + * \return */ static void afs_InsertHashCBR(struct afs_cbr *cbr) *************** *** 113,127 **** afs_cbrHashT[slot] = cbr; } ! /* ! * afs_FlushVCache ! * ! * Description: ! * Flush the given vcache entry. * ! * Parameters: ! * avc : Pointer to vcache entry to flush. ! * slept : Pointer to int to set 1 if we sleep/drop locks, 0 if we don't. * * Environment: * afs_xvcache lock must be held for writing upon entry to --- 113,121 ---- afs_cbrHashT[slot] = cbr; } ! /*! * ! * Flush the given vcache entry. * * Environment: * afs_xvcache lock must be held for writing upon entry to *************** *** 130,137 **** * LOCK: afs_FlushVCache afs_xvcache W * REFCNT: vcache ref count must be zero on entry except for osf1 * RACE: lock is dropped and reobtained, permitting race in caller */ - int afs_FlushVCache(struct vcache *avc, int *slept) { /*afs_FlushVCache */ --- 124,134 ---- * LOCK: afs_FlushVCache afs_xvcache W * REFCNT: vcache ref count must be zero on entry except for osf1 * RACE: lock is dropped and reobtained, permitting race in caller + * + * \param avc Pointer to vcache entry to flush. + * \param slept Pointer to int to set 1 if we sleep/drop locks, 0 if we don't. + * */ int afs_FlushVCache(struct vcache *avc, int *slept) { /*afs_FlushVCache */ *************** *** 279,288 **** } /*afs_FlushVCache */ #ifndef AFS_SGI_ENV ! /* ! * afs_InactiveVCache * ! * The core of the inactive vnode op for all but IRIX. */ void afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred) --- 276,286 ---- } /*afs_FlushVCache */ #ifndef AFS_SGI_ENV ! /*! ! * The core of the inactive vnode op for all but IRIX. * ! * \param avc ! * \param acred */ void afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred) *************** *** 305,318 **** } #endif ! /* ! * afs_AllocCBR ! * ! * Description: allocate a callback return structure from the * free list and return it. * ! * Env: The alloc and free routines are both called with the afs_xvcb lock * held, so we don't have to worry about blocking in osi_Alloc. */ static struct afs_cbr *afs_cbrSpace = 0; struct afs_cbr * --- 303,316 ---- } #endif ! /*! ! * Allocate a callback return structure from the * free list and return it. * ! * Environment: The alloc and free routines are both called with the afs_xvcb lock * held, so we don't have to worry about blocking in osi_Alloc. + * + * \return The allocated afs_cbr. */ static struct afs_cbr *afs_cbrSpace = 0; struct afs_cbr * *************** *** 344,358 **** return tsp; } ! /* ! * afs_FreeCBR * ! * Description: free a callback return structure, removing it from all lists. * ! * Parameters: ! * asp -- the address of the structure to free. * ! * Environment: the xvcb lock is held over these calls. */ int afs_FreeCBR(register struct afs_cbr *asp) --- 342,355 ---- return tsp; } ! /*! ! * Free a callback return structure, removing it from all lists. * ! * Environment: the xvcb lock is held over these calls. * ! * \param asp The address of the structure to free. * ! * \rerurn 0 */ int afs_FreeCBR(register struct afs_cbr *asp) *************** *** 370,384 **** return 0; } ! /* ! * afs_FlushVCBs ! * ! * Description: flush all queued callbacks to all servers. ! * ! * Parameters: none. * * Environment: holds xvcb lock over RPC to guard against race conditions * when a new callback is granted for the same file later on. */ afs_int32 afs_FlushVCBs(afs_int32 lockit) --- 367,379 ---- return 0; } ! /*! ! * Flush all queued callbacks to all servers. * * Environment: holds xvcb lock over RPC to guard against race conditions * when a new callback is granted for the same file later on. + * + * \return 0 for success. */ afs_int32 afs_FlushVCBs(afs_int32 lockit) *************** *** 492,509 **** return 0; } ! /* ! * afs_QueueVCB ! * ! * Description: ! * Queue a callback on the given fid. ! * ! * Parameters: ! * avc: vcache entry * * Environment: * Locks the xvcb lock. * Called when the xvcache lock is already held. */ static afs_int32 --- 487,501 ---- return 0; } ! /*! ! * Queue a callback on the given fid. * * Environment: * Locks the xvcb lock. * Called when the xvcache lock is already held. + * + * \param avc vcache entry + * \return 0 for success < 0 otherwise. */ static afs_int32 *************** *** 538,556 **** } ! /* ! * afs_RemoveVCB ! * ! * Description: ! * Remove a queued callback for a given Fid. ! * ! * Parameters: ! * afid: The fid we want cleansed of queued callbacks. * * Environment: * Locks xvcb and xserver locks. * Typically called with xdcache, xvcache and/or individual vcache * entries locked. */ void --- 530,545 ---- } ! /*! ! * Remove a queued callback for a given Fid. * * Environment: * Locks xvcb and xserver locks. * Typically called with xdcache, xvcache and/or individual vcache * entries locked. + * + * \param afid The fid we want cleansed of queued callbacks. + * */ void *************** *** 623,643 **** #endif } ! /* ! * afs_NewVCache * ! * Description: ! * This routine is responsible for allocating a new cache entry ! * from the free list. It formats the cache entry and inserts it ! * into the appropriate hash tables. It must be called with ! * afs_xvcache write-locked so as to prevent several processes from ! * trying to create a new cache entry simultaneously. * ! * Parameters: ! * afid : The file id of the file whose cache entry is being ! * created. */ - /* LOCK: afs_NewVCache afs_xvcache W */ struct vcache * afs_NewVCache(struct VenusFid *afid, struct server *serverp) { --- 612,630 ---- #endif } ! /*! ! * This routine is responsible for allocating a new cache entry ! * from the free list. It formats the cache entry and inserts it ! * into the appropriate hash tables. It must be called with ! * afs_xvcache write-locked so as to prevent several processes from ! * trying to create a new cache entry simultaneously. * ! * LOCK: afs_NewVCache afs_xvcache W * ! * \param afid The file id of the file whose cache entry is being created. ! * ! * \return The new vcache struct. */ struct vcache * afs_NewVCache(struct VenusFid *afid, struct server *serverp) { *************** *** 754,761 **** return NULL; } } ! } #if defined(AFS_LINUX22_ENV) { struct inode *ip; --- 741,749 ---- return NULL; } } ! } /* finished freeing up space */ + /* Alloc new vnode. */ #if defined(AFS_LINUX22_ENV) { struct inode *ip; *************** *** 870,876 **** if (tq == uq) break; } ! } if (!freeVCList) { /* none free, making one is better than a panic */ afs_stats_cmperf.vcacheXAllocs++; /* count in case we have a leak */ --- 858,865 ---- if (tq == uq) break; } ! } /* end of if (!freeVCList) */ ! if (!freeVCList) { /* none free, making one is better than a panic */ afs_stats_cmperf.vcacheXAllocs++; /* count in case we have a leak */ *************** *** 903,909 **** tvc = freeVCList; /* take from free list */ freeVCList = tvc->nextfree; tvc->nextfree = NULL; ! } #endif /* AFS_OSF_ENV */ #if defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) --- 892,899 ---- tvc = freeVCList; /* take from free list */ freeVCList = tvc->nextfree; tvc->nextfree = NULL; ! } /* end of if (!freeVCList) */ ! #endif /* AFS_OSF_ENV */ #if defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV) *************** *** 1170,1185 **** } /*afs_NewVCache */ ! /* ! * afs_FlushActiveVcaches * ! * Description: ! * ??? * ! * Parameters: ! * doflocks : Do we handle flocks? */ - /* LOCK: afs_FlushActiveVcaches afs_xvcache N */ void afs_FlushActiveVcaches(register afs_int32 doflocks) { --- 1160,1172 ---- } /*afs_NewVCache */ ! /*! ! * ??? * ! * LOCK: afs_FlushActiveVcaches afs_xvcache N * ! * \param doflocks : Do we handle flocks? */ void afs_FlushActiveVcaches(register afs_int32 doflocks) { *************** *** 1327,1337 **** ! /* ! * afs_VerifyVCache ! * ! * Description: ! * Make sure a cache entry is up-to-date status-wise. * * NOTE: everywhere that calls this can potentially be sped up * by checking CStatd first, and avoiding doing the InitReq --- 1314,1321 ---- ! /*! ! * Make sure a cache entry is up-to-date status-wise. * * NOTE: everywhere that calls this can potentially be sped up * by checking CStatd first, and avoiding doing the InitReq *************** *** 1340,1350 **** * Anymore, the only places that call this KNOW already that the * vcache is not up-to-date, so we don't screw around. * ! * Parameters: ! * avc : Ptr to vcache entry to verify. ! * areq : ??? */ int afs_VerifyVCache2(struct vcache *avc, struct vrequest *areq) { --- 1324,1349 ---- * Anymore, the only places that call this KNOW already that the * vcache is not up-to-date, so we don't screw around. * ! * \param avc : Ptr to vcache entry to verify. ! * \param areq : ??? */ + /*! + * + * Make sure a cache entry is up-to-date status-wise. + * + * NOTE: everywhere that calls this can potentially be sped up + * by checking CStatd first, and avoiding doing the InitReq + * if this is up-to-date. + * + * Anymore, the only places that call this KNOW already that the + * vcache is not up-to-date, so we don't screw around. + * + * \param avc Pointer to vcache entry to verify. + * \param areq + * + * \return 0 for success or other error codes. + */ int afs_VerifyVCache2(struct vcache *avc, struct vrequest *areq) { *************** *** 1394,1413 **** } /*afs_VerifyVCache */ ! /* ! * afs_SimpleVStat * ! * Description: ! * Simple copy of stat info into cache. * ! * Parameters: ! * avc : Ptr to vcache entry involved. ! * astat : Ptr to stat info to copy. * - * Environment: - * Nothing interesting. - * - * Callers: as of 1992-04-29, only called by WriteVCache */ static void afs_SimpleVStat(register struct vcache *avc, --- 1393,1406 ---- } /*afs_VerifyVCache */ ! /*! ! * Simple copy of stat info into cache. * ! * Callers:as of 1992-04-29, only called by WriteVCache * ! * \param avc Ptr to vcache entry involved. ! * \param astat Ptr to stat info to copy. * */ static void afs_SimpleVStat(register struct vcache *avc, *************** *** 1490,1509 **** } /*afs_SimpleVStat */ ! /* ! * afs_WriteVCache * ! * Description: ! * Store the status info *only* back to the server for a ! * fid/vrequest. * ! * Parameters: ! * avc : Ptr to the vcache entry. ! * astatus : Ptr to the status info to store. ! * areq : Ptr to the associated vrequest. * ! * Environment: ! * Must be called with a shared lock held on the vnode. */ int --- 1483,1499 ---- } /*afs_SimpleVStat */ ! /*! ! * Store the status info *only* back to the server for a ! * fid/vrequest. * ! * Environment: Must be called with a shared lock held on the vnode. * ! * \param avc Ptr to the vcache entry. ! * \param astatus Ptr to the status info to store. ! * \param areq Ptr to the associated vrequest. * ! * \return Operation status. */ int *************** *** 1651,1673 **** #endif ! /* ! * afs_ProcessFS * ! * Description: ! * Copy astat block into vcache info * ! * Parameters: ! * avc : Ptr to vcache entry. ! * astat : Ptr to stat block to copy in. ! * areq : Ptr to associated request. * ! * Environment: ! * Must be called under a write lock ! * ! * Note: this code may get dataversion and length out of sync if the file has ! * been modified. This is less than ideal. I haven't thought about ! * it sufficiently to be certain that it is adequate. */ void afs_ProcessFS(register struct vcache *avc, --- 1641,1658 ---- #endif ! /*! ! * Copy astat block into vcache info * ! * \note This code may get dataversion and length out of sync if the file has ! * been modified. This is less than ideal. I haven't thought about it sufficiently ! * to be certain that it is adequate. * ! * \note Environment: Must be called under a write lock * ! * \param avc Ptr to vcache entry. ! * \param astat Ptr to stat block to copy in. ! * \param areq Ptr to associated request. */ void afs_ProcessFS(register struct vcache *avc, *************** *** 1753,1758 **** --- 1738,1756 ---- } /*afs_ProcessFS */ + /*! + * Get fid from server. + * + * \param afid + * \param areq Request to be passed on. + * \param name Name of ?? to lookup. + * \param OutStatus Fetch status. + * \param CallBackp + * \param serverp + * \param tsyncp + * + * \return Success status of operation. + */ int afs_RemoteLookup(register struct VenusFid *afid, struct vrequest *areq, char *name, struct VenusFid *nfid, *************** *** 1791,1811 **** } ! /* * afs_GetVCache * ! * Description: ! * Given a file id and a vrequest structure, fetch the status ! * information associated with the file. * ! * Parameters: ! * afid : File ID. ! * areq : Ptr to associated vrequest structure, specifying the ! * user whose authentication tokens will be used. ! * avc : caller may already have a vcache for this file, which is ! * already held. * ! * Environment: * The cache entry is returned with an increased vrefCount field. * The entry must be discarded by calling afs_PutVCache when you * are through using the pointer to the cache entry. --- 1789,1807 ---- } ! /*! * afs_GetVCache * ! * Given a file id and a vrequest structure, fetch the status ! * information associated with the file. * ! * \param afid File ID. ! * \param areq Ptr to associated vrequest structure, specifying the ! * user whose authentication tokens will be used. ! * \param avc Caller may already have a vcache for this file, which is ! * already held. * ! * \note Environment: * The cache entry is returned with an increased vrefCount field. * The entry must be discarded by calling afs_PutVCache when you * are through using the pointer to the cache entry. *************** *** 1821,1831 **** * of a parent dir cache entry, given a file (to check its access * control list). It also allows renames to be handled easily by * locking directories in a constant order. ! * NB. NewVCache -> FlushVCache presently (4/10/95) drops the xvcache lock. */ - /* might have a vcache structure already, which must - * already be held by the caller */ - struct vcache * afs_GetVCache(register struct VenusFid *afid, struct vrequest *areq, afs_int32 * cached, struct vcache *avc) --- 1817,1828 ---- * of a parent dir cache entry, given a file (to check its access * control list). It also allows renames to be handled easily by * locking directories in a constant order. ! * ! * \note NB. NewVCache -> FlushVCache presently (4/10/95) drops the xvcache lock. ! * ! * \note Might have a vcache structure already, which must ! * already be held by the caller */ struct vcache * afs_GetVCache(register struct VenusFid *afid, struct vrequest *areq, afs_int32 * cached, struct vcache *avc) *************** *** 2024,2035 **** if (AFS_IS_DISCONNECTED) { if (AFS_IS_DISCON_RW) { ! /* Seek the vnode manually. */ ! ObtainSharedLock(&afs_xvcache, 738); ! avc = afs_FindVCache(afid, NULL, 1); ! ReleaseSharedLock(&afs_xvcache); ! ! if (vType(avc) == VDIR) OutStatus.FileType = Directory; code = tvc?0:ENOENT; --- 2021,2027 ---- if (AFS_IS_DISCONNECTED) { if (AFS_IS_DISCON_RW) { ! if (vType(tvc) == VDIR) OutStatus.FileType = Directory; code = tvc?0:ENOENT; *************** *** 2071,2076 **** --- 2063,2081 ---- + /*! + * Lookup a vcache by fid. Look inside the cache first, if not + * there, lookup the file on the server, and then get it's fresh + * cache entry. + * + * \param afid + * \param areq + * \param cached Is element cached? If NULL, don't answer. + * \param adp + * \param aname + * + * \return The found element or NULL. + */ struct vcache * afs_LookupVCache(struct VenusFid *afid, struct vrequest *areq, afs_int32 * cached, struct vcache *adp, char *aname) *************** *** 2552,2559 **** } ! /* ! * must be called with avc write-locked * don't absolutely have to invalidate the hint unless the dv has * changed, but be sure to get it right else there will be consistency bugs. */ --- 2557,2564 ---- } ! /*! ! * Must be called with avc write-locked * don't absolutely have to invalidate the hint unless the dv has * changed, but be sure to get it right else there will be consistency bugs. */ *************** *** 2752,2768 **** } /*afs_StuffVcache */ #endif ! /* ! * afs_PutVCache ! * ! * Description: ! * Decrements the reference count on a cache entry. * ! * Parameters: ! * avc : Pointer to the cache entry to decrement. * ! * Environment: ! * Nothing interesting. */ void afs_PutVCache(register struct vcache *avc) --- 2757,2768 ---- } /*afs_StuffVcache */ #endif ! /*! ! * Decrements the reference count on a cache entry. * ! * \param avc Pointer to the cache entry to decrement. * ! * \note Environment: Nothing interesting. */ void afs_PutVCache(register struct vcache *avc) *************** *** 2782,2787 **** --- 2782,2796 ---- } /*afs_PutVCache */ + /*! + * Sleepa when searching for a vcache. Releases all the pending locks, + * sleeps then obtains the previously released locks. + * + * \param vcache Enter sleep state. + * \param flag Determines what locks to use. + * + * \return + */ static void findvc_sleep(struct vcache *avc, int flag) { if (flag & IS_SLOCK) { ReleaseSharedLock(&afs_xvcache); *************** *** 2803,2825 **** } } } ! /* ! * afs_FindVCache ! * ! * Description: ! * Find a vcache entry given a fid. ! * ! * Parameters: ! * afid : Pointer to the fid whose cache entry we desire. ! * retry: (SGI-specific) tell the caller to drop the lock on xvcache, ! * unlock the vnode, and try again. ! * flags: bit 1 to specify whether to compute hit statistics. Not ! * set if FindVCache is called as part of internal bookkeeping. * ! * Environment: ! * Must be called with the afs_xvcache lock at least held at ! * the read level. In order to do the VLRU adjustment, the xvcache lock ! * must be shared-- we upgrade it here. */ struct vcache * --- 2812,2829 ---- } } } ! /*! ! * Find a vcache entry given a fid. * ! * \param afid Pointer to the fid whose cache entry we desire. ! * \param retry (SGI-specific) tell the caller to drop the lock on xvcache, ! * unlock the vnode, and try again. ! * \param flag Bit 1 to specify whether to compute hit statistics. Not ! * set if FindVCache is called as part of internal bookkeeping. ! * ! * \note Environment: Must be called with the afs_xvcache lock at least held at ! * the read level. In order to do the VLRU adjustment, the xvcache lock ! * must be shared-- we upgrade it here. */ struct vcache * *************** *** 2935,2962 **** return tvc; } /*afs_FindVCache */ ! /* ! * afs_NFSFindVCache ! * ! * Description: ! * Find a vcache entry given a fid. Does a wildcard match on what we ! * have for the fid. If more than one entry, don't return anything. * ! * Parameters: ! * avcp : Fill in pointer if we found one and only one. ! * afid : Pointer to the fid whose cache entry we desire. ! * retry: (SGI-specific) tell the caller to drop the lock on xvcache, * unlock the vnode, and try again. ! * flags: bit 1 to specify whether to compute hit statistics. Not * set if FindVCache is called as part of internal bookkeeping. * ! * Environment: ! * Must be called with the afs_xvcache lock at least held at ! * the read level. In order to do the VLRU adjustment, the xvcache lock ! * must be shared-- we upgrade it here. * ! * Return value: ! * number of matches found. */ int afs_duplicate_nfs_fids = 0; --- 2939,2960 ---- return tvc; } /*afs_FindVCache */ ! /*! ! * Find a vcache entry given a fid. Does a wildcard match on what we ! * have for the fid. If more than one entry, don't return anything. * ! * \param avcp Fill in pointer if we found one and only one. ! * \param afid Pointer to the fid whose cache entry we desire. ! * \param retry (SGI-specific) tell the caller to drop the lock on xvcache, * unlock the vnode, and try again. ! * \param flags bit 1 to specify whether to compute hit statistics. Not * set if FindVCache is called as part of internal bookkeeping. * ! * \note Environment: Must be called with the afs_xvcache lock at least held at ! * the read level. In order to do the VLRU adjustment, the xvcache lock ! * must be shared-- we upgrade it here. * ! * \return Number of matches found. */ int afs_duplicate_nfs_fids = 0; *************** *** 3109,3118 **** ! /* ! * afs_vcacheInit ! * * Initialize vcache related variables */ void afs_vcacheInit(int astatSize) --- 3107,3116 ---- ! /*! * Initialize vcache related variables + * + * \param astatSize */ void afs_vcacheInit(int astatSize) *************** *** 3177,3185 **** QInit(&afs_vhashTV[i]); } ! /* ! * shutdown_vcache ! * */ void shutdown_vcache(void) --- 3175,3182 ---- QInit(&afs_vhashTV[i]); } ! /*! ! * Shutdown vcache. */ void shutdown_vcache(void) Index: openafs/src/afs/afs_volume.c diff -c openafs/src/afs/afs_volume.c:1.31.2.6 openafs/src/afs/afs_volume.c:1.31.2.8 *** openafs/src/afs/afs_volume.c:1.31.2.6 Fri May 23 10:25:16 2008 --- openafs/src/afs/afs_volume.c Sat Nov 8 11:34:42 2008 *************** *** 19,25 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.31.2.6 2008/05/23 14:25:16 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 19,25 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.31.2.8 2008/11/08 16:34:42 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 58,68 **** #endif /* vlserver error base define */ /* Exported variables */ ! ino_t volumeInode; /*Inode for VolumeItems file */ ! afs_rwlock_t afs_xvolume; /* allocation lock for volumes */ struct volume *afs_freeVolList; struct volume *afs_volumes[NVOLS]; ! afs_int32 afs_volCounter = 1; /* for allocating volume indices */ afs_int32 fvTable[NFENTRIES]; /* Forward declarations */ --- 58,73 ---- #endif /* vlserver error base define */ /* Exported variables */ ! #if defined(LINUX_USE_FH) ! struct fid volumeinfo_fh; /* File handle for VolumeItems file */ ! int volumeinfo_fh_type; ! #else ! ino_t volumeInode; /* Inode for VolumeItems file */ ! #endif ! afs_rwlock_t afs_xvolume; /** allocation lock for volumes */ struct volume *afs_freeVolList; struct volume *afs_volumes[NVOLS]; ! afs_int32 afs_volCounter = 1; /** for allocating volume indices */ afs_int32 fvTable[NFENTRIES]; /* Forward declarations */ *************** *** 74,80 **** afs_int32 * cID); ! /* Convert a volume name to a #; return 0 if can't parse as a number */ static int afs_vtoi(register char *aname) { --- 79,90 ---- afs_int32 * cID); ! ! /** ! * Convert a volume name to a number; ! * @param aname Volume name. ! * @return return 0 if can't parse as a number. ! */ static int afs_vtoi(register char *aname) { *************** *** 93,99 **** } /*afs_vtoi */ ! /* * All of the vol cache routines must be called with the afs_xvolume * lock held in exclusive mode, since they use static variables. * In addition, we don't want two people adding the same volume --- 103,109 ---- } /*afs_vtoi */ ! /** * All of the vol cache routines must be called with the afs_xvolume * lock held in exclusive mode, since they use static variables. * In addition, we don't want two people adding the same volume *************** *** 103,110 **** static struct fvolume staticFVolume; afs_int32 afs_FVIndex = -1; ! /* UFS specific version of afs_GetVolSlot */ ! struct volume * afs_UFSGetVolSlot(void) { --- 113,122 ---- static struct fvolume staticFVolume; afs_int32 afs_FVIndex = -1; ! /** ! * UFS specific version of afs_GetVolSlot ! * @return ! */ struct volume * afs_UFSGetVolSlot(void) { *************** *** 152,158 **** --- 164,174 ---- * next chain */ if (afs_FVIndex != tv->vtix) { + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(&volumeinfo_fh, volumeinfo_fh_type); + #else tfile = osi_UFSOpen(volumeInode); + #endif code = afs_osi_Read(tfile, sizeof(struct fvolume) * tv->vtix, &staticFVolume, sizeof(struct fvolume)); *************** *** 169,175 **** --- 185,195 ---- staticFVolume.dotdot = tv->dotdot; staticFVolume.rootVnode = tv->rootVnode; staticFVolume.rootUnique = tv->rootUnique; + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(&volumeinfo_fh, volumeinfo_fh_type); + #else tfile = osi_UFSOpen(volumeInode); + #endif code = afs_osi_Write(tfile, sizeof(struct fvolume) * afs_FVIndex, &staticFVolume, sizeof(struct fvolume)); *************** *** 185,190 **** --- 205,215 ---- } /*afs_UFSGetVolSlot */ + /** + * Get an available volume list slot. If the list does not exist, + * create one containing a single element. + * @return + */ struct volume * afs_MemGetVolSlot(void) { *************** *** 205,213 **** } /*afs_MemGetVolSlot */ ! /* afs_ResetVolumes() ! * Reset volume inforamation for all volume structs that * point to a speicific server. */ void afs_ResetVolumes(struct server *srvp) --- 230,239 ---- } /*afs_MemGetVolSlot */ ! /** ! * Reset volume information for all volume structs that * point to a speicific server. + * @param srvp */ void afs_ResetVolumes(struct server *srvp) *************** *** 230,236 **** } ! /* reset volume name to volume id mapping cache */ void afs_CheckVolumeNames(int flags) { --- 256,265 ---- } ! /** ! * Reset volume name to volume id mapping cache. ! * @param flags ! */ void afs_CheckVolumeNames(int flags) { *************** *** 276,281 **** --- 305,311 ---- continue; } } + /* ??? */ if (flags & (AFS_VOLCHECK_BUSY | AFS_VOLCHECK_FORCE)) { for (j = 0; j < MAXHOSTS; j++) tv->status[j] = not_busy; *************** *** 369,374 **** --- 399,412 ---- } /*afs_CheckVolumeNames */ + /** + * Check if volume is in the specified list. + * @param fid File FID. + * @param nvols Nomber of volumes??? + * @param vID Array of volume IDs. + * @param cID Array of cache IDs. + * @return 1 - true, 0 - false. + */ static int inVolList(struct VenusFid *fid, afs_int32 nvols, afs_int32 * vID, afs_int32 * cID) *************** *** 390,399 **** /* afs_PutVolume is now a macro in afs.h */ ! /* afs_FindVolume() ! * return volume struct if we have it cached and it's up-to-date ! * ! * Environment: Must be called with afs_xvolume unlocked. */ struct volume * afs_FindVolume(struct VenusFid *afid, afs_int32 locktype) --- 428,439 ---- /* afs_PutVolume is now a macro in afs.h */ ! /** ! * Return volume struct if we have it cached and it's up-to-date. ! * Environment: Must be called with afs_xvolume unlocked. ! * @param afid Volume FID. ! * @param locktype ! * @return Volume or NULL if no result. */ struct volume * afs_FindVolume(struct VenusFid *afid, afs_int32 locktype) *************** *** 419,427 **** ! /* ! * Note that areq may be null, in which case we don't bother to set any * request status information. */ struct volume * afs_GetVolume(struct VenusFid *afid, struct vrequest *areq, --- 459,471 ---- ! /** ! * Note that areq may be null, in which case we don't bother to set any * request status information. + * @param afid Volume FID. + * @param areq Request type. + * @param locktype Lock to be used. + * @return Volume or NULL if no result. */ struct volume * afs_GetVolume(struct VenusFid *afid, struct vrequest *areq, *************** *** 433,438 **** --- 477,483 ---- tv = afs_FindVolume(afid, locktype); if (!tv) { + /* Do a dynroot check and add dynroot volume if found. */ if (afs_IsDynrootAnyFid(afid)) { tv = afs_NewDynrootVolume(afid); } else { *************** *** 445,450 **** --- 490,506 ---- + /** + * + * @param volid Volume ID. If it's 0, get it from the name. + * @param aname Volume name. + * @param ve Volume entry. + * @param tcell The cell containing this volume. + * @param agood + * @param type Type of volume. + * @param areq Request. + * @return Volume or NULL if failure. + */ static struct volume * afs_SetupVolume(afs_int32 volid, char *aname, void *ve, struct cell *tcell, afs_int32 agood, afs_int32 type, struct vrequest *areq) *************** *** 477,485 **** volid = nve->volumeId[whichType]; } else { volid = ove->volumeId[whichType]; ! } ! } ! } ObtainWriteLock(&afs_xvolume, 108); --- 533,541 ---- volid = nve->volumeId[whichType]; } else { volid = ove->volumeId[whichType]; ! } ! } /* end of if (volid == 0) */ ! } /* end of if (!volid) */ ObtainWriteLock(&afs_xvolume, 108); *************** *** 502,508 **** for (j = fvTable[FVHash(tv->cell, volid)]; j != 0; j = tf->next) { if (afs_FVIndex != j) { struct osi_file *tfile; ! tfile = osi_UFSOpen(volumeInode); err = afs_osi_Read(tfile, sizeof(struct fvolume) * j, &staticFVolume, sizeof(struct fvolume)); --- 558,568 ---- for (j = fvTable[FVHash(tv->cell, volid)]; j != 0; j = tf->next) { if (afs_FVIndex != j) { struct osi_file *tfile; ! #if defined(LINUX_USE_FH) ! tfile = osi_UFSOpen_fh(&volumeinfo_fh, volumeinfo_fh_type); ! #else ! tfile = osi_UFSOpen(volumeInode); ! #endif err = afs_osi_Read(tfile, sizeof(struct fvolume) * j, &staticFVolume, sizeof(struct fvolume)); *************** *** 556,561 **** --- 616,631 ---- } + /** + * Seek volume by it's name and attributes. + * If volume not found, try to add one. + * @param aname Volume name. + * @param acell Cell + * @param agood + * @param areq + * @param locktype Type of lock to be used. + * @return + */ struct volume * afs_GetVolumeByName(register char *aname, afs_int32 acell, int agood, struct vrequest *areq, afs_int32 locktype) *************** *** 585,590 **** --- 655,665 ---- return (tv); } + /** + * Init a new dynroot volume. + * @param Volume FID. + * @return Volume or NULL if not found. + */ static struct volume * afs_NewDynrootVolume(struct VenusFid *fid) { *************** *** 613,618 **** --- 688,702 ---- } int lastnvcode; + + /** + * @param aname Volume name. + * @param acell Cell id. + * @param agood + * @param areq Request type. + * @param locktype Type of lock to be used. + * @return Volume or NULL if failure. + */ static struct volume * afs_NewVolumeByName(char *aname, afs_int32 acell, int agood, struct vrequest *areq, afs_int32 locktype) *************** *** 759,765 **** ! /* call this with the volume structure locked; used for new-style vldb requests */ void InstallVolumeEntry(struct volume *av, struct vldbentry *ve, int acell) { --- 843,854 ---- ! /** ! * Call this with the volume structure locked; used for new-style vldb requests. ! * @param av Volume ! * @param ve ! * @param acell ! */ void InstallVolumeEntry(struct volume *av, struct vldbentry *ve, int acell) { *************** *** 1052,1057 **** --- 1141,1151 ---- } /*InstallVolumeEntry */ + /** + * Reset volume info for the specified volume strecture. Mark volume + * to be rechecked next time. + * @param tv + */ void afs_ResetVolumeInfo(struct volume *tv) { Index: openafs/src/afs/exporter.h diff -c openafs/src/afs/exporter.h:1.8.14.3 openafs/src/afs/exporter.h:1.8.14.4 *** openafs/src/afs/exporter.h:1.8.14.3 Mon Jul 31 17:27:39 2006 --- openafs/src/afs/exporter.h Sat Oct 25 20:45:55 2008 *************** *** 107,113 **** #define EXP_CHECKHOST(EXP, HOST) \ (*(EXP)->exp_op->export_checkhost)(EXP, HOST) #define EXP_GETHOST(EXP) \ ! (*(EXP)->exp_op->export_checkhost)(EXP) struct afs3_fid { u_short len; --- 107,113 ---- #define EXP_CHECKHOST(EXP, HOST) \ (*(EXP)->exp_op->export_checkhost)(EXP, HOST) #define EXP_GETHOST(EXP) \ ! (*(EXP)->exp_op->export_gethost)(EXP) struct afs3_fid { u_short len; Index: openafs/src/afs/sysincludes.h diff -c openafs/src/afs/sysincludes.h:1.40.2.6 openafs/src/afs/sysincludes.h:1.40.2.7 *** openafs/src/afs/sysincludes.h:1.40.2.6 Sat Aug 16 15:42:58 2008 --- openafs/src/afs/sysincludes.h Sat Nov 8 11:34:42 2008 *************** *** 120,125 **** --- 120,128 ---- #ifdef COMPLETION_H_EXISTS #include #endif + #if defined(LINUX_USE_FH) + #include + #endif #else /* AFS_LINUX22_ENV */ #if defined(AFS_DARWIN_ENV) Index: openafs/src/afs/HPUX/osi_machdep.h diff -c openafs/src/afs/HPUX/osi_machdep.h:1.14.4.1 openafs/src/afs/HPUX/osi_machdep.h:1.14.4.2 *** openafs/src/afs/HPUX/osi_machdep.h:1.14.4.1 Thu Nov 9 19:11:06 2006 --- openafs/src/afs/HPUX/osi_machdep.h Thu Oct 9 14:56:53 2008 *************** *** 30,35 **** --- 30,37 ---- #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #define gop_rdwr(rw,gp,base,len,offset,segflg,unit,aresid) \ vn_rdwr((rw),(gp),(base),(len),(offset),(segflg),(unit),(aresid),0) + #define gop_lookupname(fnamep,segflg,followlink,compvpp) \ + lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) #undef afs_suser Index: openafs/src/afs/LINUX/osi_file.c diff -c openafs/src/afs/LINUX/osi_file.c:1.28.2.10 openafs/src/afs/LINUX/osi_file.c:1.28.2.11 *** openafs/src/afs/LINUX/osi_file.c:1.28.2.10 Wed Mar 26 00:10:39 2008 --- openafs/src/afs/LINUX/osi_file.c Sat Nov 8 11:34:42 2008 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.28.2.10 2008/03/26 04:10:39 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.28.2.11 2008/11/08 16:34:42 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ *************** *** 36,49 **** #if defined(AFS_LINUX26_ENV) void * osi_UFSOpen(afs_int32 ainode) { register struct osi_file *afile = NULL; extern int cacheDiskType; struct inode *tip = NULL; struct dentry *dp = NULL; struct file *filp = NULL; ! #if !defined(HAVE_IGET) struct fid fid; #endif AFS_STATCNT(osi_UFSOpen); --- 36,53 ---- #if defined(AFS_LINUX26_ENV) void * + #if defined(LINUX_USE_FH) + osi_UFSOpen_fh(struct fid *fh, int fh_type) + #else osi_UFSOpen(afs_int32 ainode) + #endif { register struct osi_file *afile = NULL; extern int cacheDiskType; struct inode *tip = NULL; struct dentry *dp = NULL; struct file *filp = NULL; ! #if !defined(HAVE_IGET) || defined(LINUX_USE_FH) struct fid fid; #endif AFS_STATCNT(osi_UFSOpen); *************** *** 70,93 **** dp = d_alloc_anon(tip); #else fid.i32.ino = ainode; fid.i32.gen = 0; dp = afs_cacheSBp->s_export_op->fh_to_dentry(afs_cacheSBp, &fid, sizeof(fid), FILEID_INO32_GEN); if (!dp) ! osi_Panic("Can't get dentry for inode %d\n", ainode); tip = dp->d_inode; #endif tip->i_flags |= MS_NOATIME; /* Disable updating access times. */ filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR); if (IS_ERR(filp)) osi_Panic("Can't open inode %d\n", ainode); afile->filp = filp; afile->size = FILE_INODE(filp)->i_size; AFS_GLOCK(); afile->offset = 0; afile->proc = (int (*)())0; afile->inum = ainode; /* for hint validity checking */ return (void *)afile; } #else --- 74,109 ---- dp = d_alloc_anon(tip); #else + #if defined(LINUX_USE_FH) + dp = afs_cacheSBp->s_export_op->fh_to_dentry(afs_cacheSBp, fh, sizeof(struct fid), fh_type); + #else fid.i32.ino = ainode; fid.i32.gen = 0; dp = afs_cacheSBp->s_export_op->fh_to_dentry(afs_cacheSBp, &fid, sizeof(fid), FILEID_INO32_GEN); + #endif if (!dp) ! osi_Panic("Can't get dentry\n"); tip = dp->d_inode; #endif tip->i_flags |= MS_NOATIME; /* Disable updating access times. */ filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR); if (IS_ERR(filp)) + #if defined(LINUX_USE_FH) + osi_Panic("Can't open file\n"); + #else osi_Panic("Can't open inode %d\n", ainode); + #endif afile->filp = filp; afile->size = FILE_INODE(filp)->i_size; AFS_GLOCK(); afile->offset = 0; afile->proc = (int (*)())0; + #if defined(LINUX_USE_FH) + afile->inum = tip->i_ino; /* for hint validity checking */ + #else afile->inum = ainode; /* for hint validity checking */ + #endif return (void *)afile; } #else *************** *** 143,148 **** --- 159,181 ---- } #endif + #if defined(LINUX_USE_FH) + int + osi_get_fh(struct dentry *dp, struct fid *fh, int *max_len) { + int fh_type; + + if (dp->d_sb->s_export_op->encode_fh) { + fh_type = dp->d_sb->s_export_op->encode_fh(dp, (__u32 *)fh, max_len, 0); + } else { + fh_type = FILEID_INO32_GEN; + fh->i32.ino = dp->d_inode->i_ino; + fh->i32.gen = dp->d_inode->i_generation; + } + dput(dp); + return(fh_type); + } + #endif + int afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat) { *************** *** 372,377 **** --- 405,415 ---- osi_InitCacheInfo(char *aname) { int code; + #if defined(LINUX_USE_FH) + int max_len = sizeof(struct fid); + #else + extern ino_t cacheInode; + #endif struct dentry *dp; extern ino_t cacheInode; extern struct osi_dev cacheDev; *************** *** 382,388 **** --- 420,436 ---- if (code) return ENOENT; + #if defined(LINUX_USE_FH) + if (dp->d_sb->s_export_op->encode_fh) { + cacheitems_fh_type = dp->d_sb->s_export_op->encode_fh(dp, (__u32 *)&cacheitems_fh, &max_len, 0); + } else { + cacheitems_fh_type = FILEID_INO32_GEN; + cacheitems_fh.i32.ino = dp->d_inode->i_ino; + cacheitems_fh.i32.gen = dp->d_inode->i_generation; + } + #else cacheInode = dp->d_inode->i_ino; + #endif cacheDev.dev = dp->d_inode->i_sb->s_dev; afs_fsfragsize = dp->d_inode->i_sb->s_blocksize - 1; afs_cacheSBp = dp->d_inode->i_sb; Index: openafs/src/afs/LINUX/osi_vfsops.c diff -c openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.22 openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.23 *** openafs/src/afs/LINUX/osi_vfsops.c:1.42.4.22 Mon Jun 30 23:35:23 2008 --- openafs/src/afs/LINUX/osi_vfsops.c Sat Nov 8 11:14:01 2008 *************** *** 16,22 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.42.4.22 2008/07/01 03:35:23 shadow Exp $"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ --- 16,22 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.42.4.23 2008/11/08 16:14:01 shadow Exp $"); #define __NO_VERSION__ /* don't define kernel_version in module.h */ #include /* early to avoid printf->printk mapping */ *************** *** 149,154 **** --- 149,157 ---- #if defined(AFS_LINUX26_ENV) && !defined(AFS_NONFSTRANS) sb->s_export_op = &afs_export_ops; #endif + #if defined(HAVE_BDI_INIT) + bdi_init(&afs_backing_dev_info); + #endif #if defined(MAX_NON_LFS) #ifdef AFS_64BIT_CLIENT #if !defined(MAX_LFS_FILESIZE) *************** *** 400,405 **** --- 403,411 ---- #endif osi_linux_verify_alloced_memory(); + #if defined(HAVE_BDI_INIT) + bdi_destroy(&afs_backing_dev_info); + #endif AFS_GUNLOCK(); sbp->s_dev = 0; Index: openafs/src/afs/LINUX/osi_vm.c diff -c openafs/src/afs/LINUX/osi_vm.c:1.17 openafs/src/afs/LINUX/osi_vm.c:1.17.4.1 *** openafs/src/afs/LINUX/osi_vm.c:1.17 Mon Jul 11 14:45:51 2005 --- openafs/src/afs/LINUX/osi_vm.c Mon Oct 20 08:09:43 2008 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vm.c,v 1.17 2005/07/11 18:45:51 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vm.c,v 1.17.4.1 2008/10/20 12:09:43 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 102,107 **** --- 102,112 ---- { struct inode *ip = AFSTOV(avc); + if (!avc->states & CPageWrite) + avc->states |= CPageWrite; + else + return; /* someone already writing */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,5) /* filemap_fdatasync() only exported in 2.4.5 and above */ ReleaseWriteLock(&avc->lock); *************** *** 115,120 **** --- 120,126 ---- AFS_GLOCK(); ObtainWriteLock(&avc->lock, 121); #endif + avc->states &= ~CPageWrite; } /* Purge VM for a file when its callback is revoked. Index: openafs/src/afs/LINUX/osi_vnodeops.c diff -c openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.33 openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.38 *** openafs/src/afs/LINUX/osi_vnodeops.c:1.126.2.33 Tue Oct 7 15:00:42 2008 --- openafs/src/afs/LINUX/osi_vnodeops.c Sat Nov 8 11:49:45 2008 *************** *** 22,28 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.126.2.33 2008/10/07 19:00:42 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" --- 22,28 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.126.2.38 2008/11/08 16:49:45 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" *************** *** 53,61 **** --- 53,63 ---- #if defined(AFS_LINUX26_ENV) #define LockPage(pp) lock_page(pp) #define UnlockPage(pp) unlock_page(pp) + extern struct backing_dev_info afs_backing_dev_info; #endif extern struct vcache *afs_globalVp; + extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp); #if defined(AFS_LINUX26_ENV) /* Some uses of BKL are perhaps not needed for bypass or memcache-- * why don't we try it out? */ *************** *** 94,114 **** if (code) code = -code; else { ! isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT; offindex = *offp >> PAGE_CACHE_SHIFT; if(offindex > isize) { code=0; goto done; } ! ! osi_FlushPages(vcp, credp); /* ensure stale pages are gone */ ! AFS_GUNLOCK(); #ifdef DO_SYNC_READ ! code = do_sync_read(fp, buf, count, offp); #else ! code = generic_file_read(fp, buf, count, offp); #endif ! AFS_GLOCK(); } afs_Trace4(afs_iclSetp, CM_TRACE_READOP, ICL_TYPE_POINTER, vcp, --- 96,119 ---- if (code) code = -code; else { ! #if defined(AFS_CACHE_BYPASS) ! #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ! isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT; offindex = *offp >> PAGE_CACHE_SHIFT; if(offindex > isize) { code=0; goto done; } ! #endif ! #endif ! osi_FlushPages(vcp, credp); /* ensure stale pages are gone */ ! AFS_GUNLOCK(); #ifdef DO_SYNC_READ ! code = do_sync_read(fp, buf, count, offp); #else ! code = generic_file_read(fp, buf, count, offp); #endif ! AFS_GLOCK(); } afs_Trace4(afs_iclSetp, CM_TRACE_READOP, ICL_TYPE_POINTER, vcp, *************** *** 1734,1739 **** --- 1739,1746 ---- set_bit(PG_locked, &pp->flags); /* other bits? See mm.h */ clear_bit(PG_error, &pp->flags); #endif + #if defined(AFS_CACHE_BYPASS) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) /* If the page is past the end of the file, skip it */ isize = (i_size_read(fp->f_mapping->host) - 1) >> PAGE_CACHE_SHIFT; if(pp->index > isize) { *************** *** 1741,1746 **** --- 1748,1755 ---- UnlockPage(pp); goto done; } + #endif + #endif /* if bypasscache, receiver frees, else we do */ auio = osi_Alloc(sizeof(uio_t)); iovecp = osi_Alloc(sizeof(struct iovec)); *************** *** 1887,1892 **** --- 1896,1921 ---- ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp), ICL_TYPE_INT32, 99999); + ObtainReadLock(&vcp->lock); + if (vcp->states & CPageWrite) { + ReleaseReadLock(&vcp->lock); + AFS_GUNLOCK(); + maybe_unlock_kernel(); + crfree(credp); + kunmap(pp); + #ifdef AFS_LINUX26_ENV + #if defined(WRITEPAGE_ACTIVATE) + return WRITEPAGE_ACTIVATE; + #else + return AOP_WRITEPAGE_ACTIVATE; + #endif + #else + /* should mark it dirty? */ + return(0); + #endif + } + ReleaseReadLock(&vcp->lock); + setup_uio(&tuio, &iovec, buffer, base, count, UIO_WRITE, AFS_UIOSYS); code = afs_write(vcp, &tuio, f_flags, credp, 0); *************** *** 2048,2054 **** return -code; } ! #if defined(AFS_LINUX24_ENV) static int afs_linux_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to) --- 2077,2083 ---- return -code; } ! #if defined(AFS_LINUX24_ENV) && !defined(HAVE_WRITE_BEGIN) static int afs_linux_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to) *************** *** 2075,2084 **** #endif return 0; } ! extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp); #endif static struct inode_operations afs_file_iops = { #if defined(AFS_LINUX26_ENV) .permission = afs_linux_permission, --- 2104,2143 ---- #endif return 0; } + #endif ! #if defined(HAVE_WRITE_BEGIN) ! static int ! afs_linux_write_end(struct file *file, struct address_space *mapping, ! loff_t pos, unsigned len, unsigned copied, ! struct page *page, void *fsdata) ! { ! int code; ! pgoff_t index = pos >> PAGE_CACHE_SHIFT; ! unsigned from = pos & (PAGE_CACHE_SIZE - 1); ! ! code = afs_linux_writepage_sync(file->f_dentry->d_inode, page, ! from, copied); ! unlock_page(page); ! page_cache_release(page); ! return code; ! } ! ! static int ! afs_linux_write_begin(struct file *file, struct address_space *mapping, ! loff_t pos, unsigned len, unsigned flags, ! struct page **pagep, void **fsdata) ! { ! struct page *page; ! pgoff_t index = pos >> PAGE_CACHE_SHIFT; ! page = __grab_cache_page(mapping, index); ! *pagep = page; ! ! return 0; ! } #endif + static struct inode_operations afs_file_iops = { #if defined(AFS_LINUX26_ENV) .permission = afs_linux_permission, *************** *** 2103,2110 **** .readpages = afs_linux_readpages, #endif .writepage = afs_linux_writepage, ! .commit_write = afs_linux_commit_write, ! .prepare_write = afs_linux_prepare_write, }; #endif --- 2162,2174 ---- .readpages = afs_linux_readpages, #endif .writepage = afs_linux_writepage, ! #if defined (HAVE_WRITE_BEGIN) ! .write_begin = afs_linux_write_begin, ! .write_end = afs_linux_write_end, ! #else ! .commit_write = afs_linux_commit_write, ! .prepare_write = afs_linux_prepare_write, ! #endif }; #endif *************** *** 2204,2209 **** --- 2268,2274 ---- if (vattr) vattr2inode(ip, vattr); + ip->i_mapping->backing_dev_info = &afs_backing_dev_info; /* Reset ops if symlink or directory. */ if (S_ISREG(ip->i_mode)) { ip->i_op = &afs_file_iops; Index: openafs/src/afs/SOLARIS/osi_machdep.h diff -c openafs/src/afs/SOLARIS/osi_machdep.h:1.11.4.4 openafs/src/afs/SOLARIS/osi_machdep.h:1.11.4.5 *** openafs/src/afs/SOLARIS/osi_machdep.h:1.11.4.4 Fri Oct 5 18:18:35 2007 --- openafs/src/afs/SOLARIS/osi_machdep.h Thu Oct 9 14:54:17 2008 *************** *** 59,64 **** --- 59,66 ---- #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #define gop_rdwr(rw,gp,base,len,offset,segflg,ioflag,ulimit,cr,aresid) \ vn_rdwr((rw),(gp),(base),(len),(offset),(segflg),(ioflag),(ulimit),(cr),(aresid)) + #define gop_lookupname(fnamep,segflg,followlink,compvpp) \ + lookupname((fnamep),(segflg),(followlink),NULL,(compvpp)) #if defined(AFS_SUN510_ENV) Index: openafs/src/afs/UKERNEL/afs_usrops.c diff -c openafs/src/afs/UKERNEL/afs_usrops.c:1.30.6.8 openafs/src/afs/UKERNEL/afs_usrops.c:1.30.6.9 *** openafs/src/afs/UKERNEL/afs_usrops.c:1.30.6.8 Tue Jul 1 16:56:38 2008 --- openafs/src/afs/UKERNEL/afs_usrops.c Mon Oct 27 19:53:46 2008 *************** *** 15,21 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/UKERNEL/afs_usrops.c,v 1.30.6.8 2008/07/01 20:56:38 shadow Exp $"); #ifdef UKERNEL --- 15,21 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/UKERNEL/afs_usrops.c,v 1.30.6.9 2008/10/27 23:53:46 shadow Exp $"); #ifdef UKERNEL *************** *** 2201,2207 **** uafs_LookupName(char *path, struct usr_vnode *parentVp, struct usr_vnode **vpp, int follow, int no_eval_mtpt) { ! int code; int linkCount; struct usr_vnode *vp; struct usr_vnode *nextVp; --- 2201,2207 ---- uafs_LookupName(char *path, struct usr_vnode *parentVp, struct usr_vnode **vpp, int follow, int no_eval_mtpt) { ! int code = 0; int linkCount; struct usr_vnode *vp; struct usr_vnode *nextVp; Index: openafs/src/afs/VNOPS/afs_vnop_dirops.c diff -c openafs/src/afs/VNOPS/afs_vnop_dirops.c:1.21.4.3 openafs/src/afs/VNOPS/afs_vnop_dirops.c:1.21.4.4 *** openafs/src/afs/VNOPS/afs_vnop_dirops.c:1.21.4.3 Mon Sep 22 15:29:55 2008 --- openafs/src/afs/VNOPS/afs_vnop_dirops.c Sun Oct 12 14:10:14 2008 *************** *** 21,27 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_dirops.c,v 1.21.4.3 2008/09/22 19:29:55 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 21,27 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_dirops.c,v 1.21.4.4 2008/10/12 18:10:14 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 435,442 **** ObtainSharedLock(&tdc->lock, 732); } ! if (!tvc->ddirty_flags || ! (tvc->ddirty_flags == VDisconShadowed)) { /* Put it in the list only if it's fresh or has only been shadowed. */ ObtainWriteLock(&afs_DDirtyVCListLock, 728); AFS_DISCON_ADD_DIRTY(tvc); --- 435,441 ---- ObtainSharedLock(&tdc->lock, 732); } ! if (!tvc->ddirty_flags) { /* Put it in the list only if it's fresh or has only been shadowed. */ ObtainWriteLock(&afs_DDirtyVCListLock, 728); AFS_DISCON_ADD_DIRTY(tvc); Index: openafs/src/afs/VNOPS/afs_vnop_lookup.c diff -c openafs/src/afs/VNOPS/afs_vnop_lookup.c:1.72.2.9 openafs/src/afs/VNOPS/afs_vnop_lookup.c:1.72.2.10 *** openafs/src/afs/VNOPS/afs_vnop_lookup.c:1.72.2.9 Mon Sep 22 15:29:55 2008 --- openafs/src/afs/VNOPS/afs_vnop_lookup.c Mon Oct 27 19:41:43 2008 *************** *** 18,24 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.72.2.9 2008/09/22 19:29:55 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 18,24 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.72.2.10 2008/10/27 23:41:43 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 664,670 **** afs_int32 retry; /* handle low-level SGI MP race conditions */ long volStates; /* flags from vol structure */ struct volume *volp = 0; /* volume ptr */ ! struct VenusFid dotdot; int flagIndex = 0; /* First file with bulk fetch flag set */ int inlinebulk = 0; /* Did we use InlineBulk RPC or not? */ XSTATS_DECLS; --- 664,670 ---- afs_int32 retry; /* handle low-level SGI MP race conditions */ long volStates; /* flags from vol structure */ struct volume *volp = 0; /* volume ptr */ ! struct VenusFid dotdot = {0, 0, 0}; int flagIndex = 0; /* First file with bulk fetch flag set */ int inlinebulk = 0; /* Did we use InlineBulk RPC or not? */ XSTATS_DECLS; Index: openafs/src/afs/VNOPS/afs_vnop_read.c diff -c openafs/src/afs/VNOPS/afs_vnop_read.c:1.34.2.6 openafs/src/afs/VNOPS/afs_vnop_read.c:1.34.2.7 *** openafs/src/afs/VNOPS/afs_vnop_read.c:1.34.2.6 Mon Sep 22 15:29:55 2008 --- openafs/src/afs/VNOPS/afs_vnop_read.c Sat Nov 8 11:34:42 2008 *************** *** 19,25 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_read.c,v 1.34.2.6 2008/09/22 19:29:55 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 19,25 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_read.c,v 1.34.2.7 2008/11/08 16:34:42 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 806,813 **** usedihint++; } else #endif /* IHINT */ ! tfile = (struct osi_file *)osi_UFSOpen(tdc->f.inode); #ifdef AFS_DARWIN80_ENV trimlen = len; tuiop = afsio_darwin_partialcopy(auio, trimlen); --- 806,816 ---- usedihint++; } else #endif /* IHINT */ ! #if defined(LINUX_USE_FH) ! tfile = (struct osi_file *)osi_UFSOpen_fh(&tdc->f.fh, tdc->f.fh_type); ! #else tfile = (struct osi_file *)osi_UFSOpen(tdc->f.inode); + #endif #ifdef AFS_DARWIN80_ENV trimlen = len; tuiop = afsio_darwin_partialcopy(auio, trimlen); Index: openafs/src/afs/VNOPS/afs_vnop_symlink.c diff -c openafs/src/afs/VNOPS/afs_vnop_symlink.c:1.24.4.6 openafs/src/afs/VNOPS/afs_vnop_symlink.c:1.24.4.7 *** openafs/src/afs/VNOPS/afs_vnop_symlink.c:1.24.4.6 Sun Jun 8 23:30:30 2008 --- openafs/src/afs/VNOPS/afs_vnop_symlink.c Sat Nov 8 11:34:42 2008 *************** *** 22,28 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_symlink.c,v 1.24.4.6 2008/06/09 03:30:30 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 22,28 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_symlink.c,v 1.24.4.7 2008/11/08 16:34:42 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 336,342 **** --- 336,346 ---- rbuf = (char *)osi_AllocLargeSpace(AFS_LRALLOCSIZ); tlen = len; ObtainReadLock(&tdc->lock); + #if defined(LINUX_USE_FH) + tfile = osi_UFSOpen_fh(&tdc->f.fh, tdc->f.fh_type); + #else tfile = osi_UFSOpen(tdc->f.inode); + #endif code = afs_osi_Read(tfile, -1, rbuf, tlen); osi_UFSClose(tfile); ReleaseReadLock(&tdc->lock); Index: openafs/src/afs/VNOPS/afs_vnop_write.c diff -c openafs/src/afs/VNOPS/afs_vnop_write.c:1.50.2.4 openafs/src/afs/VNOPS/afs_vnop_write.c:1.50.2.5 *** openafs/src/afs/VNOPS/afs_vnop_write.c:1.50.2.4 Mon Sep 22 15:29:55 2008 --- openafs/src/afs/VNOPS/afs_vnop_write.c Sat Nov 8 11:34:42 2008 *************** *** 21,27 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_write.c,v 1.50.2.4 2008/09/22 19:29:55 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 21,27 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_write.c,v 1.50.2.5 2008/11/08 16:34:42 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 543,549 **** --- 543,553 ---- tdc->f.states |= DWriting; tdc->dflags |= DFEntryMod; } + #if defined(LINUX_USE_FH) + tfile = (struct osi_file *)osi_UFSOpen_fh(&tdc->f.fh, tdc->f.fh_type); + #else tfile = (struct osi_file *)osi_UFSOpen(tdc->f.inode); + #endif len = totalLength; /* write this amount by default */ offset = filePos - AFS_CHUNKTOBASE(tdc->f.chunk); max = AFS_CHUNKTOSIZE(tdc->f.chunk); /* max size of this chunk */ Index: openafs/src/afsd/afsd.c diff -c openafs/src/afsd/afsd.c:1.60.2.11 openafs/src/afsd/afsd.c:1.60.2.12 *** openafs/src/afsd/afsd.c:1.60.2.11 Mon Sep 22 15:35:27 2008 --- openafs/src/afsd/afsd.c Sat Nov 8 11:34:42 2008 *************** *** 58,64 **** #include RCSID ! ("$Header: /cvs/openafs/src/afsd/afsd.c,v 1.60.2.11 2008/09/22 19:35:27 shadow Exp $"); #define VFS 1 --- 58,64 ---- #include RCSID ! ("$Header: /cvs/openafs/src/afsd/afsd.c,v 1.60.2.12 2008/11/08 16:34:42 shadow Exp $"); #define VFS 1 *************** *** 339,345 **** * -2: file exists in top-level * >=0: file exists in Dxxx */ ! #ifndef AFS_CACHE_VNODE_PATH AFSD_INO_T *inode_for_V; /* Array of inodes for desired * cache files */ #endif --- 339,345 ---- * -2: file exists in top-level * >=0: file exists in Dxxx */ ! #if !defined(AFS_CACHE_VNODE_PATH) && !defined(LINUX_USE_FH) AFSD_INO_T *inode_for_V; /* Array of inodes for desired * cache files */ #endif *************** *** 1014,1020 **** * file's inode, directory, and bump the number of files found * total and in this directory. */ ! #ifndef AFS_CACHE_VNODE_PATH inode_for_V[vFileNum] = currp->d_ino; #endif dir_for_V[vFileNum] = dirNum; /* remember this directory */ --- 1014,1020 ---- * file's inode, directory, and bump the number of files found * total and in this directory. */ ! #if !defined(AFS_CACHE_VNODE_PATH) && !defined(LINUX_USE_FH) inode_for_V[vFileNum] = currp->d_ino; #endif dir_for_V[vFileNum] = dirNum; /* remember this directory */ *************** *** 1153,1159 **** vFileNum); else { struct stat statb; ! #ifndef AFS_CACHE_VNODE_PATH assert(inode_for_V[vFileNum] == (AFSD_INO_T) 0); #endif sprintf(vFilePtr, "D%d/V%d", thisDir, vFileNum); --- 1153,1159 ---- vFileNum); else { struct stat statb; ! #if !defined(AFS_CACHE_VNODE_PATH) && !defined(LINUX_USE_FH) assert(inode_for_V[vFileNum] == (AFSD_INO_T) 0); #endif sprintf(vFilePtr, "D%d/V%d", thisDir, vFileNum); *************** *** 1166,1172 **** if (CreateCacheFile(fullpn_VFile, &statb)) printf("%s: Can't create '%s'\n", rn, fullpn_VFile); else { ! #ifndef AFS_CACHE_VNODE_PATH inode_for_V[vFileNum] = statb.st_ino; #endif dir_for_V[vFileNum] = thisDir; --- 1166,1172 ---- if (CreateCacheFile(fullpn_VFile, &statb)) printf("%s: Can't create '%s'\n", rn, fullpn_VFile); else { ! #if !defined(AFS_CACHE_VNODE_PATH) && !defined(LINUX_USE_FH) inode_for_V[vFileNum] = statb.st_ino; #endif dir_for_V[vFileNum] = thisDir; *************** *** 1268,1273 **** --- 1268,1274 ---- if (res != 0) { return "unable to statfs cache base directory"; } + #if !defined(LINUX_USE_FH) if (statfsbuf.f_type == 0x52654973) { /* REISERFS_SUPER_MAGIC */ return "cannot use reiserfs as cache partition"; } else if (statfsbuf.f_type == 0x58465342) { /* XFS_SUPER_MAGIC */ *************** *** 1277,1282 **** --- 1278,1284 ---- } else if (statfsbuf.f_type != 0xEF53) { return "must use ext2 or ext3 for cache partition"; } + #endif } #endif *************** *** 1936,1942 **** cacheStatEntries); } ! #ifndef AFS_CACHE_VNODE_PATH /* * Create and zero the inode table for the desired cache files. */ --- 1938,1944 ---- cacheStatEntries); } ! #if !defined(AFS_CACHE_VNODE_PATH) && !defined(LINUX_USE_FH) /* * Create and zero the inode table for the desired cache files. */ *************** *** 2307,2314 **** --- 2309,2321 ---- (afs_uint32) (inode_for_V[currVFile] >> 32), (afs_uint32) (inode_for_V[currVFile] & 0xffffffff)); #else + #if defined(LINUX_USE_FH) + sprintf(fullpn_VFile, "%s/D%d/V%d", cacheBaseDir, dir_for_V[currVFile], currVFile); + call_syscall(AFSOP_CACHEFILE, fullpn_VFile); + #else call_syscall(AFSOP_CACHEINODE, inode_for_V[currVFile]); #endif + #endif } #endif Index: openafs/src/aklog/aklog_main.c diff -c openafs/src/aklog/aklog_main.c:1.12.2.15 openafs/src/aklog/aklog_main.c:1.12.2.17 *** openafs/src/aklog/aklog_main.c:1.12.2.15 Tue Apr 1 14:15:40 2008 --- openafs/src/aklog/aklog_main.c Wed Oct 29 15:43:53 2008 *************** *** 1,5 **** /* ! * $Id: aklog_main.c,v 1.12.2.15 2008/04/01 18:15:40 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" --- 1,5 ---- /* ! * $Id: aklog_main.c,v 1.12.2.17 2008/10/29 19:43:53 shadow Exp $ * * Copyright 1990,1991 by the Massachusetts Institute of Technology * For distribution and copying rights, see the file "mit-copyright.h" *************** *** 36,42 **** #include RCSID ! ("$Header: /cvs/openafs/src/aklog/aklog_main.c,v 1.12.2.15 2008/04/01 18:15:40 shadow Exp $"); #include #include #include --- 36,42 ---- #include RCSID ! ("$Header: /cvs/openafs/src/aklog/aklog_main.c,v 1.12.2.17 2008/10/29 19:43:53 shadow Exp $"); #include #include #include *************** *** 463,469 **** retry = 1; while(retry) { ! /* Cell on command line - use that one */ if (realm && realm[0]) { realm_of_cell = realm; --- 463,489 ---- retry = 1; while(retry) { ! ! /* This code tries principals in the following, much debated, ! * order: ! * ! * If the realm is specified on the command line we do ! * - afs/cell@COMMAND-LINE-REALM ! * - afs@COMMAND-LINE-REALM ! * ! * Otherwise, we do ! * - afs/cell@REALM-FROM-USERS-PRINCIPAL ! * - afs/cell@krb5_get_host_realm(db-server) ! * Then, if krb5_get_host_realm(db-server) is non-empty ! * - afs@ krb5_get_host_realm(db-server) ! * Otherwise ! * - afs/cell@ upper-case-domain-of-db-server ! * - afs@ upper-case-domain-of-db-server ! * ! * In all cases, the 'afs@' variant is only tried where the ! * cell and the realm match case-insensitively. ! */ ! /* Cell on command line - use that one */ if (realm && realm[0]) { realm_of_cell = realm; *************** *** 528,535 **** "%s.\n", progname, cell_to_use); exit(AKLOG_MISC); } ! printf("We've deduced that we need to authenticate to" ! " realm %s.\n", realm_of_cell); } status = get_credv5(context, AFSKEY, cell_to_use, realm_of_cell, &v5cred); --- 548,557 ---- "%s.\n", progname, cell_to_use); exit(AKLOG_MISC); } ! if (dflag) { ! printf("We've deduced that we need to authenticate" ! " to realm %s.\n", realm_of_cell); ! } } status = get_credv5(context, AFSKEY, cell_to_use, realm_of_cell, &v5cred); Index: openafs/src/bozo/bosserver.c diff -c openafs/src/bozo/bosserver.c:1.32.2.11 openafs/src/bozo/bosserver.c:1.32.2.12 *** openafs/src/bozo/bosserver.c:1.32.2.11 Wed Sep 24 17:36:54 2008 --- openafs/src/bozo/bosserver.c Sat Oct 18 11:09:07 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/bozo/bosserver.c,v 1.32.2.11 2008/09/24 21:36:54 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bozo/bosserver.c,v 1.32.2.12 2008/10/18 15:09:07 jaltman Exp $"); #include #include *************** *** 825,836 **** else if (strcmp(argv[code], "-allow-dotted-principals") == 0) { rxkadDisableDotCheck = 1; } ! else if (!strcmp(argv[i], "-rxmaxmtu")) { ! if ((i + 1) >= argc) { fprintf(stderr, "missing argument for -rxmaxmtu\n"); exit(1); } ! rxMaxMTU = atoi(argv[++i]); if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) { printf("rxMaxMTU %d invalid; must be between %d-%d\n", --- 825,836 ---- else if (strcmp(argv[code], "-allow-dotted-principals") == 0) { rxkadDisableDotCheck = 1; } ! else if (!strcmp(argv[code], "-rxmaxmtu")) { ! if ((code + 1) >= argc) { fprintf(stderr, "missing argument for -rxmaxmtu\n"); exit(1); } ! rxMaxMTU = atoi(argv[++code]); if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) { printf("rxMaxMTU %d invalid; must be between %d-%d\n", Index: openafs/src/bucoord/commands.c diff -c openafs/src/bucoord/commands.c:1.18.2.6 openafs/src/bucoord/commands.c:1.18.2.7 *** openafs/src/bucoord/commands.c:1.18.2.6 Mon Nov 26 16:08:41 2007 --- openafs/src/bucoord/commands.c Mon Oct 27 19:41:45 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/commands.c,v 1.18.2.6 2007/11/26 21:08:41 shadow Exp $"); #include #if defined(AFS_LINUX24_ENV) --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/commands.c,v 1.18.2.7 2008/10/27 23:41:45 shadow Exp $"); #include #if defined(AFS_LINUX24_ENV) *************** *** 431,444 **** struct bc_volumeDump *tvd; /*Ptr to new dump instance */ struct bc_volumeEntry *tve, *ctve; /*Ptr to new volume entry instance */ char patt[256]; /*Composite regex; also, target string */ ! int volType; /*Type of volume that worked */ afs_int32 index; /*Current VLDB entry index */ afs_int32 count; /*Needed by VL_ListEntry() */ afs_int32 next_index; /*Next index to list */ struct vldbentry entry; /*VLDB entry */ int srvpartpair; /*Loop counter: server/partition pair */ afs_int32 total = 0; ! int found, foundentry; struct serversort *servers = 0, *ss = 0; struct partitionsort *ps = 0; --- 431,445 ---- struct bc_volumeDump *tvd; /*Ptr to new dump instance */ struct bc_volumeEntry *tve, *ctve; /*Ptr to new volume entry instance */ char patt[256]; /*Composite regex; also, target string */ ! int volType = 0; /*Type of volume that worked */ afs_int32 index; /*Current VLDB entry index */ afs_int32 count; /*Needed by VL_ListEntry() */ afs_int32 next_index; /*Next index to list */ struct vldbentry entry; /*VLDB entry */ int srvpartpair; /*Loop counter: server/partition pair */ afs_int32 total = 0; ! int found; ! int foundentry = 0; struct serversort *servers = 0, *ss = 0; struct partitionsort *ps = 0; *************** *** 1602,1610 **** bc_DumpCmd(struct cmd_syndesc *as, void *arock) { /*bc_DumpCmd */ static char rn[] = "bc_DumpCmd"; /*Routine name */ ! char *dumpPath, *vsName; /*Ptrs to various names */ ! struct bc_volumeSet *tvs; /*Ptr to list of generated volume info */ ! struct bc_dumpSchedule *tds, *baseds; /*Ptr to dump schedule node */ struct bc_volumeDump *tve, *volsToDump; /*Ptr to individual vols to be dumped */ struct budb_dumpEntry dumpEntry, de, fde; /* dump entry */ afs_uint32 d; --- 1603,1613 ---- bc_DumpCmd(struct cmd_syndesc *as, void *arock) { /*bc_DumpCmd */ static char rn[] = "bc_DumpCmd"; /*Routine name */ ! char *dumpPath = NULL; ! char *vsName = NULL; /*Ptrs to various names */ ! struct bc_volumeSet *tvs = NULL; /*Ptr to list of generated volume info */ ! struct bc_dumpSchedule *tds; ! struct bc_dumpSchedule *baseds = NULL; /*Ptr to dump schedule node */ struct bc_volumeDump *tve, *volsToDump; /*Ptr to individual vols to be dumped */ struct budb_dumpEntry dumpEntry, de, fde; /* dump entry */ afs_uint32 d; *************** *** 1618,1624 **** afs_int32 doAt, atTime; /* Time a timed-dump is to start at */ afs_int32 length; char *timeString; ! int doAppend; /* Append the dump to dump set */ afs_int32 code; /* Return code */ int loadfile; /* whether to load a file or not */ --- 1621,1627 ---- afs_int32 doAt, atTime; /* Time a timed-dump is to start at */ afs_int32 length; char *timeString; ! int doAppend = 0; /* Append the dump to dump set */ afs_int32 code; /* Return code */ int loadfile; /* whether to load a file or not */ Index: openafs/src/bucoord/restore.c diff -c openafs/src/bucoord/restore.c:1.10.6.7 openafs/src/bucoord/restore.c:1.10.6.8 *** openafs/src/bucoord/restore.c:1.10.6.7 Mon Nov 26 16:08:41 2007 --- openafs/src/bucoord/restore.c Sat Oct 18 11:23:24 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/restore.c,v 1.10.6.7 2007/11/26 21:08:41 shadow Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/bucoord/restore.c,v 1.10.6.8 2008/10/18 15:23:24 jaltman Exp $"); #include #include *************** *** 164,170 **** afs_int32 tapedumpid, parent; afs_int32 nentries = 0; ! afs_int32 last, next, ve, vecount; struct bc_tapeItem *ti, *pti, *nti; struct bc_tapeList *tapeList = (struct bc_tapeList *)0; struct bc_tapeList *tle, *ptle, *ntle; --- 164,171 ---- afs_int32 tapedumpid, parent; afs_int32 nentries = 0; ! afs_int32 last = 0; ! afs_int32 next, ve, vecount; struct bc_tapeItem *ti, *pti, *nti; struct bc_tapeList *tapeList = (struct bc_tapeList *)0; struct bc_tapeList *tle, *ptle, *ntle; Index: openafs/src/budb/db_hash.c diff -c openafs/src/budb/db_hash.c:1.8.14.2 openafs/src/budb/db_hash.c:1.8.14.3 *** openafs/src/budb/db_hash.c:1.8.14.2 Tue Oct 30 11:16:37 2007 --- openafs/src/budb/db_hash.c Mon Oct 27 19:41:45 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/budb/db_hash.c,v 1.8.14.2 2007/10/30 15:16:37 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/budb/db_hash.c,v 1.8.14.3 2008/10/27 23:41:45 shadow Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 266,272 **** int n; int i; int length; ! dbadr ta; if ((mht == 0) || ((ht = mht->ht) == 0) --- 266,272 ---- int n; int i; int length; ! dbadr ta = NULL; if ((mht == 0) || ((ht = mht->ht) == 0) Index: openafs/src/butc/lwps.c diff -c openafs/src/butc/lwps.c:1.14.4.5 openafs/src/butc/lwps.c:1.14.4.6 *** openafs/src/butc/lwps.c:1.14.4.5 Wed Apr 9 12:39:59 2008 --- openafs/src/butc/lwps.c Mon Oct 27 19:41:45 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/butc/lwps.c,v 1.14.4.5 2008/04/09 16:39:59 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/butc/lwps.c,v 1.14.4.6 2008/10/27 23:41:45 shadow Exp $"); #include #include *************** *** 1245,1251 **** { afs_int32 curChunk; afs_uint32 totalWritten = 0; ! afs_int32 code; afs_int32 headBytes, tailBytes, w; afs_int32 taskId; afs_int32 nbytes; /* # bytes data in last tape block read */ --- 1245,1251 ---- { afs_int32 curChunk; afs_uint32 totalWritten = 0; ! afs_int32 code = 0; afs_int32 headBytes, tailBytes, w; afs_int32 taskId; afs_int32 nbytes; /* # bytes data in last tape block read */ Index: openafs/src/butc/read_tape.c diff -c openafs/src/butc/read_tape.c:1.7.14.3 openafs/src/butc/read_tape.c:1.7.14.4 *** openafs/src/butc/read_tape.c:1.7.14.3 Mon Nov 26 16:08:41 2007 --- openafs/src/butc/read_tape.c Mon Oct 27 19:41:45 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/butc/read_tape.c,v 1.7.14.3 2007/11/26 21:08:41 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/butc/read_tape.c,v 1.7.14.4 2008/10/27 23:41:45 shadow Exp $"); #include #include *************** *** 285,291 **** struct volumeHeader vh; char trailer[12]; struct blockMark *bmark, *bmark2; ! char *data, *data2; int count, count2; int tlen, skip, pos; --- 285,292 ---- struct volumeHeader vh; char trailer[12]; struct blockMark *bmark, *bmark2; ! char *data; ! char *data2 = NULL; int count, count2; int tlen, skip, pos; *************** *** 396,402 **** char *data; char *tblock; afs_int32 code; ! struct volumeHeader *volheaderPtr; int eod = 1; int rc; char *nextblock; /* We cycle through three tape blocks so we */ --- 397,403 ---- char *data; char *tblock; afs_int32 code; ! struct volumeHeader *volheaderPtr = NULL; int eod = 1; int rc; char *nextblock; /* We cycle through three tape blocks so we */ Index: openafs/src/butc/tcprocs.c diff -c openafs/src/butc/tcprocs.c:1.14.6.5 openafs/src/butc/tcprocs.c:1.14.6.6 *** openafs/src/butc/tcprocs.c:1.14.6.5 Mon Mar 10 18:32:33 2008 --- openafs/src/butc/tcprocs.c Mon Oct 27 19:41:45 2008 *************** *** 13,19 **** #include RCSID ! ("$Header: /cvs/openafs/src/butc/tcprocs.c,v 1.14.6.5 2008/03/10 22:32:33 shadow Exp $"); #include #include --- 13,19 ---- #include RCSID ! ("$Header: /cvs/openafs/src/butc/tcprocs.c,v 1.14.6.6 2008/10/27 23:41:45 shadow Exp $"); #include #include *************** *** 572,578 **** PROCESS pid; #endif struct scanTapeIf *ptr; ! statusP statusPtr; afs_int32 code = 0; extern afs_int32 allocTaskId(); --- 572,578 ---- PROCESS pid; #endif struct scanTapeIf *ptr; ! statusP statusPtr = NULL; afs_int32 code = 0; extern afs_int32 allocTaskId(); Index: openafs/src/butc/tcudbprocs.c diff -c openafs/src/butc/tcudbprocs.c:1.15.6.7 openafs/src/butc/tcudbprocs.c:1.15.6.8 *** openafs/src/butc/tcudbprocs.c:1.15.6.7 Fri Apr 18 09:57:13 2008 --- openafs/src/butc/tcudbprocs.c Mon Oct 27 19:41:45 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/butc/tcudbprocs.c,v 1.15.6.7 2008/04/18 13:57:13 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/butc/tcudbprocs.c,v 1.15.6.8 2008/10/27 23:41:45 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 392,398 **** char *writeBufPtr; afs_int32 transferSize; ! char *readBufPtr; afs_int32 maxReadSize; charListT charList; --- 392,398 ---- char *writeBufPtr; afs_int32 transferSize; ! char *readBufPtr = NULL; afs_int32 maxReadSize; charListT charList; Index: openafs/src/cf/fdsetsize.m4 diff -c /dev/null openafs/src/cf/fdsetsize.m4:1.1.2.3 *** /dev/null Sun Nov 9 00:08:13 2008 --- openafs/src/cf/fdsetsize.m4 Tue Oct 21 14:36:46 2008 *************** *** 0 **** --- 1,106 ---- + AC_DEFUN([FD_SET_OBEYS_FD_SETSIZE], [ + AC_MSG_CHECKING(for default FD_SETSIZE) + AC_CACHE_VAL(ac_cv_default_fdsetsize, + [ + AC_TRY_RUN( + changequote(<<, >>)dnl + << + #include + #include + #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif + int main(int argc, char *argv[]) + { + FILE *fp; + int ac_cv_default_fdsetsize; + #if defined(FD_SETSIZE) + ac_cv_default_fdsetsize = FD_SETSIZE; + #else + ac_cv_default_fdsetsize = (sizeof(fd_set)*8); + #endif + if ((fp = fopen("conftestval", "w")) == NULL) + exit(1); + fprintf(fp, "%d\n", ac_cv_default_fdsetsize); + fclose(fp); + exit(0); + } + >> + changequote([, ])dnl + , + ac_cv_default_fdsetsize=`cat conftestval`, + ac_cv_default_fdsetsize=-1, + ac_cv_default_fdsetsize=1024 + ) + AC_MSG_RESULT([$ac_cv_default_fdsetsize]) + ]) + + AC_MSG_CHECKING(for default fd_set size) + AC_CACHE_VAL(ac_cv_default_fd_set_size, + [ + AC_TRY_RUN( + changequote(<<, >>)dnl + << + #include + #include + #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif + int main(int argc, char *argv[]) + { + FILE *fp; + int ac_cv_default_fd_set_size; + ac_cv_default_fd_set_size = (sizeof(fd_set)); + + if ((fp = fopen("conftestval", "w")) == NULL) + exit(1); + fprintf(fp, "%d\n", ac_cv_default_fd_set_size); + fclose(fp); + exit(0); + } + >> + changequote([, ])dnl + , + ac_cv_default_fd_set_size=`cat conftestval`, + ac_cv_default_fd_set_size=-1, + ac_cv_default_fd_set_size=128 + ) + AC_MSG_RESULT([$ac_cv_default_fd_set_size]) + ]) + + AC_MSG_CHECKING(for sizeof fd_set obeying FD_SETSIZE) + AC_CACHE_VAL(ac_cv_fd_set_size_obeys, + [ + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -DORIG_FD_SETSIZE=$ac_cv_default_fdsetsize -DORIG_fd_set_size=$ac_cv_default_fd_set_size" + AC_TRY_RUN([ + #include + #include + #include + #if (ORIG_FD_SETSIZE < 2048) + #define FD_SETSIZE 2048 + #define __FD_SETSIZE 2048 + #else + #define FD_SETSIZE 1024 + #define __FD_SETSIZE 1024 + #endif + #ifdef HAVE_SYS_SELECT_H + #include + #endif + int main() { + if ((ORIG_fd_set_size < 0) || (ORIG_FD_SETSIZE < 0)) + exit(1); + exit((sizeof(fd_set) == ORIG_fd_set_size) ? 1 : 0); + } + ], + ac_cv_fd_set_size_obeys=yes, + ac_cv_fd_set_size_obeys=no, + ac_cv_fd_set_size_obeys=yes) + CPPFLAGS=$save_CPPFLAGS + AC_MSG_RESULT([$ac_cv_fd_set_size_obeys]) + ]) + + ]) + Index: openafs/src/cf/linux-test1.m4 diff -c openafs/src/cf/linux-test1.m4:1.6.4.9 openafs/src/cf/linux-test1.m4:1.6.4.10 *** openafs/src/cf/linux-test1.m4:1.6.4.9 Mon Jan 7 13:33:15 2008 --- openafs/src/cf/linux-test1.m4 Sun Oct 12 14:02:19 2008 *************** *** 27,34 **** MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); _ACEOF ! echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD && ! make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err && ! grep -i "^WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 then [$3] else --- 27,34 ---- MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); _ACEOF ! echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD && ! make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err && ! grep -i "^WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 then [$3] else Index: openafs/src/cf/linux-test4.m4 diff -c openafs/src/cf/linux-test4.m4:1.29.2.45 openafs/src/cf/linux-test4.m4:1.29.2.47 *** openafs/src/cf/linux-test4.m4:1.29.2.45 Sat Aug 16 15:42:58 2008 --- openafs/src/cf/linux-test4.m4 Sat Nov 8 11:49:43 2008 *************** *** 1092,1094 **** --- 1092,1119 ---- AC_DEFINE([LINUX_SEMAPHORE_H], 1, [define if linux/semaphore.h exists]) fi]) + AC_DEFUN([LINUX_HAVE_BDI_INIT], [ + AC_MSG_CHECKING([for linux bdi_init()]) + AC_CACHE_VAL([ac_cv_linux_bdi_init], [ + AC_TRY_KBUILD( + [#include ], + [bdi_init(NULL);], + ac_cv_linux_bdi_init=yes, + ac_cv_linux_bdi_init=no)]) + AC_MSG_RESULT($ac_cv_linux_bdi_init) + if test "x$ac_cv_linux_bdi_init" = "xyes"; then + AC_DEFINE([HAVE_BDI_INIT], 1, [define if your kernel has a bdi_init()]) + fi]) + + AC_DEFUN([LINUX_HAVE_WRITE_BEGIN_AOP], [ + AC_MSG_CHECKING([for linux write_begin() address space op]) + AC_CACHE_VAL([ac_cv_linux_write_begin], [ + AC_TRY_KBUILD( + [#include ], + [simple_write_begin(NULL, NULL, 0, 0, 0, NULL, NULL);], + ac_cv_linux_write_begin=yes, + ac_cv_linux_write_begin=no)]) + AC_MSG_RESULT($ac_cv_linux_write_begin) + if test "x$ac_cv_linux_write_begin" = "xyes"; then + AC_DEFINE([HAVE_WRITE_BEGIN], 1, [define if your kernel has a write_begin() address space op]) + fi]) Index: openafs/src/cf/linux-test5.m4 diff -c openafs/src/cf/linux-test5.m4:1.3 openafs/src/cf/linux-test5.m4:1.3.14.1 *** openafs/src/cf/linux-test5.m4:1.3 Thu Jun 3 01:13:30 2004 --- openafs/src/cf/linux-test5.m4 Mon Oct 20 08:35:16 2008 *************** *** 3,16 **** AC_MSG_CHECKING(if $CC accepts -march=pentium) save_CFLAGS="$CFLAGS" CFLAGS="-MARCH=pentium" ! AC_CACHE_VAL(openafs_gcc_supports_march,[ AC_TRY_COMPILE( [], [int x;], ! openafs_gcc_supports_march=yes, ! openafs_gcc_supports_march=no)]) ! AC_MSG_RESULT($openafs_gcc_supports_march) ! if test x$openafs_gcc_supports_march = xyes; then P5PLUS_KOPTS="-march=pentium" else P5PLUS_KOPTS="-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2" --- 3,16 ---- AC_MSG_CHECKING(if $CC accepts -march=pentium) save_CFLAGS="$CFLAGS" CFLAGS="-MARCH=pentium" ! AC_CACHE_VAL(openafs_cv_gcc_supports_march,[ AC_TRY_COMPILE( [], [int x;], ! openafs_cv_gcc_supports_march=yes, ! openafs_cv_gcc_supports_march=no)]) ! AC_MSG_RESULT($openafs_cv_gcc_supports_march) ! if test x$openafs_cv_gcc_supports_march = xyes; then P5PLUS_KOPTS="-march=pentium" else P5PLUS_KOPTS="-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2" *************** *** 22,35 **** AC_MSG_CHECKING(if $CC needs -fno-strict-aliasing) save_CFLAGS="$CFLAGS" CFLAGS="-fno-strict-aliasing" ! AC_CACHE_VAL(openafs_gcc_needs_no_strict_aliasing,[ AC_TRY_COMPILE( [], [int x;], ! openafs_gcc_needs_no_strict_aliasing=yes, ! openafs_gcc_needs_no_strict_aliasing=no)]) ! AC_MSG_RESULT($openafs_gcc_needs_no_strict_aliasing) ! if test x$openafs_gcc_needs_no_strict_aliasing = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strict-aliasing" fi CFLAGS="$save_CFLAGS" --- 22,35 ---- AC_MSG_CHECKING(if $CC needs -fno-strict-aliasing) save_CFLAGS="$CFLAGS" CFLAGS="-fno-strict-aliasing" ! AC_CACHE_VAL(openafs_cv_gcc_needs_no_strict_aliasing,[ AC_TRY_COMPILE( [], [int x;], ! openafs_cv_gcc_needs_no_strict_aliasing=yes, ! openafs_cv_gcc_needs_no_strict_aliasing=no)]) ! AC_MSG_RESULT($openafs_cv_gcc_needs_no_strict_aliasing) ! if test x$openafs_cv_gcc_needs_no_strict_aliasing = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strict-aliasing" fi CFLAGS="$save_CFLAGS" *************** *** 39,52 **** AC_MSG_CHECKING(if $CC needs -fno-strength-reduce) save_CFLAGS="$CFLAGS" CFLAGS="-fno-strength-reduce" ! AC_CACHE_VAL(openafs_gcc_needs_no_strength_reduce,[ AC_TRY_COMPILE( [], [int x;], ! openafs_gcc_needs_no_strength_reduce=yes, ! openafs_gcc_needs_no_strength_reduce=no)]) ! AC_MSG_RESULT($openafs_gcc_needs_no_strength_reduce) ! if test x$openafs_gcc_needs_no_strength_reduce = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strength-reduce" fi CFLAGS="$save_CFLAGS" --- 39,52 ---- AC_MSG_CHECKING(if $CC needs -fno-strength-reduce) save_CFLAGS="$CFLAGS" CFLAGS="-fno-strength-reduce" ! AC_CACHE_VAL(openafs_cv_gcc_needs_no_strength_reduce,[ AC_TRY_COMPILE( [], [int x;], ! openafs_cv_gcc_needs_no_strength_reduce=yes, ! openafs_cv_gcc_needs_no_strength_reduce=no)]) ! AC_MSG_RESULT($openafs_cv_gcc_needs_no_strength_reduce) ! if test x$openafs_cv_gcc_needs_no_strength_reduce = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-strength-reduce" fi CFLAGS="$save_CFLAGS" *************** *** 56,69 **** AC_MSG_CHECKING(if $CC supports -fno-common) save_CFLAGS="$CFLAGS" CFLAGS="-fno-common" ! AC_CACHE_VAL(openafs_gcc_supports_no_common,[ AC_TRY_COMPILE( [], [int x;], ! openafs_gcc_supports_no_common=yes, ! openafs_gcc_supports_no_common=no)]) ! AC_MSG_RESULT($openafs_gcc_supports_no_common) ! if test x$openafs_gcc_supports_no_common = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-common" fi CFLAGS="$save_CFLAGS" --- 56,69 ---- AC_MSG_CHECKING(if $CC supports -fno-common) save_CFLAGS="$CFLAGS" CFLAGS="-fno-common" ! AC_CACHE_VAL(openafs_cv_gcc_supports_no_common,[ AC_TRY_COMPILE( [], [int x;], ! openafs_cv_gcc_supports_no_common=yes, ! openafs_cv_gcc_supports_no_common=no)]) ! AC_MSG_RESULT($openafs_cv_gcc_supports_no_common) ! if test x$openafs_cv_gcc_supports_no_common = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fno-common" fi CFLAGS="$save_CFLAGS" *************** *** 73,86 **** AC_MSG_CHECKING(if $CC supports -pipe) save_CFLAGS="$CFLAGS" CFLAGS="-pipe" ! AC_CACHE_VAL(openafs_gcc_supports_pipe,[ AC_TRY_COMPILE( [], [int x;], ! openafs_gcc_supports_pipe=yes, ! openafs_gcc_supports_pipe=no)]) ! AC_MSG_RESULT($openafs_gcc_supports_pipe) ! if test x$openafs_gcc_supports_pipe = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -pipe" fi CFLAGS="$save_CFLAGS" --- 73,86 ---- AC_MSG_CHECKING(if $CC supports -pipe) save_CFLAGS="$CFLAGS" CFLAGS="-pipe" ! AC_CACHE_VAL(openafs_cv_gcc_supports_pipe,[ AC_TRY_COMPILE( [], [int x;], ! openafs_cv_gcc_supports_pipe=yes, ! openafs_cv_gcc_supports_pipe=no)]) ! AC_MSG_RESULT($openafs_cv_gcc_supports_pipe) ! if test x$openafs_cv_gcc_supports_pipe = xyes; then LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -pipe" fi CFLAGS="$save_CFLAGS" Index: openafs/src/config/Makefile.config.in diff -c openafs/src/config/Makefile.config.in:1.12.2.4 openafs/src/config/Makefile.config.in:1.12.2.5 *** openafs/src/config/Makefile.config.in:1.12.2.4 Tue Jul 1 18:51:54 2008 --- openafs/src/config/Makefile.config.in Sun Oct 12 14:02:19 2008 *************** *** 48,53 **** --- 48,54 ---- LIB_AFSDB = @LIB_AFSDB@ LIBS = @LIBS@ LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@ + LINUX_KERNEL_BUILD = @LINUX_KERNEL_BUILD@ LINUX_LIBAFS_NAME=@LINUX_LIBAFS_NAME@ LINUX_KERNEL_PACKAGING=@LINUX_KERNEL_PACKAGING@ LINUX_VERSION = @LINUX_VERSION@ Index: openafs/src/config/NTMakefile.amd64_w2k diff -c openafs/src/config/NTMakefile.amd64_w2k:1.24.2.49 openafs/src/config/NTMakefile.amd64_w2k:1.24.2.50 *** openafs/src/config/NTMakefile.amd64_w2k:1.24.2.49 Tue Oct 7 17:56:55 2008 --- openafs/src/config/NTMakefile.amd64_w2k Fri Nov 7 21:08:36 2008 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=5400 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=5500 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.47 openafs/src/config/NTMakefile.i386_nt40:1.84.2.48 *** openafs/src/config/NTMakefile.i386_nt40:1.84.2.47 Tue Oct 7 17:56:55 2008 --- openafs/src/config/NTMakefile.i386_nt40 Fri Nov 7 21:08:36 2008 *************** *** 84,90 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=5400 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=5500 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.51 openafs/src/config/NTMakefile.i386_w2k:1.23.2.52 *** openafs/src/config/NTMakefile.i386_w2k:1.23.2.51 Tue Oct 7 17:56:55 2008 --- openafs/src/config/NTMakefile.i386_w2k Fri Nov 7 21:08:36 2008 *************** *** 88,94 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=5400 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) --- 88,94 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=5 ! AFSPRODUCT_VER_PATCH=5500 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) Index: openafs/src/kauth/kalocalcell.c diff -c openafs/src/kauth/kalocalcell.c:1.9.8.1 openafs/src/kauth/kalocalcell.c:1.9.8.2 *** openafs/src/kauth/kalocalcell.c:1.9.8.1 Tue Oct 30 11:16:39 2007 --- openafs/src/kauth/kalocalcell.c Mon Oct 27 19:53:46 2008 *************** *** 15,21 **** #endif RCSID ! ("$Header: /cvs/openafs/src/kauth/kalocalcell.c,v 1.9.8.1 2007/10/30 15:16:39 shadow Exp $"); #if defined(UKERNEL) #include "afs/pthread_glock.h" --- 15,21 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/kauth/kalocalcell.c,v 1.9.8.2 2008/10/27 23:53:46 shadow Exp $"); #if defined(UKERNEL) #include "afs/pthread_glock.h" *************** *** 79,85 **** char * ka_LocalCell(void) { ! int code; LOCK_GLOBAL_MUTEX; if (conf) { --- 79,85 ---- char * ka_LocalCell(void) { ! int code = 0; LOCK_GLOBAL_MUTEX; if (conf) { Index: openafs/src/kauth/knfs.c diff -c openafs/src/kauth/knfs.c:1.8.14.2 openafs/src/kauth/knfs.c:1.8.14.3 *** openafs/src/kauth/knfs.c:1.8.14.2 Wed Oct 31 00:09:30 2007 --- openafs/src/kauth/knfs.c Mon Oct 27 19:41:45 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/kauth/knfs.c,v 1.8.14.2 2007/10/31 04:09:30 shadow Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/kauth/knfs.c,v 1.8.14.3 2008/10/27 23:41:45 shadow Exp $"); #include #include *************** *** 103,109 **** struct ViceIoctl iob; afs_int32 pheader[6]; char tbuffer[1024]; ! register afs_int32 code; int index, newIndex; char *stp; /* secret token ptr */ struct ClearToken ct; --- 103,109 ---- struct ViceIoctl iob; afs_int32 pheader[6]; char tbuffer[1024]; ! afs_int32 code = 0; int index, newIndex; char *stp; /* secret token ptr */ struct ClearToken ct; Index: openafs/src/kauth/kpwvalid.c diff -c openafs/src/kauth/kpwvalid.c:1.6.14.2 openafs/src/kauth/kpwvalid.c:1.6.14.3 *** openafs/src/kauth/kpwvalid.c:1.6.14.2 Mon Nov 26 16:08:42 2007 --- openafs/src/kauth/kpwvalid.c Mon Oct 27 19:53:46 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/kauth/kpwvalid.c,v 1.6.14.2 2007/11/26 21:08:42 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/kauth/kpwvalid.c,v 1.6.14.3 2008/10/27 23:53:46 shadow Exp $"); #include #include *************** *** 27,33 **** { char oldpassword[512]; char password[512]; ! int rc; if (fgets(oldpassword, 512, stdin)) while (fgets(password, 512, stdin)) { --- 27,33 ---- { char oldpassword[512]; char password[512]; ! int rc = 1; if (fgets(oldpassword, 512, stdin)) while (fgets(password, 512, stdin)) { Index: openafs/src/libadmin/cfg/cfgdb.c diff -c openafs/src/libadmin/cfg/cfgdb.c:1.6 openafs/src/libadmin/cfg/cfgdb.c:1.6.14.1 *** openafs/src/libadmin/cfg/cfgdb.c:1.6 Fri Apr 2 01:54:05 2004 --- openafs/src/libadmin/cfg/cfgdb.c Mon Oct 27 19:41:45 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/cfg/cfgdb.c,v 1.6 2004/04/02 06:54:05 jaltman Exp $"); #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/cfg/cfgdb.c,v 1.6.14.1 2008/10/27 23:41:45 shadow Exp $"); #include *************** *** 233,239 **** void *bosHandle; char dbhostName[MAXHOSTSPERCELL][BOS_MAX_NAME_LEN]; char dbhostCell[BOS_MAX_NAME_LEN]; ! int dbhostCount; if (!afsclient_NullCellOpen(&cellHandle, &tst2)) { tst = tst2; --- 233,239 ---- void *bosHandle; char dbhostName[MAXHOSTSPERCELL][BOS_MAX_NAME_LEN]; char dbhostCell[BOS_MAX_NAME_LEN]; ! int dbhostCount = 0; if (!afsclient_NullCellOpen(&cellHandle, &tst2)) { tst = tst2; *************** *** 488,494 **** free(ctrlBlockp); } else { /* fill name blocks, handing each to a worker thread */ ! void *nameBlockIter; short workersStarted = 0; if (!NameBlockGetBegin --- 488,494 ---- free(ctrlBlockp); } else { /* fill name blocks, handing each to a worker thread */ ! void *nameBlockIter = NULL; short workersStarted = 0; if (!NameBlockGetBegin Index: openafs/src/libadmin/cfg/cfghost.c diff -c openafs/src/libadmin/cfg/cfghost.c:1.6 openafs/src/libadmin/cfg/cfghost.c:1.6.14.1 *** openafs/src/libadmin/cfg/cfghost.c:1.6 Fri Apr 2 01:54:05 2004 --- openafs/src/libadmin/cfg/cfghost.c Mon Oct 27 19:41:45 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/cfg/cfghost.c,v 1.6 2004/04/02 06:54:05 jaltman Exp $"); #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/cfg/cfghost.c,v 1.6.14.1 2008/10/27 23:41:45 shadow Exp $"); #include *************** *** 502,508 **** if (tst == 0) { kas_identity_t afsIdentity; kas_encryptionKey_t afsKey; ! int afsKvno; strcpy(afsIdentity.principal, "afs"); afsIdentity.instance[0] = '\0'; --- 502,508 ---- if (tst == 0) { kas_identity_t afsIdentity; kas_encryptionKey_t afsKey; ! int afsKvno = 0; strcpy(afsIdentity.principal, "afs"); afsIdentity.instance[0] = '\0'; Index: openafs/src/libadmin/cfg/cfgservers.c diff -c openafs/src/libadmin/cfg/cfgservers.c:1.6 openafs/src/libadmin/cfg/cfgservers.c:1.6.14.1 *** openafs/src/libadmin/cfg/cfgservers.c:1.6 Fri Apr 2 01:54:05 2004 --- openafs/src/libadmin/cfg/cfgservers.c Mon Oct 27 19:41:45 2008 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/cfg/cfgservers.c,v 1.6 2004/04/02 06:54:05 jaltman Exp $"); #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/cfg/cfgservers.c,v 1.6.14.1 2008/10/27 23:41:45 shadow Exp $"); #include *************** *** 1938,1944 **** if (dirp != NULL) { /* check that not a portition of a larger path */ ! char oneBefore, oneAfter, twoAfter; oneBefore = *(dirp - 1); oneAfter = *(dirp + sizeof(AFSDIR_CANONICAL_SERVER_ETC_DIRPATH) - 1); --- 1938,1945 ---- if (dirp != NULL) { /* check that not a portition of a larger path */ ! char oneBefore, oneAfter; ! char twoAfter = 0; oneBefore = *(dirp - 1); oneAfter = *(dirp + sizeof(AFSDIR_CANONICAL_SERVER_ETC_DIRPATH) - 1); *************** *** 1962,1968 **** if (dirp != NULL) { /* check that not a portition of a larger path */ ! char oneBefore, oneAfter, twoAfter; oneBefore = *(dirp - 1); oneAfter = *(dirp + sizeof(AFSDIR_CANONICAL_SERVER_BIN_DIRPATH) - 1); --- 1963,1970 ---- if (dirp != NULL) { /* check that not a portition of a larger path */ ! char oneBefore, oneAfter; ! char twoAfter = 0; oneBefore = *(dirp - 1); oneAfter = *(dirp + sizeof(AFSDIR_CANONICAL_SERVER_BIN_DIRPATH) - 1); *************** *** 2041,2047 **** tst = tst2; dbhostDone = 1; } else { ! short isSyncSite, isWriteReady; /* ignore errors fetching Ubik vote status; there might be * an unreachable dbserver yet a reachable sync site. --- 2043,2050 ---- tst = tst2; dbhostDone = 1; } else { ! short isSyncSite = 0; ! short isWriteReady = 0; /* ignore errors fetching Ubik vote status; there might be * an unreachable dbserver yet a reachable sync site. Index: openafs/src/libadmin/client/afs_clientAdmin.c diff -c openafs/src/libadmin/client/afs_clientAdmin.c:1.11.4.3 openafs/src/libadmin/client/afs_clientAdmin.c:1.11.4.4 *** openafs/src/libadmin/client/afs_clientAdmin.c:1.11.4.3 Thu Feb 28 20:27:57 2008 --- openafs/src/libadmin/client/afs_clientAdmin.c Mon Oct 27 19:41:46 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/client/afs_clientAdmin.c,v 1.11.4.3 2008/02/29 01:27:57 jaltman Exp $"); #include #include "afs_clientAdmin.h" --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/client/afs_clientAdmin.c,v 1.11.4.4 2008/10/27 23:41:46 shadow Exp $"); #include #include "afs_clientAdmin.h" *************** *** 1835,1841 **** (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t)); server_get_p serv = (server_get_p) calloc(1, sizeof(server_get_t)); server_get_p serv_cache = NULL; ! const char *cellName; void *database_iter; util_databaseServerEntry_t database_entry; void *fileserver_iter; --- 1835,1841 ---- (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t)); server_get_p serv = (server_get_p) calloc(1, sizeof(server_get_t)); server_get_p serv_cache = NULL; ! const char *cellName = NULL; void *database_iter; util_databaseServerEntry_t database_entry; void *fileserver_iter; Index: openafs/src/libadmin/test/bos.c diff -c openafs/src/libadmin/test/bos.c:1.10.14.1 openafs/src/libadmin/test/bos.c:1.10.14.2 *** openafs/src/libadmin/test/bos.c:1.10.14.1 Wed Oct 31 00:09:31 2007 --- openafs/src/libadmin/test/bos.c Mon Oct 27 19:41:46 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/test/bos.c,v 1.10.14.1 2007/10/31 04:09:31 shadow Exp $"); #include "bos.h" --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/test/bos.c,v 1.10.14.2 2008/10/27 23:41:46 shadow Exp $"); #include "bos.h" *************** *** 88,94 **** LocalParseLine(char *aline, struct token **alist) { char tbuffer[256]; ! register char *tptr; int inToken; struct token *first, *last; register struct token *ttok; --- 88,94 ---- LocalParseLine(char *aline, struct token **alist) { char tbuffer[256]; ! char *tptr = NULL; int inToken; struct token *first, *last; register struct token *ttok; *************** *** 481,487 **** const char *process = NULL; int stop = 0; int run = 0; ! bos_ProcessExecutionState_t state; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 481,487 ---- const char *process = NULL; int stop = 0; int run = 0; ! bos_ProcessExecutionState_t state = 0; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 532,538 **** const char *process = NULL; int stop = 0; int run = 0; ! bos_ProcessExecutionState_t state; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 532,538 ---- const char *process = NULL; int stop = 0; int run = 0; ! bos_ProcessExecutionState_t state = 0; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 926,932 **** typedef enum { SERVER, ADMIN } DoBosAdminCreate_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *admin; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 926,932 ---- typedef enum { SERVER, ADMIN } DoBosAdminCreate_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *admin = NULL; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 954,960 **** typedef enum { SERVER, ADMIN } DoBosAdminDelete_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *admin; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 954,960 ---- typedef enum { SERVER, ADMIN } DoBosAdminDelete_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *admin = NULL; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 1021,1027 **** typedef enum { SERVER, VERSIONNUMBER, KEY } DoBosKeyCreate_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! int version_number; kas_encryptionKey_t key = { {0, 0, 0, 0, 0, 0, 0, 0} }; const char *cell; --- 1021,1027 ---- typedef enum { SERVER, VERSIONNUMBER, KEY } DoBosKeyCreate_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! int version_number = 0; kas_encryptionKey_t key = { {0, 0, 0, 0, 0, 0, 0, 0} }; const char *cell; *************** *** 1063,1069 **** typedef enum { SERVER, VERSIONNUMBER } DoBosKeyDelete_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! int version_number; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 1063,1069 ---- typedef enum { SERVER, VERSIONNUMBER } DoBosKeyDelete_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! int version_number = 0; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 1150,1156 **** typedef enum { SERVER, CELL } DoBosCellSet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *cell; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 1150,1156 ---- typedef enum { SERVER, CELL } DoBosCellSet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *cell = NULL; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 1204,1210 **** typedef enum { SERVER, HOST } DoBosHostCreate_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *host; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 1204,1210 ---- typedef enum { SERVER, HOST } DoBosHostCreate_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *host = NULL; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 1232,1238 **** typedef enum { SERVER, HOST } DoBosHostDelete_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *host; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 1232,1238 ---- typedef enum { SERVER, HOST } DoBosHostDelete_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *host = NULL; if (as->parms[SERVER].items) { if (!bos_ServerOpen *************** *** 1435,1441 **** } DoBosExecutableRestartTimeSet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! bos_Restart_t type; int have_daily = 0; int have_weekly = 0; bos_RestartTime_t time; --- 1435,1441 ---- } DoBosExecutableRestartTimeSet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! bos_Restart_t type = 0; int have_daily = 0; int have_weekly = 0; bos_RestartTime_t time; *************** *** 1534,1540 **** } DoBosExecutableRestartTimeGet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! bos_Restart_t type; int have_daily = 0; int have_weekly = 0; bos_RestartTime_t restart_time; --- 1534,1540 ---- } DoBosExecutableRestartTimeGet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! bos_Restart_t type = 0; int have_daily = 0; int have_weekly = 0; bos_RestartTime_t restart_time; *************** *** 1583,1589 **** typedef enum { SERVER, LOGFILE } DoBosLogGet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *log_file; unsigned long buf_size = INITIAL_BUF_SIZE; char *buf = NULL; --- 1583,1589 ---- typedef enum { SERVER, LOGFILE } DoBosLogGet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *log_file = NULL; unsigned long buf_size = INITIAL_BUF_SIZE; char *buf = NULL; *************** *** 1631,1637 **** typedef enum { SERVER, REQUIREAUTH, DISABLEAUTH } DoBosAuthSet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! bos_Auth_t auth; int have_req = 0; int have_dis = 0; --- 1631,1637 ---- typedef enum { SERVER, REQUIREAUTH, DISABLEAUTH } DoBosAuthSet_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! bos_Auth_t auth = 0; int have_req = 0; int have_dis = 0; *************** *** 1675,1681 **** typedef enum { SERVER, COMMAND } DoBosCommandExecute_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *command; if (as->parms[SERVER].items) { if (!bos_ServerOpen --- 1675,1681 ---- typedef enum { SERVER, COMMAND } DoBosCommandExecute_parm_t; afs_status_t st = 0; void *bos_server = NULL; ! const char *command = NULL; if (as->parms[SERVER].items) { if (!bos_ServerOpen Index: openafs/src/libadmin/test/client.c diff -c openafs/src/libadmin/test/client.c:1.8.14.1 openafs/src/libadmin/test/client.c:1.8.14.2 *** openafs/src/libadmin/test/client.c:1.8.14.1 Wed Oct 31 00:09:31 2007 --- openafs/src/libadmin/test/client.c Mon Oct 27 19:41:46 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/test/client.c,v 1.8.14.1 2007/10/31 04:09:31 shadow Exp $"); #include "client.h" #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/libadmin/test/client.c,v 1.8.14.2 2008/10/27 23:41:46 shadow Exp $"); #include "client.h" #include *************** *** 283,290 **** CHECK } DoClientMountPointCreate_parm_t; afs_status_t st = 0; ! const char *directory; ! const char *volume; vol_type_t vol_type = READ_ONLY; vol_check_t vol_check = DONT_CHECK_VOLUME; --- 283,290 ---- CHECK } DoClientMountPointCreate_parm_t; afs_status_t st = 0; ! const char *directory = NULL; ! const char *volume = NULL; vol_type_t vol_type = READ_ONLY; vol_check_t vol_check = DONT_CHECK_VOLUME; *************** *** 335,341 **** { typedef enum { SERVER } DoClientAFSServerGet_parm_t; afs_status_t st = 0; ! const char *server; afs_serverEntry_t entry; if (as->parms[SERVER].items) { --- 335,341 ---- { typedef enum { SERVER } DoClientAFSServerGet_parm_t; afs_status_t st = 0; ! const char *server = NULL; afs_serverEntry_t entry; if (as->parms[SERVER].items) { *************** *** 486,493 **** int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid; ! afs_stat_type_t which; afs_RPCStatsState_t state; if (as->parms[PROCESS].items) { --- 486,493 ---- int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid = 0; ! afs_stat_type_t which = 0; afs_RPCStatsState_t state; if (as->parms[PROCESS].items) { *************** *** 544,551 **** int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid; ! afs_stat_type_t which; if (as->parms[PROCESS].items) { typeIsValid = --- 544,551 ---- int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid = 0; ! afs_stat_type_t which = 0; if (as->parms[PROCESS].items) { typeIsValid = *************** *** 600,607 **** int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid; ! afs_stat_type_t which; if (as->parms[PROCESS].items) { typeIsValid = --- 600,607 ---- int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid = 0; ! afs_stat_type_t which = 0; if (as->parms[PROCESS].items) { typeIsValid = *************** *** 702,712 **** int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid; ! afs_stat_type_t which; afs_RPCStats_t stats; void *iter; ! int i; #ifdef AFS_NT40_ENV (pthread_func_list_done --- 702,712 ---- int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid = 0; ! afs_stat_type_t which = 0; afs_RPCStats_t stats; void *iter; ! int i = 0; #ifdef AFS_NT40_ENV (pthread_func_list_done *************** *** 833,840 **** int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid; ! afs_stat_type_t which; afs_RPCStatsClearFlag_t flag = 0; int seen_all = 0; int seen_any = 0; --- 833,840 ---- int servAddr = 0; afs_stat_source_t type; int srvrPort; ! int typeIsValid = 0; ! afs_stat_type_t which = 0; afs_RPCStatsClearFlag_t flag = 0; int seen_all = 0; int seen_any = 0; *************** *** 999,1005 **** afs_stat_source_t type; int servAddr = 0; int srvrPort; ! int typeIsValid; afs_RPCStatsVersion_t version; if (as->parms[PROCESS].items) { --- 999,1005 ---- afs_stat_source_t type; int servAddr = 0; int srvrPort; ! int typeIsValid = 0; afs_RPCStatsVersion_t version; if (as->parms[PROCESS].items) { Index: openafs/src/libadmin/test/vos.c diff -c openafs/src/libadmin/test/vos.c:1.9.4.2 openafs/src/libadmin/test/vos.c:1.9.4.3 *** openafs/src/libadmin/test/vos.c:1.9.4.2 Mon Apr 21 15:40:01 2008 --- openafs/src/libadmin/test/vos.c Mon Oct 27 19:41:46 2008 *************** *** 21,27 **** #endif RCSID ! ("$Header: /cvs/openafs/src/libadmin/test/vos.c,v 1.9.4.2 2008/04/21 19:40:01 shadow Exp $"); #include "vos.h" --- 21,27 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/libadmin/test/vos.c,v 1.9.4.3 2008/10/27 23:41:46 shadow Exp $"); #include "vos.h" *************** *** 151,157 **** { typedef enum { VOLUME } DoVosBackupVolumeCreate_parm_t; afs_status_t st = 0; ! unsigned int volume_id; if (as->parms[VOLUME].items) { const char *volume = as->parms[VOLUME].items->data; --- 151,157 ---- { typedef enum { VOLUME } DoVosBackupVolumeCreate_parm_t; afs_status_t st = 0; ! unsigned int volume_id = 0; if (as->parms[VOLUME].items) { const char *volume = as->parms[VOLUME].items->data; *************** *** 222,228 **** typedef enum { SERVER, PARTITION } DoVosPartitionGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; vos_partitionEntry_t entry; if (as->parms[SERVER].items) { --- 222,228 ---- typedef enum { SERVER, PARTITION } DoVosPartitionGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; vos_partitionEntry_t entry; if (as->parms[SERVER].items) { *************** *** 318,324 **** NEWADDRESS } DoVosFileServerAddressChange_parm_t; afs_status_t st = 0; ! int old_addr, new_addr; if (as->parms[OLDADDRESS].items) { const char *addr = as->parms[OLDADDRESS].items->data; --- 318,325 ---- NEWADDRESS } DoVosFileServerAddressChange_parm_t; afs_status_t st = 0; ! int old_addr = 0; ! int new_addr = 0; if (as->parms[OLDADDRESS].items) { const char *addr = as->parms[OLDADDRESS].items->data; *************** *** 341,347 **** { typedef enum { ADDRESS } DoVosFileServerAddressRemove_parm_t; afs_status_t st = 0; ! int address; if (as->parms[ADDRESS].items) { const char *addr = as->parms[ADDRESS].items->data; --- 342,348 ---- { typedef enum { ADDRESS } DoVosFileServerAddressRemove_parm_t; afs_status_t st = 0; ! int address = 0; if (as->parms[ADDRESS].items) { const char *addr = as->parms[ADDRESS].items->data; *************** *** 678,684 **** { typedef enum { VOLUME } DoVosVLDBEntryLoc_parm_tk; afs_status_t st = 0; ! unsigned int volume_id; if (as->parms[VOLUME].items) { const char *volume = as->parms[VOLUME].items->data; --- 679,685 ---- { typedef enum { VOLUME } DoVosVLDBEntryLoc_parm_tk; afs_status_t st = 0; ! unsigned int volume_id = 0; if (as->parms[VOLUME].items) { const char *volume = as->parms[VOLUME].items->data; *************** *** 697,703 **** { typedef enum { VOLUME } DoVosVLDBEntryUnlock_parm_t; afs_status_t st = 0; ! unsigned int volume_id; if (as->parms[VOLUME].items) { const char *volume = as->parms[VOLUME].items->data; --- 698,704 ---- { typedef enum { VOLUME } DoVosVLDBEntryUnlock_parm_t; afs_status_t st = 0; ! unsigned int volume_id = 0; if (as->parms[VOLUME].items) { const char *volume = as->parms[VOLUME].items->data; *************** *** 719,726 **** } DoVosVLDBReadOnlySiteCreate_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 720,727 ---- } DoVosVLDBReadOnlySiteCreate_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 754,761 **** } DoVosVLDBReadOnlySiteDelete_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 755,762 ---- } DoVosVLDBReadOnlySiteDelete_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 829,838 **** } DoVosVolumeCreate_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; unsigned int volume_id; const char *volume = NULL; ! unsigned int quota; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 830,839 ---- } DoVosVolumeCreate_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; unsigned int volume_id; const char *volume = NULL; ! unsigned int quota = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 872,879 **** typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeDelete_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 873,880 ---- typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeDelete_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 905,912 **** { typedef enum { OLDVOLUME, NEWVOLUME } DoVosVolumeRename_parm_t; afs_status_t st = 0; ! unsigned int old_volume; ! const char *new_volume; if (as->parms[OLDVOLUME].items) { const char *volume = as->parms[OLDVOLUME].items->data; --- 906,913 ---- { typedef enum { OLDVOLUME, NEWVOLUME } DoVosVolumeRename_parm_t; afs_status_t st = 0; ! unsigned int old_volume = 0; ! const char *new_volume = 0; if (as->parms[OLDVOLUME].items) { const char *volume = as->parms[OLDVOLUME].items->data; *************** *** 935,943 **** unsigned int partition_id; unsigned int *part_ptr = NULL; int have_server = 0; ! unsigned int volume_id; ! unsigned int start_time; ! const char *dumpfile; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 936,944 ---- unsigned int partition_id; unsigned int *part_ptr = NULL; int have_server = 0; ! unsigned int volume_id = 0; ! unsigned int start_time = 0; ! const char *dumpfile = NULL; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 988,998 **** } DoVosVolumeRestore_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; unsigned int volume_id; unsigned int *vol_ptr = NULL; ! const char *dumpfile; ! const char *volume_name; vos_volumeRestoreType_t restore = VOS_RESTORE_INCREMENTAL; if (as->parms[SERVER].items) { --- 989,999 ---- } DoVosVolumeRestore_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; unsigned int volume_id; unsigned int *vol_ptr = NULL; ! const char *dumpfile = NULL; ! const char *volume_name = NULL; vos_volumeRestoreType_t restore = VOS_RESTORE_INCREMENTAL; if (as->parms[SERVER].items) { *************** *** 1042,1050 **** } DoVosVolumeOnline_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; ! unsigned int sleep; vos_volumeOnlineType_t type = VOS_ONLINE_OFFLINE; if (as->parms[SERVER].items) { --- 1043,1051 ---- } DoVosVolumeOnline_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; ! unsigned int sleep = 0; vos_volumeOnlineType_t type = VOS_ONLINE_OFFLINE; if (as->parms[SERVER].items) { *************** *** 1088,1095 **** typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeOffline_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 1089,1096 ---- typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeOffline_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 1345,1352 **** typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; vos_volumeEntry_t entry; if (as->parms[SERVER].items) { --- 1346,1353 ---- typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; vos_volumeEntry_t entry; if (as->parms[SERVER].items) { *************** *** 1383,1389 **** afs_status_t st = 0; void *vos_server = NULL; void *iter = NULL; ! unsigned int partition_id; vos_volumeEntry_t entry; if (as->parms[SERVER].items) { --- 1384,1390 ---- afs_status_t st = 0; void *vos_server = NULL; void *iter = NULL; ! unsigned int partition_id = 0; vos_volumeEntry_t entry; if (as->parms[SERVER].items) { *************** *** 1431,1439 **** afs_status_t st = 0; void *from_server = NULL; void *to_server = NULL; ! unsigned int from_partition; ! unsigned int to_partition; ! unsigned int volume_id; if (as->parms[FROMSERVER].items) { if (!vos_ServerOpen --- 1432,1440 ---- afs_status_t st = 0; void *from_server = NULL; void *to_server = NULL; ! unsigned int from_partition = 0; ! unsigned int to_partition = 0; ! unsigned int volume_id = 0; if (as->parms[FROMSERVER].items) { if (!vos_ServerOpen *************** *** 1479,1485 **** { typedef enum { VOLUME, FORCE } DoVosVolumeRelease_parm_t; afs_status_t st = 0; ! unsigned int volume_id; vos_force_t force = VOS_NORMAL; if (as->parms[VOLUME].items) { --- 1480,1486 ---- { typedef enum { VOLUME, FORCE } DoVosVolumeRelease_parm_t; afs_status_t st = 0; ! unsigned int volume_id = 0; vos_force_t force = VOS_NORMAL; if (as->parms[VOLUME].items) { *************** *** 1503,1510 **** typedef enum { SERVER, PARTITION, VOLUME, FORCE } DoVosVolumeZap_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; vos_force_t force = VOS_NORMAL; if (as->parms[SERVER].items) { --- 1504,1511 ---- typedef enum { SERVER, PARTITION, VOLUME, FORCE } DoVosVolumeZap_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; vos_force_t force = VOS_NORMAL; if (as->parms[SERVER].items) { *************** *** 1541,1547 **** { typedef enum { PARTITION } DoVosPartitionNameToId_parm_t; afs_status_t st = 0; ! unsigned int partition_id; if (as->parms[PARTITION].items) { partition_id = --- 1542,1548 ---- { typedef enum { PARTITION } DoVosPartitionNameToId_parm_t; afs_status_t st = 0; ! unsigned int partition_id = 0; if (as->parms[PARTITION].items) { partition_id = *************** *** 1559,1565 **** { typedef enum { PARTITIONID } DoVosPartitionIdToName_parm_t; afs_status_t st = 0; ! unsigned int partition_id; char partition[VOS_MAX_PARTITION_NAME_LEN]; if (as->parms[PARTITIONID].items) { --- 1560,1566 ---- { typedef enum { PARTITIONID } DoVosPartitionIdToName_parm_t; afs_status_t st = 0; ! unsigned int partition_id = 0; char partition[VOS_MAX_PARTITION_NAME_LEN]; if (as->parms[PARTITIONID].items) { *************** *** 1585,1593 **** } DoVosVolumeQuotaChange_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; ! unsigned int quota; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 1586,1594 ---- } DoVosVolumeQuotaChange_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; ! unsigned int quota = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen *************** *** 1733,1740 **** typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! afs_uint32 partition_id; ! afs_uint32 volume_id; volintInfo info; memset(&info, 0, sizeof(struct volintInfo)); --- 1734,1741 ---- typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! afs_uint32 partition_id = 0; ! afs_uint32 volume_id = 0; volintInfo info; memset(&info, 0, sizeof(struct volintInfo)); *************** *** 1775,1782 **** typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id; ! unsigned int volume_id; if (as->parms[SERVER].items) { if (!vos_ServerOpen --- 1776,1783 ---- typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; void *vos_server = NULL; ! unsigned int partition_id = 0; ! unsigned int volume_id = 0; if (as->parms[SERVER].items) { if (!vos_ServerOpen Index: openafs/src/libafs/MakefileProto.LINUX.in diff -c openafs/src/libafs/MakefileProto.LINUX.in:1.54.4.6 openafs/src/libafs/MakefileProto.LINUX.in:1.54.4.7 *** openafs/src/libafs/MakefileProto.LINUX.in:1.54.4.6 Wed Sep 3 12:59:18 2008 --- openafs/src/libafs/MakefileProto.LINUX.in Sun Oct 12 14:02:19 2008 *************** *** 60,65 **** --- 60,66 ---- COMMON_DEFINES=-D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} LINUX_KERNEL_PATH=@LINUX_KERNEL_PATH@ + LINUX_KERNEL_BUILD=@LINUX_KERNEL_BUILD@ # System specific build commands and flags *************** *** 295,301 **** .FORCE: ${LINUX_LIBAFS_NAME}.ko afspag.ko: .FORCE env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common ! env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS) --- 296,302 ---- .FORCE: ${LINUX_LIBAFS_NAME}.ko afspag.ko: .FORCE env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common ! env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS) Index: openafs/src/libafsrpc/afsrpc.def diff -c openafs/src/libafsrpc/afsrpc.def:1.11.4.8 openafs/src/libafsrpc/afsrpc.def:1.11.4.9 *** openafs/src/libafsrpc/afsrpc.def:1.11.4.8 Tue Oct 7 18:28:49 2008 --- openafs/src/libafsrpc/afsrpc.def Wed Oct 8 17:15:10 2008 *************** *** 233,238 **** --- 233,241 ---- clock_now @238 clock_UpdateTime @239 clock_haveCurrentTime @240 + rx_SetRxDeadTime @241 + rx_GetMinUdpBufSize @242 + rx_SetUdpBufSize @243 ; for performance testing rx_TSFPQGlobSize @2001 DATA Index: openafs/src/packaging/RedHat/openafs.spec.in diff -c openafs/src/packaging/RedHat/openafs.spec.in:1.2.2.26 openafs/src/packaging/RedHat/openafs.spec.in:1.2.2.27 *** openafs/src/packaging/RedHat/openafs.spec.in:1.2.2.26 Tue Aug 26 09:44:43 2008 --- openafs/src/packaging/RedHat/openafs.spec.in Wed Nov 5 16:29:47 2008 *************** *** 1,4 **** ! # Openafs Spec $Revision: 1.2.2.26 $ %define afsvers @VERSION@ %define pkgvers @LINUX_PKGVER@ --- 1,4 ---- ! # Openafs Spec $Revision: 1.2.2.27 $ %define afsvers @VERSION@ %define pkgvers @LINUX_PKGVER@ *************** *** 1497,1502 **** --- 1497,1503 ---- %{_mandir}/man5/fms.log.* %{_mandir}/man5/kaserver.DB0.* %{_mandir}/man5/kaserverauxdb.* + %{_mandir}/man5/krb.conf.* %{_mandir}/man5/prdb.DB0.* %{_mandir}/man5/salvage.lock.* %{_mandir}/man5/tapeconfig.* Index: openafs/src/ptserver/db_verify.c diff -c openafs/src/ptserver/db_verify.c:1.16.14.5 openafs/src/ptserver/db_verify.c:1.16.14.6 *** openafs/src/ptserver/db_verify.c:1.16.14.5 Wed Oct 31 00:09:32 2007 --- openafs/src/ptserver/db_verify.c Mon Oct 27 19:53:46 2008 *************** *** 12,18 **** #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/db_verify.c,v 1.16.14.5 2007/10/31 04:09:32 shadow Exp $"); /* * (3) Define a structure, idused, instead of an --- 12,18 ---- #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/db_verify.c,v 1.16.14.6 2008/10/27 23:53:46 shadow Exp $"); /* * (3) Define a structure, idused, instead of an *************** *** 395,402 **** struct prentry c; /* continuation entry */ afs_int32 na; /* next thread */ int ni; ! afs_int32 eid; ! int count; /* number of members */ int i; int noErrors = 1; int length; /* length of chain */ --- 395,403 ---- struct prentry c; /* continuation entry */ afs_int32 na; /* next thread */ int ni; ! afs_int32 eid = 0; ! int count = 0; /* number of members, set to > 9999 if */ ! /* list ends early */ int i; int noErrors = 1; int length; /* length of chain */ *************** *** 410,416 **** head = ntohl(e->next); eid = ntohl(e->id); bit = MAP_CONT; - count = 0; /* set to >9999 if list ends early */ #if defined(SUPERGROUPS) sgcount = 0; sghead = ntohl(g->next); --- 411,416 ---- *************** *** 713,719 **** struct prentry c; /* continuation entry */ afs_int32 na; /* next thread */ int ni; ! afs_int32 eid; int length; /* length of chain */ if (e) { --- 713,719 ---- struct prentry c; /* continuation entry */ afs_int32 na; /* next thread */ int ni; ! afs_int32 eid = 0; int length; /* length of chain */ if (e) { Index: openafs/src/ptserver/pt_util.c diff -c openafs/src/ptserver/pt_util.c:1.11.4.6 openafs/src/ptserver/pt_util.c:1.11.4.7 *** openafs/src/ptserver/pt_util.c:1.11.4.6 Tue Jul 1 01:57:35 2008 --- openafs/src/ptserver/pt_util.c Mon Oct 27 19:53:46 2008 *************** *** 1,4 **** ! /* $Id: pt_util.c,v 1.11.4.6 2008/07/01 05:57:35 rra Exp $ */ /* * --- 1,4 ---- ! /* $Id: pt_util.c,v 1.11.4.7 2008/10/27 23:53:46 shadow Exp $ */ /* * *************** *** 23,29 **** #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/pt_util.c,v 1.11.4.6 2008/07/01 05:57:35 rra Exp $"); #include /*Command line parsing */ #include --- 23,29 ---- #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/pt_util.c,v 1.11.4.7 2008/10/27 23:53:46 shadow Exp $"); #include /*Command line parsing */ #include *************** *** 133,140 **** CommandProc(register struct cmd_syndesc *a_as, void *arock) { register int i; ! register long code; ! long cc, upos, gpos; struct prentry uentry, gentry; struct ubik_hdr *uh; char *dfile = 0; --- 133,141 ---- CommandProc(register struct cmd_syndesc *a_as, void *arock) { register int i; ! long code = 0; ! long cc, upos; ! long gpos = 0; struct prentry uentry, gentry; struct ubik_hdr *uh; char *dfile = 0; Index: openafs/src/ptserver/ptutils.c diff -c openafs/src/ptserver/ptutils.c:1.19.6.5 openafs/src/ptserver/ptutils.c:1.19.6.6 *** openafs/src/ptserver/ptutils.c:1.19.6.5 Wed Apr 2 15:51:56 2008 --- openafs/src/ptserver/ptutils.c Sun Oct 26 03:50:55 2008 *************** *** 24,30 **** #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/ptutils.c,v 1.19.6.5 2008/04/02 19:51:56 shadow Exp $"); #include #include --- 24,30 ---- #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/ptutils.c,v 1.19.6.6 2008/10/26 07:50:55 jaltman Exp $"); #include #include *************** *** 294,300 **** return 1; if (cid == SYSADMINID) return 1; /* special case fileserver */ ! if (restricted && ((mem == PRP_ADD_MEM) || (mem == any == 0))) return 0; if (tentry) { flags = tentry->flags; --- 294,300 ---- return 1; if (cid == SYSADMINID) return 1; /* special case fileserver */ ! if (restricted && ((mem == PRP_ADD_MEM) || (mem == PRP_REMOVE_MEM)) && (any == 0)) return 0; if (tentry) { flags = tentry->flags; Index: openafs/src/ptserver/testpt.c diff -c openafs/src/ptserver/testpt.c:1.14.14.4 openafs/src/ptserver/testpt.c:1.14.14.5 *** openafs/src/ptserver/testpt.c:1.14.14.4 Wed Oct 31 00:09:32 2007 --- openafs/src/ptserver/testpt.c Mon Oct 27 19:41:46 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/testpt.c,v 1.14.14.4 2007/10/31 04:09:32 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/ptserver/testpt.c,v 1.14.14.5 2008/10/27 23:41:46 shadow Exp $"); #include #include *************** *** 272,279 **** char name[16]; afs_int32 id = 0; afs_int32 flags = PRGRP; ! afs_int32 owner; ! char *ownerName; int ownerType; /* type of ownership */ static char *lastGroupPrefix; /* prefix used for type==2 */ --- 272,279 ---- char name[16]; afs_int32 id = 0; afs_int32 flags = PRGRP; ! afs_int32 owner = 0; ! char *ownerName = NULL; int ownerType; /* type of ownership */ static char *lastGroupPrefix; /* prefix used for type==2 */ Index: openafs/src/rx/rx_globals.c diff -c openafs/src/rx/rx_globals.c:1.9.8.3 openafs/src/rx/rx_globals.c:1.9.8.4 *** openafs/src/rx/rx_globals.c:1.9.8.3 Mon Dec 18 22:19:08 2006 --- openafs/src/rx/rx_globals.c Wed Oct 8 17:15:10 2008 *************** *** 26,32 **** #endif RCSID ! ("$Header: /cvs/openafs/src/rx/rx_globals.c,v 1.9.8.3 2006/12/19 03:19:08 shadow Exp $"); /* Enable data initialization when the header file is included */ #define GLOBALSINIT(stuff) = stuff --- 26,32 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/rx/rx_globals.c,v 1.9.8.4 2008/10/08 21:15:10 jaltman Exp $"); /* Enable data initialization when the header file is included */ #define GLOBALSINIT(stuff) = stuff *************** *** 47,49 **** --- 47,69 ---- #endif /* KERNEL */ #include "rx_globals.h" + + #ifdef AFS_NT40_ENV + + void rx_SetRxDeadTime(int seconds) + { + rx_connDeadTime = seconds; + } + + int rx_GetMinUdpBufSize(void) + { + return 64*1024; + } + + void rx_SetUdpBufSize(int x) + { + if (x > rx_GetMinUdpBufSize()) + rx_UdpBufSize = x; + } + + #endif /* AFS_NT40_ENV */ Index: openafs/src/rx/rx_globals.h diff -c openafs/src/rx/rx_globals.h:1.21.2.21 openafs/src/rx/rx_globals.h:1.21.2.22 *** openafs/src/rx/rx_globals.h:1.21.2.21 Fri Oct 3 10:57:19 2008 --- openafs/src/rx/rx_globals.h Wed Oct 8 17:15:10 2008 *************** *** 81,88 **** --- 81,93 ---- /* Time until an unresponsive connection is declared dead */ EXT int rx_connDeadTime GLOBALSINIT(12); + /* Set rx default connection dead time; set on both services and connections at creation time */ + #ifdef AFS_NT40_ENV + void rx_SetRxDeadTime(int seconds); + #else #define rx_SetRxDeadTime(seconds) (rx_connDeadTime = (seconds)) + #endif /* Time until we toss an idle connection */ EXT int rx_idleConnectionTime GLOBALSINIT(700); *************** *** 94,102 **** /* UDP rcv buffer size */ EXT int rx_UdpBufSize GLOBALSINIT(64 * 1024); #define rx_GetMinUdpBufSize() (64*1024) #define rx_SetUdpBufSize(x) (((x)>rx_GetMinUdpBufSize()) ? (rx_UdpBufSize = (x)):0) ! /* * Variables to control RX overload management. When the number of calls * waiting for a thread exceed the threshold, new calls are aborted --- 99,111 ---- /* UDP rcv buffer size */ EXT int rx_UdpBufSize GLOBALSINIT(64 * 1024); + #ifdef AFS_NT40_ENV + int rx_GetMinUdpBufSize(void); + void rx_SetUdpBufSize(int x); + #else #define rx_GetMinUdpBufSize() (64*1024) #define rx_SetUdpBufSize(x) (((x)>rx_GetMinUdpBufSize()) ? (rx_UdpBufSize = (x)):0) ! #endif /* * Variables to control RX overload management. When the number of calls * waiting for a thread exceed the threshold, new calls are aborted Index: openafs/src/rx/rx_rdwr.c diff -c openafs/src/rx/rx_rdwr.c:1.29.2.9 openafs/src/rx/rx_rdwr.c:1.29.2.10 *** openafs/src/rx/rx_rdwr.c:1.29.2.9 Thu Oct 2 07:53:18 2008 --- openafs/src/rx/rx_rdwr.c Sun Oct 26 17:17:41 2008 *************** *** 15,21 **** #endif RCSID ! ("$Header: /cvs/openafs/src/rx/rx_rdwr.c,v 1.29.2.9 2008/10/02 11:53:18 jaltman Exp $"); #ifdef KERNEL #ifndef UKERNEL --- 15,21 ---- #endif RCSID ! ("$Header: /cvs/openafs/src/rx/rx_rdwr.c,v 1.29.2.10 2008/10/26 21:17:41 jaltman Exp $"); #ifdef KERNEL #ifndef UKERNEL *************** *** 387,393 **** call->curpos = tcurpos + sizeof(afs_int32); call->curlen = (u_short)(tcurlen - sizeof(afs_int32)); call->nLeft = (u_short)(tnLeft - sizeof(afs_int32)); ! if (!call->nLeft) { /* out of packet. Get another one. */ NETPRI; MUTEX_ENTER(&call->lock); --- 387,393 ---- call->curpos = tcurpos + sizeof(afs_int32); call->curlen = (u_short)(tcurlen - sizeof(afs_int32)); call->nLeft = (u_short)(tnLeft - sizeof(afs_int32)); ! if (!call->nLeft && call->currentPacket != NULL) { /* out of packet. Get another one. */ NETPRI; MUTEX_ENTER(&call->lock); Index: openafs/src/rxgen/rpc_parse.c diff -c openafs/src/rxgen/rpc_parse.c:1.20.4.4 openafs/src/rxgen/rpc_parse.c:1.20.4.5 *** openafs/src/rxgen/rpc_parse.c:1.20.4.4 Thu Nov 1 12:02:29 2007 --- openafs/src/rxgen/rpc_parse.c Mon Oct 27 19:41:46 2008 *************** *** 36,42 **** #include RCSID ! ("$Header: /cvs/openafs/src/rxgen/rpc_parse.c,v 1.20.4.4 2007/11/01 16:02:29 shadow Exp $"); #include #include --- 36,42 ---- #include RCSID ! ("$Header: /cvs/openafs/src/rxgen/rpc_parse.c,v 1.20.4.5 2008/10/27 23:41:46 shadow Exp $"); #include #include *************** *** 933,939 **** handle_split_proc(definition * defp, int multi_flag) { char *startname = SplitStart, *endname = SplitEnd; ! int numofparams; if (!startname) startname = "Start"; --- 933,939 ---- handle_split_proc(definition * defp, int multi_flag) { char *startname = SplitStart, *endname = SplitEnd; ! int numofparams = 0; if (!startname) startname = "Start"; Index: openafs/src/scout/scout.c diff -c openafs/src/scout/scout.c:1.10.2.3 openafs/src/scout/scout.c:1.10.2.4 *** openafs/src/scout/scout.c:1.10.2.3 Mon Nov 26 16:08:43 2007 --- openafs/src/scout/scout.c Mon Oct 27 19:41:46 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/scout/scout.c,v 1.10.2.3 2007/11/26 21:08:43 shadow Exp $"); #undef IN #ifdef AFS_AIX32_ENV --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/scout/scout.c,v 1.10.2.4 2008/10/27 23:41:46 shadow Exp $"); #undef IN #ifdef AFS_AIX32_ENV *************** *** 470,476 **** int num_src_chars; /*# of chars in source */ int true_num_src_chars; /*# src chars before truncation */ int trunc_needed; /*Is truncation needed? */ ! char diskChar; /*Disk name prefix */ if (scout_debug) { fprintf(scout_debugfd, "[%s] Called with '%s', dest width=%d\n", rn, --- 470,476 ---- int num_src_chars; /*# of chars in source */ int true_num_src_chars; /*# src chars before truncation */ int trunc_needed; /*Is truncation needed? */ ! char diskChar = 0; /*Disk name prefix */ if (scout_debug) { fprintf(scout_debugfd, "[%s] Called with '%s', dest width=%d\n", rn, Index: openafs/src/sys/pioctl_nt.c diff -c openafs/src/sys/pioctl_nt.c:1.34.4.16 openafs/src/sys/pioctl_nt.c:1.34.4.19 *** openafs/src/sys/pioctl_nt.c:1.34.4.16 Sat Aug 16 12:50:06 2008 --- openafs/src/sys/pioctl_nt.c Sun Oct 26 17:52:43 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/sys/pioctl_nt.c,v 1.34.4.16 2008/08/16 16:50:06 jaltman Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/sys/pioctl_nt.c,v 1.34.4.19 2008/10/26 21:52:43 jaltman Exp $"); #include #include *************** *** 397,402 **** --- 397,483 ---- return success; } + static BOOL + DriveIsMappedToAFS(char *drivestr, char *NetbiosName) + { + DWORD dwResult, dwResultEnum; + HANDLE hEnum; + DWORD cbBuffer = 16384; // 16K is a good size + DWORD cEntries = -1; // enumerate all possible entries + LPNETRESOURCE lpnrLocal; // pointer to enumerated structures + DWORD i; + BOOL bIsAFS = FALSE; + + // + // Call the WNetOpenEnum function to begin the enumeration. + // + dwResult = WNetOpenEnum(RESOURCE_CONNECTED, + RESOURCETYPE_DISK, + RESOURCEUSAGE_ALL, + NULL, // NULL first time the function is called + &hEnum); // handle to the resource + + if (dwResult != NO_ERROR) + return FALSE; + + // + // Call the GlobalAlloc function to allocate resources. + // + lpnrLocal = (LPNETRESOURCE) GlobalAlloc(GPTR, cbBuffer); + if (lpnrLocal == NULL) + return FALSE; + + do { + // + // Initialize the buffer. + // + ZeroMemory(lpnrLocal, cbBuffer); + // + // Call the WNetEnumResource function to continue + // the enumeration. + // + cEntries = -1; + dwResultEnum = WNetEnumResource(hEnum, // resource handle + &cEntries, // defined locally as -1 + lpnrLocal, // LPNETRESOURCE + &cbBuffer); // buffer size + // + // If the call succeeds, loop through the structures. + // + if (dwResultEnum == NO_ERROR) { + for (i = 0; i < cEntries; i++) { + if (lpnrLocal[i].lpLocalName && + toupper(lpnrLocal[i].lpLocalName[0]) == toupper(drivestr[0])) { + // + // Skip the two backslashes at the start of the UNC device name + // + if ( _strnicmp( &(lpnrLocal[i].lpRemoteName[2]), NetbiosName, strlen(NetbiosName)) == 0 ) + { + bIsAFS = TRUE; + break; + } + } + } + } + // Process errors. + // + else if (dwResultEnum != ERROR_NO_MORE_ITEMS) + break; + } + while (dwResultEnum != ERROR_NO_MORE_ITEMS); + + // + // Call the GlobalFree function to free the memory. + // + GlobalFree((HGLOBAL) lpnrLocal); + // + // Call WNetCloseEnum to end the enumeration. + // + dwResult = WNetCloseEnum(hEnum); + + return bIsAFS; + } + static long GetIoctlHandle(char *fileNamep, HANDLE * handlep) { *************** *** 424,429 **** --- 505,513 ---- CurrentState != SERVICE_RUNNING) return -1; + // Populate the Netbios Name + lana_GetNetbiosName(netbiosName,LANA_NETBIOS_NAME_FULL); + if (fileNamep) { drivep = strchr(fileNamep, ':'); if (drivep && (drivep - fileNamep) >= 1) { *************** *** 437,443 **** switch (driveType) { case DRIVE_UNKNOWN: case DRIVE_REMOTE: ! strcpy(&tbuffer[2], SMB_IOCTL_FILENAME); break; default: return -1; --- 521,530 ---- switch (driveType) { case DRIVE_UNKNOWN: case DRIVE_REMOTE: ! if (DriveIsMappedToAFS(tbuffer, netbiosName)) ! strcpy(&tbuffer[2], SMB_IOCTL_FILENAME); ! else ! return -1; break; default: return -1; *************** *** 487,493 **** } if (!tbuffer[0]) { /* No file name starting with drive colon specified, use UNC name */ - lana_GetNetbiosName(netbiosName,LANA_NETBIOS_NAME_FULL); sprintf(tbuffer,"\\\\%s\\all%s",netbiosName,SMB_IOCTL_FILENAME); } --- 574,579 ---- Index: openafs/src/tbutc/NTMakefile diff -c openafs/src/tbutc/NTMakefile:1.16.4.5 openafs/src/tbutc/NTMakefile:1.16.4.6 *** openafs/src/tbutc/NTMakefile:1.16.4.5 Tue Oct 7 18:26:44 2008 --- openafs/src/tbutc/NTMakefile Wed Oct 8 17:15:10 2008 *************** *** 76,86 **** $(BUTMLIBS) \ $(DESTDIR)\lib\afs\afsvldb.lib \ $(DESTDIR)\lib\afs\afskauth.lib \ - $(DESTDIR)\lib\afsubik.lib \ $(DESTDIR)\lib\afs\afsauth.lib \ $(DESTDIR)\lib\afsrpc.lib \ $(DESTDIR)\lib\afsrxkad.lib \ ! $(DESTDIR)\lib\afslwp.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsusd.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ --- 76,85 ---- $(BUTMLIBS) \ $(DESTDIR)\lib\afs\afsvldb.lib \ $(DESTDIR)\lib\afs\afskauth.lib \ $(DESTDIR)\lib\afs\afsauth.lib \ $(DESTDIR)\lib\afsrpc.lib \ $(DESTDIR)\lib\afsrxkad.lib \ ! $(DESTDIR)\lib\afsubik.lib \ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsusd.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ Index: openafs/src/ubik/recovery.c diff -c openafs/src/ubik/recovery.c:1.14.4.8 openafs/src/ubik/recovery.c:1.14.4.9 *** openafs/src/ubik/recovery.c:1.14.4.8 Sat Jul 19 02:15:02 2008 --- openafs/src/ubik/recovery.c Sat Oct 18 11:24:45 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/ubik/recovery.c,v 1.14.4.8 2008/07/19 06:15:02 rra Exp $"); #include #ifdef AFS_NT40_ENV --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/ubik/recovery.c,v 1.14.4.9 2008/10/18 15:24:45 jaltman Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 605,610 **** --- 605,611 ---- } #endif + pass = 0; while (length > 0) { tlen = (length > sizeof(tbuffer) ? sizeof(tbuffer) : length); #ifndef AFS_PTHREAD_ENV Index: openafs/src/ubik/remote.c diff -c openafs/src/ubik/remote.c:1.15.4.7 openafs/src/ubik/remote.c:1.15.4.9 *** openafs/src/ubik/remote.c:1.15.4.7 Sat Jul 19 02:15:02 2008 --- openafs/src/ubik/remote.c Mon Oct 27 19:53:46 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/ubik/remote.c,v 1.15.4.7 2008/07/19 06:15:02 rra Exp $"); #include #ifdef AFS_NT40_ENV --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/ubik/remote.c,v 1.15.4.9 2008/10/27 23:53:46 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 489,506 **** struct ubik_version *avers; { register afs_int32 code; ! register struct ubik_dbase *dbase; char tbuffer[1024]; afs_int32 offset; struct ubik_version tversion; register int tlen; struct rx_peer *tpeer; struct rx_connection *tconn; ! afs_uint32 otherHost; #ifndef OLD_URECOVERY char pbuffer[1028]; int flen, fd = -1; ! afs_int32 epoch, pass; #endif /* send the file back to the requester */ --- 489,507 ---- struct ubik_version *avers; { register afs_int32 code; ! struct ubik_dbase *dbase = NULL; char tbuffer[1024]; afs_int32 offset; struct ubik_version tversion; register int tlen; struct rx_peer *tpeer; struct rx_connection *tconn; ! afs_uint32 otherHost = 0; #ifndef OLD_URECOVERY char pbuffer[1028]; int flen, fd = -1; ! afs_int32 epoch = 0; ! afs_int32 pass; #endif /* send the file back to the requester */ *************** *** 560,566 **** close(fd); goto failed; } - #else pass = 0; #endif memcpy(&ubik_dbase->version, &tversion, sizeof(struct ubik_version)); --- 561,566 ---- *************** *** 639,646 **** #ifndef OLD_URECOVERY unlink(pbuffer); /* Failed to sync. Allow reads again for now. */ ! tversion.epoch = epoch; ! (*dbase->setlabel) (dbase, file, &tversion); #endif ubik_print ("Ubik: Synchronize database with server %s failed (error = %d)\n", --- 639,648 ---- #ifndef OLD_URECOVERY unlink(pbuffer); /* Failed to sync. Allow reads again for now. */ ! if (dbase != NULL) { ! tversion.epoch = epoch; ! (*dbase->setlabel) (dbase, file, &tversion); ! } #endif ubik_print ("Ubik: Synchronize database with server %s failed (error = %d)\n", Index: openafs/src/uss/uss.c diff -c openafs/src/uss/uss.c:1.8.14.3 openafs/src/uss/uss.c:1.8.14.4 *** openafs/src/uss/uss.c:1.8.14.3 Mon Nov 26 16:08:45 2007 --- openafs/src/uss/uss.c Mon Oct 27 19:41:46 2008 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/uss/uss.c,v 1.8.14.3 2007/11/26 21:08:45 shadow Exp $"); #ifdef AFS_AIX32_ENV #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/uss/uss.c,v 1.8.14.4 2008/10/27 23:41:46 shadow Exp $"); #ifdef AFS_AIX32_ENV #include *************** *** 1319,1325 **** int code; int line_no = 0; ! int error; char tbuf[USS_BULK_BUF_CHARS]; /* --- 1319,1325 ---- int code; int line_no = 0; ! int error = 0; char tbuf[USS_BULK_BUF_CHARS]; /* Index: openafs/src/uss/uss_procs.c diff -c openafs/src/uss/uss_procs.c:1.9.14.1 openafs/src/uss/uss_procs.c:1.9.14.2 *** openafs/src/uss/uss_procs.c:1.9.14.1 Tue Oct 30 11:16:48 2007 --- openafs/src/uss/uss_procs.c Mon Oct 27 19:41:46 2008 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/uss/uss_procs.c,v 1.9.14.1 2007/10/30 15:16:48 shadow Exp $"); #include "uss_procs.h" /*Module interface */ #include "uss_common.h" /*Common defs & operations */ --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/uss/uss_procs.c,v 1.9.14.2 2008/10/27 23:41:46 shadow Exp $"); #include "uss_procs.h" /*Module interface */ #include "uss_common.h" /*Common defs & operations */ *************** *** 694,700 **** char cd[300]; /*Current directory for search */ ! int i, count, MinIndex, mina = 10000; struct dirent *dp; DIR *dirp; char dirname[300]; --- 694,700 ---- char cd[300]; /*Current directory for search */ ! int i, count, MinIndex = 0, mina = 10000; struct dirent *dp; DIR *dirp; char dirname[300]; Index: openafs/src/uss/uss_vol.c diff -c openafs/src/uss/uss_vol.c:1.10.14.3 openafs/src/uss/uss_vol.c:1.10.14.4 *** openafs/src/uss/uss_vol.c:1.10.14.3 Tue Oct 30 11:16:48 2007 --- openafs/src/uss/uss_vol.c Mon Oct 27 19:41:46 2008 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/uss/uss_vol.c,v 1.10.14.3 2007/10/30 15:16:48 shadow Exp $"); #include "uss_vol.h" /*Interface to this module */ #include "uss_common.h" /*Common definitions */ --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/uss/uss_vol.c,v 1.10.14.4 2008/10/27 23:41:46 shadow Exp $"); #include "uss_vol.h" /*Interface to this module */ #include "uss_common.h" /*Common definitions */ *************** *** 935,941 **** { /*uss_vol_DeleteVol */ static char rn[] = "uss_vol_DeleteVol"; /*Routine name */ ! register afs_int32 code; /*Return code */ /* * Make sure we've initialized our VLDB connection(s) before --- 935,941 ---- { /*uss_vol_DeleteVol */ static char rn[] = "uss_vol_DeleteVol"; /*Routine name */ ! register afs_int32 code = 0; /*Return code */ /* * Make sure we've initialized our VLDB connection(s) before Index: openafs/src/venus/cmdebug.c diff -c openafs/src/venus/cmdebug.c:1.19.4.7 openafs/src/venus/cmdebug.c:1.19.4.8 *** openafs/src/venus/cmdebug.c:1.19.4.7 Sat Jan 12 10:44:40 2008 --- openafs/src/venus/cmdebug.c Fri Oct 10 07:54:29 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/venus/cmdebug.c,v 1.19.4.7 2008/01/12 15:44:40 jaltman Exp $"); #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/venus/cmdebug.c,v 1.19.4.8 2008/10/10 11:54:29 jaltman Exp $"); #include *************** *** 266,272 **** struct AFSDBCacheEntry centry; char *cellname; ! for (i = 0; i < 10000; i++) { code = RXAFSCB_GetCE(aconn, i, ¢ry); if (code) { if (code == 1) --- 266,272 ---- struct AFSDBCacheEntry centry; char *cellname; ! for (i = 0; i < 1000000; i++) { code = RXAFSCB_GetCE(aconn, i, ¢ry); if (code) { if (code == 1) *************** *** 363,369 **** char *cellname; int ce64 = 0; ! for (i = 0; i < 10000; i++) { code = RXAFSCB_GetCE64(aconn, i, ¢ry); if (code) { if (code == 1) --- 363,369 ---- char *cellname; int ce64 = 0; ! for (i = 0; i < 1000000; i++) { code = RXAFSCB_GetCE64(aconn, i, ¢ry); if (code) { if (code == 1) Index: openafs/src/venus/fstrace.c diff -c openafs/src/venus/fstrace.c:1.23.2.3 openafs/src/venus/fstrace.c:1.23.2.4 *** openafs/src/venus/fstrace.c:1.23.2.3 Mon Nov 26 16:08:45 2007 --- openafs/src/venus/fstrace.c Mon Oct 27 19:41:46 2008 *************** *** 14,20 **** #include RCSID ! ("$Header: /cvs/openafs/src/venus/fstrace.c,v 1.23.2.3 2007/11/26 21:08:45 shadow Exp $"); #include #include --- 14,20 ---- #include RCSID ! ("$Header: /cvs/openafs/src/venus/fstrace.c,v 1.23.2.4 2008/10/27 23:41:46 shadow Exp $"); #include #include *************** *** 1662,1668 **** for (i = 0; i < ICL_LOGSPERSET; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGSBYSET, (long)setname, ! i, (long)tname, sizeof(tname)); if (code) { if (errno == EBADF) { code = 0; --- 1662,1668 ---- for (i = 0; i < ICL_LOGSPERSET; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGSBYSET, (long)setname, ! i, (long)tname, sizeof(tname), 0, 0); if (code) { if (errno == EBADF) { code = 0; *************** *** 1672,1678 **** } code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)tname, ! (long)&dummy, (long)&dummy2, 0); if (code) break; found++; --- 1672,1678 ---- } code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)tname, ! (long)&dummy, (long)&dummy2, 0, 0, 0); if (code) break; found++; *************** *** 1691,1697 **** for (i = 0; i < 1000; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGS, i, (long)tname, ! sizeof(tname), (long)&dummy); if (code) break; if (dummy > bufferSize) /* find biggest log */ --- 1691,1697 ---- for (i = 0; i < 1000; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGS, i, (long)tname, ! sizeof(tname), (long)&dummy, 0, 0); if (code) break; if (dummy > bufferSize) /* find biggest log */ *************** *** 1727,1733 **** code = afs_syscall(AFSCALL_ICL, ICL_OP_COPYOUT, (long)lip->name, (long)(bufferp + nwords), bufferSize - nwords, ! (long)&i); if (code < 0) { /* otherwise we've got an error */ fprintf(outFilep, "Returned error %d dumping log.\n", errno); --- 1727,1733 ---- code = afs_syscall(AFSCALL_ICL, ICL_OP_COPYOUT, (long)lip->name, (long)(bufferp + nwords), bufferSize - nwords, ! (long)&i, 0, 0); if (code < 0) { /* otherwise we've got an error */ fprintf(outFilep, "Returned error %d dumping log.\n", errno); *************** *** 1786,1792 **** { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_CLRLOG, (long)name, 0, 0, 0); return code; } --- 1786,1792 ---- { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_CLRLOG, (long)name, 0, 0, 0, 0, 0); return code; } *************** *** 1796,1802 **** { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_CLRSET, (long)name, 0, 0, 0); return code; } --- 1796,1802 ---- { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_CLRSET, (long)name, 0, 0, 0, 0, 0); return code; } *************** *** 1805,1811 **** { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_CLRALL, 0, 0, 0, 0); return code; } --- 1805,1811 ---- { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_CLRALL, 0, 0, 0, 0, 0, 0); return code; } *************** *** 1822,1828 **** for (i = 0; i < 1000; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMSETS, i, (long)tname, ! sizeof(tname), (long)&states); if (code) break; (void)fprintf(outFileP, "%s %s%s%s\n", tname, --- 1822,1828 ---- for (i = 0; i < 1000; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMSETS, i, (long)tname, ! sizeof(tname), (long)&states, 0, 0); if (code) break; (void)fprintf(outFileP, "%s %s%s%s\n", tname, *************** *** 1849,1862 **** for (i = 0; i < 1000; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGS, i, (long)tname, ! sizeof(tname), (long)&logSize); if (code) break; if (int32flg) { /* get more information on the log */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)tname, ! (long)&logSize, (long)&allocated, 0); if (code) break; (void)fprintf(outFileP, "%s : %d kbytes (%s)\n", tname, --- 1849,1862 ---- for (i = 0; i < 1000; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGS, i, (long)tname, ! sizeof(tname), (long)&logSize, 0, 0); if (code) break; if (int32flg) { /* get more information on the log */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)tname, ! (long)&logSize, (long)&allocated, 0, 0, 0); if (code) break; (void)fprintf(outFileP, "%s : %d kbytes (%s)\n", tname, *************** *** 1885,1891 **** for (i = 0; i < ICL_LOGSPERSET; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGSBYSET, (long)setname, i, ! (long)tname, sizeof(tname)); if (code) { if (errno == EBADF) { code = 0; --- 1885,1891 ---- for (i = 0; i < ICL_LOGSPERSET; i++) { code = afs_syscall(AFSCALL_ICL, ICL_OP_ENUMLOGSBYSET, (long)setname, i, ! (long)tname, sizeof(tname), 0, 0); if (code) { if (errno == EBADF) { code = 0; *************** *** 1897,1903 **** /* get more information on the log */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)tname, ! (long)&logSize, (long)&allocated, 0); if (code) break; (void)fprintf(outFileP, "%s : %d kbytes (%s)\n", tname, --- 1897,1903 ---- /* get more information on the log */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)tname, ! (long)&logSize, (long)&allocated, 0, 0, 0); if (code) break; (void)fprintf(outFileP, "%s : %d kbytes (%s)\n", tname, *************** *** 1918,1924 **** { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_SETSTAT, (long)name, op, 0, 0); return code; } --- 1918,1924 ---- { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_SETSTAT, (long)name, op, 0, 0, 0, 0); return code; } *************** *** 1929,1935 **** { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_SETSTATALL, op, 0, 0, 0); return code; } --- 1929,1935 ---- { afs_int32 code; ! code = afs_syscall(AFSCALL_ICL, ICL_OP_SETSTATALL, op, 0, 0, 0, 0, 0); return code; } *************** *** 1943,1949 **** code = afs_syscall(AFSCALL_ICL, ICL_OP_SETLOGSIZE, (long)name, logSize, 0, ! 0); return code; } --- 1943,1949 ---- code = afs_syscall(AFSCALL_ICL, ICL_OP_SETLOGSIZE, (long)name, logSize, 0, ! 0, 0, 0); return code; } *************** *** 1957,1963 **** afs_int32 code; code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)logname, ! (long)logSizeP, (long)allocatedP, 0); return code; } --- 1957,1963 ---- afs_int32 code; code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)logname, ! (long)logSizeP, (long)allocatedP, 0, 0, 0); return code; } *************** *** 1970,1976 **** afs_int32 code; code = afs_syscall(AFSCALL_ICL, ICL_OP_GETSETINFO, (long)setname, ! (long)stateP, 0, 0); return code; } --- 1970,1976 ---- afs_int32 code; code = afs_syscall(AFSCALL_ICL, ICL_OP_GETSETINFO, (long)setname, ! (long)stateP, 0, 0, 0, 0); return code; } *************** *** 1993,1999 **** /* get information about the specified log */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)logname, ! (long)&bufferSize, (long)&allocated, 0); if (code) { if (errno == ENOENT) (void)fprintf(stderr, "'%s' not found\n", logname); --- 1993,1999 ---- /* get information about the specified log */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)logname, ! (long)&bufferSize, (long)&allocated, 0, 0, 0); if (code) { if (errno == ENOENT) (void)fprintf(stderr, "'%s' not found\n", logname); *************** *** 2030,2036 **** code = afs_syscall(AFSCALL_ICL, ICL_OP_COPYOUTCLR, (long)logname, (long)(bufferp + nwords), bufferSize - nwords, ! (long)&i); if (code < 0) { /* otherwise we've got an error */ fprintf(stderr, "returned error %d dumping log.\n", errno); --- 2030,2036 ---- code = afs_syscall(AFSCALL_ICL, ICL_OP_COPYOUTCLR, (long)logname, (long)(bufferp + nwords), bufferSize - nwords, ! (long)&i, 0, 0); if (code < 0) { /* otherwise we've got an error */ fprintf(stderr, "returned error %d dumping log.\n", errno); *************** *** 2078,2084 **** /* see if things have changed */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)logname, ! (long)&newBufferSize, (long)&allocated, 0); if (code) { if (errno == ENOENT) (void)fprintf(stderr, "'%s' not found\n", logname); --- 2078,2084 ---- /* see if things have changed */ code = afs_syscall(AFSCALL_ICL, ICL_OP_GETLOGINFO, (long)logname, ! (long)&newBufferSize, (long)&allocated, 0, 0, 0); if (code) { if (errno == ENOENT) (void)fprintf(stderr, "'%s' not found\n", logname); Index: openafs/src/venus/test/getinitparams.c diff -c openafs/src/venus/test/getinitparams.c:1.5.14.1 openafs/src/venus/test/getinitparams.c:1.5.14.2 *** openafs/src/venus/test/getinitparams.c:1.5.14.1 Wed Oct 31 00:09:42 2007 --- openafs/src/venus/test/getinitparams.c Mon Oct 27 19:41:47 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/venus/test/getinitparams.c,v 1.5.14.1 2007/10/31 04:09:42 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/venus/test/getinitparams.c,v 1.5.14.2 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 41,47 **** int code; int len; char *file = 0; ! int fd; if (as->parms[0].items) { file = as->parms[0].items->data; --- 41,47 ---- int code; int len; char *file = 0; ! int fd = 0; if (as->parms[0].items) { file = as->parms[0].items->data; Index: openafs/src/viced/afsfileprocs.c diff -c openafs/src/viced/afsfileprocs.c:1.113.2.28 openafs/src/viced/afsfileprocs.c:1.113.2.29 *** openafs/src/viced/afsfileprocs.c:1.113.2.28 Fri Sep 5 12:57:55 2008 --- openafs/src/viced/afsfileprocs.c Mon Oct 27 19:41:47 2008 *************** *** 29,35 **** #include RCSID ! ("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.113.2.28 2008/09/05 16:57:55 shadow Exp $"); #include #include --- 29,35 ---- #include RCSID ! ("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.113.2.29 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 7151,7161 **** afs_sfsize_t tlen; /* temp for xfr length */ Inode tinode; /* inode for I/O */ afs_int32 optSize; /* optimal transfer size */ ! afs_sfsize_t DataLength; /* size of inode */ afs_sfsize_t TruncatedLength; /* size after ftruncate */ afs_fsize_t NewLength; /* size after this store completes */ afs_sfsize_t adjustSize; /* bytes to call VAdjust... with */ ! int linkCount; /* link count on inode */ FdHandle_t *fdP; struct in_addr logHostAddr; /* host ip holder for inet_ntoa */ --- 7151,7161 ---- afs_sfsize_t tlen; /* temp for xfr length */ Inode tinode; /* inode for I/O */ afs_int32 optSize; /* optimal transfer size */ ! afs_sfsize_t DataLength = 0; /* size of inode */ afs_sfsize_t TruncatedLength; /* size after ftruncate */ afs_fsize_t NewLength; /* size after this store completes */ afs_sfsize_t adjustSize; /* bytes to call VAdjust... with */ ! int linkCount = 0; /* link count on inode */ FdHandle_t *fdP; struct in_addr logHostAddr; /* host ip holder for inet_ntoa */ Index: openafs/src/viced/callback.c diff -c openafs/src/viced/callback.c:1.77.2.15 openafs/src/viced/callback.c:1.77.2.16 *** openafs/src/viced/callback.c:1.77.2.15 Mon Feb 18 14:20:53 2008 --- openafs/src/viced/callback.c Mon Oct 27 19:41:47 2008 *************** *** 85,91 **** #include RCSID ! ("$Header: /cvs/openafs/src/viced/callback.c,v 1.77.2.15 2008/02/18 19:20:53 shadow Exp $"); #include #include /* for malloc() */ --- 85,91 ---- #include RCSID ! ("$Header: /cvs/openafs/src/viced/callback.c,v 1.77.2.16 2008/10/27 23:41:47 shadow Exp $"); #include #include /* for malloc() */ *************** *** 532,538 **** struct FileEntry *fe; struct CallBack *cb = 0, *lastcb = 0; struct FileEntry *newfe = 0; ! afs_uint32 time_out; afs_uint32 *Thead = thead; struct CallBack *newcb = 0; int safety; --- 532,538 ---- struct FileEntry *fe; struct CallBack *cb = 0, *lastcb = 0; struct FileEntry *newfe = 0; ! afs_uint32 time_out = 0; afs_uint32 *Thead = thead; struct CallBack *newcb = 0; int safety; Index: openafs/src/viced/host.c diff -c openafs/src/viced/host.c:1.93.2.34 openafs/src/viced/host.c:1.93.2.35 *** openafs/src/viced/host.c:1.93.2.34 Thu May 8 17:18:56 2008 --- openafs/src/viced/host.c Mon Oct 27 19:53:47 2008 *************** *** 13,19 **** #include RCSID ! ("$Header: /cvs/openafs/src/viced/host.c,v 1.93.2.34 2008/05/08 21:18:56 shadow Exp $"); #include #include --- 13,19 ---- #include RCSID ! ("$Header: /cvs/openafs/src/viced/host.c,v 1.93.2.35 2008/10/27 23:53:47 shadow Exp $"); #include #include *************** *** 1122,1128 **** h_Enumerate_r(int (*proc) (), struct host *enumstart, char *param) { register struct host *host, *next; ! register int held, nheld; if (hostCount == 0) { return; --- 1122,1129 ---- h_Enumerate_r(int (*proc) (), struct host *enumstart, char *param) { register struct host *host, *next; ! int held = 0; ! int nheld = 0; if (hostCount == 0) { return; *************** *** 2118,2126 **** h_FindClient_r(struct rx_connection *tcon) { register struct client *client; ! register struct host *host; struct client *oldClient; ! afs_int32 viceid; afs_int32 expTime; afs_int32 code; int authClass; --- 2119,2127 ---- h_FindClient_r(struct rx_connection *tcon) { register struct client *client; ! struct host *host = NULL; struct client *oldClient; ! afs_int32 viceid = 0; afs_int32 expTime; afs_int32 code; int authClass; *************** *** 3754,3760 **** int h_DeleteHostFromAddrHashTable_r(afs_uint32 addr, afs_uint16 port, struct host *host) { ! int flag; register struct h_AddrHashChain **hp, *th; for (hp = &hostAddrHashTable[h_HashIndex(addr)]; (th = *hp);) { --- 3755,3761 ---- int h_DeleteHostFromAddrHashTable_r(afs_uint32 addr, afs_uint16 port, struct host *host) { ! int flag = 0; register struct h_AddrHashChain **hp, *th; for (hp = &hostAddrHashTable[h_HashIndex(addr)]; (th = *hp);) { Index: openafs/src/vlserver/vldb_check.c diff -c openafs/src/vlserver/vldb_check.c:1.11.14.5 openafs/src/vlserver/vldb_check.c:1.11.14.6 *** openafs/src/vlserver/vldb_check.c:1.11.14.5 Tue Oct 7 11:38:29 2008 --- openafs/src/vlserver/vldb_check.c Mon Oct 27 19:53:47 2008 *************** *** 43,49 **** #include RCSID ! ("$Header: /cvs/openafs/src/vlserver/vldb_check.c,v 1.11.14.5 2008/10/07 15:38:29 shadow Exp $"); #include #include --- 43,49 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vlserver/vldb_check.c,v 1.11.14.6 2008/10/27 23:53:47 shadow Exp $"); #include #include *************** *** 501,507 **** int freecount = 0, mhcount = 0, vlcount = 0; int rwcount = 0, rocount = 0, bkcount = 0; struct nvlentry vlentry; ! afs_uint32 addr, entrysize, maxvolid = 0; if (verbose) printf("Read each entry in the database\n"); --- 501,509 ---- int freecount = 0, mhcount = 0, vlcount = 0; int rwcount = 0, rocount = 0, bkcount = 0; struct nvlentry vlentry; ! afs_uint32 addr; ! afs_uint32 entrysize = 0; ! afs_uint32 maxvolid = 0; if (verbose) printf("Read each entry in the database\n"); *************** *** 570,576 **** entrysize = VL_ADDREXTBLK_SIZE; mhcount++; } else { ! printf("Unknown entry at %u\n", addr); } } if (verbose) { --- 572,579 ---- entrysize = VL_ADDREXTBLK_SIZE; mhcount++; } else { ! printf("Unknown entry at %u. Aborting\n", addr); ! break; } } if (verbose) { *************** *** 1111,1121 **** if (verbose) printf("Verify each volume entry\n"); for (i = 0; i < maxentries; i++) { ! int nextp; ! int reft; ! int hash, nexthash = 0; ! int *nextpp; ! char *which; if (record[i].type == 0) continue; --- 1114,1125 ---- if (verbose) printf("Verify each volume entry\n"); for (i = 0; i < maxentries; i++) { ! int nextp = 0; ! int reft = 0; ! int hash = 0; ! int nexthash = 0; ! int *nextpp = NULL; ! char *which = NULL; if (record[i].type == 0) continue; Index: openafs/src/vlserver/vlprocs.c diff -c openafs/src/vlserver/vlprocs.c:1.15.4.3 openafs/src/vlserver/vlprocs.c:1.15.4.4 *** openafs/src/vlserver/vlprocs.c:1.15.4.3 Wed Apr 2 15:51:57 2008 --- openafs/src/vlserver/vlprocs.c Mon Oct 27 19:41:47 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/vlserver/vlprocs.c,v 1.15.4.3 2008/04/02 19:51:57 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vlserver/vlprocs.c,v 1.15.4.4 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 1131,1137 **** return VL_SIZEEXCEEDED; } } else { ! afs_int32 nextblockindex = 0, count = 0, k, match = 0; while (nextblockindex = NextEntry(trans, nextblockindex, &tentry, &count)) { if (++pollcount > 50) { --- 1131,1137 ---- return VL_SIZEEXCEEDED; } } else { ! afs_int32 nextblockindex = 0, count = 0, k = 0, match = 0; while (nextblockindex = NextEntry(trans, nextblockindex, &tentry, &count)) { if (++pollcount > 50) { *************** *** 1271,1277 **** return VL_SIZEEXCEEDED; } } else { ! afs_int32 nextblockindex = 0, count = 0, k, match = 0; while (nextblockindex = NextEntry(trans, nextblockindex, &tentry, &count)) { if (++pollcount > 50) { --- 1271,1277 ---- return VL_SIZEEXCEEDED; } } else { ! afs_int32 nextblockindex = 0, count = 0, k = 0, match = 0; while (nextblockindex = NextEntry(trans, nextblockindex, &tentry, &count)) { if (++pollcount > 50) { *************** *** 1371,1382 **** struct ubik_trans *trans; struct nvlentry tentry; struct nvldbentry *Vldbentry = 0, *VldbentryFirst = 0, *VldbentryLast = 0; ! afs_int32 blockindex = 0, count = 0, k, match, matchindex; int serverindex = -1; /* no server found */ int findserver = 0, findpartition = 0, findflag = 0, findname = 0; char *t; int pollcount = 0; ! int namematchRWBK, namematchRO, thismatch, matchtype; char volumename[VL_MAXNAMELEN]; #ifdef HAVE_POSIX_REGEX regex_t re; --- 1371,1384 ---- struct ubik_trans *trans; struct nvlentry tentry; struct nvldbentry *Vldbentry = 0, *VldbentryFirst = 0, *VldbentryLast = 0; ! afs_int32 blockindex = 0, count = 0, k, match; ! afs_int32 matchindex = 0; int serverindex = -1; /* no server found */ int findserver = 0, findpartition = 0, findflag = 0, findname = 0; char *t; int pollcount = 0; ! int namematchRWBK, namematchRO, thismatch; ! int matchtype = 0; char volumename[VL_MAXNAMELEN]; #ifdef HAVE_POSIX_REGEX regex_t re; *************** *** 1640,1646 **** struct ubik_trans *trans; struct nvlentry tentry; vldblist vllist, *vllistptr; ! afs_int32 blockindex, count, k, match; int serverindex; int pollcount = 0; --- 1642,1649 ---- struct ubik_trans *trans; struct nvlentry tentry; vldblist vllist, *vllistptr; ! afs_int32 blockindex, count, match; ! afs_int32 k = 0; int serverindex; int pollcount = 0; *************** *** 1768,1774 **** struct ubik_trans *trans; struct nvlentry tentry; nvldblist vllist, *vllistptr; ! afs_int32 blockindex, count, k, match; int serverindex; int pollcount = 0; --- 1771,1778 ---- struct ubik_trans *trans; struct nvlentry tentry; nvldblist vllist, *vllistptr; ! afs_int32 blockindex, count, match; ! afs_int32 k = 0; int serverindex; int pollcount = 0; *************** *** 1974,1981 **** afs_uint32 addrs[VL_MAXIPADDRS_PERMH]; afs_int32 fbase; int count, willChangeEntry, foundUuidEntry, willReplaceCnt; ! int WillReplaceEntry, WillChange[MAXSERVERID + 1], FoundUuid, ! ReplaceEntry; int srvidx, mhidx; COUNT_REQ(VLREGADDR); --- 1978,1986 ---- afs_uint32 addrs[VL_MAXIPADDRS_PERMH]; afs_int32 fbase; int count, willChangeEntry, foundUuidEntry, willReplaceCnt; ! int WillReplaceEntry, WillChange[MAXSERVERID + 1]; ! int FoundUuid = 0; ! int ReplaceEntry = 0; int srvidx, mhidx; COUNT_REQ(VLREGADDR); *************** *** 3136,3143 **** { int i, j; afs_int32 code; ! struct extentaddr *exp; ! int base, index, mhidx; afsUUID tuuid; afs_int32 blockindex, count; int pollcount = 0; --- 3141,3149 ---- { int i, j; afs_int32 code; ! struct extentaddr *exp = NULL; ! int base = 0; ! int index, mhidx; afsUUID tuuid; afs_int32 blockindex, count; int pollcount = 0; Index: openafs/src/vlserver/vlserver.c diff -c openafs/src/vlserver/vlserver.c:1.22.2.11 openafs/src/vlserver/vlserver.c:1.22.2.12 *** openafs/src/vlserver/vlserver.c:1.22.2.11 Wed Sep 24 17:36:52 2008 --- openafs/src/vlserver/vlserver.c Sat Oct 18 11:09:07 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/vlserver/vlserver.c,v 1.22.2.11 2008/09/24 21:36:52 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vlserver/vlserver.c,v 1.22.2.12 2008/10/18 15:09:07 jaltman Exp $"); #include #include *************** *** 198,204 **** fprintf(stderr, "missing argument for -rxmaxmtu\n"); return -1; } ! rxMaxMTU = atoi(argv[++i]); if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) { printf("rxMaxMTU %d invalid; must be between %d-%d\n", --- 198,204 ---- fprintf(stderr, "missing argument for -rxmaxmtu\n"); return -1; } ! rxMaxMTU = atoi(argv[++index]); if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) { printf("rxMaxMTU %d invalid; must be between %d-%d\n", Index: openafs/src/vol/clone.c diff -c openafs/src/vol/clone.c:1.19.2.8 openafs/src/vol/clone.c:1.19.2.9 *** openafs/src/vol/clone.c:1.19.2.8 Wed Mar 5 16:53:30 2008 --- openafs/src/vol/clone.c Mon Oct 27 19:41:47 2008 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/clone.c,v 1.19.2.8 2008/03/05 21:53:30 shadow Exp $"); #include #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/clone.c,v 1.19.2.9 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 168,177 **** char buf[SIZEOF_LARGEDISKVNODE], dbuf[SIZEOF_LARGEDISKVNODE]; struct VnodeDiskObject *rwvnode = (struct VnodeDiskObject *)buf; struct VnodeDiskObject *clvnode = (struct VnodeDiskObject *)dbuf; ! Inode rwinode, clinode; struct clone_head decHead; struct clone_rock decRock; ! afs_int32 offset, dircloned, inodeinced; struct VnodeClassInfo *vcp = &VnodeClassInfo[class]; int ReadWriteOriginal = VolumeWriteable(rwvp); --- 168,179 ---- char buf[SIZEOF_LARGEDISKVNODE], dbuf[SIZEOF_LARGEDISKVNODE]; struct VnodeDiskObject *rwvnode = (struct VnodeDiskObject *)buf; struct VnodeDiskObject *clvnode = (struct VnodeDiskObject *)dbuf; ! Inode rwinode = 0; ! Inode clinode; struct clone_head decHead; struct clone_rock decRock; ! afs_int32 offset = 0; ! afs_int32 dircloned, inodeinced; struct VnodeClassInfo *vcp = &VnodeClassInfo[class]; int ReadWriteOriginal = VolumeWriteable(rwvp); Index: openafs/src/vol/ihandle.c diff -c openafs/src/vol/ihandle.c:1.19.8.4 openafs/src/vol/ihandle.c:1.19.8.5 *** openafs/src/vol/ihandle.c:1.19.8.4 Mon Nov 26 16:47:29 2007 --- openafs/src/vol/ihandle.c Mon Oct 27 19:53:47 2008 *************** *** 15,21 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/ihandle.c,v 1.19.8.4 2007/11/26 21:47:29 shadow Exp $"); #include #include --- 15,21 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/ihandle.c,v 1.19.8.5 2008/10/27 23:53:47 shadow Exp $"); #include #include *************** *** 507,513 **** StreamHandle_t * stream_open(const char *filename, const char *mode) { ! FD_t fd; if (strcmp(mode, "r") == 0) { fd = OS_OPEN(filename, O_RDONLY, 0); --- 507,513 ---- StreamHandle_t * stream_open(const char *filename, const char *mode) { ! FD_t fd = INVALID_FD; if (strcmp(mode, "r") == 0) { fd = OS_OPEN(filename, O_RDONLY, 0); Index: openafs/src/vol/namei_ops.c diff -c openafs/src/vol/namei_ops.c:1.28.2.16 openafs/src/vol/namei_ops.c:1.28.2.17 *** openafs/src/vol/namei_ops.c:1.28.2.16 Wed Mar 5 16:53:30 2008 --- openafs/src/vol/namei_ops.c Fri Oct 10 10:42:40 2008 *************** *** 13,19 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/namei_ops.c,v 1.28.2.16 2008/03/05 21:53:30 shadow Exp $"); #ifdef AFS_NAMEI_ENV #include --- 13,19 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/namei_ops.c,v 1.28.2.17 2008/10/10 14:42:40 shadow Exp $"); #ifdef AFS_NAMEI_ENV #include *************** *** 993,1000 **** if ((row & coldata) == 0) break; } ! if (col >= NAMEI_MAXVOLS) goto badGetFreeTag; coldata = 1 << (col * 3); row |= coldata; --- 993,1002 ---- if ((row & coldata) == 0) break; } ! if (col >= NAMEI_MAXVOLS) { ! errno = ENOSPC; goto badGetFreeTag; + } coldata = 1 << (col * 3); row |= coldata; Index: openafs/src/vol/vnode.c diff -c openafs/src/vol/vnode.c:1.27.2.4 openafs/src/vol/vnode.c:1.27.2.5 *** openafs/src/vol/vnode.c:1.27.2.4 Mon Feb 4 13:51:39 2008 --- openafs/src/vol/vnode.c Mon Oct 27 19:41:47 2008 *************** *** 20,26 **** #define MAXINT (~(1<<((sizeof(int)*8)-1))) RCSID ! ("$Header: /cvs/openafs/src/vol/vnode.c,v 1.27.2.4 2008/02/04 18:51:39 shadow Exp $"); #include #include --- 20,26 ---- #define MAXINT (~(1<<((sizeof(int)*8)-1))) RCSID ! ("$Header: /cvs/openafs/src/vol/vnode.c,v 1.27.2.5 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 109,117 **** static afs_int32 theLog[THELOGSIZE]; static afs_int32 vnLogPtr = 0; void ! VNLog(aop, anparms, av1, av2, av3, av4) ! afs_int32 aop, anparms; ! afs_int32 av1, av2, av3, av4; { register afs_int32 temp; afs_int32 data[4]; --- 109,116 ---- static afs_int32 theLog[THELOGSIZE]; static afs_int32 vnLogPtr = 0; void ! VNLog(afs_int32 aop, afs_int32 anparms, afs_int32 av1, afs_int32 av2, ! afs_int32 av3, afs_int32 av4) { register afs_int32 temp; afs_int32 data[4]; *************** *** 487,493 **** if (Vn_refcount(vnp) != 0 || CheckLock(&vnp->lock)) Abort("VGetFreeVnode_r: locked vnode in lruq"); #endif ! VNLog(1, 2, Vn_id(vnp), (afs_int32) vnp); /* * it's going to be overwritten soon enough. --- 486,492 ---- if (Vn_refcount(vnp) != 0 || CheckLock(&vnp->lock)) Abort("VGetFreeVnode_r: locked vnode in lruq"); #endif ! VNLog(1, 2, Vn_id(vnp), (afs_int32) vnp, 0, 0); /* * it's going to be overwritten soon enough. *************** *** 654,666 **** */ vnrehash: ! VNLog(2, 1, vnodeNumber); /* Prepare to move it to the new hash chain */ vnp = VLookupVnode(vp, vnodeNumber); if (vnp) { /* slot already exists. May even not be in lruq (consider store file locking a file being deleted) * so we may have to wait for it below */ ! VNLog(3, 2, vnodeNumber, (afs_int32) vnp); VnCreateReservation_r(vnp); if (Vn_refcount(vnp) == 1) { --- 653,665 ---- */ vnrehash: ! VNLog(2, 1, vnodeNumber, 0, 0, 0); /* Prepare to move it to the new hash chain */ vnp = VLookupVnode(vp, vnodeNumber); if (vnp) { /* slot already exists. May even not be in lruq (consider store file locking a file being deleted) * so we may have to wait for it below */ ! VNLog(3, 2, vnodeNumber, (afs_int32) vnp, 0, 0); VnCreateReservation_r(vnp); if (Vn_refcount(vnp) == 1) { *************** *** 817,829 **** } sane: ! VNLog(4, 2, vnodeNumber, (afs_int32) vnp); #ifndef AFS_DEMAND_ATTACH_FS AddToVnHash(vnp); #endif } ! VNLog(5, 1, (afs_int32) vnp); memset(&vnp->disk, 0, sizeof(vnp->disk)); vnp->changed_newTime = 0; /* set this bit when vnode is updated */ vnp->changed_oldTime = 0; /* set this on CopyOnWrite. */ --- 816,828 ---- } sane: ! VNLog(4, 2, vnodeNumber, (afs_int32) vnp, 0, 0); #ifndef AFS_DEMAND_ATTACH_FS AddToVnHash(vnp); #endif } ! VNLog(5, 1, (afs_int32) vnp, 0, 0, 0); memset(&vnp->disk, 0, sizeof(vnp->disk)); vnp->changed_newTime = 0; /* set this bit when vnode is updated */ vnp->changed_oldTime = 0; /* set this on CopyOnWrite. */ *************** *** 1119,1125 **** return NULL; } ! VNLog(100, 1, vnodeNumber); #ifdef AFS_DEMAND_ATTACH_FS /* --- 1118,1124 ---- return NULL; } ! VNLog(100, 1, vnodeNumber, 0, 0, 0); #ifdef AFS_DEMAND_ATTACH_FS /* *************** *** 1167,1173 **** if (vnp) { /* vnode is in cache */ ! VNLog(101, 2, vnodeNumber, (afs_int32) vnp); VnCreateReservation_r(vnp); #ifdef AFS_DEMAND_ATTACH_FS --- 1166,1172 ---- if (vnp) { /* vnode is in cache */ ! VNLog(101, 2, vnodeNumber, (afs_int32) vnp, 0, 0); VnCreateReservation_r(vnp); #ifdef AFS_DEMAND_ATTACH_FS *************** *** 1254,1260 **** /* Check that the vnode hasn't been removed while we were obtaining * the lock */ ! VNLog(102, 2, vnodeNumber, (afs_int32) vnp); if ((vnp->disk.type == vNull) || (Vn_cacheCheck(vnp) == 0)) { VnUnlock(vnp, locktype); VnCancelReservation_r(vnp); --- 1253,1259 ---- /* Check that the vnode hasn't been removed while we were obtaining * the lock */ ! VNLog(102, 2, vnodeNumber, (afs_int32) vnp, 0, 0); if ((vnp->disk.type == vNull) || (Vn_cacheCheck(vnp) == 0)) { VnUnlock(vnp, locktype); VnCancelReservation_r(vnp); *************** *** 1317,1323 **** class = vnodeIdToClass(Vn_id(vnp)); vcp = &VnodeClassInfo[class]; assert(vnp->disk.vnodeMagic == vcp->magic); ! VNLog(200, 2, Vn_id(vnp), (afs_int32) vnp); #ifdef AFS_DEMAND_ATTACH_FS writeLocked = (Vn_state(vnp) == VN_STATE_EXCLUSIVE); --- 1316,1322 ---- class = vnodeIdToClass(Vn_id(vnp)); vcp = &VnodeClassInfo[class]; assert(vnp->disk.vnodeMagic == vcp->magic); ! VNLog(200, 2, Vn_id(vnp), (afs_int32) vnp, 0, 0); #ifdef AFS_DEMAND_ATTACH_FS writeLocked = (Vn_state(vnp) == VN_STATE_EXCLUSIVE); *************** *** 1336,1342 **** VNLog(201, 2, (afs_int32) vnp, ((vnp->changed_newTime) << 1) | ((vnp-> changed_oldTime) << 1) | vnp-> ! delete); if (thisProcess != vnp->writer) Abort("VPutVnode: Vnode at 0x%x locked by another process!\n", vnp); --- 1335,1341 ---- VNLog(201, 2, (afs_int32) vnp, ((vnp->changed_newTime) << 1) | ((vnp-> changed_oldTime) << 1) | vnp-> ! delete, 0, 0); if (thisProcess != vnp->writer) Abort("VPutVnode: Vnode at 0x%x locked by another process!\n", vnp); *************** *** 1351,1357 **** /* No longer any directory entries for this vnode. Free the Vnode */ memset(&vnp->disk, 0, sizeof(vnp->disk)); /* delete flag turned off further down */ ! VNLog(202, 2, Vn_id(vnp), (afs_int32) vnp); } else if (vnp->changed_newTime) { vnp->disk.serverModifyTime = now; } --- 1350,1356 ---- /* No longer any directory entries for this vnode. Free the Vnode */ memset(&vnp->disk, 0, sizeof(vnp->disk)); /* delete flag turned off further down */ ! VNLog(202, 2, Vn_id(vnp), (afs_int32) vnp, 0, 0); } else if (vnp->changed_newTime) { vnp->disk.serverModifyTime = now; } *************** *** 1458,1464 **** class = vnodeIdToClass(Vn_id(vnp)); vcp = &VnodeClassInfo[class]; assert(vnp->disk.vnodeMagic == vcp->magic); ! VNLog(300, 2, Vn_id(vnp), (afs_int32) vnp); #ifdef AFS_DEMAND_ATTACH_FS writeLocked = (Vn_state(vnp) == VN_STATE_EXCLUSIVE); --- 1457,1463 ---- class = vnodeIdToClass(Vn_id(vnp)); vcp = &VnodeClassInfo[class]; assert(vnp->disk.vnodeMagic == vcp->magic); ! VNLog(300, 2, Vn_id(vnp), (afs_int32) vnp, 0, 0); #ifdef AFS_DEMAND_ATTACH_FS writeLocked = (Vn_state(vnp) == VN_STATE_EXCLUSIVE); *************** *** 1473,1479 **** VNLog(301, 2, (afs_int32) vnp, ((vnp->changed_newTime) << 1) | ((vnp-> changed_oldTime) << 1) | vnp-> ! delete); /* sanity checks */ #ifdef AFS_PTHREAD_ENV --- 1472,1478 ---- VNLog(301, 2, (afs_int32) vnp, ((vnp->changed_newTime) << 1) | ((vnp-> changed_oldTime) << 1) | vnp-> ! delete, 0, 0); /* sanity checks */ #ifdef AFS_PTHREAD_ENV Index: openafs/src/vol/vol-info.c diff -c openafs/src/vol/vol-info.c:1.22.4.2 openafs/src/vol/vol-info.c:1.22.4.3 *** openafs/src/vol/vol-info.c:1.22.4.2 Wed Mar 5 16:53:30 2008 --- openafs/src/vol/vol-info.c Sat Nov 8 10:58:18 2008 *************** *** 18,24 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/vol-info.c,v 1.22.4.2 2008/03/05 21:53:30 shadow Exp $"); #include #include --- 18,24 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/vol-info.c,v 1.22.4.3 2008/11/08 15:58:18 shadow Exp $"); #include #include *************** *** 413,423 **** char *p = VPartitionPath(partP); #endif ! if (chdir(p) == -1) { ! printf("Can't chdir to partition %s; giving up\n", p); ! exit(1); ! } ! if ((dirp = opendir(".")) == NULL) { printf("Can't read directory %s; giving up\n", p); exit(1); } --- 413,419 ---- char *p = VPartitionPath(partP); #endif ! if ((dirp = opendir(p)) == NULL) { printf("Can't read directory %s; giving up\n", p); exit(1); } Index: openafs/src/vol/vol-salvage.c diff -c openafs/src/vol/vol-salvage.c:1.51.2.18 openafs/src/vol/vol-salvage.c:1.51.2.20 *** openafs/src/vol/vol-salvage.c:1.51.2.18 Mon Sep 22 15:29:56 2008 --- openafs/src/vol/vol-salvage.c Sat Nov 8 10:58:18 2008 *************** *** 87,93 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/vol-salvage.c,v 1.51.2.18 2008/09/22 19:29:56 shadow Exp $"); #ifndef AFS_NT40_ENV #include --- 87,93 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/vol-salvage.c,v 1.51.2.20 2008/11/08 15:58:18 shadow Exp $"); #ifndef AFS_NT40_ENV #include *************** *** 1197,1210 **** void GetVolumeSummary(VolumeId singleVolumeNumber) { ! DIR *dirp; afs_int32 nvols = 0; struct VolumeSummary *vsp, vs; struct VolumeDiskHeader diskHeader; struct dirent *dp; /* Get headers from volume directory */ ! if (chdir(fileSysPath) == -1 || (dirp = opendir(".")) == NULL) Abort("Can't read directory %s; not salvaged\n", fileSysPath); if (!singleVolumeNumber) { while ((dp = readdir(dirp))) { --- 1197,1211 ---- void GetVolumeSummary(VolumeId singleVolumeNumber) { ! DIR *dirp = NULL; afs_int32 nvols = 0; struct VolumeSummary *vsp, vs; struct VolumeDiskHeader diskHeader; struct dirent *dp; /* Get headers from volume directory */ ! dirp = opendir(fileSysPath); ! if (dirp == NULL) Abort("Can't read directory %s; not salvaged\n", fileSysPath); if (!singleVolumeNumber) { while ((dp = readdir(dirp))) { *************** *** 1429,1435 **** int check; Inode ino; int dec_VGLinkH = 0; ! int VGLinkH_p1; FdHandle_t *fdP = NULL; VGLinkH_cnt = 0; --- 1430,1436 ---- int check; Inode ino; int dec_VGLinkH = 0; ! int VGLinkH_p1 =0; FdHandle_t *fdP = NULL; VGLinkH_cnt = 0; *************** *** 3543,3558 **** assert(p != NULL); strcpy(p, s); return p; - } /* Remove the FORCESALVAGE file */ void RemoveTheForce(char *path) { if (!Testing && ForceSalvage) { ! if (chdir(path) == 0) ! unlink("FORCESALVAGE"); } } --- 3544,3561 ---- assert(p != NULL); strcpy(p, s); return p; } /* Remove the FORCESALVAGE file */ void RemoveTheForce(char *path) { + char target[1024]; + struct afs_stat force; // so we can use afs_stat to find it + strcpy(target,path); + strcat(target,"/FORCESALVAGE"); if (!Testing && ForceSalvage) { ! if (afs_stat(target,&force) == 0) unlink(target); } } *************** *** 3564,3573 **** UseTheForceLuke(char *path) { struct afs_stat force; ! assert(chdir(path) != -1); ! ! return (afs_stat("FORCESALVAGE", &force) == 0); } #else /* --- 3567,3577 ---- UseTheForceLuke(char *path) { struct afs_stat force; + char target[1024]; + strcpy(target,path); + strcat(target,"/FORCESALVAGE"); ! return (afs_stat(target, &force) == 0); } #else /* Index: openafs/src/vol/volume.c diff -c openafs/src/vol/volume.c:1.43.2.23 openafs/src/vol/volume.c:1.43.2.24 *** openafs/src/vol/volume.c:1.43.2.23 Thu Sep 25 03:50:16 2008 --- openafs/src/vol/volume.c Mon Oct 27 19:53:47 2008 *************** *** 22,28 **** #include RCSID ! ("$Header: /cvs/openafs/src/vol/volume.c,v 1.43.2.23 2008/09/25 07:50:16 shadow Exp $"); #include #include --- 22,28 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vol/volume.c,v 1.43.2.24 2008/10/27 23:53:47 shadow Exp $"); #include #include *************** *** 3178,3184 **** { VolumeId volume; struct DiskPartition64 *tpartp; ! int notifyServer, useDone = FSYNC_VOL_ON; *ec = 0; /* always "succeeds" */ if (programType == volumeUtility) { --- 3178,3185 ---- { VolumeId volume; struct DiskPartition64 *tpartp; ! int notifyServer = 0; ! int useDone = FSYNC_VOL_ON; *ec = 0; /* always "succeeds" */ if (programType == volumeUtility) { Index: openafs/src/volser/dumpstuff.c diff -c openafs/src/volser/dumpstuff.c:1.29.2.10 openafs/src/volser/dumpstuff.c:1.29.2.13 *** openafs/src/volser/dumpstuff.c:1.29.2.10 Wed Mar 5 16:53:31 2008 --- openafs/src/volser/dumpstuff.c Mon Oct 27 19:41:47 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/dumpstuff.c,v 1.29.2.10 2008/03/05 21:53:31 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/dumpstuff.c,v 1.29.2.13 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 519,527 **** DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) { int code = 0, error = 0; ! afs_int32 pad = 0, offset; afs_sfsize_t n, nbytes, howMany, howBig; ! afs_foff_t lcode; byte *p; #ifndef AFS_NT40_ENV struct afs_stat status; --- 519,528 ---- DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) { int code = 0, error = 0; ! afs_int32 pad = 0; ! afs_int32 offset = 0; afs_sfsize_t n, nbytes, howMany, howBig; ! afs_foff_t lcode = 0; byte *p; #ifndef AFS_NT40_ENV struct afs_stat status; *************** *** 1226,1233 **** V_parentId(vp), vnodeNumber, vnode->uniquifier, vnode->dataVersion); if (!VALID_INO(ino)) { ! perror("unable to allocate inode"); ! Log("1 Volser: ReadVnodes: Restore aborted\n"); return VOLSERREAD_DUMPERROR; } nearInode = ino; --- 1227,1234 ---- V_parentId(vp), vnodeNumber, vnode->uniquifier, vnode->dataVersion); if (!VALID_INO(ino)) { ! Log("1 Volser: ReadVnodes: IH_CREATE: %s - restore aborted\n", ! afs_error_message(errno)); return VOLSERREAD_DUMPERROR; } nearInode = ino; *************** *** 1235,1240 **** --- 1236,1243 ---- IH_INIT(tmpH, vp->device, V_parentId(vp), ino); fdP = IH_OPEN(tmpH); if (fdP == NULL) { + Log("1 Volser: ReadVnodes: IH_OPEN: %s - restore aborted\n", + afs_error_message(errno)); IH_RELEASE(tmpH); return VOLSERREAD_DUMPERROR; } Index: openafs/src/volser/vol-dump.c diff -c openafs/src/volser/vol-dump.c:1.2.4.2 openafs/src/volser/vol-dump.c:1.2.4.3 *** openafs/src/volser/vol-dump.c:1.2.4.2 Wed Mar 5 16:53:31 2008 --- openafs/src/volser/vol-dump.c Mon Oct 27 19:41:47 2008 *************** *** 18,24 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/vol-dump.c,v 1.2.4.2 2008/03/05 21:53:31 shadow Exp $"); #include #include --- 18,24 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/vol-dump.c,v 1.2.4.3 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 543,549 **** DumpFile(int dumpfd, int vnode, FdHandle_t * handleP, struct VnodeDiskObject *v) { int code = 0, failed_seek = 0, failed_write = 0; ! afs_int32 pad = 0, offset; afs_sfsize_t n, nbytes, howMany, howBig; byte *p; #ifndef AFS_NT40_ENV --- 543,550 ---- DumpFile(int dumpfd, int vnode, FdHandle_t * handleP, struct VnodeDiskObject *v) { int code = 0, failed_seek = 0, failed_write = 0; ! afs_int32 pad = 0; ! afs_int32 offset = 0; afs_sfsize_t n, nbytes, howMany, howBig; byte *p; #ifndef AFS_NT40_ENV Index: openafs/src/volser/voltrans.c diff -c openafs/src/volser/voltrans.c:1.11.8.3 openafs/src/volser/voltrans.c:1.11.8.5 *** openafs/src/volser/voltrans.c:1.11.8.3 Tue Oct 30 11:16:59 2007 --- openafs/src/volser/voltrans.c Sat Oct 18 15:26:07 2008 *************** *** 18,24 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/voltrans.c,v 1.11.8.3 2007/10/30 15:16:59 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 18,24 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/voltrans.c,v 1.11.8.5 2008/10/18 19:26:07 shadow Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 74,93 **** NewTrans(afs_int32 avol, afs_int32 apart) { /* set volid, next, partition */ ! register struct volser_trans *tt; struct timeval tp; struct timezone tzp; VTRANS_LOCK; /* don't allow the same volume to be attached twice */ for (tt = allTrans; tt; tt = tt->next) { if ((tt->volid == avol) && (tt->partition == apart)) { VTRANS_UNLOCK; return (struct volser_trans *)0; /* volume busy */ } } ! VTRANS_UNLOCK; ! tt = (struct volser_trans *)malloc(sizeof(struct volser_trans)); memset(tt, 0, sizeof(struct volser_trans)); tt->volid = avol; tt->partition = apart; --- 74,94 ---- NewTrans(afs_int32 avol, afs_int32 apart) { /* set volid, next, partition */ ! struct volser_trans *tt, *newtt; struct timeval tp; struct timezone tzp; + newtt = (struct volser_trans *)malloc(sizeof(struct volser_trans)); VTRANS_LOCK; /* don't allow the same volume to be attached twice */ for (tt = allTrans; tt; tt = tt->next) { if ((tt->volid == avol) && (tt->partition == apart)) { VTRANS_UNLOCK; + free(newtt); return (struct volser_trans *)0; /* volume busy */ } } ! tt = newtt; memset(tt, 0, sizeof(struct volser_trans)); tt->volid = avol; tt->partition = apart; *************** *** 97,103 **** gettimeofday(&tp, &tzp); tt->creationTime = tp.tv_sec; tt->time = FT_ApproxTime(); - VTRANS_LOCK; tt->tid = transCounter++; tt->next = allTrans; allTrans = tt; --- 98,103 ---- Index: openafs/src/volser/vos.c diff -c openafs/src/volser/vos.c:1.55.2.18 openafs/src/volser/vos.c:1.55.2.19 *** openafs/src/volser/vos.c:1.55.2.18 Sat Jul 19 02:56:52 2008 --- openafs/src/volser/vos.c Mon Oct 27 19:41:47 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/vos.c,v 1.55.2.18 2008/07/19 06:56:52 rra Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/vos.c,v 1.55.2.19 2008/10/27 23:41:47 shadow Exp $"); #include #include *************** *** 1133,1139 **** int quiet; { int totalOK, totalNotOK, totalBusy, i; ! afs_int32 volid; totalOK = 0; totalNotOK = 0; --- 1133,1139 ---- int quiet; { int totalOK, totalNotOK, totalBusy, i; ! afs_int32 volid = 0; totalOK = 0; totalNotOK = 0; *************** *** 1210,1216 **** int totalNotOK; /*Total screwed volumes */ int totalBusy; /*Total busy volumes */ int i; /*Loop variable */ ! afs_int32 volid; /*Current volume ID */ /* * Initialize counters and (global!!) queues. --- 1210,1216 ---- int totalNotOK; /*Total screwed volumes */ int totalBusy; /*Total busy volumes */ int i; /*Loop variable */ ! afs_int32 volid = 0; /*Current volume ID */ /* * Initialize counters and (global!!) queues. *************** *** 1301,1307 **** int totalNotOK; /*Total screwed volumes */ int totalBusy; /*Total busy volumes */ int i; /*Loop variable */ ! afs_int32 volid; /*Current volume ID */ /* * Initialize counters and (global!!) queues. --- 1301,1307 ---- int totalNotOK; /*Total screwed volumes */ int totalBusy; /*Total busy volumes */ int i; /*Loop variable */ ! afs_int32 volid = 0; /*Current volume ID */ /* * Initialize counters and (global!!) queues. *************** *** 2901,2907 **** afs_int32 avolid, aparentid, aserver, apart, code, vcode, err; afs_int32 aoverwrite = ASK; afs_int32 acreation = 0, alastupdate = 0; ! int restoreflags, readonly = 0, offline = 0, voltype = RWVOL; char prompt; char afilename[MAXPATHLEN], avolname[VOLSER_MAXVOLNAME + 1], apartName[10]; char volname[VOLSER_MAXVOLNAME + 1]; --- 2901,2908 ---- afs_int32 avolid, aparentid, aserver, apart, code, vcode, err; afs_int32 aoverwrite = ASK; afs_int32 acreation = 0, alastupdate = 0; ! int restoreflags = 0; ! int readonly = 0, offline = 0, voltype = RWVOL; char prompt; char afilename[MAXPATHLEN], avolname[VOLSER_MAXVOLNAME + 1], apartName[10]; char volname[VOLSER_MAXVOLNAME + 1]; *************** *** 3532,3542 **** { afs_int32 apart, int32list, fast; afs_int32 aserver, code; ! volintInfo *pntr, *oldpntr; afs_int32 count; int i; char *base; ! volintXInfo *xInfoP, *origxInfoP; /*Ptr to current/orig extended vol info */ int wantExtendedInfo; /*Do we want extended vol info? */ char pname[10]; --- 3533,3545 ---- { afs_int32 apart, int32list, fast; afs_int32 aserver, code; ! volintInfo *pntr; ! volintInfo *oldpntr = NULL; afs_int32 count; int i; char *base; ! volintXInfo *xInfoP; ! volintXInfo *origxInfoP = NULL; /*Ptr to current/orig extended vol info */ int wantExtendedInfo; /*Do we want extended vol info? */ char pname[10]; *************** *** 4146,4152 **** static int DeleteEntry(register struct cmd_syndesc *as, void *arock) { ! afs_int32 apart; afs_int32 avolid; afs_int32 vcode; struct VldbListByAttributes attributes; --- 4149,4155 ---- static int DeleteEntry(register struct cmd_syndesc *as, void *arock) { ! afs_int32 apart = 0; afs_int32 avolid; afs_int32 vcode; struct VldbListByAttributes attributes; *************** *** 4375,4381 **** struct VldbListByAttributes attributes; nbulkentries arrayEntries; struct nvldbentry *vllist, *tarray = 0, *ttarray; ! afs_int32 centries, nentries = 0, tarraysize, parraysize; int j; char pname[10]; int quiet, sort, lock; --- 4378,4386 ---- struct VldbListByAttributes attributes; nbulkentries arrayEntries; struct nvldbentry *vllist, *tarray = 0, *ttarray; ! afs_int32 centries, nentries = 0; ! afs_int32 tarraysize = 0; ! afs_int32 parraysize; int j; char pname[10]; int quiet, sort, lock; *************** *** 4555,4561 **** int comp = 0; struct cmd_item *ti; char *ccode; ! int match; memset(&attributes, 0, sizeof(struct VldbListByAttributes)); attributes.Mask = 0; --- 4560,4566 ---- int comp = 0; struct cmd_item *ti; char *ccode; ! int match = 0; memset(&attributes, 0, sizeof(struct VldbListByAttributes)); attributes.Mask = 0; *************** *** 4869,4875 **** UnlockVLDB(register struct cmd_syndesc *as, void *arock) { afs_int32 apart; ! afs_int32 aserver, code; afs_int32 vcode; struct VldbListByAttributes attributes; nbulkentries arrayEntries; --- 4874,4881 ---- UnlockVLDB(register struct cmd_syndesc *as, void *arock) { afs_int32 apart; ! afs_int32 aserver = NULL; ! afs_int32 code; afs_int32 vcode; struct VldbListByAttributes attributes; nbulkentries arrayEntries; *************** *** 5361,5372 **** afs_int32 server, volid, code, i, same; struct nvldbentry entry, storeEntry; afs_int32 vcode; ! afs_int32 rwindex; afs_int32 rwserver = 0; ! afs_int32 rwpartition; ! afs_int32 roindex; afs_int32 roserver = 0; ! afs_int32 ropartition; int force = 0; struct rx_connection *aconn; char c, dc; --- 5367,5378 ---- afs_int32 server, volid, code, i, same; struct nvldbentry entry, storeEntry; afs_int32 vcode; ! afs_int32 rwindex = 0; afs_int32 rwserver = 0; ! afs_int32 rwpartition = 0; ! afs_int32 roindex = 0; afs_int32 roserver = 0; ! afs_int32 ropartition = 0; int force = 0; struct rx_connection *aconn; char c, dc; Index: openafs/src/volser/vsprocs.c diff -c openafs/src/volser/vsprocs.c:1.38.2.19 openafs/src/volser/vsprocs.c:1.38.2.20 *** openafs/src/volser/vsprocs.c:1.38.2.19 Wed May 21 16:16:20 2008 --- openafs/src/volser/vsprocs.c Mon Oct 27 19:53:47 2008 *************** *** 11,17 **** #include RCSID ! ("$Header: /cvs/openafs/src/volser/vsprocs.c,v 1.38.2.19 2008/05/21 20:16:20 shadow Exp $"); #include #include --- 11,17 ---- #include RCSID ! ("$Header: /cvs/openafs/src/volser/vsprocs.c,v 1.38.2.20 2008/10/27 23:53:47 shadow Exp $"); #include #include *************** *** 3035,3041 **** { afs_int32 volid; struct volser_status tstatus; ! int code, rcode, tcode; char hoststr[16]; *connPtr = (struct rx_connection *)0; --- 3035,3042 ---- { afs_int32 volid; struct volser_status tstatus; ! int code = 0; ! int rcode, tcode; char hoststr[16]; *connPtr = (struct rx_connection *)0; *************** *** 3173,3179 **** afs_int32 afrompart, int forceflag) { char vname[64]; ! afs_int32 code, vcode, rcode, tcode; afs_int32 cloneVolId, roVolId; struct replica *replicas = 0; struct nvldbentry entry, storeEntry; --- 3174,3181 ---- afs_int32 afrompart, int forceflag) { char vname[64]; ! afs_int32 code = 0; ! afs_int32 vcode, rcode, tcode; afs_int32 cloneVolId, roVolId; struct replica *replicas = 0; struct nvldbentry entry, storeEntry; *************** *** 3188,3200 **** int islocked = 0; afs_int32 clonetid = 0, onlinetid; afs_int32 fromtid = 0; ! afs_uint32 fromdate, thisdate; time_t tmv; int s; manyDests tr; manyResults results; int rwindex, roindex, roclone, roexists; ! afs_int32 rwcrdate, rwupdate, clcrdate; struct rtime { int validtime; afs_uint32 uptime; --- 3190,3204 ---- int islocked = 0; afs_int32 clonetid = 0, onlinetid; afs_int32 fromtid = 0; ! afs_uint32 fromdate = 0; ! afs_uint32 thisdate; time_t tmv; int s; manyDests tr; manyResults results; int rwindex, roindex, roclone, roexists; ! afs_int32 rwcrdate = 0; ! afs_int32 rwupdate, clcrdate; struct rtime { int validtime; afs_uint32 uptime; *************** *** 5305,5311 **** CheckVolume(volintInfo * volumeinfo, afs_int32 aserver, afs_int32 apart, afs_int32 * modentry, afs_uint32 * maxvolid) { ! int idx, j; afs_int32 code, error = 0; struct nvldbentry entry, storeEntry; char pname[10]; --- 5309,5316 ---- CheckVolume(volintInfo * volumeinfo, afs_int32 aserver, afs_int32 apart, afs_int32 * modentry, afs_uint32 * maxvolid) { ! int idx = 0; ! int j; afs_int32 code, error = 0; struct nvldbentry entry, storeEntry; char pname[10]; *************** *** 5784,5790 **** { struct rx_connection *aconn = 0; afs_int32 j, k, code, vcode, error = 0; ! afs_int32 tverbose, mod, modified = 0; struct nvldbentry vldbentry; afs_int32 volumeid = 0; volEntries volumeInfo; --- 5789,5796 ---- { struct rx_connection *aconn = 0; afs_int32 j, k, code, vcode, error = 0; ! afs_int32 tverbose; ! afs_int32 mod, modified = 0; struct nvldbentry vldbentry; afs_int32 volumeid = 0; volEntries volumeInfo; *************** *** 5795,5811 **** volumeInfo.volEntries_val = (volintInfo *) 0; volumeInfo.volEntries_len = 0; - if (!aserver && (flags & 1)) { - /* fprintf(STDERR,"Partition option requires a server option\n"); */ - ERROR_EXIT(EINVAL); - } - /* Turn verbose logging off and do our own verbose logging */ tverbose = verbose; if (flags & 2) tverbose = 1; verbose = 0; /* Read the VLDB entry */ vcode = VLDB_GetEntryByName(avolname, &vldbentry); if (vcode && (vcode != VL_NOENT)) { --- 5801,5819 ---- volumeInfo.volEntries_val = (volintInfo *) 0; volumeInfo.volEntries_len = 0; /* Turn verbose logging off and do our own verbose logging */ + /* tverbose must be set before we call ERROR_EXIT() */ + tverbose = verbose; if (flags & 2) tverbose = 1; verbose = 0; + if (!aserver && (flags & 1)) { + /* fprintf(STDERR,"Partition option requires a server option\n"); */ + ERROR_EXIT(EINVAL); + } + /* Read the VLDB entry */ vcode = VLDB_GetEntryByName(avolname, &vldbentry); if (vcode && (vcode != VL_NOENT)) {