use new com_err library; update Kerberos com_err usage

[moira.git] / server / mr_glue.c

diff --git a/server/mr_glue.c b/server/mr_glue.c
index 7155c9abd43756ad1d98e1b993bf767a871f04e5..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,20 +26,23 @@ 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;
 
-sms_connect()
+sms_connect(server)
+char *server;
 {
     register int status;
+    extern int query_timeout;
 
     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;
     status =  sms_open_database();
     if (!status) already_connected = 1;
     return status;
@@ -70,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)
                                                    */
@@ -193,15 +196,3 @@ trigger_dcm(dummy0, dummy1, cl)
                return(SMS_SUCCESS);
        }
 }
-
-
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */