diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2008-07-10 19:43:25 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2008-07-10 19:43:25 +0000 |
| commit | 6d66e08d7a73a43b202a74cbd2ac7d0fd1e5ab3f (patch) | |
| tree | 8ac8bf6d2c96c14cb13239bcc5d52dffcb29ab08 /nslcd | |
| parent | 85cade78dd197b80cb9766a0993d8a9e426a6c03 (diff) | |
LDAP_OPT_X_TLS_REQUIRE_CERT is not a boolean
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@773 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
| -rw-r--r-- | nslcd/myldap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nslcd/myldap.c b/nslcd/myldap.c index cfd24fd..9a61cab 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -445,7 +445,7 @@ static int do_set_options(MYLDAP_SESSION *session) int rc; struct timeval tv; #ifdef LDAP_OPT_X_TLS - int tls; + int i; #endif /* LDAP_OPT_X_TLS */ /* turn on debugging */ if (nslcd_cfg->ldc_debug) @@ -498,8 +498,8 @@ static int do_set_options(MYLDAP_SESSION *session) (strncasecmp(nslcd_cfg->ldc_uris[session->current_uri].uri,"ldaps://",8)==0) ) { /* use tls */ - tls=LDAP_OPT_X_TLS_HARD; - LDAP_SET_OPTION(session->ld,LDAP_OPT_X_TLS,&tls); + i=LDAP_OPT_X_TLS_HARD; + LDAP_SET_OPTION(session->ld,LDAP_OPT_X_TLS,&i); /* rand file */ if (nslcd_cfg->ldc_tls_randfile!=NULL) { @@ -518,7 +518,8 @@ static int do_set_options(MYLDAP_SESSION *session) /* require cert? */ if (nslcd_cfg->ldc_tls_checkpeer>-1) { - LDAP_SET_OPTION(session->ld,LDAP_OPT_X_TLS_REQUIRE_CERT,&nslcd_cfg->ldc_tls_checkpeer); + i=nslcd_cfg->ldc_tls_checkpeer?LDAP_OPT_X_TLS_DEMAND:LDAP_OPT_X_TLS_NEVER; + LDAP_SET_OPTION(session->ld,LDAP_OPT_X_TLS_REQUIRE_CERT,&i); } /* set cipher suite, certificate and private key */ if (nslcd_cfg->ldc_tls_ciphers!=NULL) |