- (dtucker) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2003/07/22 13:35:22
     [auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c
     monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1
     ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h]
     remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
     test+ok henning@
 - (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support.
 - (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files.

I hope I got this right....

1 files changed, 1 insertions, 37 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 10a79c035..c7ba86ffc 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.27 2003/06/28 16:23:06 deraadt Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.28 2003/07/22 13:35:22 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -1043,42 +1043,6 @@ mm_auth_rsa_verify_response(Key *key, BIGNUM *p, u_char response[16])
         return (success);
 }
 
-#ifdef KRB4
-int
-mm_auth_krb4(Authctxt *authctxt, void *_auth, char **client, void *_reply)
-{
-        KTEXT auth, reply;
-        Buffer m;
-        u_int rlen;
-        int success = 0;
-        char *p;
-
-        debug3("%s entering", __func__);
-        auth = _auth;
-        reply = _reply;
-
-        buffer_init(&m);
-        buffer_put_string(&m, auth->dat, auth->length);
-
-        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KRB4, &m);
-        mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KRB4, &m);
-
-        success = buffer_get_int(&m);
-        if (success) {
-                *client = buffer_get_string(&m, NULL);
-                p = buffer_get_string(&m, &rlen);
-                if (rlen >= MAX_KTXT_LEN)
-                        fatal("%s: reply from monitor too large", __func__);
-                reply->length = rlen;
-                memcpy(reply->dat, p, rlen);
-                memset(p, 0, rlen);
-                xfree(p);
-        }
-        buffer_free(&m);
-        return (success);
-}
-#endif
-
 #ifdef KRB5
 int
 mm_auth_krb5(void *ctx, void *argp, char **userp, void *resp)