===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ldap/ldapclient.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/ldap/ldapclient.c	2018/11/27 12:04:57	1.10
--- src/usr.bin/ldap/ldapclient.c	2018/11/29 14:25:07	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: ldapclient.c,v 1.10 2018/11/27 12:04:57 martijn Exp $	*/
  
  /*
   * Copyright (c) 2018 Reyk Floeter <reyk@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: ldapclient.c,v 1.11 2018/11/29 14:25:07 tedu Exp $	*/
  
  /*
   * Copyright (c) 2018 Reyk Floeter <reyk@openbsd.org>
***************
*** 61,67 ****
  	struct aldap		*ldap_al;
  	char			*ldap_host;
  	int			 ldap_port;
! 	char			*ldap_capath;
  	char			*ldap_binddn;
  	char			*ldap_secret;
  	unsigned int		 ldap_flags;
--- 61,67 ----
  	struct aldap		*ldap_al;
  	char			*ldap_host;
  	int			 ldap_port;
! 	const char		*ldap_capath;
  	char			*ldap_binddn;
  	char			*ldap_secret;
  	unsigned int		 ldap_flags;
***************
*** 220,226 ****
  	if (ldap.ldap_protocol == LDAP && (ldap.ldap_flags & F_STARTTLS))
  		ldap.ldap_protocol = LDAPTLS;
  	if (ldap.ldap_capath == NULL)
! 		ldap.ldap_capath = TLS_CA_CERT_FILE;
  	if (ls.ls_basedn == NULL)
  		ls.ls_basedn = "";
  	if (ls.ls_scope == -1)
--- 220,226 ----
  	if (ldap.ldap_protocol == LDAP && (ldap.ldap_flags & F_STARTTLS))
  		ldap.ldap_protocol = LDAPTLS;
  	if (ldap.ldap_capath == NULL)
! 		ldap.ldap_capath = tls_default_ca_cert_file();
  	if (ls.ls_basedn == NULL)
  		ls.ls_basedn = "";
  	if (ls.ls_scope == -1)