From 3455702721c0888a475afe3e0fe2e8469aa8cdd3 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 16 Apr 2008 02:38:13 +0200
Subject: libnetapi: Let NetUserAdd_l/NetUserDel_l talk to the local RPC
 server.

Guenther
(This used to be commit 9bbb6cea0b21d98ae13f7a41226b437515bd5a2f)
---
 source3/lib/netapi/user.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

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

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 55d9795f2d..05a051067a 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -27,15 +27,6 @@
 /****************************************************************
 ****************************************************************/
 
-WERROR NetUserAdd_l(struct libnetapi_ctx *ctx,
-		    struct NetUserAdd *r)
-{
-	return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 static void convert_USER_INFO_1_to_samr_user_info25(struct USER_INFO_1 *info1,
 						    DATA_BLOB *user_session_key,
 						    struct samr_UserInfo25 *info25)
@@ -344,6 +335,20 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
+WERROR NetUserAdd_l(struct libnetapi_ctx *ctx,
+		    struct NetUserAdd *r)
+{
+	/* for now just talk to local RPC server */
+	if (!r->in.server_name) {
+		r->in.server_name = "localhost";
+	}
+
+	return NetUserAdd_r(ctx, r);
+}
+
+/****************************************************************
+****************************************************************/
+
 WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 		    struct NetUserDel *r)
 {
@@ -515,7 +520,12 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 WERROR NetUserDel_l(struct libnetapi_ctx *ctx,
 		    struct NetUserDel *r)
 {
-	return WERR_NOT_SUPPORTED;
+	/* for now just talk to local RPC server */
+	if (!r->in.server_name) {
+		r->in.server_name = "localhost";
+	}
+
+	return NetUserDel_r(ctx, r);
 }
 
 /****************************************************************
-- 
cgit 


From cee268b5cb32076cc09cbfa429a0e2553ba5be4d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 20 Apr 2008 14:07:38 +0200
Subject: Make convert_samr_dispinfo_to_NET_DISPLAY() static (This used to be
 commit a30a26d471a572167ee13bf10be1a275a6592851)

---
 source3/lib/netapi/user.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 05a051067a..f2dc785a36 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -845,11 +845,11 @@ static WERROR convert_samr_dispinfo_to_NET_DISPLAY_GROUP(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-WERROR convert_samr_dispinfo_to_NET_DISPLAY(TALLOC_CTX *mem_ctx,
-					    union samr_DispInfo *info,
-					    uint32_t level,
-					    uint32_t *entries_read,
-					    void **buffer)
+static WERROR convert_samr_dispinfo_to_NET_DISPLAY(TALLOC_CTX *mem_ctx,
+						   union samr_DispInfo *info,
+						   uint32_t level,
+						   uint32_t *entries_read,
+						   void **buffer)
 {
 	switch (level) {
 		case 1:
-- 
cgit