From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 20 Apr 2004 19:12:56 +0000 (+0000)
Subject: rename macro accordingly to new authz naming
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~458
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b9dcdbb2d85c809b100b042ec26a170d323c3c11;p=openldap

rename macro accordingly to new authz naming
---

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 8c39adbbb7..c8921e2078 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -683,7 +683,7 @@ read_config( const char *fname, int depth )
 
 			lutil_salt_format( cargv[1] );
 
-#ifdef SLAP_SASL_REWRITE
+#ifdef SLAP_AUTH_REWRITE
 		/* use authid rewrite instead of sasl regexp */
 		} else if ( strncasecmp( cargv[0], "auth-rewrite",
 			STRLENOF("auth-rewrite") ) == 0 )
@@ -693,7 +693,7 @@ read_config( const char *fname, int depth )
 			if ( rc ) {
 				return rc;
 			}
-#endif /* SLAP_SASL_REWRITE */
+#endif /* SLAP_AUTH_REWRITE */
 
 		/* Auth + SASL config options */
 		} else if ( !strncasecmp( cargv[0], "auth", STRLENOF("auth") ) ||
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index fa1e7a3ccb..b79a7d6003 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1012,13 +1012,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_SASL_REWRITE
+#ifdef SLAP_AUTH_REWRITE
 LDAP_SLAPD_F (int) slap_sasl_rewrite_config LDAP_P(( 
 	const char *fname,
 	int lineno,
 	int argc, 
 	char **argv ));
-#endif /* SLAP_SASL_REWRITE */
+#endif /* SLAP_AUTH_REWRITE */
 
 /*
  * schema.c
diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index d57a45128c..d951a987a7 100644
--- 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_SASL_REWRITE
+#ifdef SLAP_AUTH_REWRITE
 #include "rewrite.h"
 struct rewrite_info	*sasl_rwinfo = NULL;
 #define AUTHID_CONTEXT	"authid"
-#endif /* SLAP_SASL_REWRITE */
+#endif /* SLAP_AUTH_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_SASL_REWRITE
+#ifdef SLAP_AUTH_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_SASL_REWRITE */
+#endif /* SLAP_AUTH_REWRITE */
 
 int slap_sasl_regexp_config( const char *match, const char *replace )
 {
-#ifdef SLAP_SASL_REWRITE
+#ifdef SLAP_AUTH_REWRITE
 	return slap_sasl_regexp_rewrite_config( "sasl-regexp", 0,
 			match, replace, AUTHID_CONTEXT );
-#else /* ! SLAP_SASL_REWRITE */
+#else /* ! SLAP_AUTH_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_SASL_REWRITE */
+#endif /* ! SLAP_AUTH_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_SASL_REWRITE
+#ifdef SLAP_AUTH_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_SASL_REWRITE */
+#else /* ! SLAP_AUTH_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_SASL_REWRITE */
+#endif /* ! SLAP_AUTH_REWRITE */
 }
 
 /* This callback actually does some work...*/
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 667f6694d5..4fbff3bed5 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2364,7 +2364,7 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P((
 
 #if defined(LDAP_DEVEL) && defined(ENABLE_REWRITE)
 /* use librewrite for sasl-regexp */
-#define SLAP_SASL_REWRITE	1
+#define SLAP_AUTH_REWRITE	1
 #endif /* LDAP_DEVEL && ENABLE_REWRITE */
 
 LDAP_END_DECL