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, 8 insertions, 122 deletions

diff --git a/source3/include/smb.h b/source3/include/smb.h
index bba5d5cd52..4dacf79a13 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -155,6 +155,11 @@ typedef int BOOL;
 
 #include "doserr.h"
 
+typedef union unid_t {
+	uid_t uid;
+	gid_t gid;
+} unid_t;
+
 /*
  * SMB UCS2 (16-bit unicode) internal type.
  */
@@ -260,7 +265,7 @@ enum SID_NAME_USE
  *
  * @sa http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/accctrl_38yn.asp
  **/
-typedef struct DOM_SID
+typedef struct sid_info
 {
   uint8  sid_rev_num;             /**< SID revision number */
   uint8  num_auths;               /**< Number of sub-authorities */
@@ -582,122 +587,6 @@ typedef struct {
 #define LM_HASH_LEN 16
 
 /*
- * bit flags representing initialized fields in SAM_ACCOUNT
- */
-enum pdb_elements {
-	PDB_UNINIT,
-	PDB_UID,
-	PDB_GID,
-	PDB_SMBHOME,
-	PDB_PROFILE,
-	PDB_DRIVE,
-	PDB_LOGONSCRIPT,
-	PDB_LOGONTIME,
-	PDB_LOGOFFTIME,
-	PDB_KICKOFFTIME,
-	PDB_CANCHANGETIME,
-	PDB_MUSTCHANGETIME,
-	PDB_PLAINTEXT_PW,
-	PDB_USERNAME,
-	PDB_FULLNAME,
-	PDB_DOMAIN,
-	PDB_NTUSERNAME,
-	PDB_HOURSLEN,
-	PDB_LOGONDIVS,
-	PDB_USERSID,
-	PDB_GROUPSID,
-	PDB_ACCTCTRL,
-	PDB_PASSLASTSET,
-	PDB_UNIXHOMEDIR,
-	PDB_ACCTDESC,
-	PDB_WORKSTATIONS,
-	PDB_UNKNOWNSTR,
-	PDB_MUNGEDDIAL,
-	PDB_HOURS,
-	PDB_UNKNOWN3,
-	PDB_UNKNOWN5,
-	PDB_UNKNOWN6,
-	PDB_LMPASSWD,
-	PDB_NTPASSWD,
-
-	/* this must be the last element */
-	PDB_COUNT
-};
-
-enum pdb_value_state {
-	PDB_DEFAULT=0,
-	PDB_SET,
-	PDB_CHANGED
-};
-
-#define IS_SAM_UNIX_USER(x) \
-	(( pdb_get_init_flags(x, PDB_UID) != PDB_DEFAULT ) \
-	 && ( pdb_get_init_flags(x,PDB_GID) != PDB_DEFAULT ))
-
-#define IS_SAM_SET(x, flag)	(pdb_get_init_flags(x, flag) == PDB_SET)
-#define IS_SAM_CHANGED(x, flag)	(pdb_get_init_flags(x, flag) == PDB_CHANGED)
-#define IS_SAM_DEFAULT(x, flag)	(pdb_get_init_flags(x, flag) == PDB_DEFAULT)
-		
-typedef struct sam_passwd
-{
-	TALLOC_CTX *mem_ctx;
-	
-	void (*free_fn)(struct sam_passwd **);
-
-	struct pdb_methods *methods;
-
-	struct user_data {
-		/* initiailization flags */
-		struct bitmap *change_flags;
-		struct bitmap *set_flags;
-
-		time_t logon_time;            /* logon time */
-		time_t logoff_time;           /* logoff time */
-		time_t kickoff_time;          /* kickoff time */
-		time_t pass_last_set_time;    /* password last set time */
-		time_t pass_can_change_time;  /* password can change time */
-		time_t pass_must_change_time; /* password must change time */
-		
-		const char * username;     /* UNIX username string */
-		const char * domain;       /* Windows Domain name */
-		const char * nt_username;  /* Windows username string */
-		const char * full_name;    /* user's full name string */
-		const char * unix_home_dir;     /* UNIX home directory string */
-		const char * home_dir;     /* home directory string */
-		const char * dir_drive;    /* home directory drive string */
-		const char * logon_script; /* logon script string */
-		const char * profile_path; /* profile path string */
-		const char * acct_desc  ;  /* user description string */
-		const char * workstations; /* login from workstations string */
-		const char * unknown_str ; /* don't know what this is, yet. */
-		const char * munged_dial ; /* munged path name and dial-back tel number */
-		
-		uid_t uid;          /* this is a unix uid_t */
-		gid_t gid;          /* this is a unix gid_t */
-		DOM_SID user_sid;    /* Primary User SID */
-		DOM_SID group_sid;   /* Primary Group SID */
-		
-		DATA_BLOB lm_pw; /* .data is Null if no password */
-		DATA_BLOB nt_pw; /* .data is Null if no password */
-		char* plaintext_pw; /* is Null if not available */
-		
-		uint16 acct_ctrl; /* account info (ACB_xxxx bit-mask) */
-		uint32 unknown_3; /* 0x00ff ffff */
-		
-		uint16 logon_divs; /* 168 - number of hours in a week */
-		uint32 hours_len; /* normally 21 bytes */
-		uint8 hours[MAX_HOURS_LEN];
-		
-		uint32 unknown_5; /* 0x0002 0000 */
-		uint32 unknown_6; /* 0x0000 04ec */
-	} private;
-
-	/* Lets see if the remaining code can get the hint that you
-	   are meant to use the pdb_...() functions. */
-	
-} SAM_ACCOUNT;
-
-/*
  * Flags for account policy.
  */
 #define AP_MIN_PASSWORD_LEN 		1
@@ -1628,11 +1517,6 @@ struct pwd_info
 	uchar sess_key[16];
 };
 
-#include "rpc_creds.h"
-#include "rpc_misc.h"
-#include "rpc_secdes.h"
-#include "nt_printing.h"
-
 typedef struct user_struct
 {
 	struct user_struct *next, *prev;
@@ -1672,9 +1556,11 @@ struct unix_error_map {
 	NTSTATUS nt_error;
 };
 
+/*
 #include "ntdomain.h"
 
 #include "client.h"
+*/
 
 /*
  * Size of new password account encoding string.  This is enough space to