And finally IDMAP in 3_0

We really need idmap_ldap to have a good solution with ldapsam, porting
it from the prvious code is beeing made, the code is really simple to do
so I am confident it is not a problem to commit this code in.

Not committing it would have been worst.
I really would have been able to finish also the group code, maybe we can
put it into a followin release after 3.0.0 even if it may be an upgrade
problem.

The code has been tested and seem to work right, more testing is needed for
corner cases.

Currently winbind pdc (working only for users and not for groups) is
disabled as I was not able to make a complete group code replacement that
works somewhat in a week (I have a complete patch, but there are bugs)

Simo.
(This used to be commit 0e58085978f984436815114a2ec347cf7899a89d)

1 files changed, 3 insertions, 9 deletions

diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 47114f5469..5d8e31a163 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -32,21 +32,15 @@
 #define ID_NOMAP	0x10
 #define ID_CACHE	0x20
 
-typedef union unid_t {
-	uid_t uid;
-	gid_t gid;
-} unid_t;
-
-struct DOM_SID;
 /* Filled out by IDMAP backends */
 struct idmap_methods {
 
 	/* Called when backend is first loaded */
 	NTSTATUS (*init)(void);
 
-	NTSTATUS (*get_sid_from_id)(struct DOM_SID *sid, unid_t id, int id_type);
-	NTSTATUS (*get_id_from_sid)(unid_t *id, int *id_type, const struct DOM_SID *sid);
-	NTSTATUS (*set_mapping)(const struct DOM_SID *sid, unid_t id, int id_type);
+	NTSTATUS (*get_sid_from_id)(DOM_SID *sid, unid_t id, int id_type);
+	NTSTATUS (*get_id_from_sid)(unid_t *id, int *id_type, const DOM_SID *sid);
+	NTSTATUS (*set_mapping)(const DOM_SID *sid, unid_t id, int id_type);
 
 	/* Called when backend is unloaded */
 	NTSTATUS (*close)(void);