/* search.c - /etc/passwd backend search function */
/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP). Additional significant contributors
+ * include:
+ * Hallvard B. Furuseth
+ * Howard Chu
+ * Kurt D. Zeilenga
+ */
#include "portable.h"
int
passwd_back_search(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *base,
- struct berval *nbase,
- int scope,
- int deref,
- int slimit,
- int tlimit,
- Filter *filter,
- struct berval *filterstr,
- AttributeName *attrs,
- int attrsonly
-)
+ SlapReply *rs )
{
struct passwd *pw;
Entry *e;
char *s;
time_t stoptime;
- int sent = 0;
- int err = LDAP_SUCCESS;
-
- LDAPRDN *rdn = NULL;
- struct berval parent = { 0, NULL };
- char *matched = NULL;
- const char *text = NULL;
+ LDAPRDN rdn = NULL;
+ struct berval parent = BER_BVNULL;
AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
- tlimit = (tlimit > be->be_timelimit || tlimit < 1) ? be->be_timelimit
- : tlimit;
- stoptime = op->o_time + tlimit;
- slimit = (slimit > be->be_sizelimit || slimit < 1) ? be->be_sizelimit
- : slimit;
+ if (op->ors_tlimit != SLAP_NO_LIMIT ) {
+ stoptime = op->o_time + op->ors_tlimit;
+ }
/* Handle a query for the base of this backend */
- if ( be_issuffix( be, nbase ) ) {
+ if ( be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
struct berval vals[2];
vals[1].bv_val = NULL;
- matched = (char *) base;
+ rs->sr_matched = op->o_req_dn.bv_val;
- if( scope != LDAP_SCOPE_ONELEVEL ) {
+ if( op->ors_scope != LDAP_SCOPE_ONELEVEL ) {
AttributeDescription *desc = NULL;
/* Create an entry corresponding to the base DN */
e = (Entry *) ch_calloc(1, sizeof(Entry));
- e->e_name.bv_val = ch_strdup( base->bv_val );
- e->e_name.bv_len = base->bv_len;
- e->e_nname.bv_val = ch_strdup( nbase->bv_val );
- e->e_nname.bv_len = nbase->bv_len;
+ e->e_name.bv_val = ch_strdup( op->o_req_dn.bv_val );
+ e->e_name.bv_len = op->o_req_dn.bv_len;
+ e->e_nname.bv_val = ch_strdup( op->o_req_ndn.bv_val );
+ e->e_nname.bv_len = op->o_req_ndn.bv_len;
e->e_attrs = NULL;
e->e_private = NULL;
/* Use the first attribute of the DN
* as an attribute within the entry itself.
*/
- if( ldap_bv2rdn( base, &rdn, (char **)&text,
+ if( ldap_bv2rdn( &op->o_req_dn, &rdn, (char **)&rs->sr_text,
LDAP_DN_FORMAT_LDAP ) )
{
- err = LDAP_INVALID_DN_SYNTAX;
+ rs->sr_err = LDAP_INVALID_DN_SYNTAX;
goto done;
}
- if( slap_bv2ad( &rdn[0][0]->la_attr, &desc, &text )) {
- err = LDAP_NO_SUCH_OBJECT;
+ if( slap_bv2ad( &rdn[0]->la_attr, &desc, &rs->sr_text )) {
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
ldap_rdnfree(rdn);
goto done;
}
- vals[0] = rdn[0][0]->la_value;
- attr_merge( e, desc, vals );
+ vals[0] = rdn[0]->la_value;
+ attr_mergeit( e, desc, vals );
ldap_rdnfree(rdn);
rdn = NULL;
*/
vals[0].bv_val = "organizationalUnit";
vals[0].bv_len = sizeof("organizationalUnit")-1;
- attr_merge( e, ad_objectClass, vals );
+ attr_mergeit( e, ad_objectClass, vals );
- if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
- send_search_entry( be, conn, op,
- e, attrs, attrsonly, NULL );
- sent++;
+ if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
+ rs->sr_entry = e;
+ rs->sr_attrs = op->ors_attrs;
+ rs->sr_flags = REP_ENTRY_MODIFIABLE;
+ send_search_entry( op, rs );
}
}
- if ( scope != LDAP_SCOPE_BASE ) {
+ if ( op->ors_scope != LDAP_SCOPE_BASE ) {
/* check all our "children" */
ldap_pvt_thread_mutex_lock( &passwd_mutex );
- pw_start( be );
+ pw_start( op->o_bd );
for ( pw = getpwent(); pw != NULL; pw = getpwent() ) {
/* check for abandon */
if ( op->o_abandon ) {
}
/* check time limit */
- if ( slap_get_time() > stoptime ) {
- send_ldap_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
- NULL, NULL, NULL, NULL );
+ if ( op->ors_tlimit != SLAP_NO_LIMIT
+ && slap_get_time() > stoptime )
+ {
+ send_ldap_error( op, rs, LDAP_TIMELIMIT_EXCEEDED, NULL );
endpwent();
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
return( 0 );
}
- if ( !(e = pw2entry( be, pw, &text )) ) {
- err = LDAP_OPERATIONS_ERROR;
+ if ( !(e = pw2entry( op->o_bd, pw, &rs->sr_text )) ) {
+ rs->sr_err = LDAP_OTHER;
endpwent();
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
goto done;
}
- if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
+ if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
/* check size limit */
- if ( --slimit == -1 ) {
- send_ldap_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
- NULL, NULL, NULL, NULL );
+ if ( --op->ors_slimit == -1 ) {
+ send_ldap_error( op, rs, LDAP_SIZELIMIT_EXCEEDED, NULL );
endpwent();
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
return( 0 );
}
- send_search_entry( be, conn, op,
- e, attrs, attrsonly, NULL );
- sent++;
+ rs->sr_entry = e;
+ rs->sr_attrs = op->ors_attrs;
+ rs->sr_flags = REP_ENTRY_MODIFIABLE;
+ send_search_entry( op, rs );
}
entry_free( e );
}
} else {
- if (! be_issuffix( be, nbase ) ) {
- dnParent( nbase, &parent );
+ if (! be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+ dnParent( &op->o_req_ndn, &parent );
}
/* This backend is only one layer deep. Don't answer requests for
* anything deeper than that.
*/
- if( !be_issuffix( be, &parent ) ) {
+ if( !be_issuffix( op->o_bd, &parent ) ) {
int i;
- for( i=0; be->be_nsuffix[i].bv_val != NULL; i++ ) {
- if( dnIsSuffix( nbase, &be->be_nsuffix[i] ) ) {
- matched = be->be_suffix[i].bv_val;
+ for( i=0; op->o_bd->be_nsuffix[i].bv_val != NULL; i++ ) {
+ if( dnIsSuffix( &op->o_req_ndn, &op->o_bd->be_nsuffix[i] ) ) {
+ rs->sr_matched = op->o_bd->be_suffix[i].bv_val;
break;
}
}
- err = LDAP_NO_SUCH_OBJECT;
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
goto done;
}
- if( scope == LDAP_SCOPE_ONELEVEL ) {
+ if( op->ors_scope == LDAP_SCOPE_ONELEVEL ) {
goto done;
}
- if ( ldap_bv2rdn( base, &rdn, (char **)&text,
+ if ( ldap_bv2rdn( &op->o_req_dn, &rdn, (char **)&rs->sr_text,
LDAP_DN_FORMAT_LDAP ))
{
- err = LDAP_OPERATIONS_ERROR;
+ rs->sr_err = LDAP_OTHER;
goto done;
}
ldap_pvt_thread_mutex_lock( &passwd_mutex );
- pw_start( be );
- if ( (pw = getpwnam( rdn[0][0]->la_value.bv_val )) == NULL ) {
- matched = parent.bv_val;
- err = LDAP_NO_SUCH_OBJECT;
+ pw_start( op->o_bd );
+ if ( (pw = getpwnam( rdn[0]->la_value.bv_val )) == NULL ) {
+ rs->sr_matched = parent.bv_val;
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
goto done;
}
- e = pw2entry( be, pw, &text );
+ e = pw2entry( op->o_bd, pw, &rs->sr_text );
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
if ( !e ) {
- err = LDAP_OPERATIONS_ERROR;
+ rs->sr_err = LDAP_OTHER;
goto done;
}
- if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
- send_search_entry( be, conn, op,
- e, attrs, attrsonly, NULL );
- sent++;
+ if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
+ rs->sr_entry = e;
+ rs->sr_attrs = op->ors_attrs;
+ rs->sr_flags = REP_ENTRY_MODIFIABLE;
+ send_search_entry( op, rs );
}
entry_free( e );
}
done:
- send_ldap_result( conn, op,
- err, err == LDAP_NO_SUCH_OBJECT ? matched : NULL, text,
- NULL, NULL );
+ if( rs->sr_err != LDAP_NO_SUCH_OBJECT ) rs->sr_matched = NULL;
+ send_ldap_result( op, rs );
if( rdn != NULL ) ldap_rdnfree( rdn );
sprintf( vals[0].bv_val, "uid=%s,%s",
pw->pw_name, be->be_suffix[0].bv_val );
- rc = dnNormalize2( NULL, vals, &bv );
+ rc = dnNormalize( 0, NULL, NULL, vals, &bv, NULL );
if( rc != LDAP_SUCCESS ) {
free( vals[0].bv_val );
return NULL;
/* objectclasses should be configurable items */
vals[0].bv_val = "top";
vals[0].bv_len = sizeof("top")-1;
- attr_merge( e, ad_objectClass, vals );
+ attr_mergeit( e, ad_objectClass, vals );
vals[0].bv_val = "person";
vals[0].bv_len = sizeof("person")-1;
- attr_merge( e, ad_objectClass, vals );
+ attr_mergeit( e, ad_objectClass, vals );
vals[0].bv_val = "uidObject";
vals[0].bv_len = sizeof("uidObject")-1;
- attr_merge( e, ad_objectClass, vals );
+ attr_mergeit( e, ad_objectClass, vals );
vals[0].bv_val = pw->pw_name;
vals[0].bv_len = pwlen;
- attr_merge( e, ad_uid, vals ); /* required by uidObject */
- attr_merge( e, ad_cn, vals ); /* required by person */
- attr_merge( e, ad_sn, vals ); /* required by person */
+ attr_mergeit( e, ad_uid, vals ); /* required by uidObject */
+ attr_mergeit( e, ad_cn, vals ); /* required by person */
+ attr_mergeit( e, ad_sn, vals ); /* required by person */
#ifdef HAVE_PW_GECOS
/*
vals[0].bv_val = pw->pw_gecos;
vals[0].bv_len = strlen(vals[0].bv_val);
- attr_merge(e, ad_description, vals);
+ attr_mergeit(e, ad_description, vals);
s = strchr(vals[0].bv_val, ',');
if (s) *s = '\0';
s = strchr(vals[0].bv_val, '&');
if (s) {
- char buf[256];
- int i = s - vals[0].bv_val;
- strncpy(buf, vals[0].bv_val, i);
- s = buf+i;
- strcpy(s, pw->pw_name);
- *s = TOUPPER((unsigned char)*s);
- strcat(s, vals[0].bv_val+i+1);
- vals[0].bv_val = buf;
+ char buf[1024];
+
+ if( vals[0].bv_len + pwlen < sizeof(buf) ) {
+ int i = s - vals[0].bv_val;
+ strncpy(buf, vals[0].bv_val, i);
+ s = buf+i;
+ strcpy(s, pw->pw_name);
+ *s = TOUPPER((unsigned char)*s);
+ strcat(s, vals[0].bv_val+i+1);
+ vals[0].bv_val = buf;
+ }
}
vals[0].bv_len = strlen(vals[0].bv_val);
- if ( strcmp( vals[0].bv_val, pw->pw_name ))
- attr_merge( e, ad_cn, vals );
+
+ if ( vals[0].bv_len && strcasecmp( vals[0].bv_val, pw->pw_name )) {
+ attr_mergeit( e, ad_cn, vals );
+ }
+
if ( (s=strrchr(vals[0].bv_val, ' '))) {
vals[0].bv_val = s + 1;
vals[0].bv_len = strlen(vals[0].bv_val);
- attr_merge(e, ad_sn, vals);
+ attr_mergeit(e, ad_sn, vals);
}
}
#endif
projects / openldap / blobdiff