From 610c63c64b128f413529ae628d459751e1ffceb1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 15 Mar 2006 14:58:39 +0000 Subject: [PATCH] r14448: * protect against NULL cli_state* pointers in cli_rpc_pipe_open() * Fix inverted logic check for machine accounts in get_md4pw() --- source/rpc_client/cli_pipe.c | 6 ++++++ source/rpc_server/srv_netlog_nt.c | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c index 45b2e96baca..a2e0dab990f 100644 --- a/source/rpc_client/cli_pipe.c +++ b/source/rpc_client/cli_pipe.c @@ -2171,6 +2171,12 @@ static struct rpc_pipe_client *cli_rpc_pipe_open(struct cli_state *cli, int pipe *perr = NT_STATUS_NO_MEMORY; + /* sanity check to protect against crashes */ + + if ( !cli ) { + return NT_STATUS_INVALID_HANDLE; + } + /* The pipe name index must fall within our array */ SMB_ASSERT((pipe_idx >= 0) && (pipe_idx < PI_MAX_PIPES)); diff --git a/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c index f3200cbdd7d..cafef5ab7fd 100644 --- a/source/rpc_server/srv_netlog_nt.c +++ b/source/rpc_server/srv_netlog_nt.c @@ -251,9 +251,10 @@ static NTSTATUS get_md4pw(char *md4pw, char *mach_acct, uint16 sec_chan_type) return NT_STATUS_ACCOUNT_DISABLED; } - if (!(acct_ctrl & ACB_SVRTRUST) || - !(acct_ctrl & ACB_WSTRUST) || - !(acct_ctrl & ACB_DOMTRUST)) { + if (!(acct_ctrl & ACB_SVRTRUST) && + !(acct_ctrl & ACB_WSTRUST) && + !(acct_ctrl & ACB_DOMTRUST)) + { DEBUG(0,("get_md4pw: Workstation %s: account is not a trust account\n", mach_acct)); TALLOC_FREE(sampass); return NT_STATUS_NO_TRUST_SAM_ACCOUNT; -- 2.11.4.GIT