- todd sabin spotted bugs in samr enum dom users / groups / aliases code:

  last count (probably an ENUM / resume handle) should always be returned
  even if there are no items being returned.

- got fed up of seven intendation levels in cmd_samr.c, maximum recommended
  in *any* code is three!  made some sub-fns instead.
(This used to be commit 1c330d568225759950401cfb98fe9e99db81419c)

1 files changed, 3 insertions, 5 deletions

diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 0e7c891b79..8fc56d3d9b 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -1128,9 +1128,9 @@ void samr_io_r_enum_dom_users(char *desc,  SAMR_R_ENUM_DOM_USERS *r_u, prs_struc
 
 		prs_align(ps);
 
-		prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
 	}
 
+	prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
 	prs_uint32("status", ps, depth, &(r_u->status));
 }
 
@@ -2524,10 +2524,9 @@ void samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_stru
 		}
 
 		prs_align(ps);
-
-		prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
 	}
 
+	prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
 	prs_uint32("status", ps, depth, &(r_u->status));
 }
 
@@ -2658,10 +2657,9 @@ void samr_io_r_enum_dom_aliases(char *desc,  SAMR_R_ENUM_DOM_ALIASES *r_u, prs_s
 		}
 
 		prs_align(ps);
-
-		prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
 	}
 
+	prs_uint32("num_entries4", ps, depth, &(r_u->num_entries4));
 	prs_uint32("status", ps, depth, &(r_u->status));
 }