sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r25059: Apply to 3.2 as well

Browse Source 
(This used to be commit 17a7d33b3b)
This commit is contained in:
Simo Sorce 2007-09-10 16:21:55 +00:00 committed by Gerald (Jerry) Carter
parent df04cb69f7
commit 3f8e1f9ad2
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/nsswitch/idmap_ldap.c
View File

@ -287,16 +287,9 @@ static NTSTATUS idmap_ldap_alloc_init(const char *params)
}
CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
tmp = lp_ldap_idmap_suffix();
tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
if ( ! tmp || ! *tmp) {
tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
}
if ( ! tmp) {
tmp = lp_ldap_suffix();
if (tmp) {
DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
}
tmp = lp_ldap_idmap_suffix();
if ( ! tmp) {
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
ret = NT_STATUS_UNSUCCESSFUL;
@ -781,21 +774,16 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
}
CHECK_ALLOC_DONE(ctx->url);
tmp = lp_ldap_idmap_suffix();
if ( ! tmp || ! *tmp) {
tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
}
if ( ! tmp) {
tmp = lp_ldap_suffix();
if (tmp) {
DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
} else {
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
ret = NT_STATUS_UNSUCCESSFUL;
goto done;
tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
if ( ! tmp || ! *tmp) {
tmp = lp_ldap_idmap_suffix();
if ( ! tmp) {
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
ret = NT_STATUS_UNSUCCESSFUL;
goto done;
}
}
}
ctx->suffix = talloc_strdup(ctx, tmp);
CHECK_ALLOC_DONE(ctx->suffix);