Changeset 862 for trunk/server/source4/libnet/groupman.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libnet/groupman.c (modified) (1 diff)

trunk/server/source4/libnet/groupman.c

@@ -213 +213 @@
         /* what to do when there's no group 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_GROUP;
-                composite_error(c, c->status);
-                return;
-
-        } else if (!s->lookupname.out.rids->count > 1) {
-                c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
+        if (s->lookupname.out.rids->count != s->lookupname.in.num_names) {
+                c->status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                composite_error(c, c->status);
+                return;
+        }
+        if (s->lookupname.out.types->count != s->lookupname.in.num_names) {
+                c->status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                 composite_error(c, c->status);
                 return;