mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-13 14:27:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed search attrs to struct berval **.

Browse Source 
Use typedefs for all backend functions, to minimize work in future API
updates. (back-*/external.h will never need updating in the future.)
This commit is contained in:
Howard Chu 2001-12-26 08:47:04 +00:00
parent c7d7c6f18f
commit ede3abc8c7
12 changed files with 116 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
servers/slapd/back-dnssrv/external.h
View File

@ -12,39 +12,24 @@
LDAP_BEGIN_DECL
extern int dnssrv_back_initialize LDAP_P(( BackendInfo *bi ));
extern int dnssrv_back_open LDAP_P(( BackendInfo *bi ));
extern int dnssrv_back_close LDAP_P(( BackendInfo *bi ));
extern int dnssrv_back_destroy LDAP_P(( BackendInfo *bi ));
extern BI_init dnssrv_back_initialize;
extern BI_open dnssrv_back_open;
extern BI_close dnssrv_back_close;
extern BI_destroy dnssrv_back_destroy;
extern int dnssrv_back_db_init LDAP_P(( BackendDB *bd ));
extern int dnssrv_back_db_destroy LDAP_P(( BackendDB *bd ));
extern BI_db_init dnssrv_back_db_init;
extern BI_db_destroy dnssrv_back_db_destroy;
extern int dnssrv_back_db_config LDAP_P(( BackendDB *bd,
const char *fname, int lineno, int argc, char **argv ));
extern BI_db_config dnssrv_back_db_config;
extern int dnssrv_back_bind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, int method,
struct berval *cred, char** edn ));
extern BI_op_bind dnssrv_back_bind;
extern int dnssrv_back_search LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *base, const char *nbase,
int scope, int deref, int sizelimit, int timelimit,
Filter *filter, const char *filterstr,
char **attrs, int attrsonly ));
extern BI_op_search dnssrv_back_search;
extern int dnssrv_back_compare LDAP_P((BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, AttributeAssertion *ava ));
extern BI_op_compare dnssrv_back_compare;
extern int dnssrv_back_referrals LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
const char **text ));
extern BI_chk_referrals dnssrv_back_referrals;
LDAP_END_DECL
#endif /* _DNSSRV_EXTERNAL_H */

157
servers/slapd/back-meta/external.h
View File

@ -69,143 +69,28 @@
LDAP_BEGIN_DECL
extern int
meta_back_initialize LDAP_P((
BackendInfo *bi
));
extern int
meta_back_open LDAP_P((
BackendInfo *bi
));
extern int
meta_back_close LDAP_P((
BackendInfo *bi
));
extern int
meta_back_destroy LDAP_P((
BackendInfo *bi
));
extern int
meta_back_db_init LDAP_P((
BackendDB *bd
));
extern int
meta_back_db_destroy LDAP_P((
BackendDB *bd
));
extern int
meta_back_db_config LDAP_P((
BackendDB *bd,
const char *fname,
int lineno,
int argc,
char **argv
));
extern int
meta_back_bind LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
const char *dn,
const char *ndn,
int method,
struct berval *cred,
char** edn
));
extern int
meta_back_conn_destroy LDAP_P((
BackendDB *bd,
Connection *conn
));
extern int
meta_back_search LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
const char *base,
const char *nbase,
int scope,
int deref,
int sizelimit,
int timelimit,
Filter *filter,
const char *filterstr,
char **attrs,
int attrsonly
));
extern int
meta_back_compare LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
const char *dn,
const char *ndn,
AttributeAssertion *ava
));
extern int
meta_back_modify LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
const char *dn,
const char *ndn,
Modifications *ml
));
extern int
meta_back_modrdn LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
const char *dn,
const char *ndn,
const char *newrdn,
int deleteoldrdn,
const char *newSuperior
));
extern int
meta_back_add LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
Entry *e
));
extern int
meta_back_delete LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
const char *dn,
const char *ndn
));
extern int meta_back_abandon LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
int msgid
));
extern int meta_back_group LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
Entry *target,
const char* gr_ndn,
const char* op_ndn,
ObjectClass* group_oc,
AttributeDescription*
group_at
));
extern int
meta_back_attribute LDAP_P((
BackendDB *bd,
Connection *conn,
Operation *op,
Entry *target,
const char* ndn,
AttributeDescription* entry_at,
struct berval ***vals
));
extern BI_init meta_back_initialize;
extern BI_open meta_back_open;
extern BI_close meta_back_close;
extern BI_destroy meta_back_destroy;
extern BI_db_init meta_back_db_init;
extern BI_db_destroy meta_back_db_destroy;
extern BI_db_config meta_back_db_config;
extern BI_op_bind meta_back_bind;
extern BI_connection_destroy meta_back_conn_destroy;
extern BI_op_search meta_back_search;
extern BI_op_compare meta_back_compare;
extern BI_op_modify meta_back_modify;
extern BI_op_modrdn meta_back_modrdn;
extern BI_op_add meta_back_add;
extern BI_op_delete meta_back_delete;
extern BI_op_abandon meta_back_abandon;
extern BI_acl_group meta_back_group;
extern BI_acl_attribute meta_back_attribute;
LDAP_END_DECL
#endif /* META_EXTERNAL_H */

48
servers/slapd/back-monitor/external.h
View File

@ -38,45 +38,21 @@
LDAP_BEGIN_DECL
extern int monitor_back_initialize LDAP_P(( BackendInfo *bi ));
extern int monitor_back_db_init LDAP_P(( BackendDB *be ));
extern int monitor_back_open LDAP_P(( BackendInfo *bi ));
extern int monitor_back_config LDAP_P(( BackendInfo *bi,
const char *fname, int lineno, int argc, char **argv ));
extern int monitor_back_db_config LDAP_P(( Backend *be,
const char *fname, int lineno, int argc, char **argv ));
extern BI_init monitor_back_initialize;
extern BI_db_init monitor_back_db_init;
extern BI_open monitor_back_open;
extern BI_config monitor_back_config;
extern BI_db_config monitor_back_db_config;
extern int monitor_back_db_destroy LDAP_P(( BackendDB *be ));
extern BI_db_destroy monitor_back_db_destroy;
extern int monitor_back_search LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *base, const char *nbase,
int scope, int deref, int sizelimit, int timelimit,
Filter *filter, const char *filterstr,
char **attrs, int attrsonly ));
extern int monitor_back_compare LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
AttributeAssertion *ava ));
extern int monitor_back_abandon LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op, ber_int_t msgid ));
extern int monitor_back_modify LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, Modifications *ml ));
extern int monitor_back_bind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, int method,
struct berval *cred, char** edn ));
extern int monitor_back_operational LDAP_P((BackendDB *bd,
Connection *conn, Operation *op,
Entry *e, char **attrs, int opattrs, Attribute **a ));
extern BI_op_search monitor_back_search;
extern BI_op_compare monitor_back_compare;
extern BI_op_abandon monitor_back_abandon;
extern BI_op_modify monitor_back_modify;
extern BI_op_bind monitor_back_bind;
extern BI_operational monitor_back_operational;
LDAP_END_DECL
#endif /* _MONITOR_EXTERNAL_H */

13
servers/slapd/back-passwd/external.h
View File

@ -4,19 +4,12 @@
LDAP_BEGIN_DECL
extern int passwd_back_initialize LDAP_P(( BackendInfo *bi ));
extern BI_init passwd_back_initialize;
extern int passwd_back_search LDAP_P(( BackendDB *be,
Connection *c, Operation *o,
const char *base, const char *nbase,
int scope, int deref, int slimit, int tlimit,
Filter *f, const char *filterstr,
char **attrs, int attrsonly));
extern BI_op_search passwd_back_search;
extern int passwd_back_db_config LDAP_P((BackendDB *bd,
const char *fname, int lineno, int argc, char **argv ));
extern BI_db_config passwd_back_db_config;
LDAP_END_DECL
#endif /* _PASSWD_EXTERNAL_H */

54
servers/slapd/back-perl/external.h
View File

@ -4,56 +4,32 @@
LDAP_BEGIN_DECL
extern int perl_back_initialize LDAP_P(( BackendInfo *bi ));
extern int perl_back_open LDAP_P(( BackendInfo *bi ));
extern int perl_back_close LDAP_P(( BackendInfo *bi ));
extern int perl_back_destroy LDAP_P(( BackendInfo *bi ));
extern BI_init perl_back_initialize;
extern BI_open perl_back_open;
extern BI_close perl_back_close:
extern BI_destroy perl_back_destroy;
extern int perl_back_db_init LDAP_P(( BackendDB *bd ));
extern int perl_back_db_destroy LDAP_P(( BackendDB *bd ));
extern BI_db_init perl_back_db_init;
extern BI_db_destroy perl_back_db_destroy;
extern int perl_back_db_config LDAP_P(( BackendDB *bd,
const char *fname, int lineno, int argc, char **argv ));
extern BI_db_config perl_back_db_config;
extern int perl_back_bind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, int method,
struct berval *cred, char** edn ));
extern BI_op_bind perl_back_bind;
extern int perl_back_unbind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op ));
extern BI_op_unbind perl_back_unbind;
extern int perl_back_search LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *base, const char *nbase,
int scope, int deref, int sizelimit, int timelimit,
Filter *filter, const char *filterstr,
char **attrs, int attrsonly ));
extern BI_op_search perl_back_search;
extern int perl_back_compare LDAP_P((BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
Ava *ava ));
extern BI_op_compare perl_back_compare;
extern int perl_back_modify LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
Modifications *ml ));
extern BI_op_modify perl_back_modify;
extern int perl_back_modrdn LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
const char *newrdn, int deleteoldrdn,
const char *newSuperior ));
extern BI_op_modrdn perl_back_modrdn;
extern int perl_back_add LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op, Entry *e ));
extern BI_op_add perl_back_add;
extern int perl_back_delete LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn ));
extern BI_op_delete perl_back_delete;
LDAP_END_DECL
#endif /* _PERL_EXTERNAL_H */

57
servers/slapd/back-shell/external.h
View File

@ -8,59 +8,34 @@
LDAP_BEGIN_DECL
extern int shell_back_initialize LDAP_P(( BackendInfo *bi ));
extern int shell_back_open LDAP_P(( BackendInfo *bi ));
extern int shell_back_close LDAP_P(( BackendInfo *bi ));
extern int shell_back_destroy LDAP_P(( BackendInfo *bi ));
extern BI_init shell_back_initialize;
extern BI_open shell_back_open;
extern BI_close shell_back_close;
extern BI_destroy shell_back_destroy;
extern int shell_back_db_init LDAP_P(( BackendDB *bd ));
extern int shell_back_db_destroy LDAP_P(( BackendDB *bd ));
extern BI_db_init shell_back_db_init;
extern BI_db_destroy shell_back_db_destroy;
extern int shell_back_db_config LDAP_P(( BackendDB *bd,
const char *fname, int lineno, int argc, char **argv ));
extern BI_db_config shell_back_db_config;
extern int shell_back_bind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, int method,
struct berval *cred, char** edn ));
extern BI_op_bind shell_back_bind;
extern int shell_back_unbind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op ));
extern BI_op_unbind shell_back_unbind;
extern int shell_back_search LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *base, const char *nbase,
int scope, int deref, int sizelimit, int timelimit,
Filter *filter, const char *filterstr,
char **attrs, int attrsonly ));
extern BI_op_search shell_back_search;
extern int shell_back_compare LDAP_P((BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
AttributeAssertion *ava ));
extern BI_op_compare shell_back_compare;
extern int shell_back_modify LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
Modifications *ml ));
extern BI_op_modify shell_back_modify;
extern int shell_back_modrdn LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
const char *newrdn, int deleteoldrdn,
const char *newSuperior ));
extern BI_op_modrdn shell_back_modrdn:
extern int shell_back_add LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op, Entry *e ));
extern BI_op_add shell_back_add;
extern int shell_back_delete LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn ));
extern BI_op_delete shell_back_delete;
extern int shell_back_abandon LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op, int msgid ));
extern BI_op_abandon shell_back_abandon;
LDAP_END_DECL
#endif /* _SHELL_EXTERNAL_H */

4
servers/slapd/back-sql/bind.c
View File

@ -19,10 +19,6 @@
#include "util.h"
#include "entry-id.h"
void backsql_init_search(backsql_srch_info *bsi,backsql_info *bi,char *nbase,int scope,
int slimit,int tlimit,time_t stoptime,Filter *filter,
SQLHDBC dbh,BackendDB *be,Connection *conn,Operation *op,char **attrs);
int backsql_bind(BackendDB *be,Connection *conn,Operation *op,
const char *dn,const char *ndn,int method,struct berval *cred,char** edn)
{

68
servers/slapd/back-sql/external.h
View File

@ -14,62 +14,28 @@
LDAP_BEGIN_DECL
extern int sql_back_initialize LDAP_P(( BackendInfo *bi ));
extern int backsql_destroy LDAP_P(( BackendInfo *bi ));
extern BI_init sql_back_initialize;
extern BI_destroy backsql_destroy;
extern int backsql_db_init LDAP_P(( BackendDB *bd ));
extern int backsql_db_open LDAP_P(( BackendDB *bd ));
extern int backsql_db_close LDAP_P(( BackendDB *bd ));
extern int backsql_db_destroy LDAP_P(( BackendDB *bd ));
extern BI_db_init backsql_db_init;
extern BI_db_open backsql_db_open;
extern BI_db_close backsql_db_close;
extern BI_db_destroy backsql_db_destroy;
extern int backsql_db_config LDAP_P(( BackendDB *bd,
const char *fname, int lineno, int argc, char **argv ));
extern BI_db_config backsql_db_config;
extern int backsql_bind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn, int method,
struct berval *cred, char** edn ));
extern BI_op_bind backsql_bind;
extern BI_op_unbind backsql_unbind;
extern BI_op_search backsql_search;
extern BI_op_compare backsql_compare;
extern BI_op_modify backsql_modify;
extern BI_op_modrdn backsql_modrdn;
extern BI_op_add backsql_add;
extern BI_op_delete backsql_delete;
extern BI_op_abandon backsql_abandon;
extern int backsql_unbind LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op ));
extern int backsql_search LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *base, const char *nbase,
int scope, int deref, int sizelimit, int timelimit,
Filter *filter, const char *filterstr,
char **attrs, int attrsonly ));
extern int backsql_compare LDAP_P((BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
AttributeAssertion *ava ));
extern int backsql_modify LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
Modifications *ml ));
extern int backsql_modrdn LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn,
const char *newrdn, int deleteoldrdn,
const char *newSuperior ));
extern int backsql_add LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op, Entry *e ));
extern int backsql_delete LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
const char *dn, const char *ndn ));
extern int backsql_abandon LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op, int msgid ));
extern int backsql_connection_destroy LDAP_P(( BackendDB *bd,
Connection *conn));
extern BI_connection_destroy backsql_connection_destroy;
LDAP_END_DECL
#endif /* _SQL_EXTERNAL_H */

2
servers/slapd/back-sql/util.h
View File

@ -49,7 +49,7 @@ typedef struct __backsql_srch_info
int backsql_process_filter(backsql_srch_info *bsi,Filter *f);
void backsql_init_search(backsql_srch_info *bsi,backsql_info *bi,char *nbase,int scope,
int slimit,int tlimit,time_t stoptime,Filter *filter,
SQLHDBC dbh,Backend *be,Connection *conn,Operation *op,char **attrs);
SQLHDBC dbh,Backend *be,Connection *conn,Operation *op,struct berval **attrs);
Entry* backsql_id2entry(backsql_srch_info *bsi,Entry* e,backsql_entryID* id);
extern char backsql_def_oc_query[],backsql_def_at_query[],

60
servers/slapd/back-tcl/external.h
View File

@ -5,59 +5,35 @@
LDAP_BEGIN_DECL
extern int tcl_back_initialize LDAP_P ((BackendInfo * bi));
extern int tcl_back_open LDAP_P ((BackendInfo * bi));
extern int tcl_back_close LDAP_P ((BackendInfo * bi));
extern int tcl_back_destroy LDAP_P ((BackendInfo * bi));
extern BI_init tcl_back_initialize;
extern BI_open tcl_back_open;
extern BI_close tcl_back_close;
extern BI_destroy tcl_back_destroy;
extern int tcl_back_db_init LDAP_P ((BackendDB * bd));
extern int tcl_back_db_open LDAP_P ((BackendDB * bd));
extern int tcl_back_db_close LDAP_P ((BackendDB * bd));
extern int tcl_back_db_destroy LDAP_P ((BackendDB * bd));
extern BI_db_init tcl_back_db_init;
extern BI_db_open tcl_back_db_open;
extern BI_db_close tcl_back_db_close;
extern BI_db_destroy tcl_back_db_destroy;
extern int tcl_back_db_config LDAP_P ((BackendDB * bd,
const char *fname, int lineno, int argc, char **argv));
extern BI_db_config tcl_back_db_config;
extern int tcl_back_bind LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op,
const char *dn, const char *ndn, int method,
struct berval * cred, char **edn));
extern BI_op_bind tcl_back_bind;
extern int tcl_back_unbind LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op));
extern BI_op_unbind tcl_back_unbind;
extern int tcl_back_search LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op,
const char *base, const char *nbase,
int scope, int deref, int sizelimit, int timelimit,
Filter * filter, const char *filterstr,
char **attrs, int attrsonly));
extern BI_op_search tcl_back_search;
extern int tcl_back_compare LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op,
const char *dn, const char *ndn,
Ava * ava));
extern BI_op_compare tcl_back_compare;
extern int tcl_back_modify LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op,
const char *dn, const char *ndn,
Modifications * ml));
extern BI_op_modify tcl_back_modify;
extern int tcl_back_modrdn LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op,
const char *dn, const char *ndn,
const char *newrdn, int deleteoldrdn,
const char *newSuperior));
extern BI_op_modrdn tcl_back_modrdn;
extern int tcl_back_add LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op, Entry * e));
extern BI_op_add tcl_back_add;
extern int tcl_back_delete LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op,
const char *dn, const char *ndn));
extern BI_op_delete tcl_back_delete;
extern int tcl_back_abandon LDAP_P ((BackendDB * bd,
Connection * conn, Operation * op, int msgid));
extern BI_op_abandon tcl_back_abandon;
LDAP_END_DECL

2
servers/slapd/back-tcl/tcl_back.h
View File

@ -57,7 +57,7 @@ int interp_send_results (
Connection * conn,
Operation * op,
char *result,
char **attrs,
struct berval **attrs,
int attrsonly
);

2
servers/slapd/back-tcl/tcl_search.c
View File

@ -29,7 +29,7 @@ tcl_back_search (
int timelimit,
Filter * filter,
const char *filterstr,
char **attrs,
struct berval **attrs,
int attrsonly
)
{