propagate flags to sasl-regexp functions (will need it later)

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index c83caf886f352c45e9d0dc29dc8d1bdde59464f6..4e8f412aabe1876160823a012f006c3223976dbb 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -989,7 +989,8 @@ LDAP_SLAPD_F (int) slap_parse_user LDAP_P((
 LDAP_SLAPD_F (void) slap_sasl2dn LDAP_P((
        Operation *op,
        struct berval *saslname,
-       struct berval *dn ));
+       struct berval *dn,
+       int flags ));
 LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P((
        Operation *op,
        struct berval *authcid,

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 14ed0b64c0f668a0f276c858969a3fb1a69a0653..9021c9505f36a2526822a312a2c2307e84fb8917 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1970,7 +1970,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, char *id, int len,
        }
 
        /* Run thru regexp */
-       slap_sasl2dn( op, dn, &dn2 );
+       slap_sasl2dn( op, dn, &dn2, flags );
        if( dn2.bv_val ) {
                sl_free( dn->bv_val, op->o_tmpmemctx );
                *dn = dn2;

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 07539ef03ea7b2ef4fe9e1e93262930e33240bfa..78bb9ea7d832cf86dc37dd029bcc01b5b275319b 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -492,7 +492,8 @@ static void slap_sasl_rx_exp(
    LDAP URI to find the matching LDAP entry, using the pattern matching
    strings given in the saslregexp config file directive(s) */
 
-static int slap_sasl_regexp( struct berval *in, struct berval *out, void *ctx )
+static int slap_sasl_regexp( struct berval *in, struct berval *out,
+               int flags, void *ctx )
 {
        char *saslname = in->bv_val;
        SaslRegexp_t *reg;
@@ -812,7 +813,7 @@ COMPLETE:
  * entry, return the DN of that one entry.
  */
 void slap_sasl2dn( Operation *opx,
-       struct berval *saslname, struct berval *sasldn )
+       struct berval *saslname, struct berval *sasldn, int flags )
 {
        int rc;
        slap_callback cb = { NULL, sasl_sc_sasl2dn, NULL, NULL };
@@ -835,7 +836,7 @@ void slap_sasl2dn( Operation *opx,
        cb.sc_private = sasldn;
 
        /* Convert the SASL name into a minimal URI */
-       if( !slap_sasl_regexp( saslname, &regout, opx->o_tmpmemctx ) ) {
+       if( !slap_sasl_regexp( saslname, &regout, flags, opx->o_tmpmemctx ) ) {
                goto FINISHED;
        }