diff options
author | Jeremy Allison <jra@samba.org> | 1998-09-28 21:43:48 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1998-09-28 21:43:48 +0000 |
commit | cf3a9741dc7427efb97eff09a3c197a906ce6767 (patch) | |
tree | a5ca09216db91089dd5c2be34751733c4dbff2be /source3/include | |
parent | cdaa53e3ef7e9bbb7dedaa82d54f730085b9250c (diff) | |
download | samba-cf3a9741dc7427efb97eff09a3c197a906ce6767.tar.gz samba-cf3a9741dc7427efb97eff09a3c197a906ce6767.tar.bz2 samba-cf3a9741dc7427efb97eff09a3c197a906ce6767.zip |
Changes to test in configure if capabilities are enabled on a system.
Changes to get Samba to compile cleanly with the IRIX compiler
with the options : -fullwarn -woff 1209,1174 (the -woff options
are to turn off warnings about unused function parameters and
controlling loop expressions being constants).
Split prototype generation as we hit a limit in IRIX nawk.
Removed "." code in smbd/filename.c (yet again :-).
Jeremy.
(This used to be commit e0567433bd72aec17bf5a54cc292701095d25f09)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/client.h | 30 | ||||
-rw-r--r-- | source3/include/proto.h | 14 | ||||
-rw-r--r-- | source3/include/smb.h | 32 |
3 files changed, 37 insertions, 39 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 6d0be057ae..dde377f484 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -28,6 +28,34 @@ * These definitions depend on smb.h */ +typedef struct +{ + SMB_OFF_T size; + int mode; + uid_t uid; + gid_t gid; + /* these times are normally kept in GMT */ + time_t mtime; + time_t atime; + time_t ctime; + pstring name; +} file_info; + +struct pwd_info +{ + BOOL null_pwd; + BOOL cleartext; + BOOL crypted; + + fstring password; + + uchar smb_lm_pwd[16]; + uchar smb_nt_pwd[16]; + + uchar smb_lm_owf[24]; + uchar smb_nt_owf[24]; +}; + struct cli_state { int fd; int cnum; @@ -52,7 +80,7 @@ struct cli_state { struct in_addr dest_ip; struct pwd_info pwd; - char cryptkey[8]; + unsigned char cryptkey[8]; uint32 sesskey; int serverzone; uint32 servertime; diff --git a/source3/include/proto.h b/source3/include/proto.h index c1397884b7..1c09d627db 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -135,7 +135,7 @@ int get_netmask(struct in_addr *ipaddr, struct in_addr *nmask); /*The following definitions come from lib/pidfile.c */ -int pidfile_pid(char *name); +pid_t pidfile_pid(char *name); void pidfile_create(char *name); /*The following definitions come from lib/replace.c */ @@ -460,11 +460,11 @@ void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); void pwd_set_nullpwd(struct pwd_info *pwd); void pwd_set_cleartext(struct pwd_info *pwd, char *clr); void pwd_get_cleartext(struct pwd_info *pwd, char *clr); -void pwd_set_lm_nt_16(struct pwd_info *pwd, char lm_pwd[16], char nt_pwd[16]); -void pwd_get_lm_nt_16(struct pwd_info *pwd, char lm_pwd[16], char nt_pwd[16]); +void pwd_set_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); +void pwd_get_lm_nt_16(struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); -void pwd_make_lm_nt_owf(struct pwd_info *pwd, char cryptkey[8]); -void pwd_get_lm_nt_owf(struct pwd_info *pwd, char lm_owf[24], char nt_owf[24]); +void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8]); +void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], uchar nt_owf[24]); /*The following definitions come from libsmb/smbdes.c */ @@ -2023,7 +2023,7 @@ void check_kernel_oplocks(void); /*The following definitions come from smbd/password.c */ void generate_next_challenge(char *challenge); -BOOL set_challenge(char *challenge); +BOOL set_challenge(unsigned char *challenge); user_struct *get_valid_user_struct(uint16 vuid); void invalidate_vuid(uint16 vuid); char *validated_username(uint16 vuid); @@ -2210,7 +2210,7 @@ void start_smbd(void); void start_nmbd(void); void stop_smbd(void); void stop_nmbd(void); -void kill_pid(int pid); +void kill_pid(pid_t pid); /*The following definitions come from web/statuspage.c */ diff --git a/source3/include/smb.h b/source3/include/smb.h index e1baac8f6f..f42951ec59 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -403,36 +403,6 @@ typedef struct cred_info UTIME timestamp; /* credential time-stamp */ } DOM_CRED; -struct pwd_info -{ - BOOL null_pwd; - BOOL cleartext; - BOOL crypted; - - fstring password; - - uchar smb_lm_pwd[16]; - uchar smb_nt_pwd[16]; - - uchar smb_lm_owf[24]; - uchar smb_nt_owf[24]; -}; - -typedef struct -{ - SMB_OFF_T size; - int mode; - uid_t uid; - gid_t gid; - /* these times are normally kept in GMT */ - time_t mtime; - time_t atime; - time_t ctime; - pstring name; - -} file_info; - - /* Structure used when SMBwritebmpx is active */ typedef struct { @@ -538,7 +508,7 @@ typedef struct files_struct file_fd_struct *fd_ptr; SMB_OFF_T pos; SMB_OFF_T size; - int mode; + mode_t mode; int vuid; char *mmap_ptr; SMB_OFF_T mmap_size; |