From cf17c168c5fac89d30dd3eab0d545e92d577c816 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 21 Sep 2000 19:12:41 +0000
Subject: [PATCH] Fix portability issue. Move prototypes to proto-slap.h

---
 servers/slapd/proto-slap.h |  3 +++
 servers/slapd/saslauthz.c  | 13 ++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ca1a3e49b4..c8b8ea2e34 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -784,6 +784,9 @@ LDAP_SLAPD_F (int)		ldap_syslog;
 LDAP_SLAPD_F (char *)	default_search_base;
 LDAP_SLAPD_F (char *)	default_search_nbase;
 
+LDAP_SLAPD_F (int)		nSaslRegexp;
+LDAP_SLAPD_F (SaslRegexp_t*) SaslRegexp;
+
 LDAP_SLAPD_F (ldap_pvt_thread_mutex_t)	num_sent_mutex;
 LDAP_SLAPD_F (long)		num_bytes_sent;
 LDAP_SLAPD_F (long)		num_pdu_sent;
diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index f762f20289..1caa446ff7 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -15,24 +15,15 @@
 #include <ac/stdlib.h>
 #include <stdio.h>
 
-#define SLAPD_TOOLS
 #include "slap.h"
-#undef SLAPD_TOOLS
 #include "proto-slap.h"
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#elif defined (HAVE_STRING_H)
-#include <string.h>
-#endif
+#include <ac/string.h>
 
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 #include <sasl.h>
 #include <ldap_pvt.h>
-
-extern int nSaslRegexp;
-extern SaslRegexp_t *SaslRegexp;
 #endif
 
 
@@ -198,7 +189,7 @@ char *slap_sasl_regexp( char *saslname )
 	/* Match the normalized SASL name to the saslregexp patterns */
 	for( reg = SaslRegexp,i=0;  i<nSaslRegexp;  i++,reg++ ) {
 		if ( regexec( &reg->workspace, saslname, SASLREGEX_REPLACE,
-		  reg->strings, 0)  == REG_OK )
+		  reg->strings, 0)  == 0 )
 			break;
 	}
 
-- 
2.39.5