From bf9afdb5c20707c5af271cbdfd98f0bb60180eb1 Mon Sep 17 00:00:00 2001 From: bubulle Date: Thu, 2 Apr 2009 15:54:13 +0000 Subject: merge upstream 3.3.3 git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2683 fc4039ab-9d04-0410-8cac-899223bdd6b0 --- source/lib/netapi/group.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'source/lib/netapi/group.c') diff --git a/source/lib/netapi/group.c b/source/lib/netapi/group.c index a78c784e38..b3bb14e695 100644 --- a/source/lib/netapi/group.c +++ b/source/lib/netapi/group.c @@ -1319,6 +1319,7 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx, *r->out.buffer = NULL; *r->out.entries_read = 0; + *r->out.total_entries = 0; switch (r->in.level) { case 0: @@ -1408,13 +1409,8 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx, } } - if (r->out.entries_read) { - *r->out.entries_read = entries_read; - } - - if (r->out.total_entries) { - *r->out.total_entries = entries_read; - } + *r->out.entries_read = entries_read; + *r->out.total_entries = entries_read; werr = WERR_OK; -- cgit v1.2.3