move some things around

(This used to be commit a4fc9c3b2dfbdbb3f75bf38415741ff66dbe1367)

1 files changed, 1 insertions, 107 deletions

diff --git a/source3/include/smb.h b/source3/include/smb.h
index a4df0e2697..c7a771b4da 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -585,113 +585,7 @@ typedef struct {
 #define NT_HASH_LEN 16
 #define LM_HASH_LEN 16
 
-/*
- * bit flags representing initialized fields in SAM_ACCOUNT
- */
-enum pdb_elements {
-	PDB_UNINIT,
-	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_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 */
-		
-		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;
+#include "passdb.h"
 
 /*
  * Flags for account policy.