2 files changed, 69 insertions, 0 deletions

diff --git a/source3/rpc_client/cli_winreg.c b/source3/rpc_client/cli_winreg.c
index d197bd78d7..640820b928 100644
--- a/source3/rpc_client/cli_winreg.c
+++ b/source3/rpc_client/cli_winreg.c
@@ -246,4 +246,47 @@ NTSTATUS dcerpc_winreg_set_sz(TALLOC_CTX *mem_ctx,
 	return status;
 }
 
+NTSTATUS dcerpc_winreg_set_expand_sz(TALLOC_CTX *mem_ctx,
+				     struct dcerpc_binding_handle *h,
+				     struct policy_handle *key_handle,
+				     const char *value,
+				     const char *data,
+				     WERROR *pwerr)
+{
+	struct winreg_String wvalue;
+	DATA_BLOB blob;
+	WERROR result = WERR_OK;
+	NTSTATUS status;
+
+	wvalue.name = value;
+	if (data == NULL) {
+		blob = data_blob_string_const("");
+	} else {
+		if (!push_reg_sz(mem_ctx, &blob, data)) {
+			DEBUG(2, ("dcerpc_winreg_set_expand_sz: Could not marshall "
+				  "string %s for %s\n",
+				  data, wvalue.name));
+			*pwerr = WERR_NOMEM;
+			return NT_STATUS_OK;
+		}
+	}
+
+	status = dcerpc_winreg_SetValue(h,
+					mem_ctx,
+					key_handle,
+					wvalue,
+					REG_EXPAND_SZ,
+					blob.data,
+					blob.length,
+					&result);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
+	if (!W_ERROR_IS_OK(result)) {
+		*pwerr = result;
+	}
+
+	return status;
+}
+
 /* vim: set ts=8 sw=8 noet cindent syntax=c.doxygen: */
diff --git a/source3/rpc_client/cli_winreg.h b/source3/rpc_client/cli_winreg.h
index 69f34e4ecb..bf48c5d7e3 100644
--- a/source3/rpc_client/cli_winreg.h
+++ b/source3/rpc_client/cli_winreg.h
@@ -133,6 +133,32 @@ NTSTATUS dcerpc_winreg_set_sz(TALLOC_CTX *mem_ctx,
 			      const char *data,
 			      WERROR *pwerr);
 
+/**
+ * @brief Set a value with the specified expand sz data.
+ *
+ * @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 set.
+ *
+ * @param[in]  data     The data to store in 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_set_expand_sz(TALLOC_CTX *mem_ctx,
+				     struct dcerpc_binding_handle *h,
+				     struct policy_handle *key_handle,
+				     const char *value,
+				     const char *data,
+				     WERROR *pwerr);
+
 #endif /* CLI_WINREG_H */
 
 /* vim: set ts=8 sw=8 noet cindent syntax=c.doxygen: */