X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=2d26a5cb4e1921d9cb791a8faca3ce5136353a82;hb=dacc0bfc7da20b4d0c669038a6289dc370098381;hp=412174f6bf5716d97f87da0ecff8e31b4821790d;hpb=e2ee741ea86edb97a08b3f217760f1cd5972302e;p=openldap

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 412174f6bf..2d26a5cb4e 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -16,8 +16,11 @@ int acl_access_allowed LDAP_P(( struct acl *a, Backend *be, Connection *conn, En
 	struct berval *val, Operation *op, int  access, char *edn,
 	regmatch_t *matches ));
 
-int acl_check_mods LDAP_P(( Backend *be, Connection *conn, Operation *op, Entry *e,
-	LDAPMod *mods ));
+int acl_check_modlist LDAP_P(( Backend *be,
+	Connection *conn,
+	Operation *op,
+	Entry *e,
+	LDAPModList *ml ));
 
 /*
  * aclparse.c
@@ -208,8 +211,6 @@ int value_add LDAP_P(( struct berval ***vals, struct berval **addvals ));
 void value_normalize LDAP_P(( char *s, int syntax ));
 int value_cmp LDAP_P(( struct berval *v1, struct berval *v2, int syntax,
 	int normalize ));
-int value_ncmp LDAP_P(( struct berval *v1, struct berval *v2, int syntax, int len,
-	int normalize ));
 int value_find LDAP_P(( struct berval **vals, struct berval *v, int syntax,
 	int normalize ));
 
@@ -236,7 +237,6 @@ extern int		global_schemacheck;
 extern int		lber_debug;
 extern int		ldap_syslog;
 extern int		num_conns;
-extern int		slapd_shutdown;
 extern long		num_bytes_sent;
 extern long		num_entries_sent;
 extern long		ops_completed;
@@ -284,7 +284,7 @@ extern int  ldbm_back_bind   LDAP_P((Backend *be, Connection *c, Operation *o, c
 extern void ldbm_back_unbind LDAP_P((Backend *be, Connection *c, Operation *o ));
 extern int  ldbm_back_search LDAP_P((Backend *be, Connection *c, Operation *o, char *base, int scope, int deref, int slimit, int tlimit, Filter *f, char *filterstr, char **attrs, int attrsonly));
 extern int  ldbm_back_compare LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, Ava *ava));
-extern int  ldbm_back_modify LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, LDAPMod *m));
+extern int  ldbm_back_modify LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, LDAPModList *ml));
 extern int  ldbm_back_modrdn LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, char *newrdn, int deleteoldrdn ));
 extern int  ldbm_back_add    LDAP_P((Backend *be, Connection *c, Operation *o, Entry *e));
 extern int  ldbm_back_delete LDAP_P((Backend *be, Connection *c, Operation *o, char *dn));
@@ -305,7 +305,7 @@ extern int  shell_back_bind   LDAP_P((Backend *be, Connection *c, Operation *o,
 extern void shell_back_unbind LDAP_P((Backend *be, Connection *c, Operation *o ));
 extern int  shell_back_search LDAP_P((Backend *be, Connection *c, Operation *o, char *base, int scope, int deref, int slimit, int tlimit, Filter *f, char *filterstr, char **attrs, int attrsonly));
 extern int  shell_back_compare LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, Ava *ava));
-extern int  shell_back_modify LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, LDAPMod *m));
+extern int  shell_back_modify LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, LDAPModList *m));
 extern int  shell_back_modrdn LDAP_P((Backend *be, Connection *c, Operation *o, char *dn, char *newrdn, int deleteoldrdn ));
 extern int  shell_back_add    LDAP_P((Backend *be, Connection *c, Operation *o, Entry *e));
 extern int  shell_back_delete LDAP_P((Backend *be, Connection *c, Operation *o, char *dn));