Index: openafs/src/WINNT/afsd/NTMakefile diff -c openafs/src/WINNT/afsd/NTMakefile:1.27.2.9 openafs/src/WINNT/afsd/NTMakefile:1.27.2.10 *** openafs/src/WINNT/afsd/NTMakefile:1.27.2.9 Sun May 29 23:52:52 2005 --- openafs/src/WINNT/afsd/NTMakefile Sun Oct 2 02:08:55 2005 *************** *** 276,282 **** install: install_headers install_objs $(CONF_DLLFILE) \ $(EXEDIR)\klog.exe \ $(EXEDIR)\tokens.exe \ ! $(EXEDIR)\unlog.exe $(EXEDIR)\afsd.exe $(EXEDIR)\afsd_service.exe \ $(EXEDIR)\fs.exe \ $(EXEDIR)\symlink.exe \ $(EXEDIR)\afsdacl.exe \ --- 276,283 ---- install: install_headers install_objs $(CONF_DLLFILE) \ $(EXEDIR)\klog.exe \ $(EXEDIR)\tokens.exe \ ! $(EXEDIR)\unlog.exe \ ! $(EXEDIR)\afsd_service.exe \ $(EXEDIR)\fs.exe \ $(EXEDIR)\symlink.exe \ $(EXEDIR)\afsdacl.exe \ *************** *** 287,293 **** install9X: install_headers $(CONF_DLLFILE) \ $(EXEDIR)\klog.exe \ $(EXEDIR)\tokens.exe \ ! $(EXEDIR)\unlog.exe $(EXEDIR)\afsd_service.exe \ $(EXEDIR)\fs.exe $(EXEDIR)\symlink.exe \ $(LOGON_DLLFILE) $(LOG95_DLLFILE) \ $(EXEDIR)\afsshare.exe \ --- 288,294 ---- install9X: install_headers $(CONF_DLLFILE) \ $(EXEDIR)\klog.exe \ $(EXEDIR)\tokens.exe \ ! $(EXEDIR)\unlog.exe $(EXEDIR)\afsd.exe $(EXEDIR)\afsd_service.exe \ $(EXEDIR)\fs.exe $(EXEDIR)\symlink.exe \ $(LOGON_DLLFILE) $(LOG95_DLLFILE) \ $(EXEDIR)\afsshare.exe \ *************** *** 380,386 **** AFSD_EXELIBS =\ $(DESTDIR)\lib\libosi.lib \ $(DESTDIR)\lib\afsrpc.lib \ - $(DESTDIR)\lib\afsrx.lib \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\afs\mtafsvldb.lib \ $(DESTDIR)\lib\afs\mtafsint.lib \ --- 381,386 ---- Index: openafs/src/WINNT/afsd/afsd_init.c diff -c openafs/src/WINNT/afsd/afsd_init.c:1.40.2.23 openafs/src/WINNT/afsd/afsd_init.c:1.40.2.24 *** openafs/src/WINNT/afsd/afsd_init.c:1.40.2.23 Sat Aug 27 23:45:15 2005 --- openafs/src/WINNT/afsd/afsd_init.c Sun Oct 2 02:08:55 2005 *************** *** 536,541 **** --- 536,543 ---- DWORD cacheSize; long logChunkSize; DWORD stats; + DWORD rx_enable_peer_stats = 0; + DWORD rx_enable_process_stats = 0; long traceBufSize; long maxcpus; long ltt, ltto; *************** *** 987,992 **** --- 989,1012 ---- if (rx_mtu != -1) afsi_log("RX maximum MTU is %d", rx_mtu); + dummyLen = sizeof(rx_enable_peer_stats); + code = RegQueryValueEx(parmKey, "RxEnablePeerStats", NULL, NULL, + (BYTE *) &rx_enable_peer_stats, &dummyLen); + if (code != ERROR_SUCCESS) { + rx_enable_peer_stats = 0; + } + if (rx_enable_peer_stats) + afsi_log("RX Peer Statistics gathering is enabled"); + + dummyLen = sizeof(rx_enable_process_stats); + code = RegQueryValueEx(parmKey, "RxEnableProcessStats", NULL, NULL, + (BYTE *) &rx_enable_process_stats, &dummyLen); + if (code != ERROR_SUCCESS) { + rx_enable_process_stats = 0; + } + if (rx_enable_process_stats) + afsi_log("RX Process Statistics gathering is enabled"); + dummyLen = sizeof(ConnDeadtimeout); code = RegQueryValueEx(parmKey, "ConnDeadTimeout", NULL, NULL, (BYTE *) &ConnDeadtimeout, &dummyLen); *************** *** 1123,1128 **** --- 1143,1154 ---- rx_StartServer(0); afsi_log("rx_StartServer"); + if (rx_enable_peer_stats) + rx_enablePeerRPCStats(); + + if (rx_enable_process_stats) + rx_enableProcessRPCStats(); + code = cm_GetRootCellName(rootCellName); afsi_log("cm_GetRootCellName code %d, cm_freelanceEnabled= %d, rcn= %s", code, cm_freelanceEnabled, (code ? "" : rootCellName)); Index: openafs/src/WINNT/afsd/cm_ioctl.c diff -c openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.15 openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.18 *** openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.15 Fri Sep 9 08:53:17 2005 --- openafs/src/WINNT/afsd/cm_ioctl.c Mon Oct 3 12:34:16 2005 *************** *** 537,543 **** { long code; cm_scache_t *scp; - unsigned long volume; int i; cm_req_t req; --- 537,542 ---- *************** *** 760,765 **** --- 759,822 ---- return 0; } + long cm_IoctlGetFid(struct smb_ioctl *ioctlp, struct cm_user *userp) + { + cm_scache_t *scp; + register long code; + register char *cp; + cm_fid_t fid; + cm_req_t req; + + cm_InitReq(&req); + + code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp); + if (code) return code; + + memset(&fid, 0, sizeof(cm_fid_t)); + fid.volume = scp->fid.volume; + fid.vnode = scp->fid.vnode; + fid.unique = scp->fid.unique; + + cm_ReleaseSCache(scp); + + /* Copy all this junk into msg->im_data, keeping track of the lengths. */ + cp = ioctlp->outDatap; + memcpy(cp, (char *)&fid, sizeof(cm_fid_t)); + cp += sizeof(cm_fid_t); + + /* return new size */ + ioctlp->outDatap = cp; + + return 0; + } + + long cm_IoctlGetOwner(struct smb_ioctl *ioctlp, struct cm_user *userp) + { + cm_scache_t *scp; + register long code; + register char *cp; + cm_req_t req; + + cm_InitReq(&req); + + code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp); + if (code) return code; + + /* Copy all this junk into msg->im_data, keeping track of the lengths. */ + cp = ioctlp->outDatap; + memcpy(cp, (char *)&scp->owner, sizeof(afs_uint32)); + cp += sizeof(afs_uint32); + memcpy(cp, (char *)&scp->group, sizeof(afs_uint32)); + cp += sizeof(afs_uint32); + + /* return new size */ + ioctlp->outDatap = cp; + + cm_ReleaseSCache(scp); + + return 0; + } + long cm_IoctlWhereIs(struct smb_ioctl *ioctlp, struct cm_user *userp) { long code; *************** *** 2310,2315 **** --- 2367,2415 ---- return 0; } + long cm_IoctlRxStatProcess(struct smb_ioctl *ioctlp, struct cm_user *userp) + { + afs_int32 flags; + int code = 0; + + memcpy((char *)&flags, ioctlp->inDatap, sizeof(afs_int32)); + if (!(flags & AFSCALL_RXSTATS_MASK) || (flags & ~AFSCALL_RXSTATS_MASK)) { + return -1; + } + if (flags & AFSCALL_RXSTATS_ENABLE) { + rx_enableProcessRPCStats(); + } + if (flags & AFSCALL_RXSTATS_DISABLE) { + rx_disableProcessRPCStats(); + } + if (flags & AFSCALL_RXSTATS_CLEAR) { + rx_clearProcessRPCStats(AFS_RX_STATS_CLEAR_ALL); + } + return 0; + } + + long cm_IoctlRxStatPeer(struct smb_ioctl *ioctlp, struct cm_user *userp) + { + afs_int32 flags; + int code = 0; + + memcpy((char *)&flags, ioctlp->inDatap, sizeof(afs_int32)); + + if (!(flags & AFSCALL_RXSTATS_MASK) || (flags & ~AFSCALL_RXSTATS_MASK)) { + return -1; + } + if (flags & AFSCALL_RXSTATS_ENABLE) { + rx_enablePeerRPCStats(); + } + if (flags & AFSCALL_RXSTATS_DISABLE) { + rx_disablePeerRPCStats(); + } + if (flags & AFSCALL_RXSTATS_CLEAR) { + rx_clearPeerRPCStats(AFS_RX_STATS_CLEAR_ALL); + } + return 0; + } + #ifdef DJGPP extern int afsd_shutdown(int); extern int afs_shutdown; Index: openafs/src/WINNT/afsd/cm_ioctl.h diff -c openafs/src/WINNT/afsd/cm_ioctl.h:1.8.2.2 openafs/src/WINNT/afsd/cm_ioctl.h:1.8.2.4 *** openafs/src/WINNT/afsd/cm_ioctl.h:1.8.2.2 Wed Sep 7 12:31:14 2005 --- openafs/src/WINNT/afsd/cm_ioctl.h Sun Oct 2 02:08:55 2005 *************** *** 47,52 **** --- 47,59 ---- extern unsigned int cm_sysNameCount; extern char * cm_sysNameList[MAXNUMSYSNAMES]; + /* flags for rxstats pioctl */ + + #define AFSCALL_RXSTATS_MASK 0x7 /* Valid flag bits */ + #define AFSCALL_RXSTATS_ENABLE 0x1 /* Enable RX stats */ + #define AFSCALL_RXSTATS_DISABLE 0x2 /* Disable RX stats */ + #define AFSCALL_RXSTATS_CLEAR 0x4 /* Clear RX stats */ + #ifndef __CM_IOCTL_INTERFACES_ONLY__ void cm_InitIoctl(void); *************** *** 69,74 **** --- 76,85 ---- extern long cm_IoctlGetVolumeStatus(smb_ioctl_t *ioctlp, cm_user_t *userp); + extern long cm_IoctlGetFid(smb_ioctl_t *ioctlp, cm_user_t *userp); + + extern long cm_IoctlGetOwner(smb_ioctl_t *ioctlp, cm_user_t *userp); + extern long cm_IoctlWhereIs(smb_ioctl_t *ioctlp, cm_user_t *userp); extern long cm_IoctlStatMountPoint(smb_ioctl_t *ioctlp, cm_user_t *userp); *************** *** 140,145 **** --- 151,160 ---- extern long cm_IoctlFreemountRemoveCell(smb_ioctl_t *ioctlp, cm_user_t *userp); extern long cm_IoctlMemoryDump(smb_ioctl_t *ioctlp, cm_user_t *userp); + + extern long cm_IoctlRxStatProcess(smb_ioctl_t *ioctlp, cm_user_t *userp); + + extern long cm_IoctlRxStatPeer(smb_ioctl_t *ioctlp, cm_user_t *userp); #endif /* __CM_IOCTL_INTERFACES_ONLY__ */ #endif /* __CM_IOCTL_H_ENV__ */ Index: openafs/src/WINNT/afsd/fs.c diff -c openafs/src/WINNT/afsd/fs.c:1.16.2.15 openafs/src/WINNT/afsd/fs.c:1.16.2.17 *** openafs/src/WINNT/afsd/fs.c:1.16.2.15 Fri Sep 9 15:44:57 2005 --- openafs/src/WINNT/afsd/fs.c Sun Oct 2 02:08:56 2005 *************** *** 1504,1516 **** SetDotDefault(&as->parms[0].items); for(ti=as->parms[0].items; ti; ti=ti->next) { ! #ifndef WIN32 ! struct VenusFid vfid; ! #endif /* WIN32 */ /* once per file */ - blob.out_size = MAXSIZE; blob.in_size = 0; blob.out = space; code = pioctl(ti->data, VIOCGETVOLSTAT, &blob, 1); if (code) { Die(errno, ti->data); --- 1504,1544 ---- SetDotDefault(&as->parms[0].items); for(ti=as->parms[0].items; ti; ti=ti->next) { ! cm_fid_t fid; ! afs_uint32 owner[2]; ! char cell[MAXCELLCHARS]; ! ! code = GetCell(ti->data, cell); ! if (code) { ! Die(errno, ti->data); ! error = 1; ! continue; ! } ! /* once per file */ blob.in_size = 0; + + blob.out_size = sizeof(cm_fid_t); + blob.out = (char *) &fid; + if (0 == pioctl(ti->data, VIOCGETFID, &blob, 1)) { + printf("File %s (%u.%u.%u) contained in cell %s\n", + ti->data, fid.volume, fid.vnode, fid.unique, + cell); + } + + blob.out_size = 2 * sizeof(afs_uint32); + blob.out = (char *) &owner; + if (0 == pioctl(ti->data, VIOCGETOWNER, &blob, 1)) { + char oname[PR_MAXNAMELEN] = "(unknown)"; + + /* Go to the PRDB and see if this all number username is valid */ + pr_Initialize(1, AFSDIR_CLIENT_ETC_DIRPATH, cell); + pr_SIdToName(owner[0], oname); + printf("Owner %s (%u) Group %u\n", oname, owner[0], owner[1]); + } + blob.out = space; + blob.out_size = MAXSIZE; code = pioctl(ti->data, VIOCGETVOLSTAT, &blob, 1); if (code) { Die(errno, ti->data); *************** *** 1522,1536 **** offmsg = name + strlen(name) + 1; motd = offmsg + strlen(offmsg) + 1; - #ifndef WIN32 - blob.out_size = sizeof(struct VenusFid); - blob.out = (char *) &vfid; - if (0 == pioctl(ti->data, VIOCGETFID, &blob, 1)) { - printf("File %s (%u.%u.%u) contained in volume %u\n", - ti->data, vfid.Fid.Volume, vfid.Fid.Vnode, vfid.Fid.Unique, - vfid.Fid.Volume); - } - #endif /* WIN32 */ PrintStatus(status, name, motd, offmsg); } return error; --- 1550,1555 ---- *************** *** 4178,4183 **** --- 4197,4203 ---- } return error; } + #endif /* WIN32 */ static int RxStatProcCmd(struct cmd_syndesc *as, char *arock) *************** *** 4248,4254 **** return 0; } - #endif /* WIN32 */ #ifndef WIN32 #include "AFS_component_version_number.c" --- 4268,4273 ---- *************** *** 4502,4508 **** ts = cmd_CreateSyntax("getcrypt", GetCryptCmd, 0, "get cache manager encryption flag"); - #ifndef WIN32 ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, 0, "Manage per process RX statistics"); cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats"); --- 4521,4526 ---- *************** *** 4515,4520 **** --- 4533,4539 ---- cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats"); + #ifndef WIN32 ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, 0, "configure callback connection address"); cmd_AddParm(ts, "-addr", CMD_SINGLE, CMD_OPTIONAL, "host name or address"); #endif Index: openafs/src/WINNT/afsd/smb_iocons.h diff -c openafs/src/WINNT/afsd/smb_iocons.h:1.6.2.2 openafs/src/WINNT/afsd/smb_iocons.h:1.6.2.4 *** openafs/src/WINNT/afsd/smb_iocons.h:1.6.2.2 Wed Sep 7 12:31:14 2005 --- openafs/src/WINNT/afsd/smb_iocons.h Sun Oct 2 02:08:56 2005 *************** *** 92,95 **** --- 92,99 ---- #define VIOC_TRACEMEMDUMP 0x29 #define VIOC_SHUTDOWN 0x2a #define VIOC_FLUSHALL 0x2b + #define VIOCGETFID 0x2c + #define VIOCGETOWNER 0x2d + #define VIOC_RXSTAT_PROC 0x2e + #define VIOC_RXSTAT_PEER 0x2f #endif /* __SMB_IOCONS_H_ENV_ */ Index: openafs/src/WINNT/afsd/smb_ioctl.c diff -c openafs/src/WINNT/afsd/smb_ioctl.c:1.14.2.3 openafs/src/WINNT/afsd/smb_ioctl.c:1.14.2.5 *** openafs/src/WINNT/afsd/smb_ioctl.c:1.14.2.3 Wed Sep 7 15:24:39 2005 --- openafs/src/WINNT/afsd/smb_ioctl.c Sun Oct 2 02:08:56 2005 *************** *** 79,84 **** --- 79,88 ---- smb_ioctlProcsp[VIOC_TRACEMEMDUMP] = cm_IoctlMemoryDump; smb_ioctlProcsp[VIOC_ISSYMLINK] = cm_IoctlIslink; smb_ioctlProcsp[VIOC_FLUSHALL] = cm_IoctlFlushAllVolumes; + smb_ioctlProcsp[VIOCGETFID] = cm_IoctlGetFid; + smb_ioctlProcsp[VIOCGETOWNER] = cm_IoctlGetOwner; + smb_ioctlProcsp[VIOC_RXSTAT_PROC] = cm_IoctlRxStatProcess; + smb_ioctlProcsp[VIOC_RXSTAT_PEER] = cm_IoctlRxStatPeer; } /* called to make a fid structure into an IOCTL fid structure */ Index: openafs/src/WINNT/client_creds/window.cpp diff -c openafs/src/WINNT/client_creds/window.cpp:1.11.2.4 openafs/src/WINNT/client_creds/window.cpp:1.11.2.5 *** openafs/src/WINNT/client_creds/window.cpp:1.11.2.4 Sat Aug 20 20:51:35 2005 --- openafs/src/WINNT/client_creds/window.cpp Sat Oct 1 00:52:04 2005 *************** *** 171,181 **** } lock_ReleaseMutex(&g.credsLock); CheckMenuItem (hm, M_REMIND, MF_BYCOMMAND | ((fRemind) ? MF_CHECKED : MF_UNCHECKED)); ! TrackPopupMenu (GetSubMenu (hmDummy, 0), TPM_RIGHTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, NULL, hDlg, NULL); ! DestroyMenu (hmDummy); } break; --- 171,181 ---- } lock_ReleaseMutex(&g.credsLock); CheckMenuItem (hm, M_REMIND, MF_BYCOMMAND | ((fRemind) ? MF_CHECKED : MF_UNCHECKED)); ! SetForegroundWindow(hDlg); TrackPopupMenu (GetSubMenu (hmDummy, 0), TPM_RIGHTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, NULL, hDlg, NULL); ! PostMessage(hDlg, WM_NULL, 0, 0); DestroyMenu (hmDummy); } break; Index: openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc:1.7.2.1 openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc:1.7.2.2 *** openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc:1.7.2.1 Sun Aug 14 07:27:43 2005 --- openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc Mon Oct 3 00:05:56 2005 *************** *** 105,113 **** FONT 9, "MS Shell Dlg" BEGIN LTEXT "Cell: ",IDC_STATIC,7,9,24,8 ! LTEXT "(none)",IDC_CREDS_CELL,51,9,193,8 LTEXT "Tokens:",IDC_STATIC,7,26,27,8 ! LTEXT "(none)",IDC_CREDS_INFO,51,26,193,8 CONTROL "&Show a warning before these tokens expire", IDC_CREDS_REMIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 51,43,193,10 --- 105,113 ---- FONT 9, "MS Shell Dlg" BEGIN LTEXT "Cell: ",IDC_STATIC,7,9,24,8 ! LTEXT "(none)",IDC_CREDS_CELL,51,9,282,8 LTEXT "Tokens:",IDC_STATIC,7,26,27,8 ! LTEXT "(none)",IDC_CREDS_INFO,51,26,282,8 CONTROL "&Show a warning before these tokens expire", IDC_CREDS_REMIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 51,43,193,10 Index: openafs/src/WINNT/client_exp/afs_shl_ext.cpp diff -c openafs/src/WINNT/client_exp/afs_shl_ext.cpp:1.5 openafs/src/WINNT/client_exp/afs_shl_ext.cpp:1.5.2.1 *** openafs/src/WINNT/client_exp/afs_shl_ext.cpp:1.5 Sat Nov 22 23:53:14 2003 --- openafs/src/WINNT/client_exp/afs_shl_ext.cpp Sun Oct 2 10:47:20 2005 *************** *** 84,92 **** { AFX_MANAGE_STATE(AfxGetStaticModuleState()); if (!nCMRefCount && !nSERefCount && !nICRefCount && !nTPRefCount && !nXPRefCount) return S_OK; ! return S_FALSE; } --- 84,99 ---- { AFX_MANAGE_STATE(AfxGetStaticModuleState()); + #ifdef COMMENT + // This test is correct and we really do want to allow the extension to be loaded and + // unloaded as needed. Unfortunately, the extension is being unloaded and never loaded + // again which is disconcerting for many folks. For now we will prevent the unloading + // until someone has time to figure out how to debug this. + // Jeffrey Altman - 2 Oct 2005 + if (!nCMRefCount && !nSERefCount && !nICRefCount && !nTPRefCount && !nXPRefCount) return S_OK; ! #endif return S_FALSE; } Index: openafs/src/WINNT/client_exp/gui2fs.cpp diff -c openafs/src/WINNT/client_exp/gui2fs.cpp:1.10.2.6 openafs/src/WINNT/client_exp/gui2fs.cpp:1.10.2.7 *** openafs/src/WINNT/client_exp/gui2fs.cpp:1.10.2.6 Wed Aug 31 20:08:43 2005 --- openafs/src/WINNT/client_exp/gui2fs.cpp Sun Oct 2 05:08:18 2005 *************** *** 1546,1552 **** register LONG code = 0; struct ViceIoctl blob; char tbuffer[1024]; - char lsbuffer[1024]; register char *tp; char szCurItem[1024]; BOOL error = FALSE; --- 1546,1551 ---- *************** *** 1739,1768 **** blob.out_size = MAXSIZE; blob.out = space; ! memset(space, 0, sizeof(LONG)); /* so we assure zero when nothing is copied back */ - /* prepare flags for checkservers command */ - if (nCellsToCheck == LOCAL_CELL) - temp = 2; /* default to checking local cell only */ - else if (nCellsToCheck == ALL_CELLS) - temp &= ~2; /* turn off local cell check */ - - if (bFast) - temp |= 1; /* set fast flag */ - - checkserv.magic = 0x12345678; /* XXX */ - checkserv.tflags = temp; - - /* now copy in optional cell name, if specified */ if (nCellsToCheck == SPECIFIC_CELL) { GetCellName(PCCHAR(strCellName), &info); strcpy(checkserv.tbuffer,info.name); checkserv.tsize = strlen(info.name) + 1; } else { strcpy(checkserv.tbuffer, "\0"); checkserv.tsize = 0; } ! checkserv.tinterval = -1; /* don't change current interval */ code = pioctl(0, VIOCCKSERV, &blob, 1); --- 1738,1761 ---- blob.out_size = MAXSIZE; blob.out = space; ! memset(space, 0, sizeof(afs_int32)); /* so we assure zero when nothing is copied back */ if (nCellsToCheck == SPECIFIC_CELL) { + temp = 2; GetCellName(PCCHAR(strCellName), &info); strcpy(checkserv.tbuffer,info.name); checkserv.tsize = strlen(info.name) + 1; } else { + if (nCellsToCheck != ALL_CELLS) + temp = 2; strcpy(checkserv.tbuffer, "\0"); checkserv.tsize = 0; } ! if (bFast) ! temp |= 1; /* set fast flag */ ! ! checkserv.magic = 0x12345678; /* XXX */ ! checkserv.tflags = temp; checkserv.tinterval = -1; /* don't change current interval */ code = pioctl(0, VIOCCKSERV, &blob, 1); Index: openafs/src/WINNT/client_exp/server_status_dlg.cpp diff -c openafs/src/WINNT/client_exp/server_status_dlg.cpp:1.2 openafs/src/WINNT/client_exp/server_status_dlg.cpp:1.2.20.1 *** openafs/src/WINNT/client_exp/server_status_dlg.cpp:1.2 Sat Nov 4 05:02:54 2000 --- openafs/src/WINNT/client_exp/server_status_dlg.cpp Sun Oct 2 05:08:18 2005 *************** *** 34,40 **** //{{AFX_DATA_INIT(CServerStatusDlg) m_bFast = FALSE; ! m_nCell = -1; //}}AFX_DATA_INIT } --- 34,40 ---- //{{AFX_DATA_INIT(CServerStatusDlg) m_bFast = FALSE; ! m_nCell = LOCAL_CELL; //}}AFX_DATA_INIT } *************** *** 76,82 **** CDialog::OnInitDialog(); m_CellName.EnableWindow(FALSE); ! m_nCell = 0; UpdateData(FALSE); --- 76,82 ---- CDialog::OnInitDialog(); m_CellName.EnableWindow(FALSE); ! m_nCell = LOCAL_CELL; UpdateData(FALSE); *************** *** 93,111 **** void CServerStatusDlg::OnSpecifiedCell() { ! m_CellName.EnableWindow(TRUE); ! CheckEnableShowStatus(); } void CServerStatusDlg::OnLocalCell() { m_CellName.EnableWindow(FALSE); m_ShowStatus.EnableWindow(TRUE); } void CServerStatusDlg::OnAllCells() { m_CellName.EnableWindow(FALSE); m_ShowStatus.EnableWindow(TRUE); } --- 93,113 ---- void CServerStatusDlg::OnSpecifiedCell() { ! m_nCell = SPECIFIC_CELL; ! m_CellName.EnableWindow(TRUE); CheckEnableShowStatus(); } void CServerStatusDlg::OnLocalCell() { + m_nCell = LOCAL_CELL; m_CellName.EnableWindow(FALSE); m_ShowStatus.EnableWindow(TRUE); } void CServerStatusDlg::OnAllCells() { + m_nCell = ALL_CELLS; m_CellName.EnableWindow(FALSE); m_ShowStatus.EnableWindow(TRUE); } Index: openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc:1.4 openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc:1.4.2.2 *** openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc:1.4 Thu Apr 1 14:10:18 2004 --- openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc Sun Oct 2 10:49:39 2005 *************** *** 230,236 **** BS_AUTORADIOBUTTON | WS_GROUP,161,16,79,10 CONTROL "Eingabe negativer Zahlen",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,96,10 ! PUSHBUTTON "OK",IDOK,101,90,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,155,90,50,14 PUSHBUTTON "Hilfe",9,209,90,50,14 LTEXT "Name:",IDC_STATIC,10,72,20,8 --- 230,236 ---- BS_AUTORADIOBUTTON | WS_GROUP,161,16,79,10 CONTROL "Eingabe negativer Zahlen",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,96,10 ! DEFPUSHBUTTON "OK",IDOK,101,90,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,155,90,50,14 PUSHBUTTON "Hilfe",9,209,90,50,14 LTEXT "Name:",IDC_STATIC,10,72,20,8 *************** *** 324,330 **** CAPTION "Inaktive Server" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "Diese Servers sind noch inaktiv:",IDC_STATIC,10,10,114, 8 --- 324,330 ---- CAPTION "Inaktive Server" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "Diese Servers sind noch inaktiv:",IDC_STATIC,10,10,114, 8 *************** *** 345,351 **** WS_TABSTOP,20,65,45,10 CONTROL "Server nicht testen",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,89,10 ! PUSHBUTTON "Status anzeigen",IDC_SHOWSTATUS,5,120,58,14 GROUPBOX "Zelle",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,88,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL --- 345,351 ---- WS_TABSTOP,20,65,45,10 CONTROL "Server nicht testen",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,89,10 ! DEFPUSHBUTTON "Status anzeigen",IDC_SHOWSTATUS,5,120,58,14 GROUPBOX "Zelle",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,88,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL *************** *** 361,367 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "Token erhalten",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "Token l鰏chen",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "Schlie遝n",IDCANCEL,145,137,55,14 PUSHBUTTON "Hilfe",9,215,137,55,14 --- 361,367 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "Token erhalten",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "Token l鰏chen",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "Schlie遝n",IDCANCEL,145,137,55,14 PUSHBUTTON "Hilfe",9,215,137,55,14 *************** *** 411,417 **** PUSHBUTTON "L鰏chen",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "膎dern",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submounts:",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "OK",IDOK,202,145,45,14 PUSHBUTTON "Abbrechen",IDCANCEL,202,163,45,14 END --- 411,417 ---- PUSHBUTTON "L鰏chen",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "膎dern",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submounts:",IDC_STATIC,10,10,50,8 ! DEFPUSHBUTTON "OK",IDOK,202,145,45,14 PUSHBUTTON "Abbrechen",IDCANCEL,202,163,45,14 END *************** *** 422,428 **** BEGIN EDITTEXT IDC_SHARE_NAME,77,8,141,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,77,23,141,12,ES_AUTOHSCROLL ! PUSHBUTTON "OK",IDOK,22,53,45,14 PUSHBUTTON "Abbrechen",IDCANCEL,92,53,45,14 PUSHBUTTON "Hilfe",9,167,53,45,14 LTEXT "Gemeinsam benutzter Name:",IDC_STATIC,18,7,60,15 --- 422,428 ---- BEGIN EDITTEXT IDC_SHARE_NAME,77,8,141,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,77,23,141,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "OK",IDOK,22,53,45,14 PUSHBUTTON "Abbrechen",IDCANCEL,92,53,45,14 PUSHBUTTON "Hilfe",9,167,53,45,14 LTEXT "Gemeinsam benutzter Name:",IDC_STATIC,18,7,60,15 Index: openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc:1.6.2.2 openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc:1.6.2.4 *** openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc:1.6.2.2 Wed Aug 31 20:08:43 2005 --- openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc Sun Oct 2 10:49:39 2005 *************** *** 235,241 **** BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "Negative Entry",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! PUSHBUTTON "OK",IDOK,22,90,50,14 PUSHBUTTON "Cancel",IDCANCEL,92,90,50,14 PUSHBUTTON "Help",9,162,90,50,14 LTEXT "Name:",IDC_STATIC,10,72,20,8 --- 235,241 ---- BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "Negative Entry",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! DEFPUSHBUTTON "OK",IDOK,22,90,50,14 PUSHBUTTON "Cancel",IDCANCEL,92,90,50,14 PUSHBUTTON "Help",9,162,90,50,14 LTEXT "Name:",IDC_STATIC,10,72,20,8 *************** *** 329,335 **** CAPTION "Down Servers" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "These servers are still down:",IDC_STATIC,10,10,95,8 DEFPUSHBUTTON "OK",IDOK,82,140,45,15 --- 329,335 ---- CAPTION "Down Servers" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "These servers are still down:",IDC_STATIC,10,10,95,8 DEFPUSHBUTTON "OK",IDOK,82,140,45,15 *************** *** 349,355 **** WS_TABSTOP,20,65,45,10 CONTROL "Do not probe servers",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,80,10 ! PUSHBUTTON "Show Status",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "Cell",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,90,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL --- 349,355 ---- WS_TABSTOP,20,65,45,10 CONTROL "Do not probe servers",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,80,10 ! DEFPUSHBUTTON "Show Status",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "Cell",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,90,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL *************** *** 365,371 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "Get Tokens",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "Discard Tokens",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "Close",IDCANCEL,145,137,55,14 PUSHBUTTON "Help",9,215,137,55,14 --- 365,371 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "Get Tokens",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "Discard Tokens",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "Close",IDCANCEL,145,137,55,14 PUSHBUTTON "Help",9,215,137,55,14 *************** *** 415,421 **** PUSHBUTTON "Delete",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "Change",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submounts:",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "OK",IDOK,202,145,45,14 PUSHBUTTON "Cancel",IDCANCEL,202,163,45,14 END --- 415,421 ---- PUSHBUTTON "Delete",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "Change",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submounts:",IDC_STATIC,10,10,50,8 ! DEFPUSHBUTTON "OK",IDOK,202,145,45,14 PUSHBUTTON "Cancel",IDCANCEL,202,163,45,14 END *************** *** 426,432 **** BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "OK",IDOK,22,53,45,14 PUSHBUTTON "Cancel",IDCANCEL,92,53,45,14 PUSHBUTTON "Help",9,167,53,45,14 LTEXT "Submount Name:",IDC_STATIC,18,10,29,8 --- 426,432 ---- BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "OK",IDOK,22,53,45,14 PUSHBUTTON "Cancel",IDCANCEL,92,53,45,14 PUSHBUTTON "Help",9,167,53,45,14 LTEXT "Submount Name:",IDC_STATIC,18,10,29,8 *************** *** 440,446 **** BEGIN EDITTEXT IDC_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_DIR,62,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "OK",IDOK,22,53,45,14 PUSHBUTTON "Cancel",IDCANCEL,92,53,45,14 PUSHBUTTON "Help",9,167,53,45,14 LTEXT "Link Name:",IDC_STATIC,18,10,29,8 --- 440,446 ---- BEGIN EDITTEXT IDC_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_DIR,62,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "OK",IDOK,22,53,45,14 PUSHBUTTON "Cancel",IDCANCEL,92,53,45,14 PUSHBUTTON "Help",9,167,53,45,14 LTEXT "Link Name:",IDC_STATIC,18,10,29,8 Index: openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc:1.5 openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc:1.5 Thu Apr 1 14:10:21 2004 --- openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc Sun Oct 2 10:49:40 2005 *************** *** 232,238 **** BS_AUTORADIOBUTTON | WS_GROUP,161,16,69,10 CONTROL "Entrada negativa",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,72,10 ! PUSHBUTTON "Aceptar",IDOK,22,90,50,14 PUSHBUTTON "Cancelar",IDCANCEL,92,90,50,14 PUSHBUTTON "Ayuda",9,162,90,50,14 LTEXT "Nombre:",IDC_STATIC,10,72,32,8 --- 232,238 ---- BS_AUTORADIOBUTTON | WS_GROUP,161,16,69,10 CONTROL "Entrada negativa",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,72,10 ! DEFPUSHBUTTON "Aceptar",IDOK,22,90,50,14 PUSHBUTTON "Cancelar",IDCANCEL,92,90,50,14 PUSHBUTTON "Ayuda",9,162,90,50,14 LTEXT "Nombre:",IDC_STATIC,10,72,32,8 *************** *** 326,332 **** CAPTION "Servidores no activos" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "Estos servidores siguen sin estar activos:",IDC_STATIC, 10,10,182,8 --- 326,332 ---- CAPTION "Servidores no activos" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "Estos servidores siguen sin estar activos:",IDC_STATIC, 10,10,182,8 *************** *** 347,353 **** BS_AUTORADIOBUTTON | WS_TABSTOP,20,65,135,10 CONTROL "No investigar servidores",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,93,10 ! PUSHBUTTON "Mostrar estado",IDC_SHOWSTATUS,10,120,54,14 GROUPBOX "C閘ula",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,100,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL --- 347,353 ---- BS_AUTORADIOBUTTON | WS_TABSTOP,20,65,135,10 CONTROL "No investigar servidores",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,93,10 ! DEFPUSHBUTTON "Mostrar estado",IDC_SHOWSTATUS,10,120,54,14 GROUPBOX "C閘ula",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,100,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL *************** *** 363,369 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "Obtener se馻les",ID_GET_TOKENS,12,137,57,14 PUSHBUTTON "Descartar se馻les",ID_DISCARD_TOKENS,79,137,62,14 PUSHBUTTON "Cerrar",IDCANCEL,151,137,55,14 PUSHBUTTON "Ayuda",9,217,137,55,14 --- 363,369 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "Obtener se馻les",ID_GET_TOKENS,12,137,57,14 PUSHBUTTON "Descartar se馻les",ID_DISCARD_TOKENS,79,137,62,14 PUSHBUTTON "Cerrar",IDCANCEL,151,137,55,14 PUSHBUTTON "Ayuda",9,217,137,55,14 *************** *** 413,419 **** PUSHBUTTON "Suprimir",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "Cambiar",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submontajes:",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "Aceptar",IDOK,202,145,45,14 PUSHBUTTON "Cancelar",IDCANCEL,202,163,45,14 END --- 413,419 ---- PUSHBUTTON "Suprimir",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "Cambiar",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submontajes:",IDC_STATIC,10,10,50,8 ! DEFPUSHBUTTON "Aceptar",IDOK,202,145,45,14 PUSHBUTTON "Cancelar",IDCANCEL,202,163,45,14 END *************** *** 424,430 **** BEGIN EDITTEXT IDC_SHARE_NAME,107,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,107,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "Aceptar",IDOK,22,53,45,14 PUSHBUTTON "Cancelar",IDCANCEL,92,53,45,14 PUSHBUTTON "Ayuda",9,167,53,45,14 LTEXT "Nombre de compartici髇:",IDC_STATIC,18,10,87,8 --- 424,430 ---- BEGIN EDITTEXT IDC_SHARE_NAME,107,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,107,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "Aceptar",IDOK,22,53,45,14 PUSHBUTTON "Cancelar",IDCANCEL,92,53,45,14 PUSHBUTTON "Ayuda",9,167,53,45,14 LTEXT "Nombre de compartici髇:",IDC_STATIC,18,10,87,8 Index: openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc:1.5 openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc:1.5 Thu Apr 1 14:10:23 2004 --- openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc Sun Oct 2 10:49:41 2005 *************** *** 232,238 **** BS_AUTORADIOBUTTON | WS_GROUP,191,16,43,10 CONTROL "嬛巭崁栚",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,191,26,43,10 ! PUSHBUTTON "椆夝",IDOK,22,90,50,14 PUSHBUTTON "庢徚偟",IDCANCEL,92,90,50,14 PUSHBUTTON "僿儖僾",9,162,90,50,14 LTEXT "柤慜:",IDC_STATIC,10,72,18,8 --- 232,238 ---- BS_AUTORADIOBUTTON | WS_GROUP,191,16,43,10 CONTROL "嬛巭崁栚",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,191,26,43,10 ! DEFPUSHBUTTON "椆夝",IDOK,22,90,50,14 PUSHBUTTON "庢徚偟",IDCANCEL,92,90,50,14 PUSHBUTTON "僿儖僾",9,162,90,50,14 LTEXT "柤慜:",IDC_STATIC,10,72,18,8 *************** *** 326,332 **** CAPTION "僒乕僶乕偑僟僂儞" FONT 9, "俵俽 俹僑僔僢僋" BEGIN ! LISTBOX 1029,10,22,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "埲壓偺僒乕僶乕偼傑偩僟僂儞偟偰偄傑偡:",IDC_STATIC,10,10, 146,8 --- 326,332 ---- CAPTION "僒乕僶乕偑僟僂儞" FONT 9, "俵俽 俹僑僔僢僋" BEGIN ! LISTBOX IDC_LIST,10,22,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "埲壓偺僒乕僶乕偼傑偩僟僂儞偟偰偄傑偡:",IDC_STATIC,10,10, 146,8 *************** *** 347,353 **** WS_TABSTOP,20,65,59,10 CONTROL "僒乕僶乕傪僾儘乕僽偟側偄",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,107,10 ! PUSHBUTTON "忬嫷偺昞帵",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "僙儖",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,120,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,48,130,12,ES_AUTOHSCROLL --- 347,353 ---- WS_TABSTOP,20,65,59,10 CONTROL "僒乕僶乕傪僾儘乕僽偟側偄",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,107,10 ! DEFPUSHBUTTON "忬嫷偺昞帵",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "僙儖",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,120,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,48,130,12,ES_AUTOHSCROLL *************** *** 363,369 **** LISTBOX IDC_TOKEN_LIST,10,19,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "僩乕僋儞偺庢摼",ID_GET_TOKENS,15,137,62,14 PUSHBUTTON "僩乕僋儞偺攋婞",ID_DISCARD_TOKENS,80,137,62,14 PUSHBUTTON "僋儘乕僘",IDCANCEL,145,137,55,14 PUSHBUTTON "僿儖僾",9,215,137,55,14 --- 363,369 ---- LISTBOX IDC_TOKEN_LIST,10,19,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "僩乕僋儞偺庢摼",ID_GET_TOKENS,15,137,62,14 PUSHBUTTON "僩乕僋儞偺攋婞",ID_DISCARD_TOKENS,80,137,62,14 PUSHBUTTON "僋儘乕僘",IDCANCEL,145,137,55,14 PUSHBUTTON "僿儖僾",9,215,137,55,14 *************** *** 413,419 **** PUSHBUTTON "嶍彍",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "曄峏",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "僒僽儅僂儞僩:",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "椆夝",IDOK,202,145,45,14 PUSHBUTTON "庢徚偟",IDCANCEL,202,163,45,14 END --- 413,419 ---- PUSHBUTTON "嶍彍",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "曄峏",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "僒僽儅僂儞僩:",IDC_STATIC,10,10,50,8 ! DEfPUSHBUTTON "椆夝",IDOK,202,145,45,14 PUSHBUTTON "庢徚偟",IDCANCEL,202,163,45,14 END *************** *** 424,430 **** BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "椆夝",IDOK,22,53,45,14 PUSHBUTTON "庢徚偟",IDCANCEL,92,53,45,14 PUSHBUTTON "僿儖僾",9,167,53,45,14 LTEXT "嫟梡柤:",IDC_STATIC,19,10,29,8 --- 424,430 ---- BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "椆夝",IDOK,22,53,45,14 PUSHBUTTON "庢徚偟",IDCANCEL,92,53,45,14 PUSHBUTTON "僿儖僾",9,167,53,45,14 LTEXT "嫟梡柤:",IDC_STATIC,19,10,29,8 Index: openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc:1.5 openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc:1.5 Thu Apr 1 14:10:25 2004 --- openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc Sun Oct 2 10:49:42 2005 *************** *** 231,237 **** BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "何沥 亲格",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! PUSHBUTTON "犬牢",IDOK,22,90,50,14 PUSHBUTTON "秒家",IDCANCEL,92,90,50,14 PUSHBUTTON "档框富",9,162,90,50,14 LTEXT "捞抚:",IDC_STATIC,10,72,20,8 --- 231,237 ---- BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "何沥 亲格",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! DEFPUSHBUTTON "犬牢",IDOK,22,90,50,14 PUSHBUTTON "秒家",IDCANCEL,92,90,50,14 PUSHBUTTON "档框富",9,162,90,50,14 LTEXT "捞抚:",IDC_STATIC,10,72,20,8 *************** *** 325,331 **** CAPTION "辑滚 吝窜" FONT 9, "奔覆" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "捞 辑滚绰 酒流 矫累登瘤 臼篮 惑怕涝聪促",IDC_STATIC,10, 10,186,8 --- 325,331 ---- CAPTION "辑滚 吝窜" FONT 9, "奔覆" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "捞 辑滚绰 酒流 矫累登瘤 臼篮 惑怕涝聪促",IDC_STATIC,10, 10,186,8 *************** *** 346,352 **** WS_TABSTOP,21,69,45,10 CONTROL "辑滚 惑怕甫 炼荤窍瘤 臼澜",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,112,10 ! PUSHBUTTON "惑怕 钎矫",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "伎",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,137,20,WS_GROUP EDITTEXT IDC_CELL_NAME,31,51,130,12,ES_AUTOHSCROLL --- 346,352 ---- WS_TABSTOP,21,69,45,10 CONTROL "辑滚 惑怕甫 炼荤窍瘤 臼澜",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,112,10 ! DEFPUSHBUTTON "惑怕 钎矫",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "伎",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,137,20,WS_GROUP EDITTEXT IDC_CELL_NAME,31,51,130,12,ES_AUTOHSCROLL *************** *** 362,368 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "配奴 犬焊",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "配奴 滚府扁",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "摧扁",IDCANCEL,145,137,55,14 PUSHBUTTON "档框富",9,215,137,55,14 --- 362,368 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "配奴 犬焊",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "配奴 滚府扁",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "摧扁",IDCANCEL,145,137,55,14 PUSHBUTTON "档框富",9,215,137,55,14 *************** *** 412,418 **** PUSHBUTTON "昏力",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "函版",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "辑宏付款飘:",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "犬牢",IDOK,202,145,45,14 PUSHBUTTON "秒家",IDCANCEL,202,163,45,14 END --- 412,418 ---- PUSHBUTTON "昏力",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "函版",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "辑宏付款飘:",IDC_STATIC,10,10,50,8 ! DEFPUSHBUTTON "犬牢",IDOK,202,145,45,14 PUSHBUTTON "秒家",IDCANCEL,202,163,45,14 END *************** *** 423,429 **** BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "犬牢",IDOK,22,53,45,14 PUSHBUTTON "秒家",IDCANCEL,92,53,45,14 PUSHBUTTON "档框富",9,167,53,45,14 LTEXT "傍蜡 捞抚:",IDC_STATIC,18,10,37,8 --- 423,429 ---- BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "犬牢",IDOK,22,53,45,14 PUSHBUTTON "秒家",IDCANCEL,92,53,45,14 PUSHBUTTON "档框富",9,167,53,45,14 LTEXT "傍蜡 捞抚:",IDC_STATIC,18,10,37,8 Index: openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc:1.5 openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc:1.5 Thu Apr 1 14:10:27 2004 --- openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc Sun Oct 2 10:49:43 2005 *************** *** 231,237 **** BS_AUTORADIOBUTTON | WS_GROUP,155,14,64,10 CONTROL "Entrada negativa",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,155,24,69,10 ! PUSHBUTTON "OK",IDOK,22,90,50,14 PUSHBUTTON "Cancelar",IDCANCEL,92,90,50,14 PUSHBUTTON "Ajuda",9,162,90,50,14 LTEXT "Nome:",IDC_STATIC,10,72,20,8 --- 231,237 ---- BS_AUTORADIOBUTTON | WS_GROUP,155,14,64,10 CONTROL "Entrada negativa",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,155,24,69,10 ! DEFPUSHBUTTON "OK",IDOK,22,90,50,14 PUSHBUTTON "Cancelar",IDCANCEL,92,90,50,14 PUSHBUTTON "Ajuda",9,162,90,50,14 LTEXT "Nome:",IDC_STATIC,10,72,20,8 *************** *** 325,331 **** CAPTION "Servidores Inoperantes" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "Estes servidores ainda est鉶 inoperantes:",IDC_STATIC, 10,10,136,8 --- 325,331 ---- CAPTION "Servidores Inoperantes" FONT 8, "MS Sans Serif" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "Estes servidores ainda est鉶 inoperantes:",IDC_STATIC, 10,10,136,8 *************** *** 346,352 **** BS_AUTORADIOBUTTON | WS_TABSTOP,20,65,71,10 CONTROL "N鉶 sondar servidores",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,86,10 ! PUSHBUTTON "Mostrar Status",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "C閘ula",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,95,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL --- 346,352 ---- BS_AUTORADIOBUTTON | WS_TABSTOP,20,65,71,10 CONTROL "N鉶 sondar servidores",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,86,10 ! DEFPUSHBUTTON "Mostrar Status",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "C閘ula",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,95,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL *************** *** 362,368 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "Obter Tokens",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "Descartar Tokens",ID_DISCARD_TOKENS,79,137,62,14 PUSHBUTTON "Fechar",IDCANCEL,150,137,55,14 PUSHBUTTON "Ajuda",9,214,137,55,14 --- 362,368 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "Obter Tokens",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "Descartar Tokens",ID_DISCARD_TOKENS,79,137,62,14 PUSHBUTTON "Fechar",IDCANCEL,150,137,55,14 PUSHBUTTON "Ajuda",9,214,137,55,14 *************** *** 412,418 **** PUSHBUTTON "Excluir",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "Alterar",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submontagens:",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "OK",IDOK,202,145,45,14 PUSHBUTTON "Cancelar",IDCANCEL,202,163,45,14 END --- 412,418 ---- PUSHBUTTON "Excluir",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "Alterar",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "Submontagens:",IDC_STATIC,10,10,50,8 ! DEFPUSHBUTTON "OK",IDOK,202,145,45,14 PUSHBUTTON "Cancelar",IDCANCEL,202,163,45,14 END *************** *** 423,429 **** BEGIN EDITTEXT IDC_SHARE_NAME,97,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,97,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "OK",IDOK,24,53,45,14 PUSHBUTTON "Cancelar",IDCANCEL,111,53,45,14 PUSHBUTTON "Ajuda",9,198,53,45,14 LTEXT "Nome do Compartilhamento:",IDC_STATIC,4,10,90,8 --- 423,429 ---- BEGIN EDITTEXT IDC_SHARE_NAME,97,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,97,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "OK",IDOK,24,53,45,14 PUSHBUTTON "Cancelar",IDCANCEL,111,53,45,14 PUSHBUTTON "Ajuda",9,198,53,45,14 LTEXT "Nome do Compartilhamento:",IDC_STATIC,4,10,90,8 Index: openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc:1.5 openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc:1.5 Thu Apr 1 14:10:28 2004 --- openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc Sun Oct 2 10:49:44 2005 *************** *** 231,237 **** BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "浏览条目",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! PUSHBUTTON "确定",IDOK,22,90,50,14 PUSHBUTTON "取消",IDCANCEL,92,90,50,14 PUSHBUTTON "帮助",9,162,90,50,14 LTEXT "名称：",IDC_STATIC,10,72,26,8 --- 231,237 ---- BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "浏览条目",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! DEFPUSHBUTTON "确定",IDOK,22,90,50,14 PUSHBUTTON "取消",IDCANCEL,92,90,50,14 PUSHBUTTON "帮助",9,162,90,50,14 LTEXT "名称：",IDC_STATIC,10,72,26,8 *************** *** 325,331 **** CAPTION "关闭的服务器" FONT 8, "System" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "这些服务器仍然关闭着：",IDC_STATIC,10,10,95,8 DEFPUSHBUTTON "确定",IDOK,82,140,45,15 --- 325,331 ---- CAPTION "关闭的服务器" FONT 8, "System" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "这些服务器仍然关闭着：",IDC_STATIC,10,10,95,8 DEFPUSHBUTTON "确定",IDOK,82,140,45,15 *************** *** 345,351 **** WS_TABSTOP,20,65,45,10 CONTROL "不检测服务器",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,80,10 ! PUSHBUTTON "显示状态",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "单元",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,90,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL --- 345,351 ---- WS_TABSTOP,20,65,45,10 CONTROL "不检测服务器",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,80,10 ! DEFPUSHBUTTON "显示状态",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "单元",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,90,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL *************** *** 361,367 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "获得令牌",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "丢弃令牌",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "关闭",IDCANCEL,145,137,55,14 PUSHBUTTON "帮助",9,215,137,55,14 --- 361,367 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "获得令牌",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "丢弃令牌",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "关闭",IDCANCEL,145,137,55,14 PUSHBUTTON "帮助",9,215,137,55,14 *************** *** 407,413 **** BEGIN LISTBOX IDC_LIST,10,20,183,157,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "添加 ",IDC_ADD,202,20,45,14 PUSHBUTTON "删除",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "更改",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "子安装：",IDC_STATIC,10,10,50,8 --- 407,413 ---- BEGIN LISTBOX IDC_LIST,10,20,183,157,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "添加 ",IDC_ADD,202,20,45,14 PUSHBUTTON "删除",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "更改",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "子安装：",IDC_STATIC,10,10,50,8 *************** *** 422,428 **** BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! PUSHBUTTON "确定",IDOK,22,53,45,14 PUSHBUTTON "取消",IDCANCEL,92,53,45,14 PUSHBUTTON "帮助",9,167,53,45,14 LTEXT "共享名：",IDC_STATIC,18,10,41,8 --- 422,428 ---- BEGIN EDITTEXT IDC_SHARE_NAME,62,8,163,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,62,23,163,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "确定",IDOK,22,53,45,14 PUSHBUTTON "取消",IDCANCEL,92,53,45,14 PUSHBUTTON "帮助",9,167,53,45,14 LTEXT "共享名：",IDC_STATIC,18,10,41,8 Index: openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc diff -c openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc:1.5 openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc:1.5.2.2 *** openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc:1.5 Thu Apr 1 14:10:30 2004 --- openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc Sun Oct 2 10:49:44 2005 *************** *** 230,236 **** BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "璽兜ヘ",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! PUSHBUTTON "絋﹚",IDOK,36,90,50,14 PUSHBUTTON "",IDCANCEL,106,90,50,14 PUSHBUTTON "弧",9,173,90,50,14 LTEXT "嘿",IDC_STATIC,10,72,27,8 --- 230,236 ---- BS_AUTORADIOBUTTON | WS_GROUP,161,16,54,10 CONTROL "璽兜ヘ",IDC_ADD_NEGATIVE_ENTRY,"Button", BS_AUTORADIOBUTTON,161,26,59,10 ! DEFPUSHBUTTON "絋﹚",IDOK,36,90,50,14 PUSHBUTTON "",IDCANCEL,106,90,50,14 PUSHBUTTON "弧",9,173,90,50,14 LTEXT "嘿",IDC_STATIC,10,72,27,8 *************** *** 324,330 **** CAPTION "狝竟氨ゎ笲" FONT 9, "穝灿砰" BEGIN ! LISTBOX 1029,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "硂ㄇ狝竟ㄌ礛氨ゎ笲",IDC_STATIC,10,7,147,8 DEFPUSHBUTTON "絋﹚",IDOK,82,140,45,15 --- 324,330 ---- CAPTION "狝竟氨ゎ笲" FONT 9, "穝灿砰" BEGIN ! LISTBOX IDC_LIST,10,20,190,110,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL LTEXT "硂ㄇ狝竟ㄌ礛氨ゎ笲",IDC_STATIC,10,7,147,8 DEFPUSHBUTTON "絋﹚",IDOK,82,140,45,15 *************** *** 344,350 **** WS_TABSTOP,20,65,74,10 CONTROL "ぃ璶贝琩狝竟",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,80,10 ! PUSHBUTTON "陪ボ篈",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "Cell",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,90,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL --- 344,350 ---- WS_TABSTOP,20,65,74,10 CONTROL "ぃ璶贝琩狝竟",IDC_DONTPROBESERVERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,24,87,80,10 ! DEFPUSHBUTTON "陪ボ篈",IDC_SHOWSTATUS,10,120,50,14 GROUPBOX "Cell",IDC_STATIC,10,5,160,105,WS_GROUP GROUPBOX "",IDC_STATIC,20,80,90,20,WS_GROUP EDITTEXT IDC_CELL_NAME,30,47,130,12,ES_AUTOHSCROLL *************** *** 360,366 **** LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! PUSHBUTTON "眔癘腹",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "彼斌癘腹",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "闽超",IDCANCEL,145,137,55,14 PUSHBUTTON "弧",9,215,137,55,14 --- 360,366 ---- LISTBOX IDC_TOKEN_LIST,10,18,265,110,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "眔癘腹",ID_GET_TOKENS,15,137,55,14 PUSHBUTTON "彼斌癘腹",ID_DISCARD_TOKENS,80,137,55,14 PUSHBUTTON "闽超",IDCANCEL,145,137,55,14 PUSHBUTTON "弧",9,215,137,55,14 *************** *** 410,416 **** PUSHBUTTON "埃",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "跑",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "杆更",IDC_STATIC,10,10,50,8 ! PUSHBUTTON "絋﹚",IDOK,202,145,45,14 PUSHBUTTON "",IDCANCEL,202,163,45,14 END --- 410,416 ---- PUSHBUTTON "埃",IDC_DELETE,202,39,45,14,WS_DISABLED PUSHBUTTON "跑",IDC_CHANGE,202,58,45,14,WS_DISABLED LTEXT "杆更",IDC_STATIC,10,10,50,8 ! DEfPUSHBUTTON "絋﹚",IDOK,202,145,45,14 PUSHBUTTON "",IDCANCEL,202,163,45,14 END *************** *** 421,427 **** BEGIN EDITTEXT IDC_SHARE_NAME,66,8,147,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,66,23,147,12,ES_AUTOHSCROLL ! PUSHBUTTON "絋﹚",IDOK,22,53,45,14 PUSHBUTTON "",IDCANCEL,92,53,45,14 PUSHBUTTON "弧",9,167,53,45,14 LTEXT "ノ嘿",IDC_STATIC,18,10,49,8 --- 421,427 ---- BEGIN EDITTEXT IDC_SHARE_NAME,66,8,147,12,ES_AUTOHSCROLL EDITTEXT IDC_PATH_NAME,66,23,147,12,ES_AUTOHSCROLL ! DEFPUSHBUTTON "絋﹚",IDOK,22,53,45,14 PUSHBUTTON "",IDCANCEL,92,53,45,14 PUSHBUTTON "弧",9,167,53,45,14 LTEXT "ノ嘿",IDC_STATIC,18,10,49,8 Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm:1.2.2.3 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm:1.2.2.5 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm:1.2.2.3 Mon Sep 26 20:44:35 2005 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm Sun Oct 2 22:32:47 2005 *************** *** 36,54 **** Jeffrey Altman OpenAFS 1.4.0 Jeffrey Altman ! 3 ! 39 2005-09-26T23:55:00Z 2005-09-25T20:12:00Z ! 2005-09-27T00:33:00Z 1 ! 14488 ! 82584 Secure Endpoints Inc. ! 688 ! 193 ! 96879 ! 11.6408 22

3.11. OpenAFS ! Debugging Symbol files

The OpenAFS for Windows installers now include Debugging Symbol files which should be installed if you are experiencing problems and --- 3390,3397 ---- style='mso-element:field-end'>

3.11. OpenAFS Debugging ! Symbol files

The OpenAFS for Windows installers now include Debugging Symbol files which should be installed if you are experiencing problems and *************** *** 3443,3450 **** "fcrypt" mode.

3.14. Authenticated ! Access to the OpenAFS Client Service

OpenAFS 1.4 supports authenticated SMB connections using either NTLM or GSS SPNEGO (NTLM). In --- 3445,3452 ---- "fcrypt" mode.

3.14. ! Authenticated Access to the OpenAFS Client Service

OpenAFS 1.4 supports authenticated SMB connections using either NTLM or GSS SPNEGO (NTLM). In *************** *** 3454,3469 ****

When GSS SPNEGO attempts a Kerberos 5 authentication, the ! Windows SMB client will attempt to retrieve service tickets for ! "cifs/afs@REALM" (if the loopback adapter is in use) or ! "cifs/machine-afs@REALM" (if the loopback adapter is not being ! used). It is extremely important that ! this service principal not exist in the KDC database as the Kerberos ! authentication must fail allowing automatic fallback to NTLM. When NTLM is used a special local ! authentication mode will be used that does not require access to the user's ! password. Instead, Windows will ! internally recognize the request as coming from a local logon session.

3.15. No More INI --- 3456,3470 ----

When GSS SPNEGO attempts a Kerberos 5 authentication, the ! Windows SMB client will attempt to retrieve service tickets for "cifs/afs@REALM" ! (if the loopback adapter is in use) or "cifs/machine-afs@REALM" (if ! the loopback adapter is not being used). ! It is extremely important that this service principal not exist in the ! KDC database as the Kerberos authentication must fail allowing automatic ! fallback to NTLM. When NTLM is used a ! special local authentication mode will be used that does not require access to ! the user's password. Instead, Windows ! will internally recognize the request as coming from a local logon session.

3.15. No More INI *************** *** 3519,3528 ****

Many applications on Windows (e.g. Microsoft Office) require the use of byte range locks applied to a file either to protect against simultaneous file access or as a signaling mechanism.牋 OpenAFS does not currently support byte range ! locks.牋 It is strongly recommended that ! files not be edited within AFS if they might be accessed by multiple users or ! multiple processes on a single machine.

3.19. Automatic --- 3520,3529 ----

Many applications on Windows (e.g. Microsoft Office) require the use of byte range locks applied to a file either to protect against simultaneous file access or as a signaling mechanism.牋 OpenAFS does not currently support byte ! range locks.牋 It is strongly recommended ! that files not be edited within AFS if they might be accessed by multiple users ! or multiple processes on a single machine.

3.19. Automatic *************** *** 3531,3541 ****

OpenAFS 1.4 will automatically forget a user's tokens upon Logoff unless the user's profile was loaded from an AFS volume. In this situation there is no mechanism to ! determine when the profile has been successfully written back to the network. It is therefore unsafe to release the user's ! tokens. Whether or not the profile has ! been loaded from the registry can be determined for Local Accounts, Active ! Directory accounts and NT4 accounts.

If there is a need to disable this functionality, the LogoffPreserveTokens --- 3532,3542 ----

OpenAFS 1.4 will automatically forget a user's tokens upon Logoff unless the user's profile was loaded from an AFS volume. In this situation there is no mechanism to ! determine when the profile has been successfully written back to the ! network. It is therefore unsafe to ! release the user's tokens. Whether or ! not the profile has been loaded from the registry can be determined for Local ! Accounts, Active Directory accounts and NT4 accounts.

If there is a need to disable this functionality, the LogoffPreserveTokens *************** *** 3575,3582 **** 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. --- 3576,3583 ---- 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. *************** *** 3589,3596 ****

"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.

"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.

08/06 206 86 a ring

!

牋 牋[鏬 ! 135 08/07 207 ! 87 c cedilla

牋牋 [闿 136 08/08 21008/06 206 86 a ring

!

牋牋 [鏬 135 ! 08/07 207 87 c ! cedilla

牋牋 [闿 136 08/08 210 92 AE diphthong

牋牋 [鬩 147 09/03 ! 223 93 o circumflex

牋牋 [鯹 148 09/04 224 92 AE diphthong

牋牋 [鬩 147 ! 09/03 223 93 o ! circumflex

牋牋 [鯹 148 09/04 224

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. OpenAFS for Windows does not currently support UNICODE. To avoid this problem --- 3831,3838 ---- 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. OpenAFS for Windows does not currently support UNICODE. To avoid this problem *************** *** 3920,3927 ****

Where: -long牋 print all info

!

牋牋牋 -addrs print only host interfaces

牋牋牋 -cache print only cache --- 3921,3928 ----

Where: -long牋 print all info

!

牋牋牋 ! -addrs print only host interfaces

牋牋牋 -cache print only cache *************** *** 3932,3940 **** 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 Beta 1 or later.

3.34. Initial --- 3933,3941 ---- 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 Beta 1 or later.

3.34. Initial *************** *** 3954,3960 ****

OpenAFS 1.4 reports timestamps on files stored in AFS in UTC all year round. In locales with daylight savings time, previous versions of AFS for Windows reported the time when DST ! is active as UTC+1. This was done to preserve the relative local time for the user. A file stored at 11:00am EST in January would be reported as having been stored at 11:00am EDT in June. --- 3955,3961 ----

OpenAFS 1.4 reports timestamps on files stored in AFS in UTC all year round. In locales with daylight savings time, previous versions of AFS for Windows reported the time when DST ! is active as UTC+1. This was done to preserve the relative local time for the user. A file stored at 11:00am EST in January would be reported as having been stored at 11:00am EDT in June. *************** *** 4021,4028 ****

4. How to Debug ! Problems with OpenAFS for Windows:

OpenAFS for Windows provides a wide range of tools to assist you in debugging problems. The --- 4022,4029 ----

4. How to Debug Problems ! with OpenAFS for Windows:

OpenAFS for Windows provides a wide range of tools to assist you in debugging problems. The *************** *** 4159,4165 **** any one time is 5000. This can be adjusted with the registry value:

!

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

REG_DWORD TraceBufferSize

--- 4160,4167 ---- any one time is 5000. This can be adjusted with the registry value:

!

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

REG_DWORD TraceBufferSize

*************** *** 4179,4187 **** style='mso-spacerun:yes'> When the OpenAFS Client Service starts and Bit 2 of the TraceOption value in the registry is set, all trace log events are output using the Windows Debug ! Monitor interface (OutputDebugString).

!

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

REG_DWORD牋 TraceOption = 0x04

--- 4181,4190 ---- style='mso-spacerun:yes'> When the OpenAFS Client Service starts and Bit 2 of the TraceOption value in the registry is set, all trace log events are output using the Windows Debug ! Monitor interface (OutputDebugString).

!

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

REG_DWORD牋 TraceOption = 0x04

*************** *** 4752,4759 **** list 18.0pt'>2.        ! Select the 'Property' table from the list of ! tables on the left.

2.        ! Select the 'Property' table from the list of tables ! on the left.

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.

--- 4977,4984 ----

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.

*************** *** 4987,4994 ****
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 --- 4990,4996 ----

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 *************** *** 5224,5234 **** 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.

--- 5226,5236 ---- 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.

*************** *** 5359,5377 **** !

It is important to create the new ! feature under the 'feaClient' feature, which will ensure that the configuration file will be installed when the client binaries are installed.

Setting 'Display' to 0 will hide ! this feature from the feature selection dialog during an interactive installation. A value of 30 for 'Level' allows this feature ! to be installed by default (on a 'Typical' installation).

The 'Attributes' value is msidbFeatureAttributesDisallowAdvertise (8), which is set on all features in ! the OpenAFS MSI. The OpenAFS MSI is not designed ! for an advertised installation.

It is important to create the ! new feature under the 'feaClient' feature, which will ensure that the configuration file will be installed when the client binaries are installed.

Setting 'Display' to 0 will hide ! this feature from the feature selection dialog during an interactive ! installation. A value of 30 for 'Level' ! allows this feature to be installed by default (on a 'Typical' installation).

The 'Attributes' value is msidbFeatureAttributesDisallowAdvertise (8), which is set on all features in ! the OpenAFS MSI. The OpenAFS MSI is not ! designed for an advertised installation.

牋牋牋牋牋 牋 (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 being in a separate source --- 5526,5536 ----

牋牋牋牋牋 牋 (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 being in a separate source *************** *** 5592,5599 ****

7.2.3.1 Components for Configuration Files

!

CellServDB: 'cpf_CellServDB' ! (ID {D5BA4C15-DBEC-4292-91FC-B54C30F24F2A})

7.2.4 Adding Domain Specific Registry Keys

--- 5593,5600 ----

7.2.3.1 Components for Configuration Files

!

CellServDB: ! 'cpf_CellServDB' (ID {D5BA4C15-DBEC-4292-91FC-B54C30F24F2A})

7.2.4 Adding Domain Specific Registry Keys

*************** *** 5638,5645 **** !

牋 'Component' ! table:

--- 5639,5645 ---- !

牋 'Component' table:

*************** *** 5660,5667 **** !

牋 'FeatureComponents' ! table:

--- 5660,5667 ---- !

牋 ! 'FeatureComponents' table:

*************** *** 5718,5725 **** 牋牋牋牋牋 Root牋牋牋牋牋牋牋 : 2
牋牋牋牋牋 Key牋牋牋牋牋牋牋牋 : ! 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\ATHENA.MIT.EDU'
牋牋牋牋牋 Name牋牋牋牋牋牋 : '*'
牋牋牋牋牋 Component牋牋牋牋牋 Root牋牋牋牋牋牋牋 : 2
牋牋牋牋牋 Key牋牋牋牋牋牋牋牋 : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\ATHENA.MIT.EDU'
牋牋牋牋牋 Name牋牋牋牋牋牋 : '*'
牋牋牋牋牋 Component牋牋牋牋牋 Root牋牋牋牋牋牋牋 : 2
牋牋牋牋牋 Key牋牋牋牋牋牋牋牋 : 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\ATHENA.MIT.EDU'
牋牋牋牋牋 Name牋牋牋牋牋牋 : 'LogonOptions'
牋牋牋牋牋 Value牋牋牋牋牋 Root牋牋牋牋牋牋牋 : 2
牋牋牋牋牋 Key牋牋牋牋牋牋牋牋 : ! 'SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\ATHENA.MIT.EDU'
牋牋牋牋牋 Name牋牋牋牋牋牋 : 'LogonOptions'
牋牋牋牋牋 Value牋牋牋牋牋 Root牋牋牋牋牋牋牋 : 2
牋牋牋牋牋 Key牋牋牋牋牋牋牋牋 : SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST'
牋牋牋牋牋 Name牋牋牋牋牋牋 : '*'
牋牋牋牋牋 Component牋牋牋牋牋 Root牋牋牋牋牋牋牋 : 2
牋牋牋牋牋 Key牋牋牋牋牋牋牋牋 : ! SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider\Domain\LOCALHOST'
牋牋牋牋牋 Name牋牋牋牋牋牋 : '*'
牋牋牋牋牋 Component !

牋 'Registry' table:

--- 5884,5891 ---- !

牋 'Registry' ! table:

*************** *** 5911,5918 **** 牋牋牋牋牋 Name牋牋牋牋牋牋 : '0'
牋牋牋牋 Value牋 牋牋牋牋牋牋牋牋 : 'athena.mit.edu#athena.mit.edu:root.cell.'
牋牋牋牋牋 Component牋牋 : 'rcm_FreelanceKeys'

--- 5913,5919 ---- 牋牋牋牋牋 Name牋牋牋牋牋牋 : '0'
牋牋牋牋 Value牋牋牋牋牋 牋牋牋牋 : 'athena.mit.edu#athena.mit.edu:root.cell.'
牋牋牋牋牋 Component牋牋 : 'rcm_FreelanceKeys'

*************** *** 6045,6051 **** previous versions of OpenAFS for Windows during installation. Previous versions are installations that used the NSIS (.EXE) installer or an MSI that has a known Upgrade Code and a ! different Product Code. The MSI does not directly upgrade an existing installation. This is intentional and ensures that development releases which do not have strictly increasing version numbers are properly upgraded.

--- 6046,6052 ---- previous versions of OpenAFS for Windows during installation. Previous versions are installations that used the NSIS (.EXE) installer or an MSI that has a known Upgrade Code and a ! different Product Code. The MSI does not directly upgrade an existing installation. This is intentional and ensures that development releases which do not have strictly increasing version numbers are properly upgraded.

*************** *** 6092,6098 ****

7.4.1. OpenAFS MSI Product Codes

!

Release 1.3

7.4.1. OpenAFS MSI Product Codes !

Release 1.3

!

Release 1.4

!

Release 1.5

LAN adapter number to use. This is the lana number of the LAN adapter that ! the SMB server should bind to. If unspecified or set to -1, a LAN adapter with named 'AFS' or a loopback adapter will be selected. If neither are present, then all available adapters will be bound to. Variable: LANadapter

LAN adapter number to use. This is the lana number of the LAN adapter ! that the SMB server should bind to. If unspecified or set to -1, a LAN adapter with named 'AFS' or a loopback adapter will be selected. If neither are present, then all available adapters will be bound to.Type: DWORD
Default: 25 (CM_CONFIGDEFAULT_SVTHREADS)
Variable: numSvThreads

!

Number of SMB server threads (number of threads of ! smb_Server). (see smb_Server in smb.c).

 --- 6256,6263 ----

Type: DWORD
Default: 25 (CM_CONFIGDEFAULT_SVTHREADS)
Variable: numSvThreads

!

Number of SMB server threads (number of threads of smb_Server). ! (see smb_Server in smb.c).

*************** *** 6577,6585 **** Default: 0

Enables logging of debug output to the Windows Event Log.

!

Bit 0 enables logging of "Logon Events" processed ! by the Network Provider and Winlogon Event Notification Handler.

Bit 1 enables logging of events captured by the AFS Client Service.

Bit 2 enables real-time viewing of "fs trace" --- 6578,6586 ---- Default: 0

Enables logging of debug output to the Windows Event Log.

!

Bit 0 enables logging of "Logon Events" ! processed by the Network Provider and Winlogon Event Notification ! Handler.

Bit 1 enables logging of events captured by the AFS Client Service.

Bit 2 enables real-time viewing of "fs trace" *************** *** 6655,6661 **** 0, it means the file should be allowed to grow indefinitely.

! ! + + + + + +
Value: FlushOnHibernate
--- 6656,6662 ---- 0, it means the file should be allowed to grow indefinitely.
Value: FlushOnHibernate
*************** *** 6665,6670 **** --- 6666,6694 ---- hibernate or stand-by.
+
Value: RxEnablePeerStats
+

Type: REG_DWORD
+ Default: 0x0

+

This value will enable the gathering of RX Statistics + for connections with the Cache Manager抯 Peers. This functionality can be adjusted at + runtime with the 揻s rxstatpeer command.

+
+
Value: RxEnableProcessStats
+

Type: REG_DWORD
+ Default: 0x0

+

This value will enable the gathering of RX Statistics + for the Cache Manager抯 Process. This + functionality can be adjusted at runtime with the 揻s rxstatproc command.

+

Regkey:
*************** *** 7092,7098 ****

Example:

!

HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider

|

--- 7116,7123 ----

Example:

!

HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider

|

*************** *** 7131,7147 **** LogonOptions

Type: DWORD
Default: 0x01

!

NSIS/WiX: depends on user ! configuration

0x00 - Integrated Logon is not used
0x01 - Integrated Logon is used
0x02 - High Security Mode is used (deprecated)
0x03 - Integrated Logon with High Security Mode is used (deprecated)

!

High Security Mode generates ! random SMB names for the creation of Drive Mappings. This mode should not be used without ! Integrated Logon.

As of 1.3.65 the SMB server supports SMB authentication. The High Security Mode should not be used when using SMB authentication (SMBAuthType --- 7156,7170 ---- LogonOptions

Type: DWORD
Default: 0x01

!

NSIS/WiX: depends on user configuration

0x00 - Integrated Logon is not used
0x01 - Integrated Logon is used
0x02 - High Security Mode is used (deprecated)
0x03 - Integrated Logon with High Security Mode is used (deprecated)

!

High Security Mode generates random ! SMB names for the creation of Drive Mappings. ! This mode should not be used without Integrated Logon.

As of 1.3.65 the SMB server supports SMB authentication. The High Security Mode should not be used when using SMB authentication (SMBAuthType *************** *** 7226,7233 **** l15 level1 lfo36;tab-stops:list 36.0pt'>1.      ! NP key. ! ("HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider")

1.      ! NP key. ("HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider")

Type: REG_SZ
Default: <none>
Variable: IsServiceConfigured()

!

The value Cell is used to determine if the AFS Client Service ! has been properly configured or not.

--- 7333,7340 ----

Type: REG_SZ
Default: <none>
Variable: IsServiceConfigured()

!

The value Cell is used to determine if the AFS Client ! Service has been properly configured or not.

*************** *** 7331,7338 ****

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

!

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

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

--- 7353,7360 ----

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

!

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

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

*************** *** 7379,7386 ****

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

!

This value specifies the command line options which should ! be set as part of the shortcut to afscreds.exe. afscreds.exe rewrites the shortcut each time it exits so as to ensure that the shortcut points to the latest version of the program. This value is used to --- 7401,7408 ----

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

!

This value specifies the command line options which ! should be set as part of the shortcut to afscreds.exe. afscreds.exe rewrites the shortcut each time it exits so as to ensure that the shortcut points to the latest version of the program. This value is used to *************** *** 7437,7445 ****

Type: DWORD {0, 1}
Default: <none>
Function: LoadRemind(), SaveRemind()

!

These values are used to save ! and restore the state of the reminder flag for each cell for which the user ! has obtained tokens.

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

--- 7459,7467 ----

Type: DWORD {0, 1}
Default: <none>
Function: LoadRemind(), SaveRemind()

!

These values are used to save and ! restore the state of the reminder flag for each cell for which the user has ! obtained tokens.

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

*************** *** 7460,7467 **** drive letter"

Type: DWORD {0, 1}
Default: <none>

!

These values are used to store the ! persistence state of the AFS drive mappings as listed in the [...\Client\Mappings] key.

These values used to be stored in the afsdsbmt.ini file

--- 7482,7489 ---- drive letter"

Type: DWORD {0, 1}
Default: <none>

!

These values are used to store ! the persistence state of the AFS drive mappings as listed in the [...\Client\Mappings] key.

These values used to be stored in the afsdsbmt.ini file

*************** *** 7485,7492 **** Default: <none>

These values are used to store the AFS path in UNIX notation to which the drive letter is to be mapped.

!

These values used to be stored ! in the afsdsbmt.ini file.

--- 7507,7514 ---- Default: <none>

These values are used to store the AFS path in UNIX notation to which the drive letter is to be mapped.

!

These values used to be stored in ! the afsdsbmt.ini file.

Index: openafs/src/afs/SOLARIS/osi_vnodeops.c diff -c openafs/src/afs/SOLARIS/osi_vnodeops.c:1.20.2.2 openafs/src/afs/SOLARIS/osi_vnodeops.c:1.20.2.3 *** openafs/src/afs/SOLARIS/osi_vnodeops.c:1.20.2.2 Sun Apr 3 14:15:39 2005 --- openafs/src/afs/SOLARIS/osi_vnodeops.c Thu Sep 29 16:35:45 2005 *************** *** 11,17 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/SOLARIS/osi_vnodeops.c,v 1.20.2.2 2005/04/03 18:15:39 shadow Exp $"); /* * SOLARIS/osi_vnodeops.c --- 11,17 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/SOLARIS/osi_vnodeops.c,v 1.20.2.3 2005/09/29 20:35:45 shadow Exp $"); /* * SOLARIS/osi_vnodeops.c *************** *** 266,272 **** register struct dcache *tdc; int i, s, pexists; int slot; ! afs_size_t offset, nlen; struct vrequest treq; afs_int32 mapForRead = 0, Code = 0; u_offset_t toffset; --- 266,272 ---- register struct dcache *tdc; int i, s, pexists; int slot; ! afs_size_t offset = 0, nlen; struct vrequest treq; afs_int32 mapForRead = 0, Code = 0; u_offset_t toffset; Index: openafs/src/afs/VNOPS/afs_vnop_readdir.c diff -c openafs/src/afs/VNOPS/afs_vnop_readdir.c:1.24.2.5 openafs/src/afs/VNOPS/afs_vnop_readdir.c:1.24.2.6 *** openafs/src/afs/VNOPS/afs_vnop_readdir.c:1.24.2.5 Sun Apr 3 14:15:39 2005 --- openafs/src/afs/VNOPS/afs_vnop_readdir.c Sun Oct 2 22:46:32 2005 *************** *** 23,29 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_readdir.c,v 1.24.2.5 2005/04/03 18:15:39 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 23,29 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_readdir.c,v 1.24.2.6 2005/10/03 02:46:32 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 580,587 **** #if defined(AFS_SGI53_ENV) afs_int32 use64BitDirent, dirsiz; #endif /* defined(AFS_SGI53_ENV) */ OSI_VC_CONVERT(avc); ! #ifdef AFS_HPUX_ENV /* * XXX All the hacks for alloced sdirEntry and inlining of afs_readdir_move instead of calling * it is necessary for hpux due to stack problems that seem to occur when coming thru the nfs --- 580,588 ---- #if defined(AFS_SGI53_ENV) afs_int32 use64BitDirent, dirsiz; #endif /* defined(AFS_SGI53_ENV) */ + #ifndef AFS_HPUX_ENV OSI_VC_CONVERT(avc); ! #else /* * XXX All the hacks for alloced sdirEntry and inlining of afs_readdir_move instead of calling * it is necessary for hpux due to stack problems that seem to occur when coming thru the nfs Index: openafs/src/afs/VNOPS/afs_vnop_write.c diff -c openafs/src/afs/VNOPS/afs_vnop_write.c:1.36.2.5 openafs/src/afs/VNOPS/afs_vnop_write.c:1.36.2.6 *** openafs/src/afs/VNOPS/afs_vnop_write.c:1.36.2.5 Sun Apr 24 16:11:15 2005 --- openafs/src/afs/VNOPS/afs_vnop_write.c Sun Oct 2 22:55:33 2005 *************** *** 21,27 **** #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_write.c,v 1.36.2.5 2005/04/24 20:11:15 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ --- 21,27 ---- #include "afs/param.h" RCSID ! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_write.c,v 1.36.2.6 2005/10/03 02:55:33 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ *************** *** 186,197 **** avc->states |= CDirty; tvec = (struct iovec *)osi_AllocSmallSpace(sizeof(struct iovec)); while (totalLength > 0) { ! /* Read the cached info. If we call GetDCache while the cache ! * truncate daemon is running we risk overflowing the disk cache. ! * Instead we check for an existing cache slot. If we cannot ! * find an existing slot we wait for the cache to drain ! * before calling GetDCache. */ if (noLock) { tdc = afs_FindDCache(avc, filePos); if (tdc) --- 186,198 ---- avc->states |= CDirty; tvec = (struct iovec *)osi_AllocSmallSpace(sizeof(struct iovec)); while (totalLength > 0) { ! /* ! * The following line is necessary because afs_GetDCache with ! * flag == 4 expects the length field to be filled. It decides ! * from this whether it's necessary to fetch data into the chunk ! * before writing or not (when the whole chunk is overwritten!). */ + len = totalLength; /* write this amount by default */ if (noLock) { tdc = afs_FindDCache(avc, filePos); if (tdc) Index: openafs/src/afsd/afs.conf.linux diff -c openafs/src/afsd/afs.conf.linux:1.7.8.1 openafs/src/afsd/afs.conf.linux:1.7.8.2 *** openafs/src/afsd/afs.conf.linux:1.7.8.1 Fri Dec 17 10:13:40 2004 --- openafs/src/afsd/afs.conf.linux Sun Oct 2 23:14:31 2005 *************** *** 79,84 **** --- 79,88 ---- OPTIONS=AUTOMATIC #OPTIONS=$SMALL + # force startup script to wait for salvage to finish before proceeding + # with machine boot + WAIT_FOR_SALVAGE=no + # you should never need to change these settings AFSDIR=/afs CACHEDIR=/usr/vice/cache Index: openafs/src/afsd/afs.rc.linux diff -c openafs/src/afsd/afs.rc.linux:1.9.2.2 openafs/src/afsd/afs.rc.linux:1.9.2.3 *** openafs/src/afsd/afs.rc.linux:1.9.2.2 Sun Mar 20 10:02:30 2005 --- openafs/src/afsd/afs.rc.linux Sun Oct 2 23:14:31 2005 *************** *** 282,287 **** --- 282,295 ---- if is_on $AFS_SERVER && test -x /usr/afs/bin/bosserver ; then /usr/afs/bin/bosserver test "$afs_rh" && touch /var/lock/subsys/afs + if is_on $WAIT_FOR_SALVAGE; then + # wait for fileserver to finish salvaging + sleep 10 + while /usr/bin/bos status localhost fs 2>&1 | grep 'Auxiliary.*salvaging'; do + echo "Waiting for salvager to finish..... " + sleep 10 + done + fi fi # Start AFS client Index: openafs/src/config/NTMakefile.amd64_w2k diff -c openafs/src/config/NTMakefile.amd64_w2k:1.1.2.19 openafs/src/config/NTMakefile.amd64_w2k:1.1.2.20 *** openafs/src/config/NTMakefile.amd64_w2k:1.1.2.19 Mon Sep 26 19:34:46 2005 --- openafs/src/config/NTMakefile.amd64_w2k Sun Oct 2 20:15:24 2005 *************** *** 80,86 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0004 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID --- 80,86 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0005 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID Index: openafs/src/config/NTMakefile.i386_nt40 diff -c openafs/src/config/NTMakefile.i386_nt40:1.46.2.34 openafs/src/config/NTMakefile.i386_nt40:1.46.2.35 *** openafs/src/config/NTMakefile.i386_nt40:1.46.2.34 Mon Sep 26 19:34:46 2005 --- openafs/src/config/NTMakefile.i386_nt40 Sun Oct 2 20:15:24 2005 *************** *** 80,86 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0004 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID --- 80,86 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0005 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID Index: openafs/src/config/NTMakefile.i386_w2k diff -c openafs/src/config/NTMakefile.i386_w2k:1.1.2.20 openafs/src/config/NTMakefile.i386_w2k:1.1.2.21 *** openafs/src/config/NTMakefile.i386_w2k:1.1.2.20 Mon Sep 26 19:34:46 2005 --- openafs/src/config/NTMakefile.i386_w2k Sun Oct 2 20:15:24 2005 *************** *** 79,85 **** #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0004 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID --- 79,85 ---- #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MINOR=4 ! AFSPRODUCT_VER_PATCH=0005 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID Index: openafs/src/libafsrpc/afsrpc.def diff -c openafs/src/libafsrpc/afsrpc.def:1.3.2.5 openafs/src/libafsrpc/afsrpc.def:1.3.2.6 *** openafs/src/libafsrpc/afsrpc.def:1.3.2.5 Mon Jul 11 15:08:48 2005 --- openafs/src/libafsrpc/afsrpc.def Sun Oct 2 01:52:54 2005 *************** *** 215,219 **** rx_StartClientThread @220 rxkad_global_stats_lock @221 DATA rxkad_stats_key @222 DATA ! --- 215,225 ---- rx_StartClientThread @220 rxkad_global_stats_lock @221 DATA rxkad_stats_key @222 DATA ! rx_enableProcessRPCStats @223 ! rx_disableProcessRPCStats @224 ! rx_clearProcessRPCStats @225 ! rx_enablePeerRPCStats @226 ! rx_disablePeerRPCStats @227 ! rx_clearPeerRPCStats @228 ! Index: openafs/src/packaging/MacOS/OpenAFS.info diff -c openafs/src/packaging/MacOS/OpenAFS.info:1.1.4.19 openafs/src/packaging/MacOS/OpenAFS.info:1.1.4.20 *** openafs/src/packaging/MacOS/OpenAFS.info:1.1.4.19 Mon Sep 26 00:07:57 2005 --- openafs/src/packaging/MacOS/OpenAFS.info Mon Oct 3 12:17:51 2005 *************** *** 1,5 **** Title OpenAFS ! Version 1.4.0-rc5 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) --- 1,5 ---- Title OpenAFS ! Version 1.4.0-rc6 Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information. DefaultLocation / Diskname (null) Index: openafs/src/vfsck/dir.c diff -c openafs/src/vfsck/dir.c:1.5 openafs/src/vfsck/dir.c:1.5.2.1 *** openafs/src/vfsck/dir.c:1.5 Tue Jul 15 19:17:26 2003 --- openafs/src/vfsck/dir.c Sun Oct 2 22:46:33 2005 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/dir.c,v 1.5 2003/07/15 23:17:26 shadow Exp $"); #define VICE /* allow us to put our changes in at will */ #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/dir.c,v 1.5.2.1 2005/10/03 02:46:33 shadow Exp $"); #define VICE /* allow us to put our changes in at will */ #include *************** *** 64,70 **** --- 64,74 ---- #include #include #define DIRSIZ_MACRO + #ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H + #include + #else #include + #endif #else #define KERNEL #include Index: openafs/src/vfsck/inode.c diff -c openafs/src/vfsck/inode.c:1.5 openafs/src/vfsck/inode.c:1.5.2.1 *** openafs/src/vfsck/inode.c:1.5 Tue Jul 15 19:17:27 2003 --- openafs/src/vfsck/inode.c Sun Oct 2 22:46:33 2005 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/inode.c,v 1.5 2003/07/15 23:17:27 shadow Exp $"); #define VICE /* control whether AFS changes are present */ #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/inode.c,v 1.5.2.1 2005/10/03 02:46:33 shadow Exp $"); #define VICE /* control whether AFS changes are present */ #include *************** *** 62,68 **** --- 62,72 ---- #include #include #define DIRSIZ_MACRO + #ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H + #include + #else #include + #endif #else #include #endif Index: openafs/src/vfsck/main.c diff -c openafs/src/vfsck/main.c:1.8.2.1 openafs/src/vfsck/main.c:1.8.2.2 *** openafs/src/vfsck/main.c:1.8.2.1 Sun Apr 3 14:15:54 2005 --- openafs/src/vfsck/main.c Sun Oct 2 22:46:33 2005 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/main.c,v 1.8.2.1 2005/04/03 18:15:54 shadow Exp $"); #define VICE /* allow us to put our changes in at will */ #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/main.c,v 1.8.2.2 2005/10/03 02:46:33 shadow Exp $"); #define VICE /* allow us to put our changes in at will */ #include *************** *** 70,76 **** --- 70,80 ---- #include #include #define DIRSIZ_MACRO + #ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H + #include + #else #include + #endif #else #define KERNEL #include Index: openafs/src/vfsck/pass2.c diff -c openafs/src/vfsck/pass2.c:1.5.2.1 openafs/src/vfsck/pass2.c:1.5.2.2 *** openafs/src/vfsck/pass2.c:1.5.2.1 Sun Apr 3 14:15:54 2005 --- openafs/src/vfsck/pass2.c Sun Oct 2 22:46:33 2005 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/pass2.c,v 1.5.2.1 2005/04/03 18:15:54 shadow Exp $"); #define VICE #include --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/pass2.c,v 1.5.2.2 2005/10/03 02:46:33 shadow Exp $"); #define VICE #include *************** *** 60,66 **** --- 60,70 ---- #include #include #define DIRSIZ_MACRO + #ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H + #include + #else #include + #endif #else #include #endif Index: openafs/src/vfsck/utilities.c diff -c openafs/src/vfsck/utilities.c:1.5.2.2 openafs/src/vfsck/utilities.c:1.5.2.3 *** openafs/src/vfsck/utilities.c:1.5.2.2 Sun Apr 3 14:15:54 2005 --- openafs/src/vfsck/utilities.c Sun Oct 2 22:46:33 2005 *************** *** 19,25 **** #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/utilities.c,v 1.5.2.2 2005/04/03 18:15:54 shadow Exp $"); #include #define VICE /* allow us to put our changes in at will */ --- 19,25 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/utilities.c,v 1.5.2.3 2005/10/03 02:46:33 shadow Exp $"); #include #define VICE /* allow us to put our changes in at will */ *************** *** 62,68 **** --- 62,72 ---- #include #include #define DIRSIZ_MACRO + #ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H + #include + #else #include + #endif #else #include #endif Index: openafs/src/vfsck/vprintf.c diff -c openafs/src/vfsck/vprintf.c:1.5 openafs/src/vfsck/vprintf.c:1.5.2.1 *** openafs/src/vfsck/vprintf.c:1.5 Tue Jul 15 19:17:27 2003 --- openafs/src/vfsck/vprintf.c Sun Oct 2 22:46:33 2005 *************** *** 14,20 **** #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/vprintf.c,v 1.5 2003/07/15 23:17:27 shadow Exp $"); #define VICE /* allow us to put our changes in at will */ #include --- 14,20 ---- #include RCSID ! ("$Header: /cvs/openafs/src/vfsck/vprintf.c,v 1.5.2.1 2005/10/03 02:46:33 shadow Exp $"); #define VICE /* allow us to put our changes in at will */ #include *************** *** 71,77 **** --- 71,81 ---- #include #include #define DIRSIZ_MACRO + #ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H + #include + #else #include + #endif #else #define KERNEL #include