From bd5a802a26f427779663a3de5f6d49f352b7c473 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Sep 2007 11:47:03 +0000
Subject: [PATCH] r24992: Remove some uses of lp_*(). (This used to be commit
 a5a1a5540510cdb1bfbb3e89b84f4ba5b2812c55)

---
 source4/lib/gencache/gencache.c     | 13 +++++++------
 source4/lib/socket/socket.c         |  4 ----
 source4/libcli/cldap/cldap.c        |  3 ++-
 source4/libcli/cliconnect.c         |  7 ++-----
 source4/librpc/rpc/dcerpc_connect.c |  4 ++--
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/source4/lib/gencache/gencache.c b/source4/lib/gencache/gencache.c
index a30f09fefa8..08ff55b2111 100644
--- a/source4/lib/gencache/gencache.c
+++ b/source4/lib/gencache/gencache.c
@@ -50,22 +50,23 @@ static struct tdb_wrap *cache;
 BOOL gencache_init(void)
 {
 	char* cache_fname = NULL;
+	TALLOC_CTX *mem_ctx = talloc_autofree_context();
 	
 	/* skip file open if it's already opened */
 	if (cache) return True;
 
-	asprintf(&cache_fname, "%s/%s", lp_lockdir(), "gencache.tdb");
-	if (cache_fname)
+	cache_fname = lock_path(mem_ctx, "gencache.tdb");
+	if (cache_fname != NULL) {
 		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
-	else {
+	} else {
 		DEBUG(0, ("Filename allocation failed.\n"));
-		return False;
+		return false;
 	}
 
-	cache = tdb_wrap_open(NULL, cache_fname, 0, TDB_DEFAULT,
+	cache = tdb_wrap_open(mem_ctx, cache_fname, 0, TDB_DEFAULT,
 			      O_RDWR|O_CREAT, 0644);
 
-	SAFE_FREE(cache_fname);
+	talloc_free(cache_fname);
 	if (!cache) {
 		DEBUG(5, ("Attempt to open gencache.tdb has failed.\n"));
 		return False;
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index a60171ccd1c..5e19485ec68 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -429,10 +429,6 @@ _PUBLIC_ const struct socket_ops *socket_getops_byname(const char *family, enum
 
 #if HAVE_IPV6
 	if (strcmp("ipv6", family) == 0) {
-		if (lp_parm_bool(-1, "socket", "noipv6", False)) {
-			DEBUG(3, ("IPv6 support was disabled in smb.conf"));
-			return NULL;
-		}
 		return socket_ipv6_ops(type);
 	}
 #endif
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 33d6e88a306..a5c4cc66a18 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -315,7 +315,8 @@ struct cldap_request *cldap_search_send(struct cldap_socket *cldap,
 	}
 
 	req->dest = socket_address_from_strings(req, cldap->sock->backend_name,
-						io->in.dest_address, lp_cldap_port());
+						io->in.dest_address, 
+						lp_cldap_port());
 	if (!req->dest) goto failed;
 
 	req->message_id = idr_get_new_random(cldap->idr, req, UINT16_MAX);
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index e0f3c598b4b..50fe41c2bc0 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -205,7 +205,7 @@ terminate_path_at_separator(char * path)
 /*
   parse a //server/share type UNC name
 */
-BOOL smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx,
+bool smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx,
 		      char **hostname, char **sharename)
 {
 	char *p;
@@ -220,12 +220,9 @@ BOOL smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx,
 	*hostname = talloc_strdup(mem_ctx, &unc_name[2]);
 	p = terminate_path_at_separator(*hostname);
 
-	if (p && *p) {
+	if (p != NULL && *p) {
 		*sharename = talloc_strdup(mem_ctx, p);
 		terminate_path_at_separator(*sharename);
-	} else {
-		*sharename = talloc_strdup(mem_ctx, 
-					   lp_parm_string(-1, "torture", "share"));
 	}
 
 	if (*hostname && *sharename) {
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index bd05498aedb..114725880cf 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -111,12 +111,12 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
 	conn->in.dest_host              = s->io.binding->host;
 	conn->in.port                   = 0;
 	if (s->io.binding->target_hostname == NULL)
-		conn->in.called_name = "*SMBSERVER";
+		conn->in.called_name = "*SMBSERVER"; /* FIXME: This is invalid */
 	else
 		conn->in.called_name            = s->io.binding->target_hostname;
 	conn->in.service                = "IPC$";
 	conn->in.service_type           = NULL;
-	conn->in.workgroup              = lp_workgroup();
+	conn->in.workgroup		= lp_workgroup();
 
 	/*
 	 * provide proper credentials - user supplied, but allow a
-- 
2.34.1