* dn.exact: the value must pass normalization and is used
* in exact DN match.
* dn.regex: the value is treated as a regular expression
- * in matching DN values in saslAuthz{To|From}
+ * in matching DN values in authz{To|From}
* attributes.
* dn: for backwards compatibility reasons, the value
* is treated as a regular expression, and thus
static int nSaslRegexp = 0;
static SaslRegexp_t *SaslRegexp = NULL;
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
#include "rewrite.h"
struct rewrite_info *sasl_rwinfo = NULL;
#define AUTHID_CONTEXT "authid"
-#endif /* SLAP_X_SASL_REWRITE */
+#endif /* SLAP_SASL_REWRITE */
/* What SASL proxy authorization policies are allowed? */
#define SASL_AUTHZ_NONE 0x00
return( LDAP_SUCCESS );
}
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
int slap_sasl_rewrite_config(
const char *fname,
int lineno,
return rc;
}
-#endif /* SLAP_X_SASL_REWRITE */
+#endif /* SLAP_SASL_REWRITE */
int slap_sasl_regexp_config( const char *match, const char *replace )
{
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
return slap_sasl_regexp_rewrite_config( "sasl-regexp", 0,
match, replace, AUTHID_CONTEXT );
-#else /* ! SLAP_X_SASL_REWRITE */
+#else /* ! SLAP_SASL_REWRITE */
int rc;
SaslRegexp_t *reg;
nSaslRegexp++;
return( LDAP_SUCCESS );
-#endif /* ! SLAP_X_SASL_REWRITE */
+#endif /* ! SLAP_SASL_REWRITE */
}
/* Perform replacement on regexp matches */
static int slap_sasl_regexp( struct berval *in, struct berval *out,
int flags, void *ctx )
{
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
const char *context = AUTHID_CONTEXT;
if ( sasl_rwinfo == NULL || BER_BVISNULL( in ) ) {
return 0;
}
-#else /* ! SLAP_X_SASL_REWRITE */
+#else /* ! SLAP_SASL_REWRITE */
char *saslname = in->bv_val;
SaslRegexp_t *reg;
regmatch_t sr_strings[SASLREGEX_REPLACE]; /* strings matching $1,$2 ... */
#endif
return( 1 );
-#endif /* ! SLAP_X_SASL_REWRITE */
+#endif /* ! SLAP_SASL_REWRITE */
}
/* This callback actually does some work...*/