rename macro

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 5efcd1153658c3fffd27857e7fd248c2127b604e..e0bc78ccc7451329e3451e044aa7b610e09f339e 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -687,7 +687,7 @@ read_config( const char *fname, int depth )
                } else if ( strncasecmp( cargv[0], "sasl", 4 ) == 0 ) {
                        if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
                                return 1;
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
                /* use authid rewrite instead of sasl regexp */
                } else if ( strncasecmp( cargv[0], "authid-rewrite", sizeof("authid-rewrite") - 1 ) == 0 ) {
                        int rc = slap_sasl_rewrite_config( fname, lineno,
@@ -695,7 +695,7 @@ read_config( const char *fname, int depth )
                        if ( rc ) {
                                return rc;
                        }
-#endif /* SLAP_X_SASL_REWRITE */
+#endif /* SLAP_SASL_REWRITE */
 
                } else if ( strcasecmp( cargv[0], "schemadn" ) == 0 ) {
                        struct berval dn;

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index a0108ae7168b5694f2c75e2bd3826cbd7f1012a2..522fff8e7295397cf2cfc4dd09404b303a162db5 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1010,13 +1010,13 @@ LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P((
 LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P((
        const char *match, const char *replace ));
 LDAP_SLAPD_F (int) slap_sasl_setpolicy LDAP_P(( const char * ));
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
 LDAP_SLAPD_F (int) slap_sasl_rewrite_config LDAP_P(( 
        const char *fname,
        int lineno,
        int argc, 
        char **argv ));
-#endif /* SLAP_X_SASL_REWRITE */
+#endif /* SLAP_SASL_REWRITE */
 
 /*
  * schema.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 75c675904b723d3f93f4e5a8ff2d69e808893f25..f1f338b7db9ffad52d0e0d2ca12233ad1b2bfeb6 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -73,11 +73,11 @@ typedef struct sasl_regexp {
 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
@@ -406,7 +406,7 @@ static int slap_sasl_rx_off(char *rep, int *off)
        return( LDAP_SUCCESS );
 }
 
-#ifdef SLAP_X_SASL_REWRITE
+#ifdef SLAP_SASL_REWRITE
 int slap_sasl_rewrite_config( 
                const char      *fname,
                int             lineno,
@@ -493,14 +493,14 @@ int slap_sasl_regexp_rewrite_config(
 
        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;
 
@@ -533,7 +533,7 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
 
        nSaslRegexp++;
        return( LDAP_SUCCESS );
-#endif /* ! SLAP_X_SASL_REWRITE */
+#endif /* ! SLAP_SASL_REWRITE */
 }
 
 /* Perform replacement on regexp matches */
@@ -595,7 +595,7 @@ static void slap_sasl_rx_exp(
 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 ) ) {
@@ -632,7 +632,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out,
                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 ... */
@@ -680,7 +680,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out,
 #endif
 
        return( 1 );
-#endif /* ! SLAP_X_SASL_REWRITE */
+#endif /* ! SLAP_SASL_REWRITE */
 }
 
 /* This callback actually does some work...*/