New database and column names for Moira2.

[moira.git] / update / ticket.c

diff --git a/update/ticket.c b/update/ticket.c
index 4d4c90f85cceff0647aae37a8149bc6bbcaae9d6..67bdfd5d74ab95391a7002b0c3f988a4d6b2a60e 100644 (file)
--- a/update/ticket.c
+++ b/update/ticket.c
@@ -18,30 +18,30 @@ static char *rcsid_ticket_c = "$Header$";
 #include <strings.h>
 #include <update.h>
 #include <com_err.h>
+#include <krb_et.h>
 
 /* too bad we can't set the pathname easily */
 static char *srvtab = KEYFILE; /* default == /etc/srvtab */
 static char realm[REALM_SZ];
-static char master[] = "sms";
-static char service[] = "rcmd";
+static char master[INST_SZ] = "sms";
+static char service[ANAME_SZ] = "rcmd";
 
-extern char *tkt_string(), *PrincipalHostname();
-extern int krb_err_base;
 
 static init()
 {
     static int initialized = 0;
 
     if (!initialized) {
-       get_krbrlm(realm, 1);
-       init_krb_err_tbl();
+       if (krb_get_lrealm(realm, 1))
+           strcpy(realm, KRB_REALM);
+       initialize_krb_error_table();
        initialized=1;
     }
 }
 
 
 int
-get_sms_update_ticket(host, ticket)
+get_mr_update_ticket(host, ticket)
      char *host;
      KTEXT ticket;
 {
@@ -51,32 +51,39 @@ get_sms_update_ticket(host, ticket)
 
      pass = 1;
      init();
-     strcpy(phost, PrincipalHostname(host));
+     strcpy(phost, krb_get_phost(host));
  try_it:
      code = krb_mk_req(ticket, service, phost, realm, (long)0);
-     if (code)
-       code += krb_err_base;
+     if (code) {
+        code += ERROR_TABLE_BASE_krb;
+        com_err(whoami, code, "in krb_mk_req");
+     }
+#ifdef notdef
      if (pass == 1) {
         /* maybe we're taking too long? */
-        if ((code = get_sms_tgt()) != 0) {
-            /* don't need phost buffer any more */
+        if ((code = get_mr_tgt()) != 0) {
             com_err(whoami, code, " can't get Kerberos TGT");
             return(code);
         }
         pass++;
         goto try_it;
      }
+#endif /* notdef */
      return(code);
 }
 
 int
-get_sms_tgt()
+get_mr_tgt()
 {
     register int code;
+    char linst[INST_SZ], kinst[INST_SZ];
+
     init();
-    code = get_svc_in_tkt(master, "", realm, "krbtgt", realm, 1, srvtab);
+    linst[0] = '\0';
+    strcpy(kinst, "krbtgt");
+    code = krb_get_svc_in_tkt(master, linst, realm, kinst, realm, 1, srvtab);
     if (!code)
        return(0);
     else
-       return(code + krb_err_base);
+       return(code + ERROR_TABLE_BASE_krb);
 }