[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-2812-g0352682
Günther Deschner
gd at samba.org
Wed Jun 11 08:48:12 GMT 2008
The branch, v3-3-test has been updated
via 0352682a355b42ced7628a720a6889d8453e7946 (commit)
via 3a73fe564f07ef057bfc3b61367acf940067269d (commit)
via 652af123b214e30d0edf1d5626849484c6bb5045 (commit)
via cdd1ce797aefa07780a73d0793c450e2d96f17bb (commit)
from e4eb9d347d14de8c9ba73b07f26fe8fd4f17eab5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 0352682a355b42ced7628a720a6889d8453e7946
Author: Günther Deschner <gd at samba.org>
Date: Wed Jun 11 10:44:47 2008 +0200
rpc_client: fix some valgrind warnings.
Guenther
commit 3a73fe564f07ef057bfc3b61367acf940067269d
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 10 20:50:53 2008 +0200
re-run make idl.
Guenther
commit 652af123b214e30d0edf1d5626849484c6bb5045
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 10 20:50:25 2008 +0200
idl: fix drsuapi_DsGetNCChanges.
Guenther
commit cdd1ce797aefa07780a73d0793c450e2d96f17bb
Author: Günther Deschner <gd at samba.org>
Date: Wed Jun 11 00:56:44 2008 +0200
net: remove some dead code.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_drsuapi.c | 9 +++--
source/librpc/gen_ndr/cli_drsuapi.h | 7 ++--
source/librpc/gen_ndr/drsuapi.h | 8 ++--
source/librpc/gen_ndr/ndr_drsuapi.c | 54 +++++++++++++---------------------
source/librpc/idl/drsuapi.idl | 7 ++--
source/rpc_client/cli_pipe.c | 6 ++-
source/utils/net_rpc_samsync.c | 29 ------------------
7 files changed, 42 insertions(+), 78 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_drsuapi.c b/source/librpc/gen_ndr/cli_drsuapi.c
index 3e2605a..0731885 100644
--- a/source/librpc/gen_ndr/cli_drsuapi.c
+++ b/source/librpc/gen_ndr/cli_drsuapi.c
@@ -153,9 +153,10 @@ NTSTATUS rpccli_drsuapi_DsReplicaSync(struct rpc_pipe_client *cli,
NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *bind_handle /* [in] [ref] */,
- int32_t *level /* [in,out] [ref] */,
- union drsuapi_DsGetNCChangesRequest *req /* [in] [ref,switch_is(*level)] */,
- union drsuapi_DsGetNCChangesCtr *ctr /* [out] [ref,switch_is(*level)] */,
+ int32_t level /* [in] */,
+ union drsuapi_DsGetNCChangesRequest *req /* [in] [ref,switch_is(level)] */,
+ int32_t *level_out /* [out] [ref] */,
+ union drsuapi_DsGetNCChangesCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
WERROR *werror)
{
struct drsuapi_DsGetNCChanges r;
@@ -190,7 +191,7 @@ NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
}
/* Return variables */
- *level = *r.out.level;
+ *level_out = *r.out.level_out;
*ctr = *r.out.ctr;
/* Return result */
diff --git a/source/librpc/gen_ndr/cli_drsuapi.h b/source/librpc/gen_ndr/cli_drsuapi.h
index a41cded..ab7375f 100644
--- a/source/librpc/gen_ndr/cli_drsuapi.h
+++ b/source/librpc/gen_ndr/cli_drsuapi.h
@@ -20,9 +20,10 @@ NTSTATUS rpccli_drsuapi_DsReplicaSync(struct rpc_pipe_client *cli,
NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *bind_handle /* [in] [ref] */,
- int32_t *level /* [in,out] [ref] */,
- union drsuapi_DsGetNCChangesRequest *req /* [in] [ref,switch_is(*level)] */,
- union drsuapi_DsGetNCChangesCtr *ctr /* [out] [ref,switch_is(*level)] */,
+ int32_t level /* [in] */,
+ union drsuapi_DsGetNCChangesRequest *req /* [in] [ref,switch_is(level)] */,
+ int32_t *level_out /* [out] [ref] */,
+ union drsuapi_DsGetNCChangesCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
WERROR *werror);
NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/source/librpc/gen_ndr/drsuapi.h b/source/librpc/gen_ndr/drsuapi.h
index 628131e..35769f7 100644
--- a/source/librpc/gen_ndr/drsuapi.h
+++ b/source/librpc/gen_ndr/drsuapi.h
@@ -1375,13 +1375,13 @@ struct drsuapi_DsReplicaSync {
struct drsuapi_DsGetNCChanges {
struct {
struct policy_handle *bind_handle;/* [ref] */
- union drsuapi_DsGetNCChangesRequest *req;/* [ref,switch_is(*level)] */
- int32_t *level;/* [ref] */
+ int32_t level;
+ union drsuapi_DsGetNCChangesRequest *req;/* [ref,switch_is(level)] */
} in;
struct {
- union drsuapi_DsGetNCChangesCtr *ctr;/* [ref,switch_is(*level)] */
- int32_t *level;/* [ref] */
+ int32_t *level_out;/* [ref] */
+ union drsuapi_DsGetNCChangesCtr *ctr;/* [ref,switch_is(*level_out)] */
WERROR result;
} out;
diff --git a/source/librpc/gen_ndr/ndr_drsuapi.c b/source/librpc/gen_ndr/ndr_drsuapi.c
index 7a76cfe..ce8fbf2 100644
--- a/source/librpc/gen_ndr/ndr_drsuapi.c
+++ b/source/librpc/gen_ndr/ndr_drsuapi.c
@@ -12226,25 +12226,22 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChanges(struct ndr_push *ndr, i
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
- if (r->in.level == NULL) {
- return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
- }
- NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->in.level));
+ NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->in.level));
if (r->in.req == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.req, *r->in.level));
+ NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.req, r->in.level));
NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.req));
}
if (flags & NDR_OUT) {
- if (r->out.level == NULL) {
+ if (r->out.level_out == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level));
+ NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, *r->out.level_out));
if (r->out.ctr == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.ctr, *r->out.level));
+ NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.ctr, *r->out.level_out));
NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesCtr(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.ctr));
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
}
@@ -12254,8 +12251,8 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChanges(struct ndr_push *ndr, i
static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChanges(struct ndr_pull *ndr, int flags, struct drsuapi_DsGetNCChanges *r)
{
TALLOC_CTX *_mem_save_bind_handle_0;
- TALLOC_CTX *_mem_save_level_0;
TALLOC_CTX *_mem_save_req_0;
+ TALLOC_CTX *_mem_save_level_out_0;
TALLOC_CTX *_mem_save_ctr_0;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -12267,40 +12264,34 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChanges(struct ndr_pull *ndr, i
NDR_PULL_SET_MEM_CTX(ndr, r->in.bind_handle, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS, r->in.bind_handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_bind_handle_0, LIBNDR_FLAG_REF_ALLOC);
- if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->in.level);
- }
- _mem_save_level_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->in.level, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->in.level));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_0, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->in.level));
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->in.req);
}
_mem_save_req_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->in.req, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.req, *r->in.level));
+ NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.req, r->in.level));
NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.req));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_req_0, LIBNDR_FLAG_REF_ALLOC);
- NDR_PULL_ALLOC(ndr, r->out.level);
- *r->out.level = *r->in.level;
+ NDR_PULL_ALLOC(ndr, r->out.level_out);
+ ZERO_STRUCTP(r->out.level_out);
NDR_PULL_ALLOC(ndr, r->out.ctr);
ZERO_STRUCTP(r->out.ctr);
}
if (flags & NDR_OUT) {
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->out.level);
+ NDR_PULL_ALLOC(ndr, r->out.level_out);
}
- _mem_save_level_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.level, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_0, LIBNDR_FLAG_REF_ALLOC);
+ _mem_save_level_out_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out.level_out, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, r->out.level_out));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_out_0, LIBNDR_FLAG_REF_ALLOC);
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.ctr);
}
_mem_save_ctr_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.ctr, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.ctr, *r->out.level));
+ NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.ctr, *r->out.level_out));
NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesCtr(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.ctr));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_ctr_0, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
@@ -12322,13 +12313,10 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChanges(struct ndr_print *ndr, const char
ndr->depth++;
ndr_print_policy_handle(ndr, "bind_handle", r->in.bind_handle);
ndr->depth--;
- ndr_print_ptr(ndr, "level", r->in.level);
- ndr->depth++;
- ndr_print_int32(ndr, "level", *r->in.level);
- ndr->depth--;
+ ndr_print_int32(ndr, "level", r->in.level);
ndr_print_ptr(ndr, "req", r->in.req);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->in.req, *r->in.level);
+ ndr_print_set_switch_value(ndr, r->in.req, r->in.level);
ndr_print_drsuapi_DsGetNCChangesRequest(ndr, "req", r->in.req);
ndr->depth--;
ndr->depth--;
@@ -12336,13 +12324,13 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChanges(struct ndr_print *ndr, const char
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "drsuapi_DsGetNCChanges");
ndr->depth++;
- ndr_print_ptr(ndr, "level", r->out.level);
+ ndr_print_ptr(ndr, "level_out", r->out.level_out);
ndr->depth++;
- ndr_print_int32(ndr, "level", *r->out.level);
+ ndr_print_int32(ndr, "level_out", *r->out.level_out);
ndr->depth--;
ndr_print_ptr(ndr, "ctr", r->out.ctr);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->out.ctr, *r->out.level);
+ ndr_print_set_switch_value(ndr, r->out.ctr, *r->out.level_out);
ndr_print_drsuapi_DsGetNCChangesCtr(ndr, "ctr", r->out.ctr);
ndr->depth--;
ndr_print_WERROR(ndr, "result", r->out.result);
diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl
index 16b87d7..8a3bb69 100644
--- a/source/librpc/idl/drsuapi.idl
+++ b/source/librpc/idl/drsuapi.idl
@@ -626,9 +626,10 @@ interface drsuapi
WERROR drsuapi_DsGetNCChanges(
[in] policy_handle *bind_handle,
- [in,out,ref] int32 *level,
- [in,ref,switch_is(*level)] drsuapi_DsGetNCChangesRequest *req,
- [out,ref,switch_is(*level)] drsuapi_DsGetNCChangesCtr *ctr
+ [in] int32 level,
+ [in,ref,switch_is(level)] drsuapi_DsGetNCChangesRequest *req,
+ [out,ref] int32 *level_out,
+ [out,ref,switch_is(*level_out)] drsuapi_DsGetNCChangesCtr *ctr
);
/*****************/
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 8ba79d3..ba6fbdd 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -2522,7 +2522,7 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
struct sockaddr_storage addr;
NTSTATUS status;
- result = talloc(mem_ctx, struct rpc_pipe_client);
+ result = TALLOC_ZERO_P(mem_ctx, struct rpc_pipe_client);
if (result == NULL) {
return NT_STATUS_NO_MEMORY;
}
@@ -2705,6 +2705,8 @@ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host,
NTSTATUS status;
uint16_t port = 0;
+ *presult = NULL;
+
status = rpc_pipe_get_tcp_port(host, abstract_syntax, &port);
if (!NT_STATUS_IS_OK(status)) {
goto done;
@@ -2877,7 +2879,7 @@ static struct rpc_pipe_client *cli_rpc_pipe_open(struct cli_state *cli,
int pipe_idx,
NTSTATUS *perr)
{
- struct rpc_pipe_client *result;
+ struct rpc_pipe_client *result = NULL;
*perr = NT_STATUS_PIPE_NOT_AVAILABLE;
diff --git a/source/utils/net_rpc_samsync.c b/source/utils/net_rpc_samsync.c
index bbba2c4..bd8118a 100644
--- a/source/utils/net_rpc_samsync.c
+++ b/source/utils/net_rpc_samsync.c
@@ -408,35 +408,6 @@ NTSTATUS rpc_samdump_internals(struct net_context *c,
int argc,
const char **argv)
{
-#if 0
- /* net_rpc.c now always tries to create an schannel pipe.. */
-
- NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- uchar trust_password[16];
- uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
- uint32 sec_channel_type = 0;
-
- if (!secrets_fetch_trust_account_password(domain_name,
- trust_password,
- NULL, &sec_channel_type)) {
- DEBUG(0,("Could not fetch trust account password\n"));
- goto fail;
- }
-
- nt_status = rpccli_netlogon_setup_creds(pipe_hnd,
- cli->desthost,
- domain_name,
- global_myname(),
- trust_password,
- sec_channel_type,
- &neg_flags);
-
- if (!NT_STATUS_IS_OK(nt_status)) {
- DEBUG(0,("Error connecting to NETLOGON pipe\n"));
- goto fail;
- }
-#endif
-
dump_database(pipe_hnd, SAM_DATABASE_DOMAIN);
dump_database(pipe_hnd, SAM_DATABASE_BUILTIN);
dump_database(pipe_hnd, SAM_DATABASE_PRIVS);
--
Samba Shared Repository
More information about the samba-cvs
mailing list