[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-462-ge16ca32
Günther Deschner
gd at samba.org
Thu Mar 27 10:16:49 GMT 2008
The branch, v3-2-test has been updated
via e16ca32b8e0485ceafee6a2ff62dc88e96329ec4 (commit)
via 8474ef334fd0ff05ee67a49ad7c39687117b49d9 (commit)
from 6dab6cf0647d7db01e5e472f8b5cf21395b7dbf0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e16ca32b8e0485ceafee6a2ff62dc88e96329ec4
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 27 11:04:01 2008 +0100
Re-run make idl.
Guenther
commit 8474ef334fd0ff05ee67a49ad7c39687117b49d9
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 27 11:01:55 2008 +0100
Use netr_LogonControlCode in netr_LogonControl2().
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_netlogon.c | 2 +-
source/librpc/gen_ndr/cli_netlogon.h | 2 +-
source/librpc/gen_ndr/ndr_netlogon.c | 6 +++---
source/librpc/gen_ndr/netlogon.h | 2 +-
source/librpc/idl/netlogon.idl | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_netlogon.c b/source/librpc/gen_ndr/cli_netlogon.c
index 0ad1d03..6743601 100644
--- a/source/librpc/gen_ndr/cli_netlogon.c
+++ b/source/librpc/gen_ndr/cli_netlogon.c
@@ -745,7 +745,7 @@ NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *logon_server /* [in] [unique,charset(UTF16)] */,
- uint32_t function_code /* [in] */,
+ enum netr_LogonControlCode function_code /* [in] */,
uint32_t level /* [in] */,
union netr_CONTROL_DATA_INFORMATION *data /* [in] [ref,switch_is(function_code)] */,
union netr_CONTROL_QUERY_INFORMATION *query /* [out] [ref,switch_is(level)] */,
diff --git a/source/librpc/gen_ndr/cli_netlogon.h b/source/librpc/gen_ndr/cli_netlogon.h
index 31171ff..82c51fb 100644
--- a/source/librpc/gen_ndr/cli_netlogon.h
+++ b/source/librpc/gen_ndr/cli_netlogon.h
@@ -127,7 +127,7 @@ NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
const char *logon_server /* [in] [unique,charset(UTF16)] */,
- uint32_t function_code /* [in] */,
+ enum netr_LogonControlCode function_code /* [in] */,
uint32_t level /* [in] */,
union netr_CONTROL_DATA_INFORMATION *data /* [in] [ref,switch_is(function_code)] */,
union netr_CONTROL_QUERY_INFORMATION *query /* [out] [ref,switch_is(level)] */,
diff --git a/source/librpc/gen_ndr/ndr_netlogon.c b/source/librpc/gen_ndr/ndr_netlogon.c
index a898be6..1a18fea 100644
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -10237,7 +10237,7 @@ static enum ndr_err_code ndr_push_netr_LogonControl2(struct ndr_push *ndr, int f
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.logon_server, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.logon_server, ndr_charset_length(r->in.logon_server, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.function_code));
+ NDR_CHECK(ndr_push_netr_LogonControlCode(ndr, NDR_SCALARS, r->in.function_code));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
if (r->in.data == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
@@ -10283,7 +10283,7 @@ static enum ndr_err_code ndr_pull_netr_LogonControl2(struct ndr_pull *ndr, int f
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.logon_server, ndr_get_array_length(ndr, &r->in.logon_server), sizeof(uint16_t), CH_UTF16));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_logon_server_0, 0);
}
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.function_code));
+ NDR_CHECK(ndr_pull_netr_LogonControlCode(ndr, NDR_SCALARS, &r->in.function_code));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.level));
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->in.data);
@@ -10326,7 +10326,7 @@ _PUBLIC_ void ndr_print_netr_LogonControl2(struct ndr_print *ndr, const char *na
ndr_print_string(ndr, "logon_server", r->in.logon_server);
}
ndr->depth--;
- ndr_print_uint32(ndr, "function_code", r->in.function_code);
+ ndr_print_netr_LogonControlCode(ndr, "function_code", r->in.function_code);
ndr_print_uint32(ndr, "level", r->in.level);
ndr_print_ptr(ndr, "data", r->in.data);
ndr->depth++;
diff --git a/source/librpc/gen_ndr/netlogon.h b/source/librpc/gen_ndr/netlogon.h
index 434e989..fa2d9c0 100644
--- a/source/librpc/gen_ndr/netlogon.h
+++ b/source/librpc/gen_ndr/netlogon.h
@@ -1071,7 +1071,7 @@ struct netr_GetAnyDCName {
struct netr_LogonControl2 {
struct {
const char *logon_server;/* [unique,charset(UTF16)] */
- uint32_t function_code;
+ enum netr_LogonControlCode function_code;
uint32_t level;
union netr_CONTROL_DATA_INFORMATION *data;/* [ref,switch_is(function_code)] */
} in;
diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 2a7b14c..60be989 100644
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -835,7 +835,7 @@ interface netlogon
WERROR netr_LogonControl2(
[in,unique] [string,charset(UTF16)] uint16 *logon_server,
- [in] uint32 function_code,
+ [in] netr_LogonControlCode function_code,
[in] uint32 level,
[in,ref][switch_is(function_code)] netr_CONTROL_DATA_INFORMATION *data,
[out,ref][switch_is(level)] netr_CONTROL_QUERY_INFORMATION *query
--
Samba Shared Repository
More information about the samba-cvs
mailing list