Changeset 862 for trunk/server/source4/libnet

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/groupinfo.c (modified) (1 diff)
• source4/libnet/groupman.c (modified) (1 diff)
• source4/libnet/libnet_join.c (modified) (1 diff)
• source4/libnet/libnet_lookup.c (modified) (1 diff)
• source4/libnet/libnet_passwd.c (modified) (1 diff)
• source4/libnet/userinfo.c (modified) (1 diff)
• source4/libnet/userman.c (modified) (2 diffs)

trunk/server/source4/libnet/groupinfo.c

@@ -88 +88 @@
                 s->monitor_fn(&msg);
         }
-        
 
         /* have we actually got name resolved
            - we're looking for only one at the moment */
-        if (s->lookup.out.rids->count == 0) {
-                composite_error(c, NT_STATUS_NO_SUCH_USER);
+        if (s->lookup.out.rids->count != s->lookup.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
+        }
+        if (s->lookup.out.types->count != s->lookup.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
         }
 

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;

trunk/server/source4/libnet/libnet_join.c

@@ -657 +657 @@
                                                               r->in.account_name, ln.out.rids->count);
                         talloc_free(tmp_ctx);
-                        return NT_STATUS_INVALID_PARAMETER;
-                }
-                
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+
+                if (ln.out.types->count != 1) {
+                        r->out.error_string = talloc_asprintf(mem_ctx,
+                                                                "samr_LookupNames for [%s] returns %d RID TYPEs",
+                                                                r->in.account_name, ln.out.types->count);
+                        talloc_free(tmp_ctx);
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+
                 /* prepare samr_OpenUser */
                 ZERO_STRUCTP(u_handle);

trunk/server/source4/libnet/libnet_lookup.c

@@ -364 +364 @@
         if (!composite_is_ok(c)) return;
 
+        if (s->lookup.out.sids->count != s->lookup.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
+        }
+
         composite_done(c);
 }

trunk/server/source4/libnet/libnet_passwd.c

@@ -628 +628 @@
                                                 "samr_LookupNames for [%s] returns %d RIDs",
                                                 r->samr.in.account_name, ln.out.rids->count);
-                status = NT_STATUS_INVALID_PARAMETER;
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                 goto disconnect;        
+        }
+
+        if (ln.out.types->count != 1) {
+                r->samr.out.error_string = talloc_asprintf(mem_ctx,
+                                                "samr_LookupNames for [%s] returns %d RID TYPEs",
+                                                r->samr.in.account_name, ln.out.types->count);
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto disconnect;
         }
 

trunk/server/source4/libnet/userinfo.c

@@ -91 +91 @@
         /* have we actually got name resolved
            - we're looking for only one at the moment */
-        if (s->lookup.out.rids->count == 0) {
-                composite_error(c, NT_STATUS_NO_SUCH_USER);
+        if (s->lookup.out.rids->count != s->lookup.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
+        }
+        if (s->lookup.out.types->count != s->lookup.in.num_names) {
+                composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                return;
         }
 

trunk/server/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;
         }