summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-11-30 16:27:59 +0100
committerStefan Metzmacher <metze@samba.org>2012-12-03 08:48:29 +0100
commit2d3f7e31411cc63d5c83337f7280fcd6d2330282 (patch)
treecad510fda269dd90c7f78fc905661ba290c2e3b4
parent845a14210729c6a4c39a65be00e2f8b19fc13ec0 (diff)
downloadsamba-2d3f7e31411cc63d5c83337f7280fcd6d2330282.tar.gz
samba-2d3f7e31411cc63d5c83337f7280fcd6d2330282.tar.bz2
samba-2d3f7e31411cc63d5c83337f7280fcd6d2330282.zip
s3:winbindd: use the new sid_check_is_for_passdb() in idmap_find_domain_with_sid()
This is more correct than the original one: It also hands the wellknown and "Unix Users" and "Unix Groups" sids to passdb for id mapping. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/winbindd/idmap.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index ae4fb2b246..d5eeac659c 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -24,7 +24,7 @@
#include "includes.h"
#include "winbindd.h"
#include "idmap.h"
-#include "passdb/machine_sid.h"
+#include "lib/util_sid_passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
@@ -427,11 +427,7 @@ struct idmap_domain *idmap_find_domain_with_sid(const char *domname,
{
idmap_init();
- if (sid_check_is_in_builtin(sid) ||
- sid_check_is_builtin(sid) ||
- sid_check_is_in_our_sam(sid) ||
- sid_check_is_our_sam(sid))
- {
+ if (sid_check_is_for_passdb(sid)) {
return idmap_passdb_domain(NULL);
}