diff options
| author | Michael Adam <obnox@samba.org> | 2011-03-02 17:04:59 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-03-22 22:49:56 +0100 |
| commit | 7511f080b459a5477362eeb6a326ed73e38a1b11 (patch) | |
| tree | 0bf3a5457ca2561740220d355a388a1d4896f473 | |
| parent | 0a3627d24987efcd99ec5f7808e0d1f15e51c774 (diff) | |
| download | samba-7511f080b459a5477362eeb6a326ed73e38a1b11.tar.gz samba-7511f080b459a5477362eeb6a326ed73e38a1b11.tar.bz2 samba-7511f080b459a5477362eeb6a326ed73e38a1b11.zip | |
s3:idmap: remove use of params from idmap_ldap_init - it is not used any more
| -rw-r--r-- | source3/winbindd/idmap_ldap.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index aaac75f101..eb3e67de82 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -461,21 +461,15 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom, } } - if (params != NULL) { - /* assume location is the only parameter */ - ctx->url = talloc_strdup(ctx, params); - } else { - tmp = lp_parm_const_string(-1, config_option, "ldap_url", NULL); + tmp = lp_parm_const_string(-1, config_option, "ldap_url", NULL); - if ( ! tmp) { - DEBUG(1, ("ERROR: missing idmap ldap url\n")); - ret = NT_STATUS_UNSUCCESSFUL; - goto done; - } - - ctx->url = talloc_strdup(ctx, tmp); + if ( ! tmp) { + DEBUG(1, ("ERROR: missing idmap ldap url\n")); + ret = NT_STATUS_UNSUCCESSFUL; + goto done; } - CHECK_ALLOC_DONE(ctx->url); + + ctx->url = talloc_strdup(ctx, tmp); trim_char(ctx->url, '\"', '\"'); |