diff options
| author | Jeremy Allison <jra@samba.org> | 2000-05-03 02:24:01 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-05-03 02:24:01 +0000 |
| commit | 99352a098656ac9d3886d047ff273a6880990d2f (patch) | |
| tree | 26f6ca93e045ff7e2d23ca0e18508f73d3c545a9 | |
| parent | ee42e492cef366b77c3c6fcf26e440105e89ffc8 (diff) | |
| download | samba-99352a098656ac9d3886d047ff273a6880990d2f.tar.gz samba-99352a098656ac9d3886d047ff273a6880990d2f.tar.bz2 samba-99352a098656ac9d3886d047ff273a6880990d2f.zip | |
Insure uninitialized memory read fixes.
Jeremy.
(This used to be commit 577ddbfbec857dec3ade811f735ec6b183566435)
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_net.c | 4 | ||||
| -rw-r--r-- | source3/smbd/password.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index b7c58e9c7c..c2fe1bf880 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2002,7 +2002,7 @@ BOOL net_io_r_srv_pwset(char *desc, NET_R_SRV_PWSET *r_s, prs_struct *ps, int de void init_id_info1(NET_ID_INFO_1 *id, char *domain_name, uint32 param_ctrl, uint32 log_id_low, uint32 log_id_high, char *user_name, char *wksta_name, - char sess_key[16], + char *sess_key, unsigned char lm_cypher[16], unsigned char nt_cypher[16]); void init_id_info2(NET_ID_INFO_2 *id, char *domain_name, uint32 param_ctrl, uint32 log_id_low, uint32 log_id_high, diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index 002d7e56aa..912e18600e 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -635,7 +635,7 @@ static int init_dom_sid2s(char *sids_str, DOM_SID2 *sids, int max_sids) void init_id_info1(NET_ID_INFO_1 *id, char *domain_name, uint32 param_ctrl, uint32 log_id_low, uint32 log_id_high, char *user_name, char *wksta_name, - char sess_key[16], + char *sess_key, unsigned char lm_cypher[16], unsigned char nt_cypher[16]) { int len_domain_name = strlen(domain_name); @@ -994,7 +994,7 @@ void init_net_user_info3(NET_USER_INFO_3 *usr, DOM_GID *gids, uint32 user_flgs, - char sess_key[16], + char *sess_key, char *logon_srv, char *logon_dom, diff --git a/source3/smbd/password.c b/source3/smbd/password.c index cff47c0a94..989d3f045d 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -270,6 +270,8 @@ uint16 register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name, } } + memset(&vuser->dc, '\0', sizeof(vuser->dc)); + return (uint16)((num_validated_users - 1) + VUID_OFFSET); } |