[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  26e75cf s3: gse: use "gensec_gssapi:requested_life_time"
       via  9862312 s3:smbd: map nterror on smb2_flush errorpath
      from  1957bf1 s3:auth: make use of make_{server,session}_info_anonymous()

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


- Log -----------------------------------------------------------------
commit 26e75cf661a4482291b4faafd90f50f200eac32c
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Mar 7 12:52:15 2018 +0100

    s3: gse: use "gensec_gssapi:requested_life_time"
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Mar 16 07:48:37 CET 2018 on sn-devel-144

commit 98623129446672521b7fa41d3457b8ce95db828c
Author: Anton Nefedov via samba-technical <samba-technical at lists.samba.org>
Date:   Thu Mar 15 14:38:41 2018 +0300

    s3:smbd: map nterror on smb2_flush errorpath
    
    smbd_smb2_flush_recv() expects nterror in tevent_req, and otherwise
    aborts in tevent_req_is_nterror()
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13338
    
    Signed-off-by: Anton Nefedov <anton.nefedov at virtuozzo.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/librpc/crypto/gse.c | 10 ++++++++--
 source3/smbd/smb2_flush.c   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 5cb6647..70e29c2 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -352,6 +352,12 @@ static NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
 	char *server_principal = NULL;
 	char *server_realm = NULL;
 	bool fallback = false;
+	OM_uint32 time_req = 0;
+
+	time_req = gensec_setting_int(gensec_security->settings,
+				      "gensec_gssapi",
+				      "requested_life_time",
+				      time_req);
 
 	in_data.value = token_in->data;
 	in_data.length = token_in->length;
@@ -419,7 +425,7 @@ static NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
 					       gse_ctx->server_name,
 					       &gse_ctx->gss_mech,
 					       gse_ctx->gss_want_flags,
-					       0,
+					       time_req,
 					       GSS_C_NO_CHANNEL_BINDINGS,
 					       &in_data,
 					       NULL,
@@ -476,7 +482,7 @@ static NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx,
 					gse_ctx->server_name,
 					&gse_ctx->gss_mech,
 					gse_ctx->gss_want_flags,
-					0, GSS_C_NO_CHANNEL_BINDINGS,
+					time_req, GSS_C_NO_CHANNEL_BINDINGS,
 					&in_data, NULL, &out_data,
 					&gse_ctx->gss_got_flags, &time_rec);
 	goto init_sec_context_done;
diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c
index d077c62..51584ca 100644
--- a/source3/smbd/smb2_flush.c
+++ b/source3/smbd/smb2_flush.c
@@ -198,7 +198,7 @@ static void smbd_smb2_flush_done(struct tevent_req *subreq)
 	ret = SMB_VFS_FSYNC_RECV(subreq, &vfs_aio_state);
 	TALLOC_FREE(subreq);
 	if (ret == -1) {
-		tevent_req_error(req, vfs_aio_state.error);
+		tevent_req_nterror(req, map_nt_error_from_unix(vfs_aio_state.error));
 		return;
 	}
 	tevent_req_done(req);


-- 
Samba Shared Repository