Changeset 860 for vendor/current/source4/libnet/userman.c

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

• vendor/current/source4/libnet/userman.c (modified) (2 diffs)

vendor/current/source4/libnet/userman.c

@@ -237 +237 @@
         /* what to do when there's no user account to delete
            and what if there's more than one rid resolved */
-        if (!s->lookupname.out.rids->count) {
-                c->status = NT_STATUS_NO_SUCH_USER;
-                composite_error(c, c->status);
-                return;
-
-        } else if (!s->lookupname.out.rids->count > 1) {
-                c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
-                composite_error(c, c->status);
+        if (s->lookupname.out.rids->count != s->lookupname.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
+        }
+        if (s->lookupname.out.types->count != s->lookupname.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
                 return;
         }
@@ -512 +510 @@
         /* what to do when there's no user account to delete
            and what if there's more than one rid resolved */
-        if (!s->lookupname.out.rids->count) {
-                c->status = NT_STATUS_NO_SUCH_USER;
-                composite_error(c, c->status);
-                return;
-
-        } else if (!s->lookupname.out.rids->count > 1) {
-                c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
-                composite_error(c, c->status);
+        if (s->lookupname.out.rids->count != s->lookupname.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
+        }
+        if (s->lookupname.out.types->count != s->lookupname.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
                 return;
         }