svn commit: samba r16817 - in trunk/source/sam: .

[gd at samba.org]

Author: gd
Date: 2006-07-05 11:43:49 +0000 (Wed, 05 Jul 2006)
New Revision: 16817

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16817

Log:
Fixing build of idmap_ad and idmap_rid.

Guenther

Modified:
   trunk/source/sam/idmap_ad.c
   trunk/source/sam/idmap_rid.c


Changeset:
Modified: trunk/source/sam/idmap_ad.c
===================================================================
--- trunk/source/sam/idmap_ad.c	2006-07-05 09:10:56 UTC (rev 16816)
+++ trunk/source/sam/idmap_ad.c	2006-07-05 11:43:49 UTC (rev 16817)
@@ -139,7 +139,7 @@
 	return ads;
 }
 
-static NTSTATUS ad_idmap_init(char *uri)
+static NTSTATUS ad_idmap_init(const char *uri)
 {
 	ad_idmap_uri = SMB_STRDUP(uri);
 	if (ad_idmap_uri == NULL) {
@@ -149,7 +149,7 @@
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS ad_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, int id_type)
+static NTSTATUS ad_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, enum idmap_type id_type, int flags)
 {
 	ADS_STATUS rc;
 	NTSTATUS status = NT_STATUS_NONE_MAPPED;
@@ -171,7 +171,7 @@
 		return NT_STATUS_NOT_SUPPORTED;
 	}
 
-	switch (id_type & ID_TYPEMASK) {
+	switch (id_type) {
 		case ID_USERID:
 			if (asprintf(&expr, "(&(|(sAMAccountType=%d)(sAMAccountType=%d)(sAMAccountType=%d))(%s=%d))",
 				ATYPE_NORMAL_ACCOUNT, ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST,
@@ -231,7 +231,7 @@
 	return status;
 }
 
-static NTSTATUS ad_idmap_get_id_from_sid(unid_t *unid, int *id_type, const DOM_SID *sid)
+static NTSTATUS ad_idmap_get_id_from_sid(unid_t *unid, enum idmap_type *id_type, const DOM_SID *sid, int flags)
 {
 	ADS_STATUS rc;
 	NTSTATUS status = NT_STATUS_NONE_MAPPED;
@@ -331,7 +331,7 @@
 
 }
 
-static NTSTATUS ad_idmap_set_mapping(const DOM_SID *sid, unid_t id, int id_type)
+static NTSTATUS ad_idmap_set_mapping(const DOM_SID *sid, unid_t id, enum idmap_type id_type)
 {
 	/* Not supported, and probably won't be... */
 	/* (It's not particularly feasible with a single-master model.) */

Modified: trunk/source/sam/idmap_rid.c
===================================================================
--- trunk/source/sam/idmap_rid.c	2006-07-05 09:10:56 UTC (rev 16816)
+++ trunk/source/sam/idmap_rid.c	2006-07-05 11:43:49 UTC (rev 16817)
@@ -334,7 +334,7 @@
 	return status;
 }
 
-static NTSTATUS rid_idmap_init(char *init_param)
+static NTSTATUS rid_idmap_init(const char *init_param)
 {
 	int i, j;
 	uid_t u_low, u_high;
@@ -432,7 +432,8 @@
 	return nt_status;
 }
 
-static NTSTATUS rid_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, int id_type)
+static NTSTATUS rid_idmap_get_sid_from_id(DOM_SID *sid, unid_t unid, enum idmap_type id_type, int flags)
+
 {
 	fstring sid_string;
 	int i;
@@ -469,7 +470,7 @@
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS rid_idmap_get_id_from_sid(unid_t *unid, int *id_type, const DOM_SID *sid)
+static NTSTATUS rid_idmap_get_id_from_sid(unid_t *unid, enum idmap_type *id_type, const DOM_SID *sid, int flags)
 {
 	fstring sid_string;
 	int i;
@@ -521,7 +522,7 @@
 
 }
 
-static NTSTATUS rid_idmap_set_mapping(const DOM_SID *sid, unid_t id, int id_type)
+static NTSTATUS rid_idmap_set_mapping(const DOM_SID *sid, unid_t id, enum idmap_type id_type)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }