s4:lib/registry/rpc: convert to use dcerpc_binding_handle stubs

metze

1 files changed, 17 insertions, 16 deletions

diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c
index 0064e17c9a..e201380033 100644
--- a/source4/lib/registry/rpc.c
+++ b/source4/lib/registry/rpc.c
@@ -27,8 +27,7 @@
 struct rpc_key {
 	struct registry_key key;
 	struct policy_handle pol;
-	struct dcerpc_pipe *pipe;
-
+	struct dcerpc_binding_handle *binding_handle;
 	const char* classname;	
 	uint32_t num_subkeys;
 	uint32_t max_subkeylen;
@@ -43,6 +42,7 @@ struct rpc_key {
 struct rpc_registry_context {
 	struct registry_context context;
 	struct dcerpc_pipe *pipe;
+	struct dcerpc_binding_handle *binding_handle;
 };
 
 static struct registry_operations reg_backend_rpc;
@@ -51,7 +51,7 @@ static struct registry_operations reg_backend_rpc;
  * This is the RPC backend for the registry library.
  */
 
-#define openhive(u) static WERROR open_ ## u(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *hnd) \
+#define openhive(u) static WERROR open_ ## u(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, struct policy_handle *hnd) \
 { \
 	struct winreg_Open ## u r; \
 	NTSTATUS status; \
@@ -61,7 +61,7 @@ static struct registry_operations reg_backend_rpc;
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; \
 	r.out.handle = hnd;\
 \
-	status = dcerpc_winreg_Open ## u(p, mem_ctx, &r); \
+	status = dcerpc_winreg_Open ## u ## _r(b, mem_ctx, &r); \
 \
 	if (!NT_STATUS_IS_OK(status)) { \
 		DEBUG(1, ("OpenHive failed - %s\n", nt_errstr(status))); \
@@ -81,7 +81,7 @@ openhive(HKCC)
 
 static struct {
 	uint32_t hkey;
-	WERROR (*open) (struct dcerpc_pipe *p, TALLOC_CTX *,
+	WERROR (*open) (struct dcerpc_binding_handle *b, TALLOC_CTX *,
 			struct policy_handle *h);
 } known_hives[] = {
 	{ HKEY_LOCAL_MACHINE, open_HKLM },
@@ -118,11 +118,11 @@ static WERROR rpc_get_predefined_key(struct registry_context *ctx,
 
 	mykeydata = talloc_zero(ctx, struct rpc_key);
 	mykeydata->key.context = ctx;
-	mykeydata->pipe = talloc_reference(mykeydata, rctx->pipe);
+	mykeydata->binding_handle = rctx->binding_handle;
 	mykeydata->num_values = -1;
 	mykeydata->num_subkeys = -1;
 	*k = (struct registry_key *)mykeydata;
-	return known_hives[n].open(mykeydata->pipe, mykeydata, &(mykeydata->pol));
+	return known_hives[n].open(mykeydata->binding_handle, mykeydata, &mykeydata->pol);
 }
 
 #if 0
@@ -161,7 +161,7 @@ static WERROR rpc_open_key(TALLOC_CTX *mem_ctx, struct registry_key *h,
 
 	mykeydata = talloc_zero(mem_ctx, struct rpc_key);
 	mykeydata->key.context = parentkeydata->key.context;
-	mykeydata->pipe = talloc_reference(mykeydata, parentkeydata->pipe);
+	mykeydata->binding_handle = parentkeydata->binding_handle;
 	mykeydata->num_values = -1;
 	mykeydata->num_subkeys = -1;
 	*key = (struct registry_key *)mykeydata;
@@ -174,7 +174,7 @@ static WERROR rpc_open_key(TALLOC_CTX *mem_ctx, struct registry_key *h,
 	r.in.access_mask = 0x02000000;
 	r.out.handle = &mykeydata->pol;
 
-	status = dcerpc_winreg_OpenKey(mykeydata->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_OpenKey_r(mykeydata->binding_handle, mem_ctx, &r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("OpenKey failed - %s\n", nt_errstr(status)));
@@ -222,7 +222,7 @@ static WERROR rpc_get_value_by_index(TALLOC_CTX *mem_ctx,
 	r.out.size = &val_size;
 	r.out.length = &zero;
 
-	status = dcerpc_winreg_EnumValue(mykeydata->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_EnumValue_r(mykeydata->binding_handle, mem_ctx, &r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("EnumValue failed - %s\n", nt_errstr(status)));
@@ -270,7 +270,7 @@ static WERROR rpc_get_value_by_name(TALLOC_CTX *mem_ctx,
 	r.out.data_size = &val_size;
 	r.out.data_length = &zero;
 
-	status = dcerpc_winreg_QueryValue(mykeydata->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_QueryValue_r(mykeydata->binding_handle, mem_ctx, &r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("QueryValue failed - %s\n", nt_errstr(status)));
@@ -311,7 +311,7 @@ static WERROR rpc_get_subkey_by_index(TALLOC_CTX *mem_ctx,
 	r.out.keyclass = &classbuf;
 	r.out.last_changed_time = &change_time;
 
-	status = dcerpc_winreg_EnumKey(mykeydata->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_EnumKey_r(mykeydata->binding_handle, mem_ctx, &r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("EnumKey failed - %s\n", nt_errstr(status)));
@@ -351,7 +351,7 @@ static WERROR rpc_add_key(TALLOC_CTX *mem_ctx,
 	r.out.new_handle = &rpck->pol;
 	r.out.action_taken = NULL;
 
-	status = dcerpc_winreg_CreateKey(parentkd->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_CreateKey_r(parentkd->binding_handle, mem_ctx, &r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(rpck);
@@ -359,7 +359,7 @@ static WERROR rpc_add_key(TALLOC_CTX *mem_ctx,
 		return ntstatus_to_werror(status);
 	}
 
-	rpck->pipe = talloc_reference(rpck, parentkd->pipe);
+	rpck->binding_handle = parentkd->binding_handle;
 	*key = (struct registry_key *)rpck;
 
 	return r.out.result;
@@ -387,7 +387,7 @@ static WERROR rpc_query_key(TALLOC_CTX *mem_ctx, const struct registry_key *k)
 	r.out.secdescsize = &mykeydata->secdescsize;
 	r.out.last_changed_time = &mykeydata->last_changed_time;
 
-	status = dcerpc_winreg_QueryInfoKey(mykeydata->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_QueryInfoKey_r(mykeydata->binding_handle, mem_ctx, &r);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("QueryInfoKey failed - %s\n", nt_errstr(status)));
@@ -410,7 +410,7 @@ static WERROR rpc_del_key(struct registry_key *parent, const char *name)
 	r.in.handle = &mykeydata->pol;
 	r.in.key.name = name;
 
-	status = dcerpc_winreg_DeleteKey(mykeydata->pipe, mem_ctx, &r);
+	status = dcerpc_winreg_DeleteKey_r(mykeydata->binding_handle, mem_ctx, &r);
 
 	talloc_free(mem_ctx);
 
@@ -500,6 +500,7 @@ _PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx,
 					 &ndr_table_winreg,
 				     credentials, ev, lp_ctx);
 	rctx->pipe = p;
+	rctx->binding_handle = p->binding_handle;
 
 	if(NT_STATUS_IS_ERR(status)) {
 		DEBUG(1, ("Unable to open '%s': %s\n", location,