diff options
| author | Volker Lendecke <vl@samba.org> | 2008-07-13 12:07:40 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-08-12 11:28:29 +0200 |
| commit | 340ab6a256802a22c11b7f707748397249075b65 (patch) | |
| tree | 20d297829eb3e27c6c80ad537712627ae845a4ef /source3/winbindd/idmap_rid.c | |
| parent | 8d4bd2d960ebf11bc85891210c6f72a371e08417 (diff) | |
| download | samba-340ab6a256802a22c11b7f707748397249075b65.tar.gz samba-340ab6a256802a22c11b7f707748397249075b65.tar.bz2 samba-340ab6a256802a22c11b7f707748397249075b65.zip | |
idmap rewrite
(This used to be commit 30a180f2fce8cf6a3e5548f6bba453272ba70b33)
Diffstat (limited to 'source3/winbindd/idmap_rid.c')
| -rw-r--r-- | source3/winbindd/idmap_rid.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/source3/winbindd/idmap_rid.c b/source3/winbindd/idmap_rid.c index f1cd77853c..9d1898708c 100644 --- a/source3/winbindd/idmap_rid.c +++ b/source3/winbindd/idmap_rid.c @@ -36,7 +36,8 @@ struct idmap_rid_context { we support multiple domains in the new idmap *****************************************************************************/ -static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom) +static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom, + const char *params) { NTSTATUS ret; struct idmap_rid_context *ctx; @@ -95,7 +96,6 @@ static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom) ctx->domain_name = talloc_strdup( ctx, dom->name ); dom->private_data = ctx; - dom->initialized = True; talloc_free(config_option); return NT_STATUS_OK; @@ -171,14 +171,6 @@ static NTSTATUS idmap_rid_unixids_to_sids(struct idmap_domain *dom, struct id_ma NTSTATUS ret; int i; - /* Initilization my have been deferred because of an error, retry or fail */ - if ( ! dom->initialized) { - ret = idmap_rid_initialize(dom); - if ( ! NT_STATUS_IS_OK(ret)) { - return ret; - } - } - ridctx = talloc_get_type(dom->private_data, struct idmap_rid_context); ctx = talloc_new(dom); @@ -213,14 +205,6 @@ static NTSTATUS idmap_rid_sids_to_unixids(struct idmap_domain *dom, struct id_ma NTSTATUS ret; int i; - /* Initilization my have been deferred because of an error, retry or fail */ - if ( ! dom->initialized) { - ret = idmap_rid_initialize(dom); - if ( ! NT_STATUS_IS_OK(ret)) { - return ret; - } - } - ridctx = talloc_get_type(dom->private_data, struct idmap_rid_context); ctx = talloc_new(dom); |