use new com_err library; update Kerberos com_err usage

diff --git a/server/mr_glue.c b/server/mr_glue.c
index a373684f8ae15e89d6c7203efd2670ed512afae4..aa851d3163c05f49cc9f74ea2f419a9fabf65a50 100644 (file)
--- a/server/mr_glue.c
+++ b/server/mr_glue.c
@@ -17,7 +17,7 @@ static char *rcsid_sms_glue_c = "$Header$";
 
 #include <mit-copyright.h>
 #include "sms_server.h"
-#include <krb.h>               /* XXX for error codes */
+#include <krb_et.h>
 #include <pwd.h>
 #include "query.h"
 
@@ -26,7 +26,7 @@ static int already_connected = 0;
 #define CHECK_CONNECTED { if (!already_connected) return SMS_NOT_CONNECTED; }
 
 static client pseudo_client;
-extern int krb_err_base, errno;
+extern int errno;
 extern char *malloc(), *whoami;
 extern time_t now;
 
@@ -38,8 +38,8 @@ char *server;
 
     if (already_connected) return SMS_ALREADY_CONNECTED;
 
-    init_sms_err_tbl();
-    init_krb_err_tbl();
+    initialize_sms_error_table();
+    initialize_krb_error_table();
     bzero((char *)&pseudo_client, sizeof(pseudo_client)); /* XXX */
 
     query_timeout = 0;
@@ -73,7 +73,7 @@ char *prog;
     
     CHECK_CONNECTED;
     pw = getpwuid(getuid());
-    if (!pw) return (KDC_PR_UNKNOWN + krb_err_base); /* XXX hack (we 
+    if (!pw) return (KDC_PR_UNKNOWN + ERROR_TABLE_BASE_krb); /* XXX hack (we 
                                                    * need an extended 
                                                    * error code table)
                                                    */

diff --git a/server/mr_main.c b/server/mr_main.c
index 9e61f2430df618b64bed1c20b9207287d9a5a4a9..351f38500731fb845b77b225ca88fcc5693d52ec 100644 (file)
--- a/server/mr_main.c
+++ b/server/mr_main.c
@@ -24,6 +24,7 @@ static char *rcsid_sms_main_c = "$Header$";
 #include <sys/signal.h>
 #include <sys/wait.h>
 #include "sms_server.h"
+#include <krb_et.h>
 
 extern CONNECTION newconn, listencon;
 
@@ -77,8 +78,8 @@ main(argc, argv)
        /*
         * Error handler init.
         */
-       init_sms_err_tbl();
-       init_krb_err_tbl();
+       initialize_sms_error_table();
+       initialize_krb_error_table();
        set_com_err_hook(sms_com_err);
        setlinebuf(stderr);
        

diff --git a/server/mr_sauth.c b/server/mr_sauth.c
index 3930979a6a4ce3e1cfe4309a44c37949451ca9a1..b0d1b0a4edb3356b5f9b4d028c92fef1fa907a00 100644 (file)
--- a/server/mr_sauth.c
+++ b/server/mr_sauth.c
@@ -13,10 +13,10 @@
 static char *rcsid_sms_sauth_c = "$Header$";
 #endif lint
 
-extern int krb_err_base;
 #include <mit-copyright.h>
 #include <strings.h>
 #include "sms_server.h"
+#include <krb_et.h>
 
 extern char buf1[];
 extern char *whoami;
@@ -38,7 +38,6 @@ do_auth(cl)
        AUTH_DAT ad;
        int status;
        char buf[REALM_SZ+INST_SZ+ANAME_SZ];
-       extern int krb_err_base;
        static char *unknown = "???";
        
        if (cl->clname) {
@@ -57,8 +56,8 @@ do_auth(cl)
        auth.mbz = 0;
        
        if ((status = krb_rd_req (&auth, "sms", "sms", cl->haddr.sin_addr,
-                                &ad, "")) != KSUCCESS) {
-               status += krb_err_base;
+                                &ad, "")) != 0) {
+               status += ERROR_TABLE_BASE_krb;
                cl->reply.sms_status = status;
                if (log_flags & LOG_RES)
                        com_err(whoami, status, "(authentication failed)");