static void pw_start( Backend *be );
-static Entry *pw2entry(
- Backend *be,
- struct passwd *pw,
- const char **text);
+static int pw2entry(
+ Backend *be,
+ struct passwd *pw,
+ Entry *ep );
int
passwd_back_search(
SlapReply *rs )
{
struct passwd *pw;
- Entry *e;
- char *s;
time_t stoptime;
LDAPRDN rdn = NULL;
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;
}
/* Handle a query for the base of this backend */
if ( be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
- struct berval vals[2];
-
- vals[1].bv_val = NULL;
+ struct berval val;
rs->sr_matched = op->o_req_dn.bv_val;
if( op->ors_scope != LDAP_SCOPE_ONELEVEL ) {
- AttributeDescription *desc = NULL;
+ 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.
*/
- if( ldap_bv2rdn( &op->o_req_dn, &rdn, (char **)&rs->sr_text,
+ if( ldap_bv2rdn( &op->o_req_dn, &rdn, &next,
LDAP_DN_FORMAT_LDAP ) )
{
rs->sr_err = LDAP_INVALID_DN_SYNTAX;
goto done;
}
- vals[0] = rdn[0]->la_value;
- attr_mergeit( e, desc, vals );
+ attr_merge_normalize_one( &e, desc, &rdn[0]->la_value, NULL );
ldap_rdnfree(rdn);
rdn = NULL;
*
* should be a configuratable item
*/
- vals[0].bv_val = "organizationalUnit";
- vals[0].bv_len = sizeof("organizationalUnit")-1;
- attr_mergeit( e, ad_objectClass, vals );
+ BER_BVSTR( &val, "organizationalUnit" );
+ 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, &rs->sr_text )) ) {
+ 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 );
}
goto done;
}
- if ( ldap_bv2rdn( &op->o_req_dn, &rdn, (char **)&rs->sr_text,
+ if ( ldap_bv2rdn( &op->o_req_dn, &rdn, &next,
LDAP_DN_FORMAT_LDAP ))
{
rs->sr_err = LDAP_OTHER;
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, &rs->sr_text );
+ 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, const char **text )
+static int
+pw2entry( Backend *be, struct passwd *pw, Entry *e )
{
- size_t pwlen;
- Entry *e;
- struct berval vals[2];
+ size_t pwlen;
+ struct berval val;
struct berval bv;
- int rc;
-
- AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
- AttributeDescription *ad_cn = NULL;
- AttributeDescription *ad_sn = NULL;
- AttributeDescription *ad_uid = NULL;
- AttributeDescription *ad_description = NULL;
-
- rc = slap_str2ad( "cn", &ad_cn, text );
- if(rc != LDAP_SUCCESS) return NULL;
- rc = slap_str2ad( "sn", &ad_sn, text );
- if(rc != LDAP_SUCCESS) return NULL;
- rc = slap_str2ad( "uid", &ad_uid, text );
- if(rc != LDAP_SUCCESS) return NULL;
- rc = slap_str2ad( "description", &ad_description, text );
- if(rc != LDAP_SUCCESS) return NULL;
+ int rc;
/*
* from pw we get pw_name and make it cn
*/
pwlen = strlen( pw->pw_name );
- vals[0].bv_len = (sizeof("uid=,")-1) + ( pwlen + be->be_suffix[0].bv_len );
- vals[0].bv_val = ch_malloc( vals[0].bv_len + 1 );
+ val.bv_len = STRLENOF("uid=,") + ( pwlen + be->be_suffix[0].bv_len );
+ val.bv_val = ch_malloc( val.bv_len + 1 );
/* rdn attribute type should be a configuratable item */
- sprintf( vals[0].bv_val, "uid=%s,%s",
+ sprintf( val.bv_val, "uid=%s,%s",
pw->pw_name, be->be_suffix[0].bv_val );
- rc = dnNormalize( 0, NULL, NULL, vals, &bv, NULL );
+ rc = dnNormalize( 0, NULL, NULL, &val, &bv, NULL );
if( rc != LDAP_SUCCESS ) {
- free( vals[0].bv_val );
- return NULL;
+ free( val.bv_val );
+ return( -1 );
}
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
- e->e_name = vals[0];
+ e->e_name = val;
e->e_nname = bv;
e->e_attrs = NULL;
- vals[1].bv_val = NULL;
-
/* objectclasses should be configurable items */
- vals[0].bv_val = "top";
- vals[0].bv_len = sizeof("top")-1;
- attr_mergeit( e, ad_objectClass, vals );
+ BER_BVSTR( &val, "person" );
+ attr_merge_one( e, slap_schema.si_ad_objectClass, &val, NULL );
- vals[0].bv_val = "person";
- vals[0].bv_len = sizeof("person")-1;
- attr_mergeit( e, ad_objectClass, vals );
+ BER_BVSTR( &val, "uidObject" );
+ attr_merge_one( e, slap_schema.si_ad_objectClass, &val, NULL );
- vals[0].bv_val = "uidObject";
- vals[0].bv_len = sizeof("uidObject")-1;
- attr_mergeit( e, ad_objectClass, vals );
-
- vals[0].bv_val = pw->pw_name;
- vals[0].bv_len = pwlen;
- 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 */
+ val.bv_val = pw->pw_name;
+ val.bv_len = pwlen;
+ 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
/*
if (pw->pw_gecos[0]) {
char *s;
- vals[0].bv_val = pw->pw_gecos;
- vals[0].bv_len = strlen(vals[0].bv_val);
- attr_mergeit(e, ad_description, vals);
+ ber_str2bv( pw->pw_gecos, 0, 0, &val );
+ attr_merge_normalize_one( e, ad_desc, &val, NULL );
- s = strchr(vals[0].bv_val, ',');
- if (s) *s = '\0';
+ s = strchr( val.bv_val, ',' );
+ if ( s ) *s = '\0';
- s = strchr(vals[0].bv_val, '&');
- if (s) {
+ s = strchr( val.bv_val, '&' );
+ if ( s ) {
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);
+ if( val.bv_len + pwlen < sizeof(buf) ) {
+ int i = s - val.bv_val;
+ strncpy( buf, val.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;
+ strcat( s, val.bv_val + i + 1 );
+ val.bv_val = buf;
}
}
- vals[0].bv_len = strlen(vals[0].bv_val);
+ val.bv_len = strlen( val.bv_val );
- if ( vals[0].bv_len && strcasecmp( vals[0].bv_val, pw->pw_name )) {
- attr_mergeit( e, ad_cn, vals );
+ if ( val.bv_len && strcasecmp( val.bv_val, pw->pw_name ) ) {
+ attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL );
}
- if ( (s=strrchr(vals[0].bv_val, ' '))) {
- vals[0].bv_val = s + 1;
- vals[0].bv_len = strlen(vals[0].bv_val);
- attr_mergeit(e, ad_sn, vals);
+ if ( ( s = strrchr(val.bv_val, ' ' ) ) ) {
+ ber_str2bv( s + 1, 0, 0, &val );
+ attr_merge_normalize_one( e, ad_sn, &val, NULL );
}
}
-#endif
+#endif /* HAVE_PW_GECOS */
- return( e );
+ return( 0 );
}
projects / openldap / blobdiff