From 0f0ad2992eedeb9e75ddd2c122b5a5b291ba4efe Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 15 Mar 2006 14:58:39 +0000 Subject: r14448: * protect against NULL cli_state* pointers in cli_rpc_pipe_open() * Fix inverted logic check for machine accounts in get_md4pw() (This used to be commit a36529535dcb5a262e7627b80fb62a31240dc8ad) --- source3/rpc_server/srv_netlog_nt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/rpc_server/srv_netlog_nt.c') diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index f3200cbdd7..cafef5ab7f 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/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; -- cgit