From 8f163d5c5ae48a3ff1974e936b9316781eceff8a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 23 Dec 2007 15:07:20 +0100
Subject: Move logic of net_conf_getparm() to libnet_conf.c.

Michael
(This used to be commit d3a20c4d5a8109334cd3ed665ba60cfcc4425059)
---
 source3/utils/net_conf.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 673d373177..f3f2321643 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -869,7 +869,6 @@ static int net_conf_getparm(int argc, const char **argv)
 {
 	int ret = -1;
 	WERROR werr = WERR_OK;
-	struct registry_key *key = NULL;
 	char *service = NULL;
 	char *param = NULL;
 	struct registry_value *value = NULL;
@@ -884,21 +883,20 @@ static int net_conf_getparm(int argc, const char **argv)
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	if (!libnet_smbconf_key_exists(ctx, service)) {
+	werr = libnet_smbconf_getparm(ctx, service, param, &value);
+
+	if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
 		d_fprintf(stderr,
-			  "ERROR: given service '%s' does not exist.\n",
+			  "Error: given service '%s' does not exist.\n",
 			  service);
 		goto done;
-	}
-
-	werr = libnet_smbconf_open_path(ctx, service, REG_KEY_READ, &key);
-	if (!W_ERROR_IS_OK(werr)) {
+	} else if (W_ERROR_EQUAL(werr, WERR_INVALID_PARAM)) {
+		d_fprintf(stderr,
+			  "Error: given parameter '%s' is not set.\n",
+			  param);
 		goto done;
-	}
-
-	werr = reg_queryvalue(ctx, key, param, &value);
-	if (!W_ERROR_IS_OK(werr)) {
-		d_fprintf(stderr, "Error querying value '%s': %s.\n",
+	} else if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error getting value '%s': %s.\n",
 			  param, dos_errstr(werr));
 		goto done;
 	}
-- 
cgit 


From c74579f49149171e731ae9b5a8e77c579d120cbb Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 24 Dec 2007 00:53:22 +0100
Subject: Make libnet_smbconf_key_exists() use talloc_stackframe().

And not pass a talloc context.

Michael
(This used to be commit 7e8451f2f03b246801783aaf4b3d54465292f8f7)
---
 source3/utils/net_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index f3f2321643..d09079c6f2 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -340,7 +340,7 @@ static int import_process_service(TALLOC_CTX *ctx,
 	if (opt_testmode) {
 		d_printf("[%s]\n", servicename);
 	} else {
-		if (libnet_smbconf_key_exists(tmp_ctx, servicename)) {
+		if (libnet_smbconf_key_exists(servicename)) {
 			werr = reg_delkey_internal(tmp_ctx, servicename);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
@@ -424,7 +424,7 @@ int net_conf_list(int argc, const char **argv)
 		goto done;
 	}
 
-	if (libnet_smbconf_key_exists(ctx, GLOBAL_NAME))  {
+	if (libnet_smbconf_key_exists(GLOBAL_NAME))  {
 		werr = reg_openkey(ctx, base_key, GLOBAL_NAME,
 				   REG_KEY_READ, &sub_key);
 		if (!W_ERROR_IS_OK(werr)) {
-- 
cgit 


From c9f65929b733353baec531c4735749a754f051c5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 02:21:30 +0100
Subject: Move reg_delkey_internal() to libnet/libnet_conf.c

Michael
(This used to be commit c1b863fd0520ce64a1bad5e2fa3f69afcc2c78d5)
---
 source3/utils/net_conf.c | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index d09079c6f2..f45042b2f8 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -143,30 +143,6 @@ static char *format_value(TALLOC_CTX *mem_ctx, struct registry_value *value)
 	return result;
 }
 
-/*
- * delete a subkey of KEY_SMBCONF
- */
-static WERROR reg_delkey_internal(TALLOC_CTX *ctx, const char *keyname)
-{
-	WERROR werr = WERR_OK;
-	struct registry_key *key = NULL;
-
-	werr = libnet_smbconf_open_basepath(ctx, REG_KEY_WRITE, &key);
-	if (!W_ERROR_IS_OK(werr)) {
-		goto done;
-	}
-
-	werr = reg_deletekey_recursive(key, key, keyname);
-	if (!W_ERROR_IS_OK(werr)) {
-		d_fprintf(stderr, "Error deleting registry key %s\\%s: %s\n",
-			  KEY_SMBCONF, keyname, dos_errstr(werr));
-	}
-
-done:
-	TALLOC_FREE(key);
-	return werr;
-}
-
 static WERROR list_values(TALLOC_CTX *ctx, struct registry_key *key)
 {
 	WERROR werr = WERR_OK;
-- 
cgit 


From 9c20b9a731d581ae8bbf4f9ef66c3b7ded7e4122 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 02:24:39 +0100
Subject: Rename reg_delkey_internal() to libnet_smbconf_delshare().

Michael
(This used to be commit 7d501f0d78ec57509d0bc5ef0dc16fcd24ee27e7)
---
 source3/utils/net_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index f45042b2f8..e1b4fe1dfa 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -317,7 +317,7 @@ static int import_process_service(TALLOC_CTX *ctx,
 		d_printf("[%s]\n", servicename);
 	} else {
 		if (libnet_smbconf_key_exists(servicename)) {
-			werr = reg_delkey_internal(tmp_ctx, servicename);
+			werr = libnet_smbconf_delshare(tmp_ctx, servicename);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
 			}
@@ -799,7 +799,7 @@ int net_conf_delshare(int argc, const char **argv)
 	}
 	sharename = argv[0];
 
-	if (W_ERROR_IS_OK(reg_delkey_internal(NULL, sharename))) {
+	if (W_ERROR_IS_OK(libnet_smbconf_delshare(NULL, sharename))) {
 		ret = 0;
 	}
 done:
-- 
cgit 


From 86486fcc9826663f7bf03fe4ceb354818415d089 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 02:31:41 +0100
Subject: Simplify libnet_smbconf_delshare().

Remove talloc context parameter.
Remove d_printf error message.

Michael
(This used to be commit 870d35c04889603843bae989fb9c01396b4c6ed1)
---
 source3/utils/net_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index e1b4fe1dfa..38c14d779f 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -317,7 +317,7 @@ static int import_process_service(TALLOC_CTX *ctx,
 		d_printf("[%s]\n", servicename);
 	} else {
 		if (libnet_smbconf_key_exists(servicename)) {
-			werr = libnet_smbconf_delshare(tmp_ctx, servicename);
+			werr = libnet_smbconf_delshare(servicename);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
 			}
@@ -799,7 +799,7 @@ int net_conf_delshare(int argc, const char **argv)
 	}
 	sharename = argv[0];
 
-	if (W_ERROR_IS_OK(libnet_smbconf_delshare(NULL, sharename))) {
+	if (W_ERROR_IS_OK(libnet_smbconf_delshare(sharename))) {
 		ret = 0;
 	}
 done:
-- 
cgit 


From 734ddacc915aa6008b7189b4c8124bc8ee6b6890 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 02:42:33 +0100
Subject: Add error reporting to net_conf_delshare().

Michael
(This used to be commit 8d02a2de61eb6b62fef1fbe57194c9d286423ba0)
---
 source3/utils/net_conf.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 38c14d779f..54875c49a3 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -792,6 +792,7 @@ int net_conf_delshare(int argc, const char **argv)
 {
 	int ret = -1;
 	const char *sharename = NULL;
+	WERROR werr = WERR_OK;
 
 	if (argc != 1) {
 		net_conf_delshare_usage(argc, argv);
@@ -799,9 +800,14 @@ int net_conf_delshare(int argc, const char **argv)
 	}
 	sharename = argv[0];
 
-	if (W_ERROR_IS_OK(libnet_smbconf_delshare(sharename))) {
-		ret = 0;
+	werr = libnet_smbconf_delshare(sharename);
+	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error deleting share %s: %s\n",
+			  sharename, dos_errstr(werr));
+		goto done;
 	}
+
+	ret = 0;
 done:
 	return ret;
 }
-- 
cgit 


From 9626fffe14ebedba7ce53441bb4f9e2288a8410d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 02:48:45 +0100
Subject: Use the proper boolean constants in net_conf.c

Michael
(This used to be commit 1fe4ea63b197cb7ebc054909d888d74b5ad6523c)
---
 source3/utils/net_conf.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 54875c49a3..a10f983025 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -360,7 +360,7 @@ done:
 	return ret;
 }
 
-/* return True iff there are nondefault globals */
+/* return true iff there are nondefault globals */
 static bool globals_exist(void)
 {
 	int i = 0;
@@ -368,10 +368,10 @@ static bool globals_exist(void)
 
 	while ((parm = lp_next_parameter(GLOBAL_SECTION_SNUM, &i, 0)) != NULL) {
 		if (parm->type != P_SEP) {
-			return True;
+			return true;
 		}
 	}
-	return False;
+	return false;
 }
 
 /*
@@ -456,7 +456,7 @@ int net_conf_import(int argc, const char **argv)
 	int ret = -1;
 	const char *filename = NULL;
 	const char *servicename = NULL;
-	bool service_found = False;
+	bool service_found = false;
 	TALLOC_CTX *ctx;
 	struct share_iterator *shares;
 	struct share_params *share;
@@ -480,10 +480,10 @@ int net_conf_import(int argc, const char **argv)
 		filename));
 
 	if (!lp_load(filename,
-		     False,     /* global_only */
-		     True,      /* save_defaults */
-		     False,     /* add_ipc */
-		     True))     /* initialize_globals */
+		     false,     /* global_only */
+		     true,      /* save_defaults */
+		     false,     /* add_ipc */
+		     true))     /* initialize_globals */
 	{
 		d_fprintf(stderr, "Error parsing configuration file.\n");
 		goto done;
@@ -497,7 +497,7 @@ int net_conf_import(int argc, const char **argv)
 	if (((servicename == NULL) && globals_exist()) ||
 	    strequal(servicename, GLOBAL_NAME))
 	{
-		service_found = True;
+		service_found = true;
 		if (import_process_service(ctx, &global_share) != 0) {
 			goto done;
 		}
@@ -516,7 +516,7 @@ int net_conf_import(int argc, const char **argv)
 		if ((servicename == NULL)
 		    || strequal(servicename, lp_servicename(share->service)))
 		{
-			service_found = True;
+			service_found = true;
 			if (import_process_service(ctx, share)!= 0) {
 				goto done;
 			}
-- 
cgit 


From 8e53343a74ab6c8947523ca9bd9a8c1583a8691e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 02:55:07 +0100
Subject: Move drop_smbconf_internal() to libnet_conf.c

Michael
(This used to be commit 4c2a3396bb687703f6b74655fda2014d1f75200b)
---
 source3/utils/net_conf.c | 50 ------------------------------------------------
 1 file changed, 50 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index a10f983025..e46ff758ef 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -168,56 +168,6 @@ done:
 	return werr;
 }
 
-static WERROR drop_smbconf_internal(TALLOC_CTX *ctx)
-{
-	char *path, *p;
-	WERROR werr = WERR_OK;
-	NT_USER_TOKEN *token;
-	struct registry_key *parent_key = NULL;
-	struct registry_key *new_key = NULL;
-	TALLOC_CTX* tmp_ctx = NULL;
-	enum winreg_CreateAction action;
-
-	tmp_ctx = talloc_new(ctx);
-	if (tmp_ctx == NULL) {
-		werr = WERR_NOMEM;
-		goto done;
-	}
-
-	if (!(token = registry_create_admin_token(tmp_ctx))) {
-		/* what is the appropriate error code here? */
-		werr = WERR_CAN_NOT_COMPLETE;
-		goto done;
-	}
-
-	path = talloc_strdup(tmp_ctx, KEY_SMBCONF);
-	if (path == NULL) {
-		d_fprintf(stderr, "ERROR: out of memory!\n");
-		werr = WERR_NOMEM;
-		goto done;
-	}
-	p = strrchr(path, '\\');
-	*p = '\0';
-	werr = reg_open_path(tmp_ctx, path, REG_KEY_WRITE, token, &parent_key);
-
-	if (!W_ERROR_IS_OK(werr)) {
-		goto done;
-	}
-
-	werr = reg_deletekey_recursive(tmp_ctx, parent_key, p+1);
-
-	if (!W_ERROR_IS_OK(werr)) {
-		goto done;
-	}
-
-	werr = reg_createkey(tmp_ctx, parent_key, p+1, REG_KEY_WRITE,
-			     &new_key, &action);
-
-done:
-	TALLOC_FREE(tmp_ctx);
-	return werr;
-}
-
 static char *parm_valstr(TALLOC_CTX *ctx, struct parm_struct *parm,
 			 struct share_params *share)
 {
-- 
cgit 


From 2764f5a0a6404b1ade9b996783e0a131b7b2d231 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 03:01:59 +0100
Subject: Rename drop_smbconf_internal() to libnet_smbconf_drop().

Michael
(This used to be commit 5873e6a1f8242e07b1699366a536350a7199c28c)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index e46ff758ef..6d59643bee 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -538,7 +538,7 @@ int net_conf_drop(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = drop_smbconf_internal(NULL);
+	werr = libnet_smbconf_drop(NULL);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error deleting configuration: %s\n",
 			  dos_errstr(werr));
-- 
cgit 


From e5a87c2543dea12488250eb8e15dcfe02b34dfe1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 03:05:06 +0100
Subject: Remove talloc context parameter from libnet_smbconf_drop().

Make use of talloc_stackframe.

Michael
(This used to be commit aaceab1153f6c2a2adde83681913c771a16ca81f)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 6d59643bee..9a6f5400e1 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -538,7 +538,7 @@ int net_conf_drop(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_drop(NULL);
+	werr = libnet_smbconf_drop();
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error deleting configuration: %s\n",
 			  dos_errstr(werr));
-- 
cgit 


From f3b0469b4a623c3ef17e2453bf40eb52778b5c42 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 03:29:05 +0100
Subject: Remove talloc context parameter from libnet_smbconf_setparm().

Make use of talloc stackframe internally.
This removes talloc contxt from net_conf_setparm.

Michael
(This used to be commit efaffefc438f8375a083b194ac7a09e563000d3c)
---
 source3/utils/net_conf.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 9a6f5400e1..eb6398f5b9 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -769,9 +769,6 @@ static int net_conf_setparm(int argc, const char **argv)
 	char *service = NULL;
 	char *param = NULL;
 	const char *value_str = NULL;
-	TALLOC_CTX *ctx;
-
-	ctx = talloc_init("setparm");
 
 	if (argc != 3) {
 		net_conf_setparm_usage(argc, argv);
@@ -781,7 +778,7 @@ static int net_conf_setparm(int argc, const char **argv)
 	param = strdup_lower(argv[1]);
 	value_str = argv[2];
 
-	werr = libnet_smbconf_setparm(ctx, service, param, value_str);
+	werr = libnet_smbconf_setparm(service, param, value_str);
 
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting value '%s': %s\n",
@@ -793,7 +790,6 @@ static int net_conf_setparm(int argc, const char **argv)
 
 done:
 	SAFE_FREE(service);
-	TALLOC_FREE(ctx);
 	return ret;
 }
 
-- 
cgit 


From 726f32b6728a7d2b56ccb2f04827d0e5150ea848 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 03:29:41 +0100
Subject: Add a missing free.

Michael
(This used to be commit bf6031287f75a0e17092f60f9885e7e55cd0f93c)
---
 source3/utils/net_conf.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index eb6398f5b9..5d8b6d605b 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -790,6 +790,7 @@ static int net_conf_setparm(int argc, const char **argv)
 
 done:
 	SAFE_FREE(service);
+	SAFE_FREE(param);
 	return ret;
 }
 
-- 
cgit 


From 44631bfd4d418cbf1ca4309057e6161cdce50bd4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 03:34:04 +0100
Subject: Remove talloc context parameter from libnet_smbconf_delparm().

Make use of talloc stackframe internally.
This removes talloc contxt from net_conf_delparm.

Michael
(This used to be commit 16f137393881edc78c9322f038ba38e53e3ee07d)
---
 source3/utils/net_conf.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 5d8b6d605b..5dc1eb06f4 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -846,9 +846,6 @@ static int net_conf_delparm(int argc, const char **argv)
 	WERROR werr = WERR_OK;
 	char *service = NULL;
 	char *param = NULL;
-	TALLOC_CTX *ctx;
-
-	ctx = talloc_init("delparm");
 
 	if (argc != 2) {
 		net_conf_delparm_usage(argc, argv);
@@ -857,7 +854,7 @@ static int net_conf_delparm(int argc, const char **argv)
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	werr = libnet_smbconf_delparm(ctx, service, param);
+	werr = libnet_smbconf_delparm(service, param);
 
 	if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
 		d_fprintf(stderr,
-- 
cgit 


From c2ab4bd70599cd7ff2043fef9904da178e6e4d19 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 Dec 2007 03:35:00 +0100
Subject: Add two missing free-s.

Michael
(This used to be commit 4efac39c363d565c2c7211da73d5e1cf2ac3d0b2)
---
 source3/utils/net_conf.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 5dc1eb06f4..df85d7eb4b 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -875,6 +875,8 @@ static int net_conf_delparm(int argc, const char **argv)
 	ret = 0;
 
 done:
+	SAFE_FREE(service);
+	SAFE_FREE(param);
 	return ret;
 }
 
-- 
cgit 


From 18ea20e19b59d3151ca59f0576211f855931f839 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 26 Dec 2007 00:58:11 +0100
Subject: Rename libnet_smbconf_open_path() to libnet_smbconf_reg_open_path().

Michael
(This used to be commit 4b0e636965bd37e7c0deecb7b5eff0cc4487408b)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index df85d7eb4b..348e91a15f 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -565,7 +565,7 @@ int net_conf_showshare(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_open_path(ctx, argv[0], REG_KEY_READ, &key);
+	werr = libnet_smbconf_reg_open_path(ctx, argv[0], REG_KEY_READ, &key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From afca308742795a34e58f7a049c9a8d86cdff80c1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 26 Dec 2007 01:01:14 +0100
Subject: Rename libnet_smbconf_open_basepath() to
 libnet_smbconf_reg_open_basepath().

Michael
(This used to be commit 4c0e7270c42788e7f77c402032ae74cf0f8a7106)
---
 source3/utils/net_conf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 348e91a15f..8b89f2fa6f 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -345,7 +345,7 @@ int net_conf_list(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_open_basepath(ctx, REG_KEY_READ, &base_key);
+	werr = libnet_smbconf_reg_open_basepath(ctx, REG_KEY_READ, &base_key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
@@ -503,7 +503,8 @@ int net_conf_listshares(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS, &key);
+	werr = libnet_smbconf_reg_open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS,
+						&key);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From 5f196fafd3a8ed9dda189b62bcd24105bb693456 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Wed, 26 Dec 2007 17:06:06 +0100
Subject: Properly destroy the pdb search object (This used to be commit
 514cf532248723e7f775dc5f8f2e6936e02b7a1c)

---
 source3/utils/net_sam.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index bd1f6cd686..52f8f911e1 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1135,7 +1135,7 @@ static int net_sam_do_list(int argc, const char **argv,
 		}
 	}
 
-	search->search_end(search);
+	pdb_search_destroy(search);
 	return 0;
 }
 
-- 
cgit 


From c90f731ef21d682f808cf3da0f24510a2eaea4ff Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Wed, 26 Dec 2007 17:45:49 +0100
Subject: Convert pdbedit to use pdb_search_users (This used to be commit
 8a8f2583b8bda22f65c7483dea54ac823ed1c0c3)

---
 source3/utils/pdbedit.c | 201 +++++++++++++++++++++++++++++-------------------
 1 file changed, 123 insertions(+), 78 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 6884783396..e1d6709073 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -61,69 +61,85 @@ static int export_database (struct pdb_methods *in,
                             struct pdb_methods *out, 
                             const char *username) 
 {
-	struct samu *user = NULL;
 	NTSTATUS status;
+	struct pdb_search *u_search;
+	struct samr_displayentry userentry;
 
 	DEBUG(3, ("export_database: username=\"%s\"\n", username ? username : "(NULL)"));
 
-	status = in->setsampwent(in, 0, 0);
-	if ( NT_STATUS_IS_ERR(status) ) {
-		fprintf(stderr, "Unable to set account database iterator for %s!\n", 
-			in->name);
+	u_search = pdb_search_init(PDB_USER_SEARCH);
+	if (u_search == NULL) {
+		DEBUG(0, ("pdb_search_init failed\n"));
 		return 1;
 	}
 
-	if ( ( user = samu_new( NULL ) ) == NULL ) {
-		fprintf(stderr, "export_database: Memory allocation failure!\n");
+	if (!in->search_users(in, u_search, 0)) {
+		DEBUG(0, ("Could not start searching users\n"));
+		pdb_search_destroy(u_search);
 		return 1;
 	}
 
-	while ( NT_STATUS_IS_OK(in->getsampwent(in, user)) ) 
-	{
-		DEBUG(4, ("Processing account %s\n", user->username));
+	while (u_search->next_entry(u_search, &userentry)) {
+		struct samu *user;
+		struct samu *account;
+		DOM_SID user_sid;
 
-		/* If we don't have a specific user or if we do and 
-		   the login name matches */
+		DEBUG(4, ("Processing account %s\n", userentry.account_name));
 
-		if ( !username || (strcmp(username, user->username) == 0)) {
-			struct samu *account;
+		if ((username != NULL)
+		    && (strcmp(username, userentry.account_name) != 0)) {
+			/*
+			 * ignore unwanted users
+			 */
+			continue;
+		}
 
-			if ( (account = samu_new( NULL )) == NULL ) {
-				fprintf(stderr, "export_database: Memory allocation failure!\n");
-				TALLOC_FREE( user );
-				in->endsampwent( in );
-				return 1;
-			}
+		user = samu_new(talloc_tos());
+		if (user == NULL) {
+			DEBUG(0, ("talloc failed\n"));
+			break;
+		}
 
-			printf("Importing account for %s...", user->username);
-			if ( !NT_STATUS_IS_OK(out->getsampwnam( out, account, user->username )) ) {
-				status = out->add_sam_account(out, user);
-			} else {
-				status = out->update_sam_account( out, user );
-			}
+		sid_compose(&user_sid, get_global_sam_sid(), userentry.rid);
 
-			if ( NT_STATUS_IS_OK(status) ) {
-				printf( "ok\n");
-			} else {
-				printf( "failed\n");
-			}
+		status = in->getsampwsid(in, user, &user_sid);
 
-			TALLOC_FREE( account );
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(2, ("getsampwsid failed: %s\n",
+				  nt_errstr(status)));
+			TALLOC_FREE(user);
+			continue;
 		}
 
-		/* clean up and get ready for another run */
+		account = samu_new(NULL);
+		if (account == NULL) {
+			fprintf(stderr, "export_database: Memory allocation "
+				"failure!\n");
+			TALLOC_FREE( user );
+			pdb_search_destroy(u_search);
+			return 1;
+		}
 
-		TALLOC_FREE( user );
+		printf("Importing account for %s...", user->username);
+		status = out->getsampwnam(out, account, user->username);
 
-		if ( ( user = samu_new( NULL ) ) == NULL ) {
-			fprintf(stderr, "export_database: Memory allocation failure!\n");
-			return 1;
+		if (NT_STATUS_IS_OK(status)) {
+			status = out->update_sam_account( out, user );
+		} else {
+			status = out->add_sam_account(out, user);
+		}
+
+		if ( NT_STATUS_IS_OK(status) ) {
+			printf( "ok\n");
+		} else {
+			printf( "failed\n");
 		}
-	}
 
-	TALLOC_FREE( user );
+		TALLOC_FREE( account );
+		TALLOC_FREE( user );
+	}
 
-	in->endsampwent(in);
+	pdb_search_destroy(u_search);
 
 	return 0;
 }
@@ -326,33 +342,50 @@ static int print_user_info (struct pdb_methods *in, const char *username, bool v
 **********************************************************/
 static int print_users_list (struct pdb_methods *in, bool verbosity, bool smbpwdstyle)
 {
-	struct samu *sam_pwent=NULL;
-	bool check;
-	
-	check = NT_STATUS_IS_OK(in->setsampwent(in, False, 0));
-	if (!check) {
+	struct pdb_search *u_search;
+	struct samr_displayentry userentry;
+
+	u_search = pdb_search_init(PDB_USER_SEARCH);
+	if (u_search == NULL) {
+		DEBUG(0, ("pdb_search_init failed\n"));
 		return 1;
 	}
 
-	check = True;
-	if ( (sam_pwent = samu_new( NULL )) == NULL ) {
+	if (!in->search_users(in, u_search, 0)) {
+		DEBUG(0, ("Could not start searching users\n"));
+		pdb_search_destroy(u_search);
 		return 1;
 	}
 
-	while (check && NT_STATUS_IS_OK(in->getsampwent (in, sam_pwent))) {
+	while (u_search->next_entry(u_search, &userentry)) {
+		struct samu *sam_pwent;
+		DOM_SID user_sid;
+		NTSTATUS status;
+
+		sam_pwent = samu_new(talloc_tos());
+		if (sam_pwent == NULL) {
+			DEBUG(0, ("talloc failed\n"));
+			break;
+		}
+
+		sid_compose(&user_sid, get_global_sam_sid(), userentry.rid);
+
+		status = in->getsampwsid(in, sam_pwent, &user_sid);
+
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(2, ("getsampwsid failed: %s\n",
+				  nt_errstr(status)));
+			TALLOC_FREE(sam_pwent);
+			continue;
+		}
+
 		if (verbosity)
 			printf ("---------------\n");
 		print_sam_info (sam_pwent, verbosity, smbpwdstyle);
 		TALLOC_FREE(sam_pwent);
-		
-		if ( (sam_pwent = samu_new( NULL )) == NULL ) {
-			check = False;
-		}
 	}
-	if (check) 
-		TALLOC_FREE(sam_pwent);
-	
-	in->endsampwent(in);
+	pdb_search_destroy(u_search);
+
 	return 0;
 }
 
@@ -361,38 +394,50 @@ static int print_users_list (struct pdb_methods *in, bool verbosity, bool smbpwd
 **********************************************************/
 static int fix_users_list (struct pdb_methods *in)
 {
-	struct samu *sam_pwent=NULL;
-	bool check;
-	
-	check = NT_STATUS_IS_OK(in->setsampwent(in, False, 0));
-	if (!check) {
+	struct pdb_search *u_search;
+	struct samr_displayentry userentry;
+
+	u_search = pdb_search_init(PDB_USER_SEARCH);
+	if (u_search == NULL) {
+		DEBUG(0, ("pdb_search_init failed\n"));
 		return 1;
 	}
 
-	check = True;
-	if ( (sam_pwent = samu_new( NULL )) == NULL ) {
+	if (!in->search_users(in, u_search, 0)) {
+		DEBUG(0, ("Could not start searching users\n"));
+		pdb_search_destroy(u_search);
 		return 1;
 	}
 
-	while (check && NT_STATUS_IS_OK(in->getsampwent (in, sam_pwent))) {
-		printf("Updating record for user %s\n", pdb_get_username(sam_pwent));
-	
-		if (!NT_STATUS_IS_OK(pdb_update_sam_account(sam_pwent))) {
-			printf("Update of user %s failed!\n", pdb_get_username(sam_pwent));
+	while (u_search->next_entry(u_search, &userentry)) {
+		struct samu *sam_pwent;
+		DOM_SID user_sid;
+		NTSTATUS status;
+
+		sam_pwent = samu_new(talloc_tos());
+		if (sam_pwent == NULL) {
+			DEBUG(0, ("talloc failed\n"));
+			break;
 		}
-		TALLOC_FREE(sam_pwent);
-		if ( (sam_pwent = samu_new( NULL )) == NULL ) {
-			check = False;
+
+		sid_compose(&user_sid, get_global_sam_sid(), userentry.rid);
+
+		status = in->getsampwsid(in, sam_pwent, &user_sid);
+
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(2, ("getsampwsid failed: %s\n",
+				  nt_errstr(status)));
+			TALLOC_FREE(sam_pwent);
+			continue;
 		}
-		if (!check) {
-			fprintf(stderr, "Failed to initialise new struct samu structure (out of memory?)\n");
+
+		if (!NT_STATUS_IS_OK(pdb_update_sam_account(sam_pwent))) {
+			printf("Update of user %s failed!\n",
+			       pdb_get_username(sam_pwent));
 		}
-			
-	}
-	if (check) 
 		TALLOC_FREE(sam_pwent);
-	
-	in->endsampwent(in);
+	}
+	pdb_search_destroy(u_search);
 	return 0;
 }
 
-- 
cgit 


From 9dfde0ebec14edc25ac79336b77c133c8319ea92 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <ks@sernet.de>
Date: Thu, 27 Dec 2007 14:08:40 +0100
Subject: Improve error messages of 'net rpc user [add|delete]' commands.

Karolin
(This used to be commit 4260c79bf7687bd2ebcc4ca5e0a5f020a759c1fb)
---
 source3/utils/net_rpc.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index ab0cc73e49..155cda64df 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -682,10 +682,10 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
 	}
  done:
 	if (!NT_STATUS_IS_OK(result)) {
-		d_fprintf(stderr, "Failed to add user %s - %s\n", acct_name, 
-			 nt_errstr(result));
+		d_fprintf(stderr, "Failed to add user '%s' with %s.\n",
+			  acct_name, nt_errstr(result));
 	} else {
-		d_printf("Added user %s\n", acct_name);
+		d_printf("Added user '%s'.\n", acct_name);
 	}
 	return result;
 }
@@ -732,12 +732,16 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	POLICY_HND connect_pol, domain_pol, user_pol;
+	const char *acct_name;
 
 	if (argc < 1) {
 		d_printf("User must be specified\n");
 		rpc_user_usage(argc, argv);
 		return NT_STATUS_OK;
 	}
+
+	acct_name = argv[0];
+
 	/* Get sam policy and domain handles */
 
 	result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
@@ -762,7 +766,7 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
 		uint32 flags = 0x000003e8; /* Unknown */
 
 		result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol,
-					       flags, 1, &argv[0],
+					       flags, 1, &acct_name,
 					       &num_rids, &user_rids,
 					       &name_types);
 
@@ -787,14 +791,14 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
 		goto done;
 	}
 
-	/* Display results */
+ done:
 	if (!NT_STATUS_IS_OK(result)) {
-		d_fprintf(stderr, "Failed to delete user account - %s\n", nt_errstr(result));
-	} else {
-		d_printf("Deleted user account\n");
-	}
+                d_fprintf(stderr, "Failed to delete user '%s' with %s.\n",
+			  acct_name, nt_errstr(result));
+        } else {
+                d_printf("Deleted user '%s'.\n", acct_name);
+        }
 
- done:
 	return result;
 }
 
-- 
cgit 


From dfa8d9356cea0dd6a1b013a72c3d68c026deb511 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 00:05:23 +0100
Subject: Move format_value() to libnet_conf.c.

Michael
(This used to be commit 3422a5048ad4b7f789ec233356885d78dbdacf9a)
---
 source3/utils/net_conf.c | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 8b89f2fa6f..98cc1ee198 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -110,39 +110,6 @@ static int net_conf_delparm_usage(int argc, const char **argv)
  * Helper functions
  */
 
-static char *format_value(TALLOC_CTX *mem_ctx, struct registry_value *value)
-{
-	char *result = NULL;
-
-	/* what if mem_ctx = NULL? */
-
-	switch (value->type) {
-	case REG_DWORD:
-		result = talloc_asprintf(mem_ctx, "%d", value->v.dword);
-		break;
-	case REG_SZ:
-	case REG_EXPAND_SZ:
-		result = talloc_asprintf(mem_ctx, "%s", value->v.sz.str);
-		break;
-	case REG_MULTI_SZ: {
-                uint32 j;
-                for (j = 0; j < value->v.multi_sz.num_strings; j++) {
-                        result = talloc_asprintf(mem_ctx, "\"%s\" ",
-						 value->v.multi_sz.strings[j]);
-                }
-                break;
-        }
-	case REG_BINARY:
-                result = talloc_asprintf(mem_ctx, "binary (%d bytes)",
-					 (int)value->v.binary.length);
-                break;
-        default:
-                result = talloc_asprintf(mem_ctx, "<unprintable>");
-                break;
-        }
-	return result;
-}
-
 static WERROR list_values(TALLOC_CTX *ctx, struct registry_key *key)
 {
 	WERROR werr = WERR_OK;
-- 
cgit 


From 4b75bc63bb82f2322acdb013f1cfa9eb36419856 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 01:17:39 +0100
Subject: Rename format_value() to libnet_smbconf_format_registry_value().

Michael
(This used to be commit 95d5dd9bb0546181cd499e6deabff562166412e3)
---
 source3/utils/net_conf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 98cc1ee198..fb6cb58840 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -122,7 +122,8 @@ static WERROR list_values(TALLOC_CTX *ctx, struct registry_key *key)
 			                        &valvalue));
 	     idx++)
 	{
-		d_printf("\t%s = %s\n", valname, format_value(ctx, valvalue));
+		d_printf("\t%s = %s\n", valname,
+			 libnet_smbconf_format_registry_value(ctx, valvalue));
 	}
 	if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
                 d_fprintf(stderr, "Error enumerating values: %s\n",
@@ -798,7 +799,7 @@ static int net_conf_getparm(int argc, const char **argv)
 		goto done;
 	}
 
-	d_printf("%s\n", format_value(ctx, value));
+	d_printf("%s\n", libnet_smbconf_format_registry_value(ctx, value));
 
 	ret = 0;
 done:
-- 
cgit 


From eb356fbafc4b6e0d94b1ba75c6c466262e3221e5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 02:12:33 +0100
Subject: Hide the registry backend from libnet_smbconf_getparm().

Return a formatted string of the value instead.

Michael
(This used to be commit 7d0ec5bae155cda6620db04dcb7bd43db59241aa)
---
 source3/utils/net_conf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index fb6cb58840..e607d099dc 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -769,7 +769,7 @@ static int net_conf_getparm(int argc, const char **argv)
 	WERROR werr = WERR_OK;
 	char *service = NULL;
 	char *param = NULL;
-	struct registry_value *value = NULL;
+	char *valstr = NULL;
 	TALLOC_CTX *ctx;
 
 	ctx = talloc_init("getparm");
@@ -781,7 +781,7 @@ static int net_conf_getparm(int argc, const char **argv)
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	werr = libnet_smbconf_getparm(ctx, service, param, &value);
+	werr = libnet_smbconf_getparm(ctx, service, param, &valstr);
 
 	if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
 		d_fprintf(stderr,
@@ -799,7 +799,7 @@ static int net_conf_getparm(int argc, const char **argv)
 		goto done;
 	}
 
-	d_printf("%s\n", libnet_smbconf_format_registry_value(ctx, value));
+	d_printf("%s\n", valstr);
 
 	ret = 0;
 done:
-- 
cgit 


From 8093a75d6f44644b70023272f186575c2372c54b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 02:27:20 +0100
Subject: Make the main net_conf functions static in net_conf.c

Michael
(This used to be commit dd6e09a65e67a9a16b35b078ebfb41da09926029)
---
 source3/utils/net_conf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index e607d099dc..8140941da2 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -296,7 +296,7 @@ static bool globals_exist(void)
  * the conf functions
  */
 
-int net_conf_list(int argc, const char **argv)
+static int net_conf_list(int argc, const char **argv)
 {
 	WERROR werr = WERR_OK;
 	int ret = -1;
@@ -369,7 +369,7 @@ done:
 	return ret;
 }
 
-int net_conf_import(int argc, const char **argv)
+static int net_conf_import(int argc, const char **argv)
 {
 	int ret = -1;
 	const char *filename = NULL;
@@ -455,7 +455,7 @@ done:
 	return ret;
 }
 
-int net_conf_listshares(int argc, const char **argv)
+static int net_conf_listshares(int argc, const char **argv)
 {
 	WERROR werr = WERR_OK;
 	int ret = -1;
@@ -497,7 +497,7 @@ done:
 	return ret;
 }
 
-int net_conf_drop(int argc, const char **argv)
+static int net_conf_drop(int argc, const char **argv)
 {
 	int ret = -1;
 	WERROR werr;
@@ -520,7 +520,7 @@ done:
 	return ret;
 }
 
-int net_conf_showshare(int argc, const char **argv)
+static int net_conf_showshare(int argc, const char **argv)
 {
 	int ret = -1;
 	WERROR werr = WERR_OK;
@@ -552,7 +552,7 @@ done:
 	return ret;
 }
 
-int net_conf_addshare(int argc, const char **argv)
+static int net_conf_addshare(int argc, const char **argv)
 {
 	int ret = -1;
 	WERROR werr = WERR_OK;
@@ -707,7 +707,7 @@ done:
 	return ret;
 }
 
-int net_conf_delshare(int argc, const char **argv)
+static int net_conf_delshare(int argc, const char **argv)
 {
 	int ret = -1;
 	const char *sharename = NULL;
-- 
cgit 


From f8c39cbb7b3e4df3c07735575bc5f31717b22f66 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 03:38:13 +0100
Subject: Move functionality of net_conf_showshare() to libnet_conf.c

The functionality is moved to a new function libnet_smbconf_getshare().
This returns the parameters of the given share as two lists: the list
of parameter names and the list of matching (formatted) parameter values.

The retrieval and formatting is done in a new internal helper function
libnet_smbconf_reg_get_values() that is to become the replacement for
list_values() from net_conf.c once functionality of net_conf_list() has
been moved to libnet_conf, too.

Michael
(This used to be commit 198232bd525cfac933b4885e6b330ebf4ac2c8ae)
---
 source3/utils/net_conf.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 8140941da2..9a7c8c9097 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -525,7 +525,12 @@ static int net_conf_showshare(int argc, const char **argv)
 	int ret = -1;
 	WERROR werr = WERR_OK;
 	struct registry_key *key = NULL;
+	char *sharename = NULL;
 	TALLOC_CTX *ctx;
+	uint32_t num_params;
+	uint32_t count;
+	char **param_names;
+	char **param_values;
 
 	ctx = talloc_init("showshare");
 
@@ -534,15 +539,21 @@ static int net_conf_showshare(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_reg_open_path(ctx, argv[0], REG_KEY_READ, &key);
+	sharename = argv[0];
+
+	werr = libnet_smbconf_getshare(ctx, sharename, &num_params,
+				       &param_names, &param_values);
 	if (!W_ERROR_IS_OK(werr)) {
+		d_printf("error getting share parameters: %s\n",
+			 dos_errstr(werr));
 		goto done;
 	}
 
-	d_printf("[%s]\n", argv[0]);
+	d_printf("[%s]\n", sharename);
 
-	if (!W_ERROR_IS_OK(list_values(ctx, key))) {
-		goto done;
+	for (count = 0; count <= num_params; count++) {
+		d_printf("\t%s = %s\n", param_names[count],
+			 param_values[count]);
 	}
 
 	ret = 0;
-- 
cgit 


From 2a642a6e2b42c2b111870f95fe6dd38e875766f1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 12:52:09 +0100
Subject: Move functionality of net_conf_listshares() to libnet_conf.c

into new function libnet_smbconf_getshares().

Michael
(This used to be commit 306c7e4d9cecac4c2c0ea1172bd585c3c17d4541)
---
 source3/utils/net_conf.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 9a7c8c9097..5c0d6c6376 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -459,9 +459,8 @@ static int net_conf_listshares(int argc, const char **argv)
 {
 	WERROR werr = WERR_OK;
 	int ret = -1;
-	struct registry_key *key;
-	uint32 idx = 0;
-	char *subkey_name = NULL;
+	uint32_t count, num_shares = 0;
+	char **share_names = NULL;
 	TALLOC_CTX *ctx;
 
 	ctx = talloc_init("listshares");
@@ -471,23 +470,14 @@ static int net_conf_listshares(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_reg_open_basepath(ctx, SEC_RIGHTS_ENUM_SUBKEYS,
-						&key);
+	werr = libnet_smbconf_getshares(ctx, &num_shares, &share_names);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
-	for (idx = 0;
-	     W_ERROR_IS_OK(werr = reg_enumkey(ctx, key, idx,
-			    		      &subkey_name, NULL));
-	     idx++)
+	for (count = 0; count <= num_shares; count++)
 	{
-		d_printf("%s\n", subkey_name);
-	}
-	if (! W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
-		d_fprintf(stderr, "Error enumerating subkeys: %s\n",
-			  dos_errstr(werr));
-		goto done;
+		d_printf("%s\n", share_names[count]);
 	}
 
 	ret = 0;
-- 
cgit 


From 1c03f6b6081a54f6b6e684d9a76be039fd468444 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 12:55:42 +0100
Subject: Rename libnet_smbconf_getshares() to
 libnet_smbconf_get_share_names().

Michael
(This used to be commit 9b3b9aa7e1044719a5112b9e5446e6fbdd7cecf9)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 5c0d6c6376..42af824508 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -470,7 +470,7 @@ static int net_conf_listshares(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_getshares(ctx, &num_shares, &share_names);
+	werr = libnet_smbconf_get_share_names(ctx, &num_shares, &share_names);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From 0b7aafff116fc297a0c2fb31a440a62652fe6fc9 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 13:02:22 +0100
Subject: Fix a const warning.

Michael
(This used to be commit e276e48177f890531ee8b4024c90352f284d4608)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 42af824508..651948c07c 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -515,7 +515,7 @@ static int net_conf_showshare(int argc, const char **argv)
 	int ret = -1;
 	WERROR werr = WERR_OK;
 	struct registry_key *key = NULL;
-	char *sharename = NULL;
+	const char *sharename = NULL;
 	TALLOC_CTX *ctx;
 	uint32_t num_params;
 	uint32_t count;
-- 
cgit 


From e8cb7cecf2dde62f271a37376cefa5179eb7b7bc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 14:38:42 +0100
Subject: Make sure libnet_smbconf_get_share_names() always lists "global"
 first.

And don't return count-1 but count.

Michael
(This used to be commit b7cb9b78231512dc4a88c307048d7fb5334fa319)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 651948c07c..8791d7cbdd 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -475,7 +475,7 @@ static int net_conf_listshares(int argc, const char **argv)
 		goto done;
 	}
 
-	for (count = 0; count <= num_shares; count++)
+	for (count = 0; count < num_shares; count++)
 	{
 		d_printf("%s\n", share_names[count]);
 	}
-- 
cgit 


From a6d6fbb73d56d3b96ccf55c1d028c5af00d83386 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 17:02:27 +0100
Subject: Dont return count - 1 but count from libnet_smbconf_reg_get_values().

Michael
(This used to be commit ded60dec7d75db7df485a159fb6bf628d8e24805)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 8791d7cbdd..8957408bd6 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -541,7 +541,7 @@ static int net_conf_showshare(int argc, const char **argv)
 
 	d_printf("[%s]\n", sharename);
 
-	for (count = 0; count <= num_params; count++) {
+	for (count = 0; count < num_params; count++) {
 		d_printf("\t%s = %s\n", param_names[count],
 			 param_values[count]);
 	}
-- 
cgit 


From 9c1449594458ad6f019f48072bba2b1c831b628b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 22:09:51 +0100
Subject: Use libnet_smbconf_get_config() in net_conf_list().

This leaves only output logic in net_conf_list().

Michael
(This used to be commit 95d9981d59fe69ee1ed98f21475bd1ba72930c1b)
---
 source3/utils/net_conf.c | 64 ++++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 45 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 8957408bd6..ed9ed389e4 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -301,10 +301,12 @@ static int net_conf_list(int argc, const char **argv)
 	WERROR werr = WERR_OK;
 	int ret = -1;
 	TALLOC_CTX *ctx;
-	struct registry_key *base_key = NULL;
-	struct registry_key *sub_key = NULL;
-	uint32 idx_key = 0;
-	char *subkey_name = NULL;
+	uint32_t num_shares;
+	char **share_names;
+	uint32_t *num_params;
+	char ***param_names;
+	char ***param_values;
+	uint32_t share_count, param_count;
 
 	ctx = talloc_init("list");
 
@@ -313,54 +315,26 @@ static int net_conf_list(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_reg_open_basepath(ctx, REG_KEY_READ, &base_key);
+	werr = libnet_smbconf_get_config(ctx, &num_shares, &share_names,
+					 &num_params, &param_names,
+					 &param_values);
 	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error getting config: %s\n",
+			  dos_errstr(werr));
 		goto done;
 	}
 
-	if (libnet_smbconf_key_exists(GLOBAL_NAME))  {
-		werr = reg_openkey(ctx, base_key, GLOBAL_NAME,
-				   REG_KEY_READ, &sub_key);
-		if (!W_ERROR_IS_OK(werr)) {
-			d_fprintf(stderr, "Error opening subkey '%s' : %s\n",
-				  subkey_name, dos_errstr(werr));
-			goto done;
-		}
-		d_printf("[%s]\n", GLOBAL_NAME);
-		if (!W_ERROR_IS_OK(list_values(ctx, sub_key))) {
-			goto done;
-		}
-		d_printf("\n");
-	}
-
-	for (idx_key = 0;
-	     W_ERROR_IS_OK(werr = reg_enumkey(ctx, base_key, idx_key,
-			     		      &subkey_name, NULL));
-	     idx_key++)
-	{
-		if (strequal(subkey_name, GLOBAL_NAME)) {
-			continue;
-		}
-		d_printf("[%s]\n", subkey_name);
-
-		werr = reg_openkey(ctx, base_key, subkey_name,
-				   REG_KEY_READ, &sub_key);
-		if (!W_ERROR_IS_OK(werr)) {
-			d_fprintf(stderr,
-				  "Error opening subkey '%s': %s\n",
-				  subkey_name, dos_errstr(werr));
-			goto done;
-		}
-		if (!W_ERROR_IS_OK(list_values(ctx, sub_key))) {
-			goto done;
+	for (share_count = 0; share_count < num_shares; share_count++) {
+		d_printf("[%s]\n", share_names[share_count]);
+		for (param_count = 0; param_count < num_params[share_count];
+		     param_count++)
+		{
+			d_printf("\t%s = %s\n",
+				 param_names[share_count][param_count],
+				 param_values[share_count][param_count]);
 		}
 		d_printf("\n");
 	}
-	if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
-		d_fprintf(stderr, "Error enumerating subkeys: %s\n",
-			  dos_errstr(werr));
-		goto done;
-	}
 
 	ret = 0;
 
-- 
cgit 


From 59128c783761c6f823971e7aa9513834a7be4b7d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sat, 29 Dec 2007 22:11:09 +0100
Subject: Remove list_values() from net_conf.c - it is not needed any more.

Also make libnet.c:libnet_smbconf_format_registry_value() static.
(There are nor more external callers.)

Michael
(This used to be commit ac7baa17e89d2363b5b3db85de9c842b596dea25)
---
 source3/utils/net_conf.c | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index ed9ed389e4..29bbc83ec3 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -110,32 +110,6 @@ static int net_conf_delparm_usage(int argc, const char **argv)
  * Helper functions
  */
 
-static WERROR list_values(TALLOC_CTX *ctx, struct registry_key *key)
-{
-	WERROR werr = WERR_OK;
-	uint32 idx = 0;
-	struct registry_value *valvalue = NULL;
-	char *valname = NULL;
-
-	for (idx = 0;
-	     W_ERROR_IS_OK(werr = reg_enumvalue(ctx, key, idx, &valname,
-			                        &valvalue));
-	     idx++)
-	{
-		d_printf("\t%s = %s\n", valname,
-			 libnet_smbconf_format_registry_value(ctx, valvalue));
-	}
-	if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
-                d_fprintf(stderr, "Error enumerating values: %s\n",
-                          dos_errstr(werr));
-		goto done;
-        }
-	werr = WERR_OK;
-
-done:
-	return werr;
-}
-
 static char *parm_valstr(TALLOC_CTX *ctx, struct parm_struct *parm,
 			 struct share_params *share)
 {
-- 
cgit 


From 80957726b694ea59da306c1be2e08b213936dc93 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 30 Dec 2007 22:27:45 +0100
Subject: Remove all d_fprintf-s from libnet_conf.c

Replacing them buy DEBUG statements and filling in
d_fprintfs in callers in net_conf.c.

Michael
(This used to be commit 1f0122d8d4ec0f67eaedd5df7383c1b45f37290f)
---
 source3/utils/net_conf.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 29bbc83ec3..9503a3c521 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -216,6 +216,8 @@ static int import_process_service(TALLOC_CTX *ctx,
 		}
 		werr = libnet_smbconf_reg_createkey_internal(tmp_ctx, servicename, &key);
 		if (!W_ERROR_IS_OK(werr)) {
+			d_fprintf(stderr, "Error creating share %s: %s\n",
+				  servicename, dos_errstr(werr));
 			goto done;
 		}
 	}
@@ -235,6 +237,10 @@ static int import_process_service(TALLOC_CTX *ctx,
 				werr = libnet_smbconf_reg_setvalue_internal(key,
 							parm->label, valstr);
 				if (!W_ERROR_IS_OK(werr)) {
+					d_fprintf(stderr,
+						  "Error setting parameter '%s'"
+						  ": %s\n", parm->label,
+						   dos_errstr(werr));
 					goto done;
 				}
 			}
@@ -622,31 +628,45 @@ static int net_conf_addshare(int argc, const char **argv)
 
 	werr = libnet_smbconf_reg_createkey_internal(NULL, argv[0], &newkey);
 	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error creating share %s: %s\n",
+			  argv[0], dos_errstr(werr));
 		goto done;
 	}
 
 	/* add config params as values */
 
 	werr = libnet_smbconf_reg_setvalue_internal(newkey, "path", path);
-	if (!W_ERROR_IS_OK(werr))
+	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error setting parameter %s: %s\n",
+			  "path", dos_errstr(werr));
 		goto done;
+	}
 
 	if (comment != NULL) {
 		werr = libnet_smbconf_reg_setvalue_internal(newkey, "comment",
 							    comment);
-		if (!W_ERROR_IS_OK(werr))
+		if (!W_ERROR_IS_OK(werr)) {
+			d_fprintf(stderr, "Error setting parameter %s: %s\n",
+				  "comment", dos_errstr(werr));
 			goto done;
+		}
 	}
 
 	werr = libnet_smbconf_reg_setvalue_internal(newkey, "guest ok",
 						    guest_ok);
-	if (!W_ERROR_IS_OK(werr))
+	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error setting parameter %s: %s\n",
+			  "'guest ok'", dos_errstr(werr));
 		goto done;
+	}
 
 	werr = libnet_smbconf_reg_setvalue_internal(newkey, "writeable",
 						    writeable);
-	if (!W_ERROR_IS_OK(werr))
+	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error setting parameter %s: %s\n",
+			  "writeable", dos_errstr(werr));
 		goto done;
+	}
 
 	ret = 0;
 
-- 
cgit 


From a74de0c7eb575e5b983773a1b8daa724c7074e7e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 30 Dec 2007 22:30:21 +0100
Subject: Remove an unused variable.

Michael
(This used to be commit 332be113a775adce8108a8003682019ae7f5bc21)
---
 source3/utils/net_conf.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 9503a3c521..98e6b60034 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -468,7 +468,6 @@ static int net_conf_showshare(int argc, const char **argv)
 {
 	int ret = -1;
 	WERROR werr = WERR_OK;
-	struct registry_key *key = NULL;
 	const char *sharename = NULL;
 	TALLOC_CTX *ctx;
 	uint32_t num_params;
-- 
cgit 


From e8a680cdf391255fcbdacd1dcebc0f5a947408f1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Dec 2007 01:14:44 +0100
Subject: Rename libnet_smbconf_key_exists() to libnet_smbconf_share_exists()

and move it to the api section of libnet_conf.c

Michael
(This used to be commit 9b5d8f4d95ebfd47831906019e11227aecc83aa1)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 98e6b60034..24257fe7cf 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -208,7 +208,7 @@ static int import_process_service(TALLOC_CTX *ctx,
 	if (opt_testmode) {
 		d_printf("[%s]\n", servicename);
 	} else {
-		if (libnet_smbconf_key_exists(servicename)) {
+		if (libnet_smbconf_share_exists(servicename)) {
 			werr = libnet_smbconf_delshare(servicename);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
-- 
cgit 


From 01f8fd55a7f9cb9cc90e3d2b53397412a7bad714 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Dec 2007 01:56:18 +0100
Subject: Rewrite net_conf_addshare() to only use libnet_conf API functions.

Also exit on error if the share already exists.

net_conf_addshare() is considered a high level utility function.
It should not be an libnet_conf API function in itself since it is
kind of arbitrary.

Michael
(This used to be commit af5218f1505321236be52df10ebfe8f42b99573d)
---
 source3/utils/net_conf.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 24257fe7cf..9e4d4300d5 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -506,11 +506,16 @@ done:
 	return ret;
 }
 
+/**
+ * Add a share, with a couple of standard parameters, partly optional.
+ *
+ * This is a high level utility function of the net conf utility,
+ * not a direct frontend to the libnet_conf API.
+ */
 static int net_conf_addshare(int argc, const char **argv)
 {
 	int ret = -1;
 	WERROR werr = WERR_OK;
-	struct registry_key *newkey = NULL;
 	char *sharename = NULL;
 	const char *path = NULL;
 	const char *comment = NULL;
@@ -562,7 +567,6 @@ static int net_conf_addshare(int argc, const char **argv)
 					net_conf_addshare_usage(argc, argv);
 					goto done;
 			}
-
 		case 2:
 			path = argv[1];
 			sharename = strdup_lower(argv[0]);
@@ -596,6 +600,12 @@ static int net_conf_addshare(int argc, const char **argv)
 		goto done;
 	}
 
+	if (libnet_smbconf_share_exists(sharename)) {
+		d_fprintf(stderr, "ERROR: share %s already exists.\n",
+			  sharename);
+		goto done;
+	}
+
 	/* validate path */
 
 	if (path[0] != '/') {
@@ -622,19 +632,10 @@ static int net_conf_addshare(int argc, const char **argv)
 	}
 
 	/*
-	 * create the share
+	 * create the share by adding the parameters
 	 */
 
-	werr = libnet_smbconf_reg_createkey_internal(NULL, argv[0], &newkey);
-	if (!W_ERROR_IS_OK(werr)) {
-		d_fprintf(stderr, "Error creating share %s: %s\n",
-			  argv[0], dos_errstr(werr));
-		goto done;
-	}
-
-	/* add config params as values */
-
-	werr = libnet_smbconf_reg_setvalue_internal(newkey, "path", path);
+	werr = libnet_smbconf_setparm(sharename, "path", path);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting parameter %s: %s\n",
 			  "path", dos_errstr(werr));
@@ -642,8 +643,7 @@ static int net_conf_addshare(int argc, const char **argv)
 	}
 
 	if (comment != NULL) {
-		werr = libnet_smbconf_reg_setvalue_internal(newkey, "comment",
-							    comment);
+		werr = libnet_smbconf_setparm(sharename, "comment", comment);
 		if (!W_ERROR_IS_OK(werr)) {
 			d_fprintf(stderr, "Error setting parameter %s: %s\n",
 				  "comment", dos_errstr(werr));
@@ -651,16 +651,14 @@ static int net_conf_addshare(int argc, const char **argv)
 		}
 	}
 
-	werr = libnet_smbconf_reg_setvalue_internal(newkey, "guest ok",
-						    guest_ok);
+	werr = libnet_smbconf_setparm(sharename, "guest ok", guest_ok);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting parameter %s: %s\n",
 			  "'guest ok'", dos_errstr(werr));
 		goto done;
 	}
 
-	werr = libnet_smbconf_reg_setvalue_internal(newkey, "writeable",
-						    writeable);
+	werr = libnet_smbconf_setparm(sharename, "writeable", writeable);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting parameter %s: %s\n",
 			  "writeable", dos_errstr(werr));
@@ -670,7 +668,6 @@ static int net_conf_addshare(int argc, const char **argv)
 	ret = 0;
 
 done:
-	TALLOC_FREE(newkey);
 	SAFE_FREE(sharename);
 	return ret;
 }
-- 
cgit 


From 8d9fb62a4593525a84104665d0a5318e16993d9e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Dec 2007 03:02:39 +0100
Subject: Change net_conf_import() to only use libnet_conf API functions.

More precisely, only import_process_service() is changed.
This removes all references to registry code from net_conf.c.

net_conf_import() is currently -- like net_conf_addshare() -- also
considered a high-level add-on, not an API function.

Michael
(This used to be commit b4dca117c09ddb9c8e7eea25c6cde3fbef8c692b)
---
 source3/utils/net_conf.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 9e4d4300d5..1882567d8b 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -191,7 +191,6 @@ static int import_process_service(TALLOC_CTX *ctx,
 	struct parm_struct *parm;
 	int pnum = 0;
 	const char *servicename;
-	struct registry_key *key;
 	WERROR werr;
 	char *valstr = NULL;
 	TALLOC_CTX *tmp_ctx = NULL;
@@ -214,12 +213,6 @@ static int import_process_service(TALLOC_CTX *ctx,
 				goto done;
 			}
 		}
-		werr = libnet_smbconf_reg_createkey_internal(tmp_ctx, servicename, &key);
-		if (!W_ERROR_IS_OK(werr)) {
-			d_fprintf(stderr, "Error creating share %s: %s\n",
-				  servicename, dos_errstr(werr));
-			goto done;
-		}
 	}
 
 	while ((parm = lp_next_parameter(share->service, &pnum, 0)))
@@ -234,8 +227,9 @@ static int import_process_service(TALLOC_CTX *ctx,
 			if (opt_testmode) {
 				d_printf("\t%s = %s\n", parm->label, valstr);
 			} else {
-				werr = libnet_smbconf_reg_setvalue_internal(key,
-							parm->label, valstr);
+				werr = libnet_smbconf_setparm(servicename,
+							      parm->label,
+							      valstr);
 				if (!W_ERROR_IS_OK(werr)) {
 					d_fprintf(stderr,
 						  "Error setting parameter '%s'"
-- 
cgit 


From 4c7ef1c03e81f45270fddc4bd59f837d52bc34d8 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Dec 2007 03:55:22 +0100
Subject: Make grouping in if statement more explicit.

Michael
(This used to be commit a1bb47695a7fb21af239aa9d02537d3de2fea325)
---
 source3/utils/net_conf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 1882567d8b..07eb3b890f 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -217,9 +217,11 @@ static int import_process_service(TALLOC_CTX *ctx,
 
 	while ((parm = lp_next_parameter(share->service, &pnum, 0)))
 	{
-		if ((share->service < 0 && parm->p_class == P_LOCAL)
+		if ((share->service < 0) && (parm->p_class == P_LOCAL)
 		    && !(parm->flags & FLAG_GLOBAL))
+		{
 			continue;
+		}
 
 		valstr = parm_valstr(tmp_ctx, parm, share);
 
-- 
cgit 


From fd597c7e6d1b5d89c75dd24f2b62916ec81a67ae Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 11:30:14 +0100
Subject: Add libnet_conf API function libnet_smbconf_create_share().

And make libnet_smbconf_setparm() return error if the share
does not already exist. Adapt net_conf_addshare to this new
situation.

Michael
(This used to be commit de349bd26db3341815f6d8f6c18a5ca1fd664dca)
---
 source3/utils/net_conf.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 07eb3b890f..feee16f564 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -628,7 +628,18 @@ static int net_conf_addshare(int argc, const char **argv)
 	}
 
 	/*
-	 * create the share by adding the parameters
+	 * create the share
+	 */
+
+	werr = libnet_smbconf_create_share(sharename);
+	if (!W_ERROR_IS_OK(werr)) {
+		d_fprintf(stderr, "Error creating share %s: %s\n",
+			  sharename, dos_errstr(werr));
+		goto done;
+	}
+
+	/*
+	 * fill the share with parameters
 	 */
 
 	werr = libnet_smbconf_setparm(sharename, "path", path);
-- 
cgit 


From 78acbddbd51a8201100a958447265ad9d7f46229 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 12:08:49 +0100
Subject: Happy new year again.

Michael
(This used to be commit e568f42e2146fa6510a86746581409450887ff16)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index feee16f564..6c61c24a52 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -2,7 +2,7 @@
  *  Samba Unix/Linux SMB client library
  *  Distributed SMB/CIFS Server Management Utility
  *  Local configuration interface
- *  Copyright (C) Michael Adam 2007
+ *  Copyright (C) Michael Adam 2007-2008
  *
  *  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
-- 
cgit 


From 05ff62cf78447dc8caacf4a9d0b4b746f8d8e481 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 13:48:56 +0100
Subject: Rename libnet_smbconf_drop() to libnet_conf_drop().

Michael
(This used to be commit 42ae33a96228e916d7d530d844be6937a80d4fea)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 6c61c24a52..2f94f3b722 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -447,7 +447,7 @@ static int net_conf_drop(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_drop();
+	werr = libnet_conf_drop();
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error deleting configuration: %s\n",
 			  dos_errstr(werr));
-- 
cgit 


From 90837d048b18ae72199b6f7ed7e1d17b0cc71102 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 13:50:55 +0100
Subject: Rename libnet_smbconf_get_config() to libnet_conf_get_config().

Michael
(This used to be commit e8f7c07699b5b93acd81b24bca908769f0b5e8d8)
---
 source3/utils/net_conf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 2f94f3b722..7730187e7d 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -291,9 +291,9 @@ static int net_conf_list(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_get_config(ctx, &num_shares, &share_names,
-					 &num_params, &param_names,
-					 &param_values);
+	werr = libnet_conf_get_config(ctx, &num_shares, &share_names,
+				      &num_params, &param_names,
+				      &param_values);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error getting config: %s\n",
 			  dos_errstr(werr));
-- 
cgit 


From daf1a460c821f247c43c22f1e26785d3acdb3ac3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 13:53:04 +0100
Subject: Rename libnet_smbconf_get_share_names() to
 libnet_conf_get_share_names().

Michael
(This used to be commit 2e4beee66b3672c3259b312aca3d482598731119)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 7730187e7d..930d7b3508 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -420,7 +420,7 @@ static int net_conf_listshares(int argc, const char **argv)
 		goto done;
 	}
 
-	werr = libnet_smbconf_get_share_names(ctx, &num_shares, &share_names);
+	werr = libnet_conf_get_share_names(ctx, &num_shares, &share_names);
 	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
-- 
cgit 


From 630de5f555b7fb897e1bb700b2a0a3d8d611e9bd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 13:54:31 +0100
Subject: Rename libnet_smbconf_share_exists() to libnet_conf_share_exists().

Michael
(This used to be commit 3258758e5c8dfc2c681e1285cb34aaacae697a55)
---
 source3/utils/net_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 930d7b3508..be1447f182 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -207,7 +207,7 @@ static int import_process_service(TALLOC_CTX *ctx,
 	if (opt_testmode) {
 		d_printf("[%s]\n", servicename);
 	} else {
-		if (libnet_smbconf_share_exists(servicename)) {
+		if (libnet_conf_share_exists(servicename)) {
 			werr = libnet_smbconf_delshare(servicename);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
@@ -596,7 +596,7 @@ static int net_conf_addshare(int argc, const char **argv)
 		goto done;
 	}
 
-	if (libnet_smbconf_share_exists(sharename)) {
+	if (libnet_conf_share_exists(sharename)) {
 		d_fprintf(stderr, "ERROR: share %s already exists.\n",
 			  sharename);
 		goto done;
-- 
cgit 


From 3f3a29ed509916751e8ead326dba3e2221cab199 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 13:55:43 +0100
Subject: Rename libnet_smbconf_create_share() to libnet_conf_create_share().

Michael
(This used to be commit 6bc4ee210855dbfbee9e86b59e90b08ecb3a9df9)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index be1447f182..c080da2d91 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -631,7 +631,7 @@ static int net_conf_addshare(int argc, const char **argv)
 	 * create the share
 	 */
 
-	werr = libnet_smbconf_create_share(sharename);
+	werr = libnet_conf_create_share(sharename);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error creating share %s: %s\n",
 			  sharename, dos_errstr(werr));
-- 
cgit 


From e1aa474a32a8b6faa952ad4e9e2e91b8727ad56e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 13:59:14 +0100
Subject: Rename libnet_smbconf_getshare() to libnet_conf_get_share().

Michael
(This used to be commit 1575612f1936312125e7778a9a4227e444ea36cf)
---
 source3/utils/net_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index c080da2d91..7859e0e615 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -480,8 +480,8 @@ static int net_conf_showshare(int argc, const char **argv)
 
 	sharename = argv[0];
 
-	werr = libnet_smbconf_getshare(ctx, sharename, &num_params,
-				       &param_names, &param_values);
+	werr = libnet_conf_get_share(ctx, sharename, &num_params,
+				     &param_names, &param_values);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_printf("error getting share parameters: %s\n",
 			 dos_errstr(werr));
-- 
cgit 


From e89411effda51f9012d1830d18adcb968637baac Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 14:01:50 +0100
Subject: Rename libnet_smbconf_delshare() to libnet_conf_delete_share().

Michael
(This used to be commit 2075baf551ca7fc6bcee6b93f63fd7fbf75f9a50)
---
 source3/utils/net_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 7859e0e615..340cb37541 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -208,7 +208,7 @@ static int import_process_service(TALLOC_CTX *ctx,
 		d_printf("[%s]\n", servicename);
 	} else {
 		if (libnet_conf_share_exists(servicename)) {
-			werr = libnet_smbconf_delshare(servicename);
+			werr = libnet_conf_delete_share(servicename);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto done;
 			}
@@ -691,7 +691,7 @@ static int net_conf_delshare(int argc, const char **argv)
 	}
 	sharename = argv[0];
 
-	werr = libnet_smbconf_delshare(sharename);
+	werr = libnet_conf_delete_share(sharename);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error deleting share %s: %s\n",
 			  sharename, dos_errstr(werr));
-- 
cgit 


From b9f904b59d867c290675ec1013218ba7333253c5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 14:06:09 +0100
Subject: Rename libnet_smbconf_setparm() to libnet_conf_set_parameter().

Michael
(This used to be commit e00cb415d30b3e72ccfb7e5c366c95ec0f9c6247)
---
 source3/utils/net_conf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 340cb37541..c8de6a555b 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -229,9 +229,9 @@ static int import_process_service(TALLOC_CTX *ctx,
 			if (opt_testmode) {
 				d_printf("\t%s = %s\n", parm->label, valstr);
 			} else {
-				werr = libnet_smbconf_setparm(servicename,
-							      parm->label,
-							      valstr);
+				werr = libnet_conf_set_parameter(servicename,
+								 parm->label,
+								 valstr);
 				if (!W_ERROR_IS_OK(werr)) {
 					d_fprintf(stderr,
 						  "Error setting parameter '%s'"
@@ -642,7 +642,7 @@ static int net_conf_addshare(int argc, const char **argv)
 	 * fill the share with parameters
 	 */
 
-	werr = libnet_smbconf_setparm(sharename, "path", path);
+	werr = libnet_conf_set_parameter(sharename, "path", path);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting parameter %s: %s\n",
 			  "path", dos_errstr(werr));
@@ -650,7 +650,7 @@ static int net_conf_addshare(int argc, const char **argv)
 	}
 
 	if (comment != NULL) {
-		werr = libnet_smbconf_setparm(sharename, "comment", comment);
+		werr = libnet_conf_set_parameter(sharename, "comment", comment);
 		if (!W_ERROR_IS_OK(werr)) {
 			d_fprintf(stderr, "Error setting parameter %s: %s\n",
 				  "comment", dos_errstr(werr));
@@ -658,14 +658,14 @@ static int net_conf_addshare(int argc, const char **argv)
 		}
 	}
 
-	werr = libnet_smbconf_setparm(sharename, "guest ok", guest_ok);
+	werr = libnet_conf_set_parameter(sharename, "guest ok", guest_ok);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting parameter %s: %s\n",
 			  "'guest ok'", dos_errstr(werr));
 		goto done;
 	}
 
-	werr = libnet_smbconf_setparm(sharename, "writeable", writeable);
+	werr = libnet_conf_set_parameter(sharename, "writeable", writeable);
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting parameter %s: %s\n",
 			  "writeable", dos_errstr(werr));
@@ -719,7 +719,7 @@ static int net_conf_setparm(int argc, const char **argv)
 	param = strdup_lower(argv[1]);
 	value_str = argv[2];
 
-	werr = libnet_smbconf_setparm(service, param, value_str);
+	werr = libnet_conf_set_parameter(service, param, value_str);
 
 	if (!W_ERROR_IS_OK(werr)) {
 		d_fprintf(stderr, "Error setting value '%s': %s\n",
-- 
cgit 


From 55771b356d632ffe7d1d773670a71366e3d7302a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 14:08:45 +0100
Subject: Rename libnet_smbconf_getparm() to libnet_conf_get_parameter().

Michael
(This used to be commit d08556dbc7071933feaeec538f01ac8f6a637b1d)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index c8de6a555b..c62c555ebe 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -753,7 +753,7 @@ static int net_conf_getparm(int argc, const char **argv)
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	werr = libnet_smbconf_getparm(ctx, service, param, &valstr);
+	werr = libnet_conf_get_parameter(ctx, service, param, &valstr);
 
 	if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
 		d_fprintf(stderr,
-- 
cgit 


From 2476254ccdf629d7889b9cff458a6e1097fc71ba Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 14:11:20 +0100
Subject: Rename libnet_smbconf_delparm() to libnet_conf_delete_parameter().

Michael
(This used to be commit 073eeca51e46da6a687175aadbfdbb9e029532d6)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index c62c555ebe..2d4b3f4054 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -795,7 +795,7 @@ static int net_conf_delparm(int argc, const char **argv)
 	service = strdup_lower(argv[0]);
 	param = strdup_lower(argv[1]);
 
-	werr = libnet_smbconf_delparm(service, param);
+	werr = libnet_conf_delete_parameter(service, param);
 
 	if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) {
 		d_fprintf(stderr,
-- 
cgit 


From 5470f8f638505b8dccc11ca0038632aa472608d8 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Jan 2008 15:33:09 +0100
Subject: Make libnet_conf handle opening/initialization of the registry.

Open state is currently tracked by a global variable
to avoid double initialization.

Later, this can possibly be replaced by a conf-context
created by an initialization function and passed around
to the other api functions.

Michael
(This used to be commit 77713e776405800ac54c692a77cd4efd153042cb)
---
 source3/utils/net_conf.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 2d4b3f4054..a758391630 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -852,11 +852,6 @@ int net_conf(int argc, const char **argv)
 		{NULL, NULL, NULL}
 	};
 
-	if (!registry_init_regdb()) {
-		d_fprintf(stderr, "Error initializing the registry!\n");
-		goto done;
-	}
-
 	ret = net_run_function2(argc, argv, "net conf", func);
 
 	regdb_close();
-- 
cgit 


From 77219ddd220649986fc4f1532271a832d25528bc Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 4 Jan 2008 17:33:24 +0100
Subject: Fix build warning.

Guenther
(This used to be commit a43125d9e9052fab8eb561976f45d1db4622482e)
---
 source3/utils/net_conf.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index a758391630..63d5477c9d 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -856,7 +856,6 @@ int net_conf(int argc, const char **argv)
 
 	regdb_close();
 
-done:
 	return ret;
 }
 
-- 
cgit 


From 2a8722d4c3177077f5d6cc648f4ef42e38e0ab4d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Jan 2008 19:49:57 +0100
Subject: Fix the behaviour of "net conf setparm" to create the share if
 necessary.

This moves functionality taken away from libnet_conf_set_parameter() to the
higher level user frontend function. (Somehow I thought I had done this
already ... :-)

Michael
(This used to be commit fc0fca980f08a0af65d82784ef5a50a7b1ac0927)
---
 source3/utils/net_conf.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 63d5477c9d..2df2410160 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -719,6 +719,15 @@ static int net_conf_setparm(int argc, const char **argv)
 	param = strdup_lower(argv[1]);
 	value_str = argv[2];
 
+	if (!libnet_conf_share_exists(service)) {
+		werr = libnet_conf_create_share(service);
+		if (!W_ERROR_IS_OK(werr)) {
+			d_fprintf(stderr, "Error creating share '%s': %s\n",
+				  service, dos_errstr(werr));
+			goto done;
+		}
+	}
+
 	werr = libnet_conf_set_parameter(service, param, value_str);
 
 	if (!W_ERROR_IS_OK(werr)) {
-- 
cgit 


From b1472c0956c6d016973c2a76e4dfce5ecc3b9c05 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Jan 2008 19:52:22 +0100
Subject: Remove the final regdb_close() from net_conf.c

This is to hide the registry from net_conf.
Right now, it does not harm if "net conf" does not close
the registry file explicitly just before exiting.
I am working out a proper way of handling open/close
operations transparently in the libnet_conf library.

Michael
(This used to be commit 790ef789444945fbae5637f0b469665859171dcd)
---
 source3/utils/net_conf.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 2df2410160..d212b451bc 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -863,8 +863,6 @@ int net_conf(int argc, const char **argv)
 
 	ret = net_run_function2(argc, argv, "net conf", func);
 
-	regdb_close();
-
 	return ret;
 }
 
-- 
cgit 


From 34fb7839658af03da0a5f3939777ceb6576dfb42 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Jan 2008 21:03:24 +0100
Subject: Update the introductory comment to net_conf.c to mention linbet_conf.

Michael
(This used to be commit e166b886375b450534c894676ab1f64571dd46b8)
---
 source3/utils/net_conf.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index d212b451bc..f1bf330950 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -19,9 +19,13 @@
  */
 
 /*
- * This is an interface to the configuration stored inside the
- * samba registry. In the future there might be support for other
- * configuration backends as well.
+ * This is an interface to the Samba's configuration as made available
+ * by the libnet_conf interface (source/libnet/libnet_conf.c).
+ *
+ * This currently supports local interaction with the configuration
+ * stored in the registry. But other backends and remote access via
+ * rpc (to registry stored configuration) might get implemented in
+ * the future.
  */
 
 #include "includes.h"
-- 
cgit 


From dee8e32d8d66fb07817f28780978cd2b928233ad Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Jan 2008 21:05:51 +0100
Subject: Remove the word "registry" from the help output of the "net conf"
 command.

Michael
(This used to be commit 8d9e3e08f3cc6a1f54661d1e54a3902ad50be191)
---
 source3/utils/net_conf.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index f1bf330950..1cf98aa3a2 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -24,8 +24,7 @@
  *
  * This currently supports local interaction with the configuration
  * stored in the registry. But other backends and remote access via
- * rpc (to registry stored configuration) might get implemented in
- * the future.
+ * rpc might get implemented in the future.
  */
 
 #include "includes.h"
@@ -847,15 +846,15 @@ int net_conf(int argc, const char **argv)
 		{"import", net_conf_import,
 		 "Import configuration from file in smb.conf format."},
 		{"listshares", net_conf_listshares,
-		 "List the registry shares."},
+		 "List the share names."},
 		{"drop", net_conf_drop,
-		 "Delete the complete configuration from registry."},
+		 "Delete the complete configuration."},
 		{"showshare", net_conf_showshare,
-		 "Show the definition of a registry share."},
+		 "Show the definition of a share."},
 		{"addshare", net_conf_addshare,
-		 "Create a new registry share."},
+		 "Create a new share."},
 		{"delshare", net_conf_delshare,
-		 "Delete a registry share."},
+		 "Delete a share."},
 		{"setparm", net_conf_setparm,
 		 "Store a parameter."},
 		{"getparm", net_conf_getparm,
-- 
cgit 


From dbdaa5eeec62e2a643a8be36db0a30c20092b064 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Jan 2008 21:09:55 +0100
Subject: Fix a comment.

Michael
(This used to be commit fc9c3f39b5af55026f1e5e964857c203cf6c9316)
---
 source3/utils/net_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 1cf98aa3a2..52dcda03db 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * This is an interface to the Samba's configuration as made available
+ * This is an interface to Samba's configuration as made available
  * by the libnet_conf interface (source/libnet/libnet_conf.c).
  *
  * This currently supports local interaction with the configuration
-- 
cgit 


From 517ad5318d3d196713b96f69eff8e2f5d38d922a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Jan 2008 21:16:48 +0100
Subject: Fix spacing - spaces mixed with tabs.

Michael
(This used to be commit a4ef828102417f04af1e9823c89404e77e4fd5c1)
---
 source3/utils/net_conf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 52dcda03db..38cdeacc11 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -46,9 +46,9 @@ static int net_conf_import_usage(int argc, const char**argv)
 	d_printf("USAGE: net conf import [--test|-T] <filename> "
 		 "[<servicename>]\n"
 		 "\t[--test|-T]    testmode - do not act, just print "
-		                   "what would be done\n"
+			"what would be done\n"
 		 "\t<servicename>  only import service <servicename>, "
-		                   "ignore the rest\n");
+			"ignore the rest\n");
 	return -1;
 }
 
@@ -139,14 +139,14 @@ static char *parm_valstr(TALLOC_CTX *ctx, struct parm_struct *parm,
 		valstr = talloc_asprintf(ctx, "%s", BOOLSTR(!*(bool *)ptr));
 		break;
 	case P_ENUM:
-        	for (i = 0; parm->enum_list[i].name; i++) {
-        	        if (*(int *)ptr == parm->enum_list[i].value)
+		for (i = 0; parm->enum_list[i].name; i++) {
+			if (*(int *)ptr == parm->enum_list[i].value)
 			{
 				valstr = talloc_asprintf(ctx, "%s",
-        	                         parm->enum_list[i].name);
-        	                break;
-        	        }
-        	}
+					parm->enum_list[i].name);
+				break;
+			}
+		}
 		break;
 	case P_OCTAL: {
 		char *o = octal_string(*(int *)ptr);
-- 
cgit 


From 9254bb4ef1c3c3a52ea8e935edb0e7a86ec3ea7a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 12:56:23 -0800
Subject: Refactor the crypto code after a very helpful conversation with
 Volker. Mostly making sure we have data on the incoming packet type, not
 stored in the smb header. Jeremy. (This used to be commit
 c4e5a505043965eec77b5bb9bc60957e8f3b97c8)

---
 source3/utils/smbfilter.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 912d575c60..fb01e7f9a1 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -114,6 +114,30 @@ static void filter_request(char *buf)
 
 }
 
+/****************************************************************************
+ Send an smb to a fd.
+****************************************************************************/
+
+static bool send_smb(int fd, char *buffer)
+{
+	size_t len;
+	size_t nwritten=0;
+	ssize_t ret;
+
+        len = smb_len(buffer) + 4;
+
+	while (nwritten < len) {
+		ret = write_data(fd,buffer+nwritten,len - nwritten);
+		if (ret <= 0) {
+			DEBUG(0,("Error writing %d bytes to client. %d. (%s)\n",
+				(int)len,(int)ret, strerror(errno) ));
+			return false;
+		}
+		nwritten += ret;
+	}
+
+	return true;
+}
 
 static void filter_child(int c, struct sockaddr_storage *dest_ss)
 {
@@ -145,7 +169,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
 		if (num <= 0) continue;
 		
 		if (c != -1 && FD_ISSET(c, &fds)) {
-			if (!receive_smb(c, packet, 0, NULL)) {
+			if (!receive_smb_raw(c, packet, 0, NULL)) {
 				d_printf("client closed connection\n");
 				exit(0);
 			}
@@ -156,7 +180,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
 			}			
 		}
 		if (s != -1 && FD_ISSET(s, &fds)) {
-			if (!receive_smb(s, packet, 0, NULL)) {
+			if (!receive_smb_raw(s, packet, 0, NULL)) {
 				d_printf("server closed connection\n");
 				exit(0);
 			}
-- 
cgit 


From 68b296510827c4d40a06ab16c6cfee883bc6bc1d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 13:24:24 -0800
Subject: Fix the build. Jeremy. (This used to be commit
 25a0084af5978cc11cf4e83a641bc57e0e64eb89)

---
 source3/utils/smbfilter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index fb01e7f9a1..8db969722a 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -169,7 +169,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
 		if (num <= 0) continue;
 		
 		if (c != -1 && FD_ISSET(c, &fds)) {
-			if (!receive_smb_raw(c, packet, 0, NULL)) {
+			if (!receive_smb_raw(c, packet, 0, 0, NULL)) {
 				d_printf("client closed connection\n");
 				exit(0);
 			}
@@ -180,7 +180,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
 			}			
 		}
 		if (s != -1 && FD_ISSET(s, &fds)) {
-			if (!receive_smb_raw(s, packet, 0, NULL)) {
+			if (!receive_smb_raw(s, packet, 0, 0, NULL)) {
 				d_printf("server closed connection\n");
 				exit(0);
 			}
-- 
cgit 


From 3d40b197b0312967c8d22af73f18414a9fe053bb Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 17:15:04 -0800
Subject: Add missing patch to allow smbcacls to do krb5 auth, bug #5175 from
 Tom Maher <tmaher@watson.org>. Jeremy. (This used to be commit
 54ee718957b768a06e41857b96f0b5e18b3ca6a4)

---
 source3/utils/smbcacls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/utils')

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 958f8e255e..ef4254ead2 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -840,7 +840,7 @@ static struct cli_state *connect_one(const char *server, const char *share)
 							    get_cmdline_auth_info_username(),
 							    lp_workgroup(),
 							    get_cmdline_auth_info_password(),
-							    0,
+							     get_cmdline_auth_info_use_kerberos() ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
 							    get_cmdline_auth_info_signing_state(),
 							    NULL))) {
 		return c;
-- 
cgit 


From 9baa97a46ebb92a5968ceba0fb5c2de51e6fa8f0 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 5 Jan 2008 00:23:35 -0800
Subject: Add general '-e' option to enable smb encryption on tools. Jeremy.
 (This used to be commit 757653966fc1384159bd2d57c5670cd8af0cae96)

---
 source3/utils/net.c      | 63 ++++++++++++++++++++++++++++++++++++++++++------
 source3/utils/net_help.c |  1 +
 source3/utils/smbcacls.c | 37 +++++++++++++++++++---------
 3 files changed, 81 insertions(+), 20 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net.c b/source3/utils/net.c
index bf70d08d8b..59316091ba 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -88,6 +88,7 @@ int opt_testmode = False;
 
 int opt_have_ip = False;
 struct sockaddr_storage opt_dest_ip;
+bool smb_encrypt;
 
 extern bool AllowDebugChange;
 
@@ -178,9 +179,7 @@ NTSTATUS connect_to_service(struct cli_state **c,
 					service_name, service_type,
 					opt_user_name, opt_workgroup,
 					opt_password, 0, Undefined, NULL);
-	if (NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
-	} else {
+	if (!NT_STATUS_IS_OK(nt_status)) {
 		d_fprintf(stderr, "Could not connect to server %s\n", server_name);
 
 		/* Display a nicer message depending on the result */
@@ -196,9 +195,41 @@ NTSTATUS connect_to_service(struct cli_state **c,
 		if (NT_STATUS_V(nt_status) ==
 		    NT_STATUS_V(NT_STATUS_ACCOUNT_DISABLED))
 			d_fprintf(stderr, "The account was disabled.\n");
-
 		return nt_status;
 	}
+
+	if (smb_encrypt) {
+		nt_status = cli_force_encryption(*c,
+					opt_user_name,
+					opt_password,
+					opt_workgroup,
+					service_name);
+
+		if (NT_STATUS_EQUAL(nt_status,NT_STATUS_NOT_SUPPORTED)) {
+			d_printf("Encryption required and "
+				"server that doesn't support "
+				"UNIX extensions - failing connect\n");
+		} else if (NT_STATUS_EQUAL(nt_status,NT_STATUS_UNKNOWN_REVISION)) {
+			d_printf("Encryption required and "
+				"can't get UNIX CIFS extensions "
+				"version from server.\n");
+		} else if (NT_STATUS_EQUAL(nt_status,NT_STATUS_UNSUPPORTED_COMPRESSION)) {
+			d_printf("Encryption required and "
+				"share %s doesn't support "
+				"encryption.\n", service_name);
+		} else if (!NT_STATUS_IS_OK(nt_status)) {
+			d_printf("Encryption required and "
+				"setup failed with error %s.\n",
+				nt_errstr(nt_status));
+		}
+
+		if (!NT_STATUS_IS_OK(nt_status)) {
+			cli_shutdown(*c);
+			*c = NULL;
+		}
+	}
+
+	return nt_status;
 }
 
 /****************************************************************************
@@ -287,12 +318,24 @@ NTSTATUS connect_to_ipc_krb5(struct cli_state **c,
 
 	SAFE_FREE(user_and_realm);
 
-	if (NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
-	} else {
+	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(1,("Cannot connect to server using kerberos.  Error was %s\n", nt_errstr(nt_status)));
 		return nt_status;
 	}
+
+        if (smb_encrypt) {
+		nt_status = cli_cm_force_encryption(*c,
+					user_and_realm,
+					opt_password,
+					opt_workgroup,
+                                        "IPC$");
+		if (!NT_STATUS_IS_OK(nt_status)) {
+			cli_shutdown(*c);
+			*c = NULL;
+		}
+	}
+
+	return nt_status;
 }
 
 /**
@@ -988,6 +1031,7 @@ static struct functable net_func[] = {
 		{"port",	'p', POPT_ARG_INT,    &opt_port},
 		{"myname",	'n', POPT_ARG_STRING, &opt_requester_name},
 		{"server",	'S', POPT_ARG_STRING, &opt_host},
+		{"encrypt",	'e', POPT_ARG_NONE,   NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" },
 		{"container",	'c', POPT_ARG_STRING, &opt_container},
 		{"comment",	'C', POPT_ARG_STRING, &opt_comment},
 		{"maxusers",	'M', POPT_ARG_INT,    &opt_maxusers},
@@ -1010,7 +1054,7 @@ static struct functable net_func[] = {
 		{"acls",	0, POPT_ARG_NONE,     &opt_acls},
 		{"attrs",	0, POPT_ARG_NONE,     &opt_attrs},
 		{"timestamps",	0, POPT_ARG_NONE,     &opt_timestamps},
-		{"exclude",	'e', POPT_ARG_STRING, &opt_exclude},
+		{"exclude",	'X', POPT_ARG_STRING, &opt_exclude},
 		{"destination",	0, POPT_ARG_STRING,   &opt_destination},
 		{"tallocreport", 0, POPT_ARG_NONE, &do_talloc_report},
 
@@ -1037,6 +1081,9 @@ static struct functable net_func[] = {
 			net_help(argc, argv);
 			exit(0);
 			break;
+		case 'e':
+			smb_encrypt=true;
+			break;
 		case 'I':
 			if (!interpret_string_addr(&opt_dest_ip,
 						poptGetOptArg(pc), 0)) {
diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index 2cb601f917..908be0512a 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -48,6 +48,7 @@ int net_common_flags_usage(int argc, const char **argv)
 	d_printf("\t-l or --long\t\t\tDisplay full information\n");
 	d_printf("\t-V or --version\t\t\tPrint samba version information\n");
 	d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
+	d_printf("\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended servers only)\n");
 	return -1;
 }
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index ef4254ead2..134f561760 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -822,7 +822,7 @@ static int cacl_set(struct cli_state *cli, char *filename,
 *******************************************************/
 static struct cli_state *connect_one(const char *server, const char *share)
 {
-	struct cli_state *c;
+	struct cli_state *c = NULL;
 	struct sockaddr_storage ss;
 	NTSTATUS nt_status;
 	zero_addr(&ss);
@@ -834,20 +834,33 @@ static struct cli_state *connect_one(const char *server, const char *share)
 		}
 	}
 
-	if (NT_STATUS_IS_OK(nt_status = cli_full_connection(&c, global_myname(), server, 
-							    &ss, 0,
-							    share, "?????",
-							    get_cmdline_auth_info_username(),
-							    lp_workgroup(),
-							    get_cmdline_auth_info_password(),
-							     get_cmdline_auth_info_use_kerberos() ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
-							    get_cmdline_auth_info_signing_state(),
-							    NULL))) {
-		return c;
-	} else {
+	nt_status = cli_full_connection(&c, global_myname(), server, 
+				&ss, 0,
+				share, "?????",
+				get_cmdline_auth_info_username(),
+				lp_workgroup(),
+				get_cmdline_auth_info_password(),
+				get_cmdline_auth_info_use_kerberos() ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
+				get_cmdline_auth_info_signing_state(),
+				NULL);
+	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("cli_full_connection failed! (%s)\n", nt_errstr(nt_status)));
 		return NULL;
 	}
+
+	if (get_cmdline_auth_info_smb_encrypt()) {
+		nt_status = cli_cm_force_encryption(c,
+					get_cmdline_auth_info_username(),
+					get_cmdline_auth_info_password(),
+					lp_workgroup(),
+					share);
+                if (!NT_STATUS_IS_OK(nt_status)) {
+			cli_shutdown(c);
+			c = NULL;
+                }
+	}
+
+	return c;
 }
 
 /****************************************************************************
-- 
cgit 


From 160fefc71a1c0d5cc596b2291ac6e54c4d7c4c6d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 5 Jan 2008 00:41:48 -0800
Subject: Fix args to cli_force_encryption. Jeremy. (This used to be commit
 7b0826aeec284fb129dc1101a5eae2ca96c7cfb6)

---
 source3/utils/net.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 59316091ba..586ea2fdb6 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -202,8 +202,7 @@ NTSTATUS connect_to_service(struct cli_state **c,
 		nt_status = cli_force_encryption(*c,
 					opt_user_name,
 					opt_password,
-					opt_workgroup,
-					service_name);
+					opt_workgroup);
 
 		if (NT_STATUS_EQUAL(nt_status,NT_STATUS_NOT_SUPPORTED)) {
 			d_printf("Encryption required and "
-- 
cgit 


From a41972e8012d5028ff19721a869a3c2322c48158 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 5 Jan 2008 00:50:03 -0800
Subject: Fix -e for smbcquotas. Jeremy. (This used to be commit
 f97b1247c1053f47aef64be95ab9b3c3d8702c8a)

---
 source3/utils/smbcquotas.c | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index e6aa5e86cf..508a2dc8ca 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -380,20 +380,33 @@ static struct cli_state *connect_one(const char *share)
 		}
 	}
 
-	if (NT_STATUS_IS_OK(nt_status = cli_full_connection(&c, global_myname(), server, 
-						    &ss, 0,
-						    share, "?????",
-						    get_cmdline_auth_info_username(),
-						    lp_workgroup(),
-						    get_cmdline_auth_info_password(),
-						    0,
-						    get_cmdline_auth_info_signing_state(),
-						    NULL))) {
-		return c;
-	} else {
+	nt_status = cli_full_connection(&c, global_myname(), server, 
+					    &ss, 0,
+					    share, "?????",
+					    get_cmdline_auth_info_username(),
+					    lp_workgroup(),
+					    get_cmdline_auth_info_password(),
+					    0,
+					    get_cmdline_auth_info_signing_state(),
+					    NULL);
+	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("cli_full_connection failed! (%s)\n", nt_errstr(nt_status)));
 		return NULL;
 	}
+
+	if (get_cmdline_auth_info_smb_encrypt()) {
+		nt_status = cli_cm_force_encryption(c,
+					get_cmdline_auth_info_username(),
+					get_cmdline_auth_info_password(),
+					lp_workgroup(),
+					share);
+		if (!NT_STATUS_IS_OK(nt_status)) {
+			cli_shutdown(c);
+			return NULL;
+		}
+	}
+
+	return c;
 }
 
 /****************************************************************************
-- 
cgit 


From af2a75ba61b754f30430df9b271e99d05c2cd1b2 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 5 Jan 2008 00:51:50 -0800
Subject: Add -e to smbget. Jeremy. (This used to be commit
 0475bdcf44d21bbdefb57f15d403c91c44d8d90a)

---
 source3/utils/smbget.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'source3/utils')

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index ac662e6ace..63b7f48626 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -521,9 +521,11 @@ int main(int argc, const char **argv)
 	int c = 0;
 	const char *file = NULL;
 	char *rcfile = NULL;
+	bool smb_encrypt = false;
 	TALLOC_CTX *frame = talloc_stackframe();
 	struct poptOption long_options[] = {
 		{"guest", 'a', POPT_ARG_NONE, NULL, 'a', "Work as user guest" },	
+		{"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" },	
 		{"resume", 'r', POPT_ARG_NONE, &_resume, 0, "Automatically resume aborted files" },
 		{"recursive", 'R',  POPT_ARG_NONE, &_recursive, 0, "Recursively download files" },
 		{"username", 'u', POPT_ARG_STRING, &username, 'u', "Username to use" },
@@ -568,6 +570,9 @@ int main(int argc, const char **argv)
 		case 'a':
 			username = ""; password = "";
 			break;
+		case 'e':
+			smb_encrypt = true;
+			break;
 		}
 	}
 
@@ -586,6 +591,13 @@ int main(int argc, const char **argv)
 		return 1;
 	}
 
+	if (smb_encrypt) {
+		SMBCCTX *smb_ctx = smbc_set_context(NULL);
+		smbc_option_set(smb_ctx,
+			CONST_DISCARD(char *, "smb_encrypt_level"),
+			"require");
+	}
+	
 	columns = get_num_cols();
 
 	total_start_time = time(NULL);
-- 
cgit