62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From ec1ea05e8f1dcca14ed7a92a0645da9ff73f33d3 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Metzmacher <metze@samba.org>
|
|
Date: Thu, 5 Aug 2021 10:34:06 +0200
|
|
Subject: [PATCH 258/266] CVE-2021-3738 s4:torture/drsuapi: maintain
|
|
|
|
Conflict: NA
|
|
Reference: https://git.samba.org/samba.git/?p=samba.git;a=patch;h=ec1ea05e8f1dcca14ed7a92a0645da9ff73f33d3
|
|
|
|
priv->admin_credentials
|
|
|
|
This will be used in the next commits.
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14468
|
|
|
|
Signed-off-by: Stefan Metzmacher <metze@samba.org>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
|
[abartlet@samba.org Backported from patch for master to use
|
|
the older popt functions as master has the new common command
|
|
line handling]
|
|
---
|
|
source4/torture/rpc/drsuapi.c | 3 +++
|
|
source4/torture/rpc/drsuapi.h | 1 +
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
|
|
index 1cd595e5d8e..3e8105af07b 100644
|
|
--- a/source4/torture/rpc/drsuapi.c
|
|
+++ b/source4/torture/rpc/drsuapi.c
|
|
@@ -22,6 +22,7 @@
|
|
*/
|
|
|
|
#include "includes.h"
|
|
+#include "lib/cmdline/popt_common.h"
|
|
#include "librpc/gen_ndr/ndr_drsuapi_c.h"
|
|
#include "torture/rpc/torture_rpc.h"
|
|
#include "param/param.h"
|
|
@@ -777,6 +778,8 @@ bool torture_drsuapi_tcase_setup_common(struct torture_context *tctx, struct DsP
|
|
|
|
torture_assert(tctx, priv, "Invalid argument");
|
|
|
|
+ priv->admin_credentials = popt_get_cmdline_credentials();
|
|
+
|
|
torture_comment(tctx, "Create DRSUAPI pipe\n");
|
|
status = torture_rpc_connection(tctx,
|
|
&priv->drs_pipe,
|
|
diff --git a/source4/torture/rpc/drsuapi.h b/source4/torture/rpc/drsuapi.h
|
|
index f327c54cda4..3cc4be49d99 100644
|
|
--- a/source4/torture/rpc/drsuapi.h
|
|
+++ b/source4/torture/rpc/drsuapi.h
|
|
@@ -27,6 +27,7 @@
|
|
* Data structure common for most of DRSUAPI tests
|
|
*/
|
|
struct DsPrivate {
|
|
+ struct cli_credentials *admin_credentials;
|
|
struct dcerpc_pipe *drs_pipe;
|
|
struct policy_handle bind_handle;
|
|
struct GUID bind_guid;
|
|
--
|
|
2.23.0
|
|
|