X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fback-ldap.h;h=c4692f361e0301d2c14540f18f362372dad31dcd;hb=56cdaa594cd9f3c683a02f3fa6952204c016e232;hp=ffe616e24b564c3111efc854fde66193c14c7487;hpb=bf35f8e37fa2516daa02a8c607dd2326b2be40e9;p=openldap diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h index ffe616e24b..c4692f361e 100644 --- a/servers/slapd/back-ldap/back-ldap.h +++ b/servers/slapd/back-ldap/back-ldap.h @@ -1,38 +1,24 @@ /* back-ldap.h - ldap backend header file */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -/* This is an altered version */ -/* - * Copyright 1999, Howard Chu, All rights reserved. - * - * Permission is granted to anyone to use this software for any purpose - * on any computer system, and to alter it and redistribute it, subject - * to the following restrictions: - * - * 1. The author is not responsible for the consequences of use of this - * software, no matter how awful, even if they arise from flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, - * credits should appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users - * ever read sources, credits should appear in the documentation. - * - * 4. This notice may not be removed or altered. +/* This work is part of OpenLDAP Software . * + * Copyright 1999-2004 The OpenLDAP Foundation. + * Portions Copyright 2000-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. * - * Copyright 2000, Pierangelo Masarati, All rights reserved. - * - * This software is being modified by Pierangelo Masarati. - * The previously reported conditions apply to the modified code as well. - * Changes in the original code are highlighted where required. - * Credits for the original code go to the author, Howard Chu. + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by the Howard Chu for inclusion + * in OpenLDAP Software and subsequently enhanced by Pierangelo + * Masarati. */ #ifndef SLAPD_LDAP_H @@ -73,14 +59,39 @@ struct ldapmapping { struct berval dst; }; +struct ldaprwmap { + /* + * DN rewriting + */ +#ifdef ENABLE_REWRITE + struct rewrite_info *rwm_rw; +#else /* !ENABLE_REWRITE */ + /* some time the suffix massaging without librewrite + * will be disabled */ + BerVarray rwm_suffix_massage; +#endif /* !ENABLE_REWRITE */ + + /* + * Attribute/objectClass mapping + */ + struct ldapmap rwm_oc; + struct ldapmap rwm_at; +}; + struct ldapinfo { struct slap_backend_db *be; char *url; - char *binddn; - char *bindpw; + struct berval binddn; + struct berval bindpw; +#ifdef LDAP_BACK_PROXY_AUTHZ + struct berval proxyauthzdn; + struct berval proxyauthzpw; +#endif /* LDAP_BACK_PROXY_AUTHZ */ ldap_pvt_thread_mutex_t conn_mutex; int savecred; Avlnode *conntree; + +#if 0 #ifdef ENABLE_REWRITE struct rewrite_info *rwinfo; #else /* !ENABLE_REWRITE */ @@ -89,18 +100,34 @@ struct ldapinfo { struct ldapmap oc_map; struct ldapmap at_map; +#endif + + struct ldaprwmap rwmap; }; -struct ldapconn *ldap_back_getconn(struct ldapinfo *li, struct slap_conn *conn, - struct slap_op *op); -int ldap_back_dobind(struct ldapinfo *li, struct ldapconn *lc, Connection *conn, Operation *op); -int ldap_back_map_result(int err); -int ldap_back_op_result(struct ldapinfo *li, struct ldapconn *lc, - Connection *conn, Operation *op, ber_int_t msgid, int rc, int sendok); +/* Whatever context ldap_back_dn_massage needs... */ +typedef struct dncookie { + struct ldaprwmap *rwmap; + +#ifdef ENABLE_REWRITE + Connection *conn; + char *ctx; + SlapReply *rs; +#else + int normalized; + int tofrom; +#endif +} dncookie; + +struct ldapconn *ldap_back_getconn(struct slap_op *op, struct slap_rep *rs); +int ldap_back_dobind(struct ldapconn *lc, Operation *op, SlapReply *rs); +int ldap_back_map_result(SlapReply *rs); +int ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs, + ber_int_t msgid, int sendok); int back_ldap_LTX_init_module(int argc, char *argv[]); -void ldap_back_dn_massage(struct ldapinfo *li, struct berval *dn, - struct berval *res, int normalized, int tofrom); +int ldap_back_dn_massage(dncookie *dc, struct berval *dn, + struct berval *res); extern int ldap_back_conn_cmp( const void *c1, const void *c2); extern int ldap_back_conn_dup( void *c1, void *c2 ); @@ -122,11 +149,13 @@ ldap_back_map_filter( struct berval *f, int remap ); -char ** + +int ldap_back_map_attrs( struct ldapmap *at_map, AttributeName *a, - int remap + int remap, + char ***mapped_attrs ); extern void mapping_free ( void *mapping ); @@ -140,13 +169,8 @@ extern int ldap_back_map_config( char **argv ); extern int -ldap_back_filter_map_rewrite_( -#ifdef ENABLE_REWRITE - struct rewrite_info *info, - void *cookie, -#endif /* ENABLE_REWRITE */ - struct ldapmap *at_map, - struct ldapmap *oc_map, +ldap_back_filter_map_rewrite( + dncookie *dc, Filter *f, struct berval *fstr, int remap ); @@ -156,8 +180,18 @@ ldap_back_filter_map_rewrite_( extern int suffix_massage_config( struct rewrite_info *info, struct berval *pvnc, struct berval *nvnc, struct berval *prnc, struct berval *nrnc); -extern int ldap_dnattr_rewrite( struct rewrite_info *rwinfo, BerVarray a_vals, void *cookie ); #endif /* ENABLE_REWRITE */ +extern int ldap_dnattr_rewrite( dncookie *dc, BerVarray a_vals ); +extern int ldap_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals ); + +#ifdef LDAP_BACK_PROXY_AUTHZ +extern int +ldap_back_proxy_authz_ctrl( + struct ldapconn *lc, + Operation *op, + SlapReply *rs, + LDAPControl ***pctrls ); +#endif /* LDAP_BACK_PROXY_AUTHZ */ LDAP_END_DECL