added in some pdb_xxx routines that are needed by nispass.c

(This used to be commit 5212dd69d05a0d26dddcb4a0d9efca195436bfda)

2 files changed, 21 insertions, 12 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1c09d627db..eac1093450 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -482,7 +482,7 @@ void SamOEMhash( unsigned char *data, unsigned char *key, int val);
 void SMBencrypt(uchar *passwd, uchar *c8, uchar *p24);
 void E_md4hash(uchar *passwd, uchar *p16);
 void nt_lm_owf_gen(char *pwd, uchar nt_p16[16], uchar p16[16]);
-void SMBOWFencrypt(uchar passwd[16], uchar *c8, uchar p24[24]);
+void SMBOWFencrypt(uchar passwd[16], char *c8, uchar p24[24]);
 void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24);
 
 /*The following definitions come from  libsmb/smberr.c  */
@@ -1131,6 +1131,14 @@ struct sam_disp_info *pdb_sam_to_dispinfo(struct sam_passwd *user);
 struct smb_passwd *pdb_sam_to_smb(struct sam_passwd *user);
 char *pdb_encode_acct_ctrl(uint16 acct_ctrl, size_t length);
 uint16 pdb_decode_acct_ctrl(char *p);
+time_t pdb_get_last_set_time(char *p);
+void pdb_set_logon_time(char *p, int max_len, time_t t);
+void pdb_set_logoff_time(char *p, int max_len, time_t t);
+void pdb_set_kickoff_time(char *p, int max_len, time_t t);
+void pdb_set_can_change_time(char *p, int max_len, time_t t);
+void pdb_set_must_change_time(char *p, int max_len, time_t t);
+void pdb_set_last_set_time(char *p, int max_len, time_t t);
+void pdb_sethexpwd(char *p, char *pwd, uint16 acct_ctrl);
 BOOL pdb_gethexpwd(char *p, char *pwd);
 BOOL pdb_name_to_rid(char *user_name, uint32 *u_rid, uint32 *g_rid);
 BOOL pdb_generate_machine_sid(void);
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 8bcc4a1338..ff87ed1bfb 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -168,17 +168,18 @@ typedef struct lsa_r_close_info
 /* DOM_R_REF */
 typedef struct dom_ref_info
 {
-    uint32 undoc_buffer; /* undocumented buffer pointer. */
-    uint32 num_ref_doms_1; /* num referenced domains? */
-    uint32 buffer_dom_name; /* undocumented domain name buffer pointer. */
-    uint32 max_entries; /* 32 - max number of entries */
-    uint32 num_ref_doms_2; /* 4 - num referenced domains? */
+	uint32 undoc_buffer; /* undocumented buffer pointer. */
+	uint32 num_ref_doms_1; /* num referenced domains */
+	uint32 buffer_dom_name; /* undocumented domain name buffer pointer. */
+	uint32 max_entries; /* 32 - max number of entries */
+	uint32 num_ref_doms_2; /* num referenced domains */
 
-    UNIHDR2 hdr_dom_name; /* domain name unicode string header */
-    UNIHDR2 hdr_ref_dom[MAX_REF_DOMAINS]; /* referenced domain unicode string headers */
 
-    UNISTR uni_dom_name; /* domain name unicode string */
-    DOM_SID2 ref_dom[MAX_REF_DOMAINS]; /* referenced domain SIDs */
+	UNIHDR2 hdr_dom_name; /* domain name unicode string header */
+	UNIHDR2 hdr_ref_dom[MAX_REF_DOMAINS]; /* referenced domain unicode string headers */
+
+	UNISTR uni_dom_name; /* domain name unicode string */
+	DOM_SID2 ref_dom[MAX_REF_DOMAINS]; /* referenced domain SIDs */
 
 } DOM_R_REF;
 
@@ -223,7 +224,7 @@ typedef struct lsa_sid_enum_info
 /* LSA_Q_LOOKUP_SIDS - LSA Lookup SIDs */
 typedef struct lsa_q_lookup_sids
 {
-    POLICY_HND          pol_hnd; /* policy handle */
+	POLICY_HND          pol_hnd; /* policy handle */
 	LSA_SID_ENUM        sids;
 	LSA_TRANS_NAME_ENUM names;
 	LOOKUP_LEVEL        level;
@@ -234,7 +235,7 @@ typedef struct lsa_q_lookup_sids
 /* LSA_R_LOOKUP_SIDS - response to LSA Lookup SIDs */
 typedef struct lsa_r_lookup_sids
 {
-    DOM_R_REF           *dom_ref; /* domain reference info */
+	DOM_R_REF           *dom_ref; /* domain reference info */
 	LSA_TRANS_NAME_ENUM *names;
 	uint32              mapped_count;