diff options
author | Jeremy Allison <jra@samba.org> | 1998-03-24 00:37:53 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1998-03-24 00:37:53 +0000 |
commit | 5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12 (patch) | |
tree | f899a5c26bd29c518a32b0f57988c1a3e0ab277d /source3/include | |
parent | 4ddd855d706df5d3aacfcc0121a926d6f43cae02 (diff) | |
download | samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.tar.gz samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.tar.bz2 samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.zip |
clientgen.c ipc.c smbpasswd.c: Fixes for warnings (from Herb).
quotas.c: Linux quota fix.
util.c: Ensure smb_read_error is zero in all calls that can set it.
lib/rpc/include/rpc_misc.h lib/rpc/include/rpc_netlogon.h
lib/rpc/parse/parse_misc.c lib/rpc/parse/parse_net.c
lib/rpc/server/srv_netlog.c : Modify Luke's code to call
SamOEMhash().
Jeremy.
(This used to be commit 7f749708383b8b36c3f23a5fbc5cbdf39bc8e555)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/proto.h | 4 | ||||
-rw-r--r-- | source3/include/rpc_misc.h | 6 | ||||
-rw-r--r-- | source3/include/rpc_netlogon.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 209004e90a..a643996d3c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -293,8 +293,8 @@ void make_clnt_info(DOM_CLNT_INFO *clnt, void smb_io_clnt_info(char *desc, DOM_CLNT_INFO *clnt, prs_struct *ps, int depth); void make_logon_id(DOM_LOGON_ID *log, uint32 log_id_low, uint32 log_id_high); void smb_io_logon_id(char *desc, DOM_LOGON_ID *log, prs_struct *ps, int depth); -void make_arc4_owf(ARC4_OWF *hash, uint8 data[16]); -void smb_io_arc4_owf(char *desc, ARC4_OWF *hash, prs_struct *ps, int depth); +void make_owf_info(OWF_INFO *hash, uint8 data[16]); +void smb_io_owf_info(char *desc, OWF_INFO *hash, prs_struct *ps, int depth); void smb_io_gid(char *desc, DOM_GID *gid, prs_struct *ps, int depth); void smb_io_pol_hnd(char *desc, POLICY_HND *pol, prs_struct *ps, int depth); void smb_io_dom_query_3(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h index 5d4e385875..c6e0d8d5ee 100644 --- a/source3/include/rpc_misc.h +++ b/source3/include/rpc_misc.h @@ -243,12 +243,12 @@ typedef struct logon_info } DOM_LOGON_ID; -/* ARC4_OWF */ -typedef struct arc4_owf_info +/* OWF INFO */ +typedef struct owf_info { uint8 data[16]; -} ARC4_OWF; +} OWF_INFO; /* DOM_GID - group id + user attributes */ diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h index 1808649328..1fc6596821 100644 --- a/source3/include/rpc_netlogon.h +++ b/source3/include/rpc_netlogon.h @@ -293,8 +293,8 @@ typedef struct id_info_1 DOM_LOGON_ID logon_id; /* logon ID */ UNIHDR hdr_user_name; /* user name unicode header */ UNIHDR hdr_wksta_name; /* workstation name unicode header */ - ARC4_OWF arc4_lm_owf; /* arc4 LM OWF Password */ - ARC4_OWF arc4_nt_owf; /* arc4 NT OWF Password */ + OWF_INFO lm_owf; /* LM OWF Password */ + OWF_INFO nt_owf; /* NT OWF Password */ UNISTR2 uni_domain_name; /* domain name unicode string */ UNISTR2 uni_user_name; /* user name unicode string */ UNISTR2 uni_wksta_name; /* workgroup name unicode string */ |