Fix warnings from previous OID parse commit

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index e4234c7cefbe58211d03741e99779840311b741b..a8dfa588e2939307103b3a3fc09261411c2db15c 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -256,7 +256,8 @@ int lock_fclose LDAP_P(( FILE *fp, FILE *lfp ));
  */
 
 #ifdef SLAPD_MODULES
-int load_module LDAP_P(( const char* file_name, int argc, char *argv[] ));
+int module_load LDAP_P(( const char* file_name, int argc, char *argv[] ));
+int module_path LDAP_P(( const char* path ));
 #endif /* SLAPD_MODULES */
 
 /*
@@ -376,6 +377,7 @@ int is_entry_objectclass LDAP_P(( Entry *, char* objectclass ));
 void parse_oc_old LDAP_P(( Backend *be, char *fname, int lineno, int argc, char **argv ));
 void parse_oc LDAP_P(( char *fname, int lineno, char *line, char **argv ));
 void parse_at LDAP_P(( char *fname, int lineno, char *line, char **argv ));
+void parse_oidm LDAP_P(( char *fname, int lineno, int argc, char **argv ));
 char *scherr2str LDAP_P((int code));
 int dscompare LDAP_P(( char *s1, char *s2del, char delim ));
 /*

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index b26fd9004e48d4b7018e22682c509d57d5481cb9..b14680fda0677ef931d0fac47ca717d0c5f10576 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -565,7 +565,7 @@ syn_find_desc( const char *syndesc, int *len )
        Syntax          *synp;
 
        for (synp = syn_list; synp; synp = synp->ssyn_next)
-               if ((*len = dscompare( synp->ssyn_syn.syn_desc, syndesc, '{')))
+               if ((*len = dscompare( synp->ssyn_syn.syn_desc, (char *)syndesc, '{')))
                        return synp;
        return( NULL );
 }

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 13f3f6e36fc722ac61f7cf0c1e8e275eb112cbb4..a2e3514a4181a2107d2e8721e2dd7227ddf06239 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/socket.h>