added extra fields to struct smb_passwd

[kai/samba.git] / source / include / smb.h

diff --git a/source/include/smb.h b/source/include/smb.h
index 8b7ad6ea92cb790494f51151c0471018f99be5bf..11e7409a9a80565b4da3516b18d76d5a18c4dd18 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -272,17 +272,47 @@ typedef struct nttime_info
 #define ACB_PWNOEXP    0x0200  /* 1 = User password does not expire */
 #define ACB_AUTOLOCK   0x0400  /* 1 = Account auto locked */
  
+#define MAX_HOURS_LEN 32
+
 struct smb_passwd
 {
-  int smb_userid;
-  char *smb_name;
-  unsigned char *smb_passwd; /* Null if no password */
-  unsigned char *smb_nt_passwd; /* Null if no password */
-  /* Other fields / flags may be added later */
-  uint16 acct_ctrl;
-  time_t last_change_time;
+       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 */
+
+       char *smb_name;     /* username unicode string */
+       char *full_name;    /* user's full name unicode string */
+       char *home_dir;     /* home directory unicode string */
+       char *dir_drive;    /* home directory drive unicode string */
+       char *logon_script; /* logon script unicode string */
+       char *profile_path; /* profile path unicode string */
+       char *acct_desc  ;  /* user description unicode string */
+       char *workstations; /* login from workstations unicode string */
+       char *unknown_str ; /* don't know what this is, yet. */
+       char *munged_dial ; /* munged path name and dial-back tel number */
+
+       int smb_userid;       /* this is actually the unix uid_t */
+       uint32 user_rid;      /* Primary User ID */
+       uint32 group_rid;     /* Primary Group ID */
+
+       unsigned char *smb_passwd; /* Null if no password */
+       unsigned char *smb_nt_passwd; /* Null if no password */
+
+       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 */
 };
 
+
 /* DOM_CHAL - challenge info */
 typedef struct chal_info
 {
@@ -895,6 +925,31 @@ struct parm_struct
 #define smb_droff smb_vwv7
 #define smb_drdisp smb_vwv8
 
+/* these are for the NT trans primary request. */
+#define smb_nt_MaxSetupCount smb_vwv0
+#define smb_nt_Flags (smb_vwv0 + 1)
+#define smb_nt_TotalParameterCount (smb_vwv0 + 3)
+#define smb_nt_TotalDataCount (smb_vwv0 + 7)
+#define smb_nt_MaxParameterCount (smb_vwv0 + 11)
+#define smb_nt_MaxDataCount (smb_vwv0 + 15)
+#define smb_nt_ParameterCount (smb_vwv0 + 19)
+#define smb_nt_ParameterOffset (smb_vwv0 + 23)
+#define smb_nt_DataCount (smb_vwv0 + 27)
+#define smb_nt_DataOffset (smb_vwv0 + 31)
+#define smb_nt_SetupCount (smb_vwv0 + 35)
+#define smb_nt_Function (smb_vwv0 + 36)
+#define smb_nt_SetupStart (smb_vwv0 + 39)
+
+/* these are for the NT trans secondary request. */
+#define smb_nts_TotalParameterCount (smb_vwv0 + 3)
+#define smb_nts_TotalDataCount (smb_vwv0 + 7)
+#define smb_nts_ParameterCount (smb_vwv0 + 11)
+#define smb_nts_ParameterOffset (smb_vwv0 + 15)
+#define smb_nts_ParameterDisplacement (smb_vwv0 + 19)
+#define smb_nts_DataCount (smb_vwv0 + 23)
+#define smb_nts_DataOffset (smb_vwv0 + 27)
+#define smb_nts_DataDisplacement (smb_vwv0 + 31)
+
 /* where to find the base of the SMB packet proper */
 #define smb_base(buf) (((char *)(buf))+4)