r24992: Remove some uses of lp_*().

diff --git a/source/lib/gencache/gencache.c b/source/lib/gencache/gencache.c
index a30f09fefa8b0049499bd2aab144851e182aead2..08ff55b211185723bbe4dbe9eb050e4be70c34b4 100644 (file)
--- a/source/lib/gencache/gencache.c
+++ b/source/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/source/lib/socket/socket.c b/source/lib/socket/socket.c
index a60171ccd1c16415817cfcb21fece2a09905b91c..5e19485ec6876116996040d7000eff2841d27ad9 100644 (file)
--- a/source/lib/socket/socket.c
+++ b/source/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/source/libcli/cldap/cldap.c b/source/libcli/cldap/cldap.c
index 33d6e88a3063c971dd03bb8b83bbc745a49c8749..a5c4cc66a18fbb57103bf21a87223b0d4d2a73b1 100644 (file)
--- a/source/libcli/cldap/cldap.c
+++ b/source/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/source/libcli/cliconnect.c b/source/libcli/cliconnect.c
index e0f3c598b4b6c48ad4b9b383f0b7ac086f5c611e..50fe41c2bc048aa9c1aaa2ff5fe123474a93366b 100644 (file)
--- a/source/libcli/cliconnect.c
+++ b/source/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/source/librpc/rpc/dcerpc_connect.c b/source/librpc/rpc/dcerpc_connect.c
index bd05498aedbd37d875a1dd208a046bf6745d9afd..114725880cff1ee87b0cb59cbdb5c76a8dc6d3a8 100644 (file)
--- a/source/librpc/rpc/dcerpc_connect.c
+++ b/source/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