Fix pkiUser

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 62249eeaf2ab5a3f63e9e3e2b98d9d10fe1111c9..cea889cf7adfc9c38a657b481e40f431b4929b54 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -96,6 +96,8 @@ usage( char *name )
        fprintf( stderr,
                "usage: %s options\n", name );
        fprintf( stderr,
+               "\t-4\t\tIPv4 only\n"
+               "\t-6\t\tIPv6 only\n"
                "\t-d level\tDebug level" "\n"
                "\t-f filename\tConfiguration file\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
@@ -216,6 +218,9 @@ int main( int argc, char **argv )
 
        while ( (i = getopt( argc, argv,
                             "d:f:h:s:n:t"
+#if LDAP_PF_INET6
+                               "46"
+#endif
 #ifdef HAVE_CHROOT
                                "r:"
 #endif
@@ -227,6 +232,15 @@ int main( int argc, char **argv )
 #endif
                             )) != EOF ) {
                switch ( i ) {
+#ifdef LDAP_PF_INET6
+               case '4':
+                       slap_inet4or6 = AF_INET;
+                       break;
+               case '6':
+                       slap_inet4or6 = AF_INET6;
+                       break;
+#endif
+
                case 'h':       /* listen URLs */
                        if ( urls != NULL ) free( urls );
                        urls = ch_strdup( optarg );
@@ -381,6 +395,16 @@ int main( int argc, char **argv )
                goto destroy;
        }
 
+#ifdef HAVE_TLS
+       /* Library defaults to full certificate checking. This is correct when
+        * a client is verifying a server because all servers should have a
+        * valid cert. But few clients have valid certs, so we want our default
+        * to be no checking. The config file can override this as usual.
+        */
+       rc = 0;
+       (void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
+#endif
+
        if ( read_config( configfile ) != 0 ) {
                rc = 1;
                SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );