summaryrefslogtreecommitdiff
path: root/source/lib/netapi/group.c
diff options
context:
space:
mode:
authorbubulle <bubulle@alioth.debian.org>2009-04-02 15:54:13 +0000
committerbubulle <bubulle@alioth.debian.org>2009-04-02 15:54:13 +0000
commitbf9afdb5c20707c5af271cbdfd98f0bb60180eb1 (patch)
treef72e29d251d990358e3a080aa35c801104fa54ba /source/lib/netapi/group.c
parentfe09995a9ad2d43523063725462194c7b39a3ce9 (diff)
downloadsamba-bf9afdb5c20707c5af271cbdfd98f0bb60180eb1.tar.gz
merge upstream 3.3.3
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2683 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source/lib/netapi/group.c')
-rw-r--r--source/lib/netapi/group.c10
1 files changed, 3 insertions, 7 deletions
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;