diff options
| author | Jeremy Allison <jra@samba.org> | 1997-10-06 17:52:25 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-10-06 17:52:25 +0000 |
| commit | 2e92be3aaf01c574d32d1a10e1359888638b68bc (patch) | |
| tree | 5280182dda3e36282bd11699e022e015ad531bdc /source3/include | |
| parent | 8429cec72ff15efdd5ab742ba71ede36db43ef14 (diff) | |
| download | samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.gz samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.bz2 samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.zip | |
client.c: Changed shadowed variable.
locking.c: Removed USE_OPLOCKS - now the default.
params.c: Removed unused variable.
proto.h: Updated.
reply.c: Removed USE_OPLOCKS - now the default.
server.c: Removed USE_OPLOCKS - now the default.
smb.h: Removed USE_OPLOCKS - now the default.
smbparse.c: Changed shadowed variable.
status.c: Removed USE_OPLOCKS - now the default.
util.c: Removed USE_OPLOCKS - now the default.
Jeremy (jallison@whistle.com)
(This used to be commit b93509846d6291771787af457500eec8984ee6bd)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/include/smb.h | 24 |
2 files changed, 7 insertions, 21 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 9faecd3a00..202b151150 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -808,7 +808,7 @@ char* smb_io_chal(BOOL io, DOM_CHAL *chal, char *q, char *base, int align); char* smb_io_cred(BOOL io, DOM_CRED *cred, char *q, char *base, int align); char* smb_io_clnt_info(BOOL io, DOM_CLNT_INFO *clnt, char *q, char *base, int align); char* smb_io_logon_id(BOOL io, DOM_LOGON_ID *log, char *q, char *base, int align); -char* smb_io_rc4_owf(BOOL io, RC4_OWF *hash, char *q, char *base, int align); +char* smb_io_arc4_owf(BOOL io, ARC4_OWF *hash, char *q, char *base, int align); char* smb_io_id_info1(BOOL io, DOM_ID_INFO_1 *id, char *q, char *base, int align); char* smb_io_sam_info(BOOL io, DOM_SAM_INFO *sam, char *q, char *base, int align); char* smb_io_gid(BOOL io, DOM_GID *gid, char *q, char *base, int align); @@ -1045,4 +1045,4 @@ void fstrcpy(char *dest, char *src); void pstrcpy(char *dest, char *src); char *align4(char *q, char *base); char *align2(char *q, char *base); -char *align_offset(char *q, char *base, int align_offset); +char *align_offset(char *q, char *base, int align_offset_len); diff --git a/source3/include/smb.h b/source3/include/smb.h index 1b8f04f02e..43e402359f 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -393,12 +393,12 @@ typedef struct logon_info } DOM_LOGON_ID; -/* RC4_OWF */ -typedef struct rc4_owf_info +/* ARC4_OWF */ +typedef struct arc4_owf_info { uint8 data[16]; -} RC4_OWF; +} ARC4_OWF; /* DOM_ID_INFO_1 */ @@ -409,8 +409,8 @@ typedef struct id_info_1 DOM_LOGON_ID logon_id; /* logon ID */ UNIHDR hdr_user_name; /* user name unicode header */ UNIHDR hdr_workgroup_name; /* workgroup name unicode header */ - RC4_OWF rc4_lm_owf; /* rc4 LM OWF Password */ - RC4_OWF rc4_nt_owf; /* rc4 NT OWF Password */ + ARC4_OWF arc4_lm_owf; /* arc4 LM OWF Password */ + ARC4_OWF arc4_nt_owf; /* arc4 NT OWF Password */ UNISTR2 uni_domain_name; /* domain name unicode string */ UNISTR2 uni_user_name; /* user name unicode string */ UNISTR2 uni_workgroup_name; /* workgroup name unicode string */ @@ -1040,10 +1040,8 @@ typedef struct { smb_shm_offset_t next_share_mode_entry; int pid; -#ifdef USE_OPLOCKS uint16 op_port; uint16 op_type; -#endif /* USE_OPLOCKS */ int share_mode; struct timeval time; } share_mode_entry; @@ -1052,10 +1050,8 @@ typedef struct typedef struct { int pid; -#ifdef USE_OPLOCKS uint16 op_port; uint16 op_type; -#endif /* USE_OPLOCKS */ int share_mode; struct timeval time; } min_share_mode_entry; @@ -1081,11 +1077,7 @@ struct connect_record }; #ifndef LOCKING_VERSION -#ifdef USE_OPLOCKS #define LOCKING_VERSION 4 -#else /* USE_OPLOCKS */ -#define LOCKING_VERSION 3 -#endif /* USE_OPLOCKS */ #endif /* LOCKING_VERSION */ #if !defined(FAST_SHARE_MODES) @@ -1101,11 +1093,7 @@ struct connect_record #define SMF_FILENAME_LEN_OFFSET 8 #define SMF_HEADER_LENGTH 10 -#ifdef USE_OPLOCKS #define SMF_ENTRY_LENGTH 20 -#else /* USE_OPLOCKS */ -#define SMF_ENTRY_LENGTH 16 -#endif /* USE_OPLOCKS */ /* * Share mode record offsets. @@ -1116,10 +1104,8 @@ struct connect_record #define SME_SHAREMODE_OFFSET 8 #define SME_PID_OFFSET 12 -#ifdef USE_OPLOCKS #define SME_PORT_OFFSET 16 #define SME_OPLOCK_TYPE_OFFSET 18 -#endif /* USE_OPLOCKS */ #endif /* FAST_SHARE_MODES */ |