#include <pwd.h>
#include "slap.h"
-#include "external.h"
+#include "back-passwd.h"
#include <ldap_pvt.h>
+static void pw_start( Backend *be );
+
static Entry *pw2entry(
Backend *be,
- struct passwd *pw);
+ struct passwd *pw,
+ const char **text);
int
passwd_back_search(
int slimit,
int tlimit,
Filter *filter,
- const char *filterstr,
+ struct berval *filterstr,
AttributeName *attrs,
int attrsonly
)
int err = LDAP_SUCCESS;
LDAPRDN *rdn = NULL;
- char *parent = NULL;
+ struct berval parent = { 0, NULL };
char *matched = NULL;
- char *user = NULL;
+ const char *text = NULL;
AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
slimit = (slimit > be->be_sizelimit || slimit < 1) ? be->be_sizelimit
: slimit;
- endpwent();
-
-#ifdef HAVE_SETPWFILE
- if ( be->be_private != NULL ) {
- (void) setpwfile( (char *) be->be_private );
- }
-#endif /* HAVE_SETPWFILE */
-
/* Handle a query for the base of this backend */
- if ( be_issuffix( be, nbase->bv_val ) ) {
- struct berval val, *vals[2];
+ if ( be_issuffix( be, nbase ) ) {
+ struct berval vals[2];
- vals[0] = &val;
- vals[1] = NULL;
+ vals[1].bv_val = NULL;
matched = (char *) base;
if( scope != LDAP_SCOPE_ONELEVEL ) {
- const char *text;
AttributeDescription *desc = NULL;
/* Create an entry corresponding to the base DN */
/* Use the first attribute of the DN
* as an attribute within the entry itself.
*/
- if( ldap_str2rdn( base->bv_val, &rdn, &text,
- LDAP_DN_FORMAT_LDAP ) ) {
+ if( ldap_bv2rdn( base, &rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
err = LDAP_INVALID_DN_SYNTAX;
goto done;
}
goto done;
}
- val = rdn[0][0]->la_value;
+ vals[0] = rdn[0][0]->la_value;
attr_merge( e, desc, vals );
ldap_rdnfree(rdn);
*
* should be a configuratable item
*/
- val.bv_val = "organizationalUnit";
- val.bv_len = sizeof("organizationalUnit")-1;
+ vals[0].bv_val = "organizationalUnit";
+ vals[0].bv_len = sizeof("organizationalUnit")-1;
attr_merge( e, ad_objectClass, vals );
if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
if ( scope != LDAP_SCOPE_BASE ) {
/* check all our "children" */
+ ldap_pvt_thread_mutex_lock( &passwd_mutex );
+ pw_start( be );
for ( pw = getpwent(); pw != NULL; pw = getpwent() ) {
/* check for abandon */
- ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
if ( op->o_abandon ) {
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
endpwent();
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
return( -1 );
}
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
/* check time limit */
if ( slap_get_time() > stoptime ) {
send_ldap_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
NULL, NULL, NULL, NULL );
endpwent();
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
return( 0 );
}
- e = pw2entry( be, pw );
+ if ( !(e = pw2entry( be, pw, &text )) ) {
+ err = LDAP_OTHER;
+ endpwent();
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+ goto done;
+ }
if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
/* check size limit */
send_ldap_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
NULL, NULL, NULL, NULL );
endpwent();
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
return( 0 );
}
entry_free( e );
}
endpwent();
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
}
} else {
- const char *text = NULL;
-
- parent = dn_parent( be, nbase->bv_val );
+ if (! be_issuffix( be, nbase ) ) {
+ dnParent( nbase, &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( be, &parent ) ) {
int i;
- for( i=0; be->be_nsuffix[i] != NULL; i++ ) {
- if( dnIsSuffix( nbase, be->be_nsuffix[i] ) ) {
- matched = be->be_suffix[i]->bv_val;
+ 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;
break;
}
}
goto done;
}
- if ( ldap_str2rdn( base->bv_val, &rdn, &text, LDAP_DN_FORMAT_LDAP )) {
- err = LDAP_OPERATIONS_ERROR;
+ if ( ldap_bv2rdn( base, &rdn, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ))
+ {
+ 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;
+ matched = parent.bv_val;
err = LDAP_NO_SUCH_OBJECT;
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
goto done;
}
- e = pw2entry( be, pw );
+ e = pw2entry( be, pw, &text );
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+ if ( !e ) {
+ err = LDAP_OTHER;
+ goto done;
+ }
if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
send_search_entry( be, conn, op,
done:
send_ldap_result( conn, op,
- err, err == LDAP_NO_SUCH_OBJECT ? matched : NULL, NULL,
+ err, err == LDAP_NO_SUCH_OBJECT ? matched : NULL, text,
NULL, NULL );
if( rdn != NULL ) ldap_rdnfree( rdn );
return( 0 );
}
+static void
+pw_start(
+ Backend *be
+)
+{
+ endpwent();
+
+#ifdef HAVE_SETPWFILE
+ if ( be->be_private != NULL ) {
+ (void) setpwfile( (char *) be->be_private );
+ }
+#endif /* HAVE_SETPWFILE */
+}
+
static Entry *
-pw2entry( Backend *be, struct passwd *pw )
+pw2entry( Backend *be, struct passwd *pw, const char **text )
{
size_t pwlen;
Entry *e;
- struct berval val;
- struct berval *vals[2];
+ struct berval vals[2];
struct berval bv;
int rc;
- const char *text;
AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
AttributeDescription *ad_cn = NULL;
AttributeDescription *ad_uid = NULL;
AttributeDescription *ad_description = NULL;
- rc = slap_str2ad( "cn", &ad_cn, &text );
+ rc = slap_str2ad( "cn", &ad_cn, text );
if(rc != LDAP_SUCCESS) return NULL;
- rc = slap_str2ad( "sn", &ad_sn, &text );
+ rc = slap_str2ad( "sn", &ad_sn, text );
if(rc != LDAP_SUCCESS) return NULL;
- rc = slap_str2ad( "uid", &ad_uid, &text );
+ rc = slap_str2ad( "uid", &ad_uid, text );
if(rc != LDAP_SUCCESS) return NULL;
- rc = slap_str2ad( "description", &ad_description, &text );
+ rc = slap_str2ad( "description", &ad_description, text );
if(rc != LDAP_SUCCESS) return NULL;
/*
*/
pwlen = strlen( pw->pw_name );
- val.bv_len = (sizeof("uid=,")-1) + ( pwlen + be->be_suffix[0]->bv_len );
- val.bv_val = ch_malloc( val.bv_len + 1 );
+ 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 );
/* rdn attribute type should be a configuratable item */
- sprintf( val.bv_val, "uid=%s,%s",
- pw->pw_name, be->be_suffix[0]->bv_val );
+ sprintf( vals[0].bv_val, "uid=%s,%s",
+ pw->pw_name, be->be_suffix[0].bv_val );
- rc = dnNormalize2( NULL, &val, &bv );
+ rc = dnNormalize2( NULL, vals, &bv );
if( rc != LDAP_SUCCESS ) {
- free( val.bv_val );
+ free( vals[0].bv_val );
return NULL;
}
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
- e->e_name = val;
+ e->e_name = vals[0];
e->e_nname = bv;
e->e_attrs = NULL;
- vals[0] = &val;
- vals[1] = NULL;
+ vals[1].bv_val = NULL;
/* objectclasses should be configurable items */
- val.bv_val = "top";
- val.bv_len = sizeof("top")-1;
+ vals[0].bv_val = "top";
+ vals[0].bv_len = sizeof("top")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "person";
- val.bv_len = sizeof("person")-1;
+ vals[0].bv_val = "person";
+ vals[0].bv_len = sizeof("person")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "uidObject";
- val.bv_len = sizeof("uidObject")-1;
+ vals[0].bv_val = "uidObject";
+ vals[0].bv_len = sizeof("uidObject")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = pw->pw_name;
- val.bv_len = pwlen;
+ 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 */
if (pw->pw_gecos[0]) {
char *s;
- val.bv_val = pw->pw_gecos;
- val.bv_len = strlen(val.bv_val);
+ vals[0].bv_val = pw->pw_gecos;
+ vals[0].bv_len = strlen(vals[0].bv_val);
attr_merge(e, ad_description, vals);
- s = strchr(val.bv_val, ',');
+ s = strchr(vals[0].bv_val, ',');
if (s) *s = '\0';
- s = strchr(val.bv_val, '&');
+ s = strchr(vals[0].bv_val, '&');
if (s) {
- char buf[256];
- int i = s - val.bv_val;
- strncpy(buf, val.bv_val, i);
- s = buf+i;
- strcpy(s, pw->pw_name);
- *s = TOUPPER(*s);
- strcat(s, val.bv_val+i+1);
- val.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;
+ }
}
- val.bv_len = strlen(val.bv_val);
- if ( strcmp( val.bv_val, pw->pw_name ))
+ vals[0].bv_len = strlen(vals[0].bv_val);
+
+ if ( vals[0].bv_len && strcasecmp( vals[0].bv_val, pw->pw_name )) {
attr_merge( e, ad_cn, vals );
- if ( (s=strrchr(val.bv_val, ' '))) {
- val.bv_val = s + 1;
- val.bv_len = strlen(val.bv_val);
+ }
+
+ 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);
}
}
projects / openldap / blobdiff