diff options
| author | Michael Adam <obnox@samba.org> | 2010-06-23 12:02:31 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2010-08-14 02:10:57 +0200 |
| commit | a739cb59445f069594f01f38a6e3c7eedccd4dcc (patch) | |
| tree | e0f9764e9fef2ca4a4798f314daef4f0337c698e | |
| parent | a7ba9064d6e5446cb3d0a8d773c8f31b95667134 (diff) | |
| download | samba-a739cb59445f069594f01f38a6e3c7eedccd4dcc.tar.gz samba-a739cb59445f069594f01f38a6e3c7eedccd4dcc.tar.bz2 samba-a739cb59445f069594f01f38a6e3c7eedccd4dcc.zip | |
s3:idmap_ldap: use idmap_rw_new_mapping in idmap_ldap_new_mapping
| -rw-r--r-- | source3/winbindd/idmap_ldap.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index 3223e7d223..51915002b5 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -770,43 +770,12 @@ done: static NTSTATUS idmap_ldap_new_mapping(struct idmap_domain *dom, struct id_map *map) { NTSTATUS ret; + struct idmap_ldap_context *ctx; - if (map == NULL) { - ret = NT_STATUS_INVALID_PARAMETER; - goto done; - } - - if ((map->xid.type != ID_TYPE_UID) && (map->xid.type != ID_TYPE_GID)) { - ret = NT_STATUS_INVALID_PARAMETER; - goto done; - } - - if (map->sid == NULL) { - ret = NT_STATUS_INVALID_PARAMETER; - goto done; - } - - ret = idmap_ldap_get_new_id(dom, &map->xid); - if (!NT_STATUS_IS_OK(ret)) { - DEBUG(3, ("Could not allocate id: %s\n", nt_errstr(ret))); - goto done; - } - - DEBUG(10, ("Setting mapping: %s <-> %s %lu\n", - sid_string_dbg(map->sid), - (map->xid.type == ID_TYPE_UID) ? "UID" : "GID", - (unsigned long)map->xid.id)); - - map->status = ID_MAPPED; + ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context); - /* store the mapping */ - ret = idmap_ldap_set_mapping(dom, map); - if (!NT_STATUS_IS_OK(ret)) { - DEBUG(3, ("Could not store the new mapping: %s\n", - nt_errstr(ret))); - } + ret = idmap_rw_new_mapping(dom, ctx->rw_ops, map); -done: return ret; } |