diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 23:21:16 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 23:21:16 +0200 |
commit | 25988f13696547e70b5e3155cb5bcea2f0786312 (patch) | |
tree | a7fec6e89c4ea519b721bd99670bf5743f137e88 | |
parent | ce0ac322b4a673e59e6e04467b2ceaf7a9637a68 (diff) | |
parent | 8baf1695492300fd8c2ce7e4f106a14f510357e5 (diff) | |
download | samba-25988f13696547e70b5e3155cb5bcea2f0786312.tar.gz samba-25988f13696547e70b5e3155cb5bcea2f0786312.tar.bz2 samba-25988f13696547e70b5e3155cb5bcea2f0786312.zip |
Merge branch 'master' of git://git.samba.org/samba
-rw-r--r-- | source4/libcli/ldap/ldap_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index a59356761b..7f43e16c95 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -401,7 +401,7 @@ static void ldap_connect_got_sock(struct composite_context *ctx, if (conn->ldaps) { struct socket_context *tls_socket; struct socket_context *tmp_socket; - char *cafile = private_path(conn->sock, conn->lp_ctx, lp_tls_cafile(conn->lp_ctx)); + char *cafile = lp_tls_cafile(conn->sock, conn->lp_ctx); if (!cafile || !*cafile) { talloc_free(conn->sock); |