Compile without krb4.

[moira.git] / update / ticket.c

diff --git a/update/ticket.c b/update/ticket.c
index b886631cb099f451c3efe81617c88dd1dd0c77ae..50bed8001570d41070ac4a827282280f9143e603 100644 (file)
--- a/update/ticket.c
+++ b/update/ticket.c
@@ -13,7 +13,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_KRB4
 #include <krb.h>
+#else
+#define KTEXT void*
+#include <mr_krb.h>
+#endif
 #include <krb5.h>
 #include <update.h>
 
@@ -22,16 +27,22 @@ RCSID("$Header$");
 static char realm[REALM_SZ];
 static char master[INST_SZ] = "sms";
 static char service[ANAME_SZ] = "rcmd";
+#ifdef HAVE_KRB4
 des_cblock session;
+#endif
 krb5_context context = NULL;
 
+static int get_mr_krb5_tgt(krb5_context context, krb5_ccache ccache);
+#ifdef HAVE_KRB4
 static int get_mr_tgt(void);
+#endif
 
-int get_mr_krb5_update_ticket(char *host, krb5_data auth)
+int get_mr_krb5_update_ticket(char *host, krb5_data *auth)
 {
   krb5_auth_context auth_con = NULL;
   krb5_ccache ccache = NULL;
   krb5_error_code code;
+  int pass = 1;
 
   code = krb5_init_context(&context);
   if (code)
@@ -45,8 +56,23 @@ int get_mr_krb5_update_ticket(char *host, krb5_data auth)
   if (code)
     goto out;
 
-  code = krb5_mk_req(context, &auth_con, NULL, "host", host, NULL, ccache,
-                    &auth);
+ try_it:
+  code = krb5_mk_req(context, &auth_con, 0, "host", host, NULL, ccache,
+                    auth);
+  if (code)
+    {
+      if (pass == 1)
+       {
+         if ((code = get_mr_krb5_tgt(context, ccache)))
+           {
+             com_err(whoami, code, "can't get Kerberos v5 TGT");
+             return code;
+           }
+         pass++;
+         goto try_it;
+       }
+      com_err(whoami, code, "in krb5_mk_req");
+    }
 
  out:
   if (ccache)
@@ -56,8 +82,41 @@ int get_mr_krb5_update_ticket(char *host, krb5_data auth)
   return code;
 }
 
+int get_mr_krb5_tgt(krb5_context context, krb5_ccache ccache)
+{
+  krb5_creds my_creds;
+  krb5_principal me = NULL;
+  krb5_error_code code;
+
+  memset(&my_creds, 0, sizeof(my_creds));
+
+  code = krb5_parse_name(context, master, &me);
+  if (code)
+    goto out;
+  
+  code = krb5_get_init_creds_keytab(context, &my_creds, me, NULL, NULL, NULL, NULL);
+  if (code)
+    goto out;
+  
+  code = krb5_cc_initialize(context, ccache, me);
+  if (code)
+    goto out;
+
+  code = krb5_cc_store_cred(context, ccache, &my_creds);
+  if (code)
+    goto out;
+
+ out:
+  if (me)
+    krb5_free_principal(context, me);
+  krb5_free_cred_contents(context, &my_creds);
+
+  return code;
+}
+
 int get_mr_update_ticket(char *host, KTEXT ticket)
 {
+#ifdef HAVE_KRB4
   int code, pass;
   char phost[BUFSIZ];
   CREDENTIALS cr;
@@ -93,8 +152,12 @@ try_it:
       memcpy(session, cr.session, sizeof(session));
     }
   return code;
+#else
+  return MR_NO_KRB4;
+#endif
 }
 
+#ifdef HAVE_KRB4
 static int get_mr_tgt(void)
 {
   int code;
@@ -109,3 +172,4 @@ static int get_mr_tgt(void)
   else
     return code + ERROR_TABLE_BASE_krb;
 }
+#endif