summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-02-10 23:49:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:10:03 -0500
commita48f4e832f09550b84beab39a97d2568fddfe20a (patch)
tree01a33bcd216973eb5f43268c53f3f385c21a012b
parent72b30eba6463cd4479b4f2c5076209bf77e4fc57 (diff)
downloadsamba-a48f4e832f09550b84beab39a97d2568fddfe20a.tar.gz
samba-a48f4e832f09550b84beab39a97d2568fddfe20a.tar.bz2
samba-a48f4e832f09550b84beab39a97d2568fddfe20a.zip
r13445: We already made the decision whether to include the dominfo and
changereject. Guenther (This used to be commit 98d3c63e04e1317a0a2f100e89d9be65a98ecc7e)
-rw-r--r--source3/rpc_parse/parse_samr.c16
1 files 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;
}
}