diff options
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | 2013-07-29 16:16:59 -0400 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2013-07-29 16:18:07 -0400 |
| commit | 694c35faa87b858ecdadfe4fc592615f4eefbb07 (patch) | |
| tree | 2a78abdba3549d11ff88460d03ff67ce152ae59c /usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c | |
| parent | 36f7455d36b60be70d7aae5959fa19e71954678e (diff) | |
| download | illumos-gate-694c35faa87b858ecdadfe4fc592615f4eefbb07.tar.gz | |
3882 Remove xmod & friends
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c')
| -rw-r--r-- | usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c b/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c index 09f3e893a5..8139b2a71a 100644 --- a/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c +++ b/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c @@ -156,16 +156,7 @@ splitpath(char *string, char *dir, char *prefix, char *key) { static PRStatus local_SSLPLCY_Install(void) { - SECStatus s; - -#ifdef NS_DOMESTIC - s = NSS_SetDomesticPolicy(); -#elif NS_EXPORT - s = NSS_SetExportPolicy(); -#else - s = PR_FAILURE; -#endif - return s?PR_FAILURE:PR_SUCCESS; + return NSS_SetDomesticPolicy() ? PR_FAILURE : PR_SUCCESS; } @@ -472,20 +463,10 @@ ldapssl_clientauth_init( const char *certdbpath, void *certdbhandle, -#if defined(NS_DOMESTIC) - if (local_SSLPLCY_Install() == PR_FAILURE) { - mutex_unlock(&inited_mutex); - return( -1 ); - } -#elif(NS_EXPORT) if (local_SSLPLCY_Install() == PR_FAILURE) { mutex_unlock(&inited_mutex); return( -1 ); } -#else - mutex_unlock(&inited_mutex); - return( -1 ); -#endif inited = 1; mutex_unlock(&inited_mutex); @@ -576,20 +557,10 @@ ldapssl_advclientauth_init( return (rc); } -#if defined(NS_DOMESTIC) if (local_SSLPLCY_Install() == PR_FAILURE) { mutex_unlock(&inited_mutex); return( -1 ); } -#elif(NS_EXPORT) - if (local_SSLPLCY_Install() == PR_FAILURE) { - mutex_unlock(&inited_mutex); - return( -1 ); - } -#else - mutex_unlock(&inited_mutex); - return( -1 ); -#endif inited = 1; mutex_unlock(&inited_mutex); @@ -711,20 +682,10 @@ ldapssl_pkcs_init( const struct ldapssl_pkcs_fns *pfns ) return( rc ); } -#if defined(NS_DOMESTIC) if (local_SSLPLCY_Install() == PR_FAILURE) { mutex_unlock(&inited_mutex); return( -1 ); } -#elif(NS_EXPORT) - if (local_SSLPLCY_Install() == PR_FAILURE) { - mutex_unlock(&inited_mutex); - return( -1 ); - } -#else - mutex_unlock(&inited_mutex); - return( -1 ); -#endif inited = 1; |