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”]