1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-13 23:36:08 +00:00
freebsd-ports/net/radius/files/patch-ad
Mark Murray 59a19f9bb3 Fix this.
1) eBones/Kerberos now works with 2.2-stable
2) PREFIX is honoured
3) oddball directories are removed by pkg_delete
1997-08-26 12:17:57 +00:00

73 lines
1.9 KiB
Plaintext

--- src/rad.kerberos.c.orig Wed Sep 18 17:34:21 1996
+++ src/rad.kerberos.c Tue Aug 26 12:57:28 1997
@@ -84,7 +84,7 @@
extern int mit_passwd_to_key ();
extern int afs_passwd_to_key ();
-static int krb_pass PROTO((AUTH_REQ *, int, char *));
+static int krb_pass (AUTH_REQ *, int, char *);
#if defined(A_KERB)
static AATV akrb_aatv =
@@ -177,7 +177,8 @@
#if defined(M_KERB)
if (strcmp (authreq->direct_aatv->id, "MKERB") == 0)
{
- krbval = krb_get_in_tkt (userid, "", realm, "krbtgt", realm,
+ krbval = krb_get_in_tkt (userid, KRB_INSTANCE, realm, "krbtgt",
+ realm,
DEFAULT_TKT_LIFE, mit_passwd_to_key,
NULL, passwd);
}
@@ -192,6 +193,12 @@
}
#endif /* A_KERB */
+ /*
+ * XXX
+ * This can be spoofed fairly easily... Should attempt to authenticate
+ * to some service on this machine (e.g., radius.thishost@REALM)
+ * in order to ensure that the ticket we just got is really valid.
+ */
switch (krbval)
{
case INTK_OK:
@@ -207,6 +214,37 @@
func, krbval);
break;
}
+#ifdef M_KERB
+ /*
+ * Ticket verification code based loosely on Berkeley klogin.c 8.3
+ */
+ if (krbreturn != EV_ACK) {
+ dest_tkt();
+ memset(passwd, 0, sizeof passwd);
+ } else {
+ struct sockaddr_in sin;
+ char host[MAXHOSTNAMELEN], *p;
+ AUTH_DAT authdata;
+ KTEXT_ST ticket;
+
+ krb_get_local_addr(&sin);
+ gethostname(host, sizeof host);
+ if ((p = strchr(host, '.')) != 0)
+ *p = '\0';
+ krbval = krb_mk_req(&ticket, "radius", host, realm, 33);
+ if (krbval == KSUCCESS) {
+ krbval = krb_rd_req(&ticket, "radius", host,
+ sin.sin_addr.s_addr, &authdata,
+ "");
+ }
+ if (krbval != KSUCCESS) {
+ logit(LOG_DAEMON, LOG_ERR,
+ "Kerberos error verifying ticket for %s: %s",
+ func, krb_err_txt[krbval]);
+ krbreturn = EV_NAK;
+ }
+ }
+#endif /* M_KERB */
dest_tkt (); /* destroy the ticket */
memset (passwd, 0, sizeof (passwd));