/* config.c - ldap backend configuration file routine */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * 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.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
*/
/* This is an altered version */
/*
fname, lineno );
return( 1 );
}
- li->binddn = ch_strdup(argv[1]);
+ ber_str2bv( argv[1], 0, 1, &li->binddn );
/* password to use for ldap_back_group */
} else if ( strcasecmp( argv[0], "bindpw" ) == 0 ) {
fname, lineno );
return( 1 );
}
- li->bindpw = ch_strdup(argv[1]);
+ ber_str2bv( argv[1], 0, 1, &li->bindpw );
/* save bind creds for referral rebinds? */
} else if ( strcasecmp( argv[0], "rebind-as-user" ) == 0 ) {
fname, lineno );
return( 1 );
}
- load_extop( (struct berval *)&slap_EXOP_WHOAMI, ldap_back_exop_whoami );
+ load_extop( (struct berval *)&slap_EXOP_WHOAMI,
+ 0, ldap_back_exop_whoami );
/* dn massaging */
} else if ( strcasecmp( argv[0], "suffixmassage" ) == 0 ) {
}
ber_str2bv( argv[1], 0, 0, &bvnc );
- if ( dnPrettyNormal( NULL, &bvnc, &pvnc, &nvnc ) != LDAP_SUCCESS ) {
+ if ( dnPrettyNormal( NULL, &bvnc, &pvnc, &nvnc, NULL ) != LDAP_SUCCESS ) {
fprintf( stderr, "%s: line %d: suffix DN %s is invalid\n",
fname, lineno, bvnc.bv_val );
return( 1 );
}
ber_str2bv( argv[2], 0, 0, &brnc );
- if ( dnPrettyNormal( NULL, &brnc, &prnc, &nrnc ) != LDAP_SUCCESS ) {
+ if ( dnPrettyNormal( NULL, &brnc, &prnc, &nrnc, NULL ) != LDAP_SUCCESS ) {
fprintf( stderr, "%s: line %d: suffix DN %s is invalid\n",
fname, lineno, brnc.bv_val );
free( nvnc.bv_val );
* FIXME: no extra rewrite capabilities should be added
* to the database
*/
- rc = suffix_massage_config( li->rwinfo, &pvnc, &nvnc, &prnc, &nrnc );
+ rc = suffix_massage_config( li->rwmap.rwm_rw,
+ &pvnc, &nvnc, &prnc, &nrnc );
free( nvnc.bv_val );
free( pvnc.bv_val );
free( nrnc.bv_val );
return( rc );
#else /* !ENABLE_REWRITE */
- ber_bvarray_add( &li->suffix_massage, &pvnc );
- ber_bvarray_add( &li->suffix_massage, &nvnc );
+ ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &pvnc );
+ ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &nvnc );
- ber_bvarray_add( &li->suffix_massage, &prnc );
- ber_bvarray_add( &li->suffix_massage, &nrnc );
+ ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &prnc );
+ ber_bvarray_add( &li->rwmap.rwm_suffix_massage, &nrnc );
#endif /* !ENABLE_REWRITE */
/* rewrite stuff ... */
} else if ( strncasecmp( argv[0], "rewrite", 7 ) == 0 ) {
#ifdef ENABLE_REWRITE
- return rewrite_parse( li->rwinfo, fname, lineno, argc, argv );
+ return rewrite_parse( li->rwmap.rwm_rw,
+ fname, lineno, argc, argv );
#else /* !ENABLE_REWRITE */
fprintf( stderr, "%s: line %d: rewrite capabilities "
/* objectclass/attribute mapping */
} else if ( strcasecmp( argv[0], "map" ) == 0 ) {
- return ldap_back_map_config( &li->oc_map, &li->at_map,
+ return ldap_back_map_config( &li->rwmap.rwm_oc,
+ &li->rwmap.rwm_at,
fname, lineno, argc, argv );
/* anything else */
static int
ldap_back_exop_whoami(
- Connection *conn,
Operation *op,
- struct berval *reqoid,
- struct berval *reqdata,
- char **rspoid,
- struct berval **rspdata,
- LDAPControl ***rspctrls,
- const char **text,
- BerVarray *refs )
+ SlapReply *rs )
{
struct berval *bv = NULL;
- int rc = LDAP_SUCCESS;
- if ( reqdata != NULL ) {
+ if ( op->oq_extended.rs_reqdata != NULL ) {
/* no request data should be provided */
- *text = "no request data expected";
- return LDAP_PROTOCOL_ERROR;
+ rs->sr_text = "no request data expected";
+ return rs->sr_err = LDAP_PROTOCOL_ERROR;
}
- {
- rc = backend_check_restrictions( conn->c_authz_backend,
- conn, op, (struct berval *)&slap_EXOP_WHOAMI, text );
-
- if( rc != LDAP_SUCCESS ) return rc;
- }
+ rs->sr_err = backend_check_restrictions( op, rs,
+ (struct berval *)&slap_EXOP_WHOAMI );
+ if( rs->sr_err != LDAP_SUCCESS ) return rs->sr_err;
/* if auth'd by back-ldap and request is proxied, forward it */
- if ( conn->c_authz_backend && !strcmp(conn->c_authz_backend->be_type, "ldap" ) && !dn_match(&op->o_ndn, &conn->c_ndn)) {
- struct ldapinfo *li =
- (struct ldapinfo *)conn->c_authz_backend->be_private;
+ if ( op->o_conn->c_authz_backend && !strcmp(op->o_conn->c_authz_backend->be_type, "ldap" ) && !dn_match(&op->o_ndn, &op->o_conn->c_ndn)) {
struct ldapconn *lc;
- LDAPControl c, *ctrls[2] = {&c, NULL};
+ LDAPControl c, *ctrls[2] = {NULL, NULL};
LDAPMessage *res;
Operation op2 = *op;
ber_int_t msgid;
- op2.o_ndn = conn->c_ndn;
- lc = ldap_back_getconn(li, conn, &op2);
- if (!lc || !ldap_back_dobind( li, lc, conn, op )) {
+ ctrls[0] = &c;
+ op2.o_ndn = op->o_conn->c_ndn;
+ lc = ldap_back_getconn(&op2, rs);
+ if (!lc || !ldap_back_dobind( lc, op, rs )) {
return -1;
}
c.ldctl_oid = LDAP_CONTROL_PROXY_AUTHZ;
strcpy(c.ldctl_value.bv_val, "dn:");
strcpy(c.ldctl_value.bv_val+3, op->o_ndn.bv_val);
- rc = ldap_whoami(lc->ld, ctrls, NULL, &msgid);
- if (rc == LDAP_SUCCESS) {
+ rs->sr_err = ldap_whoami(lc->ld, ctrls, NULL, &msgid);
+ if (rs->sr_err == LDAP_SUCCESS) {
if (ldap_result(lc->ld, msgid, 1, NULL, &res) == -1) {
ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER,
- &rc);
+ &rs->sr_err);
} else {
- rc = ldap_parse_whoami(lc->ld, res, &bv);
+ rs->sr_err = ldap_parse_whoami(lc->ld, res, &bv);
ldap_msgfree(res);
}
}
ch_free(c.ldctl_value.bv_val);
- if (rc != LDAP_SUCCESS) {
- rc = ldap_back_map_result(rc);
+ if (rs->sr_err != LDAP_SUCCESS) {
+ rs->sr_err = ldap_back_map_result(rs);
}
} else {
/* else just do the same as before */
}
}
- *rspdata = bv;
- return rc;
+ rs->sr_rspdata = bv;
+ return rs->sr_err;
}
rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
#else /* normalize "matched" */
+
rargv[ 0 ] = "rewriteContext";
- rargv[ 1 ] = "matchedDn";
- rargv[ 2 ] = NULL;
- rewrite_parse( info, "<suffix massage>", ++line, 2, rargv );
+ rargv[ 1 ] = "matchedDN";
+ rargv[ 2 ] = "alias";
+ rargv[ 3 ] = "searchResult";
+ rargv[ 4 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
+
+ rargv[ 0 ] = "rewriteContext";
+ rargv[ 1 ] = "searchAttrDN";
+ rargv[ 2 ] = "alias";
+ rargv[ 3 ] = "searchResult";
+ rargv[ 4 ] = NULL;
+ rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
+#if 0
rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = suffix_massage_regexize( prnc->bv_val );
rargv[ 2 ] = suffix_massage_patternize( nvnc->bv_val );
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
ch_free( rargv[ 1 ] );
ch_free( rargv[ 2 ] );
+#endif /* 0 */
#endif /* normalize "matched" */
return 0;
projects / openldap / blobdiff