Changeset 233 for branches/samba-3.2.x/source/lib/netapi/user.c

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

File:

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

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

@@ -900 +900 @@
         NTSTATUS status;
         WERROR werr;
+        WERROR werr_tmp;
+
+        *r->out.entries_read = 0;
 
         ZERO_STRUCT(connect_handle);
@@ -993 +996 @@
                                                &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) {