From 57c21f4a80371d09288266cf797773a3f0fbd0b9 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 19 Jul 2006 19:40:46 +0000
Subject: [PATCH] r17145: revert a greedy merge from SAMBA_3_0

---
 source/sam/idmap_ad.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/sam/idmap_ad.c b/source/sam/idmap_ad.c
index 2f93dd083bc..4d033e8f3e1 100644
--- a/source/sam/idmap_ad.c
+++ b/source/sam/idmap_ad.c
@@ -144,7 +144,7 @@ static NTSTATUS ad_idmap_init(const char *uri)
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ad_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, enum idmap_type id_type, int flags)
+static NTSTATUS ad_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, int id_type, int flags)
 {
 	ADS_STATUS rc;
 	NTSTATUS status = NT_STATUS_NONE_MAPPED;
@@ -166,7 +166,7 @@ static NTSTATUS ad_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, enum idmap_t
 		return NT_STATUS_NOT_SUPPORTED;
 	}
 
-	switch (id_type) {
+	switch (id_type & ID_TYPEMASK) {
 		case ID_USERID:
 			if (asprintf(&expr, "(&(|(sAMAccountType=%d)(sAMAccountType=%d)(sAMAccountType=%d))(%s=%d))",
 				ATYPE_NORMAL_ACCOUNT, ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST,
@@ -226,7 +226,7 @@ done:
 	return status;
 }
 
-static NTSTATUS ad_idmap_get_id_from_sid(unid_t *unid, enum idmap_type *id_type, const DOM_SID *sid, int flags)
+static NTSTATUS ad_idmap_get_id_from_sid(unid_t *unid, int *id_type, const DOM_SID *sid)
 {
 	ADS_STATUS rc;
 	NTSTATUS status = NT_STATUS_NONE_MAPPED;
@@ -326,7 +326,7 @@ done:
 
 }
 
-static NTSTATUS ad_idmap_set_mapping(const DOM_SID *sid, unid_t id, enum idmap_type id_type)
+static NTSTATUS ad_idmap_set_mapping(const DOM_SID *sid, unid_t id, int id_type)
 {
 	/* Not supported, and probably won't be... */
 	/* (It's not particularly feasible with a single-master model.) */
@@ -351,7 +351,7 @@ static NTSTATUS ad_idmap_close(void)
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ad_idmap_allocate_id(unid_t *id, enum idmap_type id_type)
+static NTSTATUS ad_idmap_allocate_id(unid_t *id, int id_type)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
@@ -373,7 +373,7 @@ static struct idmap_methods ad_methods = {
 
 
 /* support for new authentication subsystem */
-NTSTATUS idmap_ad_init(void)
+NTSTATUS init_module(void)
 {
 	return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "ad", &ad_methods);
 }
-- 
2.11.4.GIT