[5475] in Moira
update/ticket.c on krb4-less systems
daemon@ATHENA.MIT.EDU (Evan Broder)
Tue Sep 22 00:37:45 2009
Message-ID: <4AB8548E.2070006@mit.edu>
Date: Tue, 22 Sep 2009 00:37:34 -0400
From: Evan Broder <broder@MIT.EDU>
MIME-Version: 1.0
To: moiradev@mit.edu
Content-Type: multipart/mixed;
boundary="------------090007050800080400010606"
This is a multi-part message in MIME format.
--------------090007050800080400010606
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
The recent addition of get_mr_krb5_tgt in update/ticket.c doesn't work
on systems built --without-krb4, because the string master is #ifdefed out.
Attached is a patch to do something more clever.
- Evan
--------------090007050800080400010606
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
name="fix-krb4-less-update-ticket.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="fix-krb4-less-update-ticket.diff"
Index: debathena-moira-4.0.0+cvs20090922/update/ticket.c
===================================================================
--- debathena-moira-4.0.0+cvs20090922.orig/update/ticket.c 2009-09-22 00:30:50.000000000 -0400
+++ debathena-moira-4.0.0+cvs20090922/update/ticket.c 2009-09-22 00:31:29.000000000 -0400
@@ -17,16 +17,17 @@
#include <krb.h>
#else
#define KTEXT void*
+#include <mr_krb.h>
#endif
#include <krb5.h>
#include <update.h>
RCSID("$Header: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/update/ticket.c,v 1.26 2009-09-08 21:59:26 zacheiss Exp $");
-#ifdef HAVE_KRB4
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;
--------------090007050800080400010606--
