[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-878-gafd0e92
Günther Deschner
gd at samba.org
Sun Apr 13 17:02:57 GMT 2008
The branch, v3-2-test has been updated
via afd0e925dc63b6f776caa5fd442c4e48e8349682 (commit)
via 1200eb474c145fdde91bc39546454015fecf22f0 (commit)
from 57a5628abf628b6276f36da8ae1f3c15a4db4488 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit afd0e925dc63b6f776caa5fd442c4e48e8349682
Author: Günther Deschner <gd at samba.org>
Date: Sun Apr 13 19:00:53 2008 +0200
Re-run make idl.
Guenther
commit 1200eb474c145fdde91bc39546454015fecf22f0
Author: Günther Deschner <gd at samba.org>
Date: Sun Apr 13 18:59:42 2008 +0200
libnetapi: Add IDL for NetQueryDisplayInformation.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/libnetapi.h | 43 +++++++++
source/librpc/gen_ndr/ndr_libnetapi.c | 164 +++++++++++++++++++++++++++++++++
source/librpc/gen_ndr/ndr_libnetapi.h | 16 +++-
source/librpc/idl/libnetapi.idl | 35 +++++++
4 files changed, 257 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/libnetapi.h b/source/librpc/gen_ndr/libnetapi.h
index 73aa1be..17633da 100644
--- a/source/librpc/gen_ndr/libnetapi.h
+++ b/source/librpc/gen_ndr/libnetapi.h
@@ -49,6 +49,31 @@ struct USER_INFO_1 {
const char * usri1_script_path;
};
+struct NET_DISPLAY_USER {
+ const char * usri1_name;
+ const char * usri1_comment;
+ uint32_t usri1_flags;
+ const char * usri1_full_name;
+ uint32_t usri1_user_id;
+ uint32_t usri1_next_index;
+};
+
+struct NET_DISPLAY_MACHINE {
+ const char * usri2_name;
+ const char * usri2_comment;
+ uint32_t usri2_flags;
+ uint32_t usri2_user_id;
+ uint32_t usri2_next_index;
+};
+
+struct NET_DISPLAY_GROUP {
+ const char * grpi3_name;
+ const char * grpi3_comment;
+ uint32_t grpi3_group_id;
+ uint32_t grpi3_attributes;
+ uint32_t grpi3_next_index;
+};
+
struct NetJoinDomain {
struct {
@@ -234,4 +259,22 @@ struct NetUserEnum {
};
+
+struct NetQueryDisplayInformation {
+ struct {
+ const char * server_name;/* [unique] */
+ uint32_t level;
+ uint32_t idx;
+ uint32_t entries_requested;
+ uint32_t prefmaxlen;
+ } in;
+
+ struct {
+ uint32_t *entries_read;/* [ref] */
+ void **buffer;/* [noprint,ref] */
+ enum NET_API_STATUS result;
+ } out;
+
+};
+
#endif /* _HEADER_libnetapi */
diff --git a/source/librpc/gen_ndr/ndr_libnetapi.c b/source/librpc/gen_ndr/ndr_libnetapi.c
index bf2bbd0..028753a 100644
--- a/source/librpc/gen_ndr/ndr_libnetapi.c
+++ b/source/librpc/gen_ndr/ndr_libnetapi.c
@@ -192,6 +192,135 @@ _PUBLIC_ void ndr_print_USER_INFO_1(struct ndr_print *ndr, const char *name, con
ndr->depth--;
}
+_PUBLIC_ enum ndr_err_code ndr_push_NET_DISPLAY_USER(struct ndr_push *ndr, int ndr_flags, const struct NET_DISPLAY_USER *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->usri1_name));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->usri1_comment));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usri1_flags));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->usri1_full_name));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usri1_user_id));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usri1_next_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_NET_DISPLAY_USER(struct ndr_pull *ndr, int ndr_flags, struct NET_DISPLAY_USER *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usri1_name));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usri1_comment));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri1_flags));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usri1_full_name));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri1_user_id));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri1_next_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_NET_DISPLAY_USER(struct ndr_print *ndr, const char *name, const struct NET_DISPLAY_USER *r)
+{
+ ndr_print_struct(ndr, name, "NET_DISPLAY_USER");
+ ndr->depth++;
+ ndr_print_string(ndr, "usri1_name", r->usri1_name);
+ ndr_print_string(ndr, "usri1_comment", r->usri1_comment);
+ ndr_print_uint32(ndr, "usri1_flags", r->usri1_flags);
+ ndr_print_string(ndr, "usri1_full_name", r->usri1_full_name);
+ ndr_print_uint32(ndr, "usri1_user_id", r->usri1_user_id);
+ ndr_print_uint32(ndr, "usri1_next_index", r->usri1_next_index);
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_NET_DISPLAY_MACHINE(struct ndr_push *ndr, int ndr_flags, const struct NET_DISPLAY_MACHINE *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->usri2_name));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->usri2_comment));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usri2_flags));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usri2_user_id));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usri2_next_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_NET_DISPLAY_MACHINE(struct ndr_pull *ndr, int ndr_flags, struct NET_DISPLAY_MACHINE *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usri2_name));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usri2_comment));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri2_flags));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri2_user_id));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usri2_next_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_NET_DISPLAY_MACHINE(struct ndr_print *ndr, const char *name, const struct NET_DISPLAY_MACHINE *r)
+{
+ ndr_print_struct(ndr, name, "NET_DISPLAY_MACHINE");
+ ndr->depth++;
+ ndr_print_string(ndr, "usri2_name", r->usri2_name);
+ ndr_print_string(ndr, "usri2_comment", r->usri2_comment);
+ ndr_print_uint32(ndr, "usri2_flags", r->usri2_flags);
+ ndr_print_uint32(ndr, "usri2_user_id", r->usri2_user_id);
+ ndr_print_uint32(ndr, "usri2_next_index", r->usri2_next_index);
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_NET_DISPLAY_GROUP(struct ndr_push *ndr, int ndr_flags, const struct NET_DISPLAY_GROUP *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->grpi3_name));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->grpi3_comment));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->grpi3_group_id));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->grpi3_attributes));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->grpi3_next_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_NET_DISPLAY_GROUP(struct ndr_pull *ndr, int ndr_flags, struct NET_DISPLAY_GROUP *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->grpi3_name));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->grpi3_comment));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->grpi3_group_id));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->grpi3_attributes));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->grpi3_next_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_NET_DISPLAY_GROUP(struct ndr_print *ndr, const char *name, const struct NET_DISPLAY_GROUP *r)
+{
+ ndr_print_struct(ndr, name, "NET_DISPLAY_GROUP");
+ ndr->depth++;
+ ndr_print_string(ndr, "grpi3_name", r->grpi3_name);
+ ndr_print_string(ndr, "grpi3_comment", r->grpi3_comment);
+ ndr_print_uint32(ndr, "grpi3_group_id", r->grpi3_group_id);
+ ndr_print_uint32(ndr, "grpi3_attributes", r->grpi3_attributes);
+ ndr_print_uint32(ndr, "grpi3_next_index", r->grpi3_next_index);
+ ndr->depth--;
+}
+
_PUBLIC_ void ndr_print_NetJoinDomain(struct ndr_print *ndr, const char *name, int flags, const struct NetJoinDomain *r)
{
ndr_print_struct(ndr, name, "NetJoinDomain");
@@ -715,3 +844,38 @@ _PUBLIC_ void ndr_print_NetUserEnum(struct ndr_print *ndr, const char *name, int
ndr->depth--;
}
+_PUBLIC_ void ndr_print_NetQueryDisplayInformation(struct ndr_print *ndr, const char *name, int flags, const struct NetQueryDisplayInformation *r)
+{
+ ndr_print_struct(ndr, name, "NetQueryDisplayInformation");
+ ndr->depth++;
+ if (flags & NDR_SET_VALUES) {
+ ndr->flags |= LIBNDR_PRINT_SET_VALUES;
+ }
+ if (flags & NDR_IN) {
+ ndr_print_struct(ndr, "in", "NetQueryDisplayInformation");
+ ndr->depth++;
+ ndr_print_ptr(ndr, "server_name", r->in.server_name);
+ ndr->depth++;
+ if (r->in.server_name) {
+ ndr_print_string(ndr, "server_name", r->in.server_name);
+ }
+ ndr->depth--;
+ ndr_print_uint32(ndr, "level", r->in.level);
+ ndr_print_uint32(ndr, "idx", r->in.idx);
+ ndr_print_uint32(ndr, "entries_requested", r->in.entries_requested);
+ ndr_print_uint32(ndr, "prefmaxlen", r->in.prefmaxlen);
+ ndr->depth--;
+ }
+ if (flags & NDR_OUT) {
+ ndr_print_struct(ndr, "out", "NetQueryDisplayInformation");
+ ndr->depth++;
+ ndr_print_ptr(ndr, "entries_read", r->out.entries_read);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "entries_read", *r->out.entries_read);
+ ndr->depth--;
+ ndr_print_NET_API_STATUS(ndr, "result", r->out.result);
+ ndr->depth--;
+ }
+ ndr->depth--;
+}
+
diff --git a/source/librpc/gen_ndr/ndr_libnetapi.h b/source/librpc/gen_ndr/ndr_libnetapi.h
index a01fea8..70add82 100644
--- a/source/librpc/gen_ndr/ndr_libnetapi.h
+++ b/source/librpc/gen_ndr/ndr_libnetapi.h
@@ -30,7 +30,9 @@
#define NDR_NETUSERENUM (0x0b)
-#define NDR_LIBNETAPI_CALL_COUNT (12)
+#define NDR_NETQUERYDISPLAYINFORMATION (0x0c)
+
+#define NDR_LIBNETAPI_CALL_COUNT (13)
enum ndr_err_code ndr_push_NET_API_STATUS(struct ndr_push *ndr, int ndr_flags, enum NET_API_STATUS r);
enum ndr_err_code ndr_pull_NET_API_STATUS(struct ndr_pull *ndr, int ndr_flags, enum NET_API_STATUS *r);
void ndr_print_NET_API_STATUS(struct ndr_print *ndr, const char *name, enum NET_API_STATUS r);
@@ -46,6 +48,15 @@ void ndr_print_USER_INFO_0(struct ndr_print *ndr, const char *name, const struct
enum ndr_err_code ndr_push_USER_INFO_1(struct ndr_push *ndr, int ndr_flags, const struct USER_INFO_1 *r);
enum ndr_err_code ndr_pull_USER_INFO_1(struct ndr_pull *ndr, int ndr_flags, struct USER_INFO_1 *r);
void ndr_print_USER_INFO_1(struct ndr_print *ndr, const char *name, const struct USER_INFO_1 *r);
+enum ndr_err_code ndr_push_NET_DISPLAY_USER(struct ndr_push *ndr, int ndr_flags, const struct NET_DISPLAY_USER *r);
+enum ndr_err_code ndr_pull_NET_DISPLAY_USER(struct ndr_pull *ndr, int ndr_flags, struct NET_DISPLAY_USER *r);
+void ndr_print_NET_DISPLAY_USER(struct ndr_print *ndr, const char *name, const struct NET_DISPLAY_USER *r);
+enum ndr_err_code ndr_push_NET_DISPLAY_MACHINE(struct ndr_push *ndr, int ndr_flags, const struct NET_DISPLAY_MACHINE *r);
+enum ndr_err_code ndr_pull_NET_DISPLAY_MACHINE(struct ndr_pull *ndr, int ndr_flags, struct NET_DISPLAY_MACHINE *r);
+void ndr_print_NET_DISPLAY_MACHINE(struct ndr_print *ndr, const char *name, const struct NET_DISPLAY_MACHINE *r);
+enum ndr_err_code ndr_push_NET_DISPLAY_GROUP(struct ndr_push *ndr, int ndr_flags, const struct NET_DISPLAY_GROUP *r);
+enum ndr_err_code ndr_pull_NET_DISPLAY_GROUP(struct ndr_pull *ndr, int ndr_flags, struct NET_DISPLAY_GROUP *r);
+void ndr_print_NET_DISPLAY_GROUP(struct ndr_print *ndr, const char *name, const struct NET_DISPLAY_GROUP *r);
enum ndr_err_code ndr_push_NetJoinDomain(struct ndr_push *ndr, int flags, const struct NetJoinDomain *r);
enum ndr_err_code ndr_pull_NetJoinDomain(struct ndr_pull *ndr, int flags, struct NetJoinDomain *r);
void ndr_print_NetJoinDomain(struct ndr_print *ndr, const char *name, int flags, const struct NetJoinDomain *r);
@@ -82,4 +93,7 @@ void ndr_print_NetUserDel(struct ndr_print *ndr, const char *name, int flags, co
enum ndr_err_code ndr_push_NetUserEnum(struct ndr_push *ndr, int flags, const struct NetUserEnum *r);
enum ndr_err_code ndr_pull_NetUserEnum(struct ndr_pull *ndr, int flags, struct NetUserEnum *r);
void ndr_print_NetUserEnum(struct ndr_print *ndr, const char *name, int flags, const struct NetUserEnum *r);
+enum ndr_err_code ndr_push_NetQueryDisplayInformation(struct ndr_push *ndr, int flags, const struct NetQueryDisplayInformation *r);
+enum ndr_err_code ndr_pull_NetQueryDisplayInformation(struct ndr_pull *ndr, int flags, struct NetQueryDisplayInformation *r);
+void ndr_print_NetQueryDisplayInformation(struct ndr_print *ndr, const char *name, int flags, const struct NetQueryDisplayInformation *r);
#endif /* _HEADER_NDR_libnetapi */
diff --git a/source/librpc/idl/libnetapi.idl b/source/librpc/idl/libnetapi.idl
index 9cb8b23..01eb010 100644
--- a/source/librpc/idl/libnetapi.idl
+++ b/source/librpc/idl/libnetapi.idl
@@ -133,4 +133,39 @@ interface libnetapi
[out,ref] uint32 *total_entries,
[in,out,ref] uint32 *resume_handle
);
+
+ [public] typedef struct {
+ string usri1_name;
+ string usri1_comment;
+ uint32 usri1_flags;
+ string usri1_full_name;
+ uint32 usri1_user_id;
+ uint32 usri1_next_index;
+ } NET_DISPLAY_USER;
+
+ [public] typedef struct {
+ string usri2_name;
+ string usri2_comment;
+ uint32 usri2_flags;
+ uint32 usri2_user_id;
+ uint32 usri2_next_index;
+ } NET_DISPLAY_MACHINE;
+
+ [public] typedef struct {
+ string grpi3_name;
+ string grpi3_comment;
+ uint32 grpi3_group_id;
+ uint32 grpi3_attributes;
+ uint32 grpi3_next_index;
+ } NET_DISPLAY_GROUP;
+
+ [nopush,nopull] NET_API_STATUS NetQueryDisplayInformation(
+ [in,unique] string *server_name,
+ [in] uint32 level,
+ [in] uint32 idx,
+ [in] uint32 entries_requested,
+ [in] uint32 prefmaxlen,
+ [out,ref] uint32 *entries_read,
+ [out,ref,noprint] void **buffer
+ );
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list