diff options
| author | thorpej <thorpej@pkgsrc.org> | 2000-08-10 02:25:28 +0000 |
|---|---|---|
| committer | thorpej <thorpej@pkgsrc.org> | 2000-08-10 02:25:28 +0000 |
| commit | 61e0d5c07e3bfda8ef979aa806065a226c3e0e62 (patch) | |
| tree | 76a910ee3261cb7be07dc6d56de35bc2cc891b02 /security | |
| parent | f20c3003fca425e977a03eacdb19a74a9b22acd8 (diff) | |
| download | pkgsrc-61e0d5c07e3bfda8ef979aa806065a226c3e0e62.tar.gz | |
Make this work with Heimdal Kerberos 5. Requires fleshed-out MCC
support in Heimdal.
Diffstat (limited to 'security')
| -rw-r--r-- | security/sudo/files/patch-sum | 5 | ||||
| -rw-r--r-- | security/sudo/patches/patch-aa | 33 | ||||
| -rw-r--r-- | security/sudo/patches/patch-af | 15 |
3 files changed, 48 insertions, 5 deletions
diff --git a/security/sudo/files/patch-sum b/security/sudo/files/patch-sum index cebe98e47e1..5d6983c0e5b 100644 --- a/security/sudo/files/patch-sum +++ b/security/sudo/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.5 2000/06/06 11:07:20 mjl Exp $ +$NetBSD: patch-sum,v 1.6 2000/08/10 02:25:28 thorpej Exp $ +MD5 (patch-aa) = 68260f006c6494880c49df100e27af61 MD5 (patch-ab) = da4fc241e92a8a244c923d083bbadaf0 -MD5 (patch-af) = 214569add14c4ee1e4e3fc99bffdaf69 +MD5 (patch-af) = 05a2993c496702b08cc35f7e2b198ce1 diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa new file mode 100644 index 00000000000..f74ee9d98a6 --- /dev/null +++ b/security/sudo/patches/patch-aa @@ -0,0 +1,33 @@ +$NetBSD: patch-aa,v 1.7 2000/08/10 02:25:30 thorpej Exp $ + +--- auth/kerb5.c.orig Tue Oct 12 19:34:55 1999 ++++ auth/kerb5.c Wed Aug 9 17:34:11 2000 +@@ -266,8 +266,8 @@ + } + + /* Extract the name directly. Yow. */ +- strncpy(phost, krb5_princ_component(sudo_context, princ, 1)->data, +- sizeof(phost) - 1); ++ /* XXX XXX XXX */ ++ strncpy(phost, princ->name.name_string.val[0], sizeof(phost) - 1); + phost[sizeof(phost) - 1] = '\0'; + + /* +@@ -276,7 +276,7 @@ + * and enctype is currently ignored anyhow.) + */ + if (error = krb5_kt_read_service_key(sudo_context, NULL, princ, 0, +- ENCTYPE_DES_CBC_MD5, &keyblock)) { ++ ETYPE_DES_CBC_MD5, &keyblock)) { + /* Keytab or service key does not exist. */ + log_error(NO_EXIT, + "%s: host service key not found: %s", auth_name, +@@ -301,7 +301,7 @@ + NULL, NULL, NULL); + cleanup: + if (packet.data) +- krb5_free_data_contents(sudo_context, &packet); ++ krb5_data_free(&packet); + krb5_free_principal(sudo_context, princ); + + if (error) diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af index 5206f7192fd..3c9da6c4415 100644 --- a/security/sudo/patches/patch-af +++ b/security/sudo/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.7 2000/06/06 11:07:21 mjl Exp $ +$NetBSD: patch-af,v 1.8 2000/08/10 02:25:31 thorpej Exp $ ---- configure.in.orig Tue Jun 6 12:49:45 2000 -+++ configure.in Tue Jun 6 12:54:34 2000 +--- configure.in.orig Fri Mar 24 12:14:04 2000 ++++ configure.in Wed Aug 9 17:13:17 2000 @@ -167,6 +167,19 @@ ;; esac]) @@ -44,3 +44,12 @@ $NetBSD: patch-af,v 1.7 2000/06/06 11:07:21 mjl Exp $ SUDO_LDFLAGS="${SUDO_LDFLAGS} -L/usr/local/lib" elif test -f "/usr/local/kerberos/lib/libkrb5.a"; then SUDO_LDFLAGS="${SUDO_LDFLAGS} -L/usr/local/kerberos/lib" +@@ -1486,7 +1503,7 @@ + echo 'Unable to locate kerberos 5 libraries, you will have to edit the Makefile and add -L/path/to/krb/libs to SUDO_LDFLAGS' + fi + +- SUDO_LIBS="${SUDO_LIBS} -lkrb5 -lk5crypto -lcom_err" ++ SUDO_LIBS="${SUDO_LIBS} -lkrb5 -lasn1 -lcrypto -lroken -lcom_err" + AUTH_OBJS="${AUTH_OBJS} kerb5.o" + fi + |