From 79785af34181c009bc05898c483e601372ac8c2c Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 7 Dec 2005 06:20:17 +0000 Subject: [PATCH] - Modify fstrace to load its catalog from /usr/share/openafs. --- debian/changelog | 3 ++- debian/openafs-client.install | 2 ++ src/venus/fstrace.c | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3daa787a..2dfc189a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ openafs (1.4.0-2) unstable; urgency=low - openafs-dbserver: Install prdb_check and vldb_check. - openafs-fileserver: Install voldump. - openafs-client: Install fstrace, scout, and up (as afs-up). + - Modify fstrace to load its catalog from /usr/share/openafs. * Do not install kpwvalid. The default version does little useful and the kpwvalid binary must be in AFS for it to take effect. * Overhaul the way kernel modules are built. @@ -18,7 +19,7 @@ openafs (1.4.0-2) unstable; urgency=low * Suggest the same PAM settings for pam_krb5 that libpam-krb5 does. * Update uploader address. - -- + -- Russ Allbery Tue, 6 Dec 2005 22:00:11 -0800 openafs (1.4.0-1) unstable; urgency=low diff --git a/debian/openafs-client.install b/debian/openafs-client.install index 376df22bf..4b686a317 100644 --- a/debian/openafs-client.install +++ b/debian/openafs-client.install @@ -21,3 +21,5 @@ dest/etc/fms usr/sbin dest/etc/fstrace usr/sbin dest/root.client/usr/vice/etc/afsd sbin + +dest/root.client/usr/vice/etc/C/afszcm.cat usr/share/openafs diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index 1b2a59684..8d156e543 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -1471,7 +1471,7 @@ catgets1(nl_catd catd, int setno, int msgno, char *def) */ #ifndef RPC_NLS_FORMAT -#define RPC_NLS_FORMAT "%s.cat" +#define RPC_NLS_FORMAT "/usr/share/openafs/%s.cat" #endif dce1_error_inq_text(status_to_convert, error_text, status) @@ -1488,7 +1488,8 @@ dce1_error_inq_text(status_to_convert, error_text, status) char component_name[4]; char *facility_name; char filename_prefix[7]; - char nls_filename[11]; + /* strlen("/usr/share/openafs/") + 6 + strlen(".cat") + 1 */ + char nls_filename[19 + 6 + 4 + 1]; char alt_filename[80]; char *message; #if defined(AFS_64BITPOINTER_ENV) -- 2.39.5