s3-rpc_client: Added a winreg query security descriptor helper.

Signed-off-by: Günther Deschner <gd@samba.org>

2 files changed, 81 insertions, 0 deletions

diff --git a/source3/rpc_client/cli_winreg.c b/source3/rpc_client/cli_winreg.c
index 24eef033f0..c3f0c901f8 100644
--- a/source3/rpc_client/cli_winreg.c
+++ b/source3/rpc_client/cli_winreg.c
@@ -320,6 +320,58 @@ NTSTATUS dcerpc_winreg_query_sz(TALLOC_CTX *mem_ctx,
 	return status;
 }
 
+NTSTATUS dcerpc_winreg_query_sd(TALLOC_CTX *mem_ctx,
+				struct dcerpc_binding_handle *h,
+				struct policy_handle *key_handle,
+				const char *value,
+				struct security_descriptor **data,
+				WERROR *pwerr)
+{
+	WERROR result = WERR_OK;
+	NTSTATUS status;
+	DATA_BLOB blob;
+
+	status = dcerpc_winreg_query_binary(mem_ctx,
+					    h,
+					    key_handle,
+					    value,
+					    &blob,
+					    &result);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
+	if (!W_ERROR_IS_OK(result)) {
+		*pwerr = result;
+		return status;
+	}
+
+	if (data) {
+		struct security_descriptor *sd;
+		enum ndr_err_code ndr_err;
+
+		sd = talloc_zero(mem_ctx, struct security_descriptor);
+		if (sd == NULL) {
+			*pwerr = WERR_NOMEM;
+			return NT_STATUS_OK;
+		}
+
+		ndr_err = ndr_pull_struct_blob(&blob,
+					       sd,
+					       sd,
+					       (ndr_pull_flags_fn_t) ndr_pull_security_descriptor);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			DEBUG(2, ("dcerpc_winreg_query_sd: Failed to marshall "
+				  "security descriptor\n"));
+			*pwerr = WERR_NOMEM;
+			return NT_STATUS_OK;
+		}
+
+		*data = sd;
+	}
+
+	return status;
+}
+
 NTSTATUS dcerpc_winreg_set_dword(TALLOC_CTX *mem_ctx,
 				 struct dcerpc_binding_handle *h,
 				 struct policy_handle *key_handle,
diff --git a/source3/rpc_client/cli_winreg.h b/source3/rpc_client/cli_winreg.h
index e78110d556..413aba5425 100644
--- a/source3/rpc_client/cli_winreg.h
+++ b/source3/rpc_client/cli_winreg.h
@@ -140,6 +140,35 @@ NTSTATUS dcerpc_winreg_query_sz(TALLOC_CTX *mem_ctx,
 				WERROR *pwerr);
 
 /**
+ * @brief Query a key for the specified security descriptor.
+ *
+ * Get the data that is associated with the named value of a specified registry
+ * open key. This function ensures that the key is a security descriptor.
+ *
+ * @param[in]  mem_ctx  The memory context to use.
+ *
+ * @param[in]  h        The binding handle for the rpc connection.
+ *
+ * @param[in]  key_handle A handle to a key that MUST have been opened
+ *                        previously.
+ *
+ * @param[in]  value    The name of the value to query.
+ *
+ * @param[out] data     A pointer to store the data of the value.
+ *
+ * @param[out] pwerr    A pointer to a WERROR to store result of the query.
+ *
+ * @return              NT_STATUS_OK on success or a corresponding error if
+ *                      there was a problem on the connection.
+ */
+NTSTATUS dcerpc_winreg_query_sd(TALLOC_CTX *mem_ctx,
+				struct dcerpc_binding_handle *h,
+				struct policy_handle *key_handle,
+				const char *value,
+				struct security_descriptor **data,
+				WERROR *pwerr);
+
+/**
  * @brief Set a value with the specified dword data.
  *
  * @param[in]  mem_ctx  The memory context to use.