isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT

Browse Source 
Fixes problems building on older LDAP sdks.
This commit is contained in:
Todd C. Miller
2018-10-26 10:34:16 -06:00
parent 5eb0fbd076
commit 0597969301
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/sudoers/ldap_conf.c
View File

@@ -422,7 +422,7 @@ sudo_ldap_parse_keyword(const char *keyword, const char *value,
*(int *)(cur->valp) = LDAP_OPT_X_TLS_HARD; *(int *)(cur->valp) = LDAP_OPT_X_TLS_HARD;
else if (strcasecmp(value, "demand") == 0) else if (strcasecmp(value, "demand") == 0)
*(int *)(cur->valp) = LDAP_OPT_X_TLS_DEMAND; *(int *)(cur->valp) = LDAP_OPT_X_TLS_DEMAND;
#endif #endif /* LDAP_OPT_X_TLS_REQUIRE_CERT */
break; break;
case CONF_BOOL: case CONF_BOOL:
*(int *)(cur->valp) = sudo_strtobool(value) == true; *(int *)(cur->valp) = sudo_strtobool(value) == true;
@@ -641,6 +641,7 @@ sudo_ldap_read_config(void)
DPRINTF1("tls_checkpeer %s", DPRINTF1("tls_checkpeer %s",
ldap_conf.tls_checkpeer ? "(yes)" : "(no)"); ldap_conf.tls_checkpeer ? "(yes)" : "(no)");
} }
#ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
if (ldap_conf.tls_reqcert != -1) { if (ldap_conf.tls_reqcert != -1) {
DPRINTF1("tls_reqcert %s", DPRINTF1("tls_reqcert %s",
ldap_conf.tls_reqcert == LDAP_OPT_X_TLS_NEVER ? "hard" : ldap_conf.tls_reqcert == LDAP_OPT_X_TLS_NEVER ? "hard" :
@@ -650,6 +651,7 @@ sudo_ldap_read_config(void)
ldap_conf.tls_reqcert == LDAP_OPT_X_TLS_DEMAND ? "demand" : ldap_conf.tls_reqcert == LDAP_OPT_X_TLS_DEMAND ? "demand" :
"unknown"); "unknown");
} }
#endif /* LDAP_OPT_X_TLS_REQUIRE_CERT */
if (ldap_conf.tls_cacertfile != NULL) { if (ldap_conf.tls_cacertfile != NULL) {
DPRINTF1("tls_cacertfile %s", ldap_conf.tls_cacertfile); DPRINTF1("tls_cacertfile %s", ldap_conf.tls_cacertfile);
} }