Add "entry" ACL checks for add/delete/rename ops

[openldap] / servers / slapd / phonetic.c

diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 0a98e18ac931d9c45310c886acff4d6800f15e99..80522af3e753bb15f9e538c6c6b70ed7286167ed 100644 (file)
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -1,7 +1,7 @@
 /* phonetic.c - routines to do phonetic matching */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -161,8 +161,7 @@ phonetic( char *s )
         return( ch_strdup( phoneme ) );
 }
 
-#else
-#if defined(SLAPD_METAPHONE)
+#elif defined(SLAPD_METAPHONE)
 
 /*
  * Metaphone copied from C Gazette, June/July 1991, pp 56-57,
@@ -432,5 +431,4 @@ phonetic( char *Word )
        return( ch_strdup( buf ) );
 }
 
-#endif /* metaphone */
-#endif /* SLAPD_PHONETIC */
+#endif /* SLAPD_METAPHONE */