The branch, v3-2-test has been updated
via 5f8793dd1d8a3694afb7f2d882cfb9990eb40b75 (commit)
via 0d5130ddb61aa2db603339e693f54fff302eb947 (commit)
via 5387c6e8d19f7f26561c5fbacb1c75a5ba8fea60 (commit)
from 30337bce2c748e5338f9cc923e096883322f50d3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 5f8793dd1d8a3694afb7f2d882cfb9990eb40b75
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Apr 10 21:31:12 2008 +0200
Use SERVER_INFO_1005 in libnetapi.
Guenther
commit 0d5130ddb61aa2db603339e693f54fff302eb947
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Apr 10 21:29:05 2008 +0200
Re-run make idl.
Guenther
commit 5387c6e8d19f7f26561c5fbacb1c75a5ba8fea60
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Apr 10 21:28:17 2008 +0200
Add SERVER_INFO_1005 to libnetapi.idl.
Guenther
-----------------------------------------------------------------------
Summary of changes:
.../examples/netdomjoin-gui/netdomjoin-gui.c | 14 +++------
source/lib/netapi/netapi.h | 4 ++
source/lib/netapi/serverinfo.c | 4 +-
source/librpc/gen_ndr/libnetapi.h | 4 ++
source/librpc/gen_ndr/ndr_libnetapi.c | 30 ++++++++++++++++++++
source/librpc/gen_ndr/ndr_libnetapi.h | 3 ++
source/librpc/idl/libnetapi.idl | 4 ++
7 files changed, 52 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index a4daf4f..fa1bafd 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -48,10 +48,6 @@
#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
-struct srvsvc_NetSrvInfo1005 {
- const char *comment;/* [unique,charset(UTF16)] */
-};
-
static gboolean verbose = FALSE;
typedef struct join_state {
@@ -173,10 +169,10 @@ static void callback_apply_description_change(GtkWidget
*widget,
struct join_state *state = (struct join_state *)data;
NET_API_STATUS status = 0;
uint32_t parm_err = 0;
- struct srvsvc_NetSrvInfo1005 info1005;
+ struct SERVER_INFO_1005 info1005;
GtkWidget *dialog;
- info1005.comment = state->comment_new;
+ info1005.sv1005_comment = state->comment_new;
status = NetServerSetInfo(NULL, 1005, (uint8_t *)&info1005, &parm_err);
if (status) {
@@ -1556,7 +1552,7 @@ static int initialize_join_state(struct join_state *state,
}
{
- struct srvsvc_NetSrvInfo1005 *info1005 = NULL;
+ struct SERVER_INFO_1005 *info1005 = NULL;
uint8_t *buffer = NULL;
status = NetServerGetInfo(NULL, 1005, &buffer);
@@ -1566,9 +1562,9 @@ static int initialize_join_state(struct join_state *state,
return status;
}
- info1005 = (struct srvsvc_NetSrvInfo1005 *)buffer;
+ info1005 = (struct SERVER_INFO_1005 *)buffer;
- state->comment = strdup(info1005->comment);
+ state->comment = strdup(info1005->sv1005_comment);
if (!state->comment) {
return -1;
}
diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index ea850c5..a9b50c4 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -58,6 +58,10 @@ struct DOMAIN_CONTROLLER_INFO {
const char * client_site_name;
};
+struct SERVER_INFO_1005 {
+ const char * sv1005_comment;
+};
+
struct USER_INFO_0 {
const char * usri0_name;
};
diff --git a/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index 7cc84f5..643b04c 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/lib/netapi/serverinfo.c
@@ -30,9 +30,9 @@
static WERROR NetServerGetInfo_l_1005(struct libnetapi_ctx *ctx,
uint8_t **buffer)
{
- struct srvsvc_NetSrvInfo1005 info1005;
+ struct SERVER_INFO_1005 info1005;
- info1005.comment = lp_serverstring();
+ info1005.sv1005_comment = lp_serverstring();
*buffer = (uint8_t *)talloc_memdup(ctx, &info1005, sizeof(info1005));
if (!*buffer) {
return WERR_NOMEM;
diff --git a/source/librpc/gen_ndr/libnetapi.h
b/source/librpc/gen_ndr/libnetapi.h
index 08b4545..73aa1be 100644
--- a/source/librpc/gen_ndr/libnetapi.h
+++ b/source/librpc/gen_ndr/libnetapi.h
@@ -18,6 +18,10 @@ enum NET_API_STATUS
#endif
;
+struct SERVER_INFO_1005 {
+ const char * sv1005_comment;
+};
+
struct DOMAIN_CONTROLLER_INFO {
const char * domain_controller_name;
const char * domain_controller_address;
diff --git a/source/librpc/gen_ndr/ndr_libnetapi.c
b/source/librpc/gen_ndr/ndr_libnetapi.c
index cd8df4d..bf2bbd0 100644
--- a/source/librpc/gen_ndr/ndr_libnetapi.c
+++ b/source/librpc/gen_ndr/ndr_libnetapi.c
@@ -27,6 +27,36 @@ _PUBLIC_ void ndr_print_NET_API_STATUS(struct ndr_print
*ndr, const char *name,
ndr_print_enum(ndr, name, "ENUM", val, r);
}
+_PUBLIC_ enum ndr_err_code ndr_push_SERVER_INFO_1005(struct ndr_push *ndr, int
ndr_flags, const struct SERVER_INFO_1005 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->sv1005_comment));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_SERVER_INFO_1005(struct ndr_pull *ndr, int
ndr_flags, struct SERVER_INFO_1005 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->sv1005_comment));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_SERVER_INFO_1005(struct ndr_print *ndr, const char
*name, const struct SERVER_INFO_1005 *r)
+{
+ ndr_print_struct(ndr, name, "SERVER_INFO_1005");
+ ndr->depth++;
+ ndr_print_string(ndr, "sv1005_comment", r->sv1005_comment);
+ ndr->depth--;
+}
+
_PUBLIC_ enum ndr_err_code ndr_push_DOMAIN_CONTROLLER_INFO(struct ndr_push
*ndr, int ndr_flags, const struct DOMAIN_CONTROLLER_INFO *r)
{
if (ndr_flags & NDR_SCALARS) {
diff --git a/source/librpc/gen_ndr/ndr_libnetapi.h
b/source/librpc/gen_ndr/ndr_libnetapi.h
index 32ad926..a01fea8 100644
--- a/source/librpc/gen_ndr/ndr_libnetapi.h
+++ b/source/librpc/gen_ndr/ndr_libnetapi.h
@@ -34,6 +34,9 @@
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);
+enum ndr_err_code ndr_push_SERVER_INFO_1005(struct ndr_push *ndr, int
ndr_flags, const struct SERVER_INFO_1005 *r);
+enum ndr_err_code ndr_pull_SERVER_INFO_1005(struct ndr_pull *ndr, int
ndr_flags, struct SERVER_INFO_1005 *r);
+void ndr_print_SERVER_INFO_1005(struct ndr_print *ndr, const char *name, const
struct SERVER_INFO_1005 *r);
enum ndr_err_code ndr_push_DOMAIN_CONTROLLER_INFO(struct ndr_push *ndr, int
ndr_flags, const struct DOMAIN_CONTROLLER_INFO *r);
enum ndr_err_code ndr_pull_DOMAIN_CONTROLLER_INFO(struct ndr_pull *ndr, int
ndr_flags, struct DOMAIN_CONTROLLER_INFO *r);
void ndr_print_DOMAIN_CONTROLLER_INFO(struct ndr_print *ndr, const char *name,
const struct DOMAIN_CONTROLLER_INFO *r);
diff --git a/source/librpc/idl/libnetapi.idl b/source/librpc/idl/libnetapi.idl
index d74df18..9cb8b23 100644
--- a/source/librpc/idl/libnetapi.idl
+++ b/source/librpc/idl/libnetapi.idl
@@ -46,6 +46,10 @@ interface libnetapi
[out] string ***ous
);
+ [public] typedef struct {
+ string sv1005_comment;
+ } SERVER_INFO_1005;
+
[nopush,nopull] NET_API_STATUS NetServerGetInfo(
[in,unique] string *server_name,
[in] uint32 level,
--
Samba Shared Repository
