X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=0d696dc02486058b66e229ebe802f936dbba74b9;hb=3a9f96ec0d00344c1fb009ca49090a257d8d42a5;hp=5842813b96b4b03246c8298c72a995ddee72a667;hpb=b76c56ba3f45576b9c418ea9fe7f7b3440052904;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 5842813b96..0d696dc024 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -3,20 +3,24 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#endif
+
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
+
 #include <sys/stat.h>
-#include "portable.h"
-#include "slap.h"
 
-extern char	**charray_dup();
-extern char	*ch_malloc();
-extern int	errno;
+#include "slap.h"
 
 void
 attr_free( Attribute *a )
@@ -73,7 +77,7 @@ attr_merge_fast(
 
 	if ( **a == NULL ) {
 		**a = (Attribute *) ch_malloc( sizeof(Attribute) );
-		(**a)->a_type = attr_normalize( strdup( type ) );
+		(**a)->a_type = attr_normalize( ch_strdup( type ) );
 		(**a)->a_vals = NULL;
 		(**a)->a_syntax = attr_syntax( type );
 		(**a)->a_next = NULL;
@@ -108,7 +112,7 @@ attr_merge(
 
 	if ( *a == NULL ) {
 		*a = (Attribute *) ch_malloc( sizeof(Attribute) );
-		(*a)->a_type = attr_normalize( strdup( type ) );
+		(*a)->a_type = attr_normalize( ch_strdup( type ) );
 		(*a)->a_vals = NULL;
 		(*a)->a_syntax = attr_syntax( type );
 		(*a)->a_next = NULL;
@@ -288,7 +292,7 @@ attr_syntax_config(
 	} else {
 		Debug( LDAP_DEBUG_ANY,
 	    "%s: line %d: unknown syntax \"%s\" in attribute line (ignored)\n",
-		    fname, lineno, 0 );
+		    fname, lineno, argv[lasti] );
 		Debug( LDAP_DEBUG_ANY,
     "possible syntaxes are \"cis\", \"ces\", \"tel\", \"dn\", or \"bin\"\n",
 		    0, 0, 0 );
@@ -319,7 +323,7 @@ attr_syntax_config(
 
 #ifdef LDAP_DEBUG
 
-static
+static int
 attr_syntax_printnode( struct asyntaxinfo *a )
 {
 	int	i;
@@ -331,8 +335,8 @@ attr_syntax_printnode( struct asyntaxinfo *a )
 	return( 0 );
 }
 
-static
-attr_syntax_print()
+static void
+attr_syntax_print( void )
 {
 	(void) avl_apply( attr_syntaxes, attr_syntax_printnode, 0, -1,
 	    AVL_INORDER );