s4:heimdal: import lorikeet-heimdal-201012010201 (commit 81fe27bcc0148d410ca4617f8759b9df1a5e935c)

1 files changed, 0 insertions, 77 deletions

diff --git a/source4/heimdal/kdc/process.c b/source4/heimdal/kdc/process.c
index d3557ee6c9..4226600331 100644
--- a/source4/heimdal/kdc/process.c
+++ b/source4/heimdal/kdc/process.c
@@ -161,78 +161,6 @@ kdc_kx509(krb5_context context,
 #endif
 
 
-#ifdef KRB4
-
-static krb5_error_code 
-kdc_524(krb5_context context,
-	krb5_kdc_configuration *config,
-	krb5_data *req_buffer,
-	krb5_data *reply,
-	const char *from,
-	struct sockaddr *addr,
-	int datagram_reply,
-	int *claim)
-{
-    krb5_error_code ret;
-    Ticket ticket;
-    size_t len;
-
-    ret = decode_Ticket(req_buffer->data, req_buffer->length, &ticket, &len);
-    if (ret)
-	return ret;
-
-    *claim = 1;
-
-    ret = _kdc_do_524(context, config, &ticket, reply, from, addr);
-    free_Ticket(&ticket);
-    return ret;
-}
-
-static krb5_error_code 
-kdc_krb4(krb5_context context,
-	 krb5_kdc_configuration *config,
-	 krb5_data *req_buffer,
-	 krb5_data *reply,
-	 const char *from,
-	 struct sockaddr *addr,
-	 int datagram_reply,
-	 int *claim)
-{
-    if (_kdc_maybe_version4(req_buffer->data, req_buffer->length) == 0)
-	return -1;
-
-    *claim = 1;
-
-    return _kdc_do_version4(context, config, 
-			   req_buffer->data, req_buffer->length, 
-			   reply, from,
-			   (struct sockaddr_in*)addr);
-}
-
-static krb5_error_code 
-kdc_kaserver(krb5_context context,
-	     krb5_kdc_configuration *config,
-	     krb5_data *req_buffer,
-	     krb5_data *reply,
-	     const char *from,
-	     struct sockaddr *addr,
-	     int datagram_reply,
-	     int *claim)
-{
-    if (config->enable_kaserver == 0)
-	return -1;
-
-    *claim = 1;
-
-    return _kdc_do_kaserver(context, config, 
-			    req_buffer->data, req_buffer->length, 
-			    reply, from,
-			    (struct sockaddr_in*)addr);
-}
-
-#endif /* KRB4 */
-
-
 static struct krb5_kdc_service services[] =  {
     { KS_KRB5,		kdc_as_req },
     { KS_KRB5,		kdc_tgs_req },
@@ -242,11 +170,6 @@ static struct krb5_kdc_service services[] =  {
 #ifdef KX509
     { 0,		kdc_kx509 },
 #endif
-#ifdef KRB4
-    { 0,		kdc_524 },
-    { KS_NO_LENGTH,	kdc_krb4 },
-    { 0,		kdc_kaserver },
-#endif
     { 0, NULL }
 };