svn commit: samba r3609 - in branches/SAMBA_4_0/source/libcli/auth: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-11-08 01:46:00 +0000 (Mon, 08 Nov 2004)
New Revision: 3609

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3609

Log:
Lets spew out a few less error messages for tridge, and hope to get
krb5 going on recent heimdal installs.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/clikrb5.c
   branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/clikrb5.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/clikrb5.c	2004-11-08 01:21:45 UTC (rev 3608)
+++ branches/SAMBA_4_0/source/libcli/auth/clikrb5.c	2004-11-08 01:46:00 UTC (rev 3609)
@@ -326,7 +326,7 @@
 	}
 	
 	if ((retval = krb5_cc_get_principal(context, ccache, &creds.client))) {
-		DEBUG(1,("krb5_cc_get_principal failed (%s)\n", 
+		DEBUG(10,("krb5_cc_get_principal failed (%s)\n", 
 			 error_message(retval)));
 		goto cleanup_creds;
 	}

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-11-08 01:21:45 UTC (rev 3608)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c	2004-11-08 01:46:00 UTC (rev 3609)
@@ -353,10 +353,6 @@
 					      gensec_security->target.principal,
 					      gensec_krb5_state->krb5_ccache, 
 					      &gensec_krb5_state->ticket);
-			if (ret) {
-				DEBUG(1,("ads_krb5_mk_req failed (%s)\n", 
-					 error_message(ret)));
-			}
 		} else {
 			krb5_data in_data;
 			const char *hostname = gensec_get_target_hostname(gensec_security);
@@ -374,10 +370,6 @@
 					  hostname,
 					  &in_data, gensec_krb5_state->krb5_ccache, 
 					  &gensec_krb5_state->ticket);
-			if (ret) {
-				DEBUG(1,("krb5_mk_req failed (%s)\n", 
-					 error_message(ret)));
-			}
 			
 		}
 		switch (ret) {
@@ -391,13 +383,14 @@
 		case KRB5KRB_AP_ERR_TKT_EXPIRED:
 		case KRB5_CC_END:
 		{
-			DEBUG(3, ("kerberos: %s\n", 
+			DEBUG(3, ("kerberos (mk_req) failed: %s\n", 
 				  error_message(ret)));
 			/* fall down to remaining code */
 		}
 		/* just don't print a message for these really ordinary messages */
 		case KRB5_FCC_NOFILE:
 		case KRB5_CC_NOTFOUND:
+		case ENOENT:
 		{
 			char *password;
 			time_t kdc_time = 0;