From ee4a33a4fff1ba86f353d72970fe990774dee893 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 18 Dec 2018 15:53:48 +0100 Subject: [PATCH] idmap: In _wbint_Sids2UnixIDs, pass back what we have SOME_UNMAPPED does not mean that nothing worthwhile is in here. We need to pass what we have. Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Tue Jan 8 13:15:35 CET 2019 on sn-devel-144 --- selftest/knownfail.d/samba3.wbinfo_sids_to_xids | 1 - source3/winbindd/winbindd_dual_srv.c | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 selftest/knownfail.d/samba3.wbinfo_sids_to_xids diff --git a/selftest/knownfail.d/samba3.wbinfo_sids_to_xids b/selftest/knownfail.d/samba3.wbinfo_sids_to_xids deleted file mode 100644 index 26c61e361a7..00000000000 --- a/selftest/knownfail.d/samba3.wbinfo_sids_to_xids +++ /dev/null @@ -1 +0,0 @@ -^samba3.wbinfo_sids_to_xids.wbinfo.some.mapped diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index 62224bf313e..ab14f5d51a0 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -204,6 +204,15 @@ NTSTATUS _wbint_Sids2UnixIDs(struct pipes_struct *p, status = dom->methods->sids_to_unixids(dom, id_map_ptrs); + if (NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) { + /* + * This is okay. We need to transfer the mapped ones + * up to our caller. The individual mappings carry the + * information whether they are mapped or not. + */ + status = NT_STATUS_OK; + } + if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("sids_to_unixids returned %s\n", nt_errstr(status))); -- 2.34.1