Add giant lock code back in... (it's my flakey devbox that needed work)

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index e0c0db726dcc5975a38b525b85aeccc23221c6fe..67a750b2e070879f0e6cb96365c54ee30ee6fbbd 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -406,14 +406,6 @@ LDAP_SLAPD_F (void) build_new_dn LDAP_P((
 
 LDAP_SLAPD_F (void) dnParent LDAP_P(( struct berval *dn, struct berval *pdn ));
 
-#ifdef HAVE_CYRUS_SASL
-#define SLAP_DN_MIGRATION 1
-#endif
-#ifdef SLAP_DN_MIGRATION
-       /* These routines are deprecated!!! */
-LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn ));
-#endif
-
 /*
  * entry.c
  */
@@ -946,7 +938,8 @@ LDAP_SLAPD_F (int) syn_schema_info( Entry *e );
  * user.c
  */
 #if defined(HAVE_PWD_H) && defined(HAVE_GRP_H)
-LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
+LDAP_SLAPD_F (void) slap_init_user LDAP_P((
+       const char *username, const char *groupname ));
 #endif
 
 /*