Attachment 13427 Details for Bug 11392 – additional patch for master

[patch] additional patch for master

0001-s4-cldap-netlogon-Match-Windows-2012R2-and-return-NE.patch (text/plain), 1.45 KB, created by Andrew Bartlett on 2017-07-25 02:28:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2017-07-25 02:28:46 UTC

Size: 1.45 KB

patch

obsolete

>From b08e308e4058935745b576106b149a0c16bb5749 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Tue, 25 Jul 2017 14:26:45 +1200
>Subject: [PATCH] s4-cldap/netlogon: Match Windows 2012R2 and return
> NETLOGON_NT_VERSION_5 when version unspecified
>
>The previous patch set this incorrectly to NETLOGON_NT_VERSION_1
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
> source4/dsdb/samdb/ldb_modules/netlogon.c | 2 +-
> source4/torture/ldap/netlogon.c           | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source4/dsdb/samdb/ldb_modules/netlogon.c b/source4/dsdb/samdb/ldb_modules/netlogon.c
>index f7ba2ac041c..80599b8a2a0 100644
>--- a/source4/dsdb/samdb/ldb_modules/netlogon.c
>+++ b/source4/dsdb/samdb/ldb_modules/netlogon.c
>@@ -425,7 +425,7 @@ NTSTATUS parse_netlogon_request(struct ldb_parse_tree *tree,
> 	*domain_guid = NULL;
> 	*domain_sid = NULL;
> 	*acct_control = -1;
>-	*version = 0;
>+	*version = NETLOGON_NT_VERSION_5;
> 
> 	if (tree->operation != LDB_OP_AND) goto failed;
> 
>diff --git a/source4/torture/ldap/netlogon.c b/source4/torture/ldap/netlogon.c
>index 5ee69033bd4..d61d373d64f 100644
>--- a/source4/torture/ldap/netlogon.c
>+++ b/source4/torture/ldap/netlogon.c
>@@ -584,7 +584,7 @@ static bool test_netlogon_huawei(struct torture_context *tctx,
> 			tctx,
> 			&n1);
> 	CHECK_STATUS(status, NT_STATUS_OK);
>-	CHECK_VAL(n1.ntver, NETLOGON_NT_VERSION_1);
>+	CHECK_VAL(n1.ntver, NETLOGON_NT_VERSION_5);
> 
> 	return true;
> }
>-- 
>2.11.0
>

Actions: View

Attachments on bug 11392: 11241 | 13300 | 13302 | 13303 | 13427 | 13438 | 13439