svn commit: samba r13445 - branches/SAMBA_3_0/source/rpc_parse trunk/source/rpc_parse

[gd at samba.org]

Author: gd
Date: 2006-02-10 23:49:52 +0000 (Fri, 10 Feb 2006)
New Revision: 13445

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13445

Log:
We already made the decision whether to include the dominfo and
changereject.

Guenther

Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_samr.c
   trunk/source/rpc_parse/parse_samr.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_samr.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_samr.c	2006-02-10 23:41:41 UTC (rev 13444)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_samr.c	2006-02-10 23:49:52 UTC (rev 13445)
@@ -7422,16 +7422,14 @@
 	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;
+	}
 }
 
 /*******************************************************************

Modified: trunk/source/rpc_parse/parse_samr.c
===================================================================
--- trunk/source/rpc_parse/parse_samr.c	2006-02-10 23:41:41 UTC (rev 13444)
+++ trunk/source/rpc_parse/parse_samr.c	2006-02-10 23:49:52 UTC (rev 13445)
@@ -7422,16 +7422,14 @@
 	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;
+	}
 }
 
 /*******************************************************************