Changeset 223 for branches/samba-3.3.x/source/lib/netapi/user.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/lib/netapi/user.c (modified) (6 diffs)

branches/samba-3.3.x/source/lib/netapi/user.c

@@ -1511 +1511 @@
         NTSTATUS status = NT_STATUS_OK;
         WERROR werr;
+        WERROR werr_tmp;
+
+        *r->out.entries_read = 0;
 
         ZERO_STRUCT(connect_handle);
@@ -1555 +1558 @@
                                                &returned_size,
                                                &info);
-        if (!NT_STATUS_IS_OK(status)) {
-                werr = ntstatus_to_werror(status);
-                goto done;
-        }
-
-        werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-                                                    r->in.level,
-                                                    r->out.entries_read,
-                                                    r->out.buffer);
+        werr = ntstatus_to_werror(status);
+        if (NT_STATUS_IS_ERR(status)) {
+                goto done;
+        }
+
+        werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+                                                        r->in.level,
+                                                        r->out.entries_read,
+                                                        r->out.buffer);
+        if (!W_ERROR_IS_OK(werr_tmp)) {
+                werr = werr_tmp;
+        }
  done:
         if (!cli) {
@@ -2850 +2856 @@
         *r->out.buffer = NULL;
         *r->out.entries_read = 0;
+        *r->out.total_entries = 0;
 
         switch (r->in.level) {
@@ -2944 +2951 @@
         }
 
-        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:
@@ -3298 +3301 @@
         *r->out.buffer = NULL;
         *r->out.entries_read = 0;
+        *r->out.total_entries = 0;
 
         switch (r->in.level) {
@@ -3459 +3463 @@
         }
 
-        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: