[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e217b3e libcli: Increase the debug level for expired tickets
      from  79dd22a objectclass_attrs: Only abort on a missing attribute when an attribute is both MUST and replicated

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e217b3ee41cabd8a9d5f88193413e437d268e9b0
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 1 16:32:57 2016 +0100

    libcli: Increase the debug level for expired tickets
    
    In libads/sasl.c we do a retry in this case. We should not
    spam syslog with that.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Nov  2 05:22:38 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/librpc/crypto/gse.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index e67065a..3ccbb0e 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -341,8 +341,13 @@ static NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
 		status = NT_STATUS_MORE_PROCESSING_REQUIRED;
 		break;
 	default:
-		DEBUG(0, ("gss_init_sec_context failed with [%s]\n",
-			  gse_errstr(talloc_tos(), gss_maj, gss_min)));
+		if ((gss_maj == GSS_S_FAILURE) &&
+		    (gss_min == KRB5KRB_AP_ERR_TKT_EXPIRED)) {
+			DBG_NOTICE("Ticket expired\n");
+		} else {
+			DBG_ERR("gss_init_sec_context failed with [%s]\n",
+				gse_errstr(talloc_tos(), gss_maj, gss_min));
+		}
 		status = NT_STATUS_INTERNAL_ERROR;
 		goto done;
 	}


-- 
Samba Shared Repository