libadmin: add support for UAE error translation

Routine util_AdminErrorCodeTranslate() provides the support for error
translation that is used by the libadmin package and several Windows utilities,
including the Windows implementation of translate_et (translate_et_nt.c).

Enhance it so the Windows translate_et can translate UAE errors.
No changes are required for translate_et_nt.c.

Note: this may be unit-tested under Unix via a libadmin test:
$ src/libadmin/test/afscp UtilErrorTranslate -error 49733388
49733388 -> Permission denied

Change-Id: Iee85e09813e3488558c0f1c6682d0049b912abc7
Reviewed-on: https://gerrit.openafs.org/14648
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index dc19208..b985b54 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -41,7 +41,7 @@ afszcm.cat: afs_trace.msf
                        ${GENCAT} afszcm.cat afs_trace.msf ;; \
        esac
 
-depinstall: afszcm.cat AFS_component_version_number.c \
+depinstall: afszcm.cat unified_afs.c unified_afs.h AFS_component_version_number.c \
        ${TOP_INCDIR}/afs/afs_consts.h \
        ${TOP_INCDIR}/afs/afs.h \
        ${TOP_INCDIR}/afs/osi_inode.h \

diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in
index f819663..223493a 100644 (file)
--- a/src/libadmin/adminutil/Makefile.in
+++ b/src/libadmin/adminutil/Makefile.in
@@ -11,6 +11,7 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 
 RXKAD = ../../rxkad
+AFS = ../../afs
 AUTH = ../../auth
 BOZO = ../../bozo
 CMD = ../../cmd
@@ -140,6 +141,7 @@ ERROROBJS = \
        cmd_errors.o \
        pterror.o \
        uerrors.o \
+       unified_afs.o \
        vl_errors.o \
        acfg_errors.o \
        volerr.o
@@ -211,6 +213,9 @@ vl_errors.o: ${VLSERVER}/vl_errors.c
 volerr.o: ${VOLSER}/volerr.c
        $(AFS_CCRULE) $(VOLSER)/volerr.c
 
+unified_afs.o: ${AFS}/unified_afs.c
+       $(AFS_CCRULE) $(AFS)/unified_afs.c
+
 ${LIBOBJS}: ${INCLS}
 
 clean:

diff --git a/src/libadmin/adminutil/NTMakefile b/src/libadmin/adminutil/NTMakefile
index 7588dfa..a154425 100644 (file)
--- a/src/libadmin/adminutil/NTMakefile
+++ b/src/libadmin/adminutil/NTMakefile
@@ -12,6 +12,7 @@ RELDIR=libadmin\adminutil
 !include ..\..\config\NTMakefile.version
 
 RXKAD = ..\..\rxkad
+AFS = ..\..\afs
 AUTH = ..\..\auth
 BOZO = ..\..\bozo
 CMD = ..\..\cmd
@@ -114,6 +115,9 @@ VLSERVEROBJS=\
 ADMINOBJS = \
        $(OUT)\afs_utilAdmin.obj
 
+AFSOBJS=\
+       $(OUT)\unified_afs.obj
+
 DLLOBJS =\
        $(ADMINOBJS) \
        $(ERRORSOBJS) \
@@ -126,6 +130,7 @@ DLLOBJS =\
        $(VOLSEROBJS) \
        $(UBIKOBJS) \
        $(RXKADOBJS) \
+       $(AFSOBJS) \
        $(OUT)\afsadminutil.res
 
 LIBINCLUDES = \
@@ -175,6 +180,9 @@ $(OUT)\afsadminutil.res: AFS_component_version_number.h
 $(AUTHOBJS): $(AUTH)\$$(@B).c
        $(C2OBJ) -I$*(*D) $**
 
+$(AFSOBJS): $(AFS)\$$(@B).c
+       $(C2OBJ) -I$*(*D) $**
+
 $(BOZOOBJS): $(BOZO)\$$(@B).c
        $(C2OBJ) -I$*(*D) $**
 

diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index 335ad07..b713e72 100644 (file)
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -32,6 +32,7 @@
 #include <afs/bnode.h>
 #include <afs/afscbint.h>
 #include <afs/volser.h>
+#include <afs/unified_afs.h>
 
 #include "afs_AdminInternal.h"
 #include "afs_utilAdmin.h"
@@ -74,6 +75,7 @@ init_once(void)
     initialize_AU_error_table();
     initialize_AV_error_table();
     initialize_VOLS_error_table();
+    initialize_uae_error_table();
 #ifdef AFS_KRB5_ERROR_ENV
     initialize_krb5();
 #endif