From 721d36df8372dd45430a93c99180bb94ec7d9773 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 15:10:24 +0100
Subject: Add NetServerGetInfo and NetServerSetInfo (for level 1005).

Guenther
(This used to be commit 1cad549f54563c3a9787624ba7a56b54107ebd57)
---
 source3/lib/netapi/serverinfo.c | 297 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 297 insertions(+)
 create mode 100644 source3/lib/netapi/serverinfo.c

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
new file mode 100644
index 0000000000..d6031b69d2
--- /dev/null
+++ b/source3/lib/netapi/serverinfo.c
@@ -0,0 +1,297 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  NetApi Server Support
+ *  Copyright (C) Guenther Deschner 2007
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+
+#include "lib/netapi/netapi.h"
+#include "libnet/libnet.h"
+
+static WERROR NetServerGetInfoLocal_1005(struct libnetapi_ctx *ctx,
+					 uint8_t **buffer)
+{
+	struct srvsvc_NetSrvInfo1005 info1005;
+
+	info1005.comment = lp_serverstring();
+	*buffer = (uint8_t *)talloc_memdup(ctx, &info1005, sizeof(info1005));
+	if (!*buffer) {
+		return WERR_NOMEM;
+	}
+
+	return WERR_OK;
+}
+
+static WERROR NetServerGetInfoLocal(struct libnetapi_ctx *ctx,
+				    const char *server_name,
+				    uint32_t level,
+				    uint8_t **buffer)
+{
+	switch (level) {
+		case 1005:
+			return NetServerGetInfoLocal_1005(ctx, buffer);
+		default:
+			return WERR_UNKNOWN_LEVEL;
+	}
+
+	return WERR_UNKNOWN_LEVEL;
+}
+
+static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
+				     const char *server_name,
+				     uint32_t level,
+				     uint8_t **buffer)
+{
+	struct cli_state *cli = NULL;
+	struct rpc_pipe_client *pipe_cli = NULL;
+	NTSTATUS status;
+	WERROR werr;
+	union srvsvc_NetSrvInfo info;
+
+	status = cli_full_connection(&cli, NULL, server_name,
+				     NULL, 0,
+				     "IPC$", "IPC",
+				     ctx->username,
+				     ctx->workgroup,
+				     ctx->password,
+				     0, Undefined, NULL);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
+					    &status);
+	if (!pipe_cli) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	};
+
+	status = rpccli_srvsvc_NetSrvGetInfo(pipe_cli, ctx,
+					     server_name,
+					     level,
+					     &info,
+					     &werr);
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	*buffer = (uint8_t *)&info;
+
+ done:
+	if (cli) {
+		cli_shutdown(cli);
+	}
+
+	return werr;
+}
+
+WERROR libnetapi_NetServerGetInfo(struct libnetapi_ctx *ctx,
+				  const char *server_name,
+				  uint32_t level,
+				  uint8_t **buffer)
+{
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+		return NetServerGetInfoLocal(ctx,
+					     server_name,
+					     level,
+					     buffer);
+	}
+
+	return NetServerGetInfoRemote(ctx,
+				      server_name,
+				      level,
+				      buffer);
+
+}
+
+NET_API_STATUS NetServerGetInfo(const char *server_name,
+				uint32_t level,
+				uint8_t **buffer)
+{
+	struct libnetapi_ctx *ctx = NULL;
+	NET_API_STATUS status;
+	WERROR werr;
+
+	status = libnetapi_getctx(&ctx);
+	if (status != 0) {
+		return status;
+	}
+
+	werr = libnetapi_NetServerGetInfo(ctx,
+					  server_name,
+					  level,
+					  buffer);
+	if (!W_ERROR_IS_OK(werr)) {
+		return W_ERROR_V(werr);
+	}
+
+	return 0;
+}
+
+static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
+					 uint8_t *buffer,
+					 uint32_t *parm_error)
+{
+	struct srvsvc_NetSrvInfo1005 *info1005;
+
+	if (!buffer) {
+		*parm_error = 1005; /* sure here ? */
+		return WERR_INVALID_PARAM;
+	}
+
+	info1005 = (struct srvsvc_NetSrvInfo1005 *)buffer;
+
+	if (!info1005->comment) {
+		*parm_error = 1005;
+		return WERR_INVALID_PARAM;
+	}
+
+	/*
+	return libnet_conf_set_parm(GLOBAL_NAME,
+				    "server string",
+				    info1005->comment);
+	*/
+	return WERR_NOT_SUPPORTED;
+}
+
+static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
+				    const char *server_name,
+				    uint32_t level,
+				    uint8_t *buffer,
+				    uint32_t *parm_error)
+{
+	switch (level) {
+		case 1005:
+			return NetServerSetInfoLocal_1005(ctx, buffer, parm_error);
+			break;
+		default:
+			return WERR_UNKNOWN_LEVEL;
+	}
+
+	return WERR_UNKNOWN_LEVEL;
+}
+
+static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
+				     const char *server_name,
+				     uint32_t level,
+				     uint8_t *buffer,
+				     uint32_t *parm_error)
+{
+	struct cli_state *cli = NULL;
+	struct rpc_pipe_client *pipe_cli = NULL;
+	NTSTATUS status;
+	WERROR werr;
+	union srvsvc_NetSrvInfo info;
+
+	status = cli_full_connection(&cli, NULL, server_name,
+				     NULL, 0,
+				     "IPC$", "IPC",
+				     ctx->username,
+				     ctx->workgroup,
+				     ctx->password,
+				     0, Undefined, NULL);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
+					    &status);
+	if (!pipe_cli) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	};
+
+	switch (level) {
+		case 1005:
+			info.info1005 = (struct srvsvc_NetSrvInfo1005 *)buffer;
+			break;
+		default:
+			werr = WERR_NOT_SUPPORTED;
+			goto done;
+	}
+
+	status = rpccli_srvsvc_NetSrvSetInfo(pipe_cli, ctx,
+					     server_name,
+					     level,
+					     info,
+					     parm_error,
+					     &werr);
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+ done:
+	if (cli) {
+		cli_shutdown(cli);
+	}
+
+	return werr;
+}
+
+WERROR libnetapi_NetServerSetInfo(struct libnetapi_ctx *ctx,
+				  const char *server_name,
+				  uint32_t level,
+				  uint8_t *buffer,
+				  uint32_t *parm_error)
+{
+	if (!server_name || is_myname_or_ipaddr(server_name)) {
+		return NetServerSetInfoLocal(ctx,
+					     server_name,
+					     level,
+					     buffer,
+					     parm_error);
+	}
+
+	return NetServerSetInfoRemote(ctx,
+				      server_name,
+				      level,
+				      buffer,
+				      parm_error);
+}
+
+
+NET_API_STATUS NetServerSetInfo(const char *server_name,
+				uint32_t level,
+				uint8_t *buffer,
+				uint32_t *parm_error)
+{
+	struct libnetapi_ctx *ctx = NULL;
+	NET_API_STATUS status;
+	WERROR werr;
+
+	status = libnetapi_getctx(&ctx);
+	if (status != 0) {
+		return status;
+	}
+
+	werr = libnetapi_NetServerSetInfo(ctx,
+					  server_name,
+					  level,
+					  buffer,
+					  parm_error);
+	if (!W_ERROR_IS_OK(werr)) {
+		return W_ERROR_V(werr);
+	}
+
+	return 0;
+}
-- 
cgit 


From 991112eda710c97dff607dd615c777023395da65 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 19 Dec 2007 16:07:40 +0100
Subject: Implement NetServerSetInfo level 1005 in local mode with smbconf
 registry.

Guenther
(This used to be commit 15c2bc15f20a677c3c94895150e396275de6ac9b)
---
 source3/lib/netapi/serverinfo.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index d6031b69d2..d1bfa47649 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -163,12 +163,13 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_INVALID_PARAM;
 	}
 
-	/*
-	return libnet_conf_set_parm(GLOBAL_NAME,
-				    "server string",
-				    info1005->comment);
-	*/
-	return WERR_NOT_SUPPORTED;
+	if (!lp_include_registry_globals()) {
+		return WERR_NOT_SUPPORTED;
+	}
+
+	return libnet_smbconf_set_global_param(ctx,
+					       "server string",
+					       info1005->comment);
 }
 
 static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
@@ -180,7 +181,6 @@ static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
 	switch (level) {
 		case 1005:
 			return NetServerSetInfoLocal_1005(ctx, buffer, parm_error);
-			break;
 		default:
 			return WERR_UNKNOWN_LEVEL;
 	}
-- 
cgit 


From f2fe17245436f8e68be2d5ad96b77721828f040a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 20 Dec 2007 12:12:06 +0100
Subject: Keep libnetapi_NetX calls static for now.

Guenther
(This used to be commit c255654c68923aca3e258906e49be82d719d5ccd)
---
 source3/lib/netapi/serverinfo.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index d1bfa47649..276a98c15e 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -102,10 +102,10 @@ static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
-WERROR libnetapi_NetServerGetInfo(struct libnetapi_ctx *ctx,
-				  const char *server_name,
-				  uint32_t level,
-				  uint8_t **buffer)
+static WERROR libnetapi_NetServerGetInfo(struct libnetapi_ctx *ctx,
+					 const char *server_name,
+					 uint32_t level,
+					 uint8_t **buffer)
 {
 	if (!server_name || is_myname_or_ipaddr(server_name)) {
 		return NetServerGetInfoLocal(ctx,
@@ -248,11 +248,11 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
-WERROR libnetapi_NetServerSetInfo(struct libnetapi_ctx *ctx,
-				  const char *server_name,
-				  uint32_t level,
-				  uint8_t *buffer,
-				  uint32_t *parm_error)
+static WERROR libnetapi_NetServerSetInfo(struct libnetapi_ctx *ctx,
+					 const char *server_name,
+					 uint32_t level,
+					 uint8_t *buffer,
+					 uint32_t *parm_error)
 {
 	if (!server_name || is_myname_or_ipaddr(server_name)) {
 		return NetServerSetInfoLocal(ctx,
-- 
cgit 


From 921d8782ccb92d2c9a394bb2d281d3762d75dde6 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 25 Dec 2007 11:34:10 +0100
Subject: Fix the build (This used to be commit
 72dc71710813ea9f1d8864c4401fef25a25577bd)

---
 source3/lib/netapi/serverinfo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 276a98c15e..27c7c4b2fc 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -167,8 +167,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	return libnet_smbconf_set_global_param(ctx,
-					       "server string",
+	return libnet_smbconf_set_global_param("server string",
 					       info1005->comment);
 }
 
-- 
cgit 


From 5655ae7a2468e8fc93b1a8d9ac4b2f35abbf3703 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 14:15:05 +0100
Subject: Rename libnet_smbconf_set_global_param() to
 libnet_conf_set_global_parameter().

Now all functions are converted to the consistent naming scheme.

Michael
(This used to be commit a559533c0c8a80f3f4078bbc2675de395359485f)
---
 source3/lib/netapi/serverinfo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 27c7c4b2fc..0e356e0ee7 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -167,8 +167,8 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	return libnet_smbconf_set_global_param("server string",
-					       info1005->comment);
+	return libnet_conf_set_global_parameter("server string",
+						info1005->comment);
 }
 
 static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
-- 
cgit 


From 1ee6d3e1ee56554d83437a8c79cb169a26732154 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Jan 2008 01:40:05 +0100
Subject: Introduce a libnet_conf context created by libnet_conf_open().

The libnet_conf_ctx stores the information necessary to interoperate
with the configuration. It is created by calling libnet_conf_open()
and destroyed by calling libnet_conf_close(). The context is passed
to all the libnet_conf functions. It currently stores the token to
access the registry. Later, it could store more data, e.g. the server
to connect to, credentials, and so on. For support of other backends
than registry or support of remote configuration, only the open
function will have to be changed.

In net_conf, the calls to the actual net_conf functions is wrapped
into a function that calls libnet_conf_open()/_close(). Thus an
individual variant of net_conf_runfunction2() and functable2 is
used to cope with functions being called by the wrapper with the
additional libnet_conf_ctx argument.

Michael
(This used to be commit c2a9346faa26e79af5948197a1b322e545f0ed09)
---
 source3/lib/netapi/serverinfo.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 0e356e0ee7..67680ba55a 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -149,6 +149,10 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 					 uint8_t *buffer,
 					 uint32_t *parm_error)
 {
+	WERROR werr;
+	struct libnet_conf_ctx *conf_ctx;
+	TALLOC_CTX *mem_ctx;
+
 	struct srvsvc_NetSrvInfo1005 *info1005;
 
 	if (!buffer) {
@@ -167,8 +171,20 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	return libnet_conf_set_global_parameter("server string",
+	mem_ctx = talloc_stackframe();
+	werr = libnet_conf_open(mem_ctx, &conf_ctx);
+	if (!W_ERROR_IS_OK(werr)) {
+		goto done;
+	}
+
+	werr = libnet_conf_set_global_parameter(conf_ctx,
+						"server string",
 						info1005->comment);
+
+done:
+	libnet_conf_close(conf_ctx);
+	TALLOC_FREE(mem_ctx);
+	return werr;
 }
 
 static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
-- 
cgit 


From 7bfceba4bc49f5f5c8d2836dfd76e1ec15459631 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 16 Jan 2008 17:05:38 +0100
Subject: Use lp_config_backend_is_registry() instead of
 lp_include_registry_globals().

Michael
(This used to be commit c5a7d421c512a6221b0300549d7b5de0368d252e)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 67680ba55a..6cd074615b 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -167,7 +167,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_INVALID_PARAM;
 	}
 
-	if (!lp_include_registry_globals()) {
+	if (!lp_config_backend_is_registry()) {
 		return WERR_NOT_SUPPORTED;
 	}
 
-- 
cgit 


From b1424846c60848d685853fcf632ab766543e05ee Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 18 Jan 2008 02:38:35 +0100
Subject: Cosmetics and error string reporting for libnetapi.

Guenther
(This used to be commit 4ca33928512bd71268bafd41d2b608e814a7295f)
---
 source3/lib/netapi/serverinfo.c | 43 +++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 6cd074615b..7fa166e411 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -22,6 +22,9 @@
 #include "lib/netapi/netapi.h"
 #include "libnet/libnet.h"
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerGetInfoLocal_1005(struct libnetapi_ctx *ctx,
 					 uint8_t **buffer)
 {
@@ -36,6 +39,9 @@ static WERROR NetServerGetInfoLocal_1005(struct libnetapi_ctx *ctx,
 	return WERR_OK;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerGetInfoLocal(struct libnetapi_ctx *ctx,
 				    const char *server_name,
 				    uint32_t level,
@@ -51,6 +57,9 @@ static WERROR NetServerGetInfoLocal(struct libnetapi_ctx *ctx,
 	return WERR_UNKNOWN_LEVEL;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 				     const char *server_name,
 				     uint32_t level,
@@ -102,6 +111,9 @@ static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR libnetapi_NetServerGetInfo(struct libnetapi_ctx *ctx,
 					 const char *server_name,
 					 uint32_t level,
@@ -121,6 +133,10 @@ static WERROR libnetapi_NetServerGetInfo(struct libnetapi_ctx *ctx,
 
 }
 
+/****************************************************************
+ NetServerGetInfo
+****************************************************************/
+
 NET_API_STATUS NetServerGetInfo(const char *server_name,
 				uint32_t level,
 				uint8_t **buffer)
@@ -142,17 +158,18 @@ NET_API_STATUS NetServerGetInfo(const char *server_name,
 		return W_ERROR_V(werr);
 	}
 
-	return 0;
+	return NET_API_STATUS_SUCCESS;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 					 uint8_t *buffer,
 					 uint32_t *parm_error)
 {
 	WERROR werr;
 	struct libnet_conf_ctx *conf_ctx;
-	TALLOC_CTX *mem_ctx;
-
 	struct srvsvc_NetSrvInfo1005 *info1005;
 
 	if (!buffer) {
@@ -171,8 +188,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	mem_ctx = talloc_stackframe();
-	werr = libnet_conf_open(mem_ctx, &conf_ctx);
+	werr = libnet_conf_open(ctx, &conf_ctx);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -181,12 +197,14 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 						"server string",
 						info1005->comment);
 
-done:
+ done:
 	libnet_conf_close(conf_ctx);
-	TALLOC_FREE(mem_ctx);
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
 				    const char *server_name,
 				    uint32_t level,
@@ -203,6 +221,9 @@ static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
 	return WERR_UNKNOWN_LEVEL;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 				     const char *server_name,
 				     uint32_t level,
@@ -263,6 +284,9 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 	return werr;
 }
 
+/****************************************************************
+****************************************************************/
+
 static WERROR libnetapi_NetServerSetInfo(struct libnetapi_ctx *ctx,
 					 const char *server_name,
 					 uint32_t level,
@@ -284,6 +308,9 @@ static WERROR libnetapi_NetServerSetInfo(struct libnetapi_ctx *ctx,
 				      parm_error);
 }
 
+/****************************************************************
+ NetServerSetInfo
+****************************************************************/
 
 NET_API_STATUS NetServerSetInfo(const char *server_name,
 				uint32_t level,
@@ -308,5 +335,5 @@ NET_API_STATUS NetServerSetInfo(const char *server_name,
 		return W_ERROR_V(werr);
 	}
 
-	return 0;
+	return NET_API_STATUS_SUCCESS;
 }
-- 
cgit 


From d1ef6699c0f9648dd76ac5230694e03a574cd48d Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 5 Mar 2008 09:53:33 +0100
Subject: Fix rpccli_srvsvc_NetSrvSetInfo call in libnetapi.

Guenther
(This used to be commit 5911529205ca69c438e0782c07ee4fe5aa95de62)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 7fa166e411..54512950bf 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -268,7 +268,7 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 	status = rpccli_srvsvc_NetSrvSetInfo(pipe_cli, ctx,
 					     server_name,
 					     level,
-					     info,
+					     &info,
 					     parm_error,
 					     &werr);
 	if (!NT_STATUS_IS_OK(status)) {
-- 
cgit 


From 65b0235ee394f90e7a4938cfa5bc5d2d951e9d82 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 5 Mar 2008 15:21:43 +0100
Subject: Give a better error message why NetServerSetInfo() may fail in the
 gui.

Guenther
(This used to be commit 1bbbebb7767b8a25532e8be3dbd274c211e34bbd)
---
 source3/lib/netapi/serverinfo.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 54512950bf..d30e7d97f7 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -185,6 +185,9 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 	}
 
 	if (!lp_config_backend_is_registry()) {
+		libnetapi_set_error_string(ctx,
+			"Configuration manipulation requested but not "
+			"supported by backend");
 		return WERR_NOT_SUPPORTED;
 	}
 
-- 
cgit 


From 6274929b1e1ddf89f4c5e93414121eaf06b6ab14 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 17 Mar 2008 18:01:33 +0100
Subject: libsmbconf: rename all occurrences of libnet_conf_ to smbconf_ .

Michael
(This used to be commit 097af0309d7c3e9342058ba5266667293b23c80d)
---
 source3/lib/netapi/serverinfo.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index d30e7d97f7..a29a840da0 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -169,7 +169,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 					 uint32_t *parm_error)
 {
 	WERROR werr;
-	struct libnet_conf_ctx *conf_ctx;
+	struct smbconf_ctx *conf_ctx;
 	struct srvsvc_NetSrvInfo1005 *info1005;
 
 	if (!buffer) {
@@ -191,17 +191,16 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	werr = libnet_conf_open(ctx, &conf_ctx);
+	werr = smbconf_open(ctx, &conf_ctx);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
-	werr = libnet_conf_set_global_parameter(conf_ctx,
-						"server string",
-						info1005->comment);
+	werr = smbconf_set_global_parameter(conf_ctx, "server string",
+					    info1005->comment);
 
  done:
-	libnet_conf_close(conf_ctx);
+	smbconf_close(conf_ctx);
 	return werr;
 }
 
-- 
cgit 


From adf5bf554cd6bfdc5c6e7b1ed54f7f9329b15c50 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 20 Mar 2008 23:41:39 +0100
Subject: libsmbconf: rename smbconf_open() to smbconf_init().

That's more appropriate.

Michael
(This used to be commit d7bd9bb8aa2003ec0a9860df26857f67255febe2)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index a29a840da0..c5b0c2f709 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -191,7 +191,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	werr = smbconf_open(ctx, &conf_ctx);
+	werr = smbconf_init(ctx, &conf_ctx);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From 23b1d721b8262f69cb7e28348c8e5cdf3483d4ea Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 21 Mar 2008 01:04:57 +0100
Subject: libsmbconf: rename smbconf_close() to smbconf_shutdown().

Michael
(This used to be commit 797b26ad3fad27e085827efb61f6b4d8b37e93f0)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index c5b0c2f709..ffc5f6fd3e 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -200,7 +200,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 					    info1005->comment);
 
  done:
-	smbconf_close(conf_ctx);
+	smbconf_shutdown(conf_ctx);
 	return werr;
 }
 
-- 
cgit 


From fececde1815bf0469bb56e07cf23f54011c9b4ae Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 21 Mar 2008 02:20:16 +0100
Subject: libsmbconf: add backend specific init function.

Hide generic init function taking smbconf_ops argument
from public api.

Michael
(This used to be commit b3f6920ccb9a27fde26e889a7f1f3afaf56b784f)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index ffc5f6fd3e..913338fd49 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -191,7 +191,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	werr = smbconf_init(ctx, &conf_ctx);
+	werr = smbconf_init_reg(ctx, &conf_ctx);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From 6f7cfeddd61f728e2452a7b89f5ee2ff36ca394f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 21 Mar 2008 17:55:31 +0100
Subject: libsmbconf: add a "path" variable to the conf context.

This is passed to the module init routines.
In case of the registry, this is the path of the
basekey in registry, that is to be used, defaulting
to KEY_SMBCONF (HKLM\software\samba\smbconf), when
NULL is given. This is the only case currently used.

In order to support other keys, registry initialization
for smbconf has to be changed to support different keys.

Michael
(This used to be commit 96434d9dc7a66773e313cc128af57493dee245a1)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 913338fd49..a9749a12f9 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -191,7 +191,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 		return WERR_NOT_SUPPORTED;
 	}
 
-	werr = smbconf_init_reg(ctx, &conf_ctx);
+	werr = smbconf_init_reg(ctx, &conf_ctx, NULL);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From ba35a8c8dd530fa8aa6a2fd17cd43dfaa434b2f3 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 8 Apr 2008 02:42:50 +0200
Subject: Restructure inner workings of libnetapi a bit.

Guenther
(This used to be commit a4e3bc2bade8bf74696e1c6ced74da563ff2df7b)
---
 source3/lib/netapi/serverinfo.c | 181 ++++++++--------------------------------
 1 file changed, 36 insertions(+), 145 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index a9749a12f9..e2a458cdc1 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -19,14 +19,16 @@
 
 #include "includes.h"
 
+#include "librpc/gen_ndr/libnetapi.h"
 #include "lib/netapi/netapi.h"
+#include "lib/netapi/libnetapi.h"
 #include "libnet/libnet.h"
 
 /****************************************************************
 ****************************************************************/
 
-static WERROR NetServerGetInfoLocal_1005(struct libnetapi_ctx *ctx,
-					 uint8_t **buffer)
+static WERROR NetServerGetInfo_l_1005(struct libnetapi_ctx *ctx,
+				      uint8_t **buffer)
 {
 	struct srvsvc_NetSrvInfo1005 info1005;
 
@@ -42,14 +44,12 @@ static WERROR NetServerGetInfoLocal_1005(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
-static WERROR NetServerGetInfoLocal(struct libnetapi_ctx *ctx,
-				    const char *server_name,
-				    uint32_t level,
-				    uint8_t **buffer)
+WERROR NetServerGetInfo_l(struct libnetapi_ctx *ctx,
+			  struct NetServerGetInfo *r)
 {
-	switch (level) {
+	switch (r->in.level) {
 		case 1005:
-			return NetServerGetInfoLocal_1005(ctx, buffer);
+			return NetServerGetInfo_l_1005(ctx, r->out.buffer);
 		default:
 			return WERR_UNKNOWN_LEVEL;
 	}
@@ -60,10 +60,8 @@ static WERROR NetServerGetInfoLocal(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
-static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
-				     const char *server_name,
-				     uint32_t level,
-				     uint8_t **buffer)
+WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
+			  struct NetServerGetInfo *r)
 {
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
@@ -71,7 +69,7 @@ static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
-	status = cli_full_connection(&cli, NULL, server_name,
+	status = cli_full_connection(&cli, NULL, r->in.server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
 				     ctx->username,
@@ -92,8 +90,8 @@ static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 	};
 
 	status = rpccli_srvsvc_NetSrvGetInfo(pipe_cli, ctx,
-					     server_name,
-					     level,
+					     r->in.server_name,
+					     r->in.level,
 					     &info,
 					     &werr);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -101,7 +99,11 @@ static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	*buffer = (uint8_t *)&info;
+	*r->out.buffer = talloc_memdup(ctx, &info, sizeof(info));
+	if (!*r->out.buffer) {
+		werr = WERR_NOMEM;
+		goto done;
+	}
 
  done:
 	if (cli) {
@@ -114,73 +116,22 @@ static WERROR NetServerGetInfoRemote(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
-static WERROR libnetapi_NetServerGetInfo(struct libnetapi_ctx *ctx,
-					 const char *server_name,
-					 uint32_t level,
-					 uint8_t **buffer)
-{
-	if (!server_name || is_myname_or_ipaddr(server_name)) {
-		return NetServerGetInfoLocal(ctx,
-					     server_name,
-					     level,
-					     buffer);
-	}
-
-	return NetServerGetInfoRemote(ctx,
-				      server_name,
-				      level,
-				      buffer);
-
-}
-
-/****************************************************************
- NetServerGetInfo
-****************************************************************/
-
-NET_API_STATUS NetServerGetInfo(const char *server_name,
-				uint32_t level,
-				uint8_t **buffer)
-{
-	struct libnetapi_ctx *ctx = NULL;
-	NET_API_STATUS status;
-	WERROR werr;
-
-	status = libnetapi_getctx(&ctx);
-	if (status != 0) {
-		return status;
-	}
-
-	werr = libnetapi_NetServerGetInfo(ctx,
-					  server_name,
-					  level,
-					  buffer);
-	if (!W_ERROR_IS_OK(werr)) {
-		return W_ERROR_V(werr);
-	}
-
-	return NET_API_STATUS_SUCCESS;
-}
-
-/****************************************************************
-****************************************************************/
-
-static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
-					 uint8_t *buffer,
-					 uint32_t *parm_error)
+static WERROR NetServerSetInfo_l_1005(struct libnetapi_ctx *ctx,
+				      struct NetServerSetInfo *r)
 {
 	WERROR werr;
 	struct smbconf_ctx *conf_ctx;
 	struct srvsvc_NetSrvInfo1005 *info1005;
 
-	if (!buffer) {
-		*parm_error = 1005; /* sure here ? */
+	if (!r->in.buffer) {
+		*r->out.parm_error = 1005; /* sure here ? */
 		return WERR_INVALID_PARAM;
 	}
 
-	info1005 = (struct srvsvc_NetSrvInfo1005 *)buffer;
+	info1005 = (struct srvsvc_NetSrvInfo1005 *)r->in.buffer;
 
 	if (!info1005->comment) {
-		*parm_error = 1005;
+		*r->out.parm_error = 1005;
 		return WERR_INVALID_PARAM;
 	}
 
@@ -207,15 +158,12 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
-static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
-				    const char *server_name,
-				    uint32_t level,
-				    uint8_t *buffer,
-				    uint32_t *parm_error)
+WERROR NetServerSetInfo_l(struct libnetapi_ctx *ctx,
+			  struct NetServerSetInfo *r)
 {
-	switch (level) {
+	switch (r->in.level) {
 		case 1005:
-			return NetServerSetInfoLocal_1005(ctx, buffer, parm_error);
+			return NetServerSetInfo_l_1005(ctx, r);
 		default:
 			return WERR_UNKNOWN_LEVEL;
 	}
@@ -226,11 +174,8 @@ static WERROR NetServerSetInfoLocal(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
-static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
-				     const char *server_name,
-				     uint32_t level,
-				     uint8_t *buffer,
-				     uint32_t *parm_error)
+WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
+			  struct NetServerSetInfo *r)
 {
 	struct cli_state *cli = NULL;
 	struct rpc_pipe_client *pipe_cli = NULL;
@@ -238,7 +183,7 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
-	status = cli_full_connection(&cli, NULL, server_name,
+	status = cli_full_connection(&cli, NULL, r->in.server_name,
 				     NULL, 0,
 				     "IPC$", "IPC",
 				     ctx->username,
@@ -258,9 +203,9 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 		goto done;
 	};
 
-	switch (level) {
+	switch (r->in.level) {
 		case 1005:
-			info.info1005 = (struct srvsvc_NetSrvInfo1005 *)buffer;
+			info.info1005 = (struct srvsvc_NetSrvInfo1005 *)r->in.buffer;
 			break;
 		default:
 			werr = WERR_NOT_SUPPORTED;
@@ -268,10 +213,10 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 	}
 
 	status = rpccli_srvsvc_NetSrvSetInfo(pipe_cli, ctx,
-					     server_name,
-					     level,
+					     r->in.server_name,
+					     r->in.level,
 					     &info,
-					     parm_error,
+					     r->out.parm_error,
 					     &werr);
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
@@ -285,57 +230,3 @@ static WERROR NetServerSetInfoRemote(struct libnetapi_ctx *ctx,
 
 	return werr;
 }
-
-/****************************************************************
-****************************************************************/
-
-static WERROR libnetapi_NetServerSetInfo(struct libnetapi_ctx *ctx,
-					 const char *server_name,
-					 uint32_t level,
-					 uint8_t *buffer,
-					 uint32_t *parm_error)
-{
-	if (!server_name || is_myname_or_ipaddr(server_name)) {
-		return NetServerSetInfoLocal(ctx,
-					     server_name,
-					     level,
-					     buffer,
-					     parm_error);
-	}
-
-	return NetServerSetInfoRemote(ctx,
-				      server_name,
-				      level,
-				      buffer,
-				      parm_error);
-}
-
-/****************************************************************
- NetServerSetInfo
-****************************************************************/
-
-NET_API_STATUS NetServerSetInfo(const char *server_name,
-				uint32_t level,
-				uint8_t *buffer,
-				uint32_t *parm_error)
-{
-	struct libnetapi_ctx *ctx = NULL;
-	NET_API_STATUS status;
-	WERROR werr;
-
-	status = libnetapi_getctx(&ctx);
-	if (status != 0) {
-		return status;
-	}
-
-	werr = libnetapi_NetServerSetInfo(ctx,
-					  server_name,
-					  level,
-					  buffer,
-					  parm_error);
-	if (!W_ERROR_IS_OK(werr)) {
-		return W_ERROR_V(werr);
-	}
-
-	return NET_API_STATUS_SUCCESS;
-}
-- 
cgit 


From af19343df8f3ac733538bed37b983b9488a01ef8 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 8 Apr 2008 19:42:26 +0200
Subject: Try to use kerberos in libnetapi.

Guenther
(This used to be commit 9cfce2229508c2145c3527074ac76520544e5d25)
---
 source3/lib/netapi/serverinfo.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index e2a458cdc1..7cc84f5367 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -75,7 +75,9 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 				     ctx->username,
 				     ctx->workgroup,
 				     ctx->password,
-				     0, Undefined, NULL);
+				     CLI_FULL_CONNECTION_USE_KERBEROS |
+				     CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS,
+				     Undefined, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
@@ -189,7 +191,9 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 				     ctx->username,
 				     ctx->workgroup,
 				     ctx->password,
-				     0, Undefined, NULL);
+				     CLI_FULL_CONNECTION_USE_KERBEROS |
+				     CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS,
+				     Undefined, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		werr = ntstatus_to_werror(status);
-- 
cgit 


From 1a8a8b776961c9220fa686cb60b7ab82a7c76a3d Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Apr 2008 21:31:12 +0200
Subject: Use SERVER_INFO_1005 in libnetapi.

Guenther
(This used to be commit 5f8793dd1d8a3694afb7f2d882cfb9990eb40b75)
---
 source3/lib/netapi/serverinfo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 7cc84f5367..643b04c4da 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/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;
-- 
cgit 


From 8ab9696bfb5e127a35ab31e7e7746388a8f8a365 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Apr 2008 21:52:03 +0200
Subject: Split out private headers in libnetapi.

Guenther
(This used to be commit dd6251d51472a96bfc5ba3d62ea788c8924d4c6b)
---
 source3/lib/netapi/serverinfo.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 643b04c4da..fb5d9402cf 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -21,6 +21,7 @@
 
 #include "librpc/gen_ndr/libnetapi.h"
 #include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
 #include "libnet/libnet.h"
 
-- 
cgit 


From aeb7f7db4014695eb6510cc7a713db4c6228bd1f Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Apr 2008 22:04:04 +0200
Subject: Use libnetapi_open_ipc_connection in libnetapi.

Guenther
(This used to be commit d9f19fc61586d606393368799dee9757c169d602)
---
 source3/lib/netapi/serverinfo.c | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index fb5d9402cf..238b9ca308 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -70,18 +70,8 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
-	status = cli_full_connection(&cli, NULL, r->in.server_name,
-				     NULL, 0,
-				     "IPC$", "IPC",
-				     ctx->username,
-				     ctx->workgroup,
-				     ctx->password,
-				     CLI_FULL_CONNECTION_USE_KERBEROS |
-				     CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS,
-				     Undefined, NULL);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -109,10 +99,6 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (cli) {
-		cli_shutdown(cli);
-	}
-
 	return werr;
 }
 
@@ -186,18 +172,8 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
-	status = cli_full_connection(&cli, NULL, r->in.server_name,
-				     NULL, 0,
-				     "IPC$", "IPC",
-				     ctx->username,
-				     ctx->workgroup,
-				     ctx->password,
-				     CLI_FULL_CONNECTION_USE_KERBEROS |
-				     CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS,
-				     Undefined, NULL);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -229,9 +205,5 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 	}
 
  done:
-	if (cli) {
-		cli_shutdown(cli);
-	}
-
 	return werr;
 }
-- 
cgit 


From ef6ed54765b1d8ccaabfb3268f8427cc791b738b Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Apr 2008 22:44:00 +0200
Subject: Use libnetapi_open_pipe in netapi functions.

Guenther
(This used to be commit 5804d8b112e1da022988c635284eb4799974d4c7)
---
 source3/lib/netapi/serverinfo.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 238b9ca308..58efeb375d 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -75,12 +75,10 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
-	};
+	}
 
 	status = rpccli_srvsvc_NetSrvGetInfo(pipe_cli, ctx,
 					     r->in.server_name,
@@ -177,12 +175,10 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
-	};
+	}
 
 	switch (r->in.level) {
 		case 1005:
-- 
cgit 


From 25953779884483b9bb49feaa7da0f634ed20681b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Apr 2008 00:24:42 +0200
Subject: libnetapi: fix a C++ warning by making implicit cast explicit

Michael
(This used to be commit b62dd61cc56ec33601289fd4e23058c7f9ad3f0d)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 58efeb375d..dd7a8808b4 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -90,7 +90,7 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	*r->out.buffer = talloc_memdup(ctx, &info, sizeof(info));
+	*r->out.buffer = (uint8_t *)talloc_memdup(ctx, &info, sizeof(info));
 	if (!*r->out.buffer) {
 		werr = WERR_NOMEM;
 		goto done;
-- 
cgit 


From ebbeddfdcd7b3782f5b6e58abb7af7d9484090ae Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 6 Jun 2008 13:50:39 +0200
Subject: netapi: add NetRemoteTOD() skeleton.

Guenther
(This used to be commit 78bc98cb55e36ef175f9c0f6fcd943781a514005)
---
 source3/lib/netapi/serverinfo.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index dd7a8808b4..f75779a653 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -203,3 +203,22 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
  done:
 	return werr;
 }
+
+/****************************************************************
+****************************************************************/
+
+WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
+		      struct NetRemoteTOD *r)
+{
+	return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR NetRemoteTOD_l(struct libnetapi_ctx *ctx,
+		      struct NetRemoteTOD *r)
+{
+	return WERR_NOT_SUPPORTED;
+}
+
-- 
cgit 


From a2290e5e0073fdfbfe4d5a4df12ee0a1b25f5f4e Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 6 Jun 2008 16:41:19 +0200
Subject: netapi: implement NetRemoteTOD().

Guenther
(This used to be commit 76877680a8a6400bc2d3b5e3b788b7d5fc683850)
---
 source3/lib/netapi/serverinfo.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index f75779a653..7920bc29d0 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -210,7 +210,37 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 		      struct NetRemoteTOD *r)
 {
-	return WERR_NOT_SUPPORTED;
+	struct cli_state *cli = NULL;
+	struct rpc_pipe_client *pipe_cli = NULL;
+	NTSTATUS status;
+	WERROR werr;
+	struct srvsvc_NetRemoteTODInfo *info = NULL;
+
+	werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
+	if (!W_ERROR_IS_OK(werr)) {
+		goto done;
+	}
+
+	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
+		goto done;
+	}
+
+	status = rpccli_srvsvc_NetRemoteTOD(pipe_cli, ctx,
+					    r->in.server_name,
+					    &info,
+					    &werr);
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
+		goto done;
+	}
+
+	*r->out.buf = (uint8_t *)talloc_memdup(ctx, info,
+			sizeof(struct srvsvc_NetRemoteTODInfo));
+	W_ERROR_HAVE_NO_MEMORY(*r->out.buf);
+
+ done:
+	return werr;
 }
 
 /****************************************************************
@@ -219,6 +249,6 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 WERROR NetRemoteTOD_l(struct libnetapi_ctx *ctx,
 		      struct NetRemoteTOD *r)
 {
-	return WERR_NOT_SUPPORTED;
+	return NetRemoteTOD_r(ctx, r);
 }
 
-- 
cgit 


From 798b56edaec88206b0d61d2852af41777d53aef2 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 20 Jul 2008 17:59:30 +0200
Subject: Refactoring: libnetapi_open_pipe takes an interface instead of
 pipe_idx (This used to be commit 726e56c72fdb685ab5eddefd2fd8b043dc38d6ad)

---
 source3/lib/netapi/serverinfo.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 7920bc29d0..a591d3753a 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -75,7 +75,8 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	werr = libnetapi_open_pipe(ctx, cli, &ndr_table_srvsvc.syntax_id,
+				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -175,7 +176,8 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	werr = libnetapi_open_pipe(ctx, cli, &ndr_table_srvsvc.syntax_id,
+				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -221,7 +223,8 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	werr = libnetapi_open_pipe(ctx, cli, &ndr_table_srvsvc.syntax_id,
+				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From 44465215ff86452bf4136727c99854a835032505 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 18 Jul 2008 23:33:08 +0200
Subject: netapi: use "buffer" in libnetapi.

Guenther
(This used to be commit 80957bc1bc1462a2478b3eea64f5cb7a84d08677)
---
 source3/lib/netapi/serverinfo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index a591d3753a..622b8d425d 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -238,9 +238,9 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	*r->out.buf = (uint8_t *)talloc_memdup(ctx, info,
-			sizeof(struct srvsvc_NetRemoteTODInfo));
-	W_ERROR_HAVE_NO_MEMORY(*r->out.buf);
+	*r->out.buffer = (uint8_t *)talloc_memdup(ctx, info,
+			  sizeof(struct srvsvc_NetRemoteTODInfo));
+	W_ERROR_HAVE_NO_MEMORY(*r->out.buffer);
 
  done:
 	return werr;
-- 
cgit 


From 87b9c9ade21a68d4428ff4aadd32f02f86e78a40 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 12 Aug 2008 15:25:06 +0200
Subject: netapi: make non-implemented local calls default to remote
 "localhost" calls.

Guenther
(cherry picked from commit aa70e588803e3767796dc958b139f4ee464d8626)
(This used to be commit 9927ac6eec9fe1fecfedb97b61c4f93379fc8722)
---
 source3/lib/netapi/serverinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 622b8d425d..bd063332bf 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -252,6 +252,6 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 WERROR NetRemoteTOD_l(struct libnetapi_ctx *ctx,
 		      struct NetRemoteTOD *r)
 {
-	return NetRemoteTOD_r(ctx, r);
+	LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetRemoteTOD);
 }
 
-- 
cgit 


From fcd10d26a407bef323cb8beda39a21aeb1e5b144 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 12 Aug 2008 17:59:23 +0200
Subject: netapi: make libnetapi_open_ipc_connection static.

Guenther
(cherry picked from commit 0259914f8ff04514a8395d8e1af61aadd50c5efb)
(This used to be commit 7edc671cc1007ae216e7efdbcdb9cfa1e547dca5)
---
 source3/lib/netapi/serverinfo.c | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index bd063332bf..5f744bea26 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -70,12 +70,9 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
-	werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
-	if (!W_ERROR_IS_OK(werr)) {
-		goto done;
-	}
-
-	werr = libnetapi_open_pipe(ctx, cli, &ndr_table_srvsvc.syntax_id,
+	werr = libnetapi_open_pipe(ctx, r->in.server_name,
+				   &ndr_table_srvsvc.syntax_id,
+				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -171,12 +168,9 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
-	werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
-	if (!W_ERROR_IS_OK(werr)) {
-		goto done;
-	}
-
-	werr = libnetapi_open_pipe(ctx, cli, &ndr_table_srvsvc.syntax_id,
+	werr = libnetapi_open_pipe(ctx, r->in.server_name,
+				   &ndr_table_srvsvc.syntax_id,
+				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
@@ -218,12 +212,9 @@ WERROR NetRemoteTOD_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	struct srvsvc_NetRemoteTODInfo *info = NULL;
 
-	werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
-	if (!W_ERROR_IS_OK(werr)) {
-		goto done;
-	}
-
-	werr = libnetapi_open_pipe(ctx, cli, &ndr_table_srvsvc.syntax_id,
+	werr = libnetapi_open_pipe(ctx, r->in.server_name,
+				   &ndr_table_srvsvc.syntax_id,
+				   &cli,
 				   &pipe_cli);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
-- 
cgit 


From c59158b2258995833373b7c596b0a6e1d09dba4f Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 1 Sep 2008 18:37:54 +0200
Subject: netapi: add support for more infolevels in NetServerGetInfo_r.

Guenther
(This used to be commit 43aad72457f77ac209494cfca46048e0c4bfa6c7)
---
 source3/lib/netapi/serverinfo.c | 93 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 3 deletions(-)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 5f744bea26..12a0808658 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -61,6 +61,78 @@ WERROR NetServerGetInfo_l(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
+static NTSTATUS map_server_info_to_SERVER_INFO_buffer(TALLOC_CTX *mem_ctx,
+						      uint32_t level,
+						      union srvsvc_NetSrvInfo *i,
+						      uint8_t **buffer)
+{
+	struct SERVER_INFO_100 i100;
+	struct SERVER_INFO_101 i101;
+	struct SERVER_INFO_102 i102;
+	struct SERVER_INFO_1005 i1005;
+
+	uint32_t num_info = 0;
+
+	switch (level) {
+		case 100:
+			i100.sv100_platform_id		= i->info100->platform_id;
+			i100.sv100_name			= talloc_strdup(mem_ctx, i->info100->server_name);
+
+			ADD_TO_ARRAY(mem_ctx, struct SERVER_INFO_100, i100,
+				     (struct SERVER_INFO_100 **)buffer,
+				     &num_info);
+			break;
+
+		case 101:
+			i101.sv101_platform_id		= i->info101->platform_id;
+			i101.sv101_name			= talloc_strdup(mem_ctx, i->info101->server_name);
+			i101.sv101_version_major	= i->info101->version_major;
+			i101.sv101_version_minor	= i->info101->version_minor;
+			i101.sv101_type			= i->info101->server_type;
+			i101.sv101_comment		= talloc_strdup(mem_ctx, i->info101->comment);
+
+			ADD_TO_ARRAY(mem_ctx, struct SERVER_INFO_101, i101,
+				     (struct SERVER_INFO_101 **)buffer,
+				     &num_info);
+			break;
+
+		case 102:
+			i102.sv102_platform_id		= i->info102->platform_id;
+			i102.sv102_name			= talloc_strdup(mem_ctx, i->info102->server_name);
+			i102.sv102_version_major	= i->info102->version_major;
+			i102.sv102_version_minor	= i->info102->version_minor;
+			i102.sv102_type			= i->info102->server_type;
+			i102.sv102_comment		= talloc_strdup(mem_ctx, i->info102->comment);
+			i102.sv102_users		= i->info102->users;
+			i102.sv102_disc			= i->info102->disc;
+			i102.sv102_hidden		= i->info102->hidden;
+			i102.sv102_announce		= i->info102->announce;
+			i102.sv102_anndelta		= i->info102->anndelta;
+			i102.sv102_licenses		= i->info102->licenses;
+			i102.sv102_userpath		= talloc_strdup(mem_ctx, i->info102->userpath);
+
+			ADD_TO_ARRAY(mem_ctx, struct SERVER_INFO_102, i102,
+				     (struct SERVER_INFO_102 **)buffer,
+				     &num_info);
+			break;
+
+		case 1005:
+			i1005.sv1005_comment		= talloc_strdup(mem_ctx, i->info1005->comment);
+
+			ADD_TO_ARRAY(mem_ctx, struct SERVER_INFO_1005, i1005,
+				     (struct SERVER_INFO_1005 **)buffer,
+				     &num_info);
+			break;
+		default:
+			return NT_STATUS_NOT_SUPPORTED;
+	}
+
+	return NT_STATUS_OK;
+}
+
+/****************************************************************
+****************************************************************/
+
 WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 			  struct NetServerGetInfo *r)
 {
@@ -70,6 +142,20 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 	WERROR werr;
 	union srvsvc_NetSrvInfo info;
 
+	if (!r->out.buffer) {
+		return WERR_INVALID_PARAM;
+	}
+
+	switch (r->in.level) {
+		case 100:
+		case 101:
+		case 102:
+		case 1005:
+			break;
+		default:
+			return WERR_UNKNOWN_LEVEL;
+	}
+
 	werr = libnetapi_open_pipe(ctx, r->in.server_name,
 				   &ndr_table_srvsvc.syntax_id,
 				   &cli,
@@ -88,9 +174,10 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	*r->out.buffer = (uint8_t *)talloc_memdup(ctx, &info, sizeof(info));
-	if (!*r->out.buffer) {
-		werr = WERR_NOMEM;
+	status = map_server_info_to_SERVER_INFO_buffer(ctx, r->in.level, &info,
+						       r->out.buffer);
+	if (!NT_STATUS_IS_OK(status)) {
+		werr = ntstatus_to_werror(status);
 		goto done;
 	}
 
-- 
cgit 


From 78a80f18651fa08482427485e024c74120218925 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 1 Sep 2008 18:54:53 +0200
Subject: netapi: add support for local query of level 101 in NetServerGetInfo.

Guenther
(This used to be commit b7a2f27c1cae9abed2f821177fca425012222632)
---
 source3/lib/netapi/serverinfo.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'source3/lib/netapi/serverinfo.c')

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 12a0808658..b2a134b0af 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -28,6 +28,29 @@
 /****************************************************************
 ****************************************************************/
 
+static WERROR NetServerGetInfo_l_101(struct libnetapi_ctx *ctx,
+				     uint8_t **buffer)
+{
+	struct SERVER_INFO_101 i;
+
+	i.sv101_platform_id	= PLATFORM_ID_NT;
+	i.sv101_name		= global_myname();
+	i.sv101_version_major	= lp_major_announce_version();
+	i.sv101_version_minor	= lp_minor_announce_version();
+	i.sv101_type		= lp_default_server_announce();
+	i.sv101_comment		= lp_serverstring();
+
+	*buffer = (uint8_t *)talloc_memdup(ctx, &i, sizeof(i));
+	if (!*buffer) {
+		return WERR_NOMEM;
+	}
+
+	return WERR_OK;
+}
+
+/****************************************************************
+****************************************************************/
+
 static WERROR NetServerGetInfo_l_1005(struct libnetapi_ctx *ctx,
 				      uint8_t **buffer)
 {
@@ -49,6 +72,8 @@ WERROR NetServerGetInfo_l(struct libnetapi_ctx *ctx,
 			  struct NetServerGetInfo *r)
 {
 	switch (r->in.level) {
+		case 101:
+			return NetServerGetInfo_l_101(ctx, r->out.buffer);
 		case 1005:
 			return NetServerGetInfo_l_1005(ctx, r->out.buffer);
 		default:
-- 
cgit