Index: openafs/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc diff -c openafs/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc:1.2 openafs/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc:1.2 Sat Nov 4 05:01:10 2000 --- openafs/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc Tue Jul 1 20:33:28 2003 *************** *** 16,21 **** --- 16,24 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Setup Utilities DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:11 2000 --- openafs/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc Tue Jul 1 20:33:31 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Setup Utilities DLL" + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" + #define AFS_VERINFO_CHARSET 1252 + #define AFS_VERINFO_LANG_CODE 0x407 #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:11 2000 --- openafs/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc Tue Jul 1 20:33:31 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Setup Utilities DLL" + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" + #define AFS_VERINFO_CHARSET 1252 + #define AFS_VERINFO_LANG_CODE 0x409 #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:11 2000 --- openafs/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc Tue Jul 1 20:33:32 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Setup Utilities DLL" + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" + #define AFS_VERINFO_CHARSET 1252 + #define AFS_VERINFO_LANG_CODE 0x40a #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:11 2000 --- openafs/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc Tue Jul 1 20:33:32 2003 *************** *** 16,21 **** --- 16,25 ---- // #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_CHARSET 932 + #define AFS_VERINFO_LANG_CODE 0x411 #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:12 2000 --- openafs/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc Tue Jul 1 20:33:33 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Setup Utilities DLL" + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" + #define AFS_VERINFO_CHARSET 949 + #define AFS_VERINFO_LANG_CODE 0x412 #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:12 2000 --- openafs/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc Tue Jul 1 20:33:34 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "DLL dos Utilit疵ios de Configura鈬o do AFS" + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" + #define AFS_VERINFO_CHARSET 1252 + #define AFS_VERINFO_LANG_CODE 0x416 #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc:1.2 Sat Nov 4 05:01:12 2000 --- openafs/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc Tue Jul 1 20:33:34 2003 *************** *** 16,21 **** --- 16,25 ---- // #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" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc diff -c openafs/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc:1.2 openafs/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc:1.2 Sat Nov 4 05:01:12 2000 --- openafs/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc Tue Jul 1 20:33:35 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Setup Utilities DLL" + #define AFS_VERINFO_NAME "afs_setup_utils" + #define AFS_VERINFO_FILENAME "afs_setup_utils.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsadmsvr/afsadmsvr.rc diff -c openafs/src/WINNT/afsadmsvr/afsadmsvr.rc:1.2 openafs/src/WINNT/afsadmsvr/afsadmsvr.rc:1.2.8.1 *** openafs/src/WINNT/afsadmsvr/afsadmsvr.rc:1.2 Sat Nov 4 05:01:17 2000 --- openafs/src/WINNT/afsadmsvr/afsadmsvr.rc Tue Jul 1 20:33:35 2003 *************** *** 17,22 **** --- 17,24 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Administration Server" + #define AFS_VERINFO_NAME "afsadmsvr" + #define AFS_VERINFO_FILENAME "afsadmsvr.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/afsapplib_stub.rc diff -c openafs/src/WINNT/afsapplib/afsapplib_stub.rc:1.2 openafs/src/WINNT/afsapplib/afsapplib_stub.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/afsapplib_stub.rc:1.2 Sat Nov 4 05:01:18 2000 --- openafs/src/WINNT/afsapplib/afsapplib_stub.rc Tue Jul 1 20:33:36 2003 *************** *** 9,14 **** --- 9,17 ---- #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Application Base DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc:1.2 Sat Nov 4 05:01:25 2000 --- openafs/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc Tue Jul 1 20:33:37 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Application Base DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/en_US/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/en_US/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/en_US/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/en_US/afsapplib.rc:1.2 Sat Nov 4 05:01:25 2000 --- openafs/src/WINNT/afsapplib/lang/en_US/afsapplib.rc Tue Jul 1 20:33:37 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Application Base DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc:1.2 Sat Nov 4 05:01:25 2000 --- openafs/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc Tue Jul 1 20:33:38 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Application Base DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc:1.2 Sat Nov 4 05:01:26 2000 --- openafs/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc Tue Jul 1 20:33:38 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS アプリケーション・ベース DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc:1.2 Sat Nov 4 05:01:26 2000 --- openafs/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc Tue Jul 1 20:33:39 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ﾀﾀｿﾇﾁｷﾎｱﾗｷ･ ｱ篌ｻ DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc:1.2 Sat Nov 4 05:01:27 2000 --- openafs/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc Tue Jul 1 20:33:39 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "DLL Base da Aplica鈬o AFS" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc:1.2 Sat Nov 4 05:01:28 2000 --- openafs/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc Tue Jul 1 20:33:40 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ﾓｦﾓﾃｳﾌﾐｻｱｾｶｯﾌｬﾁｴｽﾓｿ" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc diff -c openafs/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc:1.2 openafs/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc:1.2.8.1 *** openafs/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc:1.2 Sat Nov 4 05:01:28 2000 --- openafs/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc Tue Jul 1 20:33:40 2003 *************** *** 18,23 **** --- 18,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Application Base DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsapplib" + #define AFS_VERINFO_FILENAME "afsapplib.dll" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsd/NTMakefile diff -c openafs/src/WINNT/afsd/NTMakefile:1.4.4.3 openafs/src/WINNT/afsd/NTMakefile:1.4.4.4 *** openafs/src/WINNT/afsd/NTMakefile:1.4.4.3 Sun Jan 20 04:09:11 2002 --- openafs/src/WINNT/afsd/NTMakefile Wed May 28 14:36:05 2003 *************** *** 62,67 **** --- 62,68 ---- cm_vnodeops.obj \ cm_dir.obj \ cm_utils.obj \ + largeintdotnet.obj \ smb.obj \ smb3.obj \ smb_ioctl.obj \ Index: openafs/src/WINNT/afsd/afsd.rc diff -c openafs/src/WINNT/afsd/afsd.rc:1.2 openafs/src/WINNT/afsd/afsd.rc:1.2.8.1 *** openafs/src/WINNT/afsd/afsd.rc:1.2 Sat Nov 4 05:01:35 2000 --- openafs/src/WINNT/afsd/afsd.rc Tue Jul 1 20:33:42 2003 *************** *** 19,21 **** --- 19,29 ---- END AFSDIcon ICON afsd.ico + /* Define VERSIONINFO resource */ + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Driver Application" + #define AFS_VERINFO_NAME "afsd" + #define AFS_VERINFO_FILENAME "afsd.exe" + + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/afsd_init.c diff -c openafs/src/WINNT/afsd/afsd_init.c:1.4.4.1 openafs/src/WINNT/afsd/afsd_init.c:1.4.4.2 *** openafs/src/WINNT/afsd/afsd_init.c:1.4.4.1 Sat Oct 13 00:19:06 2001 --- openafs/src/WINNT/afsd/afsd_init.c Fri Jun 6 17:12:09 2003 *************** *** 416,422 **** --- 416,425 ---- } else { cm_dnsEnabled = 1; /* default on */ + afsi_log("Default to use DNS to find AFS cell servers"); } + #else /* AFS_AFSDB_ENV */ + afsi_log("AFS not built with DNS support to find AFS cell servers"); #endif /* AFS_AFSDB_ENV */ #ifdef AFS_FREELANCE_CLIENT Index: openafs/src/WINNT/afsd/afsd_service.c diff -c openafs/src/WINNT/afsd/afsd_service.c:1.3.4.2 openafs/src/WINNT/afsd/afsd_service.c:1.3.4.5 *** openafs/src/WINNT/afsd/afsd_service.c:1.3.4.2 Sun Jan 20 04:09:11 2002 --- openafs/src/WINNT/afsd/afsd_service.c Tue Jul 1 15:44:12 2003 *************** *** 20,29 **** #include #include ! ! #ifdef DEBUG ! //#define NOTSERVICE ! #endif extern void afsi_log(char *pattern, ...); --- 20,29 ---- #include #include ! ! #ifdef DEBUG ! //#define NOTSERVICE ! #endif extern void afsi_log(char *pattern, ...); *************** *** 137,145 **** } } ! #if 0 /* This code was moved to Drivemap.cpp*/ /* Mount a drive into AFS if the user wants us to */ void CheckMountDrive() { char szAfsPath[_MAX_PATH]; --- 137,146 ---- } } ! #if 1 /* This code was moved to Drivemap.cpp*/ /* Mount a drive into AFS if the user wants us to */ + /* DEE Could check first if we are run as SYSTEM */ void CheckMountDrive() { char szAfsPath[_MAX_PATH]; *************** *** 171,179 **** --- 172,198 ---- } } + #if 0 sprintf(szAfsPath, "\\Device\\LanmanRedirector\\%s\\%s-AFS\\%s", szDriveToMapTo, cm_HostName, szSubMount); dwResult = DefineDosDevice(DDD_RAW_TARGET_PATH, szDriveToMapTo, szAfsPath); + #else + { + NETRESOURCE nr; + memset (&nr, 0x00, sizeof(NETRESOURCE)); + + sprintf(szAfsPath,"\\\\%s-AFS\\%s",cm_HostName,szSubMount); + + nr.dwScope = RESOURCE_GLOBALNET; + nr.dwType=RESOURCETYPE_DISK; + nr.lpLocalName=szDriveToMapTo; + nr.lpRemoteName=szAfsPath; + nr.dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; + nr.dwUsage = RESOURCEUSAGE_CONNECTABLE; + + dwResult = WNetAddConnection2(&nr,NULL,NULL,FALSE); + } + #endif afsi_log("GlobalAutoMap of %s to %s %s", szDriveToMapTo, szSubMount, dwResult ? "succeeded" : "failed"); } *************** *** 194,200 **** WaitToTerminate = CreateEvent(NULL, TRUE, FALSE, NULL); ! #ifndef NOTSERVICE StatusHandle = RegisterServiceCtrlHandler(AFS_DAEMON_SERVICE_NAME, (LPHANDLER_FUNCTION) afsd_ServiceControlHandler); --- 213,219 ---- WaitToTerminate = CreateEvent(NULL, TRUE, FALSE, NULL); ! #ifndef NOTSERVICE StatusHandle = RegisterServiceCtrlHandler(AFS_DAEMON_SERVICE_NAME, (LPHANDLER_FUNCTION) afsd_ServiceControlHandler); *************** *** 251,257 **** } /* Check if we should mount a drive into AFS */ ! /* CheckMountDrive();*/ WaitForSingleObject(WaitToTerminate, INFINITE); --- 270,276 ---- } /* Check if we should mount a drive into AFS */ ! CheckMountDrive(); WaitForSingleObject(WaitToTerminate, INFINITE); *************** *** 281,287 **** return ; } #else ! void _CRTAPI1 main() { LONG status = ERROR_SUCCESS; SERVICE_TABLE_ENTRY dispatchTable[] = { --- 300,311 ---- return ; } #else ! ! #ifdef _CRTAPI1 ! void _CRTAPI1 main(void) ! #else ! void main() ! #endif { LONG status = ERROR_SUCCESS; SERVICE_TABLE_ENTRY dispatchTable[] = { Index: openafs/src/WINNT/afsd/afsd_service.rc diff -c openafs/src/WINNT/afsd/afsd_service.rc:1.2 openafs/src/WINNT/afsd/afsd_service.rc:1.2.8.1 *** openafs/src/WINNT/afsd/afsd_service.rc:1.2 Sat Nov 4 05:01:35 2000 --- openafs/src/WINNT/afsd/afsd_service.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Daemon" + #define AFS_VERINFO_NAME "afsd_service" + #define AFS_VERINFO_FILENAME "afsd_service.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/afslog95.rc diff -c openafs/src/WINNT/afsd/afslog95.rc:1.2 openafs/src/WINNT/afsd/afslog95.rc:1.2.8.1 *** openafs/src/WINNT/afsd/afslog95.rc:1.2 Sat Nov 4 05:01:35 2000 --- openafs/src/WINNT/afsd/afslog95.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Integrated Logon 95 DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afslog95" + #define AFS_VERINFO_FILENAME "afslog95.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/afslogon.c diff -c openafs/src/WINNT/afsd/afslogon.c:1.2.8.2 openafs/src/WINNT/afsd/afslogon.c:1.2.8.3 *** openafs/src/WINNT/afsd/afslogon.c:1.2.8.2 Sun Jan 20 04:09:11 2002 --- openafs/src/WINNT/afsd/afslogon.c Fri Jun 6 17:12:09 2003 *************** *** 320,325 **** --- 320,326 ---- LPWSTR *lpLogonScript) { char uname[256]; + char *ctemp; char password[256]; char cell[256]; MSV1_0_INTERACTIVE_LOGON *IL; *************** *** 347,352 **** --- 348,357 ---- wcstombs(uname, IL->UserName.Buffer, 256); wcstombs(password, IL->Password.Buffer, 256); + /* Make sure AD-DOMANS sent from login that is sent to us is striped */ + ctemp = strchr(uname, '@'); + if (ctemp) *ctemp = 0; + (void) RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CLIENT_PARMS_KEY, 0, KEY_QUERY_VALUE, &NPKey); LSPsize=sizeof(TraceOption); *************** *** 435,440 **** --- 440,446 ---- * mode or the failSilently flag is set, otherwise let the * user know we failed and give them a chance to try again. */ if (retryInterval <= 0) { + reason = "AFS not running"; if (!interactive || failSilently) break; flag = MessageBox(hwndOwner, Index: openafs/src/WINNT/afsd/afslogon.rc diff -c openafs/src/WINNT/afsd/afslogon.rc:1.2 openafs/src/WINNT/afsd/afslogon.rc:1.2.8.1 *** openafs/src/WINNT/afsd/afslogon.rc:1.2 Sat Nov 4 05:01:35 2000 --- openafs/src/WINNT/afsd/afslogon.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Integrated Logon DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afslogon" + #define AFS_VERINFO_FILENAME "afslogon.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/afsshare.rc diff -c openafs/src/WINNT/afsd/afsshare.rc:1.2 openafs/src/WINNT/afsd/afsshare.rc:1.2.8.1 *** openafs/src/WINNT/afsd/afsshare.rc:1.2 Sat Nov 4 05:01:36 2000 --- openafs/src/WINNT/afsd/afsshare.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Submount Command" + #define AFS_VERINFO_NAME "afsshare" + #define AFS_VERINFO_FILENAME "afsshare.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/cm.h diff -c openafs/src/WINNT/afsd/cm.h:1.3 openafs/src/WINNT/afsd/cm.h:1.3.4.1 *** openafs/src/WINNT/afsd/cm.h:1.3 Mon Apr 30 02:48:02 2001 --- openafs/src/WINNT/afsd/cm.h Tue Jul 1 15:51:15 2003 *************** *** 245,249 **** --- 245,250 ---- #define CM_ERROR_BADNTFILENAME (CM_ERROR_BASE+37) #define CM_ERROR_BUFFERTOOSMALL (CM_ERROR_BASE+38) #define CM_ERROR_RENAME_IDENTICAL (CM_ERROR_BASE+39) + #define CM_ERROR_ALLOFFLINE (CM_ERROR_BASE+40) #endif /* __CM_H_ENV__ */ Index: openafs/src/WINNT/afsd/cm_conn.c diff -c openafs/src/WINNT/afsd/cm_conn.c:1.4.4.2 openafs/src/WINNT/afsd/cm_conn.c:1.4.4.3 *** openafs/src/WINNT/afsd/cm_conn.c:1.4.4.2 Fri Mar 14 14:49:00 2003 --- openafs/src/WINNT/afsd/cm_conn.c Tue Jul 1 15:51:15 2003 *************** *** 134,139 **** --- 134,148 ---- if (reqp->flags & CM_REQ_NORETRY) goto out; + /* if all servers are offline, mark them non-busy and start over */ + if (errorCode == CM_ERROR_ALLOFFLINE) { + osi_Log0(afsd_logp, "cm_Analyze passed CM_ERROR_ALLOFFLINE."); + thrd_Sleep(5000); + /* cm_ForceUpdateVolume marks all servers as non_busy */ + cm_ForceUpdateVolume(fidp, userp, reqp); + retry = 1; + } + /* if all servers are busy, mark them non-busy and start over */ if (errorCode == CM_ERROR_ALLBUSY) { cm_GetServerList(fidp, userp, reqp, &serversp); *************** *** 164,186 **** long oldSum, newSum; int same; ! /* Back off to allow move to complete */ ! thrd_Sleep(2000); ! /* Update the volume location and see if it changed */ cm_GetServerList(fidp, userp, reqp, &serversp); - oldSum = cm_ChecksumServerList(serversp); - cm_ForceUpdateVolume(fidp, userp, reqp); - cm_GetServerList(fidp, userp, reqp, &serversp); - newSum = cm_ChecksumServerList(serversp); - same = (oldSum == newSum); - /* mark servers as appropriate */ for (tsrp = serversp; tsrp; tsrp=tsrp->next) { if (tsrp->server == serverp) tsrp->status = offline; - else if (!same) - tsrp->status = not_busy; } retry = 1; } --- 173,209 ---- long oldSum, newSum; int same; ! /* Log server being offline for this volume */ ! osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d ! marked offline for a volume", ! ((serverp->addr.sin_addr.s_addr & 0xff)), ! ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8), ! ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16), ! ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24)); ! /* Create Event Log message */ ! { ! HANDLE h; ! char *ptbuf[1]; ! char s[100]; ! h = RegisterEventSource(NULL, AFS_DAEMON_EVENT_NAME); ! sprintf(s, "cm_Analyze: Server %d.%d.%d.%d reported volume %d as missing.", ! ((serverp->addr.sin_addr.s_addr & 0xff)), ! ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8), ! ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16), ! ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24), ! fidp->volume); ! ptbuf[0] = s; ! ReportEvent(h, EVENTLOG_WARNING_TYPE, 0, 1009, NULL, ! 1, 0, ptbuf, NULL); ! DeregisterEventSource(h); ! } ! /* Mark server offline for this volume */ cm_GetServerList(fidp, userp, reqp, &serversp); for (tsrp = serversp; tsrp; tsrp=tsrp->next) { if (tsrp->server == serverp) tsrp->status = offline; } retry = 1; } *************** *** 312,319 **** lock_ReleaseWrite(&cm_serverLock); if (firstError == 0) { if (someBusy) firstError = CM_ERROR_ALLBUSY; ! else if (someOffline) firstError = CM_ERROR_NOSUCHVOLUME; ! else firstError = CM_ERROR_TIMEDOUT; } osi_Log1(afsd_logp, "cm_ConnByMServers returning %x", firstError); return firstError; --- 335,345 ---- lock_ReleaseWrite(&cm_serverLock); if (firstError == 0) { if (someBusy) firstError = CM_ERROR_ALLBUSY; ! else if (someOffline) firstError = CM_ERROR_ALLOFFLINE; ! else if (serversp) firstError = CM_ERROR_TIMEDOUT; ! /* Only return CM_ERROR_NOSUCHVOLUME if there are no ! servers for this volume */ ! else firstError = CM_ERROR_NOSUCHVOLUME; } osi_Log1(afsd_logp, "cm_ConnByMServers returning %x", firstError); return firstError; Index: openafs/src/WINNT/afsd/fs.rc diff -c openafs/src/WINNT/afsd/fs.rc:1.2 openafs/src/WINNT/afsd/fs.rc:1.2.8.1 *** openafs/src/WINNT/afsd/fs.rc:1.2 Sat Nov 4 05:01:42 2000 --- openafs/src/WINNT/afsd/fs.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS File Server Command" + #define AFS_VERINFO_NAME "fs" + #define AFS_VERINFO_FILENAME "fs.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/klog.rc diff -c openafs/src/WINNT/afsd/klog.rc:1.2 openafs/src/WINNT/afsd/klog.rc:1.2.8.1 *** openafs/src/WINNT/afsd/klog.rc:1.2 Sat Nov 4 05:01:42 2000 --- openafs/src/WINNT/afsd/klog.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Logon Command" + #define AFS_VERINFO_NAME "klog" + #define AFS_VERINFO_FILENAME "klog.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/largeintdotnet.c diff -c /dev/null openafs/src/WINNT/afsd/largeintdotnet.c:1.1.2.1 *** /dev/null Tue Jul 29 19:40:39 2003 --- openafs/src/WINNT/afsd/largeintdotnet.c Wed May 28 14:36:05 2003 *************** *** 0 **** --- 1,90 ---- + /* + * Copyright (C) 1998, 1989 Transarc Corporation - All rights reserved + * + * (C) COPYRIGHT IBM CORPORATION 1987, 1988 + * LICENSED MATERIALS - PROPERTY OF IBM + * + */ + + /* Copyright (C) 1994 Cazamar Systems, Inc. */ + + #include + #include + + #include + #include + #include + #include + #include + + #if (_MSC_VER >= 1300) + LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b) + { + LARGE_INTEGER result; + int carry; + result.LowPart=a.LowPart+b.LowPart; + carry=(result.LowPart < b.LowPart) ? 1 : 0; + result.HighPart=a.HighPart+b.HighPart+ carry; + return result; + } + LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b) + { + LARGE_INTEGER result; + int borrow; + result.LowPart=a.LowPart-b.LowPart; + borrow=(result.LowPart > a.LowPart) ? 1 : 0; + result.HighPart=a.HighPart-b.HighPart- borrow; + return result; + } + LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder) + { + LARGE_INTEGER result; + ULONGLONG a1,q1,r1; + + result.HighPart=0; + result.LowPart=0; + if (b == 0) { return result; } + if (b == 1) { *remainder = 0; return a; } + + a1=(a.HighPart << 32) | a.LowPart; + q1=a1/b; + r1=a1-(q1*b); + if (r1 > ULONG_MAX) /*XXX */; + result.HighPart=q1 >> 32; + result.LowPart=q1 & 0xffffffff; + *remainder=r1 & 0xffffffff; + return result; + } + LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder) + { + LARGE_INTEGER result; + ULONGLONG a1,b1,q1,r1; + + result.HighPart=0; + result.LowPart=0; + if (b.HighPart == 0 && b.LowPart == 0) { return result; } + if (b.HighPart == 0 && b.LowPart == 1) { + remainder->HighPart = 0; + remainder->LowPart = 0; + return a; + } + + a1=(a.HighPart << 32) | a.LowPart; + b1=(b.HighPart << 32) | a.LowPart; + q1=a1/b1; + r1=a1-(q1*b1); + result.HighPart=q1 >> 32; + result.LowPart=q1 & 0xffffffff; + remainder->HighPart=r1 >> 32; + remainder->LowPart=r1 & 0xffffffff; + return result; + } + + LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a) + { + LARGE_INTEGER result; + result.HighPart=0; + result.LowPart=a; + return result; + } + #endif Index: openafs/src/WINNT/afsd/libafsconf.rc diff -c openafs/src/WINNT/afsd/libafsconf.rc:1.2 openafs/src/WINNT/afsd/libafsconf.rc:1.2.8.1 *** openafs/src/WINNT/afsd/libafsconf.rc:1.2 Sat Nov 4 05:01:43 2000 --- openafs/src/WINNT/afsd/libafsconf.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Cell File DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "libafsconf" + #define AFS_VERINFO_FILENAME "libafsconf.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/smb.c diff -c openafs/src/WINNT/afsd/smb.c:1.4.4.5 openafs/src/WINNT/afsd/smb.c:1.4.4.6 *** openafs/src/WINNT/afsd/smb.c:1.4.4.5 Tue Dec 10 11:41:24 2002 --- openafs/src/WINNT/afsd/smb.c Tue Jul 1 15:46:18 2003 *************** *** 5902,5907 **** --- 5902,5908 ---- while (1) { memset(ncbp, 0, sizeof(NCB)); + flags = 0; #ifdef DJGPP /* terminate if shutdown flag is set */ if (smbShutdownFlag == 1) Index: openafs/src/WINNT/afsd/smb3.c diff -c openafs/src/WINNT/afsd/smb3.c:1.5.4.5 openafs/src/WINNT/afsd/smb3.c:1.5.4.6 *** openafs/src/WINNT/afsd/smb3.c:1.5.4.5 Fri Mar 14 14:45:58 2003 --- openafs/src/WINNT/afsd/smb3.c Thu Jul 10 22:13:08 2003 *************** *** 1345,1352 **** *((LARGE_INTEGER *)op) = scp->length; op += 8; /* EOF */ *((u_long *)op) = scp->linkCount; op += 4; *op++ = ((fidp->flags & SMB_FID_DELONCLOSE) ? 1 : 0); - *op++ = 0; *op++ = (scp->fileType == CM_SCACHETYPE_DIRECTORY ? 1 : 0); *op++ = 0; } else if (infoLevel == 0x103) { --- 1345,1352 ---- *((LARGE_INTEGER *)op) = scp->length; op += 8; /* EOF */ *((u_long *)op) = scp->linkCount; op += 4; *op++ = ((fidp->flags & SMB_FID_DELONCLOSE) ? 1 : 0); *op++ = (scp->fileType == CM_SCACHETYPE_DIRECTORY ? 1 : 0); + *op++ = 0; *op++ = 0; } else if (infoLevel == 0x103) { Index: openafs/src/WINNT/afsd/symlink.rc diff -c openafs/src/WINNT/afsd/symlink.rc:1.2 openafs/src/WINNT/afsd/symlink.rc:1.2.8.1 *** openafs/src/WINNT/afsd/symlink.rc:1.2 Sat Nov 4 05:01:45 2000 --- openafs/src/WINNT/afsd/symlink.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Symbolic Link Command" + #define AFS_VERINFO_NAME "symlink" + #define AFS_VERINFO_FILENAME "symlink.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/tokens.rc diff -c openafs/src/WINNT/afsd/tokens.rc:1.2 openafs/src/WINNT/afsd/tokens.rc:1.2.8.1 *** openafs/src/WINNT/afsd/tokens.rc:1.2 Sat Nov 4 05:01:45 2000 --- openafs/src/WINNT/afsd/tokens.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Tokens Command" + #define AFS_VERINFO_NAME "tokens" + #define AFS_VERINFO_FILENAME "tokens.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afsd/unlog.rc diff -c openafs/src/WINNT/afsd/unlog.rc:1.2 openafs/src/WINNT/afsd/unlog.rc:1.2.8.1 *** openafs/src/WINNT/afsd/unlog.rc:1.2 Sat Nov 4 05:01:45 2000 --- openafs/src/WINNT/afsd/unlog.rc Tue Jul 1 20:33:42 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Unlog Command" + #define AFS_VERINFO_NAME "unlog" + #define AFS_VERINFO_FILENAME "unlog.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afslegal/afslegal_stub.rc diff -c openafs/src/WINNT/afslegal/afslegal_stub.rc:1.2 openafs/src/WINNT/afslegal/afslegal_stub.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/afslegal_stub.rc:1.2 Sat Nov 4 05:01:46 2000 --- openafs/src/WINNT/afslegal/afslegal_stub.rc Tue Jul 1 20:33:42 2003 *************** *** 9,14 **** --- 9,16 ---- #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Startup Message" + #define AFS_VERINFO_NAME "afslegal_stub" + #define AFS_VERINFO_FILENAME "afslegal_stub.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/de_DE/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/de_DE/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/de_DE/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/de_DE/afslegal.rc:1.2 Sat Nov 4 05:01:46 2000 --- openafs/src/WINNT/afslegal/lang/de_DE/afslegal.rc Tue Jul 1 20:33:43 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Startup Message" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/en_US/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/en_US/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/en_US/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/en_US/afslegal.rc:1.2 Sat Nov 4 05:01:46 2000 --- openafs/src/WINNT/afslegal/lang/en_US/afslegal.rc Tue Jul 1 20:33:43 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Startup Message" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/es_ES/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/es_ES/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/es_ES/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/es_ES/afslegal.rc:1.2 Sat Nov 4 05:01:46 2000 --- openafs/src/WINNT/afslegal/lang/es_ES/afslegal.rc Tue Jul 1 20:33:44 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "Mensaje de inicio de AFS Server" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/ja_JP/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/ja_JP/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/ja_JP/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/ja_JP/afslegal.rc:1.2 Sat Nov 4 05:01:47 2000 --- openafs/src/WINNT/afslegal/lang/ja_JP/afslegal.rc Tue Jul 1 20:33:44 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS サーバー始動メッセージ" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/ko_KR/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/ko_KR/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/ko_KR/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/ko_KR/afslegal.rc:1.2 Sat Nov 4 05:01:47 2000 --- openafs/src/WINNT/afslegal/lang/ko_KR/afslegal.rc Tue Jul 1 20:33:46 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｼｭｹ ｽﾃｵｿ ｸﾞｽﾃﾁ" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/pt_BR/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/pt_BR/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/pt_BR/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/pt_BR/afslegal.rc:1.2 Sat Nov 4 05:01:47 2000 --- openafs/src/WINNT/afslegal/lang/pt_BR/afslegal.rc Tue Jul 1 20:33:46 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "Mensagem de Inicializa鈬o de AFS Server" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/zh_CN/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/zh_CN/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/zh_CN/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/zh_CN/afslegal.rc:1.2 Sat Nov 4 05:01:47 2000 --- openafs/src/WINNT/afslegal/lang/zh_CN/afslegal.rc Tue Jul 1 20:33:47 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｷﾎﾆﾆｶｯﾏﾏ｢" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afslegal/lang/zh_TW/afslegal.rc diff -c openafs/src/WINNT/afslegal/lang/zh_TW/afslegal.rc:1.2 openafs/src/WINNT/afslegal/lang/zh_TW/afslegal.rc:1.2.8.1 *** openafs/src/WINNT/afslegal/lang/zh_TW/afslegal.rc:1.2 Sat Nov 4 05:01:47 2000 --- openafs/src/WINNT/afslegal/lang/zh_TW/afslegal.rc Tue Jul 1 20:33:48 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Startup Message" + #define AFS_VERINFO_NAME "afslegal" + #define AFS_VERINFO_FILENAME "afslegal.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrcfg/afscfg_stub.rc diff -c openafs/src/WINNT/afssvrcfg/afscfg_stub.rc:1.2 openafs/src/WINNT/afssvrcfg/afscfg_stub.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/afscfg_stub.rc:1.2 Sat Nov 4 05:01:49 2000 --- openafs/src/WINNT/afssvrcfg/afscfg_stub.rc Tue Jul 1 20:33:49 2003 *************** *** 10,15 **** --- 10,17 ---- #include "resource.h" #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Configuration" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc:1.2 Sat Nov 4 05:01:55 2000 --- openafs/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc Tue Jul 1 20:33:49 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFSｮ Configuration-Anwendung und -Assistent" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc:1.2 Sat Nov 4 05:01:55 2000 --- openafs/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc Tue Jul 1 20:33:50 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Configuration" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc:1.2 Sat Nov 4 05:01:56 2000 --- openafs/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc Tue Jul 1 20:33:50 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFSｮ Configuration application and wizard" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc:1.2 Sat Nov 4 05:01:57 2000 --- openafs/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc Tue Jul 1 20:33:51 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS(R) 構成アプリケーションおよびウィザード" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc:1.2 Sat Nov 4 05:01:57 2000 --- openafs/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc Tue Jul 1 20:33:52 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｱｸｼｺ ﾀﾀｿﾇﾁｷﾎｱﾗｷ･ ｹﾗ ｸｶｹｻ" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc:1.2 Sat Nov 4 05:01:57 2000 --- openafs/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc Tue Jul 1 20:33:52 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "Aplica鈬o e assistente de Configura鈬o do AFSｮ" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc:1.2 Sat Nov 4 05:01:58 2000 --- openafs/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc Tue Jul 1 20:33:53 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS ﾅ葷ﾃﾓｦﾓﾃｳﾌﾐｺﾍﾏｵｼ" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc diff -c openafs/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc:1.2 openafs/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc:1.2 Sat Nov 4 05:01:58 2000 --- openafs/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc Tue Jul 1 20:33:55 2003 *************** *** 17,22 **** --- 17,26 ---- #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Configuration application and wizard" + #define AFS_VERINFO_NAME "afscfg" + #define AFS_VERINFO_FILENAME "afscfg.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/afssvrcpa_stub.rc diff -c openafs/src/WINNT/afssvrcpa/afssvrcpa_stub.rc:1.2 openafs/src/WINNT/afssvrcpa/afssvrcpa_stub.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/afssvrcpa_stub.rc:1.2 Sat Nov 4 05:01:58 2000 --- openafs/src/WINNT/afssvrcpa/afssvrcpa_stub.rc Tue Jul 1 20:33:57 2003 *************** *** 10,15 **** --- 10,17 ---- #include "resource.h" #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Configuration application" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc:1.2 Sat Nov 4 05:01:59 2000 --- openafs/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc Tue Jul 1 20:33:58 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "Die Anwendung AFS Server Configuration" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc:1.2 Sat Nov 4 05:01:59 2000 --- openafs/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc Tue Jul 1 20:33:59 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Configuration application" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc:1.2 Sat Nov 4 05:01:59 2000 --- openafs/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc Tue Jul 1 20:34:00 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "Aplicacin de Configuracin de AFS Server" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc:1.2 Sat Nov 4 05:01:59 2000 --- openafs/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc Tue Jul 1 20:34:02 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS サーバー構成アプリケーション" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc:1.2 Sat Nov 4 05:01:59 2000 --- openafs/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc Tue Jul 1 20:34:04 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｼｭｹ ｱｸｼｺ ﾀﾀｿﾇﾁｷﾎｱﾗｷ･" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc:1.2 Sat Nov 4 05:02:00 2000 --- openafs/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc Tue Jul 1 20:34:06 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Configuration application" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc:1.2 Sat Nov 4 05:02:00 2000 --- openafs/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc Tue Jul 1 20:34:07 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｷﾎﾆﾅ葷ﾃﾓｦﾓﾃｳﾌﾐ" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc diff -c openafs/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc:1.2 openafs/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc:1.2.8.1 *** openafs/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc:1.2 Sat Nov 4 05:02:00 2000 --- openafs/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc Tue Jul 1 20:34:08 2003 *************** *** 16,21 **** --- 16,25 ---- // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Configuration application" + #define AFS_VERINFO_NAME "afssvrcpa" + #define AFS_VERINFO_FILENAME "afssvrcpa.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/afssvrmgr/svrmgr_stub.rc diff -c openafs/src/WINNT/afssvrmgr/svrmgr_stub.rc:1.2 openafs/src/WINNT/afssvrmgr/svrmgr_stub.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/svrmgr_stub.rc:1.2 Sat Nov 4 05:02:15 2000 --- openafs/src/WINNT/afssvrmgr/svrmgr_stub.rc Tue Jul 1 20:34:10 2003 *************** *** 11,16 **** --- 11,18 ---- #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Manager" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc:1.2 Sat Nov 4 05:02:16 2000 --- openafs/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc Tue Jul 1 20:34:12 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Manager" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc:1.2 Sat Nov 4 05:02:17 2000 --- openafs/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc Tue Jul 1 20:34:14 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Manager" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc:1.2 Sat Nov 4 05:02:18 2000 --- openafs/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc Tue Jul 1 20:34:16 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Manager" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc:1.2 Sat Nov 4 05:02:18 2000 --- openafs/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc Tue Jul 1 20:34:17 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS サーバー・マネージャー" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc:1.2 Sat Nov 4 05:02:19 2000 --- openafs/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc Tue Jul 1 20:34:19 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｼｭｹ ｰｸｮ ﾇﾁｷﾎｱﾗｷ･" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc:1.2 Sat Nov 4 05:02:20 2000 --- openafs/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc Tue Jul 1 20:34:20 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "Gerenciador de Servidor do AFS" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc:1.2 Sat Nov 4 05:02:20 2000 --- openafs/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc Tue Jul 1 20:34:23 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｷﾎﾆｹﾜﾀﾆ" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc diff -c openafs/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc:1.2 openafs/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc:1.2.8.1 *** openafs/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc:1.2 Sat Nov 4 05:02:21 2000 --- openafs/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc Tue Jul 1 20:34:24 2003 *************** *** 19,24 **** --- 19,28 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Server Manager" + #define AFS_VERINFO_NAME "svrmgr" + #define AFS_VERINFO_FILENAME "svrmgr.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc diff -c openafs/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc:1.2 openafs/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc:1.2 Sat Nov 4 05:02:22 2000 --- openafs/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc Tue Jul 1 20:34:26 2003 *************** *** 11,16 **** --- 11,18 ---- #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Account Manager" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:32 2000 --- openafs/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc Tue Jul 1 20:34:27 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Account Manager" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:33 2000 --- openafs/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc Tue Jul 1 20:34:30 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Account Manager" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:33 2000 --- openafs/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc Tue Jul 1 20:34:31 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Account Manager" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:33 2000 --- openafs/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc Tue Jul 1 20:34:33 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS アカウント・マネージャー" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:34 2000 --- openafs/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc Tue Jul 1 20:34:34 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｰ霖､ ｰｸｮ ﾇﾁｷﾎｱﾗｷ･" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:34 2000 --- openafs/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc Tue Jul 1 20:34:35 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "Gerenciador de Contas do AFS" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:35 2000 --- openafs/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc Tue Jul 1 20:34:36 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ﾕﾊｻｧｹﾜﾀﾆ" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc diff -c openafs/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc:1.2 openafs/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc:1.2.8.1 *** openafs/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc:1.2 Sat Nov 4 05:02:35 2000 --- openafs/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc Tue Jul 1 20:34:37 2003 *************** *** 18,23 **** --- 18,27 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Account Manager" + #define AFS_VERINFO_NAME "AfsUsrMgr" + #define AFS_VERINFO_FILENAME "AfsUsrMgr.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/bosctlsvc/bosctlsvc.rc diff -c openafs/src/WINNT/bosctlsvc/bosctlsvc.rc:1.2 openafs/src/WINNT/bosctlsvc/bosctlsvc.rc:1.2.8.1 *** openafs/src/WINNT/bosctlsvc/bosctlsvc.rc:1.2 Sat Nov 4 05:02:36 2000 --- openafs/src/WINNT/bosctlsvc/bosctlsvc.rc Tue Jul 1 20:34:39 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS BOS Control Service" + #define AFS_VERINFO_NAME "bosctlsvc" + #define AFS_VERINFO_FILENAME "bosctlsvc.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/client_config/afs_config_stub.rc diff -c openafs/src/WINNT/client_config/afs_config_stub.rc:1.2 openafs/src/WINNT/client_config/afs_config_stub.rc:1.2.8.1 *** openafs/src/WINNT/client_config/afs_config_stub.rc:1.2 Sat Nov 4 05:02:36 2000 --- openafs/src/WINNT/client_config/afs_config_stub.rc Tue Jul 1 20:34:40 2003 *************** *** 10,15 **** --- 10,17 ---- #include "resource.h" #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Configuration" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/client_config/lang/de_DE/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/de_DE/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/de_DE/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/de_DE/afs_config.rc:1.2 Sat Nov 4 05:02:41 2000 --- openafs/src/WINNT/client_config/lang/de_DE/afs_config.rc Tue Jul 1 20:34:41 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "Konfiguration des AFS Clients" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/en_US/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/en_US/afs_config.rc:1.2.8.1 openafs/src/WINNT/client_config/lang/en_US/afs_config.rc:1.2.8.2 *** openafs/src/WINNT/client_config/lang/en_US/afs_config.rc:1.2.8.1 Wed Nov 14 22:38:48 2001 --- openafs/src/WINNT/client_config/lang/en_US/afs_config.rc Tue Jul 1 20:34:42 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Configuration" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/es_ES/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/es_ES/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/es_ES/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/es_ES/afs_config.rc:1.2 Sat Nov 4 05:02:41 2000 --- openafs/src/WINNT/client_config/lang/es_ES/afs_config.rc Tue Jul 1 20:34:43 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Configuration" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/ja_JP/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/ja_JP/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/ja_JP/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/ja_JP/afs_config.rc:1.2 Sat Nov 4 05:02:42 2000 --- openafs/src/WINNT/client_config/lang/ja_JP/afs_config.rc Tue Jul 1 20:34:44 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS クライアント構成" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/ko_KR/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/ko_KR/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/ko_KR/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/ko_KR/afs_config.rc:1.2 Sat Nov 4 05:02:42 2000 --- openafs/src/WINNT/client_config/lang/ko_KR/afs_config.rc Tue Jul 1 20:34:45 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ﾅｬｶﾀﾌｾﾆｮ ｱｸｼｺ" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/pt_BR/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/pt_BR/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/pt_BR/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/pt_BR/afs_config.rc:1.2 Sat Nov 4 05:02:42 2000 --- openafs/src/WINNT/client_config/lang/pt_BR/afs_config.rc Tue Jul 1 20:34:46 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "Configura鈬o do AFS Client" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/zh_CN/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/zh_CN/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/zh_CN/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/zh_CN/afs_config.rc:1.2 Sat Nov 4 05:02:43 2000 --- openafs/src/WINNT/client_config/lang/zh_CN/afs_config.rc Tue Jul 1 20:34:48 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ｿﾍｻｧｻﾅ葷ﾃ" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_config/lang/zh_TW/afs_config.rc diff -c openafs/src/WINNT/client_config/lang/zh_TW/afs_config.rc:1.2 openafs/src/WINNT/client_config/lang/zh_TW/afs_config.rc:1.2.8.1 *** openafs/src/WINNT/client_config/lang/zh_TW/afs_config.rc:1.2 Sat Nov 4 05:02:43 2000 --- openafs/src/WINNT/client_config/lang/zh_TW/afs_config.rc Tue Jul 1 20:34:49 2003 *************** *** 17,22 **** --- 17,26 ---- #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Configuration" + #define AFS_VERINFO_NAME "afs_config" + #define AFS_VERINFO_FILENAME "afs_config.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" #endif // APSTUDIO_INVOKED Index: openafs/src/WINNT/client_cpa/afs_cpa_stub.rc diff -c openafs/src/WINNT/client_cpa/afs_cpa_stub.rc:1.2 openafs/src/WINNT/client_cpa/afs_cpa_stub.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/afs_cpa_stub.rc:1.2 Sat Nov 4 05:02:43 2000 --- openafs/src/WINNT/client_cpa/afs_cpa_stub.rc Tue Jul 1 20:34:50 2003 *************** *** 10,15 **** --- 10,17 ---- #include "resource.h" #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Control Panel Icon" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc:1.2 Sat Nov 4 05:02:44 2000 --- openafs/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc Tue Jul 1 20:34:51 2003 *************** *** 26,32 **** --- 26,46 ---- #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc:1.2 Sat Nov 4 05:02:44 2000 --- openafs/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc Tue Jul 1 20:34:52 2003 *************** *** 28,33 **** --- 28,48 ---- #pragma code_page(1252) #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc:1.2 Sat Nov 4 05:02:44 2000 --- openafs/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc Tue Jul 1 20:34:53 2003 *************** *** 26,32 **** --- 26,46 ---- #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc:1.2 Sat Nov 4 05:02:44 2000 --- openafs/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc Tue Jul 1 20:34:54 2003 *************** *** 26,31 **** --- 26,46 ---- #ifdef _WIN32 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // Index: openafs/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc:1.2 Sat Nov 4 05:02:44 2000 --- openafs/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc Tue Jul 1 20:34:55 2003 *************** *** 26,32 **** --- 26,46 ---- #ifdef _WIN32 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc:1.2 Sat Nov 4 05:02:45 2000 --- openafs/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc Tue Jul 1 20:34:56 2003 *************** *** 26,32 **** --- 26,46 ---- #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc:1.2 Sat Nov 4 05:02:45 2000 --- openafs/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc Tue Jul 1 20:34:58 2003 *************** *** 27,33 **** --- 27,47 ---- LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc diff -c openafs/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc:1.2 openafs/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc:1.2.8.1 *** openafs/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc:1.2 Sat Nov 4 05:02:45 2000 --- openafs/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc Tue Jul 1 20:34:59 2003 *************** *** 26,32 **** --- 26,46 ---- #ifdef _WIN32 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL #endif //_WIN32 + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Control Panel Applet" + #define AFS_VERINFO_NAME "afs_cpa" + #define AFS_VERINFO_FILENAME "afs_cpa.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Icon Index: openafs/src/WINNT/client_creds/afscreds_stub.rc diff -c openafs/src/WINNT/client_creds/afscreds_stub.rc:1.2 openafs/src/WINNT/client_creds/afscreds_stub.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/afscreds_stub.rc:1.2 Sat Nov 4 05:02:46 2000 --- openafs/src/WINNT/client_creds/afscreds_stub.rc Tue Jul 1 20:35:00 2003 *************** *** 10,15 **** --- 10,17 ---- #include "resource.h" #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/client_creds/lang/de_DE/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/de_DE/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/de_DE/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/de_DE/afscreds.rc:1.2 Sat Nov 4 05:02:49 2000 --- openafs/src/WINNT/client_creds/lang/de_DE/afscreds.rc Tue Jul 1 20:35:01 2003 *************** *** 29,34 **** --- 29,47 ---- ///////////////////////////////////////////////////////////////////////////// // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + ///////////////////////////////////////////////////////////////////////////// + // // Icon // Index: openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc:1.2 Sat Nov 4 05:02:49 2000 --- openafs/src/WINNT/client_creds/lang/en_US/afscreds.rc Tue Jul 1 20:35:03 2003 *************** *** 36,41 **** --- 36,45 ---- #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/client_creds/lang/es_ES/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/es_ES/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/es_ES/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/es_ES/afscreds.rc:1.2 Sat Nov 4 05:02:49 2000 --- openafs/src/WINNT/client_creds/lang/es_ES/afscreds.rc Tue Jul 1 20:35:04 2003 *************** *** 26,31 **** --- 26,44 ---- #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" ///////////////////////////////////////////////////////////////////////////// // Index: openafs/src/WINNT/client_creds/lang/ja_JP/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/ja_JP/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/ja_JP/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/ja_JP/afscreds.rc:1.2 Sat Nov 4 05:02:49 2000 --- openafs/src/WINNT/client_creds/lang/ja_JP/afscreds.rc Tue Jul 1 20:35:05 2003 *************** *** 29,34 **** --- 29,47 ---- ///////////////////////////////////////////////////////////////////////////// // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 932 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + ///////////////////////////////////////////////////////////////////////////// + // // Icon // Index: openafs/src/WINNT/client_creds/lang/ko_KR/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/ko_KR/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/ko_KR/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/ko_KR/afscreds.rc:1.2 Sat Nov 4 05:02:49 2000 --- openafs/src/WINNT/client_creds/lang/ko_KR/afscreds.rc Tue Jul 1 20:35:06 2003 *************** *** 26,31 **** --- 26,44 ---- #ifdef _WIN32 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT #endif //_WIN32 + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" ///////////////////////////////////////////////////////////////////////////// // Index: openafs/src/WINNT/client_creds/lang/pt_BR/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/pt_BR/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/pt_BR/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/pt_BR/afscreds.rc:1.2 Sat Nov 4 05:02:50 2000 --- openafs/src/WINNT/client_creds/lang/pt_BR/afscreds.rc Tue Jul 1 20:35:07 2003 *************** *** 26,31 **** --- 26,44 ---- #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" ///////////////////////////////////////////////////////////////////////////// // Index: openafs/src/WINNT/client_creds/lang/zh_CN/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/zh_CN/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/zh_CN/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/zh_CN/afscreds.rc:1.2 Sat Nov 4 05:02:50 2000 --- openafs/src/WINNT/client_creds/lang/zh_CN/afscreds.rc Tue Jul 1 20:35:09 2003 *************** *** 26,31 **** --- 26,44 ---- #ifdef _WIN32 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED #endif //_WIN32 + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" ///////////////////////////////////////////////////////////////////////////// // Index: openafs/src/WINNT/client_creds/lang/zh_TW/afscreds.rc diff -c openafs/src/WINNT/client_creds/lang/zh_TW/afscreds.rc:1.2 openafs/src/WINNT/client_creds/lang/zh_TW/afscreds.rc:1.2.8.1 *** openafs/src/WINNT/client_creds/lang/zh_TW/afscreds.rc:1.2 Sat Nov 4 05:02:50 2000 --- openafs/src/WINNT/client_creds/lang/zh_TW/afscreds.rc Tue Jul 1 20:35:10 2003 *************** *** 26,31 **** --- 26,44 ---- #ifdef _WIN32 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL #endif //_WIN32 + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client" + + #define AFS_VERINFO_NAME "afscreds" + #define AFS_VERINFO_FILENAME "afscreds.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" ///////////////////////////////////////////////////////////////////////////// // Index: openafs/src/WINNT/client_exp/afs_shl_ext_stub.rc diff -c openafs/src/WINNT/client_exp/afs_shl_ext_stub.rc:1.2 openafs/src/WINNT/client_exp/afs_shl_ext_stub.rc:1.2.8.1 *** openafs/src/WINNT/client_exp/afs_shl_ext_stub.rc:1.2 Sat Nov 4 05:02:51 2000 --- openafs/src/WINNT/client_exp/afs_shl_ext_stub.rc Tue Jul 1 20:35:11 2003 *************** *** 8,13 **** --- 8,16 ---- */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" 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.2 openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc:1.2.8.1 *** openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc:1.2 Sat Nov 4 05:02:56 2000 --- openafs/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc Tue Jul 1 20:35:12 2003 *************** *** 62,68 **** --- 62,83 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x407 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Menu 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.2.8.1 openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:25:56 2002 --- openafs/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc Tue Jul 1 20:35:13 2003 *************** *** 73,78 **** --- 73,82 ---- #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x409 + #define AFS_VERINFO_CHARSET 1252 #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" 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.2.8.1 openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:25:58 2002 --- openafs/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc Tue Jul 1 20:35:14 2003 *************** *** 62,67 **** --- 62,83 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x40a + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // 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.2.8.1 openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:26:00 2002 --- openafs/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc Tue Jul 1 20:35:15 2003 *************** *** 63,68 **** --- 63,84 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x411 + #define AFS_VERINFO_CHARSET 936 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Menu 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.2.8.1 openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:26:01 2002 --- openafs/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc Tue Jul 1 20:35:16 2003 *************** *** 62,67 **** --- 62,83 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x412 + #define AFS_VERINFO_CHARSET 949 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // 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.2.8.1 openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:26:02 2002 --- openafs/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc Tue Jul 1 20:35:17 2003 *************** *** 62,67 **** --- 62,83 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x416 + #define AFS_VERINFO_CHARSET 1252 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // 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.2.8.1 openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:26:03 2002 --- openafs/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc Tue Jul 1 20:35:19 2003 *************** *** 62,67 **** --- 62,83 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x804 + #define AFS_VERINFO_CHARSET 936 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // 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.2.8.1 openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc:1.2.8.2 *** openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc:1.2.8.1 Wed Dec 4 09:26:04 2002 --- openafs/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc Tue Jul 1 20:35:20 2003 *************** *** 62,68 **** --- 62,83 ---- #endif // APSTUDIO_INVOKED + #ifndef _MAC + ///////////////////////////////////////////////////////////////////////////// + // + // Version + // + #define AFS_VERINFO_FILE_DESCRIPTION "AFS Explorer Extension DLL" + + #define AFS_VERINFO_NAME "afs_shl_ext" + #define AFS_VERINFO_FILENAME "afs_shl_ext.exe" + #define AFS_VERINFO_LANG_CODE 0x404 + #define AFS_VERINFO_CHARSET 950 + #include "AFS_component_version_number.h" + #include "..\..\config\NTVersioninfo.rc" + + #endif // !_MAC ///////////////////////////////////////////////////////////////////////////// // // Menu Index: openafs/src/WINNT/client_osi/libosi.rc diff -c openafs/src/WINNT/client_osi/libosi.rc:1.1 openafs/src/WINNT/client_osi/libosi.rc:1.1.12.1 *** openafs/src/WINNT/client_osi/libosi.rc:1.1 Fri Nov 3 21:16:49 2000 --- openafs/src/WINNT/client_osi/libosi.rc Tue Jul 1 20:35:22 2003 *************** *** 4,9 **** --- 4,12 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS OSI DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "libosi" + #define AFS_VERINFO_FILENAME "libosi.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/client_osi/osi.h diff -c openafs/src/WINNT/client_osi/osi.h:1.2 openafs/src/WINNT/client_osi/osi.h:1.2.4.1 *** openafs/src/WINNT/client_osi/osi.h:1.2 Mon Apr 30 02:49:51 2001 --- openafs/src/WINNT/client_osi/osi.h Wed May 28 14:36:06 2003 *************** *** 18,30 **** --- 18,63 ---- /* large int */ #ifndef DJGPP #include + #if !defined(_MSC_VER) || (_MSC_VER < 1300) #include + #endif #include "osithrdnt.h" #else /* DJGPP */ #include "largeint95.h" #endif /* !DJGPP */ typedef LARGE_INTEGER osi_hyper_t; + #if _MSC_VER >= 1300 + LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b); + LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b); + LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder); + LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder); + LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a); + #define LargeIntegerGreaterThan(a, b) \ + ((a).HighPart > (b).HighPart || \ + ((a).HighPart == (b).HighPart && (a).LowPart > (b).LowPart)) + + #define LargeIntegerGreaterThanOrEqualTo(a, b) \ + ((a).HighPart > (b).HighPart || \ + ((a).HighPart == (b).HighPart && (a).LowPart >= (b).LowPart)) + + #define LargeIntegerLessThan(a, b) \ + ((a).HighPart < (b).HighPart || \ + ((a).HighPart == (b).HighPart && (a).LowPart < (b).LowPart)) + + #define LargeIntegerLessThanOrEqualTo(a, b) \ + ((a).HighPart < (b).HighPart || \ + ((a).HighPart == (b).HighPart && (a).LowPart <= (b).LowPart)) + + #define LargeIntegerEqualTo(a, b) \ + ((a).HighPart == (b).HighPart && (a).LowPart == (b).LowPart) + + #define LargeIntegerGreaterOrEqualToZero(a) ((a).HighPart >= 0) + + #define LargeIntegerLessThanZero(a) ((a).HighPart < 0) + + #define LargeIntegerNotEqualToZero(a) ((a).HighPart || (a).LowPart) + #endif #ifndef DJGPP typedef GUID osi_uid_t; #else /* DJGPP */ Index: openafs/src/WINNT/client_osi/osistatl.h diff -c openafs/src/WINNT/client_osi/osistatl.h:1.1 openafs/src/WINNT/client_osi/osistatl.h:1.1.12.1 *** openafs/src/WINNT/client_osi/osistatl.h:1.1 Fri Nov 3 21:16:55 2000 --- openafs/src/WINNT/client_osi/osistatl.h Wed May 28 14:36:06 2003 *************** *** 12,18 **** --- 12,20 ---- #define _OSISTATL_H_ENV_ 1 #include "osibasel.h" + #if !defined(_MSC_VER) || (_MSC_VER < 1300) #include + #endif #include "osiqueue.h" /* structure representing all information about someone holding a lock Index: openafs/src/WINNT/client_osi/osiutils.c diff -c openafs/src/WINNT/client_osi/osiutils.c:1.1 openafs/src/WINNT/client_osi/osiutils.c:1.1.12.1 *** openafs/src/WINNT/client_osi/osiutils.c:1.1 Fri Nov 3 21:16:55 2000 --- openafs/src/WINNT/client_osi/osiutils.c Wed May 28 14:36:06 2003 *************** *** 15,20 **** --- 15,21 ---- #include #include #include + #include #include #include "osiutils.h" *************** *** 72,74 **** --- 73,147 ---- { free(p); } + + #if (_MSC_VER >= 1300) + LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b) + { + LARGE_INTEGER result; + int carry; + result.LowPart=a.LowPart+b.LowPart; + carry=(result.LowPart < b.LowPart) ? 1 : 0; + result.HighPart=a.HighPart+b.HighPart+ carry; + return result; + } + LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b) + { + LARGE_INTEGER result; + int borrow; + result.LowPart=a.LowPart-b.LowPart; + borrow=(result.LowPart > a.LowPart) ? 1 : 0; + result.HighPart=a.HighPart-b.HighPart- borrow; + return result; + } + LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder) + { + LARGE_INTEGER result; + ULONGLONG a1,q1,r1; + + result.HighPart=0; + result.LowPart=0; + if (b == 0) { return result; } + if (b == 1) { *remainder = 0; return a; } + + a1=(a.HighPart << 32) | a.LowPart; + q1=a1/b; + r1=a1-(q1*b); + if (r1 > ULONG_MAX) /*XXX */; + result.HighPart=q1 >> 32; + result.LowPart=q1 & 0xffffffff; + *remainder=r1 & 0xffffffff; + return result; + } + LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder) + { + LARGE_INTEGER result; + ULONGLONG a1,b1,q1,r1; + + result.HighPart=0; + result.LowPart=0; + if (b.HighPart == 0 && b.LowPart == 0) { return result; } + if (b.HighPart == 0 && b.LowPart == 1) { + remainder->HighPart = 0; + remainder->LowPart = 0; + return a; + } + + a1=(a.HighPart << 32) | a.LowPart; + b1=(b.HighPart << 32) | a.LowPart; + q1=a1/b1; + r1=a1-(q1*b1); + result.HighPart=q1 >> 32; + result.LowPart=q1 & 0xffffffff; + remainder->HighPart=r1 >> 32; + remainder->LowPart=r1 & 0xffffffff; + return result; + } + + LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a) + { + LARGE_INTEGER result; + result.HighPart=0; + result.LowPart=a; + return result; + } + #endif Index: openafs/src/WINNT/eventlog/lang/afseventmsg.rc diff -c openafs/src/WINNT/eventlog/lang/afseventmsg.rc:1.2 openafs/src/WINNT/eventlog/lang/afseventmsg.rc:1.2.8.1 *** openafs/src/WINNT/eventlog/lang/afseventmsg.rc:1.2 Sat Nov 4 05:03:00 2000 --- openafs/src/WINNT/eventlog/lang/afseventmsg.rc Tue Jul 1 20:35:23 2003 *************** *** 10,16 **** --- 10,19 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Event Log Message DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afseventmsg" + #define AFS_VERINFO_FILENAME "afseventmsg.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/eventlog/lang/de_DE/event.mc diff -c openafs/src/WINNT/eventlog/lang/de_DE/event.mc:1.3 openafs/src/WINNT/eventlog/lang/de_DE/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/de_DE/event.mc:1.3 Thu Jan 11 01:28:27 2001 --- openafs/src/WINNT/eventlog/lang/de_DE/event.mc Mon May 5 16:11:45 2003 *************** *** 1,170 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! LanguageNames=(German=1:MSG000001) ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=German ! Testnachricht fr das AFS-Server-Ereignisprotokoll. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=German ! Testnachricht fr das AFS-Server-Ereignisprotokoll (Zeichenfolge1: %1, Zeichenfolge2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=German ! Ein AFS-Server-Prozeﾟ konnte kein Assert durchfhren: Zeile %1 in Datei %2. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=German ! %1 konnte das Installationsverzeichnis der AFS-Software nicht finden. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=German ! %1 konnte die Windows Sockets-Bibliothek nicht initialisieren. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=German ! Der AFS BOS-Steuerungsservice wurde gestartet. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=German ! Der AFS BOS-Steuerungsservice wurde beendet. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice kann keine Daten zum System-SCM bertragen. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice kann keine Ereignissteuerroutine registrieren. Die AFS-Server-Software ist mglicherweise nicht einwandfrei konfiguriert. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=German ! Der AFS BOS-Steuerungsservice kann die erforderlichen Systemressourcen nicht erhalten. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=German ! Im AFS BOS-Steuerungsservice ist ein interner Fehler aufgetreten. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=German ! Der AFS BOS-Steuerungsservice konnte das Installationsverzeichnis der AFS-Software nicht finden. Die AFS-Server-Software ist mglicherweise nicht einwandfrei konfiguriert. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice konnte den AFS BOS-Server nicht oder nicht erneut starten. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice konnte den AFS BOS-Server nicht beenden. Alle AFS-Server-Prozesse mssen manuell beendet werden (versuchen Sie, ber den Befehl afskill dem AFS BOS-Server ein SIGQUIT-Signal zu senden). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=German ! Der AFS BOS-Steuerungsservice wartet nicht mehr l舅ger auf das Beenden des AFS BOS-Servers. ﾜberprfen Sie vor dem Neustart des Service, ob alle AFS-Server-Prozesse beendet wurden. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=German ! Der AFS BOS-Steuerungsservice startet den AFS BOS-Server neu. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=German ! Der AFS BOS-Steuerungsservice hat festgestellt, daﾟ der AFS BOS-Server ohne Anforderung eines Neustarts beendet wurde. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,170 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! LanguageNames=(German=1:MSG000001) ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=German ! Testnachricht fr das AFS-Server-Ereignisprotokoll. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=German ! Testnachricht fr das AFS-Server-Ereignisprotokoll (Zeichenfolge1: %1, Zeichenfolge2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=German ! Ein AFS-Server-Prozeﾟ konnte kein Assert durchfhren: Zeile %1 in Datei %2. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=German ! %1 konnte das Installationsverzeichnis der AFS-Software nicht finden. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=German ! %1 konnte die Windows Sockets-Bibliothek nicht initialisieren. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=German ! Der AFS BOS-Steuerungsservice wurde gestartet. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=German ! Der AFS BOS-Steuerungsservice wurde beendet. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice kann keine Daten zum System-SCM bertragen. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice kann keine Ereignissteuerroutine registrieren. Die AFS-Server-Software ist mglicherweise nicht einwandfrei konfiguriert. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=German ! Der AFS BOS-Steuerungsservice kann die erforderlichen Systemressourcen nicht erhalten. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=German ! Im AFS BOS-Steuerungsservice ist ein interner Fehler aufgetreten. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=German ! Der AFS BOS-Steuerungsservice konnte das Installationsverzeichnis der AFS-Software nicht finden. Die AFS-Server-Software ist mglicherweise nicht einwandfrei konfiguriert. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice konnte den AFS BOS-Server nicht oder nicht erneut starten. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=German ! Der AFS BOS-Steuerungsservice konnte den AFS BOS-Server nicht beenden. Alle AFS-Server-Prozesse mssen manuell beendet werden (versuchen Sie, ber den Befehl afskill dem AFS BOS-Server ein SIGQUIT-Signal zu senden). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=German ! Der AFS BOS-Steuerungsservice wartet nicht mehr l舅ger auf das Beenden des AFS BOS-Servers. ﾜberprfen Sie vor dem Neustart des Service, ob alle AFS-Server-Prozesse beendet wurden. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=German ! Der AFS BOS-Steuerungsservice startet den AFS BOS-Server neu. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=German ! Der AFS BOS-Steuerungsservice hat festgestellt, daﾟ der AFS BOS-Server ohne Anforderung eines Neustarts beendet wurde. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/eventlog/lang/es_ES/event.mc diff -c openafs/src/WINNT/eventlog/lang/es_ES/event.mc:1.3 openafs/src/WINNT/eventlog/lang/es_ES/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/es_ES/event.mc:1.3 Thu Jan 11 01:28:36 2001 --- openafs/src/WINNT/eventlog/lang/es_ES/event.mc Mon May 5 16:11:47 2003 *************** *** 1,178 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=English ! Mensaje de prueba de registro cronol=gico de eventos de servidor de AFS. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=English ! Mensaje de prueba de registro cronol=gico de eventos de servidor de AFS (str1: %1, str2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=English ! Ha resultado an=mala una afirmaci=n en un proceso de servidor de AFS: lfnea %1 en el archivo %2. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=English ! %1 no ha podido localizar el directorio de instalaci=n de software de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=English ! %1 no ha podido inicializar la biblioteca de Windows Sockets. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=English ! Se ha iniciado el servicio de control de BOS de AFS. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=English ! Se ha detenido el servicio de control de BOS de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido comunicarse con el SCM de sistema. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido registrar un manejador de eventos. Es posible que el software de servidor de AFS se haya configurado indebidamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=English ! El servicio de control de BOS de AFS no ha podido obtener los recursos de sistema necesarios. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=English ! El servicio de control de BOS de AFS ha sufrido un error interno. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=English ! El servicio de control de BOS de AFS no ha podido localizar el ! directorio de instalaci=n de software de AFS. Es posible que el ! software de servidor de AFS se haya configurado indebidamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido iniciar o reiniciar el bosserver de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido ! detener el bosserver de AFS. Todos los procesos de servidor de AFS ! deben detenerse manualmente (pruebe a enviar al bosserver ! de AFS una seｱal de SIGQUIT por medio del mandato afskill). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=English ! El servicio de control de BOS de AFS ha dejado de esperar ! la detenci=n del bosserver de AFS. Compruebe que se han detenido ! todos los procesos de servidor de AFS antes de reiniciar el servicio. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=English ! El servicio de control de BOS de AFS estﾟ reiniciando el bosserver de AFS. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=English ! El servicio de control de BOS de AFS ha detectado que el ! bosserver de AFS ha salido sin solicitar un reinicio. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,178 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=English ! Mensaje de prueba de registro cronol=gico de eventos de servidor de AFS. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=English ! Mensaje de prueba de registro cronol=gico de eventos de servidor de AFS (str1: %1, str2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=English ! Ha resultado an=mala una afirmaci=n en un proceso de servidor de AFS: lfnea %1 en el archivo %2. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=English ! %1 no ha podido localizar el directorio de instalaci=n de software de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=English ! %1 no ha podido inicializar la biblioteca de Windows Sockets. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=English ! Se ha iniciado el servicio de control de BOS de AFS. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=English ! Se ha detenido el servicio de control de BOS de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido comunicarse con el SCM de sistema. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido registrar un manejador de eventos. Es posible que el software de servidor de AFS se haya configurado indebidamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=English ! El servicio de control de BOS de AFS no ha podido obtener los recursos de sistema necesarios. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=English ! El servicio de control de BOS de AFS ha sufrido un error interno. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=English ! El servicio de control de BOS de AFS no ha podido localizar el ! directorio de instalaci=n de software de AFS. Es posible que el ! software de servidor de AFS se haya configurado indebidamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido iniciar o reiniciar el bosserver de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=English ! El servicio de control de BOS de AFS no ha podido ! detener el bosserver de AFS. Todos los procesos de servidor de AFS ! deben detenerse manualmente (pruebe a enviar al bosserver ! de AFS una seｱal de SIGQUIT por medio del mandato afskill). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=English ! El servicio de control de BOS de AFS ha dejado de esperar ! la detenci=n del bosserver de AFS. Compruebe que se han detenido ! todos los procesos de servidor de AFS antes de reiniciar el servicio. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=English ! El servicio de control de BOS de AFS estﾟ reiniciando el bosserver de AFS. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=English ! El servicio de control de BOS de AFS ha detectado que el ! bosserver de AFS ha salido sin solicitar un reinicio. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/eventlog/lang/ja_JP/event.mc diff -c openafs/src/WINNT/eventlog/lang/ja_JP/event.mc:1.3 openafs/src/WINNT/eventlog/lang/ja_JP/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/ja_JP/event.mc:1.3 Thu Jan 11 01:28:38 2001 --- openafs/src/WINNT/eventlog/lang/ja_JP/event.mc Mon May 5 16:11:47 2003 *************** *** 1,171 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! LanguageNames=(Japanese=1:MSG000001) ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=Japanese ! AFS サーバー・イベント・ログ・テスト・メッセージ。 ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=Japanese ! AFS サーバー・イベント・ログ・テスト・メッセージ (str1: %1, str2: %2)。 ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=Japanese ! AFS サーバー・プロセスが代入に失敗しました: 行 %1 ファイル %2。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=Japanese ! %1 が AFS ソフトウェアのインストール・ディレクトリーを見つけられませんでした。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=Japanese ! %1 が Windows Socket ライブラリーを初期化できませんでした。 ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=Japanese ! AFS BOS 制御サービスが始動しました。 ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=Japanese ! AFS BOS 制御サービスが停止しました。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=Japanese ! AFS BOS 制御サービスがシステム SCM と通信できません。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=Japanese ! AFS BOS 制御サービスがイベント・ハンドラーを登録できません。AFS サーバー・ソフトウェアが正しく構成されていない可能性があります。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=Japanese ! AFS BOS 制御サービスが必要なシステム・リソースを取得できません。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=Japanese ! AFS BOS 制御サービスが内部エラーを検出しました。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=Japanese ! AFS BOS 制御サービスが AFS ソフトウェアのインストール・ディレクトリーを見つけられませんでした。AFS サーバー・ソフトウェアが正しく構成されていない可能性があります。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver を始動または再始動できませんでした。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver を停止できませんでした。AFS サーバー・プロセスをすべて手動で停止する必要があります (AFS bosserver に afskill コマンドで SIGQUIT シグナルを送信してみてください)。 ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver の停止待ちを中止しました。サービスを再始動する前に、すべての AFS サーバー・プロセスが停止していることを確かめてください。 ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver を再始動しています。 ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=Japanese ! AFS BOS 制御サービスが、AFS bosserver が再始動要求なしで終了したことを検出しました。 ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,171 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! LanguageNames=(Japanese=1:MSG000001) ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=Japanese ! AFS サーバー・イベント・ログ・テスト・メッセージ。 ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=Japanese ! AFS サーバー・イベント・ログ・テスト・メッセージ (str1: %1, str2: %2)。 ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=Japanese ! AFS サーバー・プロセスが代入に失敗しました: 行 %1 ファイル %2。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=Japanese ! %1 が AFS ソフトウェアのインストール・ディレクトリーを見つけられませんでした。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=Japanese ! %1 が Windows Socket ライブラリーを初期化できませんでした。 ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=Japanese ! AFS BOS 制御サービスが始動しました。 ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=Japanese ! AFS BOS 制御サービスが停止しました。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=Japanese ! AFS BOS 制御サービスがシステム SCM と通信できません。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=Japanese ! AFS BOS 制御サービスがイベント・ハンドラーを登録できません。AFS サーバー・ソフトウェアが正しく構成されていない可能性があります。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=Japanese ! AFS BOS 制御サービスが必要なシステム・リソースを取得できません。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=Japanese ! AFS BOS 制御サービスが内部エラーを検出しました。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=Japanese ! AFS BOS 制御サービスが AFS ソフトウェアのインストール・ディレクトリーを見つけられませんでした。AFS サーバー・ソフトウェアが正しく構成されていない可能性があります。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver を始動または再始動できませんでした。 ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver を停止できませんでした。AFS サーバー・プロセスをすべて手動で停止する必要があります (AFS bosserver に afskill コマンドで SIGQUIT シグナルを送信してみてください)。 ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver の停止待ちを中止しました。サービスを再始動する前に、すべての AFS サーバー・プロセスが停止していることを確かめてください。 ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=Japanese ! AFS BOS 制御サービスが AFS bosserver を再始動しています。 ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=Japanese ! AFS BOS 制御サービスが、AFS bosserver が再始動要求なしで終了したことを検出しました。 ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/eventlog/lang/ko_KR/event.mc diff -c openafs/src/WINNT/eventlog/lang/ko_KR/event.mc:1.3 openafs/src/WINNT/eventlog/lang/ko_KR/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/ko_KR/event.mc:1.3 Thu Jan 11 01:28:41 2001 --- openafs/src/WINNT/eventlog/lang/ko_KR/event.mc Mon May 5 16:11:47 2003 *************** *** 1,175 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! LanguageNames=(Korean=1:MSG000001) ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=Korean ! AFS ｼｭｹ ﾀﾌｺ･ﾆｮ ｷﾎｱﾗ ｰﾋｻ ｸﾞｽﾃﾁ. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=Korean ! AFS ｼｭｹ ﾀﾌｺ･ﾆｮ ｷﾎｱﾗ ｰﾋｻ ｸﾞｽﾃﾁ(str1: %1, str2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=Korean ! AFS ｼｭｹ ﾇﾁｷﾎｼｼｽｺｰ｡ ｽﾂﾀﾎｿ｡ ｽﾇﾆﾐﾇﾟｽﾀｴﾏｴﾙ: %2 ﾆﾄﾀﾏﾀﾇ %1 ﾇ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=Korean ! %1ﾀﾌ(ｰ｡) AFS ｼﾒﾇﾁﾆｮｿｾ ｼｳﾄ｡ ｵｷｺﾅ荳ｮｸｦ ﾃ｣ﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=Korean ! %1ﾀﾌ(ｰ｡) Windows ｼﾒﾄﾏ ｶﾀﾌｺｷｯｸｮｸｦ ﾃﾊｱ篳ｭﾇﾏﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ｽﾃﾀﾛｵﾇｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ﾁ､ﾁｵﾇｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ SCM ｽﾃｽｺﾅﾛｰ ﾅｽﾅﾇﾒ ｼ ｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ﾀﾌｺ･ﾆｮ ﾃｳｸｮｱ篋ｦ ｵｷﾏﾇﾒ ｼ ｾｽﾀｴﾏｴﾙ. ! AFS ｼｭｹ ｼﾒﾇﾁﾆｮｿｾｰ｡ ﾁｦｴｷﾎ ｱｸｼｺｵﾇﾁ ｾﾊﾀｺ ｰﾍﾀﾏ ｼｵｵ ﾀﾖｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ﾇﾊｿ萇ﾑ ｽﾃｽｺﾅﾛ ﾀﾚｿﾀｻ ｾﾀｻ ｼ ｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｿ｡ ｳｻｺﾎ ｿﾀｷｰ｡ ｹﾟｻﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS ｼﾒﾇﾁﾆｮｿｾ ｼｳﾄ｡ ｵｷｺﾅ荳ｮｸｦ ﾃ｣ﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! AFS ｼｭｹ ｼﾒﾇﾁﾆｮｿｾｰ｡ ﾁｦｴｷﾎ ｱｸｼｺｵﾇﾁ ｾﾊﾀｺ ｰﾍﾀﾏ ｼｵｵ ﾀﾖｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｸｦ ｽﾃﾀﾛ ｶﾇｴﾂ ﾀ鄂ﾃﾀﾛﾇﾏﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｸｦ ﾁ､ﾁﾇﾏﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! ｸｵ AFS ｼｭｹ ﾇﾁｷﾎｼｼｽｺｸｦ ｼｵｿﾀｸｷﾎ ﾁ､ﾁｽﾃﾄﾑｾﾟ ﾇﾕｴﾏｴﾙ(afskill ｸｷﾉﾀｻ ﾅﾇﾘ SIGQUIT ｽﾅﾈ｣ｸｦ AFS bosserverｷﾎ ｺｸｳｻ ｺｸｽﾊｽﾃｿﾀ). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｰ｡ ﾁﾟﾁｵﾉ ｶｧｱﾁ ｱ箒ﾙｸｮｴﾂ ｰﾍﾀｻ ﾆｱ簓ﾟｽﾀｴﾏｴﾙ. ! ｸｵ AFS ｼｭｹ ﾇﾁｷﾎｼｼｽｺｰ｡ ｼｭｺｽｺｸｦ ﾀ鄂ﾃﾀﾛﾇﾏｱ ﾀｿ｡ ﾁ､ﾁｵﾇｾｴﾂﾁ ﾈｮﾀﾎﾇﾏｽﾊｽﾃｿﾀ. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｸｦ ﾀ鄂ﾃﾀﾛﾇﾏｰ ﾀﾖｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｰ｡ ﾀ鄂ﾃﾀﾛﾀｻ ｿ菘ｻﾇﾏﾁ ｾﾊｰ ﾁｾｷ盞ﾇｾﾀｽﾀｻ ｰｨﾁﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,175 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! LanguageNames=(Korean=1:MSG000001) ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=Korean ! AFS ｼｭｹ ﾀﾌｺ･ﾆｮ ｷﾎｱﾗ ｰﾋｻ ｸﾞｽﾃﾁ. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=Korean ! AFS ｼｭｹ ﾀﾌｺ･ﾆｮ ｷﾎｱﾗ ｰﾋｻ ｸﾞｽﾃﾁ(str1: %1, str2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=Korean ! AFS ｼｭｹ ﾇﾁｷﾎｼｼｽｺｰ｡ ｽﾂﾀﾎｿ｡ ｽﾇﾆﾐﾇﾟｽﾀｴﾏｴﾙ: %2 ﾆﾄﾀﾏﾀﾇ %1 ﾇ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=Korean ! %1ﾀﾌ(ｰ｡) AFS ｼﾒﾇﾁﾆｮｿｾ ｼｳﾄ｡ ｵｷｺﾅ荳ｮｸｦ ﾃ｣ﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=Korean ! %1ﾀﾌ(ｰ｡) Windows ｼﾒﾄﾏ ｶﾀﾌｺｷｯｸｮｸｦ ﾃﾊｱ篳ｭﾇﾏﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ｽﾃﾀﾛｵﾇｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ﾁ､ﾁｵﾇｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ SCM ｽﾃｽｺﾅﾛｰ ﾅｽﾅﾇﾒ ｼ ｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ﾀﾌｺ･ﾆｮ ﾃｳｸｮｱ篋ｦ ｵｷﾏﾇﾒ ｼ ｾｽﾀｴﾏｴﾙ. ! AFS ｼｭｹ ｼﾒﾇﾁﾆｮｿｾｰ｡ ﾁｦｴｷﾎ ｱｸｼｺｵﾇﾁ ｾﾊﾀｺ ｰﾍﾀﾏ ｼｵｵ ﾀﾖｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ ﾇﾊｿ萇ﾑ ｽﾃｽｺﾅﾛ ﾀﾚｿﾀｻ ｾﾀｻ ｼ ｾｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｿ｡ ｳｻｺﾎ ｿﾀｷｰ｡ ｹﾟｻﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS ｼﾒﾇﾁﾆｮｿｾ ｼｳﾄ｡ ｵｷｺﾅ荳ｮｸｦ ﾃ｣ﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! AFS ｼｭｹ ｼﾒﾇﾁﾆｮｿｾｰ｡ ﾁｦｴｷﾎ ｱｸｼｺｵﾇﾁ ｾﾊﾀｺ ｰﾍﾀﾏ ｼｵｵ ﾀﾖｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｸｦ ｽﾃﾀﾛ ｶﾇｴﾂ ﾀ鄂ﾃﾀﾛﾇﾏﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｸｦ ﾁ､ﾁﾇﾏﾁ ｸﾇﾟｽﾀｴﾏｴﾙ. ! ｸｵ AFS ｼｭｹ ﾇﾁｷﾎｼｼｽｺｸｦ ｼｵｿﾀｸｷﾎ ﾁ､ﾁｽﾃﾄﾑｾﾟ ﾇﾕｴﾏｴﾙ(afskill ｸｷﾉﾀｻ ﾅﾇﾘ SIGQUIT ｽﾅﾈ｣ｸｦ AFS bosserverｷﾎ ｺｸｳｻ ｺｸｽﾊｽﾃｿﾀ). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｰ｡ ﾁﾟﾁｵﾉ ｶｧｱﾁ ｱ箒ﾙｸｮｴﾂ ｰﾍﾀｻ ﾆｱ簓ﾟｽﾀｴﾏｴﾙ. ! ｸｵ AFS ｼｭｹ ﾇﾁｷﾎｼｼｽｺｰ｡ ｼｭｺｽｺｸｦ ﾀ鄂ﾃﾀﾛﾇﾏｱ ﾀｿ｡ ﾁ､ﾁｵﾇｾｴﾂﾁ ﾈｮﾀﾎﾇﾏｽﾊｽﾃｿﾀ. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｸｦ ﾀ鄂ﾃﾀﾛﾇﾏｰ ﾀﾖｽﾀｴﾏｴﾙ. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=Korean ! AFS BOS ﾁｦｾ ｼｭｺｽｺｰ｡ AFS bosserverｰ｡ ﾀ鄂ﾃﾀﾛﾀｻ ｿ菘ｻﾇﾏﾁ ｾﾊｰ ﾁｾｷ盞ﾇｾﾀｽﾀｻ ｰｨﾁﾇﾟｽﾀｴﾏｴﾙ. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/eventlog/lang/pt_BR/event.mc diff -c openafs/src/WINNT/eventlog/lang/pt_BR/event.mc:1.3 openafs/src/WINNT/eventlog/lang/pt_BR/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/pt_BR/event.mc:1.3 Thu Jan 11 01:28:43 2001 --- openafs/src/WINNT/eventlog/lang/pt_BR/event.mc Mon May 5 16:11:48 2003 *************** *** 1,170 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=English ! Mensagem de teste do log de eventos para o servidor de AFS. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=English ! Mensagem de teste do log de eventos para o servidor do AFS (str1: %1, str2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=English ! Um processo para o servidor do AFS falhou uma assertiva: linha %1 no arquivo %2. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=English ! %1 n縊 conseguiu localizar o diretrio de instala鈬o para o software de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=English ! %1 n縊 conseguiu inicializar a biblioteca de Sockets Windows. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=English ! O servi輟 de controle BOS do AFS foi iniciado. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=English ! O servi輟 de controle BOS do AFS foi interrompido. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 consegue se comunicar com o SCM do sistema. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 consegue registrar um manipulador de eventos. O software do servidor do AFS pode estar configurado incorretamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=English ! O servi輟 de controle BOS do AFS n縊 consegue obter recursos necess疵ios do sistema. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=English ! O servi輟 de controle BOS do AFS sofreu um erro interno. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=English ! O servi輟 de controle BOS do AFS n縊 conseguiu localizar o diretrio de instala鈬o para o software do AFS. O software do servidor do AFS pode estar configurado incorretamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 conseguiu iniciar ou reiniciar o AFS bosserver. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 conseguiu interromper o AFS bosserver. Todos os processos para o servidor do AFS precisam ser interrompidos manualmente (tente enviar um sinal SIGQUIT ao AFS bosserver atrav駸 do comando afskill). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=English ! O servi輟 de controle BOS do AFS desistiu de aguardar pela parada do AFS bosserver. Verifique que todos os processos para o servidor do AFS tenham parado antes de reiniciar o servi輟. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=English ! O servi輟 de controle BOS do AFS est reiniciando o AFS bosserver. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=English ! O servi輟 de controle BOS do AFS detectou que o AFS bosserver saiu sem pedir um reincio. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,170 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=English ! Mensagem de teste do log de eventos para o servidor de AFS. ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=English ! Mensagem de teste do log de eventos para o servidor do AFS (str1: %1, str2: %2). ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=English ! Um processo para o servidor do AFS falhou uma assertiva: linha %1 no arquivo %2. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=English ! %1 n縊 conseguiu localizar o diretrio de instala鈬o para o software de AFS. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=English ! %1 n縊 conseguiu inicializar a biblioteca de Sockets Windows. ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=English ! O servi輟 de controle BOS do AFS foi iniciado. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=English ! O servi輟 de controle BOS do AFS foi interrompido. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 consegue se comunicar com o SCM do sistema. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 consegue registrar um manipulador de eventos. O software do servidor do AFS pode estar configurado incorretamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=English ! O servi輟 de controle BOS do AFS n縊 consegue obter recursos necess疵ios do sistema. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=English ! O servi輟 de controle BOS do AFS sofreu um erro interno. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=English ! O servi輟 de controle BOS do AFS n縊 conseguiu localizar o diretrio de instala鈬o para o software do AFS. O software do servidor do AFS pode estar configurado incorretamente. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 conseguiu iniciar ou reiniciar o AFS bosserver. ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=English ! O servi輟 de controle BOS do AFS n縊 conseguiu interromper o AFS bosserver. Todos os processos para o servidor do AFS precisam ser interrompidos manualmente (tente enviar um sinal SIGQUIT ao AFS bosserver atrav駸 do comando afskill). ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=English ! O servi輟 de controle BOS do AFS desistiu de aguardar pela parada do AFS bosserver. Verifique que todos os processos para o servidor do AFS tenham parado antes de reiniciar o servi輟. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=English ! O servi輟 de controle BOS do AFS est reiniciando o AFS bosserver. ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=English ! O servi輟 de controle BOS do AFS detectou que o AFS bosserver saiu sem pedir um reincio. ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/eventlog/lang/zh_CN/event.mc diff -c openafs/src/WINNT/eventlog/lang/zh_CN/event.mc:1.3 openafs/src/WINNT/eventlog/lang/zh_CN/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/zh_CN/event.mc:1.3 Thu Jan 11 01:28:46 2001 --- openafs/src/WINNT/eventlog/lang/zh_CN/event.mc Mon May 5 16:11:48 2003 *************** *** 1,172 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=English ! AFS ｷﾎﾆﾊﾂｼﾈﾕﾖｾｲ簗ﾔﾏﾏ｢｡｣ ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=English ! AFS ｷﾎﾆﾊﾂｼﾈﾕﾖｾｲ簗ﾔﾏﾏ｢(str1: %1｣ｬ str2: %2)｡｣ ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=English ! AFS ｷﾎﾆｽｳﾌﾊｧｰﾜ｣ｺﾎﾄｼ %2 ｵﾄﾐﾐ %1｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=English ! %1 ｶｨﾎｻ AFS ﾈｼｰｲﾗｰﾄｿﾂｼﾊｧｰﾜ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=English ! %1 ｳﾊｼｻｯ Windows ﾌﾗｽﾓﾗﾖｿ簗ｧｰﾜ｡｣ ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾒﾑﾆｶｯ｡｣ ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾒﾑﾍ｣ﾖｹ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾎﾞｷｨﾓﾏｵﾍｳ SCM ﾍｨﾐﾅ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾎﾞｷｨﾗ｢ｲ睫ﾂｼｴｦﾀﾆ｡｣ ! AFS ｷﾎﾆﾈｼｿﾉﾄﾜﾎｴﾕﾈｷﾅ葷ﾃ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾎﾞｷｨｻｵﾃｱﾘﾐｵﾄﾏｵﾍｳﾗﾊﾔｴ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎｷ｢ﾏﾖﾒｻｸﾄﾚｲｿｴﾎ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎｶｨﾎｻ AFS ﾈｼｰｲﾗｰﾄｿﾂｼﾊｧｰﾜ｡｣AFS ｷﾎﾆﾈｼｿﾉﾄﾜﾎｴﾕﾈｷﾅ葷ﾃ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾆｶｯｻﾖﾘﾐﾂﾆｶｯ AFS bosserver ﾊｧｰﾜ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾍ｣ﾖｹ AFS bosserver ﾊｧｰﾜ｡｣ﾋﾓﾐ AFS ｷﾎﾆｽｳﾌｱﾘﾐ ! ﾊﾖｹ､ﾍ｣ﾖｹ(ﾍｨｹ afskill ﾃﾁﾏ AFS bosserver ｷ｢ﾋﾍ SIGQUIT ﾐﾅｺﾅ)｡｣ ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎｷﾅﾆｵﾈｴ AFS bosserver ｵﾄﾍ｣ﾖｹ｡｣ﾔﾚﾖﾘﾐﾂﾆｶｯｷﾎﾇｰｼｲ鰺ﾓﾐ AFS ｷﾎﾆｽｳﾌﾊﾇｷﾒﾑﾍ｣ﾖｹ｡｣ ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾕﾔﾚﾖﾘﾐﾂﾆｶｯ AFS bosserver｡｣ ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾕｲ箏ｽ AFS bosserver ﾃｻﾓﾐﾇﾇﾖﾘﾐﾂﾆｶｯｶﾒﾑﾍﾋｳ｡｣ ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,172 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=English ! AFS ｷﾎﾆﾊﾂｼﾈﾕﾖｾｲ簗ﾔﾏﾏ｢｡｣ ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=English ! AFS ｷﾎﾆﾊﾂｼﾈﾕﾖｾｲ簗ﾔﾏﾏ｢(str1: %1｣ｬ str2: %2)｡｣ ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=English ! AFS ｷﾎﾆｽｳﾌﾊｧｰﾜ｣ｺﾎﾄｼ %2 ｵﾄﾐﾐ %1｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=English ! %1 ｶｨﾎｻ AFS ﾈｼｰｲﾗｰﾄｿﾂｼﾊｧｰﾜ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=English ! %1 ｳﾊｼｻｯ Windows ﾌﾗｽﾓﾗﾖｿ簗ｧｰﾜ｡｣ ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾒﾑﾆｶｯ｡｣ ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾒﾑﾍ｣ﾖｹ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾎﾞｷｨﾓﾏｵﾍｳ SCM ﾍｨﾐﾅ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾎﾞｷｨﾗ｢ｲ睫ﾂｼｴｦﾀﾆ｡｣ ! AFS ｷﾎﾆﾈｼｿﾉﾄﾜﾎｴﾕﾈｷﾅ葷ﾃ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾎﾞｷｨｻｵﾃｱﾘﾐｵﾄﾏｵﾍｳﾗﾊﾔｴ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎｷ｢ﾏﾖﾒｻｸﾄﾚｲｿｴﾎ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎｶｨﾎｻ AFS ﾈｼｰｲﾗｰﾄｿﾂｼﾊｧｰﾜ｡｣AFS ｷﾎﾆﾈｼｿﾉﾄﾜﾎｴﾕﾈｷﾅ葷ﾃ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾆｶｯｻﾖﾘﾐﾂﾆｶｯ AFS bosserver ﾊｧｰﾜ｡｣ ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾍ｣ﾖｹ AFS bosserver ﾊｧｰﾜ｡｣ﾋﾓﾐ AFS ｷﾎﾆｽｳﾌｱﾘﾐ ! ﾊﾖｹ､ﾍ｣ﾖｹ(ﾍｨｹ afskill ﾃﾁﾏ AFS bosserver ｷ｢ﾋﾍ SIGQUIT ﾐﾅｺﾅ)｡｣ ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎｷﾅﾆｵﾈｴ AFS bosserver ｵﾄﾍ｣ﾖｹ｡｣ﾔﾚﾖﾘﾐﾂﾆｶｯｷﾎﾇｰｼｲ鰺ﾓﾐ AFS ｷﾎﾆｽｳﾌﾊﾇｷﾒﾑﾍ｣ﾖｹ｡｣ ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾕﾔﾚﾖﾘﾐﾂﾆｶｯ AFS bosserver｡｣ ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=English ! AFS BOS ｿﾘﾖﾆｷﾎﾕｲ箏ｽ AFS bosserver ﾃｻﾓﾐﾇﾇﾖﾘﾐﾂﾆｶｯｶﾒﾑﾍﾋｳ｡｣ ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/eventlog/lang/zh_TW/event.mc diff -c openafs/src/WINNT/eventlog/lang/zh_TW/event.mc:1.3 openafs/src/WINNT/eventlog/lang/zh_TW/event.mc:1.3.6.1 *** openafs/src/WINNT/eventlog/lang/zh_TW/event.mc:1.3 Thu Jan 11 01:28:48 2001 --- openafs/src/WINNT/eventlog/lang/zh_TW/event.mc Mon May 5 16:11:49 2003 *************** *** 1,172 **** ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! LanguageNames=(Chinese_Traditional=1:MSG000001) ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=Chinese_Traditional ! AFS ｦｪAｾｹｨﾆ･､鮟xｴｸﾕｰTｮｧ｡C ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=Chinese_Traditional ! AFS ｦｪAｾｹｨﾆ･､鮟xｴｸﾕｰTｮｧ (str1: %1, str2: %2)｡C ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=Chinese_Traditional ! AFS ｦｪAｾｹｳBｲz･｢ｮﾄｽTｻ{｡Gｦbﾀﾉｮﾗ %2 ｪｺｲﾄ %1 ｦ譯C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=Chinese_Traditional ! %1 ｵLｪkｧ茯 AFS ｳnﾅ鬥wｸﾋ･ﾘｿ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=Chinese_Traditional ! %1 ｵLｪkｰ_ｩlｳ]ｩw Windows Sockets ｵ{ｦ｡ｮw｡C ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=Chinese_Traditional ! ､wｱﾒｰﾊ AFS BOS ｱｱｨｪAｰﾈ｡C ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=Chinese_Traditional ! ､wｰｱ､ AFS BOS ｱｱｨｪAｰﾈ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｻPｨtｲﾎ SCM ｳqｫH｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｵnｿｨﾆ･ｳBｲzｱ`ｦ｡｡CAFS ｦｪAｾｹｳnﾅ鬪ｺｬ[ｺc･iｯ爨｣･ｿｽT｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｨｱo･ｲｭnｪｺｨtｲﾎｸｷｽ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵo･ﾍ､ｺｳ｡ｿｻ~｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｧ茯 AFS ｳnﾅ鬥wｸﾋ･ﾘｿ｡CAFS ｦｪAｾｹｳnﾅ鬪ｺｬ[ｺc･iｯ爨｣･ｿｽT｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｱﾒｰﾊｩﾎｭｫｷsｱﾒｰﾊ AFS ･DｦｪAｾｹ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｰｱ､ AFS ･DｦｪAｾｹ｡Cｩﾒｦｳｪｺ AFS ｦｪAｾｹｳBｲzｳ｣･ｲｶｷ･H､箍ﾊ､隕｡ｰｱ､ ! ｡]ｸﾕｵﾛｳzｹL fskill ｫ･Oｶﾇｰe SIGQUIT ｰTｸｹｨ AFS ･DｦｪAｾｹ｡^｡C ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｩｱｵ･ｭﾔ AFS ･DｦｪAｾｹｰｱ､｡Cｽﾐﾀﾋｬdｩﾒｦｳ AFS ｦｪAｾｹｳBｲzｳ｣､wｦbｭｫｷsｱﾒｰﾊｪAｰﾈ､ｧｫeｰｱ､｡C ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈ･ｿｦbｭｫｷsｱﾒｰﾊ AFS ･DｦｪAｾｹ｡C ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｰｻｴｨ AFS ･DｦｪAｾｹｵｲｧ｡Aｨﾃ･B･ｼｭnｨDｭｫｷsｱﾒｰﾊ｡C ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ --- 1,172 ---- ! ;/* Copyright 2000, International Business Machines Corporation and others. ! ; * All Rights Reserved. ! ; * ! ; * This software has been released under the terms of the IBM Public ! ; * License. For details, see the LICENSE file in the top-level source ! ; * directory or online at http://www.openafs.org/dl/license10.html ! ; * event.mc --(mc)--> event.[h|rc] --(logevent.h + event.h)--> afsevent.h ! ; */ ! ; ! ;#ifndef TRANSARC_AFSEVENT_H ! ;#define TRANSARC_AFSEVENT_H ! ; ! ; ! ;/* AFS event.mc format. ! ; * ! ; * AFS event messages are grouped by category. The MessageId of the ! ; * first message in a given category specifies the starting identifier ! ; * range for that category; the second and later messages in a category ! ; * do NOT specify a MessageId value and thus receive the value of the ! ; * previous message plus one. ! ; * ! ; * To add a new message to an existing category, append it to the end of ! ; * that category. To create a new category, provide an appropriate ! ; * comment line and specify a non-conflicting MessageId for the first ! ; * message in the new category. ! ; */ ! ; ! ! ! MessageIdTypedef=unsigned ! LanguageNames=(Chinese_Traditional=1:MSG000001) ! ! ; ! ;/* Test message text */ ! ; ! ! MessageId=0x0001 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_TEST_MSG_NOARGS ! Language=Chinese_Traditional ! AFS ｦｪAｾｹｨﾆ･､鮟xｴｸﾕｰTｮｧ｡C ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS ! Language=Chinese_Traditional ! AFS ｦｪAｾｹｨﾆ･､鮟xｴｸﾕｰTｮｧ (str1: %1, str2: %2)｡C ! . ! ! ! ! ; ! ;/* General messages for all AFS server processes */ ! ; ! ! MessageId=0x0101 ! Severity=Error ! SymbolicName=AFSEVT_SVR_FAILED_ASSERT ! Language=Chinese_Traditional ! AFS ｦｪAｾｹｳBｲz･｢ｮﾄｽTｻ{｡Gｦbﾀﾉｮﾗ %2 ｪｺｲﾄ %1 ｦ譯C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR ! Language=Chinese_Traditional ! %1 ｵLｪkｧ茯 AFS ｳnﾅ鬥wｸﾋ･ﾘｿ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED ! Language=Chinese_Traditional ! %1 ｵLｪkｰ_ｩlｳ]ｩw Windows Sockets ｵ{ｦ｡ｮw｡C ! . ! ! ! ! ; ! ;/* AFS BOS control (startup/shutdown) service messages */ ! ; ! ! MessageId=0x0201 ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STARTED ! Language=Chinese_Traditional ! ､wｱﾒｰﾊ AFS BOS ｱｱｨｪAｰﾈ｡C ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_STOPPED ! Language=Chinese_Traditional ! ､wｰｱ､ AFS BOS ｱｱｨｪAｰﾈ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｻPｨtｲﾎ SCM ｳqｫH｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｵnｿｨﾆ･ｳBｲzｱ`ｦ｡｡CAFS ｦｪAｾｹｳnﾅ鬪ｺｬ[ｺc･iｯ爨｣･ｿｽT｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｨｱo･ｲｭnｪｺｨtｲﾎｸｷｽ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵo･ﾍ､ｺｳ｡ｿｻ~｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｧ茯 AFS ｳnﾅ鬥wｸﾋ･ﾘｿ｡CAFS ｦｪAｾｹｳnﾅ鬪ｺｬ[ｺc･iｯ爨｣･ｿｽT｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｱﾒｰﾊｩﾎｭｫｷsｱﾒｰﾊ AFS ･DｦｪAｾｹ｡C ! . ! ! MessageId= ! Severity=Error ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｵLｪkｰｱ､ AFS ･DｦｪAｾｹ｡Cｩﾒｦｳｪｺ AFS ｦｪAｾｹｳBｲzｳ｣･ｲｶｷ･H､箍ﾊ､隕｡ｰｱ､ ! ｡]ｸﾕｵﾛｳzｹL fskill ｫ･Oｶﾇｰe SIGQUIT ｰTｸｹｨ AFS ･DｦｪAｾｹ｡^｡C ! . ! ! MessageId= ! Severity=Warning ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｩｱｵ･ｭﾔ AFS ･DｦｪAｾｹｰｱ､｡Cｽﾐﾀﾋｬdｩﾒｦｳ AFS ｦｪAｾｹｳBｲzｳ｣､wｦbｭｫｷsｱﾒｰﾊｪAｰﾈ､ｧｫeｰｱ､｡C ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈ･ｿｦbｭｫｷsｱﾒｰﾊ AFS ･DｦｪAｾｹ｡C ! . ! ! MessageId= ! Severity=Informational ! SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT ! Language=Chinese_Traditional ! AFS BOS ｱｱｨｪAｰﾈｰｻｴｨ AFS ･DｦｪAｾｹｵｲｧ｡Aｨﾃ･B･ｼｭnｨDｭｫｷsｱﾒｰﾊ｡C ! . ! ! ! ! ; ! ;#endif /* TRANSARC_AFSEVENT_H */ Index: openafs/src/WINNT/install/InstallShield5/NTMakefile diff -c openafs/src/WINNT/install/InstallShield5/NTMakefile:1.6.2.3 openafs/src/WINNT/install/InstallShield5/NTMakefile:1.6.2.4 *** openafs/src/WINNT/install/InstallShield5/NTMakefile:1.6.2.3 Thu Dec 5 00:59:54 2002 --- openafs/src/WINNT/install/InstallShield5/NTMakefile Thu May 15 10:17:38 2003 *************** *** 30,35 **** --- 30,44 ---- #check which version of the complier we are using prep: AFS_component_version_number.txt + ! IF (!EXIST($(DESTDIR)\WinInstall\Config\wininet.dll)) + ! ERROR File Not found:$(DESTDIR)\WinInstall\Config\wininet.dll + ! ENDIF + ! IF (!EXIST($(DESTDIR)\WinInstall\Config\shlwapi.dll)) + ! ERROR File Not found:$(DESTDIR)\WinInstall\Config\shlwapi.dll + ! ENDIF + ! IF (!EXIST($(DESTDIR)\WinInstall\Config\$(CELLSERVDB_INSTALL))) + ! ERROR File Not found:$(DESTDIR)\WinInstall\Config\$(CELLSERVDB_INSTALL) + ! ENDIF $(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)" ".\lang\en_US\value.txt" ".\lang\en_US\value.shl" $(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)" "default.txt" "default.rge" $(DESTDIR)\bin\util_cr.exe @ "$(AFSROOT)\src\WINNT\install\InstallShield5\lang\en_US\value.shl" "[DATA] CELLSERVDB_CONFIGNAME=$(CELLSERVDB_CONFIGNAME)" *************** *** 50,56 **** CreateISDirTree.bat ScatterFiles.bat CreateGeneratedFiles.bat ! CompileScript.bat $(COPY) $(DESTDIR)\WinInstall\Config\wininet.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\." $(COPY) $(DESTDIR)\WinInstall\Config\shlwapi.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\." $(COPY) ..\..\afs_setup_utils\_isuser\_isuser.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\." --- 59,66 ---- CreateISDirTree.bat ScatterFiles.bat CreateGeneratedFiles.bat ! pause ! # CompileScript.bat $(COPY) $(DESTDIR)\WinInstall\Config\wininet.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\." $(COPY) $(DESTDIR)\WinInstall\Config\shlwapi.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\." $(COPY) ..\..\afs_setup_utils\_isuser\_isuser.dll ".\Setup Files\Compressed Files\0009-English\Intel 32\." Index: openafs/src/WINNT/pthread/pthread.rc diff -c openafs/src/WINNT/pthread/pthread.rc:1.2 openafs/src/WINNT/pthread/pthread.rc:1.2.8.1 *** openafs/src/WINNT/pthread/pthread.rc:1.2 Sat Nov 4 05:03:05 2000 --- openafs/src/WINNT/pthread/pthread.rc Tue Jul 1 20:35:24 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Pthread DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afspthread" + #define AFS_VERINFO_FILENAME "afspthread.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/WINNT/pthread/pthread95.rc diff -c openafs/src/WINNT/pthread/pthread95.rc:1.2 openafs/src/WINNT/pthread/pthread95.rc:1.2.8.1 *** openafs/src/WINNT/pthread/pthread95.rc:1.2 Sat Nov 4 05:03:05 2000 --- openafs/src/WINNT/pthread/pthread95.rc Tue Jul 1 20:35:24 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Pthread DLL (Windows 95)" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afspthread95" + #define AFS_VERINFO_FILENAME "afspthread.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/afs/Makefile.in diff -c openafs/src/afs/Makefile.in:1.4.2.3 openafs/src/afs/Makefile.in:1.4.2.7 *** openafs/src/afs/Makefile.in:1.4.2.3 Wed Aug 21 15:24:54 2002 --- openafs/src/afs/Makefile.in Mon Jul 7 16:16:24 2003 *************** *** 25,32 **** SYS_NAME=@AFS_SYSNAME@ SHELL=/bin/sh ! KERNELDIR = ../libafs/ ! UKERNELDIR = ../libuafs/ include ../config/Makefile.${SYS_NAME} --- 25,32 ---- SYS_NAME=@AFS_SYSNAME@ SHELL=/bin/sh ! KERNELDIR = ../libafs ! UKERNELDIR = ../libuafs include ../config/Makefile.${SYS_NAME} *************** *** 36,56 **** ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \ esac # NOTE: linux case uses --new as well to work around bug in some versions of # gencat. ! kinstall: ${KERNELDIR}/afs AFS_component_version_number.c ! -chmod 666 ${KERNELDIR}afs/* ! ${COMPILE_ET} -v 2 afs_trace.et ! ${INSTALL} *.[csh] ${KERNELDIR}afs ! ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}afs ! ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}afs -$(RM) -f afszcm.cat case ${SYS_NAME} in \ sgi_* ) \ gencat -m afszcm.cat afs_trace.msf ;; \ sun*_4* ) \ /usr/etc/gencat afszcm.cat afs_trace.msf ;; \ ! *_linux* ) \ gencat --new afszcm.cat afs_trace.msf ;; \ ppc_darwin* | i386_fbsd*) \ echo No gencat for ${SYS_NAME} ;; \ --- 36,60 ---- ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \ esac + kinstall: ${KERNELDIR}/afs AFS_component_version_number.c afs_trace.h afszcm.cat + -chmod 666 ${KERNELDIR}/afs/* + ${INSTALL} *.[csh] ${KERNELDIR}/afs + ${INSTALL} VNOPS/*.[csh] ${KERNELDIR}/afs + ${INSTALL} ${AFS_OSTYPE}/*.[csh] ${KERNELDIR}/afs + + afs_trace.h: afs_trace.et + ${COMPILE_ET} -v 2 afs_trace.et + # NOTE: linux case uses --new as well to work around bug in some versions of # gencat. ! afszcm.cat: afs_trace.msf -$(RM) -f afszcm.cat case ${SYS_NAME} in \ sgi_* ) \ gencat -m afszcm.cat afs_trace.msf ;; \ sun*_4* ) \ /usr/etc/gencat afszcm.cat afs_trace.msf ;; \ ! *_linux* | *_umlinux* ) \ gencat --new afszcm.cat afs_trace.msf ;; \ ppc_darwin* | i386_fbsd*) \ echo No gencat for ${SYS_NAME} ;; \ *************** *** 61,72 **** ${KERNELDIR}/afs: mkdir -p $@ ! ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c ! -chmod 666 ${UKERNELDIR}afs/* ! ${COMPILE_ET} -v 2 afs_trace.et ! ${INSTALL} *.[csh] ${UKERNELDIR}afs ! ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}afs ! ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}afs ${UKERNELDIR}/afs: mkdir -p $@ --- 65,75 ---- ${KERNELDIR}/afs: mkdir -p $@ ! ukinstall: ${UKERNELDIR}/afs AFS_component_version_number.c afs_trace.h ! -chmod 666 ${UKERNELDIR}/afs/* ! ${INSTALL} *.[csh] ${UKERNELDIR}/afs ! ${INSTALL} VNOPS/*.[csh] ${UKERNELDIR}/afs ! ${INSTALL} UKERNEL/*.[csh] ${UKERNELDIR}/afs ${UKERNELDIR}/afs: mkdir -p $@ Index: openafs/src/afs/afs_analyze.c diff -c openafs/src/afs/afs_analyze.c:1.6.4.4 openafs/src/afs/afs_analyze.c:1.6.4.6 *** openafs/src/afs/afs_analyze.c:1.6.4.4 Thu Mar 6 09:53:24 2003 --- openafs/src/afs/afs_analyze.c Tue Jul 1 19:53:28 2003 *************** *** 13,19 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_analyze.c,v 1.6.4.4 2003/03/06 14:53:24 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ --- 13,19 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_analyze.c,v 1.6.4.6 2003/07/01 23:53:28 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 129,134 **** --- 129,145 ---- return EWOULDBLOCK; if (acode == VNOVNODE) return ENOENT; + if (acode == VDISKFULL) + return ENOSPC; + if (acode == VOVERQUOTA) + return + #ifdef EDQUOT + EDQUOT + #else + ENOSPC + #endif + ; + return acode; } /*afs_CheckCode*/ *************** *** 384,389 **** --- 395,403 ---- } else { VSleep(afs_BusyWaitPeriod); /* poll periodically */ } + if (shouldRetry != 0) + areq->busyCount++; + return shouldRetry; /* should retry */ } Index: openafs/src/afs/afs_call.c diff -c openafs/src/afs/afs_call.c:1.14.2.18 openafs/src/afs/afs_call.c:1.14.2.24 *** openafs/src/afs/afs_call.c:1.14.2.18 Sun Mar 23 14:47:53 2003 --- openafs/src/afs/afs_call.c Thu May 22 11:52:58 2003 *************** *** 10,16 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_call.c,v 1.14.2.18 2003/03/23 19:47:53 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 10,16 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_call.c,v 1.14.2.24 2003/05/22 15:52:58 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 731,740 **** #endif afs_cold_shutdown = 0; if (parm == 1) afs_cold_shutdown = 1; ! if (afs_globalVFS != 0) ! afs_warn("AFS isn't unmounted yet!\n"); ! ! afs_shutdown(); } #if ! defined(AFS_HPUX90_ENV) || defined(AFS_HPUX100_ENV) --- 731,743 ---- #endif afs_cold_shutdown = 0; if (parm == 1) afs_cold_shutdown = 1; ! #ifndef AFS_DARWIN_ENV ! if (afs_globalVFS != 0) { ! afs_warn("AFS isn't unmounted yet! Call aborted\n"); ! code = EACCES; ! } else ! #endif ! afs_shutdown(); } #if ! defined(AFS_HPUX90_ENV) || defined(AFS_HPUX100_ENV) *************** *** 1090,1100 **** #ifdef AFS_SPARC64_LINUX24_ENV if (current->thread.flags & SPARC_FLAG_32BIT) ! #elif AFS_SPARC64_LINUX20_ENV if (current->tss.flags & SPARC_FLAG_32BIT) #else #error Not done for this linux version ! #endif /* AFS_SPARC64_LINUX20_ENV */ { AFS_COPYIN(cmarg, (caddr_t) &dst32, sizeof dst32, code); if (!code) --- 1093,1105 ---- #ifdef AFS_SPARC64_LINUX24_ENV if (current->thread.flags & SPARC_FLAG_32BIT) ! #elif defined(AFS_SPARC64_LINUX20_ENV) if (current->tss.flags & SPARC_FLAG_32BIT) + #elif defined(AFS_AMD64_LINUX20_ENV) + if (current->thread.flags & THREAD_IA32) #else #error Not done for this linux version ! #endif { AFS_COPYIN(cmarg, (caddr_t) &dst32, sizeof dst32, code); if (!code) *************** *** 1171,1177 **** long parm6; /* not actually used - should be removed */ }; /* Linux system calls only set up for 5 arguments. */ ! asmlinkage int afs_syscall(long syscall, long parm1, long parm2, long parm3, long parm4) { struct afssysargs args, *uap = &args; --- 1176,1182 ---- long parm6; /* not actually used - should be removed */ }; /* Linux system calls only set up for 5 arguments. */ ! asmlinkage long afs_syscall(long syscall, long parm1, long parm2, long parm3, long parm4) { struct afssysargs args, *uap = &args; Index: openafs/src/afs/afs_cell.c diff -c openafs/src/afs/afs_cell.c:1.7.2.9 openafs/src/afs/afs_cell.c:1.7.2.10 *** openafs/src/afs/afs_cell.c:1.7.2.9 Thu Mar 6 09:53:25 2003 --- openafs/src/afs/afs_cell.c Thu May 15 11:49:12 2003 *************** *** 13,19 **** #include #include "afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_cell.c,v 1.7.2.9 2003/03/06 14:53:25 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ --- 13,19 ---- #include #include "afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_cell.c,v 1.7.2.10 2003/05/15 15:49:12 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 160,166 **** code = afs_GetCellHostsAFSDB(acellName, cellHosts, &timeout, &realName); if (code) goto done; code = afs_NewCell(realName, cellHosts, CNoSUID, NULL, 0, 0, timeout); ! if (code) goto done; /* If we found an alias, create it */ if (afs_strcasecmp(acellName, realName)) --- 160,166 ---- code = afs_GetCellHostsAFSDB(acellName, cellHosts, &timeout, &realName); if (code) goto done; code = afs_NewCell(realName, cellHosts, CNoSUID, NULL, 0, 0, timeout); ! if (code && code != EEXIST) goto done; /* If we found an alias, create it */ if (afs_strcasecmp(acellName, realName)) *************** *** 657,663 **** * it must get servers from AFSDB. */ if (timeout && !tc->timeout && tc->cellHosts[0]) { ! code = EINVAL; goto bad; } --- 657,663 ---- * it must get servers from AFSDB. */ if (timeout && !tc->timeout && tc->cellHosts[0]) { ! code = EEXIST; /* This code is checked for in afs_LookupAFSDB */ goto bad; } Index: openafs/src/afs/afs_conn.c diff -c openafs/src/afs/afs_conn.c:1.7.2.1 openafs/src/afs/afs_conn.c:1.7.2.2 *** openafs/src/afs/afs_conn.c:1.7.2.1 Wed Aug 21 16:53:21 2002 --- openafs/src/afs/afs_conn.c Tue May 20 00:23:07 2003 *************** *** 13,25 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_conn.c,v 1.7.2.1 2002/08/21 20:53:21 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) #include #include #ifdef AFS_SGI62_ENV --- 13,27 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_conn.c,v 1.7.2.2 2003/05/20 04:23:07 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) + #if !defined(AFS_LINUX20_ENV) #include + #endif #include #ifdef AFS_SGI62_ENV Index: openafs/src/afs/afs_dcache.c diff -c openafs/src/afs/afs_dcache.c:1.10.2.3 openafs/src/afs/afs_dcache.c:1.10.2.4 *** openafs/src/afs/afs_dcache.c:1.10.2.3 Thu Mar 6 09:53:25 2003 --- openafs/src/afs/afs_dcache.c Tue Jul 1 19:53:28 2003 *************** *** 13,19 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_dcache.c,v 1.10.2.3 2003/03/06 14:53:25 shadow Exp $"); #include "../afs/sysincludes.h" /*Standard vendor system headers*/ #include "../afs/afsincludes.h" /*AFS-based standard headers*/ --- 13,19 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_dcache.c,v 1.10.2.4 2003/07/01 23:53:28 shadow Exp $"); #include "../afs/sysincludes.h" /*Standard vendor system headers*/ #include "../afs/afsincludes.h" /*AFS-based standard headers*/ *************** *** 182,188 **** afs_warnuser(problem_fmt, avolume, partfull); } else ! #ifndef AFS_SUN5_ENV /* EDQUOT doesn't exist on solaris and won't be sent by the server. * Instead ENOSPC will be sent... */ --- 182,188 ---- afs_warnuser(problem_fmt, avolume, partfull); } else ! #ifdef EDQUOT /* EDQUOT doesn't exist on solaris and won't be sent by the server. * Instead ENOSPC will be sent... */ Index: openafs/src/afs/afs_osi.c diff -c openafs/src/afs/afs_osi.c:1.8.2.14 openafs/src/afs/afs_osi.c:1.8.2.15 *** openafs/src/afs/afs_osi.c:1.8.2.14 Sun Mar 23 01:46:32 2003 --- openafs/src/afs/afs_osi.c Fri May 23 02:52:15 2003 *************** *** 10,16 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_osi.c,v 1.8.2.14 2003/03/23 06:46:32 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 10,16 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_osi.c,v 1.8.2.15 2003/05/23 06:52:15 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 399,410 **** --- 399,416 ---- #endif #ifdef AFS_HPUX_ENV { + #if !defined(AFS_HPUX1122_ENV) + /* drop the setting of the clock for now. spl7 is not + * known on hpux11.22 + */ + register ulong_t s; struct timeval t; t.tv_sec = atv->tv_sec; t.tv_usec = atv->tv_usec; s = spl7(); time = t; (void) splx(s); resettodr(atv); + #endif } #else { Index: openafs/src/afs/afs_pioctl.c diff -c openafs/src/afs/afs_pioctl.c:1.22.2.14 openafs/src/afs/afs_pioctl.c:1.22.2.21 *** openafs/src/afs/afs_pioctl.c:1.22.2.14 Thu Mar 6 09:53:25 2003 --- openafs/src/afs/afs_pioctl.c Thu May 22 11:17:29 2003 *************** *** 10,16 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_pioctl.c,v 1.22.2.14 2003/03/06 14:53:25 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 10,16 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_pioctl.c,v 1.22.2.21 2003/05/22 15:17:29 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 208,223 **** } #endif /* defined(AFS_SGI_ENV) && (_MIPS_SZLONG==64) */ ! #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) struct afs_ioctl32 dst32; #ifdef AFS_SPARC64_LINUX24_ENV if (current->thread.flags & SPARC_FLAG_32BIT) ! #elif AFS_SPARC64_LINUX20_ENV if (current->tss.flags & SPARC_FLAG_32BIT) #else #error Not done for this linux type ! #endif /* AFS_SPARC64_LINUX20_ENV */ { AFS_COPYIN(cmarg, (caddr_t) &dst32, sizeof dst32, code); if (!code) --- 208,225 ---- } #endif /* defined(AFS_SGI_ENV) && (_MIPS_SZLONG==64) */ ! #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) struct afs_ioctl32 dst32; #ifdef AFS_SPARC64_LINUX24_ENV if (current->thread.flags & SPARC_FLAG_32BIT) ! #elif defined(AFS_SPARC64_LINUX20_ENV) if (current->tss.flags & SPARC_FLAG_32BIT) + #elif defined(AFS_AMD64_LINUX20_ENV) + if (current->thread.flags & THREAD_IA32) #else #error Not done for this linux type ! #endif { AFS_COPYIN(cmarg, (caddr_t) &dst32, sizeof dst32, code); if (!code) *************** *** 1084,1090 **** return EINVAL; /* out of range */ } inSize = ablob->in_size; ! if (inSize >= PIGGYSIZE) return E2BIG; inData = osi_AllocLargeSpace(AFS_LRALLOCSIZ); if (inSize > 0) { AFS_COPYIN(ablob->in, inData, inSize, code); --- 1086,1096 ---- return EINVAL; /* out of range */ } inSize = ablob->in_size; ! ! /* Do all range checking before continuing */ ! if (inSize >= PIGGYSIZE || inSize < 0 || ablob->out_size < 0) ! return E2BIG; ! inData = osi_AllocLargeSpace(AFS_LRALLOCSIZ); if (inSize > 0) { AFS_COPYIN(ablob->in, inData, inSize, code); Index: openafs/src/afs/afs_server.c diff -c openafs/src/afs/afs_server.c:1.11.2.6 openafs/src/afs/afs_server.c:1.11.2.7 *** openafs/src/afs/afs_server.c:1.11.2.6 Thu Mar 6 09:53:25 2003 --- openafs/src/afs/afs_server.c Tue May 20 00:23:07 2003 *************** *** 32,44 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_server.c,v 1.11.2.6 2003/03/06 14:53:25 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) #include #include #ifdef AFS_SGI62_ENV --- 32,46 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_server.c,v 1.11.2.7 2003/05/20 04:23:07 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) + #if !defined(AFS_LINUX20_ENV) #include + #endif #include #ifdef AFS_SGI62_ENV Index: openafs/src/afs/afs_user.c diff -c openafs/src/afs/afs_user.c:1.8.2.1 openafs/src/afs/afs_user.c:1.8.2.3 *** openafs/src/afs/afs_user.c:1.8.2.1 Wed Aug 21 16:53:22 2002 --- openafs/src/afs/afs_user.c Tue May 20 00:23:07 2003 *************** *** 13,25 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_user.c,v 1.8.2.1 2002/08/21 20:53:22 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) #include #include #ifdef AFS_SGI62_ENV --- 13,27 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_user.c,v 1.8.2.3 2003/05/20 04:23:07 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) + #if !defined(AFS_LINUX20_ENV) #include + #endif #include #ifdef AFS_SGI62_ENV *************** *** 610,616 **** afs_GCPAGs_cred_count++; pag = PagInCred(pcred); ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV) uid = (pag != NOPAG ? pag : pcred->cr_uid); #else uid = (pag != NOPAG ? pag : pcred->cr_ruid); --- 612,618 ---- afs_GCPAGs_cred_count++; pag = PagInCred(pcred); ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV) || defined(AFS_LINUX22_ENV) uid = (pag != NOPAG ? pag : pcred->cr_uid); #else uid = (pag != NOPAG ? pag : pcred->cr_ruid); Index: openafs/src/afs/afs_util.c diff -c openafs/src/afs/afs_util.c:1.5.4.4 openafs/src/afs/afs_util.c:1.5.4.6 *** openafs/src/afs/afs_util.c:1.5.4.4 Thu Mar 6 10:39:43 2003 --- openafs/src/afs/afs_util.c Fri May 23 02:52:16 2003 *************** *** 15,27 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_util.c,v 1.5.4.4 2003/03/06 15:39:43 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) #include #include #ifdef AFS_SGI62_ENV --- 15,29 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_util.c,v 1.5.4.6 2003/05/23 06:52:16 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) + #if !defined(AFS_LINUX20_ENV) #include + #endif #include #ifdef AFS_SGI62_ENV *************** *** 148,154 **** --- 150,160 ---- afs_warn(a,b,c,d,e,f,g,h,i,j) char *a; + #if defined(AFS_USE_VOID_PTR) + void *b, *c, *d, *e, *f, *g, *h, *i, *j; + #else long b,c,d,e,f,g,h,i,j; + #endif { AFS_STATCNT(afs_warn); Index: openafs/src/afs/afs_vcache.c diff -c openafs/src/afs/afs_vcache.c:1.9.2.19 openafs/src/afs/afs_vcache.c:1.9.2.20 *** openafs/src/afs/afs_vcache.c:1.9.2.19 Thu Mar 6 09:53:25 2003 --- openafs/src/afs/afs_vcache.c Tue Jul 1 18:24:17 2003 *************** *** 38,44 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_vcache.c,v 1.9.2.19 2003/03/06 14:53:25 shadow Exp $"); #include "../afs/sysincludes.h" /*Standard vendor system headers*/ #include "../afs/afsincludes.h" /*AFS-based standard headers*/ --- 38,44 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_vcache.c,v 1.9.2.20 2003/07/01 22:24:17 shadow Exp $"); #include "../afs/sysincludes.h" /*Standard vendor system headers*/ #include "../afs/afsincludes.h" /*AFS-based standard headers*/ *************** *** 1061,1066 **** --- 1061,1069 ---- ip->i_mapping = &ip->i_data; #ifdef STRUCT_INODE_HAS_I_TRUNCATE_SEM init_rwsem(&ip->i_truncate_sem); + #endif + #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM + init_rwsem(&ip->i_alloc_sem); #endif #else sema_init(&ip->i_atomic_write, 1); Index: openafs/src/afs/afs_volume.c diff -c openafs/src/afs/afs_volume.c:1.6.2.6 openafs/src/afs/afs_volume.c:1.6.2.7 *** openafs/src/afs/afs_volume.c:1.6.2.6 Thu Mar 6 09:53:25 2003 --- openafs/src/afs/afs_volume.c Tue May 20 00:23:07 2003 *************** *** 18,30 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_volume.c,v 1.6.2.6 2003/03/06 14:53:25 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) #include #include #ifdef AFS_SGI62_ENV --- 18,32 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_volume.c,v 1.6.2.7 2003/05/20 04:23:07 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if !defined(UKERNEL) + #if !defined(AFS_LINUX20_ENV) #include + #endif #include #ifdef AFS_SGI62_ENV Index: openafs/src/afs/sysincludes.h diff -c openafs/src/afs/sysincludes.h:1.6.4.4 openafs/src/afs/sysincludes.h:1.6.4.5 *** openafs/src/afs/sysincludes.h:1.6.4.4 Thu Nov 14 15:20:39 2002 --- openafs/src/afs/sysincludes.h Fri May 23 02:52:16 2003 *************** *** 219,224 **** --- 219,227 ---- struct vfspage; /* for vnode.h compiler warnings */ # include "../h/swap.h" /* for struct swpdbd, for vnode.h compiler warnings */ # include "../h/dbd.h" /* for union idbd, for vnode.h compiler warnings */ + #ifdef AFS_HPUX110_ENV + # include "../h/resource.h" + #endif # endif /* AFS_HPUX_ENV */ #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV) # include *************** *** 270,276 **** --- 273,281 ---- #ifdef AFS_SUN5_ENV # include "../h/time.h" #else + #if !defined(AFS_HPUX_ENV) # include "../h/mbuf.h" + #endif #endif /* AFS_SUN5_ENV */ #include "../rpc/types.h" Index: openafs/src/afs/DARWIN/osi_vfsops.c diff -c openafs/src/afs/DARWIN/osi_vfsops.c:1.4.2.1 openafs/src/afs/DARWIN/osi_vfsops.c:1.4.2.2 *** openafs/src/afs/DARWIN/osi_vfsops.c:1.4.2.1 Tue Apr 23 21:41:22 2002 --- openafs/src/afs/DARWIN/osi_vfsops.c Thu May 15 11:09:35 2003 *************** *** 1,7 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/afs/DARWIN/osi_vfsops.c,v 1.4.2.1 2002/04/24 01:41:22 zacheiss Exp $"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ --- 1,7 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/afs/DARWIN/osi_vfsops.c,v 1.4.2.2 2003/05/15 15:09:35 shadow Exp $"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ *************** *** 67,73 **** AFS_GLOCK(); AFS_STATCNT(afs_mount); ! if (afs_globalVFS) { /* Don't allow remounts. */ AFS_GUNLOCK(); return (EBUSY); } --- 67,73 ---- AFS_GLOCK(); AFS_STATCNT(afs_mount); ! if (data == NULL && afs_globalVFS) { /* Don't allow remounts. */ AFS_GUNLOCK(); return (EBUSY); } *************** *** 80,87 **** (void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN-1, &size); memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size); memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN); ! strcpy(mp->mnt_stat.f_mntfromname, "AFS"); ! /* null terminated string "AFS" will fit, just leave it be. */ strcpy(mp->mnt_stat.f_fstypename, "afs"); AFS_GUNLOCK(); (void) afs_statfs(mp, &mp->mnt_stat, p); --- 80,130 ---- (void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN-1, &size); memset(mp->mnt_stat.f_mntonname + size, 0, MNAMELEN - size); memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN); ! ! if (data == NULL) { ! strcpy(mp->mnt_stat.f_mntfromname, "AFS"); ! /* null terminated string "AFS" will fit, just leave it be. */ ! mp->mnt_data = (qaddr_t)NULL; ! } else { ! struct VenusFid *rootFid = NULL; ! struct volume *tvp; ! char volName[MNAMELEN]; ! ! (void) copyinstr((char *)data, volName, MNAMELEN-1, &size); ! memset(volName + size, 0, MNAMELEN - size); ! ! if (volName[0] == 0) { ! strcpy(mp->mnt_stat.f_mntfromname, "AFS"); ! mp->mnt_data = (qaddr_t)&afs_rootFid; ! } else { ! struct cell *localcell = afs_GetPrimaryCell(READ_LOCK); ! if (localcell == NULL) { ! AFS_GUNLOCK(); ! return ENODEV; ! } ! ! /* Set the volume identifier to "AFS:volume.name" */ ! snprintf(mp->mnt_stat.f_mntfromname, MNAMELEN-1, "AFS:%s", ! volName); ! tvp = afs_GetVolumeByName(volName, localcell->cellNum, 1, ! (struct vrequest *)0, READ_LOCK); ! ! if (tvp) { ! int volid = (tvp->roVol ? tvp->roVol : tvp->volume); ! MALLOC(rootFid, struct VenusFid *, sizeof(*rootFid), ! M_UFSMNT, M_WAITOK); ! rootFid->Cell = localcell->cellNum; ! rootFid->Fid.Volume = volid; ! rootFid->Fid.Vnode = 1; ! rootFid->Fid.Unique = 1; ! } else { ! AFS_GUNLOCK(); ! return ENODEV; ! } ! ! mp->mnt_data = (qaddr_t)rootFid; ! } ! } strcpy(mp->mnt_stat.f_fstypename, "afs"); AFS_GUNLOCK(); (void) afs_statfs(mp, &mp->mnt_stat, p); *************** *** 97,104 **** AFS_GLOCK(); AFS_STATCNT(afs_unmount); ! afs_globalVFS = 0; ! afs_shutdown(); AFS_GUNLOCK(); return 0; --- 140,162 ---- AFS_GLOCK(); AFS_STATCNT(afs_unmount); ! ! if (mp->mnt_data != (qaddr_t)-1) { ! if (mp->mnt_data != NULL) { ! FREE(mp->mnt_data, M_UFSMNT); ! mp->mnt_data = (qaddr_t)-1; ! } else { ! if (flags & MNT_FORCE) { ! afs_globalVFS = 0; ! afs_shutdown(); ! } else { ! AFS_GUNLOCK(); ! return EBUSY; ! } ! } ! mp->mnt_flag &= ~MNT_LOCAL; ! } ! AFS_GUNLOCK(); return 0; *************** *** 119,136 **** pcred_unlock(p); AFS_GLOCK(); AFS_STATCNT(afs_root); ! if (afs_globalVp && (afs_globalVp->states & CStatd)) { tvp = afs_globalVp; error=0; } else { if (!(error = afs_InitReq(&treq, &cr)) && !(error = afs_CheckInit())) { ! tvp = afs_GetVCache(&afs_rootFid, &treq, (afs_int32 *)0, (struct vcache*)0, WRITE_LOCK); /* we really want this to stay around */ if (tvp) { ! afs_globalVp = tvp; } else error = ENOENT; } --- 177,200 ---- pcred_unlock(p); AFS_GLOCK(); AFS_STATCNT(afs_root); ! if (mp->mnt_data == NULL ! && afs_globalVp && (afs_globalVp->states & CStatd)) { tvp = afs_globalVp; error=0; + } else if (mp->mnt_data == (qaddr_t)-1) { + error = ENOENT; } else { + struct VenusFid *rootFid = (mp->mnt_data == NULL) + ? &afs_rootFid : (struct VenusFid *)mp->mnt_data; if (!(error = afs_InitReq(&treq, &cr)) && !(error = afs_CheckInit())) { ! tvp = afs_GetVCache(rootFid, &treq, (afs_int32 *)0, (struct vcache*)0, WRITE_LOCK); /* we really want this to stay around */ if (tvp) { ! if (mp->mnt_data == NULL) ! afs_globalVp = tvp; } else error = ENOENT; } *************** *** 140,148 **** AFS_GUNLOCK(); vn_lock(AFSTOV(tvp), LK_EXCLUSIVE | LK_RETRY, p); AFS_GLOCK(); ! afs_globalVFS = mp; *vpp = AFSTOV(tvp); AFSTOV(tvp)->v_flag |= VROOT; } afs_Trace2(afs_iclSetp, CM_TRACE_VFSROOT, ICL_TYPE_POINTER, *vpp, --- 204,215 ---- AFS_GUNLOCK(); vn_lock(AFSTOV(tvp), LK_EXCLUSIVE | LK_RETRY, p); AFS_GLOCK(); ! if (mp->mnt_data == NULL) { ! afs_globalVFS = mp; ! } *vpp = AFSTOV(tvp); AFSTOV(tvp)->v_flag |= VROOT; + AFSTOV(tvp)->v_vfsp = mp; } afs_Trace2(afs_iclSetp, CM_TRACE_VFSROOT, ICL_TYPE_POINTER, *vpp, *************** *** 165,171 **** } error = vget(vp, lfl, current_proc()); if (!error) ! insmntque(vp, afs_globalVFS); /* take off free list */ return error; } --- 232,238 ---- } error = vget(vp, lfl, current_proc()); if (!error) ! insmntque(vp, mp); /* take off free list */ return error; } Index: openafs/src/afs/DARWIN/osi_vnodeops.c diff -c openafs/src/afs/DARWIN/osi_vnodeops.c:1.4.2.6 openafs/src/afs/DARWIN/osi_vnodeops.c:1.4.2.7 *** openafs/src/afs/DARWIN/osi_vnodeops.c:1.4.2.6 Sat Jan 25 19:02:28 2003 --- openafs/src/afs/DARWIN/osi_vnodeops.c Thu May 15 11:09:35 2003 *************** *** 1,7 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.4.2.6 2003/01/26 00:02:28 shadow Exp $"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ --- 1,7 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.4.2.7 2003/05/15 15:09:35 shadow Exp $"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ *************** *** 173,178 **** --- 173,179 ---- return (error); } vp = AFSTOV(vcp); /* always get a node if no error */ + vp->v_vfsp = dvp->v_vfsp; /* The parent directory comes in locked. We unlock it on return unless the caller wants it left locked. *************** *** 237,242 **** --- 238,244 ---- if (vcp) { *ap->a_vpp = AFSTOV(vcp); + (*ap->a_vpp)->v_vfsp = dvp->v_vfsp; vn_lock(*ap->a_vpp, LK_EXCLUSIVE| LK_RETRY, p); if (UBCINFOMISSING(*ap->a_vpp) || UBCINFORECLAIMED(*ap->a_vpp)) *************** *** 810,820 **** GETNAME(); p=cnp->cn_proc; - if (dvp->v_mount != vp->v_mount) { - VOP_ABORTOP(vp, cnp); - error = EXDEV; - goto out; - } if (vp->v_type == VDIR) { VOP_ABORTOP(vp, cnp); error = EISDIR; --- 812,817 ---- *************** *** 859,883 **** struct proc *p=fcnp->cn_proc; /* - * Check for cross-device rename. - */ - if ((fvp->v_mount != tdvp->v_mount) || - (tvp && (fvp->v_mount != tvp->v_mount))) { - error = EXDEV; - abortit: - VOP_ABORTOP(tdvp, tcnp); /* XXX, why not in NFS? */ - if (tdvp == tvp) - vrele(tdvp); - else - vput(tdvp); - if (tvp) - vput(tvp); - VOP_ABORTOP(fdvp, fcnp); /* XXX, why not in NFS? */ - vrele(fdvp); - vrele(fvp); - return (error); - } - /* * if fvp == tvp, we're just removing one name of a pair of * directory entries for the same element. convert call into rename. ( (pinched from NetBSD 1.0's ufs_rename()) --- 856,861 ---- *************** *** 885,891 **** if (fvp == tvp) { if (fvp->v_type == VDIR) { error = EINVAL; ! goto abortit; } /* Release destination completely. */ --- 863,880 ---- if (fvp == tvp) { if (fvp->v_type == VDIR) { error = EINVAL; ! abortit: ! VOP_ABORTOP(tdvp, tcnp); /* XXX, why not in NFS? */ ! if (tdvp == tvp) ! vrele(tdvp); ! else ! vput(tdvp); ! if (tvp) ! vput(tvp); ! VOP_ABORTOP(fdvp, fcnp); /* XXX, why not in NFS? */ ! vrele(fdvp); ! vrele(fvp); ! return (error); } /* Release destination completely. */ *************** *** 968,973 **** --- 957,963 ---- } if (vcp) { *ap->a_vpp = AFSTOV(vcp); + (*ap->a_vpp)->v_vfsp = dvp->v_vfsp; vn_lock(*ap->a_vpp, LK_EXCLUSIVE|LK_RETRY, p); } else *ap->a_vpp = 0; Index: openafs/src/afs/HPUX/osi_groups.c diff -c openafs/src/afs/HPUX/osi_groups.c:1.4 openafs/src/afs/HPUX/osi_groups.c:1.4.4.1 *** openafs/src/afs/HPUX/osi_groups.c:1.4 Thu Jul 12 15:58:20 2001 --- openafs/src/afs/HPUX/osi_groups.c Fri May 23 02:52:17 2003 *************** *** 16,22 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_groups.c,v 1.4 2001/07/12 19:58:20 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" --- 16,22 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_groups.c,v 1.4.4.1 2003/05/23 06:52:17 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" *************** *** 133,138 **** --- 133,141 ---- int *gp; struct ucred *newcr; ulong_t s; + #if defined(AFS_HPUX110_ENV) + register ulong_t context; + #endif AFS_STATCNT(afs_setgroups); *************** *** 147,154 **** --- 150,163 ---- /* somebody else might have a pointer to this structure. ** make sure we do not have a race condition */ newcr = *cred; + #if defined(AFS_HPUX110_ENV) + /* all of the uniprocessor spinlocks are not defined. */ + /* I assume the UP and MP are now handled together */ + MP_SPINLOCK_USAV(cred_lock, context); + #else s = UP_SPL6(); SPINLOCK(cred_lock); + #endif } /* copy the group info */ *************** *** 168,175 **** --- 177,188 ---- } else { + #if defined(AFS_HPUX110_ENV) + MP_SPINUNLOCK_USAV(cred_lock, context); + #else (void) UP_SPLX(s); SPINUNLOCK(cred_lock); + #endif } return (setuerror(0), 0); } Index: openafs/src/afs/HPUX/osi_machdep.h diff -c openafs/src/afs/HPUX/osi_machdep.h:1.2.8.3 openafs/src/afs/HPUX/osi_machdep.h:1.2.8.4 *** openafs/src/afs/HPUX/osi_machdep.h:1.2.8.3 Tue Nov 26 18:40:38 2002 --- openafs/src/afs/HPUX/osi_machdep.h Fri May 23 02:52:17 2003 *************** *** 49,58 **** --- 49,63 ---- * HP uses global mutex to protect afs land */ + #if !defined(AFS_HPUX110_ENV) extern sema_t afs_global_sema; + #else + extern b_sema_t afs_global_sema; + #endif extern void osi_InitGlock(void); + #if !defined(AFS_HPUX110_ENV) extern void afsHash(int nbuckets); extern sv_sema_t *afsHashInsertFind(tid_t key); extern sv_sema_t *afsHashFind(tid_t key); *************** *** 64,69 **** --- 69,79 ---- #define AFS_GLOCK() MP_PXSEMA(&afs_global_sema, AFS_SAVE_SEMA) #define AFS_GUNLOCK() (AFS_ASSERT_GLOCK(), MP_VXSEMA(&afs_global_sema,AFS_FIND_SEMA), (!uniprocessor ? (afsHashRelease(AFS_GLOCK_PID),0) : 0)) #define ISAFS_GLOCK() (!uniprocessor ? owns_sema(&afs_global_sema):1) + #else + #define AFS_GLOCK() b_psema(&afs_global_sema) + #define AFS_GUNLOCK() b_vsema(&afs_global_sema) + #define ISAFS_GLOCK() b_owns_sema(&afs_global_sema) + #endif #define AFS_RXGLOCK() #define AFS_RXGUNLOCK() *************** *** 75,80 **** --- 85,91 ---- #define USERPRI NET_SPLX(splvar) #endif /* KERNEL */ + #if !defined(AFS_HPUX110_ENV) /* * On HP, the global lock is an alpha semaphore, hence it is automatically * released and reacquired aroubd a sleep() and wakeup(). *************** *** 82,94 **** --- 93,124 ---- #define afs_osi_Sleep(x) sleep((caddr_t) x,PZERO-2) #define afs_osi_Wakeup(x) wakeup((caddr_t) x) + #else + /* + * On 11.* global lock is a beta semaphore, hence we need to + * release and reacquire around sleep and wakeup. We also need to + * use the get_sleep_lock. + * afs_osi_Sleep and afs_osi_Wakeup are defined + */ + void afs_osi_Sleep(void *event); + int afs_osi_Wakeup(void *event); + #endif + + #define osi_NullHandle(x) ((x)->proc == (caddr_t) 0) + #if !defined(AFS_HPUX110_ENV) extern caddr_t kmem_alloc(); + #endif + #include /* for kt_cred() */ /* Expected to be available as a patch from HP */ /* See section D of the top level README for details */ + #if defined(AFS_HPUX110_ENV) + #include + #else #include + #endif #endif /* _OSI_MACHDEP_H_ */ Index: openafs/src/afs/HPUX/osi_sleep.c diff -c openafs/src/afs/HPUX/osi_sleep.c:1.4 openafs/src/afs/HPUX/osi_sleep.c:1.4.4.1 *** openafs/src/afs/HPUX/osi_sleep.c:1.4 Thu Jul 12 15:58:20 2001 --- openafs/src/afs/HPUX/osi_sleep.c Fri May 23 02:52:17 2003 *************** *** 10,16 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_sleep.c,v 1.4 2001/07/12 19:58:20 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 10,16 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_sleep.c,v 1.4.4.1 2003/05/23 06:52:17 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 18,25 **** ! static char waitV; /* call procedure aproc with arock as an argument, in ams milliseconds */ static int afs_osi_CallProc(aproc, arock, ams) --- 18,26 ---- ! #if !defined(AFS_HPUX110_ENV) static char waitV; + #endif /* call procedure aproc with arock as an argument, in ams milliseconds */ static int afs_osi_CallProc(aproc, arock, ams) *************** *** 30,39 **** --- 31,44 ---- int code; AFS_STATCNT(osi_CallProc); + #if !defined(AFS_HPUX110_ENV) AFS_GUNLOCK(); + #endif /* hz is in cycles/second, and timeout's 3rd parm is in cycles */ code = timeout(aproc, arock, (ams * afs_hz)/1000 + 1); + #if !defined(AFS_HPUX110_ENV) AFS_GLOCK(); + #endif return code; } *************** *** 45,61 **** --- 50,83 ---- int code = 0; AFS_STATCNT(osi_CancelProc); + #if !defined(AFS_HPUX110_ENV) AFS_GUNLOCK(); + #endif code = untimeout(aproc, arock); + #if !defined(AFS_HPUX110_ENV) AFS_GLOCK(); + #endif return code; } + #if defined(AFS_HPUX110_ENV) + static void AfsWaitHack(char * event) + { + lock_t * sleep_lock; + + AFS_STATCNT(WaitHack); + sleep_lock = get_sleep_lock(event); + wakeup(event); + spinunlock(sleep_lock); + } + #else + static void AfsWaitHack() { AFS_STATCNT(WaitHack); wakeup(&waitV); } + #endif void afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle) { *************** *** 72,78 **** --- 94,104 ---- proc = achandle->proc; if (proc == 0) return; achandle->proc = (caddr_t) 0; /* so dude can figure out he was signalled */ + #if defined(AFS_HPUX110_ENV) + afs_osi_Wakeup((char *)achandle); + #else afs_osi_Wakeup(&waitV); + #endif } /* afs_osi_Wait *************** *** 83,88 **** --- 109,118 ---- { int code; afs_int32 endTime, tid; + #if defined(AFS_HPUX110_ENV) + char localwait; + char * event; + #endif AFS_STATCNT(osi_Wait); endTime = osi_Time() + (ams/1000); *************** *** 92,103 **** --- 122,145 ---- AFS_ASSERT_GLOCK(); code = 0; /* do not do anything for solaris, digital, AIX, and SGI MP */ + #if defined(AFS_HPUX110_ENV) + if (ahandle) { + event = (char *) ahandle; + } + else { + event = &localwait; + } + afs_osi_CallProc(AfsWaitHack, event, ams); + afs_osi_Sleep(event); + afs_osi_CancelProc(AfsWaitHack, event); + #else afs_osi_CallProc(AfsWaitHack, (char *) u.u_procp, ams); afs_osi_Sleep(&waitV); /* for HP 10.0 */ /* do not do anything for solaris, digital, and SGI MP */ afs_osi_CancelProc(AfsWaitHack, (char *) u.u_procp); if (code) break; /* if something happened, quit now */ + #endif /* if we we're cancelled, quit now */ if (ahandle && (ahandle->proc == (caddr_t) 0)) { /* we've been signalled */ *************** *** 106,108 **** --- 148,174 ---- } while (osi_Time() < endTime); return code; } + + #if defined(AFS_HPUX110_ENV) + void afs_osi_Sleep(void *event) + { + lock_t * sleep_lock; + + AFS_ASSERT_GLOCK(); + get_sleep_lock(event); + AFS_GUNLOCK(); + sleep((caddr_t) event, PZERO-2); + AFS_GLOCK(); + } + + int afs_osi_Wakeup(void *event) + { + lock_t * sleep_lock; + + sleep_lock = get_sleep_lock(event); + wakeup((caddr_t) event); + spinunlock(sleep_lock); + return 0; + } + #endif + Index: openafs/src/afs/HPUX/osi_vfsops.c diff -c openafs/src/afs/HPUX/osi_vfsops.c:1.4.4.1 openafs/src/afs/HPUX/osi_vfsops.c:1.4.4.2 *** openafs/src/afs/HPUX/osi_vfsops.c:1.4.4.1 Tue Apr 23 21:41:30 2002 --- openafs/src/afs/HPUX/osi_vfsops.c Fri May 23 02:52:17 2003 *************** *** 13,19 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_vfsops.c,v 1.4.4.1 2002/04/24 01:41:30 zacheiss Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 13,19 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_vfsops.c,v 1.4.4.2 2003/05/23 06:52:17 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 182,187 **** --- 182,190 ---- static int afs_Starting = 0; #pragma align 64 + #if defined(AFS_HPUX110_ENV) + b_sema_t afs_global_sema = {0}; + #else sema_t afs_global_sema = { NULL, 0, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, /* sa_type */ 0, 0, 0, 0, 0, 0, 0, NULL, /* sa_link */ *************** *** 190,195 **** --- 193,199 ---- , 0, 0, 0, NULL #endif }; + #endif void osi_InitGlock() *************** *** 200,207 **** --- 204,215 ---- if ( !afs_Starting ) { afs_Starting = 1; SPINUNLOCK_USAV(sched_lock, context); + #if defined(AFS_HPUX110_ENV) + b_initsema(&afs_global_sema, 1, NFS_LOCK_ORDER2, "AFS GLOCK"); + #else initsema(&afs_global_sema, 1, FILESYS_SEMA_PRI, FILESYS_SEMA_ORDER); afsHash(64); /* 64 buckets */ + #endif } else { SPINUNLOCK_USAV(sched_lock, context); } Index: openafs/src/afs/HPUX/osi_vnodeops.c diff -c openafs/src/afs/HPUX/osi_vnodeops.c:1.5.2.2 openafs/src/afs/HPUX/osi_vnodeops.c:1.5.2.3 *** openafs/src/afs/HPUX/osi_vnodeops.c:1.5.2.2 Thu Nov 14 15:08:34 2002 --- openafs/src/afs/HPUX/osi_vnodeops.c Fri May 23 02:52:17 2003 *************** *** 12,18 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_vnodeops.c,v 1.5.2.2 2002/11/14 20:08:34 zacheiss Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 12,18 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/HPUX/osi_vnodeops.c,v 1.5.2.3 2003/05/23 06:52:17 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 49,55 **** --- 49,68 ---- #define vtoblksz(vp) ((vp)->v_vfsp->vfs_bsize) + #if defined(AFS_HPUX110_ENV) + /* We no longer need to lock on the VM Empire, + * or at least that is what is claimed. + * so we will noopt the vmemp_ routines + * This needs to be looked at closer. + */ + #define vmemp_lockx() + #undef vmemp_returnx + #define vmemp_returnx(a) return(a) + #define vmemp_unlockx() + #endif + + #if !defined(AFS_HPUX110_ENV) /* * Copy an mbuf to the contiguous area pointed to by cp. * Skip bytes and copy bytes. *************** *** 92,97 **** --- 105,111 ---- return (len); } + #endif /* * Note that the standard Sun vnode interface doesn't haven't an vop_lockf(), so this code is *************** *** 160,166 **** } ! #include "../machine/vmparam.h" /* For KERNELSPACE */ #include "../h/debug.h" #include "../h/types.h" #include "../h/param.h" --- 174,184 ---- } ! #if defined(AFS_HPUX1122_ENV) ! #include "../machine/vm/vmparam.h" ! #else ! #include "../machine/vmparam.h" /* For KERNELSPACE */ ! #endif #include "../h/debug.h" #include "../h/types.h" #include "../h/param.h" *************** *** 1262,1268 **** --- 1280,1290 ---- if (change_to_fstore) afspgin_update_dbd(vm_info, bsize); + #if defined(AFS_HPUX110_ENV) + getppdp()->cnt.v_exfod += count; + #else mpproc_info[getprocindex()].cnt.v_exfod += count; + #endif vmemp_unlockx(); /* free up VM empire */ *ret_startindex = startindex; *************** *** 1630,1641 **** --- 1652,1672 ---- */ if (steal) { if (flags & PF_DEACT) { + #if defined(AFS_HPUX110_ENV) + getppdp()->cnt.v_pswpout += npages; + #else mpproc_info[getprocindex()].cnt.v_pswpout += npages; + #endif /* sar_bswapout += ptod(npages);*/ } else if (vhand) { + #if defined(AFS_HPUX110_ENV) + getppdp()->cnt.v_pgout++; + getppdp()->cnt.v_pgpgout += npages; + #else mpproc_info[getprocindex()].cnt.v_pgout++; mpproc_info[getprocindex()].cnt.v_pgpgout += npages; + #endif } } *************** *** 1889,1895 **** --- 1920,1930 ---- afs_mmap(vp, off, size_bytes, access) struct vnode *vp; u_int off; + #if defined(AFS_HPUX1111_ENV) + u_long size_bytes; + #else u_int size_bytes; + #endif int access; { long bsize = vtoblksz(vp); *************** *** 1923,1929 **** --- 1958,1968 ---- afs_unmap(vp,off, size_bytes,access) struct vnode *vp; u_int off; + #if defined(AFS_HPUX1111_ENV) + u_long size_bytes; + #else u_int size_bytes; + #endif int access; { return 0; *************** *** 1945,1950 **** --- 1984,1990 ---- int afs_prealloc(vp, size, ignore_minfree, reserved) struct vnode *vp; + /* DEE on 11.22 following is off_t */ size_t size; int ignore_minfree; int reserved; *************** *** 1984,1992 **** --- 2024,2042 ---- return(ENOTTY); } + #if defined(AFS_HPUX1111_ENV) + /* looks like even if appl is 32 bit, we need to round to 8 bytes */ + /* This had no effect, it must not be being used */ + + #define roundtoint(x) (((x) + (sizeof(long) - 1)) & ~(sizeof(long) - 1)) + #define reclen(dp) roundtoint(((dp)->d_namlen + 1 + (sizeof(u_long)) +\ + sizeof(u_int) + 2 * sizeof(u_short))) + #else + #define roundtoint(x) (((x) + (sizeof(int) - 1)) & ~(sizeof(int) - 1)) #define reclen(dp) roundtoint(((dp)->d_namlen + 1 + (sizeof(u_long)) +\ 2 * sizeof(u_short))) + #endif int afs_readdir(vp, uiop, cred) Index: openafs/src/afs/LINUX/osi_alloc.c diff -c openafs/src/afs/LINUX/osi_alloc.c:1.9.2.7 openafs/src/afs/LINUX/osi_alloc.c:1.9.2.8 *** openafs/src/afs/LINUX/osi_alloc.c:1.9.2.7 Thu Aug 1 12:13:21 2002 --- openafs/src/afs/LINUX/osi_alloc.c Wed May 28 19:49:21 2003 *************** *** 14,20 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_alloc.c,v 1.9.2.7 2002/08/01 16:13:21 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" --- 14,20 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_alloc.c,v 1.9.2.8 2003/05/28 23:49:21 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" *************** *** 188,194 **** int memtype; memtype = MEMTYPE(lmp->chunk); ! #ifdef AFS_SPARC64_LINUX24_ENV if ((memtype == KM_TYPE) && (!VALID_PAGE(virt_to_page(lmp->chunk)))) { printf("osi_linux_verify_alloced_memory: address 0x%x outside range, index=%d, key=%d\n", lmp->chunk, index, key); } --- 188,194 ---- int memtype; memtype = MEMTYPE(lmp->chunk); ! #if defined(AFS_SPARC64_LINUX24_ENV) || defined(AFS_I386_UMLINUX20_ENV) if ((memtype == KM_TYPE) && (!VALID_PAGE(virt_to_page(lmp->chunk)))) { printf("osi_linux_verify_alloced_memory: address 0x%x outside range, index=%d, key=%d\n", lmp->chunk, index, key); } Index: openafs/src/afs/LINUX/osi_file.c diff -c openafs/src/afs/LINUX/osi_file.c:1.11 openafs/src/afs/LINUX/osi_file.c:1.11.2.2 *** openafs/src/afs/LINUX/osi_file.c:1.11 Tue Aug 7 20:03:31 2001 --- openafs/src/afs/LINUX/osi_file.c Tue Jul 1 18:24:21 2003 *************** *** 10,16 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_file.c,v 1.11 2001/08/08 00:03:31 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 10,16 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_file.c,v 1.11.2.2 2003/07/01 22:24:21 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 126,131 **** --- 126,134 ---- if (code || tstat.size <= asize) return code; MObtainWriteLock(&afs_xosi,321); AFS_GUNLOCK(); + #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM + down_write(&inode->i_alloc_sem); + #endif down(&inode->i_sem); inode->i_size = newattrs.ia_size = asize; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; *************** *** 156,161 **** --- 159,167 ---- #endif code = -code; up(&inode->i_sem); + #ifdef STRUCT_INODE_HAS_I_ALLOC_SEM + up_write(&inode->i_alloc_sem); + #endif AFS_GLOCK(); MReleaseWriteLock(&afs_xosi); return code; *************** *** 211,218 **** size_t resid; register afs_int32 code; AFS_STATCNT(osi_Write); ! if ( !afile ) ! osi_Panic("afs_osi_Write called with null param"); if (offset != -1) afile->offset = offset; AFS_GUNLOCK(); code = osi_rdwr(UIO_WRITE, afile, (caddr_t)aptr, asize, &resid); --- 217,228 ---- size_t resid; register afs_int32 code; AFS_STATCNT(osi_Write); ! if ( !afile ) { ! if ( !afs_shuttingdown ) ! osi_Panic("afs_osi_Write called with null param"); ! else ! return EIO; ! } if (offset != -1) afile->offset = offset; AFS_GUNLOCK(); code = osi_rdwr(UIO_WRITE, afile, (caddr_t)aptr, asize, &resid); Index: openafs/src/afs/LINUX/osi_groups.c diff -c openafs/src/afs/LINUX/osi_groups.c:1.10.2.3 openafs/src/afs/LINUX/osi_groups.c:1.10.2.6 *** openafs/src/afs/LINUX/osi_groups.c:1.10.2.3 Sat Jan 11 02:53:29 2003 --- openafs/src/afs/LINUX/osi_groups.c Thu May 22 00:08:03 2003 *************** *** 16,22 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.10.2.3 2003/01/11 07:53:29 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" --- 16,22 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.10.2.6 2003/05/22 04:08:03 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" *************** *** 113,119 **** extern long (*sys_setgroupsp)(int gidsetsize, gid_t *grouplist); asmlinkage long afs_xsetgroups(int gidsetsize, gid_t *grouplist) { ! int code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; --- 113,119 ---- extern long (*sys_setgroupsp)(int gidsetsize, gid_t *grouplist); asmlinkage long afs_xsetgroups(int gidsetsize, gid_t *grouplist) { ! long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; *************** *** 137,151 **** crfree(cr); unlock_kernel(); ! return code; } #if defined(AFS_LINUX24_ENV) /* Intercept the standard uid32 system call. */ ! extern int (*sys_setgroups32p)(int gidsetsize, gid_t *grouplist); ! asmlinkage int afs_xsetgroups32(int gidsetsize, gid_t *grouplist) { ! int code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; --- 137,152 ---- crfree(cr); unlock_kernel(); ! /* Linux syscall ABI returns errno as negative */ ! return (- code); } #if defined(AFS_LINUX24_ENV) /* Intercept the standard uid32 system call. */ ! extern long (*sys_setgroups32p)(int gidsetsize, gid_t *grouplist); ! asmlinkage long afs_xsetgroups32(int gidsetsize, gid_t *grouplist) { ! long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; *************** *** 156,161 **** --- 157,163 ---- unlock_kernel(); code = (*sys_setgroups32p)(gidsetsize, grouplist); + if (code) { return code; } *************** *** 169,184 **** crfree(cr); unlock_kernel(); ! return code; } #endif ! #if defined(AFS_SPARC64_LINUX20_ENV) /* Intercept the uid16 system call as used by 32bit programs. */ ! extern int (*sys32_setgroupsp)(int gidsetsize, __kernel_gid_t32 *grouplist); ! asmlinkage int afs32_xsetgroups(int gidsetsize, __kernel_gid_t32 *grouplist) { ! int code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; --- 171,187 ---- crfree(cr); unlock_kernel(); ! /* Linux syscall ABI returns errno as negative */ ! return (- code); } #endif ! #if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_AMD64_LINUX20_ENV) /* Intercept the uid16 system call as used by 32bit programs. */ ! extern long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist); ! asmlinkage long afs32_xsetgroups(int gidsetsize, old_gid_t *grouplist) { ! long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; *************** *** 202,215 **** crfree(cr); unlock_kernel(); ! return code; } #ifdef AFS_LINUX24_ENV /* Intercept the uid32 system call as used by 32bit programs. */ ! extern int (*sys32_setgroups32p)(int gidsetsize, __kernel_gid_t32 *grouplist); ! asmlinkage int afs32_xsetgroups32(int gidsetsize, __kernel_gid_t32 *grouplist) { ! int code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; --- 205,219 ---- crfree(cr); unlock_kernel(); ! /* Linux syscall ABI returns errno as negative */ ! return (- code); } #ifdef AFS_LINUX24_ENV /* Intercept the uid32 system call as used by 32bit programs. */ ! extern long (*sys32_setgroups32p)(int gidsetsize, gid_t *grouplist); ! asmlinkage long afs32_xsetgroups32(int gidsetsize, gid_t *grouplist) { ! long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; *************** *** 233,239 **** crfree(cr); unlock_kernel(); ! return code; } #endif #endif --- 237,244 ---- crfree(cr); unlock_kernel(); ! /* Linux syscall ABI returns errno as negative */ ! return (- code); } #endif #endif Index: openafs/src/afs/LINUX/osi_misc.c diff -c openafs/src/afs/LINUX/osi_misc.c:1.12.2.10 openafs/src/afs/LINUX/osi_misc.c:1.12.2.11 *** openafs/src/afs/LINUX/osi_misc.c:1.12.2.10 Sun Mar 23 01:46:34 2003 --- openafs/src/afs/LINUX/osi_misc.c Thu May 15 13:00:24 2003 *************** *** 14,20 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_misc.c,v 1.12.2.10 2003/03/23 06:46:34 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" --- 14,20 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_misc.c,v 1.12.2.11 2003/05/15 17:00:24 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" *************** *** 25,61 **** char *crash_addr = 0; /* Induce an oops by writing here. */ /* Lookup name and return vnode for same. */ ! int osi_lookupname(char *aname, uio_seg_t seg, int followlink, ! vnode_t **dirvpp, struct dentry **dpp) { - #if defined(AFS_LINUX24_ENV) - struct nameidata nd; - #else - struct dentry *dp = NULL; - #endif int code; code = ENOENT; - #if defined(AFS_LINUX24_ENV) if (seg == AFS_UIOUSER) { code = followlink ? ! user_path_walk(aname, &nd) : user_path_walk_link(aname, &nd); } else { ! if (path_init(aname, followlink ? LOOKUP_FOLLOW : 0, &nd)) ! code = path_walk(aname, &nd); } if (!code) { ! if (nd.dentry->d_inode) { ! *dpp = dget(nd.dentry); code = 0; ! } else code = ENOENT; ! path_release(&nd); } #else if (seg == AFS_UIOUSER) { dp = followlink ? namei(aname) : lnamei(aname); } --- 25,77 ---- char *crash_addr = 0; /* Induce an oops by writing here. */ + #if defined(AFS_LINUX24_ENV) /* Lookup name and return vnode for same. */ ! int osi_lookupname_internal(char *aname, uio_seg_t seg, int followlink, ! vnode_t **dirvpp, struct dentry **dpp, ! struct nameidata *nd) { int code; code = ENOENT; if (seg == AFS_UIOUSER) { code = followlink ? ! user_path_walk(aname, nd) : user_path_walk_link(aname, nd); } else { ! if (path_init(aname, followlink ? LOOKUP_FOLLOW : 0, nd)) ! code = path_walk(aname, nd); } if (!code) { ! if (nd->dentry->d_inode) { ! *dpp = dget(nd->dentry); code = 0; ! } else { code = ENOENT; ! path_release(nd); ! } } + return code; + } + #endif + + int osi_lookupname(char *aname, uio_seg_t seg, int followlink, + vnode_t **dirvpp, struct dentry **dpp) + { + #if defined(AFS_LINUX24_ENV) + struct nameidata nd; + int code = osi_lookupname_internal(aname, seg, followlink, dirvpp, dpp, + &nd); + if (!code) + path_release(&nd); + + return (code); #else + struct dentry *dp = NULL; + int code; + + code = ENOENT; if (seg == AFS_UIOUSER) { dp = followlink ? namei(aname) : lnamei(aname); } *************** *** 71,79 **** else dput(dp); } - #endif return code; } /* Intialize cache device info and fragment size for disk cache partition. */ --- 87,95 ---- else dput(dp); } return code; + #endif } /* Intialize cache device info and fragment size for disk cache partition. */ *************** *** 85,92 **** extern struct osi_dev cacheDev; extern afs_int32 afs_fsfragsize; extern struct super_block *afs_cacheSBp; ! code = osi_lookupname(aname, AFS_UIOSYS, 1, NULL, &dp); if (code) return ENOENT; cacheInode = dp->d_inode->i_ino; --- 101,110 ---- extern struct osi_dev cacheDev; extern afs_int32 afs_fsfragsize; extern struct super_block *afs_cacheSBp; + extern struct nameidata afs_cacheNd; ! code = osi_lookupname_internal(aname, AFS_UIOSYS, 1, NULL, &dp, ! &afs_cacheNd); if (code) return ENOENT; cacheInode = dp->d_inode->i_ino; Index: openafs/src/afs/LINUX/osi_module.c diff -c openafs/src/afs/LINUX/osi_module.c:1.16.2.12 openafs/src/afs/LINUX/osi_module.c:1.16.2.22 *** openafs/src/afs/LINUX/osi_module.c:1.16.2.12 Sun Mar 23 01:46:34 2003 --- openafs/src/afs/LINUX/osi_module.c Mon Jul 28 22:01:02 2003 *************** *** 14,38 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_module.c,v 1.16.2.12 2003/03/23 06:46:34 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" #include "../h/unistd.h" /* For syscall numbers. */ #include "../h/mm.h" #include #include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) #include #include #endif ! #ifndef EXPORTED_SYS_CALL_TABLE #include #endif - #ifdef AFS_SPARC64_LINUX24_ENV #define __NR_setgroups32 82 /* This number is not exported for some bizarre reason. */ #endif --- 14,41 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_module.c,v 1.16.2.22 2003/07/29 02:01:02 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" #include "../h/unistd.h" /* For syscall numbers. */ #include "../h/mm.h" + #ifdef AFS_AMD64_LINUX20_ENV + #include "../asm/ia32_unistd.h" + #endif + #include #include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) #include #include #endif ! #if !defined(EXPORTED_SYS_CALL_TABLE) && defined(HAVE_KERNEL_LINUX_SYSCALL_H) #include #endif #ifdef AFS_SPARC64_LINUX24_ENV #define __NR_setgroups32 82 /* This number is not exported for some bizarre reason. */ #endif *************** *** 77,93 **** static void* afs_ni_syscall = 0; #endif #ifdef AFS_SPARC64_LINUX20_ENV static unsigned int afs_ni_syscall32 = 0; asmlinkage int (*sys32_setgroupsp)(int gidsetsize, __kernel_gid_t32 *grouplist); #if defined(__NR_setgroups32) asmlinkage int (*sys32_setgroups32p)(int gidsetsize, __kernel_gid_t32 *grouplist); ! #endif #ifdef EXPORTED_SYS_CALL_TABLE extern unsigned int sys_call_table32[]; ! #else static unsigned int *sys_call_table32; ! #endif asmlinkage int afs_syscall32(long syscall, long parm1, long parm2, long parm3, long parm4, long parm5) --- 80,110 ---- static void* afs_ni_syscall = 0; #endif + #ifdef AFS_AMD64_LINUX20_ENV + #ifdef EXPORTED_IA32_SYS_CALL_TABLE + extern void * ia32_sys_call_table[]; + #else + static void **ia32_sys_call_table; + #endif + + static void *ia32_ni_syscall = 0; + asmlinkage long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist); + #if defined(__NR_ia32_setgroups32) + asmlinkage long (*sys32_setgroups32p)(int gidsetsize, gid_t *grouplist); + #endif /* __NR_ia32_setgroups32 */ + #endif /* AFS_AMD64_LINUX20_ENV */ + #ifdef AFS_SPARC64_LINUX20_ENV static unsigned int afs_ni_syscall32 = 0; asmlinkage int (*sys32_setgroupsp)(int gidsetsize, __kernel_gid_t32 *grouplist); #if defined(__NR_setgroups32) asmlinkage int (*sys32_setgroups32p)(int gidsetsize, __kernel_gid_t32 *grouplist); ! #endif /* __NR_setgroups32 */ #ifdef EXPORTED_SYS_CALL_TABLE extern unsigned int sys_call_table32[]; ! #else /* EXPORTED_SYS_CALL_TABLE */ static unsigned int *sys_call_table32; ! #endif /* EXPORTED_SYS_CALL_TABLE */ asmlinkage int afs_syscall32(long syscall, long parm1, long parm2, long parm3, long parm4, long parm5) *************** *** 99,105 **** "ret\n\t" "nop"); } ! #endif #ifdef AFS_IA64_LINUX20_ENV --- 116,122 ---- "ret\n\t" "nop"); } ! #endif /* AFS_SPARC64_LINUX20_ENV */ #ifdef AFS_IA64_LINUX20_ENV *************** *** 177,183 **** #ifdef AFS_LINUX24_ENV asmlinkage int (*sys_setgroups32p)(int gidsetsize, __kernel_gid32_t *grouplist); ! #endif #ifdef AFS_SPARC64_LINUX20_ENV #define POINTER2SYSCALL (unsigned int)(unsigned long) --- 194,200 ---- #ifdef AFS_LINUX24_ENV asmlinkage int (*sys_setgroups32p)(int gidsetsize, __kernel_gid32_t *grouplist); ! #endif /* AFS_LINUX24_ENV */ #ifdef AFS_SPARC64_LINUX20_ENV #define POINTER2SYSCALL (unsigned int)(unsigned long) *************** *** 201,215 **** extern long afs_xsetgroups(); #if defined(__NR_setgroups32) extern int afs_xsetgroups32(); ! #endif ! #ifdef AFS_SPARC64_LINUX20_ENV extern int afs32_xsetgroups(); ! #if defined(__NR_setgroups32) extern int afs32_xsetgroups32(); #endif #endif ! #ifndef EXPORTED_SYS_CALL_TABLE unsigned long *ptr; unsigned long offset; unsigned long datalen; --- 218,235 ---- extern long afs_xsetgroups(); #if defined(__NR_setgroups32) extern int afs_xsetgroups32(); ! #endif /* __NR_setgroups32 */ ! #if defined(AFS_SPARC64_LINUX20_ENV) || defined (AFS_AMD64_LINUX20_ENV) extern int afs32_xsetgroups(); ! #if (defined(__NR_setgroups32) && defined(AFS_SPARC64_LINUX20_ENV)) extern int afs32_xsetgroups32(); #endif + #if (defined(__NR_ia32_setgroups32) && defined(AFS_AMD64_LINUX20_ENV)) + extern int afs32_xsetgroups32(); #endif + #endif /* AFS_SPARC64_LINUX20_ENV || AFS_AMD64_LINUX20_ENV */ ! #if !defined(EXPORTED_SYS_CALL_TABLE) || (defined(AFS_AMD64_LINUX20_ENV) && !defined(EXPORTED_IA32_SYS_CALL_TABLE)) unsigned long *ptr; unsigned long offset; unsigned long datalen; *************** *** 224,230 **** char *sym_name; unsigned long sym_start; unsigned long sym_end; ! #endif RWLOCK_INIT(&afs_xosi, "afs_xosi"); --- 244,250 ---- char *sym_name; unsigned long sym_start; unsigned long sym_end; ! #endif /* EXPORTED_SYS_CALL_TABLE */ RWLOCK_INIT(&afs_xosi, "afs_xosi"); *************** *** 237,243 **** printf("afs: Unable to obtain PAGE_OFFSET. Exiting.."); return -EIO; } ! #endif #ifndef EXPORTED_SYS_CALL_TABLE sys_call_table=0; --- 257,263 ---- printf("afs: Unable to obtain PAGE_OFFSET. Exiting.."); return -EIO; } ! #endif /* AFS_S390_LINUX22_ENV */ #ifndef EXPORTED_SYS_CALL_TABLE sys_call_table=0; *************** *** 267,276 **** --- 287,301 ---- ptr = (unsigned long *) (&sys_close - 0x180000); datalen=0x180000/sizeof(ptr); #else + #if defined(AFS_AMD64_LINUX20_ENV) + ptr=(unsigned long *)&init_mm; + datalen=0x360000/sizeof(ptr); + #else ptr=(unsigned long *)&init_mm; datalen=16384; #endif #endif + #endif for (offset=0;offset ip; *************** *** 283,288 **** --- 308,320 ---- break; } #else + #if defined(EXPORTED_SYS_WAIT4) && defined(EXPORTED_SYS_CLOSE) + if (ptr[0] == (unsigned long)&sys_close && + ptr[__NR_wait4 - __NR_close] == (unsigned long)&sys_wait4) { + sys_call_table=ptr - __NR_close; + break; + } + #else #if defined(EXPORTED_SYS_CHDIR) && defined(EXPORTED_SYS_CLOSE) if (ptr[0] == (unsigned long)&sys_close && ptr[__NR_chdir - __NR_close] == (unsigned long)&sys_chdir) { *************** *** 297,302 **** --- 329,335 ---- } #endif #endif + #endif } #ifdef EXPORTED_KALLSYMS_ADDRESS ret=kallsyms_address_to_symbol((unsigned long)sys_call_table, &mod_name, *************** *** 316,321 **** --- 349,419 ---- #endif #endif /* SYS_CALL_TABLE */ + #ifdef AFS_AMD64_LINUX20_ENV + #ifndef EXPORTED_IA32_SYS_CALL_TABLE + ia32_sys_call_table=0; + #ifdef EXPORTED_KALLSYMS_SYMBOL + ret=1; + token=0; + while (ret) { + sym_start=0; + ret=kallsyms_symbol_to_address("ia32_sys_call_table", &token, + &mod_name, &mod_start, &mod_end, + &sec_name, &sec_start, &sec_end, + &sym_name, &sym_start, &sym_end); + if (ret && !strcmp(mod_name, "kernel")) + break; + } + if (ret && sym_start) { + ia32_sys_call_table=sym_start; + } + #else /* EXPORTED_KALLSYMS_SYMBOL */ + #ifdef EXPORTED_KALLSYMS_ADDRESS + ret=kallsyms_address_to_symbol((unsigned long)&sys_close, &mod_name, + &mod_start, &mod_end, &sec_name, &sec_start, &sec_end, + &sym_name, &sym_start, &sym_end); + ptr=(unsigned long *)sec_start; + datalen=(sec_end-sec_start)/sizeof(unsigned long); + #else /* EXPORTED_KALLSYMS_ADDRESS */ + #if defined(AFS_IA64_LINUX20_ENV) + ptr = (unsigned long *) (&sys_close - 0x180000); + datalen=0x180000/sizeof(ptr); + #else /* AFS_IA64_LINUX20_ENV */ + #if defined(AFS_AMD64_LINUX20_ENV) + ptr=(unsigned long *)&interruptible_sleep_on; + datalen=0x180000/sizeof(ptr); + #else /* AFS_AMD64_LINUX20_ENV */ + ptr=(unsigned long *)&interruptible_sleep_on; + datalen=16384; + #endif /* AFS_AMD64_LINUX20_ENV */ + #endif /* AFS_IA64_LINUX20_ENV */ + #endif /* EXPORTED_KALLSYMS_ADDRESS */ + for (offset=0;offset gp; *************** *** 356,361 **** --- 454,465 ---- sys_call_table32[__NR_afs_syscall] = POINTER2SYSCALL afs_syscall32; # endif #endif /* AFS_IA64_LINUX20_ENV */ + #ifdef AFS_AMD64_LINUX20_ENV + if (ia32_sys_call_table) { + ia32_ni_syscall = ia32_sys_call_table[__NR_ia32_afs_syscall]; + ia32_sys_call_table[__NR_ia32_afs_syscall] = POINTER2SYSCALL afs_syscall; + } + #endif osi_Init(); register_filesystem(&afs_file_system); *************** *** 372,389 **** #else /* AFS_IA64_LINUX20_ENV */ sys_setgroupsp = SYSCALL2POINTER sys_call_table[__NR_setgroups]; sys_call_table[__NR_setgroups] = POINTER2SYSCALL afs_xsetgroups; ! # ifdef AFS_SPARC64_LINUX20_ENV sys32_setgroupsp = SYSCALL2POINTER sys_call_table32[__NR_setgroups]; sys_call_table32[__NR_setgroups] = POINTER2SYSCALL afs32_xsetgroups; ! # endif ! # if defined(__NR_setgroups32) sys_setgroups32p = SYSCALL2POINTER sys_call_table[__NR_setgroups32]; sys_call_table[__NR_setgroups32] = POINTER2SYSCALL afs_xsetgroups32; ! # ifdef AFS_SPARC64_LINUX20_ENV sys32_setgroups32p = SYSCALL2POINTER sys_call_table32[__NR_setgroups32]; sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL afs32_xsetgroups32; ! # endif ! # endif #endif /* AFS_IA64_LINUX20_ENV */ osi_sysctl_init(); --- 476,507 ---- #else /* AFS_IA64_LINUX20_ENV */ sys_setgroupsp = SYSCALL2POINTER sys_call_table[__NR_setgroups]; sys_call_table[__NR_setgroups] = POINTER2SYSCALL afs_xsetgroups; ! #ifdef AFS_SPARC64_LINUX20_ENV sys32_setgroupsp = SYSCALL2POINTER sys_call_table32[__NR_setgroups]; sys_call_table32[__NR_setgroups] = POINTER2SYSCALL afs32_xsetgroups; ! #endif /* AFS_SPARC64_LINUX20_ENV */ ! #if defined(__NR_setgroups32) sys_setgroups32p = SYSCALL2POINTER sys_call_table[__NR_setgroups32]; sys_call_table[__NR_setgroups32] = POINTER2SYSCALL afs_xsetgroups32; ! #ifdef AFS_SPARC64_LINUX20_ENV sys32_setgroups32p = SYSCALL2POINTER sys_call_table32[__NR_setgroups32]; sys_call_table32[__NR_setgroups32] = POINTER2SYSCALL afs32_xsetgroups32; ! #endif /* AFS_SPARC64_LINUX20_ENV */ ! #endif /* __NR_setgroups32 */ ! #ifdef AFS_AMD64_LINUX20_ENV ! if (ia32_sys_call_table) { ! sys32_setgroupsp = ! SYSCALL2POINTER ia32_sys_call_table[__NR_ia32_setgroups]; ! ia32_sys_call_table[__NR_ia32_setgroups] = ! POINTER2SYSCALL afs32_xsetgroups; ! #if defined(__NR_ia32_setgroups32) ! sys32_setgroups32p = ! SYSCALL2POINTER ia32_sys_call_table[__NR_ia32_setgroups32]; ! ia32_sys_call_table[__NR_ia32_setgroups32] = ! POINTER2SYSCALL afs32_xsetgroups32; ! #endif /* __NR_ia32_setgroups32 */ ! } ! #endif /* AFS_AMD64_LINUX20_ENV */ #endif /* AFS_IA64_LINUX20_ENV */ osi_sysctl_init(); *************** *** 418,423 **** --- 536,553 ---- # endif # endif #endif /* AFS_IA64_LINUX20_ENV */ + #ifdef AFS_AMD64_LINUX20_ENV + if (ia32_sys_call_table) { + ia32_sys_call_table[__NR_ia32_setgroups] = + POINTER2SYSCALL sys32_setgroupsp; + ia32_sys_call_table[__NR_ia32_afs_syscall] = + POINTER2SYSCALL ia32_ni_syscall; + # if defined(__NR_setgroups32) + ia32_sys_call_table[__NR_ia32_setgroups32] = + POINTER2SYSCALL sys32_setgroups32p; + #endif + } + #endif unregister_filesystem(&afs_file_system); osi_linux_free_inode_pages(); /* Invalidate all pages using AFS inodes. */ *************** *** 434,440 **** static long get_page_offset(void) { ! #if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) return PAGE_OFFSET; #else struct task_struct *p, *q; --- 564,570 ---- static long get_page_offset(void) { ! #if defined(AFS_PPC_LINUX22_ENV) || defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV) || defined(AFS_ALPHA_LINUX20_ENV) || defined(AFS_S390_LINUX22_ENV) || defined(AFS_IA64_LINUX20_ENV) || defined(AFS_PARISC_LINUX24_ENV) || defined(AFS_AMD64_LINUX20_ENV) return PAGE_OFFSET; #else struct task_struct *p, *q; Index: openafs/src/afs/LINUX/osi_vfsops.c diff -c openafs/src/afs/LINUX/osi_vfsops.c:1.11.2.5 openafs/src/afs/LINUX/osi_vfsops.c:1.11.2.6 *** openafs/src/afs/LINUX/osi_vfsops.c:1.11.2.5 Mon Jul 22 19:14:51 2002 --- openafs/src/afs/LINUX/osi_vfsops.c Thu May 15 13:00:24 2003 *************** *** 15,21 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.11.2.5 2002/07/22 23:14:51 zacheiss Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" --- 15,21 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.11.2.6 2003/05/15 17:00:24 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" *************** *** 31,36 **** --- 31,37 ---- struct vcache *afs_globalVp = 0; struct vfs *afs_globalVFS = 0; + struct nameidata afs_cacheNd; int afs_was_mounted = 0; /* Used to force reload if mount/unmount/mount */ extern struct super_operations afs_sops; *************** *** 269,274 **** --- 270,276 ---- afs_globalVFS = 0; afs_globalVp = 0; afs_shutdown(); + path_release(&afs_cacheNd); osi_linux_verify_alloced_memory(); done: *************** *** 336,344 **** void afs_umount_begin(struct super_block *sbp) { - afs_put_super(sbp); afs_shuttingdown=1; - afs_was_mounted=0; } #if defined(AFS_LINUX24_ENV) --- 338,344 ---- *************** *** 348,354 **** delete_inode: afs_delete_inode, put_super: afs_put_super, statfs: afs_statfs, ! umount_begin: NULL /* afs_umount_begin */ }; #else struct super_operations afs_sops = { --- 348,354 ---- delete_inode: afs_delete_inode, put_super: afs_put_super, statfs: afs_statfs, ! umount_begin: afs_umount_begin }; #else struct super_operations afs_sops = { *************** *** 362,368 **** afs_statfs, NULL, /* afs_remount_fs - see doc above */ NULL, /* afs_clear_inode */ ! NULL /* afs_umount_begin */ }; #endif --- 362,368 ---- afs_statfs, NULL, /* afs_remount_fs - see doc above */ NULL, /* afs_clear_inode */ ! afs_umount_begin }; #endif Index: openafs/src/afs/SOLARIS/osi_vfsops.c diff -c openafs/src/afs/SOLARIS/osi_vfsops.c:1.8.4.4 openafs/src/afs/SOLARIS/osi_vfsops.c:1.8.4.5 *** openafs/src/afs/SOLARIS/osi_vfsops.c:1.8.4.4 Tue Apr 23 21:41:36 2002 --- openafs/src/afs/SOLARIS/osi_vfsops.c Thu May 15 11:32:08 2003 *************** *** 13,19 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/SOLARIS/osi_vfsops.c,v 1.8.4.4 2002/04/24 01:41:36 zacheiss Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 13,19 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/SOLARIS/osi_vfsops.c,v 1.8.4.5 2003/05/15 15:32:08 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 431,437 **** printf("misc/nfssrv module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } ! #else #if defined(AFS_SUN52_ENV) if ((!(mp = mod_find_by_filename("fs", "nfs")) && !(mp = mod_find_by_filename(NULL, "/kernel/fs/nfs")) && --- 431,437 ---- printf("misc/nfssrv module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } ! #else /* !AFS_SUN55_ENV */ #if defined(AFS_SUN52_ENV) if ((!(mp = mod_find_by_filename("fs", "nfs")) && !(mp = mod_find_by_filename(NULL, "/kernel/fs/nfs")) && *************** *** 440,448 **** printf("fs/nfs module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } ! #endif ! #endif ! #endif /* * Re-read the /etc/name_to_sysnum file to make sure afs isn't added after * reboot. Ideally we would like to call modctl_read_sysbinding_file() but --- 440,449 ---- printf("fs/nfs module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } ! #endif /* AFS_SUN52_ENV */ ! #endif /* AFS_SUN55_ENV */ ! #endif /* !AFS_NONFSTRANS */ ! #if !defined(AFS_SUN58_ENV) /* * Re-read the /etc/name_to_sysnum file to make sure afs isn't added after * reboot. Ideally we would like to call modctl_read_sysbinding_file() but *************** *** 455,468 **** #ifdef AFS_SUN53_ENV #ifndef SYSBINDFILE #define SYSBINDFILE "/etc/name_to_sysnum" ! #endif read_binding_file(SYSBINDFILE, sb_hashtab); ! #else read_binding_file(sysbind, sb_hashtab); ! #endif ! #if !defined(AFS_SUN58_ENV) make_syscallname("afs", AFS_SYSCALL); - #endif if (sysent[AFS_SYSCALL].sy_call == nosys) { if ((sysn = mod_getsysname(AFS_SYSCALL)) != NULL) { --- 456,467 ---- #ifdef AFS_SUN53_ENV #ifndef SYSBINDFILE #define SYSBINDFILE "/etc/name_to_sysnum" ! #endif /* SYSBINDFILE */ read_binding_file(SYSBINDFILE, sb_hashtab); ! #else /* !AFS_SUN53_ENV */ read_binding_file(sysbind, sb_hashtab); ! #endif /* AFS_SUN53_ENV */ make_syscallname("afs", AFS_SYSCALL); if (sysent[AFS_SYSCALL].sy_call == nosys) { if ((sysn = mod_getsysname(AFS_SYSCALL)) != NULL) { *************** *** 471,481 **** rw_init(sysent[AFS_SYSCALL].sy_lock, "afs_syscall", #ifdef AFS_SUN57_ENV RW_DEFAULT, NULL); ! #else RW_DEFAULT, DEFAULT_WT); ! #endif } } osi_Init(); /* initialize global lock, etc */ --- 470,481 ---- rw_init(sysent[AFS_SYSCALL].sy_lock, "afs_syscall", #ifdef AFS_SUN57_ENV RW_DEFAULT, NULL); ! #else /* !AFS_SUN57_ENV */ RW_DEFAULT, DEFAULT_WT); ! #endif /* AFS_SUN57_ENV */ } } + #endif /* !AFS_SUN58_ENV */ osi_Init(); /* initialize global lock, etc */ Index: openafs/src/afs/VNOPS/afs_vnop_attrs.c diff -c openafs/src/afs/VNOPS/afs_vnop_attrs.c:1.8.4.5 openafs/src/afs/VNOPS/afs_vnop_attrs.c:1.8.4.7 *** openafs/src/afs/VNOPS/afs_vnop_attrs.c:1.8.4.5 Tue Sep 10 18:33:33 2002 --- openafs/src/afs/VNOPS/afs_vnop_attrs.c Fri May 23 02:52:19 2003 *************** *** 21,27 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.8.4.5 2002/09/10 22:33:33 zacheiss Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 21,27 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.8.4.7 2003/05/23 06:52:19 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 33,38 **** --- 33,41 ---- extern afs_rwlock_t afs_xcbhash; struct afs_exporter *afs_nfsexporter; extern struct vcache *afs_globalVp; + #if defined(AFS_HPUX110_ENV) + extern struct vfs *afs_globalVFS; + #endif /* copy out attributes from cache entry */ afs_CopyOutAttrs(avc, attrs) *************** *** 64,69 **** --- 67,89 ---- if (tcell && (tcell->states & CNoSUID)) attrs->va_mode &= ~(VSUID|VSGID); } + #if defined(AFS_DARWIN_ENV) + /* Mac OS X uses the mode bits to determine whether a file or directory + * is accessible, and believes them, even though under AFS they're almost + * assuredly wrong, especially if the local uid does not match the AFS + * ID. So we set the mode bits conservatively. + */ + if (S_ISDIR(attrs->va_mode)) { + /* all access bits need to be set for directories, since even + * a mode 0 directory can still be used normally. + */ + attrs->va_mode |= ACCESSPERMS; + } else { + /* for other files, replicate the user bits to group and other */ + mode_t ubits = (attrs->va_mode & S_IRWXU) >> 6; + attrs->va_mode |= ubits | (ubits << 3); + } + #endif /* AFS_DARWIN_ENV */ attrs->va_uid = fakedir ? 0 : avc->m.Owner; attrs->va_gid = fakedir ? 0 : avc->m.Group; /* yeah! */ #if defined(AFS_SUN56_ENV) *************** *** 143,148 **** --- 163,173 ---- #else attrs->va_rdev = 1; #endif + + #if defined(AFS_HPUX110_ENV) + if (afs_globalVFS) attrs->va_fstype = afs_globalVFS->vfs_mtype; + #endif + /* * Below return 0 (and not 1) blocks if the file is zero length. This conforms * better with the other filesystems that do return 0. Index: openafs/src/afs/VNOPS/afs_vnop_readdir.c diff -c openafs/src/afs/VNOPS/afs_vnop_readdir.c:1.8.4.3 openafs/src/afs/VNOPS/afs_vnop_readdir.c:1.8.4.4 *** openafs/src/afs/VNOPS/afs_vnop_readdir.c:1.8.4.3 Fri Nov 22 14:14:53 2002 --- openafs/src/afs/VNOPS/afs_vnop_readdir.c Fri May 23 02:52:19 2003 *************** *** 22,28 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/VNOPS/afs_vnop_readdir.c,v 1.8.4.3 2002/11/22 19:14:53 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 22,28 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/VNOPS/afs_vnop_readdir.c,v 1.8.4.4 2003/05/23 06:52:19 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 31,36 **** --- 31,41 ---- #include "../afs/nfsclient.h" #include "../afs/afs_osidnlc.h" + #if defined(AFS_HPUX1122_ENV) + #define DIRPAD 7 + #else + #define DIRPAD 3 + #endif /** * A few definitions. This is until we have a proper header file *************** *** 172,178 **** u_short d_reclen; u_short d_namlen; }; ! #define NDIRSIZ_LEN(len) ((sizeof (struct dirent)+4 - (MAXNAMLEN+1)) + (((len)+1 + 3) &~ 3)) #endif #endif /* !defined(UKERNEL) */ --- 177,183 ---- u_short d_reclen; u_short d_namlen; }; ! #define NDIRSIZ_LEN(len) ((sizeof (struct dirent)+4 - (MAXNAMLEN+1)) + (((len)+1 + DIRPAD) &~ DIRPAD)) #endif #endif /* !defined(UKERNEL) */ *************** *** 200,206 **** */ #if defined(AFS_HPUX100_ENV) #define DIRSIZ_LEN(len) \ ! ((sizeof (struct __dirent) - (_MAXNAMLEN+1)) + (((len)+1 + 3) &~ 3)) #else #if defined(AFS_SUN56_ENV) #define DIRSIZ_LEN(len) ((18 + (len) + 1 + 7) & ~7 ) --- 205,211 ---- */ #if defined(AFS_HPUX100_ENV) #define DIRSIZ_LEN(len) \ ! ((sizeof (struct __dirent) - (_MAXNAMLEN+1)) + (((len)+1 + DIRPAD) &~ DIRPAD)) #else #if defined(AFS_SUN56_ENV) #define DIRSIZ_LEN(len) ((18 + (len) + 1 + 7) & ~7 ) *************** *** 406,412 **** /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((slen + 4) & ~3) - slen, UIO_READ, auio, code); } AFS_MOVE_LOCK(); --- 411,417 ---- /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((slen + 1 + DIRPAD) & ~DIRPAD) - slen, UIO_READ, auio, code); } AFS_MOVE_LOCK(); *************** *** 620,626 **** AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 4) & ~3) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (DIRSIZ_LEN(o_slen) < rlen) { --- 625,631 ---- AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 1 + DIRPAD) & ~DIRPAD) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (DIRSIZ_LEN(o_slen) < rlen) { *************** *** 683,689 **** AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 4) & ~3) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (DIRSIZ_LEN(o_slen) < rlen) { --- 688,694 ---- AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 1 + DIRPAD) & ~DIRPAD) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (DIRSIZ_LEN(o_slen) < rlen) { *************** *** 734,740 **** AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 4) & ~3) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ --- 739,745 ---- AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 1 + DIRPAD) & ~DIRPAD) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ *************** *** 882,888 **** } /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 4) & ~3) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (NDIRSIZ_LEN(o_slen) < rlen) { --- 887,893 ---- } /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 1 + DIRPAD) & ~DIRPAD) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (NDIRSIZ_LEN(o_slen) < rlen) { *************** *** 931,937 **** AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 4) & ~3) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (NDIRSIZ_LEN(o_slen) < rlen) { --- 936,942 ---- AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 1 + DIRPAD) & ~DIRPAD) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (NDIRSIZ_LEN(o_slen) < rlen) { *************** *** 977,983 **** AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 4) & ~3) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (NDIRSIZ_LEN(o_slen) < rlen) { --- 982,988 ---- AFS_UIOMOVE(ode->name, o_slen, UIO_READ, auio, code); /* pad out the remaining characters with zeros */ if (code == 0) { ! AFS_UIOMOVE(bufofzeros, ((o_slen + 1 + DIRPAD) & ~DIRPAD) - o_slen, UIO_READ, auio, code); } /* pad out the difference between rlen and slen... */ if (NDIRSIZ_LEN(o_slen) < rlen) { Index: openafs/src/afsd/Makefile.in diff -c openafs/src/afsd/Makefile.in:1.6.2.3 openafs/src/afsd/Makefile.in:1.6.2.6 *** openafs/src/afsd/Makefile.in:1.6.2.3 Mon Jan 13 18:47:18 2003 --- openafs/src/afsd/Makefile.in Tue Jul 1 15:03:50 2003 *************** *** 30,37 **** include ../config/Makefile.${SYS_NAME} ! CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = -g ${XLDFLAGS} INSTALLex = ${INSTALL} -m 755 --- 30,37 ---- include ../config/Makefile.${SYS_NAME} ! CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = ${XLDFLAGS} INSTALLex = ${INSTALL} -m 755 *************** *** 49,63 **** afsd: afsd.o $(AFSLIBS) case ${SYS_NAME} in \ sgi_61 | sgi_62 | sgi_63) \ ! ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \ sgi_64 | sgi_65 ) \ ! ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \ * ) \ ! ${CC} ${CFLAGS} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \ esac vsys: vsys.o ! $(CC) -g -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} # # Objects --- 49,65 ---- afsd: afsd.o $(AFSLIBS) case ${SYS_NAME} in \ sgi_61 | sgi_62 | sgi_63) \ ! ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib/libdwarf.a /usr/lib/libelf.a ;; \ sgi_64 | sgi_65 ) \ ! ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \ ! ppc_darwin* ) \ ! ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} -F/System/Library/PrivateFrameworks -framework DiskArbitration ;; \ * ) \ ! ${CC} ${CFLAGS} -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \ esac vsys: vsys.o ! $(CC) -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} # # Objects *************** *** 109,114 **** --- 111,119 ---- ${INSTALL} -f afs.rc.solaris.2_5 ${DEST}/root.client/usr/vice/etc/modload/afs.rc ;;\ alpha_osf* ) \ ${INSTALL} -f afs.rc.alpha ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;;\ + ia64_hpux1122 ) \ + ${INSTALL} -f afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\ + ${INSTALL} -f afs.hpux1122.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\ hp_ux10? | hp_ux11? ) \ ${INSTALL} -f afs.rc.hpux10 ${DEST}/root.client/usr/vice/etc/dkload/afs.rc ;\ ${INSTALL} -f afs.hpux102.driver ${DEST}/root.client/usr/vice/etc/afs.driver ;;\ Index: openafs/src/afsd/afs.hpux1122.driver diff -c /dev/null openafs/src/afsd/afs.hpux1122.driver:1.1.2.1 *** /dev/null Tue Jul 29 19:41:03 2003 --- openafs/src/afsd/afs.hpux1122.driver Fri May 23 02:52:20 2003 *************** *** 0 **** --- 1,126 ---- + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + + * + * $Revision: 1.1.2.1 $ + * + * The following devices are those that can be specified in the system + * description file. The name specified must agree with the name shown, + * or with an alias. + * + * name handle type mask block char + * + $DEVICE + afs afsc 10 100 -1 -1 + ** Reserved for Third Party and User Drivers. + * --- - - -1 38 + * --- - - -1 39 + * --- - - -1 40 + * --- - - -1 41 + * --- - - -1 42 + * --- - - -1 43 + * --- - - 8 -1 + * --- - - 15 -1 + * --- - - 16 -1 + * --- - - 17 -1 + * --- - - 18 -1 + $$$ + + $CDIO + * + * The following entries form the cdio table. + * field 1: cdio name + * field 2: required, optional + * + $$$ + + $DRIVER_INSTALL + *************************************************************************** + * Driver install table + * + * This table contains the name of drivers which have converged I/O header + * structures and install entry points. Drivers in this table should not + * be defined in the driver table above. + *************************************************************************** + * Driver Block major Char major + $$$ + + $ALIAS + * + * The following entries form the alias table. + * field 1: product # field 2: driver name + * + $$$ + + $TUNABLE + * + * The following entries form the tunable parameter table. Any of these + * values can be overwritten in the dfile. However, before changing any + * value, know the ramifications of your change. + * + $$$ + + $DRIVER_DEPENDENCY + * + * Driver dependency table, if one driver is present, what + * other drivers should also be in the dfile. + * NOTE: A maximum of 6 dependency entries my follow the driver name. + * NOTE: This mechanism does not support chaining. In other words, if + * a driver is included as a dependency, that driver will not be + * checked for its dependencies. + * + * Driver name ..... + * + $$$ + + $DRIVER_LIBRARY + * + * The driver/library table. This table defines which libraries a given + * driver depends on. If the driver is included in the dfile, then the + * libraries that driver depends on will be included on the ld(1) command + * line. Only optional libraries *need* to be specified in this table, + * (but required ones can be included, as well). + * + * Driver handle + * + * subsystems first + afs libafs64.nonfs.a + $$$ + + $LIBRARY + * + * The library table. Each element in the library table describes + * one unique library. The flag member is a boolean value, it is + * initialized to 1 if the library should *always* be included on + * the ld(1) command line, or 0 if the library is optional (i.e. it + * is only included when one or more drivers require it). The order + * of the library table determines the order of the libraries on the + * ld(1) command line, (i.e. defines an implicit load order). New + * libraries must be added to this table. + * Note: libhp-ux.a must be the last entry, do not place anything after it. + * + * Library + * + libafs64.nonfs.a 0 + $$$ + + $SUBSYSTEMS_DEFINE + * Subsystem #define table. For any subsystem that is found in the dfile + * and appears below, a #define is generated in the conf.c file. This + * is used to include any space defined in space.h. + afs + $$$ + + $DRIVER_PRODUCT + * + * Driver product table. The following generates a table of supported products + * for a given interface card. The input is a driver handle followed by a list + * of product/vendor id's. What is produced is a table of these product/vendor + * id's to be used by the interface driver for further qualification during + * booting and the setting of root device location. + * + $$$ Index: openafs/src/afsd/afs.rc.darwin diff -c openafs/src/afsd/afs.rc.darwin:1.2.2.1 openafs/src/afsd/afs.rc.darwin:1.2.2.2 *** openafs/src/afsd/afs.rc.darwin:1.2.2.1 Wed Aug 21 16:53:23 2002 --- openafs/src/afsd/afs.rc.darwin Thu May 15 11:18:38 2003 *************** *** 43,49 **** # Need the commands ps, awk, kill, sleep PATH=${PATH}${PATH:+:}/sbin:/bin:/usr/bin ! if $KMODSTAT | grep -q openafs ; then : else if [ -d $VICEETC/afs.kext ]; then --- 43,49 ---- # Need the commands ps, awk, kill, sleep PATH=${PATH}${PATH:+:}/sbin:/bin:/usr/bin ! if $KMODSTAT | perl -e 'exit not grep /openafs/, <>' ; then : else if [ -d $VICEETC/afs.kext ]; then *************** *** 54,60 **** exit 1 fi fi ! if $KMODSTAT | grep -q openafs ; then : else echo "AFS kernel extensions failed to initialize. Skipping AFS startup." --- 54,60 ---- exit 1 fi fi ! if $KMODSTAT | perl -e 'exit not grep /openafs/, <>' ; then : else echo "AFS kernel extensions failed to initialize. Skipping AFS startup." Index: openafs/src/afsd/afsd.c diff -c openafs/src/afsd/afsd.c:1.13.2.13 openafs/src/afsd/afsd.c:1.13.2.15 *** openafs/src/afsd/afsd.c:1.13.2.13 Sun Mar 23 14:47:55 2003 --- openafs/src/afsd/afsd.c Tue Jul 1 15:21:31 2003 *************** *** 55,61 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/afsd/afsd.c,v 1.13.2.13 2003/03/23 19:47:55 shadow Exp $"); #define VFS 1 --- 55,61 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/afsd/afsd.c,v 1.13.2.15 2003/07/01 19:21:31 shadow Exp $"); #define VFS 1 *************** *** 146,151 **** --- 146,172 ---- #ifdef AFS_LINUX20_ENV #include #endif + #ifdef AFS_DARWIN_ENV + #include + /* Relevant definitions from DiskArbitration.h (not included with Mac OS X) */ + #ifndef __DISKARBITRATION_H + typedef char DiskArbDiskIdentifier[1024]; + typedef char DiskArbMountpoint[1024]; + kern_return_t DiskArbStart(mach_port_t * portPtr); + kern_return_t DiskArbDiskAppearedWithMountpointPing_auto( + DiskArbDiskIdentifier diskIdentifier, + unsigned flags, + DiskArbMountpoint mountpoint); + kern_return_t DiskArbDiskDisappearedPing_auto( + DiskArbDiskIdentifier diskIdentifier, + unsigned flags); + enum { + kDiskArbDiskAppearedNoFlags = 0x00000000, + kDiskArbDiskAppearedEjectableMask = 1 << 1, + kDiskArbDiskAppearedNetworkDiskMask = 1 << 3 + }; + #endif /* __DISKARBITRATION_H */ + #endif /* AFS_DARWIN_ENV */ #ifndef MOUNT_AFS #define MOUNT_AFS AFS_MOUNT_AFS *************** *** 246,251 **** --- 267,273 ---- #endif static int enable_dynroot = 0; /* enable dynroot support */ static int enable_fakestat = 0; /* enable fakestat support */ + static int enable_nomount = 0; /* do not mount */ #ifdef notdef static int inodes = 60; /* VERY conservative, but has to be */ #endif *************** *** 1343,1348 **** --- 1365,1374 ---- /* -fakestat-all */ enable_fakestat = 1; } + if (as->parms[29].items) { + /* -nomount */ + enable_nomount = 1; + } /* * Pull out all the configuration info for the workstation's AFS cache and *************** *** 1811,1816 **** --- 1837,1844 ---- exit(1); } + if (!enable_nomount) { + mountFlags = 0; /* Read/write file system, can do setuid() */ #if defined(AFS_SUN_ENV) || defined(AFS_SUN5_ENV) #ifdef AFS_SUN5_ENV *************** *** 1893,1898 **** --- 1921,1928 ---- HandleMTab(); + } + if (afsd_rmtsys) { if (afsd_verbose) printf("%s: Forking 'rmtsys' daemon.\n", rn); *************** *** 1956,1961 **** --- 1986,1992 ---- cmd_AddParm(ts, "-dynroot", CMD_FLAG, CMD_OPTIONAL, "Enable dynroot support"); cmd_AddParm(ts, "-fakestat", CMD_FLAG, CMD_OPTIONAL, "Enable fakestat support for cross-cell mounts"); cmd_AddParm(ts, "-fakestat-all", CMD_FLAG, CMD_OPTIONAL, "Enable fakestat support for all mounts"); + cmd_AddParm(ts, "-nomount", CMD_FLAG, CMD_OPTIONAL, "Do not mount AFS"); return (cmd_Dispatch(argc, argv)); } *************** *** 2029,2034 **** --- 2060,2077 ---- #endif /* AFS_SGI_ENV */ #endif /* AFS_SUN5_ENV */ #endif /* unreasonable systems */ + #ifdef AFS_DARWIN_ENV + mach_port_t diskarb_port; + kern_return_t status; + + status = DiskArbStart(&diskarb_port); + if (status == KERN_SUCCESS) { + status = DiskArbDiskAppearedWithMountpointPing_auto("AFS", + kDiskArbDiskAppearedNetworkDiskMask, cacheMountDir); + } + + return status; + #endif /* AFS_DARWIN_ENV */ return 0; } *************** *** 2045,2051 **** eparm[2] = param6; eparm[3] = param7; ! param4 = eparm; #endif error = syscall(AFS_SYSCALL, AFSCALL_CALL, param1, param2, param3, param4, param5, param6, param7); --- 2088,2094 ---- eparm[2] = param6; eparm[3] = param7; ! param4 = (long) eparm; #endif error = syscall(AFS_SYSCALL, AFSCALL_CALL, param1, param2, param3, param4, param5, param6, param7); Index: openafs/src/afsmonitor/Makefile.in diff -c openafs/src/afsmonitor/Makefile.in:1.5 openafs/src/afsmonitor/Makefile.in:1.5.2.1 *** openafs/src/afsmonitor/Makefile.in:1.5 Fri Sep 7 20:40:38 2001 --- openafs/src/afsmonitor/Makefile.in Tue Jul 1 15:03:52 2003 *************** *** 29,35 **** include ../config/Makefile.${SYS_NAME} ! CFLAGS=-g -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ --- 29,35 ---- include ../config/Makefile.${SYS_NAME} ! CFLAGS=${DBG} -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ Index: openafs/src/afsweb/Makefile.in diff -c openafs/src/afsweb/Makefile.in:1.4.2.1 openafs/src/afsweb/Makefile.in:1.4.2.2 *** openafs/src/afsweb/Makefile.in:1.4.2.1 Fri Apr 19 00:34:19 2002 --- openafs/src/afsweb/Makefile.in Mon Jul 7 16:16:27 2003 *************** *** 28,34 **** include ../config/Makefile.${SYS_NAME} ! UKERNELDIR=../libuafs/ COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et UKSRCS=nsafs.h nsafs.c securehash.c --- 28,34 ---- include ../config/Makefile.${SYS_NAME} ! UKERNELDIR=../libuafs COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et UKSRCS=nsafs.h nsafs.c securehash.c Index: openafs/src/audit/Makefile.in diff -c openafs/src/audit/Makefile.in:1.4 openafs/src/audit/Makefile.in:1.4.2.1 *** openafs/src/audit/Makefile.in:1.4 Fri Sep 7 19:34:47 2001 --- openafs/src/audit/Makefile.in Mon Jul 7 16:16:27 2003 *************** *** 35,41 **** include ../config/Makefile.${SYS_NAME} ! UKERNELDIR = ../libuafs/ CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} --- 35,41 ---- include ../config/Makefile.${SYS_NAME} ! UKERNELDIR = ../libuafs CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} Index: openafs/src/auth/Makefile.in diff -c openafs/src/auth/Makefile.in:1.5.2.1 openafs/src/auth/Makefile.in:1.5.2.3 *** openafs/src/auth/Makefile.in:1.5.2.1 Sun Jan 20 03:27:57 2002 --- openafs/src/auth/Makefile.in Mon Jul 7 16:16:28 2003 *************** *** 27,41 **** include ../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs/ ! UKERNELDIR = ../libuafs/ COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o ! CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LIBS=libauth.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ --- 27,41 ---- include ../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs ! UKERNELDIR = ../libuafs COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et OBJS= cellconfig.o ktc.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o KOBJS= cellconfig.o ktc.krb.o userok.o writeconfig.o authcon.o \ acfg_errors.o ktc_errors.o ! CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} LIBS=libauth.a ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \ Index: openafs/src/auth/cellconfig.c diff -c openafs/src/auth/cellconfig.c:1.14.2.7 openafs/src/auth/cellconfig.c:1.14.2.9 *** openafs/src/auth/cellconfig.c:1.14.2.7 Tue Sep 10 18:33:39 2002 --- openafs/src/auth/cellconfig.c Wed May 21 10:45:27 2003 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/auth/cellconfig.c,v 1.14.2.7 2002/09/10 22:33:39 zacheiss Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/auth/cellconfig.c,v 1.14.2.9 2003/05/21 14:45:27 shadow Exp $"); #include #include *************** *** 512,517 **** --- 512,518 ---- adir->alias_entries = curAlias; } + if (tf != NULL) fclose(tf); /* now read the fs keys, if possible */ adir->keystr = (struct afsconf_keys *) 0; afsconf_IntGetKeys(adir); *************** *** 785,791 **** if (aservice) { LOCK_GLOBAL_MUTEX tservice = afsconf_FindService(aservice); ! UNLOCK_GLOBAL_MUTEX if (tservice < 0) { return AFSCONF_NOTFOUND; /* service not found */ } --- 786,792 ---- if (aservice) { LOCK_GLOBAL_MUTEX tservice = afsconf_FindService(aservice); ! UNLOCK_GLOBAL_MUTEX if (tservice < 0) { return AFSCONF_NOTFOUND; /* service not found */ } *************** *** 1023,1030 **** LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); ! if (code) return AFSCONF_FAILURE; memcpy(astr, adir->keystr, sizeof(struct afsconf_keys)); UNLOCK_GLOBAL_MUTEX return 0; --- 1024,1033 ---- LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); ! if (code) { ! UNLOCK_GLOBAL_MUTEX return AFSCONF_FAILURE; + } memcpy(astr, adir->keystr, sizeof(struct afsconf_keys)); UNLOCK_GLOBAL_MUTEX return 0; *************** *** 1045,1052 **** LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); ! if (code) return AFSCONF_FAILURE; maxa = adir->keystr->nkeys; best = -1; /* highest kvno we've seen yet */ --- 1048,1057 ---- LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); ! if (code) { ! UNLOCK_GLOBAL_MUTEX return AFSCONF_FAILURE; + } maxa = adir->keystr->nkeys; best = -1; /* highest kvno we've seen yet */ *************** *** 1080,1087 **** LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); ! if (code) return AFSCONF_FAILURE; maxa = adir->keystr->nkeys; for(tk = adir->keystr->key,i=0;ikeystr->nkeys; for(tk = adir->keystr->key,i=0;i #endif ! RCSID("$Header: /data/cvs/openafs/src/auth/ktc.c,v 1.7.2.2 2001/12/26 20:45:27 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 16,22 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/auth/ktc.c,v 1.7.2.3 2003/07/01 19:36:41 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 131,137 **** */ int afs_tf_init(), afs_tf_get_pname(), afs_tf_get_pinst(), afs_tf_get_cred(); int afs_tf_save_cred(), afs_tf_close(), afs_tf_create(); ! int afs_tf_dest_tkt(), ktc_LocalCell(); char *ktc_tkt_string(); #endif /* AFS_KERBEROS_ENV */ --- 131,140 ---- */ int afs_tf_init(), afs_tf_get_pname(), afs_tf_get_pinst(), afs_tf_get_cred(); int afs_tf_save_cred(), afs_tf_close(), afs_tf_create(); ! int afs_tf_dest_tkt(); ! /* except ktc_LocalCell which is still static ! */ ! static int ktc_LocalCell(); char *ktc_tkt_string(); #endif /* AFS_KERBEROS_ENV */ Index: openafs/src/bozo/Makefile.in diff -c openafs/src/bozo/Makefile.in:1.4.2.2 openafs/src/bozo/Makefile.in:1.4.2.4 *** openafs/src/bozo/Makefile.in:1.4.2.2 Sun Jan 20 04:07:31 2002 --- openafs/src/bozo/Makefile.in Tue Jul 1 15:03:54 2003 *************** *** 28,34 **** include ../config/Makefile.${SYS_NAME} COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et ! CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h bosint.h INCLS=bnode.h \ --- 28,34 ---- include ../config/Makefile.${SYS_NAME} COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et ! CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h bosint.h INCLS=bnode.h \ *************** *** 50,57 **** ${TOP_LIBDIR}/librxstat.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libdes.a \ - ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libubik.a \ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a \ --- 50,57 ---- ${TOP_LIBDIR}/librxstat.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libdes.a \ ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a \ Index: openafs/src/bozo/bos.rc diff -c openafs/src/bozo/bos.rc:1.2 openafs/src/bozo/bos.rc:1.2.8.1 *** openafs/src/bozo/bos.rc:1.2 Sat Nov 4 05:03:59 2000 --- openafs/src/bozo/bos.rc Tue Jul 1 20:35:25 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Basic OverSeer Command" + #define AFS_VERINFO_NAME "bos" + #define AFS_VERINFO_FILENAME "bos.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/bozo/bos_util.c diff -c openafs/src/bozo/bos_util.c:1.1.2.1 openafs/src/bozo/bos_util.c:1.1.2.2 *** openafs/src/bozo/bos_util.c:1.1.2.1 Sun Jan 20 03:52:34 2002 --- openafs/src/bozo/bos_util.c Tue Jul 1 15:21:33 2003 *************** *** 22,28 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bos_util.c,v 1.1.2.1 2002/01/20 08:52:34 shadow Exp $"); #include #include --- 22,28 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bos_util.c,v 1.1.2.2 2003/07/01 19:21:33 shadow Exp $"); #include #include *************** *** 187,193 **** printf("kvno %4d: key is '%s' '", tkeys.key[i].kvno, tbuffer); strcpy(x,(char *)tbuffer); for(count=0;count<8;count++) ! printf("\\%03o",(unsigned char *)x[count]); printf("'\n"); } } --- 187,193 ---- printf("kvno %4d: key is '%s' '", tkeys.key[i].kvno, tbuffer); strcpy(x,(char *)tbuffer); for(count=0;count<8;count++) ! printf("\\%03o", x[count]); printf("'\n"); } } Index: openafs/src/bozo/bosserver.rc diff -c openafs/src/bozo/bosserver.rc:1.2 openafs/src/bozo/bosserver.rc:1.2.8.1 *** openafs/src/bozo/bosserver.rc:1.2 Sat Nov 4 05:04:00 2000 --- openafs/src/bozo/bosserver.rc Tue Jul 1 20:35:25 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Basic OverSeer Server" + #define AFS_VERINFO_NAME "bosserver" + #define AFS_VERINFO_FILENAME "bosserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/bu_utils/Makefile.in diff -c openafs/src/bu_utils/Makefile.in:1.4 openafs/src/bu_utils/Makefile.in:1.4.2.1 *** openafs/src/bu_utils/Makefile.in:1.4 Fri Sep 7 19:34:49 2001 --- openafs/src/bu_utils/Makefile.in Tue Jul 1 15:03:54 2003 *************** *** 28,34 **** include ../config/Makefile.${SYS_NAME} ! CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} all: fms --- 28,34 ---- include ../config/Makefile.${SYS_NAME} ! CFLAGS=${DBG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} all: fms Index: openafs/src/bu_utils/fms.rc diff -c openafs/src/bu_utils/fms.rc:1.2 openafs/src/bu_utils/fms.rc:1.2.8.1 *** openafs/src/bu_utils/fms.rc:1.2 Sat Nov 4 05:04:02 2000 --- openafs/src/bu_utils/fms.rc Tue Jul 1 20:35:26 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS File Mark Size Command" + #define AFS_VERINFO_NAME "fms" + #define AFS_VERINFO_FILENAME "fms.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/bucoord/backup.rc diff -c openafs/src/bucoord/backup.rc:1.2 openafs/src/bucoord/backup.rc:1.2.8.1 *** openafs/src/bucoord/backup.rc:1.2 Sat Nov 4 05:04:03 2000 --- openafs/src/bucoord/backup.rc Tue Jul 1 20:35:27 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Backup Command" + #define AFS_VERINFO_NAME "backup" + #define AFS_VERINFO_FILENAME "backup.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/budb/Makefile.in diff -c openafs/src/budb/Makefile.in:1.4 openafs/src/budb/Makefile.in:1.4.2.2 *** openafs/src/budb/Makefile.in:1.4 Fri Sep 7 19:34:50 2001 --- openafs/src/budb/Makefile.in Tue Jul 1 15:15:36 2003 *************** *** 30,37 **** COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et RXGEN=${TOP_SRCDIR}/rxgen/rxgen ! CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = -g ${XLDFLAGS} INCLS=\ ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/ubik.h \ --- 30,37 ---- COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et RXGEN=${TOP_SRCDIR}/rxgen/rxgen ! CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = ${XLDFLAGS} INCLS=\ ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/ubik.h \ *************** *** 70,76 **** all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server ! budb_errs.o: budb_errs.c budb_errs.c budb_client.h: budb_errs.et budb_client.p.h $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} budb_errs -h budb_client --- 70,80 ---- all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server ! # ! # budb_errs.o actually depends on neither budb_client.h nor budb_errs.h ! # but generating either of them will rebuild budb_errs.c ! # ! budb_errs.o: budb_errs.c budb_client.h budb_errs.h budb_errs.c budb_client.h: budb_errs.et budb_client.p.h $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} budb_errs -h budb_client Index: openafs/src/budb/buserver.rc diff -c openafs/src/budb/buserver.rc:1.2 openafs/src/budb/buserver.rc:1.2.8.1 *** openafs/src/budb/buserver.rc:1.2 Sat Nov 4 05:04:09 2000 --- openafs/src/budb/buserver.rc Tue Jul 1 20:35:28 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Backup Database Server" + #define AFS_VERINFO_NAME "buserver" + #define AFS_VERINFO_FILENAME "buserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/budb/procs.c diff -c openafs/src/budb/procs.c:1.6 openafs/src/budb/procs.c:1.6.2.1 *** openafs/src/budb/procs.c:1.6 Wed Aug 8 20:20:22 2001 --- openafs/src/budb/procs.c Wed May 14 10:44:24 2003 *************** *** 16,22 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/budb/procs.c,v 1.6 2001/08/09 00:20:22 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 16,22 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/budb/procs.c,v 1.6.2.1 2003/05/14 14:44:24 shadow Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 26,32 **** --- 26,38 ---- #include #include #include + #ifdef HAVE_STRING_H + #include + #else + #ifdef HAVE_STRINGS_H #include + #endif + #endif #endif #include #include Index: openafs/src/butc/Makefile.in diff -c openafs/src/butc/Makefile.in:1.4.2.2 openafs/src/butc/Makefile.in:1.4.2.3 *** openafs/src/butc/Makefile.in:1.4.2.2 Mon Feb 3 18:36:47 2003 --- openafs/src/butc/Makefile.in Tue Jul 1 15:03:56 2003 *************** *** 28,34 **** include ../config/Makefile.${SYS_NAME} ! CFLAGS=-g -w ${INCDIRS} ${XCFLAGS} @XBSA_CFLAGS@ INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs \ -I${TOP_INCDIR}/rx -I${TOP_INCDIR} --- 28,34 ---- include ../config/Makefile.${SYS_NAME} ! CFLAGS=${DBG} -w ${INCDIRS} ${XCFLAGS} @XBSA_CFLAGS@ INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs \ -I${TOP_INCDIR}/rx -I${TOP_INCDIR} Index: openafs/src/butc/butc.rc diff -c openafs/src/butc/butc.rc:1.2 openafs/src/butc/butc.rc:1.2.8.1 *** openafs/src/butc/butc.rc:1.2 Sat Nov 4 05:04:12 2000 --- openafs/src/butc/butc.rc Tue Jul 1 20:35:29 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Tape Coordinator Server" + #define AFS_VERINFO_NAME "butc" + #define AFS_VERINFO_FILENAME "butc.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/butc/dump.c diff -c openafs/src/butc/dump.c:1.6.2.3 openafs/src/butc/dump.c:1.6.2.4 *** openafs/src/butc/dump.c:1.6.2.3 Tue Sep 10 18:33:42 2002 --- openafs/src/butc/dump.c Wed Jul 23 12:30:36 2003 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/butc/dump.c,v 1.6.2.3 2002/09/10 22:33:42 zacheiss Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/butc/dump.c,v 1.6.2.4 2003/07/23 16:30:36 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 455,460 **** --- 455,461 ---- * If we hit the end, see if this is the first volume on the tape or not. * Also, mark the tape as finished if the tape contains other dumps. */ + if (!code) code = rc; if (HITEOT(code)) { ErrorLog(2, taskId, code, tapeInfoPtr->error, "Warning: Dump (%s) hit end-of-tape inferred\n", Index: openafs/src/butc/tcudbprocs.c diff -c openafs/src/butc/tcudbprocs.c:1.6 openafs/src/butc/tcudbprocs.c:1.6.2.3 *** openafs/src/butc/tcudbprocs.c:1.6 Tue Aug 7 20:03:40 2001 --- openafs/src/butc/tcudbprocs.c Thu Jun 19 12:19:14 2003 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/butc/tcudbprocs.c,v 1.6 2001/08/08 00:03:40 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/butc/tcudbprocs.c,v 1.6.2.3 2003/06/19 16:19:14 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 1390,1397 **** /* open the text file */ sprintf(filename, "%s/bu_XXXXXX", gettmpdir()); ! #ifdef AFS_LINUX20_ENV ! fid = open(mkstemp(filename), O_RDWR|O_CREAT|O_EXCL, 0600); #else fid = open(mktemp(filename), O_RDWR|O_CREAT|O_EXCL, 0600); #endif --- 1390,1397 ---- /* open the text file */ sprintf(filename, "%s/bu_XXXXXX", gettmpdir()); ! #if defined (HAVE_MKSTEMP) ! fid = mkstemp(filename); #else fid = open(mktemp(filename), O_RDWR|O_CREAT|O_EXCL, 0600); #endif Index: openafs/src/butm/Makefile.in diff -c openafs/src/butm/Makefile.in:1.4 openafs/src/butm/Makefile.in:1.4.2.1 *** openafs/src/butm/Makefile.in:1.4 Fri Sep 7 19:34:51 2001 --- openafs/src/butm/Makefile.in Tue Jul 1 15:03:56 2003 *************** *** 26,33 **** SHELL = /bin/sh ! CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = -g ${XLDFLAGS} INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h LIBS=${TOP_LIBDIR}/libbubasics.a \ --- 26,33 ---- SHELL = /bin/sh ! CFLAGS=${DBG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = ${XLDFLAGS} INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h LIBS=${TOP_LIBDIR}/libbubasics.a \ Index: openafs/src/butm/file_tm.c diff -c openafs/src/butm/file_tm.c:1.5 openafs/src/butm/file_tm.c:1.5.2.1 *** openafs/src/butm/file_tm.c:1.5 Tue Aug 7 20:03:40 2001 --- openafs/src/butm/file_tm.c Tue Jul 29 18:36:10 2003 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/butm/file_tm.c,v 1.5 2001/08/08 00:03:40 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/butm/file_tm.c,v 1.5.2.1 2003/07/29 22:36:10 shadow Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 30,35 **** --- 30,44 ---- #include #include "error_macros.h" + #ifdef O_LARGEFILE + typedef off64_t osi_lloff_t; + #else /* O_LARGEFILE */ + #ifdef AFS_HAVE_LLSEEK + typedef offset_t osi_lloff_t; + #else /* AFS_HAVE_LLSEEK */ + typedef off_t osi_lloff_t; + #endif /* AFS_HAVE_LLSEEK */ + #endif /* O_LARGEFILE */ extern int isafile; *************** *** 75,81 **** * in succession (2 or 4 of them ). */ - struct fileMark { /* in network byte order */ afs_int32 magic; afs_uint32 nBytes; --- 84,89 ---- *************** *** 670,676 **** if ( info->posCount >= 2147467264 ) /* 2GB - 16K */ { info->posCount = 0; ! #if (defined(AFS_SUN_ENV) || defined(AFS_DEC_ENV)) if (!isafile) { hset64(off, 0, 0); --- 678,684 ---- if ( info->posCount >= 2147467264 ) /* 2GB - 16K */ { info->posCount = 0; ! #if (defined(AFS_SUN_ENV) || defined(AFS_DEC_ENV) || defined(AFS_LINUX24_ENV)) if (!isafile) { hset64(off, 0, 0); *************** *** 1574,1580 **** afs_int32 position; { afs_int32 code = 0; ! afs_int32 posit, w; struct progress *p; afs_hyper_t startOff, stopOff; /* for normal file(non-tape) seeks */ --- 1582,1590 ---- afs_int32 position; { afs_int32 code = 0; ! afs_int32 w; ! osi_lloff_t posit; ! afs_uint32 c, d; struct progress *p; afs_hyper_t startOff, stopOff; /* for normal file(non-tape) seeks */ *************** *** 1588,1596 **** if (isafile) { p = (struct progress *)info->tmRock; ! posit = (position * BUTM_BLOCKSIZE); ! ! hset64(startOff, 0, posit); w = USD_SEEK(p->fid, startOff, SEEK_SET, &stopOff); if (w) info->error == w; if (hcmp(startOff, stopOff) != 0) ERROR_EXIT(BUTM_POSITION); --- 1598,1614 ---- if (isafile) { p = (struct progress *)info->tmRock; ! posit = (osi_lloff_t)position * (osi_lloff_t)BUTM_BLOCKSIZE; ! /* Not really necessary to do it this way, should be fixed. */ ! #ifdef O_LARGEFILE ! c = (posit >> 32); ! d = (posit & 0xffffffff); ! #else ! c = 0; ! d = posit; ! #endif ! hset64(startOff, c, d); ! w = USD_SEEK(p->fid, startOff, SEEK_SET, &stopOff); if (w) info->error == w; if (hcmp(startOff, stopOff) != 0) ERROR_EXIT(BUTM_POSITION); Index: openafs/src/cf/linux-test2.m4 diff -c openafs/src/cf/linux-test2.m4:1.2.4.3 openafs/src/cf/linux-test2.m4:1.2.4.4 *** openafs/src/cf/linux-test2.m4:1.2.4.3 Wed Jul 10 16:41:09 2002 --- openafs/src/cf/linux-test2.m4 Tue Jul 1 18:24:23 2003 *************** *** 28,33 **** --- 28,48 ---- AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_bytes) CPPFLAGS="$save_CPPFLAGS"]) + AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_ALLOC_SEM, [ + AC_MSG_CHECKING(for i_alloc_sem in struct inode) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $CPPFLAGS" + AC_CACHE_VAL(ac_cv_linux_fs_struct_inode_has_i_alloc_sem, + [ + AC_TRY_COMPILE( + [#include ], + [struct inode _i; + printf("%x\n", _i.i_alloc_sem);], + ac_cv_linux_fs_struct_inode_has_i_alloc_sem=yes, + ac_cv_linux_fs_struct_inode_has_i_alloc_sem=no)]) + AC_MSG_RESULT($ac_cv_linux_fs_struct_inode_has_i_alloc_sem) + CPPFLAGS="$save_CPPFLAGS"]) + AC_DEFUN(LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM, [ AC_MSG_CHECKING(for i_truncate_sem in struct inode) save_CPPFLAGS="$CPPFLAGS" Index: openafs/src/cf/linux-test3.m4 diff -c openafs/src/cf/linux-test3.m4:1.3 openafs/src/cf/linux-test3.m4:1.3.4.2 *** openafs/src/cf/linux-test3.m4:1.3 Sun Jul 15 20:22:48 2001 --- openafs/src/cf/linux-test3.m4 Tue May 20 00:05:38 2003 *************** *** 1,3 **** --- 1,14 ---- + AC_DEFUN(LINUX_KERNEL_LINUX_SYSCALL_H,[ + AC_MSG_CHECKING(for linux/syscall.h in kernel) + if test -f "${LINUX_KERNEL_PATH}/include/linux/syscall.h"; then + ac_linux_syscall=yes + AC_MSG_RESULT($ac_linux_syscall) + else + ac_linux_syscall=no + AC_MSG_RESULT($ac_linux_syscall) + fi + ]) + AC_DEFUN(LINUX_NEED_RHCONFIG,[ RHCONFIG_SP="" RHCONFIG_MP="" Index: openafs/src/cf/linux-test4.m4 diff -c openafs/src/cf/linux-test4.m4:1.6.2.9 openafs/src/cf/linux-test4.m4:1.6.2.11 *** openafs/src/cf/linux-test4.m4:1.6.2.9 Fri Mar 21 09:01:10 2003 --- openafs/src/cf/linux-test4.m4 Tue May 20 01:51:47 2003 *************** *** 120,125 **** --- 120,142 ---- CPPFLAGS="$save_CPPFLAGS"]) + AC_DEFUN(LINUX_EXPORTS_IA32_SYS_CALL_TABLE, [ + AC_MSG_CHECKING(for exported ia32_sys_call_table) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $CPPFLAGS" + AC_CACHE_VAL(ac_cv_linux_exports_ia32_sys_call_table, + [ + AC_TRY_COMPILE( + [#include ], + [#ifndef __ver_ia32_sys_call_table + #error ia32_sys_call_table not exported + #endif], + ac_cv_linux_exports_ia32_sys_call_table=yes, + ac_cv_linux_exports_ia32_sys_call_table=no)]) + AC_MSG_RESULT($ac_cv_linux_exports_ia32_sys_call_table) + CPPFLAGS="$save_CPPFLAGS"]) + + AC_DEFUN(LINUX_EXPORTS_SYS_CHDIR, [ AC_MSG_CHECKING(for exported sys_chdir) save_CPPFLAGS="$CPPFLAGS" *************** *** 151,156 **** --- 168,190 ---- ac_cv_linux_exports_sys_close=yes, ac_cv_linux_exports_sys_close=no)]) AC_MSG_RESULT($ac_cv_linux_exports_sys_close) + CPPFLAGS="$save_CPPFLAGS"]) + + + AC_DEFUN(LINUX_EXPORTS_SYS_WAIT4, [ + AC_MSG_CHECKING(for exported sys_wait4) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $CPPFLAGS" + AC_CACHE_VAL(ac_cv_linux_exports_sys_wait4, + [ + AC_TRY_COMPILE( + [#include ], + [#ifndef __ver_sys_wait4 + #error sys_wait4 not exported + #endif], + ac_cv_linux_exports_sys_wait4=yes, + ac_cv_linux_exports_sys_wait4=no)]) + AC_MSG_RESULT($ac_cv_linux_exports_sys_wait4) CPPFLAGS="$save_CPPFLAGS"]) Index: openafs/src/cf/ressearch.m4 diff -c /dev/null openafs/src/cf/ressearch.m4:1.1.2.1 *** /dev/null Tue Jul 29 19:41:12 2003 --- openafs/src/cf/ressearch.m4 Thu May 15 11:51:29 2003 *************** *** 0 **** --- 1,21 ---- + AC_DEFUN(AC_FUNC_RES_SEARCH, [ + ac_cv_func_res_search=no + AC_TRY_LINK([ + #include + #include + #include + #include ], + [ + const char host[11]="openafs.org"; + u_char ans[1024]; + int r; + res_init(); + /* Capture result in r but return 0, since a working nameserver is + * not a requirement for compilation. + */ + r = res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans)); + return 0; + res_close(); + ], + ac_cv_func_res_search=yes) + ]) \ No newline at end of file Index: openafs/src/comerr/Makefile.in diff -c openafs/src/comerr/Makefile.in:1.4 openafs/src/comerr/Makefile.in:1.4.2.1 *** openafs/src/comerr/Makefile.in:1.4 Fri Sep 7 19:34:52 2001 --- openafs/src/comerr/Makefile.in Mon Jul 7 16:16:29 2003 *************** *** 27,33 **** include ../config/Makefile.${SYS_NAME} ! UKERNELDIR=../libuafs/ CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} --- 27,33 ---- include ../config/Makefile.${SYS_NAME} ! UKERNELDIR=../libuafs CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} Index: openafs/src/config/Makefile.amd64_linux24.in diff -c /dev/null openafs/src/config/Makefile.amd64_linux24.in:1.1.2.3 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/Makefile.amd64_linux24.in Fri May 16 15:59:30 2003 *************** *** 0 **** --- 1,44 ---- + # AFS_OSTYPE used to indicate suffixes and os specific subdirectories. + AFS_OSTYPE = LINUX + + # Base directory for linux kernel source. Actually a prefix which is complete + # when LINUX_VERS is appended to it. + LINUX_SRCDIR = /usr/src/linux- + # Default list of Linux kernels to build. Build will run only if all + # can be built. To build a different set, specify LINUX_VERS to make. + LINUX_VERS = @LINUX_VERSION@ + + # + # compilation and link editor flags + DBG=-g + OPTMZ=-O2 + PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC + # Put -O2 here to _ensure_ all Makefiles pick it up. + XCFLAGS= -O2 + MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} + XLDFLAGS= + SHLIB_LDFLAGS = -shared -Xlinker -x + SHLIB_SUFFIX=so + SHLIB_CFLAGS= + SHLIB_LINKER=${MT_CC} -shared + # + # libraries + MTLIBS=-lpthread + TXLIBS=-lncurses + XLIBS= @LIB_AFSDB@ + # + # programs + AR=ar + AS=as + CP=cp + LD=ld + MT_CC=cc + MV=mv + RANLIB=ranlib + RM=rm + INSTALL=${TOP_SRCDIR}/pinstall/pinstall + # + # Other OS specific requirements + # + YACC = bison -y + LEX = flex -l Index: openafs/src/config/Makefile.hp_ux11i.in diff -c /dev/null openafs/src/config/Makefile.hp_ux11i.in:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/Makefile.hp_ux11i.in Fri May 23 02:52:21 2003 *************** *** 0 **** --- 1,37 ---- + # Copyright 2000, International Business Machines Corporation and others. + # All Rights Reserved. + # + # This software has been released under the terms of the IBM Public + # License. For details, see the LICENSE file in the top-level source + # directory or online at http://www.openafs.org/dl/license10.html + + AFS_OSTYPE = HPUX + CC=/opt/ansic/bin/cc + MT_CC=/opt/ansic/bin/cc + XCFLAGS0=-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE + XCFLAGS=${XCFLAGS0} +DA1.0 + XCFLAGS64=${XCFLAGS0} +DA2.0W + MT_CFLAGS=-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS} + XLIBS=@LIB_AFSDB@ + XLIBELFA=-lelf + TXLIBS=/usr/lib/libHcurses.a + MTLIBS=-lpthread + SHLIB_SUFFIX=sl + SHLIB_LDFLAGS=-b -Bsymbolic + SHLIB_LINKER=ld -b + LWP_OPTMZ=-O + OPTMZ=-O + DBG=-g + RANLIB=/usr/bin/ranlib + INSTALL=${TOP_SRCDIR}/pinstall/pinstall + RM=/bin/rm + CP=/bin/cp + AR=/bin/ar + AS=/usr/ccs/bin/as + MV=/bin/mv + LD=/bin/ld + LEX=/opt/langtools/bin/lex + DBM=/lib/libndbm.a + PAM_CFLAGS=+DA1.0 +z -Wl,+k + PAMLIBS=/usr/lib/libpam.1 + YACC=/opt/langtools/bin/yacc Index: openafs/src/config/Makefile.i386_linux22.in diff -c openafs/src/config/Makefile.i386_linux22.in:1.7.2.2 openafs/src/config/Makefile.i386_linux22.in:1.7.2.3 *** openafs/src/config/Makefile.i386_linux22.in:1.7.2.2 Tue Sep 10 01:41:58 2002 --- openafs/src/config/Makefile.i386_linux22.in Tue Jul 1 15:31:40 2003 *************** *** 32,38 **** # # libraries MTLIBS=-lpthread ! TXLIBS= /usr/lib/libncurses.so XLIBS= @LIB_AFSDB@ # # programs --- 32,38 ---- # # libraries MTLIBS=-lpthread ! TXLIBS=-lncurses XLIBS= @LIB_AFSDB@ # # programs Index: openafs/src/config/Makefile.i386_linux24.in diff -c openafs/src/config/Makefile.i386_linux24.in:1.5.2.2 openafs/src/config/Makefile.i386_linux24.in:1.5.2.3 *** openafs/src/config/Makefile.i386_linux24.in:1.5.2.2 Tue Sep 10 01:41:58 2002 --- openafs/src/config/Makefile.i386_linux24.in Tue Jul 1 15:31:40 2003 *************** *** 24,30 **** # # libraries MTLIBS=-lpthread ! TXLIBS= /usr/lib/libncurses.so XLIBS= @LIB_AFSDB@ # # programs --- 24,30 ---- # # libraries MTLIBS=-lpthread ! TXLIBS=-lncurses XLIBS= @LIB_AFSDB@ # # programs Index: openafs/src/config/Makefile.i386_umlinux22.in diff -c /dev/null openafs/src/config/Makefile.i386_umlinux22.in:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/Makefile.i386_umlinux22.in Wed May 28 19:49:22 2003 *************** *** 0 **** --- 1,52 ---- + # Copyright 2000, International Business Machines Corporation and others. + # All Rights Reserved. + # + # This software has been released under the terms of the IBM Public + # License. For details, see the LICENSE file in the top-level source + # directory or online at http://www.openafs.org/dl/license10.html + + # Keep macros within each section in sorted order for clean diff displays. + # + # AFS_OSTYPE used to indicate suffixes and os specific subdirectories. + AFS_OSTYPE = LINUX + + # Base directory for linux kernel source. Actually a prefix which is complete + # when LINUX_VERS is appended to it. + LINUX_SRCDIR = /usr/src/linux- + # Default list of Linux kernels to build. Build will run only if all + # can be built. To build a different set, specify LINUX_VERS to make. + LINUX_VERS = @LINUX_VERSION@ + + # compilation and link editor flags + DBG=-g + OPTMZ=-O2 + PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC + # Put -O2 here to _ensure_ all Makefiles pick it up. + XCFLAGS= -O2 + MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} + XLDFLAGS= + SHLIB_LDFLAGS = -shared -Xlinker -x + SHLIB_SUFFIX=so + SHLIB_CFLAGS= + SHLIB_LINKER=${MT_CC} -shared + # + # libraries + MTLIBS=-lpthread + TXLIBS= /usr/lib/libncurses.so + XLIBS= @LIB_AFSDB@ + # + # programs + AR=ar + AS=as + CP=cp + LD=ld + MT_CC=cc + MV=mv + RANLIB=ranlib + RM=rm + INSTALL=${TOP_SRCDIR}/pinstall/pinstall + # + # Other OS specific requirements + # + YACC = bison -y + LEX = flex -l Index: openafs/src/config/Makefile.i386_umlinux24.in diff -c /dev/null openafs/src/config/Makefile.i386_umlinux24.in:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/Makefile.i386_umlinux24.in Wed May 28 19:49:22 2003 *************** *** 0 **** --- 1,44 ---- + # AFS_OSTYPE used to indicate suffixes and os specific subdirectories. + AFS_OSTYPE = LINUX + + # Base directory for linux kernel source. Actually a prefix which is complete + # when LINUX_VERS is appended to it. + LINUX_SRCDIR = /usr/src/linux- + # Default list of Linux kernels to build. Build will run only if all + # can be built. To build a different set, specify LINUX_VERS to make. + LINUX_VERS = @LINUX_VERSION@ + + # + # compilation and link editor flags + DBG=-g + OPTMZ=-O2 + PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC + # Put -O2 here to _ensure_ all Makefiles pick it up. + XCFLAGS= -O2 + MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} + XLDFLAGS= + SHLIB_LDFLAGS = -shared -Xlinker -x + SHLIB_SUFFIX=so + SHLIB_CFLAGS= + SHLIB_LINKER=${MT_CC} -shared + # + # libraries + MTLIBS=-lpthread + TXLIBS= /usr/lib/libncurses.so + XLIBS= @LIB_AFSDB@ + # + # programs + AR=ar + AS=as + CP=cp + LD=ld + MT_CC=cc + MV=mv + RANLIB=ranlib + RM=rm + INSTALL=${TOP_SRCDIR}/pinstall/pinstall + # + # Other OS specific requirements + # + YACC = bison -y + LEX = flex -l Index: openafs/src/config/Makefile.ia64_hpux1122.in diff -c /dev/null openafs/src/config/Makefile.ia64_hpux1122.in:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/Makefile.ia64_hpux1122.in Fri May 23 02:52:21 2003 *************** *** 0 **** --- 1,37 ---- + # Copyright 2000, International Business Machines Corporation and others. + # All Rights Reserved. + # + # This software has been released under the terms of the IBM Public + # License. For details, see the LICENSE file in the top-level source + # directory or online at http://www.openafs.org/dl/license10.html + + AFS_OSTYPE = HPUX + CC=/opt/ansic/bin/cc + MT_CC=/opt/ansic/bin/cc + XCFLAGS0=-ldld -lc -Wp,-H200000 -Wl,-a,archive_shared -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE + XCFLAGS=${XCFLAGS0} + XCFLAGS64=${XCFLAGS0} +DD64 + MT_CFLAGS=-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS} + XLIBS=@LIB_AFSDB@ + XLIBELFA=-lelf + TXLIBS=/usr/lib/hpux32/libcurses.so + MTLIBS=-lpthread + SHLIB_SUFFIX=sl + SHLIB_LDFLAGS=-b -Bsymbolic + SHLIB_LINKER=ld -b + LWP_OPTMZ=-O + OPTMZ=-O + DBG=-g + RANLIB=/usr/bin/ranlib + INSTALL=${TOP_SRCDIR}/pinstall/pinstall + RM=/bin/rm + CP=/bin/cp + AR=/bin/ar + AS=/usr/ccs/bin/as + MV=/bin/mv + LD=/bin/ld + LEX=/opt/langtools/bin/lex + DBM=/usr/lib/hpux32/libndbm.so + PAM_CFLAGS=-b +z -Wl,+k + PAMLIBS=/usr/lib/hpux32/libpam.so + YACC=/opt/langtools/bin/yacc Index: openafs/src/config/Makefile.in diff -c openafs/src/config/Makefile.in:1.6 openafs/src/config/Makefile.in:1.6.2.1 *** openafs/src/config/Makefile.in:1.6 Fri Sep 7 19:34:53 2001 --- openafs/src/config/Makefile.in Tue Jul 1 15:03:57 2003 *************** *** 30,36 **** include Makefile.${SYS_NAME} ! CFLAGS=-g -I${TOP_INCDIR} ${XCFLAGS} INST=$(RM) -f $@; $(CP) $? $@ --- 30,36 ---- include Makefile.${SYS_NAME} ! CFLAGS=${DBG} -I${TOP_INCDIR} ${XCFLAGS} INST=$(RM) -f $@; $(CP) $? $@ Index: openafs/src/config/NTMakefile.i386_nt40 diff -c openafs/src/config/NTMakefile.i386_nt40:1.6.2.5 openafs/src/config/NTMakefile.i386_nt40:1.6.2.8 *** openafs/src/config/NTMakefile.i386_nt40:1.6.2.5 Thu Dec 5 00:59:56 2002 --- openafs/src/config/NTMakefile.i386_nt40 Tue Jul 1 20:35:30 2003 *************** *** 37,43 **** !ENDIF #define used in WinNT/2000 installation and program version display ! AFSPRODUCT_VERSION=1.2.8 CELLNAME_DEFAULT=openafs.org CELLSERVDB_INSTALL=CellServDB.GrandCentral CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB --- 37,44 ---- !ENDIF #define used in WinNT/2000 installation and program version display ! AFSPRODUCT_VERSION=1.2.10 ! AFSPRODUCT_FILE_VERSION=1,2,1000,0 CELLNAME_DEFAULT=openafs.org CELLSERVDB_INSTALL=CellServDB.GrandCentral CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB *************** *** 103,126 **** !ENDIF !ENDIF - #CHECK which VERSION of the complier we are using - #v6.0 doesn't work using msvcrtd.lib unless AFSDEV_CRTDEBUG is defined, v7.0 requires it - !IF ("$(AFSVER)"=="") - !IF EXISTS("$(DESTDIR)\bin\util_cr.exe") - !IF EXISTS("$(AFSDEV_BIN)\CL.exe") - !IF (([$(DESTDIR)\bin\util_cr.exe __ $(AFSDEV_BIN)\CL.exe 7])==1) - AFSVER_CL=70 - !ELSE - AFSVER_CL=60 - !ENDIF - !ELSE - !MESSAGE WARNING-Complier version not available - !ENDIF - !ELSE - !MESSAGE WARNING-Complier version not available - !ENDIF - !ENDIF - # Command macros. COPY = copy DEL = -del --- 104,109 ---- *************** *** 139,145 **** # Common clean target. # Double colon (::) syntax allows supplemental clean target to be specified. clean:: ! $(DEL) /q *.obj *.lib *.dll *.exe $(DEL) /q *_component_version_number.* # Common lang target. --- 122,128 ---- # Common clean target. # Double colon (::) syntax allows supplemental clean target to be specified. clean:: ! $(DEL) /q *.obj *.lib *.dll *.exe *.res *.pdb $(DEL) /q *_component_version_number.* # Common lang target. *************** *** 186,201 **** !IF ("$(AFSDEV_BUILDTYPE)" == "FREE") # Apply full optimization; generate full debug info in obj. ! afscflags = $(afscflags) /Ox /Z7 ldebug = $(ldebug) ! cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025) cvarsdll = $(cvarsdll:-MDd=-MD) !ELSEIF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") # Disable optimization; generate full debug info in obj. ! afscflags = $(afscflags) /Od /Z7 ldebug = $(ldebug) -debugtype:both ! cdebug = $(cdebug:-Z7=-Z7) # avoid annoying override warning (D4025) !ENDIF # Set compiler warning level --- 169,186 ---- !IF ("$(AFSDEV_BUILDTYPE)" == "FREE") # Apply full optimization; generate full debug info in obj. ! afscflags = $(afscflags) /Ox ldebug = $(ldebug) ! cdebug = $(cdebug:-Od=) cvarsdll = $(cvarsdll:-MDd=-MD) !ELSEIF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") # Disable optimization; generate full debug info in obj. ! afscflags = $(afscflags) /Od ! !IF ("$(AFSVER_CL)"=="60") ldebug = $(ldebug) -debugtype:both ! !ENDIF ! cdebug = !ENDIF # Set compiler warning level *************** *** 322,329 **** !ENDIF # C/C++ compilation macros ! C2OBJ = $(cc) $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c ! CPP2OBJ = $(cc) $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c # Resource compiler macro RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(AFSPRODUCT_VERSION)\"" --- 307,314 ---- !ENDIF # C/C++ compilation macros ! C2OBJ = $(cc) $(cflags:-GS=) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c ! CPP2OBJ = $(cc) $(cflags:-GS=) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c # Resource compiler macro RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(AFSPRODUCT_VERSION)\"" Index: openafs/src/config/NTMakefile.version-NOCML diff -c openafs/src/config/NTMakefile.version-NOCML:1.2.8.1 openafs/src/config/NTMakefile.version-NOCML:1.2.8.2 *** openafs/src/config/NTMakefile.version-NOCML:1.2.8.1 Wed Dec 4 09:27:32 2002 --- openafs/src/config/NTMakefile.version-NOCML Tue Jul 1 20:35:30 2003 *************** *** 19,24 **** --- 19,25 ---- $(VERSFILE).h: echo #define AFS_VERINFO_BUILD "OpenAFS$(AFSPRODUCT_VERSION)" >$(VERSFILE).h + echo #define AFS_VERINFO_FILEVER $(AFSPRODUCT_FILE_VERSION) >>$(VERSFILE).h $(VERSFILE).txt: echo OpenAFS$(AFSPRODUCT_VERSION)>$(VERSFILE).txt Index: openafs/src/config/NTVersioninfo.rc diff -c openafs/src/config/NTVersioninfo.rc:1.3 openafs/src/config/NTVersioninfo.rc:1.3.2.1 *** openafs/src/config/NTVersioninfo.rc:1.3 Thu Aug 23 13:17:44 2001 --- openafs/src/config/NTVersioninfo.rc Tue Jul 1 20:35:30 2003 *************** *** 10,28 **** #include 1 VERSIONINFO BEGIN BLOCK "StringFileInfo" /* FileVersion must be specified or data won't appear on properties tab */ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "OpenAFS Project", "\0" ! VALUE "LegalCopyright", "Copyright \251 IBM Corporation and others, 1998, 1999, 2000, 2001.", "\0" VALUE "ProductName", "OpenAFS for Windows", "\0" ! VALUE "ProductVersion", "1.1", "\0" ! VALUE "FileVersion", "1.1", "\0" VALUE "FileDescription", AFS_VERINFO_FILE_DESCRIPTION, "\0" VALUE "Build", AFS_VERINFO_BUILD, "\0" END END END --- 10,51 ---- #include 1 VERSIONINFO + FILEVERSION AFS_VERINFO_FILEVER + PRODUCTVERSION AFS_VERINFO_FILEVER + FILEOS VOS_NT + #ifdef AFS_VERINFO_DLL + FILETYPE VFT_DLL + #else + FILETYPE VFT_APP + #endif BEGIN BLOCK "StringFileInfo" /* FileVersion must be specified or data won't appear on properties tab */ + /* Internalname and originalfilename must be specified or explorer won't + show version and description */ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", "OpenAFS Project", "\0" ! VALUE "LegalCopyright", "Copyright \251 IBM Corporation and others, 1998, 1999, 2000, 2001, 2002, 2003.", "\0" VALUE "ProductName", "OpenAFS for Windows", "\0" ! VALUE "ProductVersion", AFSPRODUCT_VERSION, "\0" ! VALUE "FileVersion", AFSPRODUCT_VERSION, "\0" VALUE "FileDescription", AFS_VERINFO_FILE_DESCRIPTION, "\0" VALUE "Build", AFS_VERINFO_BUILD, "\0" + VALUE "InternalName", AFS_VERINFO_NAME, "\0" + VALUE "OriginalFilename", AFS_VERINFO_FILENAME, "\0" END + END + /* files in msi's are supposed to have language codes attached to them. + this is how they get populated automatically */ + BLOCK "VarFileInfo" + BEGIN + #ifdef AFS_VERINFO_LANG_CODE + VALUE "Translation", AFS_VERINFO_LANG_CODE, AFS_VERINFO_CHARSET + #else + /* default to 0, 1252 */ + VALUE "Translation", 0, 0x4e4 + #endif END END Index: openafs/src/config/afs_sysnames.h diff -c openafs/src/config/afs_sysnames.h:1.14.2.7 openafs/src/config/afs_sysnames.h:1.14.2.10 *** openafs/src/config/afs_sysnames.h:1.14.2.7 Wed Apr 9 12:33:30 2003 --- openafs/src/config/afs_sysnames.h Wed May 28 19:49:22 2003 *************** *** 7,12 **** --- 7,16 ---- * directory or online at http://www.openafs.org/dl/license10.html */ + #define SYS_NAME_ID_i386_umlinux2 2700 + #define SYS_NAME_ID_i386_umlinux22 2701 + #define SYS_NAME_ID_i386_umlinux24 2702 + /* * File: afs_sysnames.h * *************** *** 43,48 **** --- 47,55 ---- #define SYS_NAME_ID_hp800_ux101 413 #define SYS_NAME_ID_hp_ux102 414 #define SYS_NAME_ID_hp_ux110 415 + #define SYS_NAME_ID_hp_ux11i 416 + #define SYS_NAME_ID_ia64_hpux1122 417 + #define SYS_NAME_ID_mac2_51 500 #define SYS_NAME_ID_mac_aux10 501 *************** *** 159,164 **** --- 166,174 ---- #define SYS_NAME_ID_parisc_linux22 2401 #define SYS_NAME_ID_parisc_linux24 2402 + #define SYS_NAME_ID_amd64_linux2 2700 + #define SYS_NAME_ID_amd64_linux22 2701 + #define SYS_NAME_ID_amd64_linux24 2702 /* * Placeholder to keep system-wide standard flags since this file is included by all * files (i.e in afs/param.h) Index: openafs/src/config/param.amd64_linux24.h diff -c /dev/null openafs/src/config/param.amd64_linux24.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/param.amd64_linux24.h Thu May 15 12:13:42 2003 *************** *** 0 **** --- 1,165 ---- + #ifndef UKERNEL + /* This section for kernel libafs compiles only */ + + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define AFS_LINUX20_ENV 1 + #define AFS_LINUX22_ENV 1 + #define AFS_LINUX24_ENV 1 + #define AFS_AMD64_LINUX20_ENV 1 + #define AFS_AMD64_LINUX22_ENV 1 + #define AFS_AMD64_LINUX24_ENV 1 + #define AFS_LINUX_64BIT_KERNEL 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 183 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + + #define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ + + #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + + #include + #ifdef CONFIG_SMP + #undef CONFIG_SMP + #endif + /* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ + #ifdef AFS_SMP + #define CONFIG_SMP 1 + #ifndef __SMP__ + #define __SMP__ + #endif + #define AFS_GLOBAL_SUNLOCK + #endif + + #if defined(MODULE) && defined(CONFIG_MODVERSIONS) + #define MODVERSIONS + #include + #endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ + + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + + /* Machine / Operating system information */ + #define SYS_NAME "amd64_linux24" + #define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #ifdef KERNEL + #ifndef MIN + #define MIN(A,B) ((A) < (B) ? (A) : (B)) + #endif + #ifndef MAX + #define MAX(A,B) ((A) > (B) ? (A) : (B)) + #endif + #endif /* KERNEL */ + + #define USE_UCONTEXT /* should be in afsconfig.h */ + + #endif /* _PARAM_AMD64_LINUX20_H_ */ + + #else /* !defined(UKERNEL) */ + + /* This section for user space compiles only */ + + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define UKERNEL 1 /* user space kernel */ + #define AFS_ENV 1 + #define AFS_USR_LINUX20_ENV 1 + #define AFS_USR_LINUX22_ENV 1 + #define AFS_USR_LINUX24_ENV 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 183 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + + /* Machine / Operating system information */ + #define SYS_NAME "amd64_linux24" + #define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES MCLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #define USE_UCONTEXT /* should be in afsconfig.h */ + + #endif /* AFS_PARAM_H */ + + #endif /* !defined(UKERNEL) */ Index: openafs/src/config/param.amd64_linux24_usr.h diff -c /dev/null openafs/src/config/param.amd64_linux24_usr.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/param.amd64_linux24_usr.h Fri May 16 15:52:49 2003 *************** *** 0 **** --- 1,165 ---- + #ifndef UKERNEL + /* This section for kernel libafs compiles only */ + + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define AFS_LINUX20_ENV 1 + #define AFS_LINUX22_ENV 1 + #define AFS_LINUX24_ENV 1 + #define AFS_AMD64_LINUX20_ENV 1 + #define AFS_AMD64_LINUX22_ENV 1 + #define AFS_AMD64_LINUX24_ENV 1 + #define AFS_LINUX_64BIT_KERNEL 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 183 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + + #define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ + + #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + + #include + #ifdef CONFIG_SMP + #undef CONFIG_SMP + #endif + /* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ + #ifdef AFS_SMP + #define CONFIG_SMP 1 + #ifndef __SMP__ + #define __SMP__ + #endif + #define AFS_GLOBAL_SUNLOCK + #endif + + #if defined(MODULE) && defined(CONFIG_MODVERSIONS) + #define MODVERSIONS + #include + #endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ + + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + + /* Machine / Operating system information */ + #define SYS_NAME "amd64_linux24" + #define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #ifdef KERNEL + #ifndef MIN + #define MIN(A,B) ((A) < (B) ? (A) : (B)) + #endif + #ifndef MAX + #define MAX(A,B) ((A) > (B) ? (A) : (B)) + #endif + #endif /* KERNEL */ + + #define USE_UCONTEXT /* should be in afsconfig.h */ + + #endif /* _PARAM_AMD64_LINUX20_H_ */ + + #else /* !defined(UKERNEL) */ + + /* This section for user space compiles only */ + + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously amd64 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define UKERNEL 1 /* user space kernel */ + #define AFS_ENV 1 + #define AFS_USR_LINUX20_ENV 1 + #define AFS_USR_LINUX22_ENV 1 + #define AFS_USR_LINUX24_ENV 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 183 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + + /* Machine / Operating system information */ + #define SYS_NAME "amd64_linux24" + #define SYS_NAME_ID SYS_NAME_ID_amd64_linux24 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES MCLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #define USE_UCONTEXT /* should be in afsconfig.h */ + + #endif /* AFS_PARAM_H */ + + #endif /* !defined(UKERNEL) */ Index: openafs/src/config/param.hp_ux11i.h diff -c /dev/null openafs/src/config/param.hp_ux11i.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/param.hp_ux11i.h Fri May 23 02:52:21 2003 *************** *** 0 **** --- 1,96 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + #define AFS_HPUX_ENV 1 + #define AFS_HPUX90_ENV 1 + #define AFS_HPUX100_ENV 1 + #define AFS_HPUX101_ENV 1 + #define AFS_HPUX102_ENV 1 + #define AFS_HPUX110_ENV 1 + #define AFS_HPUX1111_ENV 1 + + #define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ + #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + + #include + + #define AFS_SYSCALL 48 /* slot reserved for AFS */ + + /* Machine / Operating system information */ + #define SYS_NAME "hp_ux11i" + #define SYS_NAME_ID SYS_NAME_ID_hp_ux11i + #define AFSBIG_ENDIAN 1 + #define AFS_HAVE_FFS 1 + #define AFS_HAVE_STATVFS 1 /* System supports statvfs */ + #define AFS_GLOBAL_SUNLOCK 1 + #define RXK_LISTENER_ENV 1 + #define AFS_USERSPACE_IP_ADDR 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + /* + * #define AFS_VM_RDWR_ENV 1 + */ + #define AFS_TEXT_ENV 1 /* Older kernels use TEXT */ + #define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + #define NEARINODE_HINT 1 /* hint to ufs module to scatter inodes on disk*/ + #define nearInodeHash(volid, hval) { \ + unsigned char* ts = (unsigned char*)&(volid)+sizeof(volid)-1;\ + for ( (hval)=0; ts >= (unsigned char*)&(volid); ts--){\ + (hval) *= 173; \ + (hval) += *ts; \ + } \ + } + + /* Extra kernel definitions (from kdefs file) */ + #ifdef KERNEL + #define _KERNEL 1 + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_seg + #define afsio_resid uio_resid + #define AFS_UIOSYS UIOSEG_KERNEL + #define AFS_UIOUSER UIOSEG_USER + #define AFS_CLBYTES CLBYTES + #define AFS_MINCHANGE 2 + #define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) + #define AFS_KALLOC kmem_alloc + #define AFS_KFREE kmem_free + #define VATTR_NULL vattr_null + + #if defined(__LP64__) + #define AFS_HPUX_64BIT_ENV 1 + #endif + + #ifndef UKERNEL + /* + * On HP-UX, sys/socket.h includes sys/uio.h, and sys/file.h and + * sys/uio.h #include each other, and there's no simple way to avoid a + * warning about the struct uio declaration not being visible outside + * of some prototype or other. So, we put in a tenative declaration to + * supress the warnings. + */ + struct uio; + + #define memset(A, B, S) bzero(A, S) + #define memcpy(B, A, S) bcopy(A, B, S) + #define memcmp(A, B, S) bcmp(A, B, S) + #endif + #endif /* KERNEL */ + #define AFS_DIRENT + /* Non-standard definitions */ + #ifndef EDQUOT + #define EDQUOT 69 /* Disc quota exceeded */ + #endif + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.hp_ux11i_usr.h diff -c /dev/null openafs/src/config/param.hp_ux11i_usr.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:13 2003 --- openafs/src/config/param.hp_ux11i_usr.h Fri May 23 02:52:21 2003 *************** *** 0 **** --- 1,64 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + #define AFS_VFS_ENV 1 + /* Used only in vfsck code; is it needed any more???? */ + #define RXK_LISTENER_ENV 1 + #define AFS_USERSPACE_IP_ADDR 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + #define UKERNEL 1 /* user space kernel */ + #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ + #define AFS_ENV 1 + #define AFS_USR_HPUX_ENV 1 + + #include + + /*#define AFS_GLOBAL_SUNLOCK 1*/ /* For global locking */ + + #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ + + #define AFS_SYSCALL 48 /* slot reserved for AFS */ + + /* File system entry (used if mount.h doesn't define MOUNT_AFS */ + #define AFS_MOUNT_AFS 1 + + /* Machine / Operating system information */ + #define SYS_NAME "hp_ux11i" + #define SYS_NAME_ID SYS_NAME_ID_hp_ux11i + #define AFSBIG_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + + /* Extra kernel definitions (from kdefs file) */ + #ifdef KERNEL + #define AFS_UIOFMODE 1 /* Only in afs/afs_vnodeops.c (afs_ustrategy) */ + #define AFS_SYSVLOCK 1 /* sys v locking supported */ + /*#define AFS_USEBUFFERS 1*/ + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES CLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + #endif /* KERNEL */ + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.i386_linux24.h diff -c openafs/src/config/param.i386_linux24.h:1.8.4.4 openafs/src/config/param.i386_linux24.h:1.8.4.6 *** openafs/src/config/param.i386_linux24.h:1.8.4.4 Mon Feb 3 18:06:01 2003 --- openafs/src/config/param.i386_linux24.h Fri Jul 25 00:30:49 2003 *************** *** 68,73 **** --- 68,80 ---- #endif #endif /* KERNEL */ + #ifndef KERNEL + #define __USE_LARGEFILE64 1 + #if !defined off64_t + #define off64_t __off64_t + #endif + #endif + /* Machine / Operating system information */ #define SYS_NAME "i386_linux24" #define SYS_NAME_ID SYS_NAME_ID_i386_linux24 Index: openafs/src/config/param.i386_umlinux22.h diff -c /dev/null openafs/src/config/param.i386_umlinux22.h:1.1.2.2 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/config/param.i386_umlinux22.h Fri May 30 15:29:54 2003 *************** *** 0 **** --- 1,85 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously i386 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define AFS_LINUX20_ENV 1 + #define AFS_LINUX22_ENV 1 + #define AFS_UMLINUX20_ENV 1 + #define AFS_UMLINUX22_ENV 1 + #define AFS_I386_LINUX20_ENV 1 + #define AFS_I386_LINUX22_ENV 1 + #define AFS_I386_UMLINUX20_ENV 1 + #define AFS_I386_UMLINUX22_ENV 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + #ifdef CONFIG_SMP + #undef CONFIG_SMP + #endif + /* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ + #ifdef AFS_SMP + #define CONFIG_SMP 1 + #ifndef CONFIG_X86_LOCAL_APIC + #define CONFIG_X86_LOCAL_APIC 1 + #endif + #ifndef __SMP__ + #define __SMP__ + #endif + #define AFS_GLOBAL_SUNLOCK + #endif + + #if defined(MODULE) && defined(CONFIG_MODVERSIONS) + #define MODVERSIONS + #include + #endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ + + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + + + /* Machine / Operating system information */ + #define SYS_NAME "i386_umlinux22" + #define SYS_NAME_ID SYS_NAME_ID_i386_umlinux22 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #ifdef KERNEL + #ifndef MIN + #define MIN(A,B) ((A) < (B) ? (A) : (B)) + #endif + #ifndef MAX + #define MAX(A,B) ((A) > (B) ? (A) : (B)) + #endif + #endif /* KERNEL */ + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.i386_umlinux22_usr.h diff -c /dev/null openafs/src/config/param.i386_umlinux22_usr.h:1.1.2.2 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/config/param.i386_umlinux22_usr.h Fri May 30 15:29:54 2003 *************** *** 0 **** --- 1,64 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously i386 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define UKERNEL 1 /* user space kernel */ + #define AFS_ENV 1 + #define AFS_USR_LINUX20_ENV 1 + #define AFS_USR_LINUX22_ENV 1 + #define AFS_USR_UMLINUX20_ENV 1 + #define AFS_USR_UMLINUX22_ENV 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + + /* Machine / Operating system information */ + #define SYS_NAME "i386_umlinux22" + #define SYS_NAME_ID SYS_NAME_ID_i386_umlinux22 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES MCLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.i386_umlinux24.h diff -c /dev/null openafs/src/config/param.i386_umlinux24.h:1.1.2.2 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/config/param.i386_umlinux24.h Fri May 30 15:29:54 2003 *************** *** 0 **** --- 1,83 ---- + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously i386 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define AFS_LINUX20_ENV 1 + #define AFS_LINUX22_ENV 1 + #define AFS_LINUX24_ENV 1 + #define AFS_UMLINUX20_ENV 1 + #define AFS_UMLINUX22_ENV 1 + #define AFS_UMLINUX24_ENV 1 + #define AFS_I386_LINUX20_ENV 1 + #define AFS_I386_LINUX22_ENV 1 + #define AFS_I386_LINUX24_ENV 1 + #define AFS_I386_UMLINUX20_ENV 1 + #define AFS_I386_UMLINUX22_ENV 1 + #define AFS_I386_UMLINUX24_ENV 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + + #if defined(__KERNEL__) && !defined(KDUMP_KERNEL) + #include + + #include + #ifdef CONFIG_SMP + #undef CONFIG_SMP + #endif + /* Using "AFS_SMP" to map to however many #define's are required to get + * MP to compile for Linux + */ + #ifdef AFS_SMP + #define CONFIG_SMP 1 + #ifndef CONFIG_X86_LOCAL_APIC + #define CONFIG_X86_LOCAL_APIC 1 + #endif + #ifndef __SMP__ + #define __SMP__ + #endif + #define AFS_GLOBAL_SUNLOCK + #endif + + #if defined(MODULE) && defined(CONFIG_MODVERSIONS) + #define MODVERSIONS + #include + #endif + + #endif /* __KERNEL__ && !DUMP_KERNEL*/ + + #include + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 2 /* Set to Userdisabled, allow sysctl to override */ + + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #ifdef KERNEL + #ifndef MIN + #define MIN(A,B) ((A) < (B) ? (A) : (B)) + #endif + #ifndef MAX + #define MAX(A,B) ((A) > (B) ? (A) : (B)) + #endif + #endif /* KERNEL */ + + /* Machine / Operating system information */ + #define SYS_NAME "i386_umlinux24" + #define SYS_NAME_ID SYS_NAME_ID_i386_umlinux24 + + #endif /* AFS_PARAM_H */ + + Index: openafs/src/config/param.i386_umlinux24_usr.h diff -c /dev/null openafs/src/config/param.i386_umlinux24_usr.h:1.1.2.2 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/config/param.i386_umlinux24_usr.h Fri May 30 15:29:54 2003 *************** *** 0 **** --- 1,57 ---- + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + /* In user space the AFS_LINUX20_ENV should be sufficient. In the kernel, + * it's a judgment call. If something is obviously i386 specific, use that + * #define instead. Note that "20" refers to the linux 2.0 kernel. The "2" + * in the sysname is the current version of the client. This takes into + * account the perferred OS user space configuration as well as the kernel. + */ + + #define UKERNEL 1 /* user space kernel */ + #define AFS_ENV 1 + #define AFS_USR_LINUX20_ENV 1 + #define AFS_USR_LINUX22_ENV 1 + #define AFS_USR_LINUX24_ENV 1 + #define AFS_USR_UMLINUX20_ENV 1 + #define AFS_USR_UMLINUX22_ENV 1 + #define AFS_USR_UMLINUX24_ENV 1 + #define AFS_NONFSTRANS 1 + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 137 + #define AFS_64BIT_IOPS_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + + /* Machine / Operating system information */ + #define SYS_NAME "i386_umlinux24" + #define SYS_NAME_ID SYS_NAME_ID_i386_umlinux24 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_VM_RDWR_ENV 1 /* read/write implemented via VM */ + + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES MCLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.ia64_hpux1122.h diff -c /dev/null openafs/src/config/param.ia64_hpux1122.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/config/param.ia64_hpux1122.h Fri May 23 02:52:21 2003 *************** *** 0 **** --- 1,102 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + /* THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + #define AFS_HPUX_ENV 1 + #define AFS_HPUX90_ENV 1 + #define AFS_HPUX100_ENV 1 + #define AFS_HPUX101_ENV 1 + #define AFS_HPUX102_ENV 1 + #define AFS_HPUX110_ENV 1 + #define AFS_HPUX1111_ENV 1 + #define AFS_HPUX1122_ENV 1 + + #define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */ + #if defined(__LP64__) + #define AFS_64BITPOINTER_ENV 1 /* pointers are 64 bits. */ + #endif + + #include + + #define AFS_SYSCALL 48 /* slot reserved for AFS */ + + /* Machine / Operating system information */ + #define SYS_NAME "ia64_hpux1122" + #define SYS_NAME_ID SYS_NAME_ID_ia64_hpux1122 + #define AFSBIG_ENDIAN 1 + #define AFS_HAVE_FFS 1 + #define AFS_HAVE_STATVFS 1 /* System supports statvfs */ + #define AFS_GLOBAL_SUNLOCK 1 + #define RXK_LISTENER_ENV 1 + #define AFS_USERSPACE_IP_ADDR 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + #define AFS_USE_VOID_PTR 1 + /* + * #define AFS_VM_RDWR_ENV 1 + */ + #define AFS_TEXT_ENV 1 /* Older kernels use TEXT */ + #define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + #define NEARINODE_HINT 1 /* hint to ufs module to scatter inodes on disk*/ + #define nearInodeHash(volid, hval) { \ + unsigned char* ts = (unsigned char*)&(volid)+sizeof(volid)-1;\ + for ( (hval)=0; ts >= (unsigned char*)&(volid); ts--){\ + (hval) *= 173; \ + (hval) += *ts; \ + } \ + } + + /* Extra kernel definitions (from kdefs file) */ + #ifdef KERNEL + #define _KERNEL 1 + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_seg + #define afsio_resid uio_resid + #define AFS_UIOSYS UIOSEG_KERNEL + #define AFS_UIOUSER UIOSEG_USER + #define AFS_CLBYTES CLBYTES + #define AFS_MINCHANGE 2 + #define osi_GetTime(x) do { struct timeval osi_GetTimeVar; uniqtime(&osi_GetTimeVar); (x)->tv_sec = osi_GetTimeVar.tv_sec; (x)->tv_usec = osi_GetTimeVar.tv_usec; } while(0) + #define AFS_KALLOC kmem_alloc + #define AFS_KFREE kmem_free + #define VATTR_NULL vattr_null + + #if defined(__LP64__) + #define AFS_HPUX_64BIT_ENV 1 + #endif + + #ifndef UKERNEL + /* + * On HP-UX, sys/socket.h includes sys/uio.h, and sys/file.h and + * sys/uio.h #include each other, and there's no simple way to avoid a + * warning about the struct uio declaration not being visible outside + * of some prototype or other. So, we put in a tenative declaration to + * supress the warnings. + */ + struct uio; + + #define memset(A, B, S) bzero(A, S) + #define memcpy(B, A, S) bcopy(A, B, S) + #define memcmp(A, B, S) bcmp(A, B, S) + #endif + #endif /* KERNEL */ + #define AFS_DIRENT + /* Non-standard definitions */ + #ifndef EDQUOT + #define EDQUOT 69 /* Disc quota exceeded */ + #endif + + #define USE_UCONTEXT /* should be in afsconfig.h */ + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.ia64_hpux1122_usr.h diff -c /dev/null openafs/src/config/param.ia64_hpux1122_usr.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/config/param.ia64_hpux1122_usr.h Fri May 23 02:52:21 2003 *************** *** 0 **** --- 1,65 ---- + /* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + #define AFS_VFS_ENV 1 + /* Used only in vfsck code; is it needed any more???? */ + #define RXK_LISTENER_ENV 1 + #define AFS_USERSPACE_IP_ADDR 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + #define UKERNEL 1 /* user space kernel */ + #define AFS_GREEDY43_ENV 1 /* Used only in rx/rx_user.c */ + #define AFS_ENV 1 + #define AFS_USR_HPUX_ENV 1 + + #include + + /*#define AFS_GLOBAL_SUNLOCK 1*/ /* For global locking */ + + #define AFS_3DISPARES 1 /* Utilize the 3 available disk inode 'spares' */ + + #define AFS_SYSCALL 48 /* slot reserved for AFS */ + + /* File system entry (used if mount.h doesn't define MOUNT_AFS */ + #define AFS_MOUNT_AFS 1 + + /* Machine / Operating system information */ + #define SYS_NAME "ia64_hpux1122" + #define SYS_NAME_ID SYS_NAME_ID_ia64_hpux1122 + #define AFSBIG_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + #define AFS_USE_VOID_PTR 1 + + /* Extra kernel definitions (from kdefs file) */ + #ifdef KERNEL + #define AFS_UIOFMODE 1 /* Only in afs/afs_vnodeops.c (afs_ustrategy) */ + #define AFS_SYSVLOCK 1 /* sys v locking supported */ + /*#define AFS_USEBUFFERS 1*/ + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES CLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + #endif /* KERNEL */ + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #endif /* AFS_PARAM_H */ Index: openafs/src/dauth/Makefile.in diff -c openafs/src/dauth/Makefile.in:1.4 openafs/src/dauth/Makefile.in:1.4.2.1 *** openafs/src/dauth/Makefile.in:1.4 Fri Sep 7 19:34:53 2001 --- openafs/src/dauth/Makefile.in Tue Jul 1 15:03:58 2003 *************** *** 28,37 **** include ../config/Makefile.${SYS_NAME} COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et - OPTMZ= -g ! CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = ${OPTMZ} ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ --- 28,36 ---- include ../config/Makefile.${SYS_NAME} COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et ! CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ Index: openafs/src/des/Makefile.in diff -c openafs/src/des/Makefile.in:1.4.2.1 openafs/src/des/Makefile.in:1.4.2.2 *** openafs/src/des/Makefile.in:1.4.2.1 Wed Dec 26 15:11:22 2001 --- openafs/src/des/Makefile.in Mon Jul 7 16:16:29 2003 *************** *** 44,50 **** SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} ! UKERNELDIR=../libuafs/ LDFLAGS = ${XLDFLAGS} --- 44,50 ---- SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} ! UKERNELDIR=../libuafs LDFLAGS = ${XLDFLAGS} Index: openafs/src/des/andrew-conf.h diff -c openafs/src/des/andrew-conf.h:1.10.2.2 openafs/src/des/andrew-conf.h:1.10.2.3 *** openafs/src/des/andrew-conf.h:1.10.2.2 Sat Oct 13 00:21:21 2001 --- openafs/src/des/andrew-conf.h Thu May 15 12:13:43 2003 *************** *** 64,70 **** --- 64,74 ---- #ifdef AFS_IA64_LINUX20_ENV #include "conf-ia64-linux.h" #else + #ifdef AFS_AMD64_LINUX20_ENV + #include "conf-amd64-linux.h" + #else #include "conf-i386-linux.h" + #endif /* AFS_AMD64_LINUX20_ENV */ #endif /* AFS_IA64_LINUX20_ENV */ #endif /* AFS_ALPHA_LINUX20_ENV */ #endif /* AFS_S390_LINUX20_ENV */ Index: openafs/src/des/conf-amd64-linux.h diff -c /dev/null openafs/src/des/conf-amd64-linux.h:1.1.2.1 *** /dev/null Tue Jul 29 19:41:14 2003 --- openafs/src/des/conf-amd64-linux.h Thu May 15 12:13:43 2003 *************** *** 0 **** --- 1,13 ---- + /* + * Copyright 1988 by the Massachusetts Institute of Technology. + * + * For copying and distribution information, please see the file + * . + * + */ + + #include + + #define BITS32 + #define BIG + #define LSBFIRST Index: openafs/src/des/crypt.c diff -c openafs/src/des/crypt.c:1.7.2.1 openafs/src/des/crypt.c:1.7.2.2 *** openafs/src/des/crypt.c:1.7.2.1 Fri Jun 7 20:23:48 2002 --- openafs/src/des/crypt.c Thu May 15 12:13:43 2003 *************** *** 37,43 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/des/crypt.c,v 1.7.2.1 2002/06/08 00:23:48 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 37,43 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/des/crypt.c,v 1.7.2.2 2003/05/15 16:13:43 shadow Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 88,94 **** * define "LONG_IS_32_BITS" only if sizeof(long)==4. * This avoids use of bit fields (your compiler may be sloppy with them). */ ! #if !defined(cray) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) #define LONG_IS_32_BITS #endif --- 88,96 ---- * define "LONG_IS_32_BITS" only if sizeof(long)==4. * This avoids use of bit fields (your compiler may be sloppy with them). */ ! ! /* XXX shouldn't this be !AFS_64BIT_ENV ? */ ! #if !defined(cray) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV) && !defined(AFS_AMD64_LINUX20_ENV) #define LONG_IS_32_BITS #endif Index: openafs/src/dir/Makefile.in diff -c openafs/src/dir/Makefile.in:1.5 openafs/src/dir/Makefile.in:1.5.2.1 *** openafs/src/dir/Makefile.in:1.5 Mon Sep 10 16:21:05 2001 --- openafs/src/dir/Makefile.in Mon Jul 7 16:16:30 2003 *************** *** 28,35 **** include ../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs/ ! UKERNELDIR = ../libuafs/ INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} --- 28,35 ---- include ../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs ! UKERNELDIR = ../libuafs INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} Index: openafs/src/dir/dir.c diff -c openafs/src/dir/dir.c:1.5.4.1 openafs/src/dir/dir.c:1.5.4.2 *** openafs/src/dir/dir.c:1.5.4.1 Wed Aug 21 16:53:25 2002 --- openafs/src/dir/dir.c Fri May 23 02:52:22 2003 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/dir/dir.c,v 1.5.4.1 2002/08/21 20:53:25 shadow Exp $"); #ifdef KERNEL #if !defined(UKERNEL) --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/dir/dir.c,v 1.5.4.2 2003/05/23 06:52:22 shadow Exp $"); #ifdef KERNEL #if !defined(UKERNEL) *************** *** 76,82 **** #ifndef AFS_LINUX20_ENV #include "../netinet/in.h" #endif ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) #include "../h/mbuf.h" #endif #else /* !defined(UKERNEL) */ --- 76,82 ---- #ifndef AFS_LINUX20_ENV #include "../netinet/in.h" #endif ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV) #include "../h/mbuf.h" #endif #else /* !defined(UKERNEL) */ Index: openafs/src/dir/test/Makefile.in diff -c openafs/src/dir/test/Makefile.in:1.4 openafs/src/dir/test/Makefile.in:1.4.2.1 *** openafs/src/dir/test/Makefile.in:1.4 Fri Sep 7 19:34:57 2001 --- openafs/src/dir/test/Makefile.in Mon Jul 7 16:16:31 2003 *************** *** 14,20 **** include ../../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs/ INSTALL = ${SRCDIR}/bin/install INCDIRS= -I${DESTDIR}/include ${XINCLS} --- 14,20 ---- include ../../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs INSTALL = ${SRCDIR}/bin/install INCDIRS= -I${DESTDIR}/include ${XINCLS} Index: openafs/src/export/Makefile.in diff -c openafs/src/export/Makefile.in:1.4 openafs/src/export/Makefile.in:1.4.2.1 *** openafs/src/export/Makefile.in:1.4 Fri Sep 7 19:34:57 2001 --- openafs/src/export/Makefile.in Mon Jul 7 16:16:31 2003 *************** *** 31,38 **** include ../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs/ ! UKERNELDIR = ../libuafs/ DEFS = INCS = -I${TOP_SRCDIR}/config -I${TOP_INCDIR} CFLAGS = ${OPTMZ} ${DEFS} ${INCS} --- 31,38 ---- include ../config/Makefile.${SYS_NAME} ! KERNELDIR = ../libafs ! UKERNELDIR = ../libuafs DEFS = INCS = -I${TOP_SRCDIR}/config -I${TOP_INCDIR} CFLAGS = ${OPTMZ} ${DEFS} ${INCS} Index: openafs/src/finale/Makefile.in diff -c openafs/src/finale/Makefile.in:1.4 openafs/src/finale/Makefile.in:1.4.2.1 *** openafs/src/finale/Makefile.in:1.4 Fri Sep 7 19:34:58 2001 --- openafs/src/finale/Makefile.in Tue Jul 1 15:03:58 2003 *************** *** 27,34 **** SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} ! CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = -g ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ --- 27,34 ---- SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} ! CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ! LDFLAGS = ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ Index: openafs/src/finale/translate_et.rc diff -c openafs/src/finale/translate_et.rc:1.2 openafs/src/finale/translate_et.rc:1.2.8.1 *** openafs/src/finale/translate_et.rc:1.2 Sat Nov 4 05:04:29 2000 --- openafs/src/finale/translate_et.rc Tue Jul 1 20:35:31 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Error Translation Command" + #define AFS_VERINFO_NAME "translate_et" + #define AFS_VERINFO_FILENAME "translate_et.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/fsint/Makefile.in diff -c openafs/src/fsint/Makefile.in:1.4 openafs/src/fsint/Makefile.in:1.4.2.1 *** openafs/src/fsint/Makefile.in:1.4 Fri Sep 7 19:34:58 2001 --- openafs/src/fsint/Makefile.in Mon Jul 7 16:16:32 2003 *************** *** 27,34 **** include ../config/Makefile.${SYS_NAME} SHELL = /bin/sh ! KERNELDIR = ../libafs/ ! UKERNELDIR = ../libuafs/ OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} --- 27,34 ---- include ../config/Makefile.${SYS_NAME} SHELL = /bin/sh ! KERNELDIR = ../libafs ! UKERNELDIR = ../libuafs OBJS=afsaux.o afscbint.cs.o afscbint.ss.o afscbint.xdr.o afsint.cs.o afsint.ss.o afsint.xdr.o CFLAGS=${DBUG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} Index: openafs/src/fsprobe/Makefile.in diff -c openafs/src/fsprobe/Makefile.in:1.4 openafs/src/fsprobe/Makefile.in:1.4.2.3 *** openafs/src/fsprobe/Makefile.in:1.4 Fri Sep 7 19:34:58 2001 --- openafs/src/fsprobe/Makefile.in Wed Jul 2 02:36:15 2003 *************** *** 31,42 **** include ../config/Makefile.${SYS_NAME} ! CFLAGS=-g -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ ! -I${SRCDIR} \ ! -I/usr/include ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h --- 31,42 ---- include ../config/Makefile.${SYS_NAME} ! CFLAGS=${DBG} -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ ! -I${TOP_SRCDIR} \ ! ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h Index: openafs/src/kauth/Makefile.in diff -c openafs/src/kauth/Makefile.in:1.5.2.1 openafs/src/kauth/Makefile.in:1.5.2.2 *** openafs/src/kauth/Makefile.in:1.5.2.1 Sun Jan 20 03:27:58 2002 --- openafs/src/kauth/Makefile.in Mon Jul 7 16:16:33 2003 *************** *** 27,33 **** include ../config/Makefile.${SYS_NAME} ! UKERNELDIR = ../libuafs/ COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} --- 27,33 ---- include ../config/Makefile.${SYS_NAME} ! UKERNELDIR = ../libuafs COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} Index: openafs/src/kauth/kas.rc diff -c openafs/src/kauth/kas.rc:1.2 openafs/src/kauth/kas.rc:1.2.8.1 *** openafs/src/kauth/kas.rc:1.2 Sat Nov 4 05:04:39 2000 --- openafs/src/kauth/kas.rc Tue Jul 1 20:35:32 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Authentication Database Command" + #define AFS_VERINFO_NAME "kas" + #define AFS_VERINFO_FILENAME "kas.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/kauth/kaserver.rc diff -c openafs/src/kauth/kaserver.rc:1.2 openafs/src/kauth/kaserver.rc:1.2.8.1 *** openafs/src/kauth/kaserver.rc:1.2 Sat Nov 4 05:04:39 2000 --- openafs/src/kauth/kaserver.rc Tue Jul 1 20:35:32 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Authentication Database Server" + #define AFS_VERINFO_NAME "kaserver" + #define AFS_VERINFO_FILENAME "kaserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/kauth/kpasswd.rc diff -c openafs/src/kauth/kpasswd.rc:1.2 openafs/src/kauth/kpasswd.rc:1.2.8.1 *** openafs/src/kauth/kpasswd.rc:1.2 Sat Nov 4 05:04:41 2000 --- openafs/src/kauth/kpasswd.rc Tue Jul 1 20:35:32 2003 *************** *** 10,15 **** --- 10,17 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Password Change Command" + #define AFS_VERINFO_NAME "kpasswd" + #define AFS_VERINFO_FILENAME "kpasswd.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/libacl/Makefile.in diff -c openafs/src/libacl/Makefile.in:1.5 openafs/src/libacl/Makefile.in:1.5.2.1 *** openafs/src/libacl/Makefile.in:1.5 Mon Sep 10 16:21:07 2001 --- openafs/src/libacl/Makefile.in Mon Jul 7 16:16:34 2003 *************** *** 30,37 **** INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. \ -I${BACKDIR}/include -I${TOP_INCDIR}/afs ! KERNELDIR = ../libafs/ ! UKERNELDIR = ../libuafs/ CFLAGS = ${OPTMZ} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} --- 30,37 ---- INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. \ -I${BACKDIR}/include -I${TOP_INCDIR}/afs ! KERNELDIR = ../libafs ! UKERNELDIR = ../libuafs CFLAGS = ${OPTMZ} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} Index: openafs/src/libadmin/adminutil/afsadminutil.rc diff -c openafs/src/libadmin/adminutil/afsadminutil.rc:1.2 openafs/src/libadmin/adminutil/afsadminutil.rc:1.2.8.1 *** openafs/src/libadmin/adminutil/afsadminutil.rc:1.2 Sat Nov 4 05:04:48 2000 --- openafs/src/libadmin/adminutil/afsadminutil.rc Tue Jul 1 20:35:33 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Administration Utilities DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsadminutil" + #define AFS_VERINFO_FILENAME "afsadminutil.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libadmin/bos/afsbosadmin.rc diff -c openafs/src/libadmin/bos/afsbosadmin.rc:1.2 openafs/src/libadmin/bos/afsbosadmin.rc:1.2.8.1 *** openafs/src/libadmin/bos/afsbosadmin.rc:1.2 Sat Nov 4 05:04:49 2000 --- openafs/src/libadmin/bos/afsbosadmin.rc Tue Jul 1 20:35:34 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Basic OverSeer Interface DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsbosadmin" + #define AFS_VERINFO_FILENAME "afsbosadmin.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libadmin/cfg/afscfgadmin.rc diff -c openafs/src/libadmin/cfg/afscfgadmin.rc:1.2 openafs/src/libadmin/cfg/afscfgadmin.rc:1.2.8.1 *** openafs/src/libadmin/cfg/afscfgadmin.rc:1.2 Sat Nov 4 05:04:49 2000 --- openafs/src/libadmin/cfg/afscfgadmin.rc Tue Jul 1 20:35:35 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Configuration Interface DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afscfgadmin" + #define AFS_VERINFO_FILENAME "afscfgadmin.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libadmin/client/afsclientadmin.rc diff -c openafs/src/libadmin/client/afsclientadmin.rc:1.2 openafs/src/libadmin/client/afsclientadmin.rc:1.2.8.1 *** openafs/src/libadmin/client/afsclientadmin.rc:1.2 Sat Nov 4 05:04:52 2000 --- openafs/src/libadmin/client/afsclientadmin.rc Tue Jul 1 20:35:36 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Client Interface DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsclientadmin" + #define AFS_VERINFO_FILENAME "afsclientadmin.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libadmin/kas/afskasadmin.rc diff -c openafs/src/libadmin/kas/afskasadmin.rc:1.2 openafs/src/libadmin/kas/afskasadmin.rc:1.2.8.1 *** openafs/src/libadmin/kas/afskasadmin.rc:1.2 Sat Nov 4 05:04:53 2000 --- openafs/src/libadmin/kas/afskasadmin.rc Tue Jul 1 20:35:37 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Authentication Database Interface DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afskasadmin" + #define AFS_VERINFO_FILENAME "afskasadmin.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libadmin/pts/afs_ptsAdmin.c diff -c openafs/src/libadmin/pts/afs_ptsAdmin.c:1.4.4.1 openafs/src/libadmin/pts/afs_ptsAdmin.c:1.4.4.2 *** openafs/src/libadmin/pts/afs_ptsAdmin.c:1.4.4.1 Mon Apr 22 11:43:27 2002 --- openafs/src/libadmin/pts/afs_ptsAdmin.c Tue Jul 1 15:35:08 2003 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/libadmin/pts/afs_ptsAdmin.c,v 1.4.4.1 2002/04/22 15:43:27 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/libadmin/pts/afs_ptsAdmin.c,v 1.4.4.2 2003/07/01 19:35:08 shadow Exp $"); #include #include *************** *** 2682,2688 **** * We can retrieve the next group from data we already received */ ! strcpy(&list->group[slot], &list->owned_names.namelist_val[list->index]); list->index++; /* --- 2682,2688 ---- * We can retrieve the next group from data we already received */ ! strcpy(list->group[slot], list->owned_names.namelist_val[list->index]); list->index++; /* *************** *** 2725,2731 **** afs_status_t tst = 0; owned_group_list_p list = (owned_group_list_p) rpc_specific; ! strcpy((char *) dest, &list->group[slot]); rc = 1; if (st != NULL) { --- 2725,2731 ---- afs_status_t tst = 0; owned_group_list_p list = (owned_group_list_p) rpc_specific; ! strcpy((char *) dest, list->group[slot]); rc = 1; if (st != NULL) { *************** *** 3029,3035 **** * We can retrieve the next entry from data we already received */ ! strcpy(&list->entries[slot], list->currName->name); list->index++; list->currName++; --- 3029,3035 ---- * We can retrieve the next entry from data we already received */ ! strcpy(list->entries[slot], list->currName->name); list->index++; list->currName++; *************** *** 3072,3078 **** afs_status_t tst = 0; pts_list_p list = (pts_list_p) rpc_specific; ! strcpy((char *) dest, &list->entries[slot]); rc = 1; if (st != NULL) { --- 3072,3078 ---- afs_status_t tst = 0; pts_list_p list = (pts_list_p) rpc_specific; ! strcpy((char *) dest, list->entries[slot]); rc = 1; if (st != NULL) { Index: openafs/src/libadmin/pts/afsptsadmin.rc diff -c openafs/src/libadmin/pts/afsptsadmin.rc:1.2 openafs/src/libadmin/pts/afsptsadmin.rc:1.2.8.1 *** openafs/src/libadmin/pts/afsptsadmin.rc:1.2 Sat Nov 4 05:04:53 2000 --- openafs/src/libadmin/pts/afsptsadmin.rc Tue Jul 1 20:35:38 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Interface DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsptsadmin" + #define AFS_VERINFO_FILENAME "afsptsadmin.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libadmin/vos/afsvosadmin.rc diff -c openafs/src/libadmin/vos/afsvosadmin.rc:1.2 openafs/src/libadmin/vos/afsvosadmin.rc:1.2.8.1 *** openafs/src/libadmin/vos/afsvosadmin.rc:1.2 Sat Nov 4 05:05:02 2000 --- openafs/src/libadmin/vos/afsvosadmin.rc Tue Jul 1 20:35:40 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Volume Interface DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsvosadmin" + #define AFS_VERINFO_FILENAME "afsvosadmin.dll" #include "AFS_component_version_number.h" #include "..\..\config\NTVersioninfo.rc" Index: openafs/src/libafs/Makefile.common diff -c openafs/src/libafs/Makefile.common:1.14.2.5 openafs/src/libafs/Makefile.common:1.14.2.6 *** openafs/src/libafs/Makefile.common:1.14.2.5 Sun Nov 17 23:35:49 2002 --- openafs/src/libafs/Makefile.common Tue Jul 1 15:10:10 2003 *************** *** 8,14 **** # Common elements for Makefiles for all system types. # SHELL=/bin/sh ! INCLUDE= -I. -I/usr/include -I${TOP_SRCDIR}/config AFS =../afs RX =../rx AFSINT =../afsint --- 8,14 ---- # Common elements for Makefiles for all system types. # SHELL=/bin/sh ! INCLUDE= -I. -I${TOP_SRCDIR}/config AFS =../afs RX =../rx AFSINT =../afsint Index: openafs/src/libafs/MakefileProto.HPUX.in diff -c openafs/src/libafs/MakefileProto.HPUX.in:1.7.2.2 openafs/src/libafs/MakefileProto.HPUX.in:1.7.2.3 *** openafs/src/libafs/MakefileProto.HPUX.in:1.7.2.2 Thu Nov 14 15:08:41 2002 --- openafs/src/libafs/MakefileProto.HPUX.in Fri May 23 02:52:24 2003 *************** *** 66,71 **** --- 66,72 ---- # seems to hang). When the compiler sees the +ES1.Xindirect_calls # option, however, it issues a warning and turns off +Z. # + KDEFS= +ES1.Xindirect_calls +XixdU +Hx0 +ESlit +ESsfc +ESssf -Wp,-H300000 -D_KERNEL -D_KERNEL_BUILD -D_UNSUPPORTED \ -DMP +R500 -Wl,+k $(CPU_KDEFS) KDEFS_32 = +DA1.0 +DS1.0 *************** *** 73,82 **** # warning 478: "+Z" and "+ES1.Xindirect_calls" are mutually exclusive. "+Z" ignored. # warning 530: LP64 migration: Casting from loose to strict alignment: Resulting pointer may be misaligned. KDEFS_64 = +DA2.0W +DS2.0 +M2 +W 478,530 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT -DHPONCPLUS OPTF=${OPT} OPTF2=${OPT2} ! CFLAGS=-I. -I.. -I../h -I../nfs -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} # Name of directory to hold object files and libraries. KOBJ=STATIC --- 74,93 ---- # warning 478: "+Z" and "+ES1.Xindirect_calls" are mutually exclusive. "+Z" ignored. # warning 530: LP64 migration: Casting from loose to strict alignment: Resulting pointer may be misaligned. KDEFS_64 = +DA2.0W +DS2.0 +M2 +W 478,530 + + + KDEFS= +kernel -Wp,-H300000 -D_KERNEL -D_KERNEL_BUILD -D_UNSUPPORTED \ + -DFINE_GRAINED_PROTO_FILES \ + -DMP -Wl,+k $(CPU_KDEFS) + KDEFS_32 = + KDEFS_64 = +DD64 + + + DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT -DHPONCPLUS OPTF=${OPT} OPTF2=${OPT2} ! CFLAGS=-I. -I.. -I../h -I../nfs -I../conf -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} # Name of directory to hold object files and libraries. KOBJ=STATIC *************** *** 90,100 **** include Makefile.common BITS = 64 32 setup: ! -$(RM) -f h net dux machine netinet nfs rpc s200 ufs sys ln -s /usr/include/sys h ln -s /etc/conf/net net ln -s /etc/conf/dux dux ln -s /etc/conf/machine machine --- 101,120 ---- include Makefile.common + BITS = 64 32 + + BITS = 64 + setup: ! -$(RM) -f h net dux machine netinet nfs rpc s200 ufs sys conf ! ln -s /usr/include/sys h + + ln -s /etc/conf/h h + + ln -s /etc/conf conf ln -s /etc/conf/net net ln -s /etc/conf/dux dux ln -s /etc/conf/machine machine *************** *** 102,108 **** --- 122,132 ---- ln -s /etc/conf/nfs nfs ln -s /usr/include/rpc rpc ln -s /etc/conf/machine s200 + ln -s /etc/conf/ufs ufs + + ln -s /etc/conf/sys ufs + ln -s /usr/include/sys sys for b in $(BITS); do \ for t in $(KOBJ); do \ Index: openafs/src/libafs/MakefileProto.LINUX.in diff -c openafs/src/libafs/MakefileProto.LINUX.in:1.11.2.9 openafs/src/libafs/MakefileProto.LINUX.in:1.11.2.12 *** openafs/src/libafs/MakefileProto.LINUX.in:1.11.2.9 Thu Nov 14 17:18:04 2002 --- openafs/src/libafs/MakefileProto.LINUX.in Wed May 28 19:49:24 2003 *************** *** 54,63 **** --- 54,70 ---- LD = ld GCC_KOPTS=@LINUX_GCC_KOPTS@ # -Wall + + P5PLUS=@P5PLUS_KOPTS@ + CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe $(P5PLUS) -I/usr/src/linux/arch/um/include -I/usr/src/linux/arch/um/kernel/tt/include -I/usr/src/linux/arch/um/kernel/skas/include + DEFINES = -D__KERNEL__ -DCPU=586 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} ${KDEFINES} P5PLUS=@P5PLUS_KOPTS@ CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe $(P5PLUS) DEFINES = -D__KERNEL__ -DCPU=586 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} ${KDEFINES} + + CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mcmodel=kernel + DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} CCFLAGS = $(KDEBUG) -O2 $(FOMIT) $(GCC_KOPTS) -pipe -mno-fp-regs -ffixed-8 DEFINES = -D__KERNEL__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF} *************** *** 128,134 **** $(RM) -f linux ln -s ${LINUX_KERNEL_PATH}/include/linux linux $(RM) -f net ! ln -s ${LINUX_KERNEL_PATH}/include/linux net $(RM) -f netinet ln -s ${LINUX_KERNEL_PATH}/include/linux netinet $(RM) -f sys --- 135,141 ---- $(RM) -f linux ln -s ${LINUX_KERNEL_PATH}/include/linux linux $(RM) -f net ! ln -s ${LINUX_KERNEL_PATH}/include/net net $(RM) -f netinet ln -s ${LINUX_KERNEL_PATH}/include/linux netinet $(RM) -f sys *************** *** 140,145 **** --- 147,156 ---- ln -s ${LINUX_KERNEL_PATH}/include/asm-alpha asm ln -s ${LINUX_KERNEL_PATH}/include/asm-i386 asm + + ln -s ${LINUX_KERNEL_PATH}/include/asm-um asm + + ln -fs ${LINUX_KERNEL_PATH}/include/asm-x86_64 asm ln -s ${LINUX_KERNEL_PATH}/include/asm-s390 asm Index: openafs/src/libafs/MakefileProto.SOLARIS.in diff -c openafs/src/libafs/MakefileProto.SOLARIS.in:1.10.2.5 openafs/src/libafs/MakefileProto.SOLARIS.in:1.10.2.6 *** openafs/src/libafs/MakefileProto.SOLARIS.in:1.10.2.5 Fri Jan 17 01:12:29 2003 --- openafs/src/libafs/MakefileProto.SOLARIS.in Thu May 15 11:27:33 2003 *************** *** 143,158 **** DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFSNONFS} ! libafs: ${LIBAFSNONFS} ${LIBAFS} ! ! install_libafs: ${LIBAFSNONFS} ${LIBAFS} ! ${INSTALL} -f ${LIBAFSNONFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o ! ${INSTALL} -f ${LIBAFS} ${DESTDIR}${afskerneldir}/libafs${BITS}.o ! ! dest_libafs: ${LIBAFSNONFS} ${LIBAFS} ! ${INSTALL} -f ${LIBAFSNONFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o ! ${INSTALL} -f ${LIBAFS} ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o # Without this line, gmake tries to build libafs.o --- 143,153 ---- DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFSNONFS} + INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/libafs${BITS}.nonfs.o + INST_LIBAFS = ${DESTDIR}${afskerneldir}/libafs${BITS}.o ! DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.nonfs.o ! DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/libafs${BITS}.o # Without this line, gmake tries to build libafs.o Index: openafs/src/libafs/afs.ppc_darwin_12.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_12.plist.in:1.1.2.1 openafs/src/libafs/afs.ppc_darwin_12.plist.in:1.1.2.2 *** openafs/src/libafs/afs.ppc_darwin_12.plist.in:1.1.2.1 Wed Sep 12 01:03:53 2001 --- openafs/src/libafs/afs.ppc_darwin_12.plist.in Wed Jul 2 01:20:03 2003 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! @VERSION@ CFBundleSignature ???? CFBundleVersion ! @VERSION@ OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.2.9f1 CFBundleSignature ???? CFBundleVersion ! 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafs/afs.ppc_darwin_13.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_13.plist.in:1.1.2.1 openafs/src/libafs/afs.ppc_darwin_13.plist.in:1.1.2.2 *** openafs/src/libafs/afs.ppc_darwin_13.plist.in:1.1.2.1 Wed Sep 12 01:03:53 2001 --- openafs/src/libafs/afs.ppc_darwin_13.plist.in Wed Jul 2 01:20:03 2003 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! @VERSION@ CFBundleSignature ???? CFBundleVersion ! @VERSION@ OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.2.9f1 CFBundleSignature ???? CFBundleVersion ! 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafs/afs.ppc_darwin_14.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_14.plist.in:1.1.2.2 openafs/src/libafs/afs.ppc_darwin_14.plist.in:1.1.2.3 *** openafs/src/libafs/afs.ppc_darwin_14.plist.in:1.1.2.2 Sat Nov 10 18:22:57 2001 --- openafs/src/libafs/afs.ppc_darwin_14.plist.in Wed Jul 2 01:20:03 2003 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! @VERSION@ CFBundleSignature ???? CFBundleVersion ! @VERSION@ OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.2.9f1 CFBundleSignature ???? CFBundleVersion ! 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafs/afs.ppc_darwin_60.plist.in diff -c openafs/src/libafs/afs.ppc_darwin_60.plist.in:1.1.2.1 openafs/src/libafs/afs.ppc_darwin_60.plist.in:1.1.2.2 *** openafs/src/libafs/afs.ppc_darwin_60.plist.in:1.1.2.1 Wed Aug 21 18:08:55 2002 --- openafs/src/libafs/afs.ppc_darwin_60.plist.in Wed Jul 2 01:20:03 2003 *************** *** 15,25 **** CFBundlePackageType KEXT CFBundleShortVersionString ! @VERSION@ CFBundleSignature ???? CFBundleVersion ! @VERSION@ OSBundleLibraries com.apple.kernel.bsd --- 15,25 ---- CFBundlePackageType KEXT CFBundleShortVersionString ! 1.2.9f1 CFBundleSignature ???? CFBundleVersion ! 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd Index: openafs/src/libafsauthent/afsauthent.rc diff -c openafs/src/libafsauthent/afsauthent.rc:1.2 openafs/src/libafsauthent/afsauthent.rc:1.2.8.1 *** openafs/src/libafsauthent/afsauthent.rc:1.2 Sat Nov 4 05:05:05 2000 --- openafs/src/libafsauthent/afsauthent.rc Tue Jul 1 20:35:40 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Authentication Utilities DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsauthent" + #define AFS_VERINFO_FILENAME "afsauthent.dll" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/libafsrpc/afsrpc.rc diff -c openafs/src/libafsrpc/afsrpc.rc:1.2 openafs/src/libafsrpc/afsrpc.rc:1.2.8.1 *** openafs/src/libafsrpc/afsrpc.rc:1.2 Sat Nov 4 05:05:05 2000 --- openafs/src/libafsrpc/afsrpc.rc Tue Jul 1 20:35:42 2003 *************** *** 10,15 **** --- 10,18 ---- /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Rx RPC DLL" + #define AFS_VERINFO_DLL + #define AFS_VERINFO_NAME "afsrpc" + #define AFS_VERINFO_FILENAME "afsrpc.dll" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" Index: openafs/src/libuafs/Makefile.common diff -c openafs/src/libuafs/Makefile.common:1.13.2.3 openafs/src/libuafs/Makefile.common:1.13.2.4 *** openafs/src/libuafs/Makefile.common:1.13.2.3 Sun Nov 17 23:35:51 2002 --- openafs/src/libuafs/Makefile.common Tue Jul 1 15:10:11 2003 *************** *** 9,15 **** # SHELL=/bin/sh ! INCLUDE= -I. -I/usr/include -I${TOP_SRCDIR}/config UOBJ =../UAFS WEBOBJ =../AFSWEB AFS =../afs --- 9,15 ---- # SHELL=/bin/sh ! INCLUDE= -I. -I${TOP_SRCDIR}/config UOBJ =../UAFS WEBOBJ =../AFSWEB AFS =../afs Index: openafs/src/libuafs/MakefileProto.HPUX.in diff -c openafs/src/libuafs/MakefileProto.HPUX.in:1.3 openafs/src/libuafs/MakefileProto.HPUX.in:1.3.2.1 *** openafs/src/libuafs/MakefileProto.HPUX.in:1.3 Fri Sep 7 19:35:24 2001 --- openafs/src/libuafs/MakefileProto.HPUX.in Fri May 23 02:52:25 2003 *************** *** 30,41 **** --- 30,49 ---- # System specific build commands and flags CC = /opt/ansic/bin/cc DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE + KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z + + KOPTS=-Wp,-H200000 -Wl,-a,archive_shared + CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG} OPTF=-O WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD + TEST_CFLAGS= -Wp,-H200000 +DA1.0 +z -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV + + TEST_CFLAGS= -Wp,-H200000 -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV + TEST_LDFLAGS= TEST_LIBS=-lnsl -lm -lpthread -ldld -lc Index: openafs/src/login/Makefile.in diff -c openafs/src/login/Makefile.in:1.5.2.2 openafs/src/login/Makefile.in:1.5.2.4 *** openafs/src/login/Makefile.in:1.5.2.2 Wed Jul 10 15:57:44 2002 --- openafs/src/login/Makefile.in Tue Jul 1 15:10:13 2003 *************** *** 53,60 **** ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ! INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I/usr/include -I/usr/include/sys ! CFLAGS= -g ${XCFLAGS} ${INCLUDES} LIBC= /lib/libc.a SRCS= login.c OBJS= login.o setenv.o getenv.o libutil.a --- 53,60 ---- ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a ! INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ! CFLAGS= ${DBG} ${XCFLAGS} ${INCLUDES} LIBC= /lib/libc.a SRCS= login.c OBJS= login.o setenv.o getenv.o libutil.a *************** *** 71,84 **** login: ${OBJS} ${LIBS} case ${SYS_NAME} in \ ! sun4x_5? | sunx86_5? ) ${CC} -g -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\ ! *) ${CC} -g -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\ esac login.krb: ${KOBJS} ${KLIBS} case ${SYS_NAME} in \ ! sun4x_5? | sunx86_5? ) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\ ! *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\ esac libutil.a : ${UTILOBJS} --- 71,84 ---- login: ${OBJS} ${LIBS} case ${SYS_NAME} in \ ! sun4x_5? | sunx86_5? ) ${CC} -o $@ ${CFLAGS} ${OBJS} -lc ${LIBS} ${XLIBS} -lcmd;;\ ! *) ${CC} -o $@ ${CFLAGS} ${OBJS} ${LIBS} ${XLIBS} ;;\ esac login.krb: ${KOBJS} ${KLIBS} case ${SYS_NAME} in \ ! sun4x_5? | sunx86_5? ) ${CC} -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\ ! *) ${CC} -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\ esac libutil.a : ${UTILOBJS} Index: openafs/src/lwp/Makefile.in diff -c openafs/src/lwp/Makefile.in:1.4.2.2 openafs/src/lwp/Makefile.in:1.4.2.4 *** openafs/src/lwp/Makefile.in:1.4.2.2 Tue Mar 18 18:03:50 2003 --- openafs/src/lwp/Makefile.in Wed May 28 19:49:25 2003 *************** *** 73,79 **** /usr/bin/cpp -P process.fbsd.s > process.ss; \ ${AS} -o process.o process.ss; \ $(RM) process.ss ;; \ ! hp* | *_linux* | sgi_64 | sgi_65 ) \ ${CC} ${CFLAGS} -c process.c;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER process.s; \ --- 73,79 ---- /usr/bin/cpp -P process.fbsd.s > process.ss; \ ${AS} -o process.o process.ss; \ $(RM) process.ss ;; \ ! hp* | *_linux* | *_umlinux* | sgi_64 | sgi_65 | ia64_hpux* ) \ ${CC} ${CFLAGS} -c process.c;; \ alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER process.s; \ Index: openafs/src/lwp/lwp.h diff -c openafs/src/lwp/lwp.h:1.9.2.1 openafs/src/lwp/lwp.h:1.9.2.2 *** openafs/src/lwp/lwp.h:1.9.2.1 Mon Aug 26 00:34:10 2002 --- openafs/src/lwp/lwp.h Fri May 23 02:52:26 2003 *************** *** 293,302 **** --- 293,312 ---- * cases, and also between machines apparently running the same OS * version. */ + + /* + * On ia64 where the ucontext is used, it can be an extra 48K + * Need to account for this. There might be two of these on the + * stack too. This needs to be checked. + */ + #if defined(USE_UCONTEXT) && defined(HAVE_UCONTEXT_H) + #define AFS_LWP_MINSTACKSIZE (288 * 1024) + #else #if defined(AFS_LINUX22_ENV) #define AFS_LWP_MINSTACKSIZE (192 * 1024) #else #define AFS_LWP_MINSTACKSIZE (48 * 1024) + #endif #endif /* Action to take on stack overflow. */ Index: openafs/src/lwp/process.c diff -c openafs/src/lwp/process.c:1.12.2.1 openafs/src/lwp/process.c:1.12.2.3 *** openafs/src/lwp/process.c:1.12.2.1 Mon Aug 26 00:34:10 2002 --- openafs/src/lwp/process.c Fri May 23 02:52:26 2003 *************** *** 12,18 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/lwp/process.c,v 1.12.2.1 2002/08/26 04:34:10 shadow Exp $"); #include #include --- 12,18 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/lwp/process.c,v 1.12.2.3 2003/05/23 06:52:26 shadow Exp $"); #include #include *************** *** 37,42 **** --- 37,50 ---- { #if defined(AFS_IA64_LINUX20_ENV) register unsigned long sp __asm__("r12"); + #elif defined(AFS_HPUX1122_ENV) + /* don't need anything special, will use + * ucontext.uc_stack.ss_sp as it matches r12. + * This should also work for Linux, + * but dont have system to test DEE + */ + #elif defined(AFS_AMD64_LINUX24_ENV) + register unsigned long sp __asm__("sp"); #else #error "You need to update stack pointer register for this platform" #endif *************** *** 45,51 **** --- 53,63 ---- savearea->state = 0; getcontext(&savearea->ucontext); + #if defined(AFS_HPUX1122_ENV) + savearea->topstack = savearea->ucontext.uc_stack.ss_sp; + #else savearea->topstack = sp; + #endif switch (savearea->state) { case 0: Index: openafs/src/package/Makefile.in diff -c openafs/src/package/Makefile.in:1.4 openafs/src/package/Makefile.in:1.4.2.1 *** openafs/src/package/Makefile.in:1.4 Fri Sep 7 19:35:35 2001 --- openafs/src/package/Makefile.in Tue Jul 1 15:10:14 2003 *************** *** 27,33 **** include ../config/Makefile.${SYS_NAME} ! INCLUDES=-I/usr/include -I${TOP_SRCDIR}/config -I${TOP_INCDIR} DBGFLAG = -UDEBUG CFLAGS = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS) YFLAGS = -vd --- 27,33 ---- include ../config/Makefile.${SYS_NAME} ! INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} DBGFLAG = -UDEBUG CFLAGS = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS) YFLAGS = -vd Index: openafs/src/packaging/README diff -c /dev/null openafs/src/packaging/README:1.1.2.1 *** /dev/null Tue Jul 29 19:41:26 2003 --- openafs/src/packaging/README Wed Jul 9 14:24:06 2003 *************** *** 0 **** --- 1,3 ---- + Included in this directory are copies of the files used to create OpenAFS + binary packages. Because the Debian and RedHat packaging files are + maintained externally, they are not included here. Index: openafs/src/packaging/HP-UX/README diff -c /dev/null openafs/src/packaging/HP-UX/README:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/README Wed Jul 9 14:24:08 2003 *************** *** 0 **** --- 1,84 ---- + # + # File: README + # + # Purpose: README for OpenAFS psf file + # + # Copyright: None + # + # Header: $Header: /data/cvs/openafs/src/packaging/HP-UX/Attic/README,v 1.1.2.1 2003/07/09 18:24:08 shadow Exp $ + # Header: $Header: /data/cvs/openafs/src/packaging/HP-UX/Attic/README,v 1.1.2.1 2003/07/09 18:24:08 shadow Exp $ + # + + + This directory contains a Product Specification File (PSF) which defines + the layout of OpenAFS using the transarc-paths (--enable-transarc-paths). If + you did not run configure --enable-transarc-paths, using the psf file to + package the distribution will work, but you will be missing directories + when running the servers. + + The source files and controlled scripts contained in these products' + filesets are also provided in this directory. + + In order to package the sofware using HP's Software Distributor follow + the following procedure: + + Ensure the AFS docs are installed in the AFS build directory. + + Install the latest SD patch PHCO_27672, earlier patches will work, but + this patch fixes several memory leaks. + + Change directory to the top level directory, replacing the "x" with the + correct version number: + + cd /openafs-1.2.x + + Run the configure --enable-transarc-paths + + Then create the distribution directory: + + make dest + + Once the build in the distribution directory is completed, change dir to + the swpackage directory: + + cd /openafs-1.2.x/src/packaging/HP-UX + + Test the package creation, replace the "x" with the version just compiled: + + swpackage -p -s psf-1.2.x-transarc-paths-11.00 + + The package does include vfsck, mount, umount, etc. for installation in + /sbin/fs/afs. You will have to move the files into + hp_ux110/dest/root.server/etc in order to package them. + + Run: + swpackage -s psf-1.2.x-transarc-paths-11.xx [@ /dir/to/destination_depot] + + This command will package the product for installation with software distributor + into /var/spool/sw unless an alternate depot [ @ /dir/to/destination_depot] + is defined. + + Files can be compressed before transfer to the depot by using + + swpackage -x compress_files=true -x reinstall_files=true \ + -s psf-1.2.x-transarc-paths-11.xx [@ /dir/to/destination_depot] + + The psf file is designed to package the software for installation on + 32bit or 64bit HP-UX 11.00. The binaries should be compiled with +DAportable or + +DA1.0, or other options that allow binary compatibility between operating + the two operating systems (32bit or 64 bit). + + When installed, the package does install the kernel library, master.d file, + regen the kernel and cause a reboot. + + The 1.2.10 package does upgrade the 1.2.9 or the 1.2.8 package, so if a + previous version is packaged and installed a later packaged product will + upgrade it. (Worked for me). + + Follow the Quick Start Guide after installation to configure OPENAFS + + Feel free to make any corrections to any mistakes I may have made. + + Paul Weber + Hewlett-Packard + I N V E N T Index: openafs/src/packaging/HP-UX/psf-1.2.10-transarc-paths-11.00 diff -c /dev/null openafs/src/packaging/HP-UX/psf-1.2.10-transarc-paths-11.00:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/psf-1.2.10-transarc-paths-11.00 Wed Jul 9 14:24:08 2003 *************** *** 0 **** --- 1,590 ---- + # File: psf-1.2.10 + # + # Purpose: OpenAFS Product Specification File (PSF) for swpackage + # + # Copyright: Copyright (c) 2003 + # + # Header: $Header: /data/cvs/openafs/src/packaging/HP-UX/psf-1.2.10-transarc-paths-11.00,v 1.1.2.1 2003/07/09 18:24:08 shadow Exp $ + # + # Description: This PSF contains a valid product definition which includes + # all attributes for OpenAFS installation via software Distributor + # + # + # Not all control scripts are required for installation of a product/fileset + # + # Below is the list of control scripts that can be used on either + # Products or filesets + # Control script definition(s): + # + # Control scripts are optional. If defined, then specify the + # path to the script file. + # + # NOTE: control scripts can be defined for products too. + + #checkinstall path # Install check script + #preinstall path # Install pre-load script + #postinstall path # Install post-load script + #configure path # Configure for use script + #unconfigure path # Configure undo script + #verify path # Verify integrity script + #checkremove path # Remove check script + #preremove path # Remove pre-remove script + #postremove path # Remove post-remove script + #control_file path # Addition (sub)script or control data + + + vendor + + tag "OpenSource" # The identifier for the vendor. + title "OpenSource Software" # The name of the vendor. + # uuid "" # The NetLs UUID for the vendor. + description < data/vendor.description # A multi-line description of the vendor. + + end #Vendor + + # Product definition(s): + # + # All product attributes are optional, except for the tag and the + # filesets which must be contained within it. + + product + + tag "OPENAFS" # The identifier for the product. + title "Open Source Andrews File System" # The name of the product. + revision "A.1.2.10" # The revision (release) number of the product. + + #number "the_number" # The order/part number for the product. + category "OpenSource"" # The type of software (identifier). + #category_title "the category title" # The type of software (string). + + description < data/product.description # A file containing a + #multi-line description of the product. + + copyright "(c)Copyright 2002 OpenAFS, All Rights Reserved." + + readme < data/product.README # A multi-page README for the product. + + + architecture HP-UX_B.11.00_32/64 # A concise summary of hardware/OS'es + #supported. + + machine_type *:32* # Machines the product supports (uname -m). + os_name HP-UX # OS'es the product supports (uname -s). + os_release ?.11.00 # OS releases the product supports (uname -r). + os_version * # OS versions the product supports (uname -v). + + directory /usr/afs # The root directory for the product + is_locatable false # If defined then users can install the product + # into any directory they specify. + + # Control script definition(s): + # + # Control scripts are optional. If defined, then specify the + # path to the script file. + # + # NOTE: control scripts can be defined for products or filesets + + configure scripts/openafs.configure + unconfigure scripts/openafs.unconfigure + + # Subproduct definition(s): + # + # Subproducts are optional. If defined, then they group/partition + # the product's filesets into logical sets. If defined, then the + # tag and contents are required. + # + # The Runtime subproduct contains anything that is pertinant to + # either the server or client products + # + # + subproduct + tag Runtime + title "Rutime Requirements for OpenAFS Client and Server" + contents OPENAFS-RUN + end # Runtime subproduct + fileset + tag OPENAFS-RUN + title "OpenAFS Runtime" + revision A.1.2.10 + architecture HP-UX_B.11.00_32/64 + machine_type *:32* # Machines the product supports (uname -m). + os_name HP-UX # OS'es the product supports (uname -s). + os_release ?.11.00 # OS releases the product supports (uname -r). + os_version * # OS versions the product supports (uname -v). + ancestor OPENAFS.OPENAFS-RUN,fa=HP-UX_B.11.00_32/64,fr=andrew.cmu.edu #Carnegie Mellon University - Computing Services + 128.2.10.11 #vice11.fs.andrew.cmu.edu + 128.2.10.12 #vice12.fs.andrew.cmu.edu + 128.2.10.2 #vice2.fs.andrew.cmu.edu + 128.2.10.28 #vice28.fs.andrew.cmu.edu + 128.2.10.7 #vice7.fs.andrew.cmu.edu + >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. + 128.2.206.130 #cucumber.srv.cs.cmu.edu + 128.2.222.199 #papaya.srv.cs.cmu.edu + 128.2.242.86 #lemon.srv.cs.cmu.edu + >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. + 128.2.129.7 #porok.ece.cmu.edu + 128.2.129.8 #vicio.ece.cmu.edu + 128.2.129.9 #e-xing.ece.cmu.edu + >athena.mit.edu #MIT/Athena cell + 18.70.0.6 #prill.mit.edu. + 18.145.0.25 #agamemnon.mit.edu. + 18.159.0.34 #chimera.mit.edu. + >dev.mit.edu #MIT/IS Development cell + 18.86.0.28 #wham.mit.edu. + 18.86.0.50 #hum.mit.edu. + 18.86.0.51 #rattle.mit.edu. + >net.mit.edu #MIT/Network Group cell + 18.72.1.38 #gracie.mit.edu. + 18.72.0.26 #cetus.mit.edu. + >sipb.mit.edu #MIT/SIPB cell + 18.181.0.19 #reynelda.mit.edu. + 18.181.0.23 #ronald-ann.mit.edu. + 18.181.0.22 #rosebud.mit.edu. + >ir.stanford.edu #Stanford University + 171.64.7.222 #afsdb1.stanford.edu + 171.64.7.234 #afsdb2.stanford.edu + 171.64.7.246 #afsdb3.stanford.edu + >umr.edu #University of Missouri - Rolla + 131.151.1.59 #afs1.umr.edu + 131.151.1.70 #afs6.umr.edu + 131.151.1.146 #afs5.umr.edu + >dementia.org #Dementia Unlimited + 128.2.35.149 #alycia.dementia.org + 128.2.120.216 #meredith.dementia.org Index: openafs/src/packaging/HP-UX/files/usr/vice/etc/SuidCells diff -c /dev/null openafs/src/packaging/HP-UX/files/usr/vice/etc/SuidCells:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/files/usr/vice/etc/SuidCells Wed Jul 9 14:24:10 2003 *************** *** 0 **** --- 1,5 ---- + athena.mit.edu + net.mit.edu + sipb.mit.edu + dev.mit.edu + ops.mit.edu Index: openafs/src/packaging/HP-UX/files/usr/vice/etc/cacheinfo diff -c /dev/null openafs/src/packaging/HP-UX/files/usr/vice/etc/cacheinfo:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/files/usr/vice/etc/cacheinfo Wed Jul 9 14:24:10 2003 *************** *** 0 **** --- 1 ---- + /afs:/usr/vice/cache:100000 Index: openafs/src/packaging/HP-UX/scripts/openafs-clnt.checkinstall diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-clnt.checkinstall:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-clnt.checkinstall Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,45 ---- + #!/bin/sh + ############## + # Product: OPENAFS + # Fileset: OPENAFS.OPENAFS-CLNT + # checkinstall + # @(#) $Revision: 1.1.2.1 $ + ############## + # + # (c) Copyright 2003 + # + ######## + + # The global variables SUCCESS, FAILURE, WARNING, EXCLUDE, PATH, ROOT, + # SW_CTL_SCRIPT_NAME, _pf, PRODUCT, and FILESET are all set by control_utils. + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + + exitval=$SUCCESS # Anticipate success + + ############################################################################ + + # + # Check for running afsd processes, exit with a WARNING if running.. + # and SUCCESS if not running. + # + + ps -ef | grep -v grep | grep afsd + + if [[ $? = 0 ]]; then + print "WARNING: afsd processes are running..." + print "The preinstall script will attempt to shut down afsd processes" + exitval=$WARNING + else + print "NOTE: No afsd processes are running." + exitval=$SUCCESS + fi + + exit $exitval Index: openafs/src/packaging/HP-UX/scripts/openafs-clnt.configure diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-clnt.configure:1.2.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-clnt.configure Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,47 ---- + #!/bin/sh + ############## + # Product: OPENAFS + # Fileset: OPENAFS.OPENAFS-CLNT + # configure + # @(#) $Revision: 1.2.2.1 $ + # @(#) $Revision: 1.2.2.1 $ + ############## + # + # (c) Copyright 2003 + # + ######## + + # The global variables SUCCESS, FAILURE, WARNING, EXCLUDE, PATH, ROOT, + # SW_CTL_SCRIPT_NAME, _pf, PRODUCT, and FILESET are all set by control_utils. + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + + exitval=$SUCCESS # Anticipate success + + ############################################################################ + # + # Add cacheinfo info only if it does not locally exist + # + + if [[ -d /usr/newconfig/usr/vice/etc && ! -f /usr/vice/etc/cacheinfo ]]; then + + cp /usr/newconfig/usr/vice/etc/cacheinfo /usr/vice/etc + chmog 644 bin bin /usr/vice/etc/cacheinfo + + fi + # + # Add CellServDB info only if it does not locally exist + # + if [[ -f /usr/newconfig/usr/vice/etc/CellServDB && ! -f /usr/afs/etc/CellServDB ]]; then + print "Adding CellServDB hosts into /usr/afs/etc/CellServDB" + cat /usr/newconfig/usr/vice/etc/CellServDB >> /usr/afs/etc/CellServDB + fi + + exit $exitval Index: openafs/src/packaging/HP-UX/scripts/openafs-clnt.preinstall diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-clnt.preinstall:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-clnt.preinstall Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,49 ---- + #!/bin/sh + ############## + # Product: OPENAFS + # Fileset: OPENAFS.OPENAFS-CLNT + # preinstall + # @(#) $Revision: 1.1.2.1 $ + ############## + # + # (c) Copyright 2003 + # + ######## + + # The global variables SUCCESS, FAILURE, WARNING, EXCLUDE, PATH, ROOT, + # SW_CTL_SCRIPT_NAME, _pf, PRODUCT, and FILESET are all set by control_utils. + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + + exitval=$SUCCESS # Anticipate success + + ############################################################################ + + # + # Shutdown the afsd process before upgrading. This is just cleaner, than + # having SD move the file to #afsd because it's busy and adding it to + # the cleanup file for removal on the next boot. + # + + ps -ef | grep -v grep | grep afsd + + if [[ $? = 0 ]]; then + print "afsd process is running..attempting to shut down afsd process" + /usr/vice/etc/afsd -shutdown + if [[ $? = 0 ]]; then + print "Successfully shutdown the afsd processes." + exitval=$SUCCESS + else + print "Failed to successfully shutdown the afsd process." + exitval=$FAILURE + fi + fi + + exit $exitval Index: openafs/src/packaging/HP-UX/scripts/openafs-clnt.preremove diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-clnt.preremove:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-clnt.preremove Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,35 ---- + #!/bin/sh + ############## + # Product: OPENAFS + # Fileset: OPENAFS.OPENAFS-CLNT + # preremove + # @(#) $Revision: 1.1.2.1 $ + ############## + # + # (c) Copyright 2003 + # + ######## + + # The global variables SUCCESS, FAILURE, WARNING, EXCLUDE, PATH, ROOT, + # SW_CTL_SCRIPT_NAME, _pf, PRODUCT, and FILESET are all set by control_utils. + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + + exitval=$SUCCESS # Anticipate success + + ############################################################################ + + # + # Shutdown the afsd process + # + + /usr/vice/etc/afsd -shutdown + + exit $exitval Index: openafs/src/packaging/HP-UX/scripts/openafs-clnt.unconfigure diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-clnt.unconfigure:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-clnt.unconfigure Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,31 ---- + #!/bin/sh + ############## + # Product: OPENAFS + # Fileset: OPENAFS.OPENAFS-CLNT + # unconfigure + # @(#) $Revision: 1.1.2.1 $ + ############## + # + # (c) Copyright 2003 + # + ######## + + # The global variables SUCCESS, FAILURE, WARNING, EXCLUDE, PATH, ROOT, + # SW_CTL_SCRIPT_NAME, _pf, PRODUCT, and FILESET are all set by control_utils. + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + + exitval=$SUCCESS # Anticipate success + + ############################################################################ + + + + exit $exitval Index: openafs/src/packaging/HP-UX/scripts/openafs-eng-man.configure diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-eng-man.configure:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-eng-man.configure Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,32 ---- + #!/bin/sh + + echo "NOTE: Executing configure script." + ####### + # + # (c) Copyright + # + ######## + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + + ############################################################################ + # Set the global PATH to include OPENAFS software + ROOT=/usr/afs/ + + mod_pathfile -a MP ${ROOT}man + + if [[ $? = 2 ]] + then + echo " /etc/MANPATH already contains the OPENAFS component." + else + echo "NOTE: Processes may need to be restarted to inherit" + echo " ${ROOT}/man in their PATH." + fi + Index: openafs/src/packaging/HP-UX/scripts/openafs-eng-man.unconfigure diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-eng-man.unconfigure:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP-UX/scripts/openafs-eng-man.unconfigure Wed Jul 9 14:24:11 2003 *************** *** 0 **** --- 1,31 ---- + #!/bin/sh + + echo "NOTE: Executing unconfigure script." + ####### + # + # (c) Copyright + # + ######## + + set -a + UTILS="/usr/lbin/sw/control_utils" + if [[ ! -f ${UTILS} ]] + then + echo "ERROR: Cannot find ${UTILS}" + exit 1 + fi + . ${UTILS} + ################################################ + # Remove the global MANPATH to exclude OPENAFS software + ROOT=/opt/afs/ + + mod_pathfile -d MP ${ROOT}man + + if [[ $? = 2 ]] + then + echo " /etc/MANPATH does not contains the OPENAFS component." + else + echo " ${ROOT}/man removed from /etc/MANPATH." + fi + + exit 0 Index: openafs/src/packaging/HP-UX/scripts/openafs-krn.checkremove diff -c /dev/null openafs/src/packaging/HP-UX/scripts/openafs-krn.checkremove:1.1.2.1 *** /dev/null Tue Jul 29 19:41:27 2003 --- openafs/src/packaging/HP