diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-07 11:47:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:25 -0500 |
| commit | bd5a802a26f427779663a3de5f6d49f352b7c473 (patch) | |
| tree | 2910b4e5f23c51147a9d9863276ac7ab017bb21e /source4/libcli | |
| parent | ac3cbe87c6d492f91c9e18b42191bfc9991a767a (diff) | |
| download | samba-bd5a802a26f427779663a3de5f6d49f352b7c473.tar.gz samba-bd5a802a26f427779663a3de5f6d49f352b7c473.tar.bz2 samba-bd5a802a26f427779663a3de5f6d49f352b7c473.zip | |
r24992: Remove some uses of lp_*().
(This used to be commit a5a1a5540510cdb1bfbb3e89b84f4ba5b2812c55)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/cldap/cldap.c | 3 | ||||
| -rw-r--r-- | source4/libcli/cliconnect.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c index 33d6e88a30..a5c4cc66a1 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 e0f3c598b4..50fe41c2bc 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) { |