From 9f57f01b144b030274cc5d116b864b3c27f251ef Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 8 May 1998 16:59:30 +0000 Subject: clitar.c: #ifdef'ed out all the bits that were giving 'defined but not used' messages. nttrans.c: More updates. smb.h: Removed stuff that didn't belong in the smb_passwd struct. Persuaded Luke to use a new structure. web/swat.c: Fixed gcc complaints about shadowing global 'string'. Jeremy. (This used to be commit 61c1dbb9785ed1e6fe40f93c7cc65024884df6f5) --- source3/include/smb.h | 45 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) (limited to 'source3/include/smb.h') diff --git a/source3/include/smb.h b/source3/include/smb.h index 542545147b..23335e190a 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -272,45 +272,14 @@ 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 { - 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 */ - int smb_grpid; /* this is actually the unix gid_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 */ + char *smb_name; /* username */ + int smb_userid; /* this is actually the unix uid_t */ + 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) */ + time_t pass_last_set_time; /* password last set time */ }; @@ -324,7 +293,6 @@ typedef struct chal_info typedef struct time_info { uint32 time; - } UTIME; /* DOM_CREDs - timestamped client or server credentials */ @@ -332,7 +300,6 @@ typedef struct cred_info { DOM_CHAL challenge; /* credentials */ UTIME timestamp; /* credential time-stamp */ - } DOM_CRED; struct cli_state { -- cgit