diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-03-23 11:47:38 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-03-23 11:47:38 +1100 |
commit | 7f113904eba5361d963075bcea7e36fd98ca34aa (patch) | |
tree | 2d5f22f3418a3439c306b3aaf570f52ff1d0823e /source3/lib/netapi/user.c | |
parent | 9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (diff) | |
parent | 979a1b06d01817a01967d9137e4f70f222fa8eab (diff) | |
download | samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.gz samba-7f113904eba5361d963075bcea7e36fd98ca34aa.tar.bz2 samba-7f113904eba5361d963075bcea7e36fd98ca34aa.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/netapi/user.c')
-rw-r--r-- | source3/lib/netapi/user.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c index 8cc65a6e9e..e760a8b1de 100644 --- a/source3/lib/netapi/user.c +++ b/source3/lib/netapi/user.c @@ -2806,6 +2806,7 @@ WERROR NetUserGetGroups_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: @@ -2899,12 +2900,8 @@ WERROR NetUserGetGroups_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; done: if (ctx->disable_policy_handle_cache) { @@ -3242,6 +3239,7 @@ WERROR NetUserGetLocalGroups_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: @@ -3402,12 +3400,8 @@ WERROR NetUserGetLocalGroups_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; done: if (ctx->disable_policy_handle_cache) { |