diff options
author | Eduardo Chappa <chappa@washington.edu> | 2019-04-28 16:01:14 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2019-04-28 16:01:14 -0600 |
commit | 19cde66486e27063a9af8cfd79c6eb7f106b9111 (patch) | |
tree | fb4030770107efa52e0be46a6bbc755fbd590229 /alpine | |
parent | 3443fe5fcfcb33d3a2510111855e619632de57df (diff) | |
download | alpine-19cde66486e27063a9af8cfd79c6eb7f106b9111.tar.xz |
* Compilation failure in Solaris when ldap is enabled. Reported by
"mechanic" in comp.mail.pine.
* Configure script modifications to set the ldap-dir value correctly.
* Fix some typos in documentation.
Diffstat (limited to 'alpine')
-rw-r--r-- | alpine/adrbkcmd.c | 8 | ||||
-rw-r--r-- | alpine/alpine.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/alpine/adrbkcmd.c b/alpine/adrbkcmd.c index b7302a16..36244b3b 100644 --- a/alpine/adrbkcmd.c +++ b/alpine/adrbkcmd.c @@ -7592,6 +7592,9 @@ url_local_ldap(char *url) we_cancel = busy_cue(_("Searching for LDAP url"), NULL, 0); ps_global->mangled_footer = 1; +#ifdef _SOLARIS_SDK + if((ld = ldap_init(ldapurl->lud_host, ldapurl->lud_port)) == NULL) +#else #if (LDAPAPI >= 11) #ifdef _WINDOWS if((ld = ldap_init(ldapurl->lud_host, ldapurl->lud_port)) == NULL) @@ -7599,10 +7602,11 @@ url_local_ldap(char *url) snprintf(tmp_20k_buf, SIZEOF_20KBUF, "ldap://%s:%d", ldapurl->lud_host, ldapurl->lud_port); tmp_20k_buf[SIZEOF_20KBUF-1] = '\0'; if(ldap_initialize(&ld, tmp_20k_buf) != LDAP_SUCCESS) -#endif +#endif /* _WINDOWS */ #else if((ld = ldap_open(ldapurl->lud_host, ldapurl->lud_port)) == NULL) -#endif +#endif /* LDAPAPI >= 11 */ +#endif /* _SOLARIS_SDK */ { if(we_cancel){ cancel_busy_cue(-1); diff --git a/alpine/alpine.c b/alpine/alpine.c index e0a914ae..3b7df35f 100644 --- a/alpine/alpine.c +++ b/alpine/alpine.c @@ -707,7 +707,7 @@ main(int argc, char **argv) if(max_v > 0 && max_v < (long) pith_ssl_encryption_version("tls1")){ snprintf(tmp_20k_buf, SIZEOF_20KBUF, _("Security alert: SSL maximum encryption version was set to SSLv3."), - ps_global->VAR_ENCRYPTION_RANGE); + ps_global->VAR_ENCRYPTION_RANGE); tmp_20k_buf[SIZEOF_20KBUF-1] = '\0'; init_error(ps_global, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf); } |