add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index e0bc78ccc7451329e3451e044aa7b610e09f339e..dd9fb612c2afc17da6f44f82559669fade3ed2c8 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -683,13 +683,11 @@ read_config( const char *fname, int depth )
 
                        lutil_salt_format( cargv[1] );
 
-               /* SASL config options */
-               } else if ( strncasecmp( cargv[0], "sasl", 4 ) == 0 ) {
-                       if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
-                               return 1;
 #ifdef SLAP_SASL_REWRITE
                /* use authid rewrite instead of sasl regexp */
-               } else if ( strncasecmp( cargv[0], "authid-rewrite", sizeof("authid-rewrite") - 1 ) == 0 ) {
+               } else if ( strncasecmp( cargv[0], "auth-rewrite",
+                       sizeof("auth-rewrite") - 1 ) == 0 )
+               {
                        int rc = slap_sasl_rewrite_config( fname, lineno,
                                        cargc, cargv );
                        if ( rc ) {
@@ -697,6 +695,14 @@ read_config( const char *fname, int depth )
                        }
 #endif /* SLAP_SASL_REWRITE */
 
+               /* Auth + SASL config options */
+               } else if ( !strncasecmp( cargv[0], "auth", sizeof("auth")-1 ) ||
+                       !strncasecmp( cargv[0], "sasl", sizeof("sasl")-1 ))
+               {
+                       if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
+                               return 1;
+
+
                } else if ( strcasecmp( cargv[0], "schemadn" ) == 0 ) {
                        struct berval dn;
                        if ( cargc < 2 ) {