Added a conformant sortedResults support which is unable to sort anything.

[openldap] / servers / slapd / saslauthz.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index b99a0edf4569ed80ad653c46d5380768c7b5780e..a30340e31aa1101e936388543d7b0a0382b96d9a 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -604,10 +604,6 @@ int slap_sasl_regexp_rewrite_config(
 
 int slap_sasl_regexp_config( const char *match, const char *replace )
 {
-#ifdef SLAP_AUTH_REWRITE
-       return slap_sasl_regexp_rewrite_config( "sasl-regexp", 0,
-                       match, replace, AUTHID_CONTEXT );
-#else /* ! SLAP_AUTH_REWRITE */
        int rc;
        SaslRegexp_t *reg;
 
@@ -619,6 +615,13 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
        reg->sr_match = ch_strdup( match );
        reg->sr_replace = ch_strdup( replace );
 
+#ifdef SLAP_AUTH_REWRITE
+       rc = slap_sasl_regexp_rewrite_config( "sasl-regexp", 0,
+                       match, replace, AUTHID_CONTEXT );
+       if ( rc == LDAP_SUCCESS ) nSaslRegexp++;
+       return rc;
+#else /* ! SLAP_AUTH_REWRITE */
+
        /* Precompile matching pattern */
        rc = regcomp( &reg->sr_workspace, reg->sr_match, REG_EXTENDED|REG_ICASE );
        if ( rc ) {
@@ -637,6 +640,35 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
 #endif /* ! SLAP_AUTH_REWRITE */
 }
 
+void slap_sasl_regexp_unparse( BerVarray *out )
+{
+       int i;
+       struct berval bv;
+       BerVarray bva = NULL;
+       char ibuf[32], *ptr;
+       struct berval idx;
+
+       if ( !nSaslRegexp ) return;
+
+       idx.bv_val = ibuf;
+       bva = ch_malloc( (nSaslRegexp+1) * sizeof(struct berval) );
+       BER_BVZERO(bva+nSaslRegexp);
+       for ( i=0; i<nSaslRegexp; i++ ) {
+               idx.bv_len = sprintf( idx.bv_val, "{%d}", i);
+               bva[i].bv_len = idx.bv_len + strlen( SaslRegexp[i].sr_match ) +
+                       strlen( SaslRegexp[i].sr_replace ) + 5;
+               bva[i].bv_val = ch_malloc( bva[i].bv_len+1 );
+               ptr = lutil_strcopy( bva[i].bv_val, ibuf );
+               *ptr++ = '"';
+               ptr = lutil_strcopy( ptr, SaslRegexp[i].sr_match );
+               ptr = lutil_strcopy( ptr, "\" \"" );
+               ptr = lutil_strcopy( ptr, SaslRegexp[i].sr_replace );
+               *ptr++ = '"';
+               *ptr = '\0';
+       }
+       *out = bva;
+}
+
 /* Perform replacement on regexp matches */
 static void slap_sasl_rx_exp(
        const char *rep,