From a48f4e832f09550b84beab39a97d2568fddfe20a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 10 Feb 2006 23:49:52 +0000 Subject: r13445: We already made the decision whether to include the dominfo and changereject. Guenther (This used to be commit 98d3c63e04e1317a0a2f100e89d9be65a98ecc7e) --- source3/rpc_parse/parse_samr.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index b419fbebc4..711876639a 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -7422,15 +7422,13 @@ void init_samr_r_chgpasswd_user3(SAMR_R_CHGPASSWD_USER3 *r_u, NTSTATUS status, r_u->reject = 0; r_u->ptr_reject = 0; - if (NT_STATUS_EQUAL(r_u->status, NT_STATUS_PASSWORD_RESTRICTION)) { - if (info) { - r_u->info = info; - r_u->ptr_info = 1; - } - if (reject) { - r_u->reject = reject; - r_u->ptr_reject = 1; - } + if (info) { + r_u->info = info; + r_u->ptr_info = 1; + } + if (reject && (reject->reject_reason != Undefined)) { + r_u->reject = reject; + r_u->ptr_reject = 1; } } -- cgit