Author: jerry Date: 2006-07-19 19:40:46 +0000 (Wed, 19 Jul 2006) New Revision: 17145
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17145 Log: revert a greedy merge from SAMBA_3_0 Modified: branches/SAMBA_3_0_RELEASE/source/sam/idmap_ad.c Changeset: Modified: branches/SAMBA_3_0_RELEASE/source/sam/idmap_ad.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/sam/idmap_ad.c 2006-07-19 19:38:47 UTC (rev 17144) +++ branches/SAMBA_3_0_RELEASE/source/sam/idmap_ad.c 2006-07-19 19:40:46 UTC (rev 17145) @@ -144,7 +144,7 @@ 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 @@ 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 @@ 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 @@ } -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 @@ 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 @@ /* 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); }