/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
static void pw_start( Backend *be );
-static Entry *pw2entry(
- Backend *be,
- struct passwd *pw );
+static int pw2entry(
+ Backend *be,
+ struct passwd *pw,
+ Entry *ep );
int
passwd_back_search(
SlapReply *rs )
{
struct passwd *pw;
- Entry *e;
- time_t stoptime;
+ time_t stoptime = (time_t)-1;
LDAPRDN rdn = NULL;
struct berval parent = BER_BVNULL;
AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
- if (op->ors_tlimit != SLAP_NO_LIMIT ) {
+ if ( op->ors_tlimit != SLAP_NO_LIMIT ) {
stoptime = op->o_time + op->ors_tlimit;
}
if( op->ors_scope != LDAP_SCOPE_ONELEVEL ) {
AttributeDescription *desc = NULL;
char *next;
+ Entry e = { 0 };
/* Create an entry corresponding to the base DN */
- e = (Entry *) ch_calloc(1, sizeof(Entry));
- 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;
+ 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;
/* Use the first attribute of the DN
* as an attribute within the entry itself.
goto done;
}
- attr_mergeit_one( e, desc, &rdn[0]->la_value );
+ attr_merge_normalize_one( &e, desc, &rdn[0]->la_value, NULL );
ldap_rdnfree(rdn);
rdn = NULL;
* should be a configuratable item
*/
BER_BVSTR( &val, "organizationalUnit" );
- attr_mergeit_one( e, ad_objectClass, &val );
+ attr_merge_one( &e, ad_objectClass, &val, NULL );
- if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
- rs->sr_entry = e;
+ 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_clean( &e );
}
if ( op->ors_scope != LDAP_SCOPE_BASE ) {
ldap_pvt_thread_mutex_lock( &passwd_mutex );
pw_start( op->o_bd );
for ( pw = getpwent(); pw != NULL; pw = getpwent() ) {
+ Entry e = { 0 };
+
/* check for abandon */
if ( op->o_abandon ) {
endpwent();
return( 0 );
}
- if ( !( e = pw2entry( op->o_bd, pw ) ) ) {
+ if ( pw2entry( op->o_bd, pw, &e ) ) {
rs->sr_err = LDAP_OTHER;
endpwent();
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
goto done;
}
- if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
+ if ( test_filter( op, &e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
/* check size limit */
if ( --op->ors_slimit == -1 ) {
send_ldap_error( op, rs, LDAP_SIZELIMIT_EXCEEDED, NULL );
return( 0 );
}
- rs->sr_entry = e;
+ rs->sr_entry = &e;
rs->sr_attrs = op->ors_attrs;
rs->sr_flags = REP_ENTRY_MODIFIABLE;
send_search_entry( op, rs );
}
- entry_free( e );
+ entry_clean( &e );
}
endpwent();
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
} else {
char *next;
+ Entry e = { 0 };
+ int rc;
+
if (! be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
dnParent( &op->o_req_ndn, &parent );
}
ldap_pvt_thread_mutex_lock( &passwd_mutex );
pw_start( op->o_bd );
- if ( (pw = getpwnam( rdn[0]->la_value.bv_val )) == NULL ) {
+ pw = getpwnam( rdn[0]->la_value.bv_val );
+ if ( pw == 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( op->o_bd, pw );
+ rc = pw2entry( op->o_bd, pw, &e );
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
- if ( !e ) {
+ if ( rc ) {
rs->sr_err = LDAP_OTHER;
goto done;
}
- if ( test_filter( op, e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
- rs->sr_entry = e;
+ 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 );
+ entry_clean( &e );
}
done:
#endif /* HAVE_SETPWFILE */
}
-static Entry *
-pw2entry( Backend *be, struct passwd *pw )
+static int
+pw2entry( Backend *be, struct passwd *pw, Entry *e )
{
size_t pwlen;
- Entry *e;
struct berval val;
struct berval bv;
rc = dnNormalize( 0, NULL, NULL, &val, &bv, NULL );
if( rc != LDAP_SUCCESS ) {
free( val.bv_val );
- return NULL;
+ return( -1 );
}
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
e->e_name = val;
e->e_nname = bv;
e->e_attrs = NULL;
/* objectclasses should be configurable items */
-#if 0
- /* "top" is redundant */
- BER_BVSTR( &val, "top" );
- attr_mergeit_one( e, ad_objectClass, &val );
-#endif
-
BER_BVSTR( &val, "person" );
- attr_mergeit_one( e, slap_schema.si_ad_objectClass, &val );
+ attr_merge_one( e, slap_schema.si_ad_objectClass, &val, NULL );
BER_BVSTR( &val, "uidObject" );
- attr_mergeit_one( e, slap_schema.si_ad_objectClass, &val );
+ attr_merge_one( e, slap_schema.si_ad_objectClass, &val, NULL );
val.bv_val = pw->pw_name;
val.bv_len = pwlen;
- attr_mergeit_one( e, slap_schema.si_ad_uid, &val ); /* required by uidObject */
- attr_mergeit_one( e, slap_schema.si_ad_cn, &val ); /* required by person */
- attr_mergeit_one( e, ad_sn, &val ); /* required by person */
+ attr_merge_normalize_one( e, slap_schema.si_ad_uid, &val, NULL ); /* required by uidObject */
+ attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL ); /* required by person */
+ attr_merge_normalize_one( e, ad_sn, &val, NULL ); /* required by person */
-#ifdef HAVE_PW_GECOS
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
/*
* if gecos is present, add it as a cn. first process it
* according to standard BSD usage. If the processed cn has
char *s;
ber_str2bv( pw->pw_gecos, 0, 0, &val );
- attr_mergeit_one( e, ad_desc, &val );
+ attr_merge_normalize_one( e, ad_desc, &val, NULL );
- s = strchr( val.bv_val, ',' );
+ s = ber_bvchr( &val, ',' );
if ( s ) *s = '\0';
- s = strchr( val.bv_val, '&' );
+ s = ber_bvchr( &val, '&' );
if ( s ) {
char buf[1024];
val.bv_len = strlen( val.bv_val );
if ( val.bv_len && strcasecmp( val.bv_val, pw->pw_name ) ) {
- attr_mergeit_one( e, slap_schema.si_ad_cn, &val );
+ attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL );
}
if ( ( s = strrchr(val.bv_val, ' ' ) ) ) {
ber_str2bv( s + 1, 0, 0, &val );
- attr_mergeit_one( e, ad_sn, &val );
+ attr_merge_normalize_one( e, ad_sn, &val, NULL );
}
}
-#endif
+#endif /* HAVE_STRUCT_PASSWD_PW_GECOS */
- return( e );
+ return( 0 );
}
projects / openldap / blobdiff