From d6e6de5d8fc2891a34ab28d68f774624e133fa50 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej>
Date: Thu, 10 Aug 2000 16:57:32 +0000
Subject: Don't syslog krb5_init_context() failure.  It can happen if Kerberos
 is simply not configured on the system.

---
 security/sudo/files/patch-sum  |  4 ++--
 security/sudo/patches/patch-aa | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'security/sudo')

diff --git a/security/sudo/files/patch-sum b/security/sudo/files/patch-sum
index 5d6983c0e5b..7f58fd38937 100644
--- a/security/sudo/files/patch-sum
+++ b/security/sudo/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.6 2000/08/10 02:25:28 thorpej Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/10 16:57:32 thorpej Exp $
 
-MD5 (patch-aa) = 68260f006c6494880c49df100e27af61
+MD5 (patch-aa) = 4428e39f07b82242f8d50e0c937c2165
 MD5 (patch-ab) = da4fc241e92a8a244c923d083bbadaf0
 MD5 (patch-af) = 05a2993c496702b08cc35f7e2b198ce1
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index f74ee9d98a6..3bded1a7245 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.7 2000/08/10 02:25:30 thorpej Exp $
+$NetBSD: patch-aa,v 1.8 2000/08/10 16:57:33 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 @@
++++ auth/kerb5.c	Thu Aug 10 09:48:06 2000
+@@ -88,9 +88,6 @@
+     auth->data = (VOID *) &sudo_krb5_data; /* Stash all our data here */
+ 
+     if (error = krb5_init_context(&(sudo_krb5_data.sudo_context))) {
+-	log_error(NO_EXIT|NO_MAIL, 
+-		  "%s: unable to initialize context: %s", auth->name,
+-		  error_message(error));
+ 	return(AUTH_FAILURE);
+     }
+     sudo_context = sudo_krb5_data.sudo_context;
+@@ -266,8 +263,8 @@
      }
  
      /* Extract the name directly. Yow. */
@@ -13,7 +23,7 @@ $NetBSD: patch-aa,v 1.7 2000/08/10 02:25:30 thorpej Exp $
      phost[sizeof(phost) - 1] = '\0';
  
      /*
-@@ -276,7 +276,7 @@
+@@ -276,7 +273,7 @@
       * and enctype is currently ignored anyhow.)
       */
      if (error = krb5_kt_read_service_key(sudo_context, NULL, princ, 0,
@@ -22,7 +32,7 @@ $NetBSD: patch-aa,v 1.7 2000/08/10 02:25:30 thorpej Exp $
  	/* Keytab or service key does not exist. */
  	log_error(NO_EXIT,
  		  "%s: host service key not found: %s", auth_name,
-@@ -301,7 +301,7 @@
+@@ -301,7 +298,7 @@
  			    NULL, NULL, NULL);
  cleanup:
      if (packet.data)
-- 
cgit v1.2.3