git.samba.org
/
obnox
/
samba-ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b4c199
)
Revert "idmap: Remove passd check from idmap_backends_unixid_to_sid()."
author
Volker Lendecke
<vl@samba.org>
Fri, 2 Jan 2009 14:01:47 +0000
(15:01 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Mon, 5 Jan 2009 10:10:14 +0000
(11:10 +0100)
This reverts commit
3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b
.
(cherry picked from commit
860da910633415d1a3c850ed977a6635d28a7bf2
)
source/winbindd/idmap.c
patch
|
blob
|
history
diff --git
a/source/winbindd/idmap.c
b/source/winbindd/idmap.c
index 6be55ef03c63235296a2c6abbb9addf722c6781c..38cc0d0c0abdeb36df77c2249ffe5c9bd85ea824 100644
(file)
--- a/
source/winbindd/idmap.c
+++ b/
source/winbindd/idmap.c
@@
-735,6
+735,15
@@
NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id)
maps[0] = id;
maps[1] = NULL;
+ if (sid_check_is_in_builtin(id->sid)
+ || (sid_check_is_in_our_domain(id->sid))) {
+ dom = idmap_init_passdb_domain(NULL);
+ if (dom == NULL) {
+ return NT_STATUS_NONE_MAPPED;
+ }
+ return dom->methods->unixids_to_sids(dom, maps);
+ }
+
dom = idmap_find_domain(domname);
if (dom == NULL) {
return NT_STATUS_NONE_MAPPED;