Print this page
pass 2

@@ -154,20 +154,11 @@
 }
 
 
 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;
 }
 
 
 
 static void

@@ -470,24 +461,14 @@
         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);
 
     return( 0 );

@@ -574,24 +555,14 @@
             rc = -1;
         mutex_unlock(&inited_mutex);
         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);
 
     return( ldapssl_set_strength( NULL, sslstrength));

@@ -709,24 +680,14 @@
         
         mutex_unlock(&inited_mutex);
         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;
 
     if ( certdbName != NULL ) {
         ldapssl_free((void **) &certdbName );