Always use the internal regex functions : checkin lost in the AOL/RH move.

ldap/include/regex.h

@@ -38,21 +38,21 @@ extern "C" {
 #endif
 
 #ifdef NEEDPROTOS
-int slapd_re_init( void );
-void slapd_re_lock( void );
-int slapd_re_unlock( void );
-char * LDAP_CALL slapd_re_comp( char *pat );
-int LDAP_CALL slapd_re_exec( char *lp );
-void LDAP_CALL slapd_re_modw( char *s );
-int LDAP_CALL slapd_re_subs( char *src, char *dst );
+int re_init( void );
+void re_lock( void );
+int re_unlock( void );
+char * LDAP_CALL re_comp( char *pat );
+int LDAP_CALL re_exec( char *lp );
+void LDAP_CALL re_modw( char *s );
+int LDAP_CALL re_subs( char *src, char *dst );
 #else /* NEEDPROTOS */
-int slapd_re_init();
-void slapd_re_lock();
-int slapd_re_unlock();
-char * LDAP_CALL slapd_re_comp();
-int LDAP_CALL slapd_re_exec();
-void LDAP_CALL slapd_re_modw();
-int LDAP_CALL slapd_re_subs();
+int re_init();
+void re_lock();
+int re_unlock();
+char * LDAP_CALL re_comp();
+int LDAP_CALL re_exec();
+void LDAP_CALL re_modw();
+int LDAP_CALL re_subs();
 #endif /* NEEDPROTOS */
 
 #define re_fail( m, p )

ldap/servers/plugins/syntaxes/string.c

@@ -12,9 +12,6 @@
 #if defined(IRIX)
 #include <unistd.h>
 #endif
-#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX )
-#include "regex.h"
-#endif
 
 static int string_filter_approx( struct berval *bvfilter,
 	Slapi_Value **bvals, Slapi_Value **retVal );

ldap/servers/slapd/getfilelist.c

@@ -22,9 +22,6 @@
 #include "prio.h"
 #include "slap.h"
 #include "avl.h"
-#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX )
-#include "regex.h"
-#endif
 
 struct data_wrapper {
 	char **list;

ldap/servers/slapd/sasl_map.c

@@ -6,9 +6,6 @@
 #include "slap.h"
 #include "slapi-plugin.h"
 #include "fe.h"
-#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX )
-#include "regex.h"
-#endif
 
 /*
  * Map SASL identities to LDAP searches