From 3a5a6558b74cfd938f3069700ba210e8f01b616f Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 30 Jul 2003 17:13:49 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r611, which included commits to RCS files with non-trunk default branches. --- .cvsignore | 2 + README | 2 + acconfig.h | 3 + configure-libafs.in | 2 +- .../afs_setup_utils/afs_setup_utils_stub.rc | 3 + .../lang/de_DE/afs_setup_utils.rc | 4 + .../lang/en_US/afs_setup_utils.rc | 4 + .../lang/es_ES/afs_setup_utils.rc | 4 + .../lang/ja_JP/afs_setup_utils.rc | 4 + .../lang/ko_KR/afs_setup_utils.rc | 4 + .../lang/pt_BR/afs_setup_utils.rc | 4 + .../lang/zh_CN/afs_setup_utmls.rc | 4 + .../lang/zh_TW/afs_setup_utils.rc | 4 + src/WINNT/afsadmsvr/afsadmsvr.rc | 2 + src/WINNT/afsapplib/afsapplib_stub.rc | 3 + src/WINNT/afsapplib/lang/de_DE/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/en_US/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/es_ES/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc | 5 + src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc | 5 + src/WINNT/afsd/NTMakefile | 1 + src/WINNT/afsd/afsd.rc | 8 + src/WINNT/afsd/afsd_init.c | 3 + src/WINNT/afsd/afsd_service.c | 40 +- src/WINNT/afsd/afsd_service.rc | 2 + src/WINNT/afsd/afslog95.rc | 3 + src/WINNT/afsd/afslogon.c | 6 + src/WINNT/afsd/afslogon.rc | 3 + src/WINNT/afsd/afsshare.rc | 2 + src/WINNT/afsd/cm.h | 1 + src/WINNT/afsd/cm_conn.c | 52 ++- src/WINNT/afsd/fs.rc | 2 + src/WINNT/afsd/klog.rc | 2 + src/WINNT/afsd/libafsconf.rc | 3 + src/WINNT/afsd/smb.c | 1 + src/WINNT/afsd/smb3.c | 2 +- src/WINNT/afsd/symlink.rc | 2 + src/WINNT/afsd/tokens.rc | 2 + src/WINNT/afsd/unlog.rc | 2 + src/WINNT/afslegal/afslegal_stub.rc | 2 + src/WINNT/afslegal/lang/de_DE/afslegal.rc | 4 + src/WINNT/afslegal/lang/en_US/afslegal.rc | 4 + src/WINNT/afslegal/lang/es_ES/afslegal.rc | 4 + src/WINNT/afslegal/lang/ja_JP/afslegal.rc | 4 + src/WINNT/afslegal/lang/ko_KR/afslegal.rc | 4 + src/WINNT/afslegal/lang/pt_BR/afslegal.rc | 4 + src/WINNT/afslegal/lang/zh_CN/afslegal.rc | 4 + src/WINNT/afslegal/lang/zh_TW/afslegal.rc | 4 + src/WINNT/afssvrcfg/afscfg_stub.rc | 2 + src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/en_US/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc | 4 + src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc | 4 + src/WINNT/afssvrcpa/afssvrcpa_stub.rc | 2 + src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc | 4 + src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc | 4 + src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc | 4 + src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc | 4 + src/WINNT/afssvrmgr/svrmgr_stub.rc | 2 + src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc | 2 + src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc | 4 + src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc | 4 + src/WINNT/bosctlsvc/bosctlsvc.rc | 2 + src/WINNT/client_config/afs_config_stub.rc | 2 + .../client_config/lang/de_DE/afs_config.rc | 4 + .../client_config/lang/en_US/afs_config.rc | 4 + .../client_config/lang/es_ES/afs_config.rc | 4 + .../client_config/lang/ja_JP/afs_config.rc | 4 + .../client_config/lang/ko_KR/afs_config.rc | 4 + .../client_config/lang/pt_BR/afs_config.rc | 4 + .../client_config/lang/zh_CN/afs_config.rc | 4 + .../client_config/lang/zh_TW/afs_config.rc | 4 + src/WINNT/client_cpa/afs_cpa_stub.rc | 2 + src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc | 14 + src/WINNT/client_cpa/lang/en_US/afs_cpa.rc | 15 + src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc | 14 + src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc | 15 + src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc | 14 + src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc | 14 + src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc | 14 + src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc | 14 + src/WINNT/client_creds/afscreds_stub.rc | 2 + src/WINNT/client_creds/lang/de_DE/afscreds.rc | 13 + src/WINNT/client_creds/lang/en_US/afscreds.rc | 4 + src/WINNT/client_creds/lang/es_ES/afscreds.rc | 13 + src/WINNT/client_creds/lang/ja_JP/afscreds.rc | 13 + src/WINNT/client_creds/lang/ko_KR/afscreds.rc | 13 + src/WINNT/client_creds/lang/pt_BR/afscreds.rc | 13 + src/WINNT/client_creds/lang/zh_CN/afscreds.rc | 13 + src/WINNT/client_creds/lang/zh_TW/afscreds.rc | 13 + src/WINNT/client_exp/afs_shl_ext_stub.rc | 3 + .../client_exp/lang/de_DE/afs_shl_ext.rc | 17 +- .../client_exp/lang/en_US/afs_shl_ext.rc | 4 + .../client_exp/lang/es_ES/afs_shl_ext.rc | 16 + .../client_exp/lang/ja_JP/afs_shl_ext.rc | 16 + .../client_exp/lang/ko_KR/afs_shl_ext.rc | 16 + .../client_exp/lang/pt_BR/afs_shl_ext.rc | 16 + .../client_exp/lang/zh_CN/afs_shl_ext.rc | 16 + .../client_exp/lang/zh_TW/afs_shl_ext.rc | 15 + src/WINNT/client_osi/libosi.rc | 3 + src/WINNT/client_osi/osi.h | 33 ++ src/WINNT/client_osi/osistatl.h | 2 + src/WINNT/client_osi/osiutils.c | 73 ++++ src/WINNT/eventlog/lang/afseventmsg.rc | 3 + src/WINNT/eventlog/lang/de_DE/event.mc | 340 ++++++++--------- src/WINNT/eventlog/lang/es_ES/event.mc | 356 +++++++++--------- src/WINNT/eventlog/lang/ja_JP/event.mc | 342 ++++++++--------- src/WINNT/eventlog/lang/ko_KR/event.mc | 350 ++++++++--------- src/WINNT/eventlog/lang/pt_BR/event.mc | 340 ++++++++--------- src/WINNT/eventlog/lang/zh_CN/event.mc | 344 ++++++++--------- src/WINNT/eventlog/lang/zh_TW/event.mc | 344 ++++++++--------- src/WINNT/install/InstallShield5/NTMakefile | 12 +- src/WINNT/pthread/pthread.rc | 3 + src/WINNT/pthread/pthread95.rc | 3 + src/afs/DARWIN/osi_vfsops.c | 89 ++++- src/afs/DARWIN/osi_vnodeops.c | 42 +-- src/afs/HPUX/osi_groups.c | 15 +- src/afs/HPUX/osi_machdep.h | 30 ++ src/afs/HPUX/osi_sleep.c | 70 +++- src/afs/HPUX/osi_vfsops.c | 10 +- src/afs/HPUX/osi_vnodeops.c | 54 ++- src/afs/LINUX/osi_alloc.c | 4 +- src/afs/LINUX/osi_groups.c | 37 +- src/afs/LINUX/osi_vfsops.c | 10 +- src/afs/SOLARIS/osi_vfsops.c | 24 +- src/afs/VNOPS/afs_vnop_attrs.c | 27 +- src/afs/afs_analyze.c | 16 +- src/afs/afs_cell.c | 6 +- src/afs/afs_conn.c | 4 +- src/afs/afs_dcache.c | 4 +- src/afs/afs_osi.c | 8 +- src/afs/afs_server.c | 4 +- src/afs/afs_user.c | 6 +- src/afs/afs_util.c | 8 +- src/afs/afs_vcache.c | 5 +- src/afs/afs_volume.c | 4 +- src/afs/sysincludes.h | 5 + src/afsd/Makefile.in | 17 +- src/afsd/afs.rc.darwin | 4 +- src/afsd/afsd.c | 47 ++- src/afsmonitor/Makefile.in | 2 +- src/afsweb/Makefile.in | 2 +- src/auth/cellconfig.c | 17 +- src/auth/ktc.c | 7 +- src/bozo/Makefile.in | 4 +- src/bozo/bos.rc | 2 + src/bozo/bos_util.c | 4 +- src/bozo/bosserver.rc | 2 + src/bu_utils/Makefile.in | 2 +- src/bu_utils/fms.rc | 2 + src/bucoord/backup.rc | 2 + src/budb/Makefile.in | 10 +- src/budb/buserver.rc | 2 + src/budb/procs.c | 8 +- src/butc/Makefile.in | 2 +- src/butc/butc.rc | 2 + src/butc/dump.c | 3 +- src/butc/tcudbprocs.c | 6 +- src/butm/Makefile.in | 4 +- src/butm/file_tm.c | 32 +- src/cf/linux-test2.m4 | 15 + src/cf/linux-test3.m4 | 11 + src/cf/linux-test4.m4 | 34 ++ src/config/Makefile.i386_linux24.in | 2 +- src/config/Makefile.in | 2 +- src/config/NTMakefile.i386_nt40 | 37 +- src/config/NTMakefile.version-NOCML | 1 + src/config/NTVersioninfo.rc | 29 +- src/config/afs_sysnames.h | 10 + src/dauth/Makefile.in | 5 +- src/des/andrew-conf.h | 4 + src/des/crypt.c | 6 +- src/dir/Makefile.in | 4 +- src/dir/dir.c | 4 +- src/dir/test/Makefile.in | 2 +- src/export/Makefile.in | 4 +- src/finale/Makefile.in | 4 +- src/finale/translate_et.rc | 2 + src/fsint/Makefile.in | 4 +- src/fsprobe/Makefile.in | 6 +- src/kauth/kas.rc | 2 + src/kauth/kaserver.rc | 2 + src/kauth/kpasswd.rc | 2 + src/libacl/Makefile.in | 4 +- src/libadmin/adminutil/afsadminutil.rc | 3 + src/libadmin/bos/afsbosadmin.rc | 3 + src/libadmin/cfg/afscfgadmin.rc | 3 + src/libadmin/client/afsclientadmin.rc | 3 + src/libadmin/kas/afskasadmin.rc | 3 + src/libadmin/pts/afs_ptsAdmin.c | 10 +- src/libadmin/pts/afsptsadmin.rc | 3 + src/libadmin/vos/afsvosadmin.rc | 3 + src/libafs/MakefileProto.HPUX.in | 28 +- src/libafs/MakefileProto.SOLARIS.in | 13 +- src/libafs/afs.ppc_darwin_12.plist.in | 4 +- src/libafs/afs.ppc_darwin_13.plist.in | 4 +- src/libafs/afs.ppc_darwin_14.plist.in | 4 +- src/libafs/afs.ppc_darwin_60.plist.in | 4 +- src/libafsauthent/afsauthent.rc | 3 + src/libafsrpc/afsrpc.rc | 3 + src/libuafs/Makefile.common | 2 +- src/libuafs/MakefileProto.HPUX.in | 8 + src/login/Makefile.in | 12 +- src/package/Makefile.in | 2 +- src/pinstall/Makefile.in | 2 +- src/procmgmt/afskill.rc | 2 + src/procmgmt/afsprocmgmt.rc | 3 + src/ptserver/Makefile.in | 2 +- src/ptserver/pts.rc | 2 + src/ptserver/ptserver.rc | 2 + src/rx/HPUX/rx_kmutex.h | 7 + src/rx/LINUX/rx_knet.c | 7 +- src/rx/SOLARIS/rx_knet.c | 4 +- src/rx/bulk.example/Makefile.in | 2 +- src/rx/bulktest/Makefile.in | 2 +- src/rx/multi.example/Makefile.in | 2 +- src/rx/rx_kcommon.c | 6 +- src/rx/rxdebug.rc | 2 + src/rx/simple.example/Makefile.in | 2 +- src/rx/xdr.h | 18 +- src/rx/xdr_mem.c | 8 +- src/rxdebug/Makefile.in | 4 +- src/rxdebug/rxdebug.rc | 2 + src/rxgen/Makefile.in | 2 +- src/rxkad/test/Makefile.in | 8 +- src/rxkad/ticket.c | 3 +- src/rxstat/Makefile.in | 4 +- src/shlibafsauthent/afsauthent.rc | 3 + src/shlibafsrpc/afsrpc.rc | 3 + src/sia/Makefile.in | 13 +- src/sys/rmtsysc.c | 5 +- src/tsm41/Makefile.in | 3 +- src/ubik/Makefile.in | 6 +- src/ubik/beacon.c | 10 +- src/ubik/udebug.rc | 2 + src/update/upclient.rc | 2 + src/update/upserver.rc | 2 + src/uss/Makefile.in | 2 +- src/uss/lex.c | 9 +- src/uss/uss.rc | 2 + src/uss/uss_common.h | 8 + src/util/afs_lhash.c | 66 ++-- src/util/potpourri.h | 1 + src/util/softsig.c | 65 ++-- src/util/test/Makefile.in | 2 +- src/venus/test/owntest.c | 6 +- src/venus/up.c | 9 +- src/viced/callback.c | 10 +- src/viced/fileserver.rc | 2 + src/viced/host.c | 8 +- src/viced/viced.c | 8 +- src/vlserver/Makefile.in | 4 +- src/vlserver/vlserver.rc | 2 + src/vol/salvager.rc | 2 + src/vol/vol-salvage.c | 32 +- src/vol/volinfo.rc | 2 + src/volser/volprocs.c | 4 +- src/volser/volserver.rc | 2 + src/volser/vos.rc | 2 + src/xstat/Makefile.in | 2 +- 285 files changed, 3104 insertions(+), 1582 deletions(-) diff --git a/.cvsignore b/.cvsignore index c2948c21e..4f075370c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,6 +9,8 @@ hp_ux102 hp_ux110 i386_linux22 i386_linux24 +i386_umlinux22 +i386_umlinux24 include lib sgi_65 diff --git a/README b/README index c3bf7103e..7ef295b2a 100644 --- a/README +++ b/README @@ -36,6 +36,8 @@ A. Creating the proper directory structure. i386_fbsd46 (gmake is required to build for FreeBSD) i386_linux22 i386_linux24 + i386_umlinux22 + i386_umlinux24 rs_aix42 sgi_65 (file server not tested) sun4_413 (No client support, no fileserver support, db servers only) diff --git a/acconfig.h b/acconfig.h index 679dd81ad..075dca23b 100644 --- a/acconfig.h +++ b/acconfig.h @@ -26,6 +26,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #undef BITMAP_LATER #undef BOS_RESTRICTED_MODE +#undef BOS_NEW_CONFIG #undef FAST_RESTART #undef FULL_LISTVOL_SWITCH @@ -35,6 +36,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #undef EXPORTED_KALLSYMS_ADDRESS #undef EXPORTED_KALLSYMS_SYMBOL #undef EXPORTED_SYS_CALL_TABLE +#undef EXPORTED_IA32_SYS_CALL_TABLE #undef EXPORTED_TASKLIST_LOCK #undef INODE_SETATTR_NOT_VOID #undef RECALC_SIGPENDING_TAKES_VOID @@ -43,6 +45,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #undef STRUCT_FS_HAS_FS_ROLLED #undef STRUCT_INODE_HAS_I_DEVICES #undef STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS +#undef STRUCT_INODE_HAS_I_ALLOC_SEM #undef STRUCT_INODE_HAS_I_TRUNCATE_SEM #undef STRUCT_TASK_STRUCT_HAS_PARENT #undef STRUCT_TASK_STRUCT_HAS_REAL_PARENT diff --git a/configure-libafs.in b/configure-libafs.in index 7777c8e5f..d7149a9aa 100644 --- a/configure-libafs.in +++ b/configure-libafs.in @@ -1,5 +1,5 @@ AC_INIT(Makefile.common) -AM_INIT_AUTOMAKE(openafs-libafs,1.2.9) +AM_INIT_AUTOMAKE(openafs-libafs,1.2.10) AC_CONFIG_HEADER(config/afsconfig.h) define(OPENAFS_CONFIGURE_LIBAFS) diff --git a/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc b/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc index 20d1f9a6a..d0949cd5a 100644 --- a/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc +++ b/src/WINNT/afs_setup_utils/afs_setup_utils_stub.rc @@ -16,6 +16,9 @@ // #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" diff --git a/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc index 5f8faa675..fc8c340c9 100644 --- a/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/de_DE/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc index 8531252d7..228e525fa 100644 --- a/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/en_US/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc index 2868307f8..39d9f0253 100644 --- a/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/es_ES/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc index 2761ee6ae..1f3ecb9fd 100644 --- a/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/ja_JP/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒZƒbƒgƒAƒbƒvEƒ†[ƒeƒBƒŠƒeƒB[ 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" diff --git a/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc index ff0f945d5..7ad3b0ddb 100644 --- a/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/ko_KR/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc index 22a1f73cf..c90252c87 100644 --- a/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/pt_BR/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #include #define AFS_VERINFO_FILE_DESCRIPTION "DLL dos Utilitários 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" diff --git a/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc b/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc index 7d6d4431e..769f0ba1d 100644 --- a/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc +++ b/src/WINNT/afs_setup_utils/lang/zh_CN/afs_setup_utmls.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc b/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc index abf75cc2b..2ec33b6d2 100644 --- a/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc +++ b/src/WINNT/afs_setup_utils/lang/zh_TW/afs_setup_utils.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afsadmsvr/afsadmsvr.rc b/src/WINNT/afsadmsvr/afsadmsvr.rc index 1529aced7..e49cccae2 100644 --- a/src/WINNT/afsadmsvr/afsadmsvr.rc +++ b/src/WINNT/afsadmsvr/afsadmsvr.rc @@ -17,6 +17,8 @@ #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 diff --git a/src/WINNT/afsapplib/afsapplib_stub.rc b/src/WINNT/afsapplib/afsapplib_stub.rc index 8b5a155a0..f39516e29 100644 --- a/src/WINNT/afsapplib/afsapplib_stub.rc +++ b/src/WINNT/afsapplib/afsapplib_stub.rc @@ -9,6 +9,9 @@ #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 diff --git a/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc b/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc index 1bc344908..ceb27817a 100644 --- a/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/de_DE/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsapplib/lang/en_US/afsapplib.rc b/src/WINNT/afsapplib/lang/en_US/afsapplib.rc index 6524a9c3c..bcd5b5adf 100644 --- a/src/WINNT/afsapplib/lang/en_US/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/en_US/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc b/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc index 66225fa76..2db6918c8 100644 --- a/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/es_ES/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc b/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc index d7a7cb9c4..b2024c3b8 100644 --- a/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/ja_JP/afsapplib.rc @@ -18,6 +18,11 @@ #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒAƒvƒŠƒP[ƒVƒ‡ƒ“Eƒx[ƒX 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 diff --git a/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc b/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc index 3f07aa42b..e8d3eed66 100644 --- a/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/ko_KR/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc b/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc index 3be990eb9..8721489df 100644 --- a/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/pt_BR/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc b/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc index f80ef68f9..37832a587 100644 --- a/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/zh_CN/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc b/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc index 9a1f4914b..a77ddf591 100644 --- a/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc +++ b/src/WINNT/afsapplib/lang/zh_TW/afsapplib.rc @@ -18,6 +18,11 @@ #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 diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index da8bc97c1..edf83cd84 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -62,6 +62,7 @@ AFSDOBJS=\ cm_vnodeops.obj \ cm_dir.obj \ cm_utils.obj \ + largeintdotnet.obj \ smb.obj \ smb3.obj \ smb_ioctl.obj \ diff --git a/src/WINNT/afsd/afsd.rc b/src/WINNT/afsd/afsd.rc index b0d1c2d69..de954d0e1 100644 --- a/src/WINNT/afsd/afsd.rc +++ b/src/WINNT/afsd/afsd.rc @@ -19,3 +19,11 @@ BEGIN 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" diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index a09e4c144..84d6a8504 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -416,7 +416,10 @@ int afsd_InitCM(char **reasonP) } 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 diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c index 42979d5c9..69419ca41 100644 --- a/src/WINNT/afsd/afsd_service.c +++ b/src/WINNT/afsd/afsd_service.c @@ -20,10 +20,10 @@ #include #include - -#ifdef DEBUG -//#define NOTSERVICE -#endif + +#ifdef DEBUG +//#define NOTSERVICE +#endif extern void afsi_log(char *pattern, ...); @@ -137,9 +137,10 @@ doneTrace: } } -#if 0 +#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,9 +172,27 @@ void CheckMountDrive() } } +#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,7 +213,7 @@ void afsd_Main() WaitToTerminate = CreateEvent(NULL, TRUE, FALSE, NULL); -#ifndef NOTSERVICE +#ifndef NOTSERVICE StatusHandle = RegisterServiceCtrlHandler(AFS_DAEMON_SERVICE_NAME, (LPHANDLER_FUNCTION) afsd_ServiceControlHandler); @@ -251,7 +270,7 @@ void afsd_Main() } /* Check if we should mount a drive into AFS */ -/* CheckMountDrive();*/ + CheckMountDrive(); WaitForSingleObject(WaitToTerminate, INFINITE); @@ -281,7 +300,12 @@ void main() return ; } #else -void _CRTAPI1 main() + +#ifdef _CRTAPI1 +void _CRTAPI1 main(void) +#else +void main() +#endif { LONG status = ERROR_SUCCESS; SERVICE_TABLE_ENTRY dispatchTable[] = { diff --git a/src/WINNT/afsd/afsd_service.rc b/src/WINNT/afsd/afsd_service.rc index 5fa3428b4..189c56cd6 100644 --- a/src/WINNT/afsd/afsd_service.rc +++ b/src/WINNT/afsd/afsd_service.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afsd/afslog95.rc b/src/WINNT/afsd/afslog95.rc index dfb2871f4..61f21409c 100644 --- a/src/WINNT/afsd/afslog95.rc +++ b/src/WINNT/afsd/afslog95.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c index 8ad61f28c..ff671c1b9 100644 --- a/src/WINNT/afsd/afslogon.c +++ b/src/WINNT/afsd/afslogon.c @@ -320,6 +320,7 @@ DWORD APIENTRY NPLogonNotify( LPWSTR *lpLogonScript) { char uname[256]; + char *ctemp; char password[256]; char cell[256]; MSV1_0_INTERACTIVE_LOGON *IL; @@ -347,6 +348,10 @@ DWORD APIENTRY NPLogonNotify( 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,6 +440,7 @@ DWORD APIENTRY NPLogonNotify( * 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, diff --git a/src/WINNT/afsd/afslogon.rc b/src/WINNT/afsd/afslogon.rc index 0cbf866a0..1b541fd52 100644 --- a/src/WINNT/afsd/afslogon.rc +++ b/src/WINNT/afsd/afslogon.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/WINNT/afsd/afsshare.rc b/src/WINNT/afsd/afsshare.rc index a99d5807c..a4af961ff 100644 --- a/src/WINNT/afsd/afsshare.rc +++ b/src/WINNT/afsd/afsshare.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afsd/cm.h b/src/WINNT/afsd/cm.h index fbf6af631..600199761 100644 --- a/src/WINNT/afsd/cm.h +++ b/src/WINNT/afsd/cm.h @@ -245,5 +245,6 @@ int RXAFS_Lookup (struct rx_connection *, #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__ */ diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c index f38d6f6f8..6ebdf6522 100644 --- a/src/WINNT/afsd/cm_conn.c +++ b/src/WINNT/afsd/cm_conn.c @@ -134,6 +134,15 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, 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,23 +173,37 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp, long oldSum, newSum; int same; - /* Back off to allow move to complete */ - thrd_Sleep(2000); + /* 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); + } - /* Update the volume location and see if it changed */ - cm_GetServerList(fidp, userp, reqp, &serversp); - oldSum = cm_ChecksumServerList(serversp); - cm_ForceUpdateVolume(fidp, userp, reqp); + /* Mark server offline for this volume */ 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; } @@ -312,8 +335,11 @@ long cm_ConnByMServers(cm_serverRef_t *serversp, cm_user_t *usersp, 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; + 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; diff --git a/src/WINNT/afsd/fs.rc b/src/WINNT/afsd/fs.rc index 9a435a862..5624338e6 100644 --- a/src/WINNT/afsd/fs.rc +++ b/src/WINNT/afsd/fs.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afsd/klog.rc b/src/WINNT/afsd/klog.rc index 86c414cdd..0f84a5eb5 100644 --- a/src/WINNT/afsd/klog.rc +++ b/src/WINNT/afsd/klog.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afsd/libafsconf.rc b/src/WINNT/afsd/libafsconf.rc index 4c45bec86..744f727c5 100644 --- a/src/WINNT/afsd/libafsconf.rc +++ b/src/WINNT/afsd/libafsconf.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index f740e00b5..fceb2c707 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -5902,6 +5902,7 @@ void smb_Listener(void *parmp) while (1) { memset(ncbp, 0, sizeof(NCB)); + flags = 0; #ifdef DJGPP /* terminate if shutdown flag is set */ if (smbShutdownFlag == 1) diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index b6de8c3b7..aadbe0f2c 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -1345,9 +1345,9 @@ long smb_ReceiveTran2QFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t *((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; + *op++ = 0; } else if (infoLevel == 0x103) { *((u_long *)op) = 0; op += 4; diff --git a/src/WINNT/afsd/symlink.rc b/src/WINNT/afsd/symlink.rc index f073bcfab..5a97a71a7 100644 --- a/src/WINNT/afsd/symlink.rc +++ b/src/WINNT/afsd/symlink.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afsd/tokens.rc b/src/WINNT/afsd/tokens.rc index c7605bb96..169166208 100644 --- a/src/WINNT/afsd/tokens.rc +++ b/src/WINNT/afsd/tokens.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afsd/unlog.rc b/src/WINNT/afsd/unlog.rc index 4a1ad1cad..f453e6178 100644 --- a/src/WINNT/afsd/unlog.rc +++ b/src/WINNT/afsd/unlog.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/afslegal/afslegal_stub.rc b/src/WINNT/afslegal/afslegal_stub.rc index 5adf55752..8f4ae5fd8 100644 --- a/src/WINNT/afslegal/afslegal_stub.rc +++ b/src/WINNT/afslegal/afslegal_stub.rc @@ -9,6 +9,8 @@ #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 diff --git a/src/WINNT/afslegal/lang/de_DE/afslegal.rc b/src/WINNT/afslegal/lang/de_DE/afslegal.rc index 8a893838e..3fe35ea4e 100644 --- a/src/WINNT/afslegal/lang/de_DE/afslegal.rc +++ b/src/WINNT/afslegal/lang/de_DE/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afslegal/lang/en_US/afslegal.rc b/src/WINNT/afslegal/lang/en_US/afslegal.rc index 30402020c..8795f1c87 100644 --- a/src/WINNT/afslegal/lang/en_US/afslegal.rc +++ b/src/WINNT/afslegal/lang/en_US/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afslegal/lang/es_ES/afslegal.rc b/src/WINNT/afslegal/lang/es_ES/afslegal.rc index 5cf4b3a62..b1856ce96 100644 --- a/src/WINNT/afslegal/lang/es_ES/afslegal.rc +++ b/src/WINNT/afslegal/lang/es_ES/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afslegal/lang/ja_JP/afslegal.rc b/src/WINNT/afslegal/lang/ja_JP/afslegal.rc index 408dcb523..d0aef12f7 100644 --- a/src/WINNT/afslegal/lang/ja_JP/afslegal.rc +++ b/src/WINNT/afslegal/lang/ja_JP/afslegal.rc @@ -17,6 +17,10 @@ #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒT[ƒo[Žn“®ƒƒbƒZ[ƒW" +#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 diff --git a/src/WINNT/afslegal/lang/ko_KR/afslegal.rc b/src/WINNT/afslegal/lang/ko_KR/afslegal.rc index b19a97dd3..a0009151b 100644 --- a/src/WINNT/afslegal/lang/ko_KR/afslegal.rc +++ b/src/WINNT/afslegal/lang/ko_KR/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afslegal/lang/pt_BR/afslegal.rc b/src/WINNT/afslegal/lang/pt_BR/afslegal.rc index da8abd422..deb0014a9 100644 --- a/src/WINNT/afslegal/lang/pt_BR/afslegal.rc +++ b/src/WINNT/afslegal/lang/pt_BR/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afslegal/lang/zh_CN/afslegal.rc b/src/WINNT/afslegal/lang/zh_CN/afslegal.rc index 533e21b5c..2bb2b04dd 100644 --- a/src/WINNT/afslegal/lang/zh_CN/afslegal.rc +++ b/src/WINNT/afslegal/lang/zh_CN/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afslegal/lang/zh_TW/afslegal.rc b/src/WINNT/afslegal/lang/zh_TW/afslegal.rc index 0dad52b3d..a12e0a327 100644 --- a/src/WINNT/afslegal/lang/zh_TW/afslegal.rc +++ b/src/WINNT/afslegal/lang/zh_TW/afslegal.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/afssvrcfg/afscfg_stub.rc b/src/WINNT/afssvrcfg/afscfg_stub.rc index 44cd48e3c..2e83d6847 100644 --- a/src/WINNT/afssvrcfg/afscfg_stub.rc +++ b/src/WINNT/afssvrcfg/afscfg_stub.rc @@ -10,6 +10,8 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc b/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc index 23ce1afc5..5d3015f86 100644 --- a/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/de_DE/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc b/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc index 2318d99af..7235ebabd 100644 --- a/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/en_US/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc b/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc index 619c32abf..26444734e 100644 --- a/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/es_ES/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc b/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc index 99364c1b6..8d05d69e8 100644 --- a/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/ja_JP/afscfg.rc @@ -17,6 +17,10 @@ #include "afxres.h" #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS(R) \¬ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚¨‚æ‚уEƒBƒU[ƒh" +#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" diff --git a/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc b/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc index 890639951..332a8da00 100644 --- a/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/ko_KR/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc b/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc index 1cac00c67..8c36c4bd7 100644 --- a/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/pt_BR/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc b/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc index 96c46e3f7..43282ac6c 100644 --- a/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/zh_CN/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc b/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc index 4e5cdf051..788da457e 100644 --- a/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc +++ b/src/WINNT/afssvrcfg/lang/zh_TW/afscfg.rc @@ -17,6 +17,10 @@ #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" diff --git a/src/WINNT/afssvrcpa/afssvrcpa_stub.rc b/src/WINNT/afssvrcpa/afssvrcpa_stub.rc index 2e9bb42f7..bceb7a2d3 100644 --- a/src/WINNT/afssvrcpa/afssvrcpa_stub.rc +++ b/src/WINNT/afssvrcpa/afssvrcpa_stub.rc @@ -10,6 +10,8 @@ #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" diff --git a/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc index 2c72738c9..9cc2be6f8 100644 --- a/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/de_DE/afssvrcpa.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc index 0a2b1aa93..094d6b62f 100644 --- a/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/en_US/afssvrcpa.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc index 8cbfc0967..838afbea1 100644 --- a/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/es_ES/afssvrcpa.rc @@ -16,6 +16,10 @@ // #include #define AFS_VERINFO_FILE_DESCRIPTION "Aplicación de Configuración 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" diff --git a/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc index e0a092b58..a201508a6 100644 --- a/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/ja_JP/afssvrcpa.rc @@ -16,6 +16,10 @@ // #include #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒT[ƒo[\¬ƒAƒvƒŠƒP[ƒVƒ‡ƒ“" +#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" diff --git a/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc index 293a543b5..daab79db4 100644 --- a/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/ko_KR/afssvrcpa.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc index 4a67aa418..131fa6ce2 100644 --- a/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/pt_BR/afssvrcpa.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc index 14a748e71..075fe3159 100644 --- a/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/zh_CN/afssvrcpa.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc b/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc index f21342f35..86cfd3030 100644 --- a/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc +++ b/src/WINNT/afssvrcpa/lang/zh_TW/afssvrcpa.rc @@ -16,6 +16,10 @@ // #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" diff --git a/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc b/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc index 20ce225b6..4a957e104 100644 --- a/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/de_DE/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc b/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc index 03e3e6c15..c6bb6c082 100644 --- a/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/en_US/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc b/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc index b3b935833..0412efade 100644 --- a/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/es_ES/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc b/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc index 127ffa769..7713c0183 100644 --- a/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/ja_JP/svrmgr.rc @@ -19,6 +19,10 @@ #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒT[ƒo[Eƒ}ƒl[ƒWƒƒ[" +#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 diff --git a/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc b/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc index be3c3afd0..4efa49b24 100644 --- a/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/ko_KR/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc b/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc index 805733807..373c3c170 100644 --- a/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/pt_BR/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc b/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc index 0b6e576b3..5e64adb19 100644 --- a/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/zh_CN/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc b/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc index dc490a1ef..febb014a1 100644 --- a/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc +++ b/src/WINNT/afssvrmgr/lang/zh_TW/svrmgr.rc @@ -19,6 +19,10 @@ #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 diff --git a/src/WINNT/afssvrmgr/svrmgr_stub.rc b/src/WINNT/afssvrmgr/svrmgr_stub.rc index 4cea1158d..eeb526be3 100644 --- a/src/WINNT/afssvrmgr/svrmgr_stub.rc +++ b/src/WINNT/afssvrmgr/svrmgr_stub.rc @@ -11,6 +11,8 @@ #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 diff --git a/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc b/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc index aced0abcd..aac7ae6eb 100644 --- a/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc +++ b/src/WINNT/afsusrmgr/AfsUsrMgr_stub.rc @@ -11,6 +11,8 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc index b56876b07..15d4bffa1 100644 --- a/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/de_DE/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc index a89714519..8eccbb3e9 100644 --- a/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/en_US/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc index 1d6b0a981..a9c001e5e 100644 --- a/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/es_ES/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc index d9753f2ad..d67716d3d 100644 --- a/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/ja_JP/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒAƒJƒEƒ“ƒgEƒ}ƒl[ƒWƒƒ[" +#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 diff --git a/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc index 2c0e11776..e804b82bc 100644 --- a/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/ko_KR/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc index bfccd57ea..f9ae5e98a 100644 --- a/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/pt_BR/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc index 48edd0526..a6a7ec61f 100644 --- a/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/zh_CN/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc b/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc index 17c1a565d..7e2aae289 100644 --- a/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc +++ b/src/WINNT/afsusrmgr/lang/zh_TW/AfsUsrMgr.rc @@ -18,6 +18,10 @@ #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 diff --git a/src/WINNT/bosctlsvc/bosctlsvc.rc b/src/WINNT/bosctlsvc/bosctlsvc.rc index ff500a530..907f11bce 100644 --- a/src/WINNT/bosctlsvc/bosctlsvc.rc +++ b/src/WINNT/bosctlsvc/bosctlsvc.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/WINNT/client_config/afs_config_stub.rc b/src/WINNT/client_config/afs_config_stub.rc index d1d3e4769..14a5a5902 100644 --- a/src/WINNT/client_config/afs_config_stub.rc +++ b/src/WINNT/client_config/afs_config_stub.rc @@ -10,6 +10,8 @@ #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" diff --git a/src/WINNT/client_config/lang/de_DE/afs_config.rc b/src/WINNT/client_config/lang/de_DE/afs_config.rc index e3515d6ac..93a3f7bbb 100644 --- a/src/WINNT/client_config/lang/de_DE/afs_config.rc +++ b/src/WINNT/client_config/lang/de_DE/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_config/lang/en_US/afs_config.rc b/src/WINNT/client_config/lang/en_US/afs_config.rc index 9aec58a41..22ffcc101 100644 --- a/src/WINNT/client_config/lang/en_US/afs_config.rc +++ b/src/WINNT/client_config/lang/en_US/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_config/lang/es_ES/afs_config.rc b/src/WINNT/client_config/lang/es_ES/afs_config.rc index 0856bc7ae..8c3e447e9 100644 --- a/src/WINNT/client_config/lang/es_ES/afs_config.rc +++ b/src/WINNT/client_config/lang/es_ES/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_config/lang/ja_JP/afs_config.rc b/src/WINNT/client_config/lang/ja_JP/afs_config.rc index ec5e8db11..564039e0b 100644 --- a/src/WINNT/client_config/lang/ja_JP/afs_config.rc +++ b/src/WINNT/client_config/lang/ja_JP/afs_config.rc @@ -17,6 +17,10 @@ #include #ifndef APSTUDIO_INVOKED #define AFS_VERINFO_FILE_DESCRIPTION "AFS ƒNƒ‰ƒCƒAƒ“ƒg\¬" +#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 diff --git a/src/WINNT/client_config/lang/ko_KR/afs_config.rc b/src/WINNT/client_config/lang/ko_KR/afs_config.rc index 898872ac4..7bd1bbb24 100644 --- a/src/WINNT/client_config/lang/ko_KR/afs_config.rc +++ b/src/WINNT/client_config/lang/ko_KR/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_config/lang/pt_BR/afs_config.rc b/src/WINNT/client_config/lang/pt_BR/afs_config.rc index 8991e7e40..073fda2c3 100644 --- a/src/WINNT/client_config/lang/pt_BR/afs_config.rc +++ b/src/WINNT/client_config/lang/pt_BR/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_config/lang/zh_CN/afs_config.rc b/src/WINNT/client_config/lang/zh_CN/afs_config.rc index ff0f9922c..3175ff120 100644 --- a/src/WINNT/client_config/lang/zh_CN/afs_config.rc +++ b/src/WINNT/client_config/lang/zh_CN/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_config/lang/zh_TW/afs_config.rc b/src/WINNT/client_config/lang/zh_TW/afs_config.rc index 835c7ef50..7bda9e908 100644 --- a/src/WINNT/client_config/lang/zh_TW/afs_config.rc +++ b/src/WINNT/client_config/lang/zh_TW/afs_config.rc @@ -17,6 +17,10 @@ #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 diff --git a/src/WINNT/client_cpa/afs_cpa_stub.rc b/src/WINNT/client_cpa/afs_cpa_stub.rc index dc6e7df33..8da96f17f 100644 --- a/src/WINNT/client_cpa/afs_cpa_stub.rc +++ b/src/WINNT/client_cpa/afs_cpa_stub.rc @@ -10,6 +10,8 @@ #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" diff --git a/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc b/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc index 456b61071..f450901ad 100644 --- a/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/de_DE/afs_cpa.rc @@ -26,7 +26,21 @@ #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 diff --git a/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc b/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc index fd8c313d0..e6ecbba0f 100644 --- a/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/en_US/afs_cpa.rc @@ -28,6 +28,21 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #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 diff --git a/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc b/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc index e2ba9dfa4..863b9b6d2 100644 --- a/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/es_ES/afs_cpa.rc @@ -26,7 +26,21 @@ #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 diff --git a/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc b/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc index 6f927cab9..3f4b3e52e 100644 --- a/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/ja_JP/afs_cpa.rc @@ -26,6 +26,21 @@ #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 ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc b/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc index 9ffe553b3..427cc2a28 100644 --- a/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/ko_KR/afs_cpa.rc @@ -26,7 +26,21 @@ #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 diff --git a/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc b/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc index 43069d0e1..5eb94ebf5 100644 --- a/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/pt_BR/afs_cpa.rc @@ -26,7 +26,21 @@ #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 diff --git a/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc b/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc index cc1268e7f..b3b122049 100644 --- a/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/zh_CN/afs_cpa.rc @@ -27,7 +27,21 @@ 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 diff --git a/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc b/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc index 009c3f6a2..b545f7bfd 100644 --- a/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc +++ b/src/WINNT/client_cpa/lang/zh_TW/afs_cpa.rc @@ -26,7 +26,21 @@ #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 diff --git a/src/WINNT/client_creds/afscreds_stub.rc b/src/WINNT/client_creds/afscreds_stub.rc index 9aec0c988..727e9a099 100644 --- a/src/WINNT/client_creds/afscreds_stub.rc +++ b/src/WINNT/client_creds/afscreds_stub.rc @@ -10,6 +10,8 @@ #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" diff --git a/src/WINNT/client_creds/lang/de_DE/afscreds.rc b/src/WINNT/client_creds/lang/de_DE/afscreds.rc index 163826720..6ad916cdd 100644 --- a/src/WINNT/client_creds/lang/de_DE/afscreds.rc +++ b/src/WINNT/client_creds/lang/de_DE/afscreds.rc @@ -29,6 +29,19 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US ///////////////////////////////////////////////////////////////////////////// // +// 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 // diff --git a/src/WINNT/client_creds/lang/en_US/afscreds.rc b/src/WINNT/client_creds/lang/en_US/afscreds.rc index 328264975..96ec62358 100644 --- a/src/WINNT/client_creds/lang/en_US/afscreds.rc +++ b/src/WINNT/client_creds/lang/en_US/afscreds.rc @@ -36,6 +36,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #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" diff --git a/src/WINNT/client_creds/lang/es_ES/afscreds.rc b/src/WINNT/client_creds/lang/es_ES/afscreds.rc index 41bb0bc6d..d9e8f2842 100644 --- a/src/WINNT/client_creds/lang/es_ES/afscreds.rc +++ b/src/WINNT/client_creds/lang/es_ES/afscreds.rc @@ -26,6 +26,19 @@ #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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_creds/lang/ja_JP/afscreds.rc b/src/WINNT/client_creds/lang/ja_JP/afscreds.rc index 48b1af347..3e92ac7f9 100644 --- a/src/WINNT/client_creds/lang/ja_JP/afscreds.rc +++ b/src/WINNT/client_creds/lang/ja_JP/afscreds.rc @@ -29,6 +29,19 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT ///////////////////////////////////////////////////////////////////////////// // +// 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 // diff --git a/src/WINNT/client_creds/lang/ko_KR/afscreds.rc b/src/WINNT/client_creds/lang/ko_KR/afscreds.rc index 85c5a3721..d6c5d5f7c 100644 --- a/src/WINNT/client_creds/lang/ko_KR/afscreds.rc +++ b/src/WINNT/client_creds/lang/ko_KR/afscreds.rc @@ -26,6 +26,19 @@ #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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_creds/lang/pt_BR/afscreds.rc b/src/WINNT/client_creds/lang/pt_BR/afscreds.rc index 66c518a94..ae3bb7809 100644 --- a/src/WINNT/client_creds/lang/pt_BR/afscreds.rc +++ b/src/WINNT/client_creds/lang/pt_BR/afscreds.rc @@ -26,6 +26,19 @@ #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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_creds/lang/zh_CN/afscreds.rc b/src/WINNT/client_creds/lang/zh_CN/afscreds.rc index 549c373cd..993fd25b3 100644 --- a/src/WINNT/client_creds/lang/zh_CN/afscreds.rc +++ b/src/WINNT/client_creds/lang/zh_CN/afscreds.rc @@ -26,6 +26,19 @@ #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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_creds/lang/zh_TW/afscreds.rc b/src/WINNT/client_creds/lang/zh_TW/afscreds.rc index 43c1cc16d..47b06a338 100644 --- a/src/WINNT/client_creds/lang/zh_TW/afscreds.rc +++ b/src/WINNT/client_creds/lang/zh_TW/afscreds.rc @@ -26,6 +26,19 @@ #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" ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_exp/afs_shl_ext_stub.rc b/src/WINNT/client_exp/afs_shl_ext_stub.rc index b54e243be..ab9ea5937 100644 --- a/src/WINNT/client_exp/afs_shl_ext_stub.rc +++ b/src/WINNT/client_exp/afs_shl_ext_stub.rc @@ -8,6 +8,9 @@ */ #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" diff --git a/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc b/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc index 43e795191..9d746e43d 100644 --- a/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/de_DE/afs_shl_ext.rc @@ -62,7 +62,22 @@ END #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 diff --git a/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc b/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc index f2d3d08ec..097b2d523 100644 --- a/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/en_US/afs_shl_ext.rc @@ -73,6 +73,10 @@ END #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" diff --git a/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc b/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc index f7ba1eca4..c4207a813 100644 --- a/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/es_ES/afs_shl_ext.rc @@ -62,6 +62,22 @@ END #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 ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc b/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc index 055ac4a56..0741e5b3a 100644 --- a/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/ja_JP/afs_shl_ext.rc @@ -63,6 +63,22 @@ END #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 diff --git a/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc b/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc index 2a7cf0023..0c50e92ed 100644 --- a/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/ko_KR/afs_shl_ext.rc @@ -62,6 +62,22 @@ END #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 ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc b/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc index 663f02092..4267e028c 100644 --- a/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/pt_BR/afs_shl_ext.rc @@ -62,6 +62,22 @@ END #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 ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc b/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc index 96867d7a0..6e4d7e184 100644 --- a/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/zh_CN/afs_shl_ext.rc @@ -62,6 +62,22 @@ END #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 ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc b/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc index 4c588d313..3814833d3 100644 --- a/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc +++ b/src/WINNT/client_exp/lang/zh_TW/afs_shl_ext.rc @@ -62,7 +62,22 @@ END #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 diff --git a/src/WINNT/client_osi/libosi.rc b/src/WINNT/client_osi/libosi.rc index 4f0a5a6b2..7850e64c5 100644 --- a/src/WINNT/client_osi/libosi.rc +++ b/src/WINNT/client_osi/libosi.rc @@ -4,6 +4,9 @@ /* 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" diff --git a/src/WINNT/client_osi/osi.h b/src/WINNT/client_osi/osi.h index 43b9aca34..58922d9a0 100644 --- a/src/WINNT/client_osi/osi.h +++ b/src/WINNT/client_osi/osi.h @@ -18,13 +18,46 @@ /* 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 */ diff --git a/src/WINNT/client_osi/osistatl.h b/src/WINNT/client_osi/osistatl.h index 52435ca7b..e881afb9c 100644 --- a/src/WINNT/client_osi/osistatl.h +++ b/src/WINNT/client_osi/osistatl.h @@ -12,7 +12,9 @@ #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 diff --git a/src/WINNT/client_osi/osiutils.c b/src/WINNT/client_osi/osiutils.c index 1f051fd08..848fe61f4 100644 --- a/src/WINNT/client_osi/osiutils.c +++ b/src/WINNT/client_osi/osiutils.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "osiutils.h" @@ -72,3 +73,75 @@ void __RPC_API MIDL_user_free(void *p) { 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 diff --git a/src/WINNT/eventlog/lang/afseventmsg.rc b/src/WINNT/eventlog/lang/afseventmsg.rc index c04a711ed..5b937f7a2 100644 --- a/src/WINNT/eventlog/lang/afseventmsg.rc +++ b/src/WINNT/eventlog/lang/afseventmsg.rc @@ -10,7 +10,10 @@ /* 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" diff --git a/src/WINNT/eventlog/lang/de_DE/event.mc b/src/WINNT/eventlog/lang/de_DE/event.mc index 86bc23765..21e0f5152 100644 --- a/src/WINNT/eventlog/lang/de_DE/event.mc +++ b/src/WINNT/eventlog/lang/de_DE/event.mc @@ -1,170 +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 für das AFS-Server-Ereignisprotokoll. -. - -MessageId= -Severity=Warning -SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS -Language=German -Testnachricht für 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 durchführen: 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 möglicherweise 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 möglicherweise 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 müssen 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änger auf das Beenden des AFS BOS-Servers. Überprüfen 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 */ +;/* 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 für das AFS-Server-Ereignisprotokoll. +. + +MessageId= +Severity=Warning +SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS +Language=German +Testnachricht für 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 durchführen: 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 möglicherweise 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 möglicherweise 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 müssen 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änger auf das Beenden des AFS BOS-Servers. Überprüfen 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 */ diff --git a/src/WINNT/eventlog/lang/es_ES/event.mc b/src/WINNT/eventlog/lang/es_ES/event.mc index fe46e4d14..9f457ac8f 100644 --- a/src/WINNT/eventlog/lang/es_ES/event.mc +++ b/src/WINNT/eventlog/lang/es_ES/event.mc @@ -1,178 +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 */ +;/* 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 */ diff --git a/src/WINNT/eventlog/lang/ja_JP/event.mc b/src/WINNT/eventlog/lang/ja_JP/event.mc index 17659b37d..4f33fc4e7 100644 --- a/src/WINNT/eventlog/lang/ja_JP/event.mc +++ b/src/WINNT/eventlog/lang/ja_JP/event.mc @@ -1,171 +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 ƒT[ƒo[EƒCƒxƒ“ƒgEƒƒOEƒeƒXƒgEƒƒbƒZ[ƒWB -. - -MessageId= -Severity=Warning -SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS -Language=Japanese -AFS ƒT[ƒo[EƒCƒxƒ“ƒgEƒƒOEƒeƒXƒgEƒƒbƒZ[ƒW (str1: %1, str2: %2)B -. - - - -; -;/* General messages for all AFS server processes */ -; - -MessageId=0x0101 -Severity=Error -SymbolicName=AFSEVT_SVR_FAILED_ASSERT -Language=Japanese -AFS ƒT[ƒo[EƒvƒƒZƒX‚ª‘ã“ü‚ÉŽ¸”s‚µ‚Ü‚µ‚½: s %1 ƒtƒ@ƒCƒ‹ %2B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR -Language=Japanese -%1 ‚ª AFS ƒ\ƒtƒgƒEƒFƒA‚̃Cƒ“ƒXƒg[ƒ‹EƒfƒBƒŒƒNƒgƒŠ[‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED -Language=Japanese -%1 ‚ª Windows Socket ƒ‰ƒCƒuƒ‰ƒŠ[‚ð‰Šú‰»‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B -. - - - -; -;/* AFS BOS control (startup/shutdown) service messages */ -; - -MessageId=0x0201 -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_STARTED -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ªŽn“®‚µ‚Ü‚µ‚½B -. - -MessageId= -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_STOPPED -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª’âŽ~‚µ‚Ü‚µ‚½B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ªƒVƒXƒeƒ€ SCM ‚ƒʐM‚Å‚«‚Ü‚¹‚ñB -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ªƒCƒxƒ“ƒgEƒnƒ“ƒhƒ‰[‚ð“o˜^‚Å‚«‚Ü‚¹‚ñBAFS ƒT[ƒo[Eƒ\ƒtƒgƒEƒFƒA‚ª³‚µ‚­\¬‚³‚ê‚Ä‚¢‚È‚¢‰Â”\«‚ª‚ ‚è‚Ü‚·B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª•K—v‚ȃVƒXƒeƒ€EƒŠƒ\[ƒX‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñB -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª“à•”ƒGƒ‰[‚ðŒŸo‚µ‚Ü‚µ‚½B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª AFS ƒ\ƒtƒgƒEƒFƒA‚̃Cƒ“ƒXƒg[ƒ‹EƒfƒBƒŒƒNƒgƒŠ[‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ‚Å‚µ‚½BAFS ƒT[ƒo[Eƒ\ƒtƒgƒEƒFƒA‚ª³‚µ‚­\¬‚³‚ê‚Ä‚¢‚È‚¢‰Â”\«‚ª‚ ‚è‚Ü‚·B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚ðŽn“®‚Ü‚½‚͍Ďn“®‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚ð’âŽ~‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BAFS ƒT[ƒo[EƒvƒƒZƒX‚ð‚·‚×‚ÄŽè“®‚Å’âŽ~‚·‚é•K—v‚ª‚ ‚è‚Ü‚· (AFS bosserver ‚É afskill ƒRƒ}ƒ“ƒh‚Å SIGQUIT ƒVƒOƒiƒ‹‚𑗐M‚µ‚Ä‚Ý‚Ä‚­‚¾‚³‚¢)B -. - -MessageId= -Severity=Warning -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚Ì’âŽ~‘Ò‚¿‚𒆎~‚µ‚Ü‚µ‚½BƒT[ƒrƒX‚ðÄŽn“®‚·‚é‘O‚ɁA‚·‚×‚Ä‚Ì AFS ƒT[ƒo[EƒvƒƒZƒX‚ª’âŽ~‚µ‚Ä‚¢‚邱‚Æ‚ðŠm‚©‚ß‚Ä‚­‚¾‚³‚¢B -. - -MessageId= -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚ðÄŽn“®‚µ‚Ä‚¢‚Ü‚·B -. - -MessageId= -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT -Language=Japanese -AFS BOS §ŒäƒT[ƒrƒX‚ªAAFS bosserver ‚ªÄŽn“®—v‹‚È‚µ‚ŏI—¹‚µ‚½‚±‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B -. - - - -; -;#endif /* TRANSARC_AFSEVENT_H */ +;/* 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 ƒT[ƒo[EƒCƒxƒ“ƒgEƒƒOEƒeƒXƒgEƒƒbƒZ[ƒWB +. + +MessageId= +Severity=Warning +SymbolicName=AFSEVT_SVR_TEST_MSG_TWOARGS +Language=Japanese +AFS ƒT[ƒo[EƒCƒxƒ“ƒgEƒƒOEƒeƒXƒgEƒƒbƒZ[ƒW (str1: %1, str2: %2)B +. + + + +; +;/* General messages for all AFS server processes */ +; + +MessageId=0x0101 +Severity=Error +SymbolicName=AFSEVT_SVR_FAILED_ASSERT +Language=Japanese +AFS ƒT[ƒo[EƒvƒƒZƒX‚ª‘ã“ü‚ÉŽ¸”s‚µ‚Ü‚µ‚½: s %1 ƒtƒ@ƒCƒ‹ %2B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_NO_INSTALL_DIR +Language=Japanese +%1 ‚ª AFS ƒ\ƒtƒgƒEƒFƒA‚̃Cƒ“ƒXƒg[ƒ‹EƒfƒBƒŒƒNƒgƒŠ[‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED +Language=Japanese +%1 ‚ª Windows Socket ƒ‰ƒCƒuƒ‰ƒŠ[‚ð‰Šú‰»‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B +. + + + +; +;/* AFS BOS control (startup/shutdown) service messages */ +; + +MessageId=0x0201 +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_STARTED +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ªŽn“®‚µ‚Ü‚µ‚½B +. + +MessageId= +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_STOPPED +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª’âŽ~‚µ‚Ü‚µ‚½B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ªƒVƒXƒeƒ€ SCM ‚ƒʐM‚Å‚«‚Ü‚¹‚ñB +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ªƒCƒxƒ“ƒgEƒnƒ“ƒhƒ‰[‚ð“o˜^‚Å‚«‚Ü‚¹‚ñBAFS ƒT[ƒo[Eƒ\ƒtƒgƒEƒFƒA‚ª³‚µ‚­\¬‚³‚ê‚Ä‚¢‚È‚¢‰Â”\«‚ª‚ ‚è‚Ü‚·B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_INSUFFICIENT_RESOURCES +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª•K—v‚ȃVƒXƒeƒ€EƒŠƒ\[ƒX‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñB +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª“à•”ƒGƒ‰[‚ðŒŸo‚µ‚Ü‚µ‚½B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª AFS ƒ\ƒtƒgƒEƒFƒA‚̃Cƒ“ƒXƒg[ƒ‹EƒfƒBƒŒƒNƒgƒŠ[‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ‚Å‚µ‚½BAFS ƒT[ƒo[Eƒ\ƒtƒgƒEƒFƒA‚ª³‚µ‚­\¬‚³‚ê‚Ä‚¢‚È‚¢‰Â”\«‚ª‚ ‚è‚Ü‚·B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_START_FAILED +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚ðŽn“®‚Ü‚½‚͍Ďn“®‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚ð’âŽ~‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BAFS ƒT[ƒo[EƒvƒƒZƒX‚ð‚·‚×‚ÄŽè“®‚Å’âŽ~‚·‚é•K—v‚ª‚ ‚è‚Ü‚· (AFS bosserver ‚É afskill ƒRƒ}ƒ“ƒh‚Å SIGQUIT ƒVƒOƒiƒ‹‚𑗐M‚µ‚Ä‚Ý‚Ä‚­‚¾‚³‚¢)B +. + +MessageId= +Severity=Warning +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚Ì’âŽ~‘Ò‚¿‚𒆎~‚µ‚Ü‚µ‚½BƒT[ƒrƒX‚ðÄŽn“®‚·‚é‘O‚ɁA‚·‚×‚Ä‚Ì AFS ƒT[ƒo[EƒvƒƒZƒX‚ª’âŽ~‚µ‚Ä‚¢‚邱‚Æ‚ðŠm‚©‚ß‚Ä‚­‚¾‚³‚¢B +. + +MessageId= +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ª AFS bosserver ‚ðÄŽn“®‚µ‚Ä‚¢‚Ü‚·B +. + +MessageId= +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT +Language=Japanese +AFS BOS §ŒäƒT[ƒrƒX‚ªAAFS bosserver ‚ªÄŽn“®—v‹‚È‚µ‚ŏI—¹‚µ‚½‚±‚Æ‚ðŒŸo‚µ‚Ü‚µ‚½B +. + + + +; +;#endif /* TRANSARC_AFSEVENT_H */ diff --git a/src/WINNT/eventlog/lang/ko_KR/event.mc b/src/WINNT/eventlog/lang/ko_KR/event.mc index 23dcd6f7b..1ba257b35 100644 --- a/src/WINNT/eventlog/lang/ko_KR/event.mc +++ b/src/WINNT/eventlog/lang/ko_KR/event.mc @@ -1,175 +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 */ +;/* 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 */ diff --git a/src/WINNT/eventlog/lang/pt_BR/event.mc b/src/WINNT/eventlog/lang/pt_BR/event.mc index 50747577b..93ad68e0f 100644 --- a/src/WINNT/eventlog/lang/pt_BR/event.mc +++ b/src/WINNT/eventlog/lang/pt_BR/event.mc @@ -1,170 +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ão conseguiu localizar o diretório de instalação para o software de AFS. -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED -Language=English -%1 não 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ço de controle BOS do AFS foi iniciado. -. - -MessageId= -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_STOPPED -Language=English -O serviço de controle BOS do AFS foi interrompido. -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED -Language=English -O serviço de controle BOS do AFS não consegue se comunicar com o SCM do sistema. -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED -Language=English -O serviço de controle BOS do AFS não 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ço de controle BOS do AFS não consegue obter recursos necessários do sistema. -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR -Language=English -O serviço de controle BOS do AFS sofreu um erro interno. -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR -Language=English -O serviço de controle BOS do AFS não conseguiu localizar o diretório 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ço de controle BOS do AFS não conseguiu iniciar ou reiniciar o AFS bosserver. -. - -MessageId= -Severity=Error -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED -Language=English -O serviço de controle BOS do AFS não 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és do comando afskill). -. - -MessageId= -Severity=Warning -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT -Language=English -O serviço 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ço. -. - -MessageId= -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART -Language=English -O serviço de controle BOS do AFS está reiniciando o AFS bosserver. -. - -MessageId= -Severity=Informational -SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT -Language=English -O serviço de controle BOS do AFS detectou que o AFS bosserver saiu sem pedir um reinício. -. - - - -; -;#endif /* TRANSARC_AFSEVENT_H */ +;/* 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ão conseguiu localizar o diretório de instalação para o software de AFS. +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_WINSOCK_INIT_FAILED +Language=English +%1 não 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ço de controle BOS do AFS foi iniciado. +. + +MessageId= +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_STOPPED +Language=English +O serviço de controle BOS do AFS foi interrompido. +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_SCM_COMM_FAILED +Language=English +O serviço de controle BOS do AFS não consegue se comunicar com o SCM do sistema. +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_HANDLER_REG_FAILED +Language=English +O serviço de controle BOS do AFS não 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ço de controle BOS do AFS não consegue obter recursos necessários do sistema. +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_INTERNAL_ERROR +Language=English +O serviço de controle BOS do AFS sofreu um erro interno. +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_NO_INSTALL_DIR +Language=English +O serviço de controle BOS do AFS não conseguiu localizar o diretório 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ço de controle BOS do AFS não conseguiu iniciar ou reiniciar o AFS bosserver. +. + +MessageId= +Severity=Error +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_FAILED +Language=English +O serviço de controle BOS do AFS não 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és do comando afskill). +. + +MessageId= +Severity=Warning +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_STOP_TIMEOUT +Language=English +O serviço 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ço. +. + +MessageId= +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_RESTART +Language=English +O serviço de controle BOS do AFS está reiniciando o AFS bosserver. +. + +MessageId= +Severity=Informational +SymbolicName=AFSEVT_SVR_BCS_BOSSERVER_EXIT +Language=English +O serviço de controle BOS do AFS detectou que o AFS bosserver saiu sem pedir um reinício. +. + + + +; +;#endif /* TRANSARC_AFSEVENT_H */ diff --git a/src/WINNT/eventlog/lang/zh_CN/event.mc b/src/WINNT/eventlog/lang/zh_CN/event.mc index 575da8fec..447114f30 100644 --- a/src/WINNT/eventlog/lang/zh_CN/event.mc +++ b/src/WINNT/eventlog/lang/zh_CN/event.mc @@ -1,172 +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 */ +;/* 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 */ diff --git a/src/WINNT/eventlog/lang/zh_TW/event.mc b/src/WINNT/eventlog/lang/zh_TW/event.mc index 08f59035f..46bebd678 100644 --- a/src/WINNT/eventlog/lang/zh_TW/event.mc +++ b/src/WINNT/eventlog/lang/zh_TW/event.mc @@ -1,172 +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 */ +;/* 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 */ diff --git a/src/WINNT/install/InstallShield5/NTMakefile b/src/WINNT/install/InstallShield5/NTMakefile index 498daa220..a792608c6 100644 --- a/src/WINNT/install/InstallShield5/NTMakefile +++ b/src/WINNT/install/InstallShield5/NTMakefile @@ -30,6 +30,15 @@ XCOPY= xcopy /s/e #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,7 +59,8 @@ prep: AFS_component_version_number.txt CreateISDirTree.bat ScatterFiles.bat CreateGeneratedFiles.bat - CompileScript.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\." diff --git a/src/WINNT/pthread/pthread.rc b/src/WINNT/pthread/pthread.rc index 9a51bd241..4f26bcff2 100644 --- a/src/WINNT/pthread/pthread.rc +++ b/src/WINNT/pthread/pthread.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/WINNT/pthread/pthread95.rc b/src/WINNT/pthread/pthread95.rc index 80a6f1d95..c9cf5a43c 100644 --- a/src/WINNT/pthread/pthread95.rc +++ b/src/WINNT/pthread/pthread95.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/afs/DARWIN/osi_vfsops.c b/src/afs/DARWIN/osi_vfsops.c index 6197f103d..e42887df8 100644 --- a/src/afs/DARWIN/osi_vfsops.c +++ b/src/afs/DARWIN/osi_vfsops.c @@ -1,7 +1,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vfsops.c,v 1.1.1.5 2002/05/10 23:43:37 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vfsops.c,v 1.1.1.6 2003/07/30 17:08:05 hartmans Exp $"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ @@ -67,7 +67,7 @@ struct proc *p; AFS_GLOCK(); AFS_STATCNT(afs_mount); - if (afs_globalVFS) { /* Don't allow remounts. */ + if (data == NULL && afs_globalVFS) { /* Don't allow remounts. */ AFS_GUNLOCK(); return (EBUSY); } @@ -80,8 +80,51 @@ struct proc *p; (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. */ + + 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,8 +140,23 @@ struct proc *p; AFS_GLOCK(); AFS_STATCNT(afs_unmount); - afs_globalVFS = 0; - afs_shutdown(); + + 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,18 +177,24 @@ afs_root(struct mount *mp, pcred_unlock(p); AFS_GLOCK(); AFS_STATCNT(afs_root); - if (afs_globalVp && (afs_globalVp->states & CStatd)) { + 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(&afs_rootFid, &treq, (afs_int32 *)0, + tvp = afs_GetVCache(rootFid, &treq, (afs_int32 *)0, (struct vcache*)0, WRITE_LOCK); /* we really want this to stay around */ if (tvp) { - afs_globalVp = tvp; + if (mp->mnt_data == NULL) + afs_globalVp = tvp; } else error = ENOENT; } @@ -140,9 +204,12 @@ afs_root(struct mount *mp, AFS_GUNLOCK(); vn_lock(AFSTOV(tvp), LK_EXCLUSIVE | LK_RETRY, p); AFS_GLOCK(); - afs_globalVFS = mp; + 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,7 +232,7 @@ int lfl; } error = vget(vp, lfl, current_proc()); if (!error) - insmntque(vp, afs_globalVFS); /* take off free list */ + insmntque(vp, mp); /* take off free list */ return error; } diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c index 084c26f13..f32d0047b 100644 --- a/src/afs/DARWIN/osi_vnodeops.c +++ b/src/afs/DARWIN/osi_vnodeops.c @@ -1,7 +1,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.1.1.8 2003/04/13 19:02:42 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.1.1.9 2003/07/30 17:08:05 hartmans Exp $"); #include /* Standard vendor system headers */ #include /* Afs-based standard headers */ @@ -173,6 +173,7 @@ struct vop_lookup_args /* { 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,6 +238,7 @@ afs_vop_create(ap) 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,11 +812,6 @@ afs_vop_link(ap) 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; @@ -858,25 +855,6 @@ afs_vop_rename(ap) register struct vnode *fdvp = ap->a_fdvp; 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. @@ -885,7 +863,18 @@ abortit: if (fvp == tvp) { if (fvp->v_type == VDIR) { error = EINVAL; - goto abortit; + 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,6 +957,7 @@ afs_vop_mkdir(ap) } 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; diff --git a/src/afs/HPUX/osi_groups.c b/src/afs/HPUX/osi_groups.c index 46e7ab737..20d28d146 100644 --- a/src/afs/HPUX/osi_groups.c +++ b/src/afs/HPUX/osi_groups.c @@ -16,7 +16,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_groups.c,v 1.1.1.4 2001/07/14 22:19:38 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_groups.c,v 1.1.1.5 2003/07/30 17:08:07 hartmans Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" @@ -133,6 +133,9 @@ afs_setgroups( int *gp; struct ucred *newcr; ulong_t s; +#if defined(AFS_HPUX110_ENV) + register ulong_t context; +#endif AFS_STATCNT(afs_setgroups); @@ -147,8 +150,14 @@ afs_setgroups( /* 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,8 +177,12 @@ afs_setgroups( } 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); } diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h index 2ea602166..e7b8312f4 100644 --- a/src/afs/HPUX/osi_machdep.h +++ b/src/afs/HPUX/osi_machdep.h @@ -49,10 +49,15 @@ extern struct timeval time; * 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,6 +69,11 @@ extern void afsHashRelease(tid_t key); #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,6 +85,7 @@ extern void afsHashRelease(tid_t key); #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,13 +93,32 @@ extern void afsHashRelease(tid_t key); #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_ */ diff --git a/src/afs/HPUX/osi_sleep.c b/src/afs/HPUX/osi_sleep.c index 51be8af01..1e123ad4d 100644 --- a/src/afs/HPUX/osi_sleep.c +++ b/src/afs/HPUX/osi_sleep.c @@ -10,7 +10,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_sleep.c,v 1.1.1.4 2001/07/14 22:19:39 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_sleep.c,v 1.1.1.5 2003/07/30 17:08:07 hartmans Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ @@ -18,8 +18,9 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_sleep.c,v 1.1.1.4 2001/07/ - +#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,10 +31,14 @@ static int afs_osi_CallProc(aproc, arock, ams) 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,17 +50,34 @@ static int afs_osi_CancelProc(aproc, arock) 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,7 +94,11 @@ void afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle) 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,6 +109,10 @@ int afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok) { 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,12 +122,24 @@ int afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok) 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,3 +148,27 @@ int afs_osi_Wait(afs_int32 ams, struct afs_osi_WaitHandle *ahandle, int aintok) } 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 + diff --git a/src/afs/HPUX/osi_vfsops.c b/src/afs/HPUX/osi_vfsops.c index 74504338a..15aca3888 100644 --- a/src/afs/HPUX/osi_vfsops.c +++ b/src/afs/HPUX/osi_vfsops.c @@ -13,7 +13,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_vfsops.c,v 1.1.1.5 2002/05/10 23:43:50 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_vfsops.c,v 1.1.1.6 2003/07/30 17:08:07 hartmans Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ @@ -182,6 +182,9 @@ struct vfsops Afs_vfsops = { 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,6 +193,7 @@ sema_t afs_global_sema = { , 0, 0, 0, NULL #endif }; +#endif void osi_InitGlock() @@ -200,8 +204,12 @@ osi_InitGlock() 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); } diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c index a39858b9f..b579afcbc 100644 --- a/src/afs/HPUX/osi_vnodeops.c +++ b/src/afs/HPUX/osi_vnodeops.c @@ -12,7 +12,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_vnodeops.c,v 1.1.1.7 2002/12/11 02:36:12 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/HPUX/osi_vnodeops.c,v 1.1.1.8 2003/07/30 17:08:08 hartmans Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ @@ -49,7 +49,20 @@ extern int afs_close(); #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,6 +105,7 @@ m_cpytoc(m, off, len, cp) return (len); } +#endif /* * Note that the standard Sun vnode interface doesn't haven't an vop_lockf(), so this code is @@ -160,7 +174,11 @@ afs_lockf( vp, flag, len, cred, fp, LB, UB ) } -#include "../machine/vmparam.h" /* For KERNELSPACE */ +#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,7 +1280,11 @@ retry: 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,12 +1652,21 @@ afs_pageout(vp,prp, start, end, flags) */ 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,7 +1920,11 @@ afs_swapfs_len(bp) 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,7 +1958,11 @@ int 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,6 +1984,7 @@ afs_read_ahead(vp, prp, wrt, space, vaddr, rhead_cnt) 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,9 +2024,19 @@ afs_ioctl(vp, com, data, flag, cred) 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) diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c index c374a3575..37dd1acb2 100644 --- a/src/afs/LINUX/osi_alloc.c +++ b/src/afs/LINUX/osi_alloc.c @@ -14,7 +14,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_alloc.c,v 1.1.1.11 2002/08/02 04:28:55 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_alloc.c,v 1.1.1.12 2003/07/30 17:08:09 hartmans Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" @@ -188,7 +188,7 @@ hash_verify(size_t index, unsigned key, void *data) int memtype; memtype = MEMTYPE(lmp->chunk); -#ifdef AFS_SPARC64_LINUX24_ENV +#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); } diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c index ff97f1953..3f2c11f38 100644 --- a/src/afs/LINUX/osi_groups.c +++ b/src/afs/LINUX/osi_groups.c @@ -16,7 +16,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_groups.c,v 1.1.1.11 2003/04/13 19:02:45 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_groups.c,v 1.1.1.12 2003/07/30 17:08:10 hartmans Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" @@ -113,7 +113,7 @@ int setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag, int change_pare extern long (*sys_setgroupsp)(int gidsetsize, gid_t *grouplist); asmlinkage long afs_xsetgroups(int gidsetsize, gid_t *grouplist) { - int code; + long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; @@ -137,15 +137,16 @@ asmlinkage long afs_xsetgroups(int gidsetsize, gid_t *grouplist) crfree(cr); unlock_kernel(); - return code; + /* Linux syscall ABI returns errno as negative */ + 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) +extern long (*sys_setgroups32p)(int gidsetsize, gid_t *grouplist); +asmlinkage long afs_xsetgroups32(int gidsetsize, gid_t *grouplist) { - int code; + long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; @@ -156,6 +157,7 @@ asmlinkage int afs_xsetgroups32(int gidsetsize, gid_t *grouplist) unlock_kernel(); code = (*sys_setgroups32p)(gidsetsize, grouplist); + if (code) { return code; } @@ -169,16 +171,17 @@ asmlinkage int afs_xsetgroups32(int gidsetsize, gid_t *grouplist) crfree(cr); unlock_kernel(); - return code; + /* Linux syscall ABI returns errno as negative */ + return (- code); } #endif -#if defined(AFS_SPARC64_LINUX20_ENV) +#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_AMD64_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) +extern long (*sys32_setgroupsp)(int gidsetsize, old_gid_t *grouplist); +asmlinkage long afs32_xsetgroups(int gidsetsize, old_gid_t *grouplist) { - int code; + long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; @@ -202,14 +205,15 @@ asmlinkage int afs32_xsetgroups(int gidsetsize, __kernel_gid_t32 *grouplist) crfree(cr); unlock_kernel(); - return code; + /* Linux syscall ABI returns errno as negative */ + 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) +extern long (*sys32_setgroups32p)(int gidsetsize, gid_t *grouplist); +asmlinkage long afs32_xsetgroups32(int gidsetsize, gid_t *grouplist) { - int code; + long code; cred_t *cr = crref(); afs_uint32 junk; int old_pag; @@ -233,7 +237,8 @@ asmlinkage int afs32_xsetgroups32(int gidsetsize, __kernel_gid_t32 *grouplist) crfree(cr); unlock_kernel(); - return code; + /* Linux syscall ABI returns errno as negative */ + return (- code); } #endif #endif diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index dbc5ce85c..610daced5 100644 --- a/src/afs/LINUX/osi_vfsops.c +++ b/src/afs/LINUX/osi_vfsops.c @@ -15,7 +15,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vfsops.c,v 1.1.1.13 2002/08/02 04:28:57 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vfsops.c,v 1.1.1.14 2003/07/30 17:08:10 hartmans Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" @@ -31,6 +31,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/afs/LINUX/osi_vfsops.c,v 1.1.1.13 2002/ 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,6 +270,7 @@ void afs_put_super(struct super_block *sbp) afs_globalVFS = 0; afs_globalVp = 0; afs_shutdown(); + path_release(&afs_cacheNd); osi_linux_verify_alloced_memory(); done: @@ -336,9 +338,7 @@ int afs_statfs(struct super_block *sbp, struct statfs *statp, int size) void afs_umount_begin(struct super_block *sbp) { - afs_put_super(sbp); afs_shuttingdown=1; - afs_was_mounted=0; } #if defined(AFS_LINUX24_ENV) @@ -348,7 +348,7 @@ struct super_operations afs_sops = { delete_inode: afs_delete_inode, put_super: afs_put_super, statfs: afs_statfs, - umount_begin: NULL /* afs_umount_begin */ + umount_begin: afs_umount_begin }; #else struct super_operations afs_sops = { @@ -362,7 +362,7 @@ struct super_operations afs_sops = { afs_statfs, NULL, /* afs_remount_fs - see doc above */ NULL, /* afs_clear_inode */ - NULL /* afs_umount_begin */ + afs_umount_begin }; #endif diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c index feb994902..337eca28b 100644 --- a/src/afs/SOLARIS/osi_vfsops.c +++ b/src/afs/SOLARIS/osi_vfsops.c @@ -13,7 +13,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/SOLARIS/osi_vfsops.c,v 1.1.1.10 2002/05/10 23:44:13 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/SOLARIS/osi_vfsops.c,v 1.1.1.11 2003/07/30 17:08:11 hartmans Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ @@ -431,7 +431,7 @@ _init() printf("misc/nfssrv module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } -#else +#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,9 +440,10 @@ _init() printf("fs/nfs module must be loaded before loading afs with nfs-xlator\n"); return (ENOSYS); } -#endif -#endif -#endif +#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,14 +456,12 @@ _init() #ifdef AFS_SUN53_ENV #ifndef SYSBINDFILE #define SYSBINDFILE "/etc/name_to_sysnum" -#endif +#endif /* SYSBINDFILE */ read_binding_file(SYSBINDFILE, sb_hashtab); -#else +#else /* !AFS_SUN53_ENV */ read_binding_file(sysbind, sb_hashtab); -#endif -#if !defined(AFS_SUN58_ENV) +#endif /* AFS_SUN53_ENV */ make_syscallname("afs", AFS_SYSCALL); -#endif if (sysent[AFS_SYSCALL].sy_call == nosys) { if ((sysn = mod_getsysname(AFS_SYSCALL)) != NULL) { @@ -471,11 +470,12 @@ _init() rw_init(sysent[AFS_SYSCALL].sy_lock, "afs_syscall", #ifdef AFS_SUN57_ENV RW_DEFAULT, NULL); -#else +#else /* !AFS_SUN57_ENV */ RW_DEFAULT, DEFAULT_WT); -#endif +#endif /* AFS_SUN57_ENV */ } } +#endif /* !AFS_SUN58_ENV */ osi_Init(); /* initialize global lock, etc */ diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index af39ae4e6..65e3349d0 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -21,7 +21,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.1.1.11 2002/09/26 18:58:21 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.1.1.12 2003/07/30 17:08:13 hartmans Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ @@ -33,6 +33,9 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.1.1.11 2 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,6 +67,23 @@ afs_CopyOutAttrs(avc, attrs) 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,6 +163,11 @@ afs_CopyOutAttrs(avc, attrs) #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. diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c index 3f54ac699..106cdf964 100644 --- a/src/afs/afs_analyze.c +++ b/src/afs/afs_analyze.c @@ -13,7 +13,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_analyze.c,v 1.1.1.10 2003/04/13 19:02:33 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_analyze.c,v 1.1.1.11 2003/07/30 17:07:57 hartmans Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ @@ -129,6 +129,17 @@ afs_CheckCode(acode, areq, where) 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,6 +395,9 @@ int afs_Analyze(aconn, acode, afid, areq, op, locktype, cellp) } else { VSleep(afs_BusyWaitPeriod); /* poll periodically */ } + if (shouldRetry != 0) + areq->busyCount++; + return shouldRetry; /* should retry */ } diff --git a/src/afs/afs_cell.c b/src/afs/afs_cell.c index b6f72d864..159281b8e 100644 --- a/src/afs/afs_cell.c +++ b/src/afs/afs_cell.c @@ -13,7 +13,7 @@ #include #include "afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_cell.c,v 1.1.1.12 2003/04/13 19:02:34 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_cell.c,v 1.1.1.13 2003/07/30 17:07:58 hartmans Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -160,7 +160,7 @@ void afs_LookupAFSDB(char *acellName) 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 (code && code != EEXIST) goto done; /* If we found an alias, create it */ if (afs_strcasecmp(acellName, realName)) @@ -657,7 +657,7 @@ afs_int32 afs_NewCell(char *acellName, afs_int32 *acellHosts, int aflags, * it must get servers from AFSDB. */ if (timeout && !tc->timeout && tc->cellHosts[0]) { - code = EINVAL; + code = EEXIST; /* This code is checked for in afs_LookupAFSDB */ goto bad; } diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c index 7230f6eea..d8aeb9a04 100644 --- a/src/afs/afs_conn.c +++ b/src/afs/afs_conn.c @@ -13,13 +13,15 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_conn.c,v 1.1.1.8 2002/09/26 18:57:50 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_conn.c,v 1.1.1.9 2003/07/30 17:07:59 hartmans 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 diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index 3e145e632..4e72d16bf 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -13,7 +13,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_dcache.c,v 1.1.1.9 2003/04/13 19:02:35 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_dcache.c,v 1.1.1.10 2003/07/30 17:07:59 hartmans Exp $"); #include "../afs/sysincludes.h" /*Standard vendor system headers*/ #include "../afs/afsincludes.h" /*AFS-based standard headers*/ @@ -182,7 +182,7 @@ afs_StoreWarn(acode, avolume, aflags) afs_warnuser(problem_fmt, avolume, partfull); } else -#ifndef AFS_SUN5_ENV +#ifdef EDQUOT /* EDQUOT doesn't exist on solaris and won't be sent by the server. * Instead ENOSPC will be sent... */ diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index f96ad25fd..6936ff39b 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -10,7 +10,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_osi.c,v 1.1.1.13 2003/04/13 19:02:36 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_osi.c,v 1.1.1.14 2003/07/30 17:08:00 hartmans Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ @@ -399,12 +399,18 @@ afs_osi_SetTime(atv) #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 { diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index bab5973aa..a40a8acc6 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -32,13 +32,15 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_server.c,v 1.1.1.14 2003/04/13 19:02:38 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_server.c,v 1.1.1.15 2003/07/30 17:08:01 hartmans 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 diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index d5c2581cd..27e70f086 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -13,13 +13,15 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_user.c,v 1.1.1.8 2002/09/26 18:57:57 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_user.c,v 1.1.1.9 2003/07/30 17:08:02 hartmans 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,7 +612,7 @@ void afs_GCPAGs_perproc_func(AFS_PROC *pproc) afs_GCPAGs_cred_count++; pag = PagInCred(pcred); -#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD40_ENV) +#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); diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index 84b314509..80428e244 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -15,13 +15,15 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_util.c,v 1.1.1.9 2003/04/13 19:02:39 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_util.c,v 1.1.1.10 2003/07/30 17:08:02 hartmans 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,7 +150,11 @@ extern afs_int32 afs_showflags; 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); diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 48374871d..05608e79a 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -38,7 +38,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_vcache.c,v 1.1.1.16 2003/04/13 19:02:39 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_vcache.c,v 1.1.1.17 2003/07/30 17:08:02 hartmans Exp $"); #include "../afs/sysincludes.h" /*Standard vendor system headers*/ #include "../afs/afsincludes.h" /*AFS-based standard headers*/ @@ -1062,6 +1062,9 @@ struct vcache *afs_NewVCache(struct VenusFid *afid, struct server *serverp, #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); init_waitqueue(&ip->i_wait); diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index 6bc8d910a..45734c716 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -18,13 +18,15 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_volume.c,v 1.1.1.12 2003/04/13 19:02:39 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_volume.c,v 1.1.1.13 2003/07/30 17:08:02 hartmans 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 diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h index 5f5d0aab6..4539cf9d2 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -219,6 +219,9 @@ typedef unsigned short etap_event_t; 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,7 +273,9 @@ MALLOC_DECLARE(M_AFS); #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" diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index 9d4ab4542..1a628cf90 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -30,8 +30,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = -g ${XLDFLAGS} +CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +LDFLAGS = ${XLDFLAGS} INSTALLex = ${INSTALL} -m 755 @@ -49,15 +49,17 @@ AFSLIBS=${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libsys.a ${ 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 ;; \ + ${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} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} /usr/lib32/libdwarf.a /usr/lib32/libelf.a ;; \ + ${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} -g -o afsd afsd.o $(NON_SHARED) $(LDFLAGS) $(AFSLIBS) ${XLIBS} ;; \ + ${CC} ${CFLAGS} -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} + $(CC) -o vsys vsys.o ${TOP_LIBDIR}/libsys.a $(LDFLAGS) ${XLIBS} # # Objects @@ -109,6 +111,9 @@ dest: ${DEST}/root.client/usr/vice/etc/afsd ${DEST}/etc/vsys ${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 ;;\ diff --git a/src/afsd/afs.rc.darwin b/src/afsd/afs.rc.darwin index a8240b39d..ed95303ab 100644 --- a/src/afsd/afs.rc.darwin +++ b/src/afsd/afs.rc.darwin @@ -43,7 +43,7 @@ fi # Need the commands ps, awk, kill, sleep PATH=${PATH}${PATH:+:}/sbin:/bin:/usr/bin -if $KMODSTAT | grep -q openafs ; then +if $KMODSTAT | perl -e 'exit not grep /openafs/, <>' ; then : else if [ -d $VICEETC/afs.kext ]; then @@ -54,7 +54,7 @@ else exit 1 fi fi -if $KMODSTAT | grep -q openafs ; then +if $KMODSTAT | perl -e 'exit not grep /openafs/, <>' ; then : else echo "AFS kernel extensions failed to initialize. Skipping AFS startup." diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 2abe4a899..b6b2c0ea6 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -55,7 +55,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/afsd/afsd.c,v 1.1.1.17 2003/04/13 19:05:54 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/afsd/afsd.c,v 1.1.1.18 2003/07/30 17:11:08 hartmans Exp $"); #define VFS 1 @@ -146,6 +146,27 @@ void set_staticaddrs(void); #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,6 +267,7 @@ static int enable_afsdb = 0; /* enable AFSDB support */ #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,6 +1365,10 @@ mainproc(as, arock) /* -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,6 +1837,8 @@ mainproc(as, arock) 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,6 +1921,8 @@ mainproc(as, arock) HandleMTab(); + } + if (afsd_rmtsys) { if (afsd_verbose) printf("%s: Forking 'rmtsys' daemon.\n", rn); @@ -1956,6 +1986,7 @@ char **argv; { 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,6 +2060,18 @@ static int HandleMTab() { #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,7 +2088,7 @@ long param1, param2, param3, param4, param5, param6, param7; eparm[2] = param6; eparm[3] = param7; - param4 = eparm; + param4 = (long) eparm; #endif error = syscall(AFS_SYSCALL, AFSCALL_CALL, param1, param2, param3, param4, param5, param6, param7); diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in index 213ed29ba..017166409 100644 --- a/src/afsmonitor/Makefile.in +++ b/src/afsmonitor/Makefile.in @@ -29,7 +29,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=-g -I. \ +CFLAGS=${DBG} -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in index d6936dafc..5fdc240fa 100644 --- a/src/afsweb/Makefile.in +++ b/src/afsweb/Makefile.in @@ -28,7 +28,7 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} -UKERNELDIR=../libuafs/ +UKERNELDIR=../libuafs COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et UKSRCS=nsafs.h nsafs.c securehash.c diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c index 4b54607a4..2846af180 100644 --- a/src/auth/cellconfig.c +++ b/src/auth/cellconfig.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/auth/cellconfig.c,v 1.1.1.13 2002/09/26 19:04:53 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/auth/cellconfig.c,v 1.1.1.14 2003/07/30 17:11:21 hartmans Exp $"); #include #include @@ -512,6 +512,7 @@ char clones[]; 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,7 +786,7 @@ int afsconf_GetAfsdbInfo(acellName, aservice, acellInfo) if (aservice) { LOCK_GLOBAL_MUTEX tservice = afsconf_FindService(aservice); - UNLOCK_GLOBAL_MUTEX + UNLOCK_GLOBAL_MUTEX if (tservice < 0) { return AFSCONF_NOTFOUND; /* service not found */ } @@ -1023,8 +1024,10 @@ struct afsconf_keys *astr; LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); - if (code) + if (code) { + UNLOCK_GLOBAL_MUTEX return AFSCONF_FAILURE; + } memcpy(astr, adir->keystr, sizeof(struct afsconf_keys)); UNLOCK_GLOBAL_MUTEX return 0; @@ -1045,8 +1048,10 @@ afs_int32 afsconf_GetLatestKey(adir, avno, akey) LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); - if (code) + if (code) { + UNLOCK_GLOBAL_MUTEX return AFSCONF_FAILURE; + } maxa = adir->keystr->nkeys; best = -1; /* highest kvno we've seen yet */ @@ -1080,8 +1085,10 @@ char *akey; LOCK_GLOBAL_MUTEX code = afsconf_Check(adir); - if (code) + if (code) { + UNLOCK_GLOBAL_MUTEX return AFSCONF_FAILURE; + } maxa = adir->keystr->nkeys; for(tk = adir->keystr->key,i=0;i #endif -RCSID("$Header: /tmp/cvstemp/openafs/src/auth/ktc.c,v 1.1.1.8 2002/01/22 19:52:29 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/auth/ktc.c,v 1.1.1.9 2003/07/30 17:11:22 hartmans Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" @@ -131,7 +131,10 @@ static struct flock fileUlock = { F_UNLCK, 0, 0, 0, 0 }; */ 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(); +int afs_tf_dest_tkt(); +/* except ktc_LocalCell which is still static + */ +static int ktc_LocalCell(); char *ktc_tkt_string(); #endif /* AFS_KERBEROS_ENV */ diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in index b6c00e4cd..c48b800c1 100644 --- a/src/bozo/Makefile.in +++ b/src/bozo/Makefile.in @@ -28,7 +28,7 @@ SHELL=/bin/sh include ../config/Makefile.${SYS_NAME} COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +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,8 +50,8 @@ LIBS=${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/librxstat.a \ ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libdes.a \ - ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/librx.a \ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/util.a \ ${TOP_LIBDIR}/libsys.a \ diff --git a/src/bozo/bos.rc b/src/bozo/bos.rc index 745055a4f..8a88352da 100644 --- a/src/bozo/bos.rc +++ b/src/bozo/bos.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c index 63198c1ad..3bbf9804c 100644 --- a/src/bozo/bos_util.c +++ b/src/bozo/bos_util.c @@ -22,7 +22,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/bozo/bos_util.c,v 1.1 2002/01/22 19:52:32 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/bozo/bos_util.c,v 1.1.1.2 2003/07/30 17:11:24 hartmans Exp $"); #include #include @@ -187,7 +187,7 @@ main(int argc, char **argv) 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("\\%03o", x[count]); printf("'\n"); } } diff --git a/src/bozo/bosserver.rc b/src/bozo/bosserver.rc index 66f1e8b62..951f9ec4d 100644 --- a/src/bozo/bosserver.rc +++ b/src/bozo/bosserver.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in index 6fcbc06b0..c414aaf3c 100644 --- a/src/bu_utils/Makefile.in +++ b/src/bu_utils/Makefile.in @@ -28,7 +28,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} +CFLAGS=${DBG} -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs ${XCFLAGS} LDFLAGS = ${XLDFLAGS} all: fms diff --git a/src/bu_utils/fms.rc b/src/bu_utils/fms.rc index 78c75c3e3..05bdd54cc 100644 --- a/src/bu_utils/fms.rc +++ b/src/bu_utils/fms.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/bucoord/backup.rc b/src/bucoord/backup.rc index 3c714e5f2..aa606fff0 100644 --- a/src/bucoord/backup.rc +++ b/src/bucoord/backup.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in index 701dd619f..7924e1494 100644 --- a/src/budb/Makefile.in +++ b/src/budb/Makefile.in @@ -30,8 +30,8 @@ include ../config/Makefile.${SYS_NAME} 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} +CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +LDFLAGS = ${XLDFLAGS} INCLS=\ ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/ubik.h \ @@ -70,7 +70,11 @@ SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o 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.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 diff --git a/src/budb/buserver.rc b/src/budb/buserver.rc index 59b6b9020..cd4041ef1 100644 --- a/src/budb/buserver.rc +++ b/src/budb/buserver.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/budb/procs.c b/src/budb/procs.c index 6506fbdcf..1a7edea34 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -16,7 +16,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/budb/procs.c,v 1.1.1.5 2001/09/11 14:31:45 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/budb/procs.c,v 1.1.1.6 2003/07/30 17:11:30 hartmans Exp $"); #ifdef AFS_NT40_ENV #include @@ -26,8 +26,14 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/budb/procs.c,v 1.1.1.5 2001/09/11 14:31 #include #include #include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H #include #endif +#endif +#endif #include #include #include diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in index 67afda267..a937b8fb4 100644 --- a/src/butc/Makefile.in +++ b/src/butc/Makefile.in @@ -28,7 +28,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=-g -w ${INCDIRS} ${XCFLAGS} @XBSA_CFLAGS@ +CFLAGS=${DBG} -w ${INCDIRS} ${XCFLAGS} @XBSA_CFLAGS@ INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}/afs \ -I${TOP_INCDIR}/rx -I${TOP_INCDIR} diff --git a/src/butc/butc.rc b/src/butc/butc.rc index 1a84f43ff..fe2334916 100644 --- a/src/butc/butc.rc +++ b/src/butc/butc.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/butc/dump.c b/src/butc/dump.c index 23a90a55c..35685027c 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/butc/dump.c,v 1.1.1.7 2002/09/26 19:05:11 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/butc/dump.c,v 1.1.1.8 2003/07/30 17:11:31 hartmans Exp $"); #include #ifdef AFS_NT40_ENV @@ -455,6 +455,7 @@ error_exit: * 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", diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c index 68897d30c..a89ba9cb5 100644 --- a/src/butc/tcudbprocs.c +++ b/src/butc/tcudbprocs.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/butc/tcudbprocs.c,v 1.1.1.6 2001/09/11 14:31:53 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/butc/tcudbprocs.c,v 1.1.1.7 2003/07/30 17:11:32 hartmans Exp $"); #include #ifdef AFS_NT40_ENV @@ -1390,8 +1390,8 @@ restoreText(tapeInfo, rstTapeInfoPtr, nextHeader) /* 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); +#if defined (HAVE_MKSTEMP) + fid = mkstemp(filename); #else fid = open(mktemp(filename), O_RDWR|O_CREAT|O_EXCL, 0600); #endif diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in index 81e322df5..f7e9ccfa5 100644 --- a/src/butm/Makefile.in +++ b/src/butm/Makefile.in @@ -26,8 +26,8 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh -CFLAGS=-g -w -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = -g ${XLDFLAGS} +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 \ diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index f163f6710..240caaf5b 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/butm/file_tm.c,v 1.1.1.5 2001/09/11 14:31:57 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/butm/file_tm.c,v 1.1.1.6 2003/07/30 17:11:35 hartmans Exp $"); #ifdef AFS_NT40_ENV #include @@ -30,6 +30,15 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/butm/file_tm.c,v 1.1.1.5 2001/09/11 14: #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,7 +84,6 @@ extern int isafile; * in succession (2 or 4 of them ). */ - struct fileMark { /* in network byte order */ afs_int32 magic; afs_uint32 nBytes; @@ -670,7 +678,7 @@ incPosition(info, fid, dataSize) if ( info->posCount >= 2147467264 ) /* 2GB - 16K */ { info->posCount = 0; -#if (defined(AFS_SUN_ENV) || defined(AFS_DEC_ENV)) +#if (defined(AFS_SUN_ENV) || defined(AFS_DEC_ENV) || defined(AFS_LINUX24_ENV)) if (!isafile) { hset64(off, 0, 0); @@ -1574,7 +1582,9 @@ static afs_int32 file_Seek (info, position) afs_int32 position; { afs_int32 code = 0; - afs_int32 posit, w; + 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,9 +1598,17 @@ static afs_int32 file_Seek (info, position) if (isafile) { p = (struct progress *)info->tmRock; - posit = (position * BUTM_BLOCKSIZE); - - hset64(startOff, 0, posit); + 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); diff --git a/src/cf/linux-test2.m4 b/src/cf/linux-test2.m4 index 17b34bf6b..49ceb11a1 100644 --- a/src/cf/linux-test2.m4 +++ b/src/cf/linux-test2.m4 @@ -28,6 +28,21 @@ ac_cv_linux_fs_struct_inode_has_i_bytes=no)]) 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" diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4 index d82c88829..929b17d6e 100644 --- a/src/cf/linux-test3.m4 +++ b/src/cf/linux-test3.m4 @@ -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="" diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index 6b4386b18..dd8129a4d 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -120,6 +120,23 @@ AC_MSG_RESULT($ac_cv_linux_exports_sys_call_table) 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" @@ -154,6 +171,23 @@ 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"]) + + AC_DEFUN(LINUX_EXPORTS_TASKLIST_LOCK, [ AC_MSG_CHECKING(for exported tasklist_lock) save_CPPFLAGS="$CPPFLAGS" diff --git a/src/config/Makefile.i386_linux24.in b/src/config/Makefile.i386_linux24.in index e905612e2..646422da9 100644 --- a/src/config/Makefile.i386_linux24.in +++ b/src/config/Makefile.i386_linux24.in @@ -24,7 +24,7 @@ SHLIB_LINKER=${MT_CC} -shared # # libraries MTLIBS=-lpthread -TXLIBS= /usr/lib/libncurses.so +TXLIBS=-lncurses XLIBS= @LIB_AFSDB@ # # programs diff --git a/src/config/Makefile.in b/src/config/Makefile.in index 1cf3b9e70..ac4538f90 100644 --- a/src/config/Makefile.in +++ b/src/config/Makefile.in @@ -30,7 +30,7 @@ SHELL=/bin/sh include Makefile.${SYS_NAME} -CFLAGS=-g -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${DBG} -I${TOP_INCDIR} ${XCFLAGS} INST=$(RM) -f $@; $(CP) $? $@ diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 9d390b50d..247a00ded 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -37,7 +37,8 @@ APPVER = 4.0 !ENDIF #define used in WinNT/2000 installation and program version display -AFSPRODUCT_VERSION=1.2.8 +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,24 +104,6 @@ AFSVER_CL=60 !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 @@ -139,7 +122,7 @@ MIDL = midl # Common clean target. # Double colon (::) syntax allows supplemental clean target to be specified. clean:: - $(DEL) /q *.obj *.lib *.dll *.exe + $(DEL) /q *.obj *.lib *.dll *.exe *.res *.pdb $(DEL) /q *_component_version_number.* # Common lang target. @@ -186,16 +169,18 @@ afscflags =\ !IF ("$(AFSDEV_BUILDTYPE)" == "FREE") # Apply full optimization; generate full debug info in obj. -afscflags = $(afscflags) /Ox /Z7 +afscflags = $(afscflags) /Ox ldebug = $(ldebug) -cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025) +cdebug = $(cdebug:-Od=) cvarsdll = $(cvarsdll:-MDd=-MD) !ELSEIF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") # Disable optimization; generate full debug info in obj. -afscflags = $(afscflags) /Od /Z7 +afscflags = $(afscflags) /Od +!IF ("$(AFSVER_CL)"=="60") ldebug = $(ldebug) -debugtype:both -cdebug = $(cdebug:-Z7=-Z7) # avoid annoying override warning (D4025) +!ENDIF +cdebug = !ENDIF # Set compiler warning level @@ -322,8 +307,8 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@ !ENDIF # C/C++ compilation macros -C2OBJ = $(cc) $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c -CPP2OBJ = $(cc) $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c +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)\"" diff --git a/src/config/NTMakefile.version-NOCML b/src/config/NTMakefile.version-NOCML index 408da36c9..6326574fe 100644 --- a/src/config/NTMakefile.version-NOCML +++ b/src/config/NTMakefile.version-NOCML @@ -19,6 +19,7 @@ $(VERSFILE).c: $(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 diff --git a/src/config/NTVersioninfo.rc b/src/config/NTVersioninfo.rc index ac9fae8e8..ac79f6b41 100644 --- a/src/config/NTVersioninfo.rc +++ b/src/config/NTVersioninfo.rc @@ -10,19 +10,42 @@ #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.", "\0" + VALUE "LegalCopyright", "Copyright \251 IBM Corporation and others, 1998, 1999, 2000, 2001, 2002, 2003.", "\0" VALUE "ProductName", "OpenAFS for Windows", "\0" - VALUE "ProductVersion", "1.1", "\0" - VALUE "FileVersion", "1.1", "\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 diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h index 576c8de48..330204aa0 100644 --- a/src/config/afs_sysnames.h +++ b/src/config/afs_sysnames.h @@ -7,6 +7,10 @@ * 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,6 +47,9 @@ #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,6 +166,9 @@ #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) diff --git a/src/dauth/Makefile.in b/src/dauth/Makefile.in index 5c6810f6f..c4d9fb475 100644 --- a/src/dauth/Makefile.in +++ b/src/dauth/Makefile.in @@ -28,10 +28,9 @@ SHELL = /bin/sh 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} +CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +LDFLAGS = ${XLDFLAGS} INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ diff --git a/src/des/andrew-conf.h b/src/des/andrew-conf.h index f1be8c1a5..8d34bbf5d 100644 --- a/src/des/andrew-conf.h +++ b/src/des/andrew-conf.h @@ -64,7 +64,11 @@ #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 */ diff --git a/src/des/crypt.c b/src/des/crypt.c index a0fce5955..db9e1ab33 100644 --- a/src/des/crypt.c +++ b/src/des/crypt.c @@ -37,7 +37,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/des/crypt.c,v 1.1.1.6 2002/06/10 11:45:53 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/des/crypt.c,v 1.1.1.7 2003/07/30 17:11:51 hartmans Exp $"); #ifdef AFS_NT40_ENV #include @@ -88,7 +88,9 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/des/crypt.c,v 1.1.1.6 2002/06/10 11:45: * 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) + +/* 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 diff --git a/src/dir/Makefile.in b/src/dir/Makefile.in index cc27fee44..c59d12450 100644 --- a/src/dir/Makefile.in +++ b/src/dir/Makefile.in @@ -28,8 +28,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +KERNELDIR = ../libafs +UKERNELDIR = ../libuafs INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XINCLS} CFLAGS = ${OPTMZ} ${INCDIRS} ${XCFLAGS} diff --git a/src/dir/dir.c b/src/dir/dir.c index e6f59d901..8ae32f95d 100644 --- a/src/dir/dir.c +++ b/src/dir/dir.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/dir/dir.c,v 1.1.1.6 2002/09/26 19:05:59 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/dir/dir.c,v 1.1.1.7 2003/07/30 17:11:54 hartmans Exp $"); #ifdef KERNEL #if !defined(UKERNEL) @@ -76,7 +76,7 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/dir/dir.c,v 1.1.1.6 2002/09/26 19:05:59 #ifndef AFS_LINUX20_ENV #include "../netinet/in.h" #endif -#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) +#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV) #include "../h/mbuf.h" #endif #else /* !defined(UKERNEL) */ diff --git a/src/dir/test/Makefile.in b/src/dir/test/Makefile.in index 5fb3498fd..d775afc56 100644 --- a/src/dir/test/Makefile.in +++ b/src/dir/test/Makefile.in @@ -14,7 +14,7 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} -KERNELDIR = ../libafs/ +KERNELDIR = ../libafs INSTALL = ${SRCDIR}/bin/install INCDIRS= -I${DESTDIR}/include ${XINCLS} diff --git a/src/export/Makefile.in b/src/export/Makefile.in index 1a82d9938..7cb43f603 100644 --- a/src/export/Makefile.in +++ b/src/export/Makefile.in @@ -31,8 +31,8 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +KERNELDIR = ../libafs +UKERNELDIR = ../libuafs DEFS = INCS = -I${TOP_SRCDIR}/config -I${TOP_INCDIR} CFLAGS = ${OPTMZ} ${DEFS} ${INCS} diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in index eb1f0e197..2aad40c92 100644 --- a/src/finale/Makefile.in +++ b/src/finale/Makefile.in @@ -27,8 +27,8 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} -LDFLAGS = -g ${XLDFLAGS} +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 \ diff --git a/src/finale/translate_et.rc b/src/finale/translate_et.rc index 870804d67..0096a1ebf 100644 --- a/src/finale/translate_et.rc +++ b/src/finale/translate_et.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 2869fe181..c5cae22ce 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -27,8 +27,8 @@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} SHELL = /bin/sh -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +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} diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in index 802f68a8a..b6db2529a 100644 --- a/src/fsprobe/Makefile.in +++ b/src/fsprobe/Makefile.in @@ -31,12 +31,12 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=-g -I. \ +CFLAGS=${DBG} -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ - -I${SRCDIR} \ - -I/usr/include ${XCFLAGS} + -I${TOP_SRCDIR} \ + ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h diff --git a/src/kauth/kas.rc b/src/kauth/kas.rc index 08427cb3d..2800553af 100644 --- a/src/kauth/kas.rc +++ b/src/kauth/kas.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/kauth/kaserver.rc b/src/kauth/kaserver.rc index d43a75a1b..2fbb45a0f 100644 --- a/src/kauth/kaserver.rc +++ b/src/kauth/kaserver.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/kauth/kpasswd.rc b/src/kauth/kpasswd.rc index f8c29d463..aa8347386 100644 --- a/src/kauth/kpasswd.rc +++ b/src/kauth/kpasswd.rc @@ -10,6 +10,8 @@ /* 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" diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in index 08371f660..f4dc991ab 100644 --- a/src/libacl/Makefile.in +++ b/src/libacl/Makefile.in @@ -30,8 +30,8 @@ include ../config/Makefile.${SYS_NAME} INCDIRS=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I.. \ -I${BACKDIR}/include -I${TOP_INCDIR}/afs -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +KERNELDIR = ../libafs +UKERNELDIR = ../libuafs CFLAGS = ${OPTMZ} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} diff --git a/src/libadmin/adminutil/afsadminutil.rc b/src/libadmin/adminutil/afsadminutil.rc index cbedf3613..c75d59e00 100644 --- a/src/libadmin/adminutil/afsadminutil.rc +++ b/src/libadmin/adminutil/afsadminutil.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libadmin/bos/afsbosadmin.rc b/src/libadmin/bos/afsbosadmin.rc index 29926749d..e0e723aa8 100644 --- a/src/libadmin/bos/afsbosadmin.rc +++ b/src/libadmin/bos/afsbosadmin.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libadmin/cfg/afscfgadmin.rc b/src/libadmin/cfg/afscfgadmin.rc index cc82e0f8f..257f76263 100644 --- a/src/libadmin/cfg/afscfgadmin.rc +++ b/src/libadmin/cfg/afscfgadmin.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libadmin/client/afsclientadmin.rc b/src/libadmin/client/afsclientadmin.rc index f7198b77e..39a942491 100644 --- a/src/libadmin/client/afsclientadmin.rc +++ b/src/libadmin/client/afsclientadmin.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libadmin/kas/afskasadmin.rc b/src/libadmin/kas/afskasadmin.rc index 336fcd70f..0128fdba5 100644 --- a/src/libadmin/kas/afskasadmin.rc +++ b/src/libadmin/kas/afskasadmin.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c index 3728f235e..da55269a0 100644 --- a/src/libadmin/pts/afs_ptsAdmin.c +++ b/src/libadmin/pts/afs_ptsAdmin.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/pts/afs_ptsAdmin.c,v 1.1.1.5 2002/05/10 23:59:34 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/libadmin/pts/afs_ptsAdmin.c,v 1.1.1.6 2003/07/30 17:12:12 hartmans Exp $"); #include #include @@ -2682,7 +2682,7 @@ static int GetOwnedGroupRPC( * We can retrieve the next group from data we already received */ - strcpy(&list->group[slot], &list->owned_names.namelist_val[list->index]); + strcpy(list->group[slot], list->owned_names.namelist_val[list->index]); list->index++; /* @@ -2725,7 +2725,7 @@ static int GetOwnedGroupFromCache( afs_status_t tst = 0; owned_group_list_p list = (owned_group_list_p) rpc_specific; - strcpy((char *) dest, &list->group[slot]); + strcpy((char *) dest, list->group[slot]); rc = 1; if (st != NULL) { @@ -3029,7 +3029,7 @@ static int GetPTSRPC( * We can retrieve the next entry from data we already received */ - strcpy(&list->entries[slot], list->currName->name); + strcpy(list->entries[slot], list->currName->name); list->index++; list->currName++; @@ -3072,7 +3072,7 @@ static int GetPTSFromCache( afs_status_t tst = 0; pts_list_p list = (pts_list_p) rpc_specific; - strcpy((char *) dest, &list->entries[slot]); + strcpy((char *) dest, list->entries[slot]); rc = 1; if (st != NULL) { diff --git a/src/libadmin/pts/afsptsadmin.rc b/src/libadmin/pts/afsptsadmin.rc index 134c062ce..7f56ffba2 100644 --- a/src/libadmin/pts/afsptsadmin.rc +++ b/src/libadmin/pts/afsptsadmin.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libadmin/vos/afsvosadmin.rc b/src/libadmin/vos/afsvosadmin.rc index 5a576447e..eb83b6b9d 100644 --- a/src/libadmin/vos/afsvosadmin.rc +++ b/src/libadmin/vos/afsvosadmin.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in index 29830be64..6370a1e91 100644 --- a/src/libafs/MakefileProto.HPUX.in +++ b/src/libafs/MakefileProto.HPUX.in @@ -66,6 +66,7 @@ AFS_OS_NONFSOBJS = \ # 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,10 +74,20 @@ KDEFS_32 = +DA1.0 +DS1.0 # 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${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} +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,11 +101,20 @@ DESTDIRS = hpux_destdirs include Makefile.common + BITS = 64 32 + +BITS = 64 + setup: - -$(RM) -f h net dux machine netinet nfs rpc s200 ufs sys + -$(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,7 +122,11 @@ setup: 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 \ diff --git a/src/libafs/MakefileProto.SOLARIS.in b/src/libafs/MakefileProto.SOLARIS.in index 4d4657999..81ab369c9 100644 --- a/src/libafs/MakefileProto.SOLARIS.in +++ b/src/libafs/MakefileProto.SOLARIS.in @@ -143,16 +143,11 @@ DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS} 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 -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 +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 diff --git a/src/libafs/afs.ppc_darwin_12.plist.in b/src/libafs/afs.ppc_darwin_12.plist.in index 50e5e72d9..101f38605 100644 --- a/src/libafs/afs.ppc_darwin_12.plist.in +++ b/src/libafs/afs.ppc_darwin_12.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + 1.2.9f1 CFBundleSignature ???? CFBundleVersion - @VERSION@ + 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_13.plist.in b/src/libafs/afs.ppc_darwin_13.plist.in index 50e5e72d9..101f38605 100644 --- a/src/libafs/afs.ppc_darwin_13.plist.in +++ b/src/libafs/afs.ppc_darwin_13.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + 1.2.9f1 CFBundleSignature ???? CFBundleVersion - @VERSION@ + 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_14.plist.in b/src/libafs/afs.ppc_darwin_14.plist.in index 7e4f1bf1a..830e4bc20 100644 --- a/src/libafs/afs.ppc_darwin_14.plist.in +++ b/src/libafs/afs.ppc_darwin_14.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + 1.2.9f1 CFBundleSignature ???? CFBundleVersion - @VERSION@ + 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafs/afs.ppc_darwin_60.plist.in b/src/libafs/afs.ppc_darwin_60.plist.in index 98ab34421..60934334a 100644 --- a/src/libafs/afs.ppc_darwin_60.plist.in +++ b/src/libafs/afs.ppc_darwin_60.plist.in @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - @VERSION@ + 1.2.9f1 CFBundleSignature ???? CFBundleVersion - @VERSION@ + 1.2.9f1 OSBundleLibraries com.apple.kernel.bsd diff --git a/src/libafsauthent/afsauthent.rc b/src/libafsauthent/afsauthent.rc index ce49d82f0..28a82f33f 100644 --- a/src/libafsauthent/afsauthent.rc +++ b/src/libafsauthent/afsauthent.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libafsrpc/afsrpc.rc b/src/libafsrpc/afsrpc.rc index 8d08d0068..218fd55c0 100644 --- a/src/libafsrpc/afsrpc.rc +++ b/src/libafsrpc/afsrpc.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/libuafs/Makefile.common b/src/libuafs/Makefile.common index 00a930380..94a3fd821 100644 --- a/src/libuafs/Makefile.common +++ b/src/libuafs/Makefile.common @@ -9,7 +9,7 @@ # SHELL=/bin/sh -INCLUDE= -I. -I/usr/include -I${TOP_SRCDIR}/config +INCLUDE= -I. -I${TOP_SRCDIR}/config UOBJ =../UAFS WEBOBJ =../AFSWEB AFS =../afs diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in index 0057b011a..1b7b218fb 100644 --- a/src/libuafs/MakefileProto.HPUX.in +++ b/src/libuafs/MakefileProto.HPUX.in @@ -30,12 +30,20 @@ include ../config/Makefile.${SYS_NAME} # 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 diff --git a/src/login/Makefile.in b/src/login/Makefile.in index cfaa3dff3..6de55b536 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -53,8 +53,8 @@ KAFSLIBS = ${TOP_LIBDIR}/libkauth.krb.a ${TOP_LIBDIR}/libprot.a \ ${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} +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,14 +71,14 @@ all: login login.krb 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} ;;\ + 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} -g -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\ - *) ${CC} -g -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\ + sun4x_5? | sunx86_5? ) ${CC} -o $@ ${CFLAGS} ${KOBJS} -lc ${KLIBS} ${XLIBS} -lcmd;;\ + *) ${CC} -o $@ ${CFLAGS} ${KOBJS} ${KLIBS} ${XLIBS} ;;\ esac libutil.a : ${UTILOBJS} diff --git a/src/package/Makefile.in b/src/package/Makefile.in index 6ec6a692c..32a135e81 100644 --- a/src/package/Makefile.in +++ b/src/package/Makefile.in @@ -27,7 +27,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -INCLUDES=-I/usr/include -I${TOP_SRCDIR}/config -I${TOP_INCDIR} +INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} DBGFLAG = -UDEBUG CFLAGS = ${DBUG} -DKFLAG -DANDREW -DVICE $(DBGFLAG) $(INCLUDES) $(XCFLAGS) YFLAGS = -vd diff --git a/src/pinstall/Makefile.in b/src/pinstall/Makefile.in index 49067af2f..fd9178f40 100644 --- a/src/pinstall/Makefile.in +++ b/src/pinstall/Makefile.in @@ -30,7 +30,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} LIBS= ${XLIBS} -CFLAGS=${OPTMZ} -g -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} +CFLAGS=${OPTMZ} ${DBG} -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} all: pinstall diff --git a/src/procmgmt/afskill.rc b/src/procmgmt/afskill.rc index fe2808bf5..5d0ba54bc 100644 --- a/src/procmgmt/afskill.rc +++ b/src/procmgmt/afskill.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Signal Process Command" +#define AFS_VERINFO_NAME "afskill" +#define AFS_VERINFO_FILENAME "afskill.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/procmgmt/afsprocmgmt.rc b/src/procmgmt/afsprocmgmt.rc index 2eb0bc2d5..6787d3900 100644 --- a/src/procmgmt/afsprocmgmt.rc +++ b/src/procmgmt/afsprocmgmt.rc @@ -10,6 +10,9 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Process Management DLL" +#define AFS_VERINFO_DLL +#define AFS_VERINFO_NAME "afsprocmgmt" +#define AFS_VERINFO_FILENAME "afsprocmgmt.dll" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index bf9eb2d76..4a1028d56 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -25,7 +25,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -UKERNELDIR=../libuafs/ +UKERNELDIR=../libuafs RXGEN=${TOP_SRCDIR}/rxgen/rxgen COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et diff --git a/src/ptserver/pts.rc b/src/ptserver/pts.rc index a910824d2..d49cde71f 100644 --- a/src/ptserver/pts.rc +++ b/src/ptserver/pts.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Command" +#define AFS_VERINFO_NAME "pts" +#define AFS_VERINFO_FILENAME "pts.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/ptserver/ptserver.rc b/src/ptserver/ptserver.rc index 5dc2dab64..ff52b17d5 100644 --- a/src/ptserver/ptserver.rc +++ b/src/ptserver/ptserver.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Protection Database Server" +#define AFS_VERINFO_NAME "ptserver" +#define AFS_VERINFO_FILENAME "ptserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/rx/HPUX/rx_kmutex.h b/src/rx/HPUX/rx_kmutex.h index a1584c518..007a9ee89 100644 --- a/src/rx/HPUX/rx_kmutex.h +++ b/src/rx/HPUX/rx_kmutex.h @@ -112,11 +112,18 @@ extern void osirx_AssertMine(afs_kmutex_t *lockaddr, char *msg); #define MUTEX_TRYENTER(a) b_cpsema(a) +#ifdef AFS_HPUX1111_ENV +#define MUTEX_ENTER(a) \ + ((b_owns_sema(a)) ? osi_Panic("Already Held") : b_psema(a)) +#define MUTEX_EXIT(a) \ + ((b_owns_sema(a)) ? b_vsema(a) : osi_Panic("mutex not held")) +#else #define MUTEX_ENTER(a) \ ((b_owns_sema(a)) ? (osi_Panic("Already Held"), 0) : b_psema(a)) #define MUTEX_EXIT(a) \ ((b_owns_sema(a)) ? b_vsema(a) : (osi_Panic("mutex not held"), 0)) +#endif #undef MUTEX_ISMINE #define MUTEX_ISMINE(a) b_owns_sema(a) diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index db0c51a59..54b5bdbc9 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -15,7 +15,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/LINUX/rx_knet.c,v 1.1.1.10 2003/04/13 19:07:29 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/LINUX/rx_knet.c,v 1.1.1.11 2003/07/30 17:12:50 hartmans Exp $"); #include #ifdef AFS_LINUX22_ENV @@ -184,9 +184,12 @@ void osi_StopListener(void) #endif listener = find_task_by_pid(rxk_ListenerPid); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) - read_unlock(&tasklist_lock); + read_unlock(&tasklist_lock); #endif while (rxk_ListenerPid) { + struct task_struct *p; + + flush_signals(listener); force_sig(SIGKILL, listener); afs_osi_Sleep(&rxk_ListenerPid); } diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c index bdaf06312..c3688e0f8 100644 --- a/src/rx/SOLARIS/rx_knet.c +++ b/src/rx/SOLARIS/rx_knet.c @@ -10,7 +10,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/SOLARIS/rx_knet.c,v 1.1.1.10 2003/04/13 19:07:29 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/SOLARIS/rx_knet.c,v 1.1.1.11 2003/07/30 17:12:50 hartmans Exp $"); #ifdef AFS_SUN5_ENV #include "../rx/rx_kcommon.h" @@ -299,7 +299,7 @@ int osi_FreeSocket(asocket) AFS_STATCNT(osi_FreeSocket); taddr.sin_family = AF_INET; - taddr.sin_port = htons(rx_port); + taddr.sin_port = rx_port; taddr.sin_addr.s_addr = htonl(0x7f000001); dvec.iov_base = &c; diff --git a/src/rx/bulk.example/Makefile.in b/src/rx/bulk.example/Makefile.in index 45a057315..131bedfb5 100644 --- a/src/rx/bulk.example/Makefile.in +++ b/src/rx/bulk.example/Makefile.in @@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a DESTDIR=/usr/andy/ INSTALL=${SRCDIR}/bin/install LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a -CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} +CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} all: bulk_client bulk_server diff --git a/src/rx/bulktest/Makefile.in b/src/rx/bulktest/Makefile.in index 45a057315..131bedfb5 100644 --- a/src/rx/bulktest/Makefile.in +++ b/src/rx/bulktest/Makefile.in @@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a DESTDIR=/usr/andy/ INSTALL=${SRCDIR}/bin/install LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a -CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} +CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} all: bulk_client bulk_server diff --git a/src/rx/multi.example/Makefile.in b/src/rx/multi.example/Makefile.in index bb7ac9c4a..d2c99c3a9 100644 --- a/src/rx/multi.example/Makefile.in +++ b/src/rx/multi.example/Makefile.in @@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a DESTDIR=/usr/andy/ INSTALL=${SRCDIR}/bin/install LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a -CFLAGS=-g -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} +CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} all: sample_client sample_server diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index a3ff587d8..db8bb5339 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -14,7 +14,7 @@ #include #include "../afs/param.h" -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx_kcommon.c,v 1.1.1.15 2003/04/13 19:07:24 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx_kcommon.c,v 1.1.1.16 2003/07/30 17:12:46 hartmans Exp $"); #include "../rx/rx_kcommon.h" @@ -750,7 +750,9 @@ struct osi_socket *rxk_NewSocket(short aport) { register afs_int32 code; struct socket *newSocket; +#if !defined(AFS_HPUX110_ENV) register struct mbuf *nam; +#endif struct sockaddr_in myaddr; int wow; #ifdef AFS_HPUX110_ENV @@ -804,7 +806,9 @@ struct osi_socket *rxk_NewSocket(short aport) code = sobind(newSocket, bindnam, addrsize); if (code) { soclose(newSocket); +#if !defined(AFS_HPUX110_ENV) m_freem(nam); +#endif goto bad; } diff --git a/src/rx/rxdebug.rc b/src/rx/rxdebug.rc index a68887c0c..3192c8abe 100644 --- a/src/rx/rxdebug.rc +++ b/src/rx/rxdebug.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Rx RPC Diagnostic Command" +#define AFS_VERINFO_NAME "rxdebug" +#define AFS_VERINFO_FILENAME "rxdebug.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/rx/simple.example/Makefile.in b/src/rx/simple.example/Makefile.in index 1fab2e59c..d01992410 100644 --- a/src/rx/simple.example/Makefile.in +++ b/src/rx/simple.example/Makefile.in @@ -15,7 +15,7 @@ LIBRX=${SRCDIR}/lib/librx.a DESTDIR=/usr/andy/ INSTALL=${SRCDIR}/bin/install LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a -CFLAGS=-g -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} +CFLAGS=${DBG} -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} all: sample_client sample_server diff --git a/src/rx/xdr.h b/src/rx/xdr.h index 5f899ac4a..f56fd6d60 100644 --- a/src/rx/xdr.h +++ b/src/rx/xdr.h @@ -61,12 +61,7 @@ #define mem_free(ptr, bsize) free(ptr) #endif -#ifdef KERNEL -void *afs_osi_Alloc(); -#define osi_alloc afs_osi_Alloc -#define osi_free afs_osi_Free - -#ifndef UKERNEL +#if defined(AFS_AMD64_LINUX24_ENV) || (defined(KERNEL) && !defined(UKERNEL)) #define xdr_void afs_xdr_void #define xdr_int afs_xdr_int #define xdr_u_int afs_xdr_u_int @@ -92,6 +87,17 @@ void *afs_osi_Alloc(); #define xdr_int64 afs_xdr_int64 #define xdr_uint64 afs_xdr_uint64 #endif + +#ifdef KERNEL +void *afs_osi_Alloc(); +#define osi_alloc afs_osi_Alloc +#define osi_free afs_osi_Free + +/* keep here for now, 64 bit issues */ +extern void *afs_osi_Alloc(size_t x); +extern void *afs_osi_Alloc_NoSleep(size_t x); +extern void afs_osi_Free(void *x, size_t asize); + #endif #ifndef major /* ouch! */ #include diff --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c index b36eca9c6..9de37f088 100644 --- a/src/rx/xdr_mem.c +++ b/src/rx/xdr_mem.c @@ -29,7 +29,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/rx/xdr_mem.c,v 1.1.1.5 2003/04/13 19:07:27 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rx/xdr_mem.c,v 1.1.1.6 2003/07/30 17:12:49 hartmans Exp $"); #ifndef NeXT @@ -45,7 +45,9 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/rx/xdr_mem.c,v 1.1.1.5 2003/04/13 19:07 */ #include "xdr.h" -#ifndef AFS_NT40_ENV +#ifdef AFS_NT40_ENV +#include +#else #include #endif @@ -114,7 +116,7 @@ xdrmem_putint32(xdrs, lp) afs_int32 *lp; { if (xdrs->x_handy -= sizeof(afs_int32)) - eturn (FALSE); + return (FALSE); else xdrs->x_handy -= sizeof(afs_int32); diff --git a/src/rxdebug/Makefile.in b/src/rxdebug/Makefile.in index ae2a8bf75..859be7371 100644 --- a/src/rxdebug/Makefile.in +++ b/src/rxdebug/Makefile.in @@ -29,8 +29,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +KERNELDIR = ../libafs +UKERNELDIR = ../libuafs CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/rx -DRXDEBUG ${XCFLAGS} diff --git a/src/rxdebug/rxdebug.rc b/src/rxdebug/rxdebug.rc index a68887c0c..3192c8abe 100644 --- a/src/rxdebug/rxdebug.rc +++ b/src/rxdebug/rxdebug.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Rx RPC Diagnostic Command" +#define AFS_VERINFO_NAME "rxdebug" +#define AFS_VERINFO_FILENAME "rxdebug.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in index ef122380a..58343545c 100644 --- a/src/rxgen/Makefile.in +++ b/src/rxgen/Makefile.in @@ -27,7 +27,7 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -UKERNELDIR=../libuafs/ +UKERNELDIR=../libuafs SRCS= rpc_main.c rpc_hout.c rpc_cout.c rpc_parse.c rpc_scan.c rpc_util.c \ rpc_svcout.c rpc_clntout.c diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in index cea77cecf..a6cd51b79 100644 --- a/src/rxkad/test/Makefile.in +++ b/src/rxkad/test/Makefile.in @@ -27,13 +27,11 @@ SHELL = /bin/sh include ../../config/Makefile.${SYS_NAME} -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +KERNELDIR = ../libafs +UKERNELDIR = ../libuafs COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et -OPTIMIZE=-g - -CFLAGS=-g -I. -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${DBG} -I. -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h diff --git a/src/rxkad/ticket.c b/src/rxkad/ticket.c index 3f6027bd3..ac6fb0cf5 100644 --- a/src/rxkad/ticket.c +++ b/src/rxkad/ticket.c @@ -14,7 +14,7 @@ #include #endif -RCSID("$Header: /tmp/cvstemp/openafs/src/rxkad/ticket.c,v 1.1.1.8 2003/04/13 19:07:35 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/rxkad/ticket.c,v 1.1.1.9 2003/07/30 17:12:56 hartmans Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" @@ -101,6 +101,7 @@ int tkt_DecodeTicket (asecret, ticketLen, key, if (ticketLen == 0) return RXKADBADTICKET; /* no ticket */ if ((ticketLen < MINKTCTICKETLEN) || /* minimum legal ticket size */ + (ticketLen > MAXKTCTICKETLEN) || /* maximum legal ticket size */ ((ticketLen) % 8 != 0)) /* enc. part must be (0 mod 8) bytes */ return RXKADBADTICKET; diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index 872b4da7f..e2151521e 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -26,8 +26,8 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -KERNELDIR = ../libafs/ -UKERNELDIR = ../libuafs/ +KERNELDIR = ../libafs +UKERNELDIR = ../libuafs RXGEN=${TOP_SRCDIR}/rxgen/rxgen KSRCS=rxstat.c rxstat.h Krxstat.ss.c Krxstat.xdr.c diff --git a/src/shlibafsauthent/afsauthent.rc b/src/shlibafsauthent/afsauthent.rc index ce49d82f0..28a82f33f 100644 --- a/src/shlibafsauthent/afsauthent.rc +++ b/src/shlibafsauthent/afsauthent.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/shlibafsrpc/afsrpc.rc b/src/shlibafsrpc/afsrpc.rc index 8d08d0068..218fd55c0 100644 --- a/src/shlibafsrpc/afsrpc.rc +++ b/src/shlibafsrpc/afsrpc.rc @@ -10,6 +10,9 @@ /* 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" diff --git a/src/sia/Makefile.in b/src/sia/Makefile.in index b89dd13f1..37ad70dc5 100644 --- a/src/sia/Makefile.in +++ b/src/sia/Makefile.in @@ -28,7 +28,6 @@ SYS_NAME=@AFS_SYSNAME@ SHELL = /bin/sh -DEBUG = #UNRESOLVED = -expect_unresolved \* UNRESOLVED = include ../config/Makefile.${SYS_NAME} @@ -48,7 +47,7 @@ all: ${TOP_LIBDIR}/libafssiad.so ${TOP_LIBDIR}/libafssiad.krb.so clean: $(RM) -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c -CFLAGS=$(DEBUG) -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} ${DEST}/lib/afs/libafssiad.so: libafssiad.so ${INSTALL} $? $@ @@ -57,21 +56,21 @@ ${DEST}/lib/afs/libafssiad.krb.so: libafssiad.krb.so ${INSTALL} $? $@ siad.o: siad.c - $(CC) $(CFLAGS) -c -g siad.c -o siad.o + $(CC) $(CFLAGS) -c siad.c -o siad.o siad_krb.o: siad.c - $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c -g siad.c -o siad_krb.o + $(CC) $(CFLAGS) -DAFS_KERBEROS_ENV -c siad.c -o siad_krb.o libafssiad.so: siad.o - $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.so \ + $(LD) $(LDFLAGS) -shared -no_archive -o libafssiad.so \ ${UNRESOLVED} siad.o ${LIBS} -none -lc libafssiad.krb.so: siad_krb.o - $(LD) $(LDFLAGS) -g -shared -no_archive -o libafssiad.krb.so \ + $(LD) $(LDFLAGS) -shared -no_archive -o libafssiad.krb.so \ ${UNRESOLVED} siad_krb.o ${KLIBS} ${LIBS} -none -lc test-reauth: test-reauth.o - $(CC) $(CFLAGS) -g -o test-reauth test-reauth.o -lc + $(CC) $(CFLAGS) -o test-reauth test-reauth.o -lc install: ${DESTDIR}${libdir}/afs/libafssiad.so ${DESTDIR}${libdir}/afs/libafssiad.krb.so diff --git a/src/sys/rmtsysc.c b/src/sys/rmtsysc.c index 13ccbd062..699b9c145 100644 --- a/src/sys/rmtsysc.c +++ b/src/sys/rmtsysc.c @@ -15,7 +15,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsysc.c,v 1.1.1.7 2001/09/11 14:34:51 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsysc.c,v 1.1.1.8 2003/07/30 17:13:02 hartmans Exp $"); #include #include @@ -33,6 +33,9 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/sys/rmtsysc.c,v 1.1.1.7 2001/09/11 14:3 #ifdef HAVE_STRING_H #include #endif +#ifdef HAVE_UNISTD_H +#include +#endif #include #include "rmtsys.h" diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in index d8cd5e972..6f82cb403 100644 --- a/src/tsm41/Makefile.in +++ b/src/tsm41/Makefile.in @@ -25,8 +25,7 @@ TOP_SRCDIR=@TOP_SRCDIR@ SYS_NAME=@AFS_SYSNAME@ include ../config/Makefile.${SYS_NAME} -OPTIMIZE=-g -CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} +CFLAGS=${DBG} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \ ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \ diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in index 335c1036f..dae2baada 100644 --- a/src/ubik/Makefile.in +++ b/src/ubik/Makefile.in @@ -26,8 +26,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS} -UKERNELDIR=../libuafs/ +CFLAGS=${OPTMZ} ${DBG} -I${TOP_SRCDIR}/config -I. -I${TOP_INCDIR} ${XCFLAGS} +UKERNELDIR=../libuafs LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ @@ -77,7 +77,7 @@ utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c udebug.o: udebug.c ${INCLS} AFS_component_version_number.c - ${CC} ${CFLAGS} -g -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c udebug.c + ${CC} ${CFLAGS} -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c udebug.c uerrors.o: uerrors.c diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c index 6aacd4d6b..277b25e66 100644 --- a/src/ubik/beacon.c +++ b/src/ubik/beacon.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/ubik/beacon.c,v 1.1.1.11 2003/04/13 19:07:58 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/ubik/beacon.c,v 1.1.1.12 2003/07/30 17:13:20 hartmans Exp $"); #include #ifdef AFS_NT40_ENV @@ -456,7 +456,7 @@ static verifyInterfaceAddress(ame, info, aservers) { afs_uint32 myAddr[UBIK_MAX_INTERFACE_ADDR], *servList, tmpAddr; afs_uint32 myAddr2[UBIK_MAX_INTERFACE_ADDR]; - int count, found, i, j, totalServers, start, end, usednetfiles = 0; + int tcount, count, found, i, j, totalServers, start, end, usednetfiles = 0; if (info) totalServers = info->numServers; @@ -520,15 +520,15 @@ static verifyInterfaceAddress(ame, info, aservers) if (usednetfiles) { /* take the address we did get, then see if ame was masked */ *ame=myAddr[0]; - count = rx_getAllAddr(myAddr2, UBIK_MAX_INTERFACE_ADDR); - if ( count <= 0 ) /* no address found */ + tcount = rx_getAllAddr(myAddr2, UBIK_MAX_INTERFACE_ADDR); + if ( tcount <= 0 ) /* no address found */ { ubik_print("ubik: No network addresses found, aborting.."); return UBADHOST; } /* verify that the My-address passed in by ubik is correct */ - for ( j=0, found = 0; j < count; j++) + for ( j=0, found = 0; j < tcount; j++) { if ( *ame == myAddr2[j] ) /* both in net byte order */ { diff --git a/src/ubik/udebug.rc b/src/ubik/udebug.rc index 86632aed1..05f410f49 100644 --- a/src/ubik/udebug.rc +++ b/src/ubik/udebug.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Ubik Diagnostic Command" +#define AFS_VERINFO_NAME "udebug" +#define AFS_VERINFO_FILENAME "udebug.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/update/upclient.rc b/src/update/upclient.rc index 5be6e3f90..3c8dca102 100644 --- a/src/update/upclient.rc +++ b/src/update/upclient.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Update Client" +#define AFS_VERINFO_NAME "upclient" +#define AFS_VERINFO_FILENAME "upclient.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/update/upserver.rc b/src/update/upserver.rc index ea4e7e24b..3d8863206 100644 --- a/src/update/upserver.rc +++ b/src/update/upserver.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Update Server" +#define AFS_VERINFO_NAME "upserver" +#define AFS_VERINFO_FILENAME "upserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in index c18e6d1b7..2924b0a15 100644 --- a/src/uss/Makefile.in +++ b/src/uss/Makefile.in @@ -32,7 +32,7 @@ include ../config/Makefile.${SYS_NAME} all: uss -CFLAGS=${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \ +CFLAGS=${DBUG} -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} -I. ${XCFLAGS} # diff --git a/src/uss/lex.c b/src/uss/lex.c index ce3837141..38bfb4920 100644 --- a/src/uss/lex.c +++ b/src/uss/lex.c @@ -10,8 +10,15 @@ #include #include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif -RCSID("$Header: /tmp/cvstemp/openafs/src/uss/lex.c,v 1.1.1.5 2001/09/11 14:35:04 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/uss/lex.c,v 1.1.1.6 2003/07/30 17:13:24 hartmans Exp $"); #include "y.tab.h" #include "uss_common.h" diff --git a/src/uss/uss.rc b/src/uss/uss.rc index 1c6105aae..4a4659f3a 100644 --- a/src/uss/uss.rc +++ b/src/uss/uss.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS User Account Command" +#define AFS_VERINFO_NAME "uss" +#define AFS_VERINFO_FILENAME "uss.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/uss/uss_common.h b/src/uss/uss_common.h index aeb8201ea..7477e61e9 100644 --- a/src/uss/uss_common.h +++ b/src/uss/uss_common.h @@ -23,6 +23,14 @@ #include /*I/O stuff*/ #include #include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif + /* * --------------------- Exported definitions --------------------- diff --git a/src/util/afs_lhash.c b/src/util/afs_lhash.c index fcf2ac42f..7dba682e7 100644 --- a/src/util/afs_lhash.c +++ b/src/util/afs_lhash.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/util/afs_lhash.c,v 1.1.1.5 2002/12/11 02:45:51 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/util/afs_lhash.c,v 1.1.1.6 2003/07/30 17:13:26 hartmans Exp $"); #ifdef KERNEL #include "../afs/afs_atomlist.h" @@ -179,7 +179,7 @@ afs_lhash_expand( size_t old_address; /* index of bucket to split */ size_t new_address; /* index of new bucket */ - struct bucket *current; /* for scanning down old chain */ + struct bucket *curr; /* for scanning down old chain */ struct bucket *previous; struct bucket *last_of_new; /* last element in new chain */ @@ -216,36 +216,36 @@ afs_lhash_expand( /* relocate records to the new bucket */ - current = lh->table[old_address]; + curr = lh->table[old_address]; previous = 0; last_of_new = 0; lh->table[new_address] = 0; - while (current) { + while (curr) { size_t addr; - addr = afs_lhash_address(lh, current->key); + addr = afs_lhash_address(lh, curr->key); if (addr == new_address) { /* attach it to the end of the new chain */ if (last_of_new) { - last_of_new->next = current; + last_of_new->next = curr; } else { - lh->table[new_address] = current; + lh->table[new_address] = curr; } if (previous) { - previous->next = current->next; + previous->next = curr->next; } else { - lh->table[old_address] = current->next; + lh->table[old_address] = curr->next; } - last_of_new = current; - current = current->next; + last_of_new = curr; + curr = curr->next; last_of_new->next = 0; } else { #ifdef CHECK_INVARIANTS assert(addr == old_address); #endif /* CHECK_INVARIANTS */ /* leave it on the old chain */ - previous = current; - current = current->next; + previous = curr; + curr = curr->next; } } } @@ -345,12 +345,12 @@ afs_lhash_iter( #endif /* CHECK_INVARIANTS */ for (i = 0; i < lh->ltable; i++) { - struct bucket *current; + struct bucket *curr; - for (current = lh->table[i]; - current; - current = current->next) { - f(i, current->key, current->data); + for (curr = lh->table[i]; + curr; + curr = curr->next) { + f(i, curr->key, curr->data); } } } @@ -364,16 +364,16 @@ afs_lhash_search( { size_t k; struct bucket *previous; - struct bucket *current; + struct bucket *curr; lh->search_calls++; k = afs_lhash_address(lh, key); - for (previous = 0, current = lh->table[k]; - current; - previous = current, current = current->next) { + for (previous = 0, curr = lh->table[k]; + curr; + previous = curr, curr = curr->next) { lh->search_tests++; - if (lh->equal(data, current->data)) { + if (lh->equal(data, curr->data)) { /* * Since we found what we were looking for, move @@ -389,12 +389,12 @@ afs_lhash_search( */ if (previous) { - previous->next = current->next; - current->next = lh->table[k]; - lh->table[k] = current; + previous->next = curr->next; + curr->next = lh->table[k]; + lh->table[k] = curr; } - return current->data; + return curr->data; } } @@ -409,14 +409,14 @@ afs_lhash_rosearch( ) { size_t k; - struct bucket *current; + struct bucket *curr; k = afs_lhash_address(lh, key); - for (current = lh->table[k]; - current; - current = current->next) { - if (lh->equal(data, current->data)) { - return current->data; + for (curr = lh->table[k]; + curr; + curr = curr->next) { + if (lh->equal(data, curr->data)) { + return curr->data; } } diff --git a/src/util/potpourri.h b/src/util/potpourri.h index 3d7bb8685..9849e3ecd 100644 --- a/src/util/potpourri.h +++ b/src/util/potpourri.h @@ -92,6 +92,7 @@ Abstract: Contains miscellaneous general-purpose macros. BEWARE: avoid quotes in the assertion!! Also beware: you cannot make the NOASSERT case a null macro, because of side effects */ +#undef assert #ifndef NOASSERT #define assert(ex) {if (!(ex)){fprintf(stderr,"Assertion failed: file %s, line %d\n", __FILE__, __LINE__);fprintf(stderr, "\t%s\n", # ex); abort();}} #else diff --git a/src/util/softsig.c b/src/util/softsig.c index 886a61f76..6d8a9f9b2 100644 --- a/src/util/softsig.c +++ b/src/util/softsig.c @@ -14,34 +14,59 @@ #include #include +#include "pthread_nosigs.h" + static pthread_t softsig_tid; static struct { void (*handler) (int); int pending; + int fatal; + int inited; } softsig_sigs[NSIG]; static void * softsig_thread (void *arg) { - sigset_t ss; + sigset_t ss,os; + int i; sigemptyset (&ss); + /* get the list of signals _not_ blocked by AFS_SIGSET_CLEAR() */ + pthread_sigmask (SIG_BLOCK, &ss, &os); + pthread_sigmask (SIG_SETMASK, &os, NULL); sigaddset (&ss, SIGUSR1); + for (i = 0; i < NSIG; i++) { + if (!sigismember(&os, i) && i != SIGSTOP && i != SIGKILL) { + sigaddset(&ss, i); + softsig_sigs[i].fatal = 1; + } + } while (1) { void (*h) (int) = NULL; - int i, sigw; + int sigw; - for (i = 0; i < NSIG; i++) + h = NULL; + + for (i = 0; i < NSIG; i++) { + if (softsig_sigs[i].handler && !softsig_sigs[i].inited) { + sigaddset(&ss, i); + softsig_sigs[i].inited = 1; + } if (softsig_sigs[i].pending) { - softsig_sigs[i].pending = 0; - h = softsig_sigs[i].handler; - break; + softsig_sigs[i].pending = 0; + h = softsig_sigs[i].handler; + break; } - - if (i == NSIG) - assert (0 == sigwait (&ss, &sigw)); - else if (h) + } + if (i == NSIG) { + sigwait (&ss, &sigw); + if (sigw != SIGUSR1) { + if (softsig_sigs[sigw].fatal) + exit(0); + softsig_sigs[sigw].pending=1; + } + } else if (h) h (i); } } @@ -49,22 +74,18 @@ softsig_thread (void *arg) void softsig_init () { - sigset_t ss, os; - - sigemptyset (&ss); - sigaddset (&ss, SIGUSR1); - - /* Set mask right away, so we don't accidentally SIGUSR1 the - * softsig thread and cause an exit (default action). - */ - assert (0 == pthread_sigmask (SIG_BLOCK, &ss, &os)); - assert (0 == pthread_create (&softsig_tid, NULL, &softsig_thread, NULL)); - assert (0 == pthread_sigmask (SIG_SETMASK, &os, NULL)); + int rc; + AFS_SIGSET_DECL; + AFS_SIGSET_CLEAR(); + rc = pthread_create (&softsig_tid, NULL, &softsig_thread, NULL); + assert(0 == rc); + AFS_SIGSET_RESTORE(); } static void softsig_handler (int signo) { + signal (signo, softsig_handler); softsig_sigs[signo].pending = 1; pthread_kill (softsig_tid, SIGUSR1); } @@ -73,7 +94,9 @@ void softsig_signal (int signo, void (*handler) (int)) { softsig_sigs[signo].handler = handler; + softsig_sigs[signo].inited = 0; signal (signo, softsig_handler); + pthread_kill (softsig_tid, SIGUSR1); } #if defined(TEST) diff --git a/src/util/test/Makefile.in b/src/util/test/Makefile.in index d67e2e0c8..b690f296f 100644 --- a/src/util/test/Makefile.in +++ b/src/util/test/Makefile.in @@ -12,7 +12,7 @@ SYS_NAME=@AFS_SYSNAME@ include ../../config/Makefile.${SYS_NAME} -CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} -g +CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} ${DBG} tests: test_ktime ktest dirpath_test diff --git a/src/venus/test/owntest.c b/src/venus/test/owntest.c index ceb2486e8..97e653a46 100644 --- a/src/venus/test/owntest.c +++ b/src/venus/test/owntest.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/venus/test/owntest.c,v 1.1.1.5 2003/04/13 19:08:10 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/venus/test/owntest.c,v 1.1.1.6 2003/07/30 17:13:33 hartmans Exp $"); #include #include @@ -45,8 +45,8 @@ char **argv; { perror("chmod back to RW"); return 1; } - gettimeofday(&tv[0], (char *) 0); - gettimeofday(&tv[1], (char *) 0); + gettimeofday(&tv[0], (void *) 0); + gettimeofday(&tv[1], (void *) 0); tv[0].tv_sec -= 10000; tv[0].tv_usec = 0; tv[1].tv_sec -= 20000; diff --git a/src/venus/up.c b/src/venus/up.c index 9649145bb..2fda14b7a 100644 --- a/src/venus/up.c +++ b/src/venus/up.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/venus/up.c,v 1.1.1.7 2001/09/11 14:35:26 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/venus/up.c,v 1.1.1.8 2003/07/30 17:13:32 hartmans Exp $"); /* missing type from C language */ #define Boolean short @@ -18,6 +18,13 @@ RCSID("$Header: /tmp/cvstemp/openafs/src/venus/up.c,v 1.1.1.7 2001/09/11 14:35:2 #define false 0 #include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif #ifdef AFS_AIX32_ENV #include #undef _NONSTD_TYPES diff --git a/src/viced/callback.c b/src/viced/callback.c index 2bc8b5f4a..73af227a2 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -82,7 +82,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/viced/callback.c,v 1.1.1.11 2003/04/13 19:08:13 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/viced/callback.c,v 1.1.1.12 2003/07/30 17:13:35 hartmans Exp $"); #include #include /* for malloc() */ @@ -442,7 +442,7 @@ static CDel(cb) assert(0); ViceLog(0,("CDel: Internal Error -- shutting down: wanted %d from %d, now at %d\n",cbi,fe->firstcb,*cbp)); DumpCallBackState(); - ShutDown(); + ShutDownAndCore(PANIC); } } CDelPtr(fe, cbp); @@ -492,7 +492,7 @@ static u_short *FindCBPtr(fe, host) if (safety > cbstuff.nblks) { ViceLog(0,("FindCBPtr: Internal Error -- shutting down.\n")); DumpCallBackState(); - ShutDown(); + ShutDownAndCore(PANIC); } cb = itocb(*cbp); if (cb->hhead == hostindex) @@ -695,7 +695,7 @@ AddCallBack1_r(host, fid, thead, type, locked) if (safety > cbstuff.nblks) { ViceLog(0,("AddCallBack1: Internal Error -- shutting down.\n")); DumpCallBackState(); - ShutDown(); + ShutDownAndCore(PANIC); } if (cb->hhead == h_htoi(host)) break; @@ -1361,7 +1361,7 @@ CleanupTimedOutCallBacks_r() if (ntimedout > cbstuff.nblks) { ViceLog(0,("CCB: Internal Error -- shutting down...\n")); DumpCallBackState(); - ShutDown(); + ShutDownAndCore(PANIC); } } while (cbi != *thead); *thead = 0; diff --git a/src/viced/fileserver.rc b/src/viced/fileserver.rc index 5d912d655..1fbc5cdda 100644 --- a/src/viced/fileserver.rc +++ b/src/viced/fileserver.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS File Server" +#define AFS_VERINFO_NAME "fileserver" +#define AFS_VERINFO_FILENAME "fileserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/viced/host.c b/src/viced/host.c index cd64a6814..90f1556e0 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/viced/host.c,v 1.1.1.13 2003/04/13 19:08:13 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/viced/host.c,v 1.1.1.14 2003/07/30 17:13:36 hartmans Exp $"); #include #include @@ -1059,9 +1059,9 @@ retry: { char uuid1[128], uuid2[128]; if (identP->valid) - afsUUID_to_string(identP->uuid, uuid1, 127); + afsUUID_to_string(&identP->uuid, uuid1, 127); if (host->interface) - afsUUID_to_string(host->interface->uuid, uuid2, 127); + afsUUID_to_string(&host->interface->uuid, uuid2, 127); ViceLog(0, ("CB: new identity for host %s:%d, deleting(%x %x %s %s)\n", afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port), @@ -1217,7 +1217,7 @@ static MapName_r(aname, acell, aval) return 0; } foreign = 1; /* attempt cross-cell authentication */ - tname = (char *) malloc(anamelen+cnamelen+2); + tname = (char *) malloc(PR_MAXNAMELEN); strcpy(tname, aname); tname[anamelen] = '@'; strcpy(tname+anamelen+1, acell); diff --git a/src/viced/viced.c b/src/viced/viced.c index f34308035..6bf9680be 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -19,7 +19,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/viced/viced.c,v 1.1.1.10 2003/04/13 19:08:14 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/viced/viced.c,v 1.1.1.11 2003/07/30 17:13:36 hartmans Exp $"); #include #include @@ -229,11 +229,13 @@ static void ResetCheckSignal(void) #if defined(AFS_HPUX_ENV) signo = SIGPOLL; -#elif defined(AFS_NT40_ENV) +#else +#if defined(AFS_NT40_ENV) signo = SIGUSR2; #else signo = SIGXCPU; #endif +#endif #if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV) softsig_signal(signo, CheckSignal_Signal); @@ -898,7 +900,7 @@ int dopanic; } #endif DFlush(); - PrintCounters(); + if (!dopanic) PrintCounters(); /* do not allows new reqests to be served from now on, all new requests are returned with an error code of RX_RESTARTING ( transient failure ) */ diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 8b4daebf9..b04dc04c1 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -26,8 +26,8 @@ SHELL = /bin/sh include ../config/Makefile.${SYS_NAME} -KERNELDIR=../libafs/ -UKERNELDIR=../libuafs/ +KERNELDIR=../libafs +UKERNELDIR=../libuafs COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et CFLAGS=${DBUG} -I. -I.. -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} diff --git a/src/vlserver/vlserver.rc b/src/vlserver/vlserver.rc index cac9e1393..130872ad8 100644 --- a/src/vlserver/vlserver.rc +++ b/src/vlserver/vlserver.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Volume Location Database Server" +#define AFS_VERINFO_NAME "vlserver" +#define AFS_VERINFO_FILENAME "vlserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/vol/salvager.rc b/src/vol/salvager.rc index 83e45ef8c..d80d22c3a 100644 --- a/src/vol/salvager.rc +++ b/src/vol/salvager.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Volume Salvager Command" +#define AFS_VERINFO_NAME "vol-salvage" +#define AFS_VERINFO_FILENAME "salvager.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index d679720a4..8b0f0d17f 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -91,7 +91,7 @@ Vnodes with 0 inode pointers in RW volumes are now deleted. #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/vol/vol-salvage.c,v 1.1.1.12 2003/04/13 19:08:19 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/vol/vol-salvage.c,v 1.1.1.13 2003/07/30 17:13:41 hartmans Exp $"); #include #include @@ -398,6 +398,9 @@ char * ToString(char *s); void AskOffline(VolumeId volumeId); void AskOnline(VolumeId volumeId, char *partition); void CheckLogFile(void); +#ifndef AFS_NT40_ENV +void TimeStampLogFile(void); +#endif void ClearROInUseBit(struct VolumeSummary *summary); void CopyAndSalvage(register struct DirSummary *dir); int CopyInode(Device device, Inode inode1, Inode inode2, int rwvolume); @@ -571,11 +574,13 @@ static handleit(as) if ( ti = as->parms[17].items) { /* -syslogfacility */ useSyslogFacility = atoi(ti->data); } + if (ti = as->parms[18].items) { /* -datelogs */ + TimeStampLogFile(); + } #endif - #ifdef FAST_RESTART - if (ti = as->parms[18].items) { /* -DontSalvage */ + if (ti = as->parms[19].items) { /* -DontSalvage */ printf("Exiting immediately without salvage. Look into the FileLog"); printf(" to find volumes which really need to be salvaged!\n"); Exit(0); @@ -753,6 +758,7 @@ char **argv; to deal with screwy offsets for cmd params */ cmd_AddParm(ts, "-syslog", CMD_FLAG, CMD_OPTIONAL, "Write salvage log to syslogs"); cmd_AddParm(ts, "-syslogfacility", CMD_SINGLE, CMD_OPTIONAL, "Syslog facility number to use"); + cmd_AddParm(ts, "-datelogs", CMD_FLAG, CMD_OPTIONAL, "Include timestamp in logfile filename"); #ifdef FAST_RESTART cmd_AddParm(ts, "-DontSalvage", CMD_FLAG, CMD_OPTIONAL, "Don't salvage. This my be set in BosConfig to let the fileserver restart immediately after a crash. Bad volumes will be taken offline"); @@ -3588,6 +3594,26 @@ void CheckLogFile(void) } } +#ifndef AFS_NT40_ENV +void TimeStampLogFile(void) +{ + char stampSlvgLog[AFSDIR_PATH_MAX]; + struct tm *lt; + time_t now; + + now = time(0); + lt = localtime(&now); + sprintf(stampSlvgLog, "%s.%04d-%02d-%02d.%02d:%02d:%02d", + AFSDIR_SERVER_SLVGLOG_FILEPATH, + lt->tm_year + 1900, lt->tm_mon + 1, lt->tm_mday, + lt->tm_hour, lt->tm_min, lt->tm_sec); + + /* try to link the logfile to a timestamped filename */ + /* if it fails, oh well, nothing we can do */ + link(AFSDIR_SERVER_SLVGLOG_FILEPATH, stampSlvgLog); +} +#endif + void showlog(void) { char line[256]; diff --git a/src/vol/volinfo.rc b/src/vol/volinfo.rc index 79e8ab6f0..0c97ad586 100644 --- a/src/vol/volinfo.rc +++ b/src/vol/volinfo.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Volume Diagnostic Command" +#define AFS_VERINFO_NAME "volinfo" +#define AFS_VERINFO_FILENAME "volinfo.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c index ff66f1128..600474fbe 100644 --- a/src/volser/volprocs.c +++ b/src/volser/volprocs.c @@ -10,7 +10,7 @@ #include #include -RCSID("$Header: /tmp/cvstemp/openafs/src/volser/volprocs.c,v 1.1.1.8 2001/10/14 18:07:30 hartmans Exp $"); +RCSID("$Header: /tmp/cvstemp/openafs/src/volser/volprocs.c,v 1.1.1.9 2003/07/30 17:13:44 hartmans Exp $"); #include #include @@ -198,7 +198,7 @@ Volume * vp; V_parentId(vp), 1, 1, 0); assert(VALID_INO(inodeNumber)); - SetSalvageDirHandle(&dir, V_id(vp), vp->device, inodeNumber); + SetSalvageDirHandle(&dir, V_parentId(vp), vp->device, inodeNumber); did.Volume = V_id(vp); did.Vnode = (VnodeId)1; did.Unique = 1; diff --git a/src/volser/volserver.rc b/src/volser/volserver.rc index cc298d19e..074216fa8 100644 --- a/src/volser/volserver.rc +++ b/src/volser/volserver.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Volume Server" +#define AFS_VERINFO_NAME "volserver" +#define AFS_VERINFO_FILENAME "volserver.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/volser/vos.rc b/src/volser/vos.rc index 1ed26fa5b..cc39de029 100644 --- a/src/volser/vos.rc +++ b/src/volser/vos.rc @@ -10,6 +10,8 @@ /* Define VERSIONINFO resource */ #define AFS_VERINFO_FILE_DESCRIPTION "AFS Volume Command" +#define AFS_VERINFO_NAME "vos" +#define AFS_VERINFO_FILENAME "vos.exe" #include "AFS_component_version_number.h" #include "..\config\NTVersioninfo.rc" diff --git a/src/xstat/Makefile.in b/src/xstat/Makefile.in index 81cb339e9..70fea8d11 100644 --- a/src/xstat/Makefile.in +++ b/src/xstat/Makefile.in @@ -35,7 +35,7 @@ CFLAGS=${DBUG} -I. \ -I${TOP_SRCDIR}/config \ -I${TOP_INCDIR} \ -I${TOP_INCDIR}/afs \ - -I/usr/include ${XCFLAGS} + ${XCFLAGS} RPCINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/rx/rx.h -- 2.39.5