[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  8936281 gss: samba member server returns incorrect error code with some versions of krb5
      from  6e6436a ctdb-build: Don't try to install unavailable prebuilt manpages

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


- Log -----------------------------------------------------------------
commit 8936281bcc9bef19ede99146475dd867ed5d3873
Author: Richard Sharpe <rsharpe at samba.org>
Date:   Tue Nov 10 20:50:18 2015 -0800

    gss: samba member server returns incorrect error code with some versions of krb5
    
    As per Simo's comments in https://bugzilla.redhat.com/show_bug.cgi?id=1279249
    we need Samba to return the correct thing to the client when gss_accept_sec_context
    returns a token along with an error.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11592
    
    Signed-off-by: Richard Sharpe <rsharpe at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Nov 12 01:44:08 CET 2015 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 33a32c3..9c4cce2 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -475,8 +475,17 @@ static NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx,
 						GSS_C_NO_BUFFER);
 		}
 
-		status = NT_STATUS_LOGON_FAILURE;
-		goto done;
+		/*
+		 * If we got an output token, make Windows aware of it
+		 * by telling it that more processing is needed
+		 */
+		if (out_data.length > 0) {
+			status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+			/* Fall through to handle the out token */
+		} else {
+			status = NT_STATUS_LOGON_FAILURE;
+			goto done;
+		}
 	}
 
 	/* we may be told to return nothing */


-- 
Samba Shared Repository