Changeset 105 for branches/samba-3.0/source/nmbd

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

Location:

branches/samba-3.0/source/nmbd

Files:

• nmbd_namelistdb.c (modified) (1 diff)
• nmbd_processlogon.c (modified) (6 diffs)

branches/samba-3.0/source/nmbd/nmbd_namelistdb.c

@@ -506 +506 @@
                 }
 
-                for( bcast_subrecs = FIRST_SUBNET, i = 0; bcast_subrecs; bcast_subrecs = NEXT_SUBNET_EXCLUDING_UNICAST(bcast_subrecs), i++ )
+                for( bcast_subrecs = FIRST_SUBNET, i = 0; bcast_subrecs &&
+                                i < num_ips;
+                                bcast_subrecs = NEXT_SUBNET_EXCLUDING_UNICAST(bcast_subrecs), i++ ) {
                         iplist[i] = bcast_subrecs->myip;
+                }
+                num_ips = i;
         }
 

branches/samba-3.0/source/nmbd/nmbd_processlogon.c

@@ -451 +451 @@
                                                         sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
                                                         0);
+                                                if (size == (uint8)-1) {
+                                                        return;
+                                                }
                                                 SCVAL(q, 0, size);
                                                 q += (size + 1);
@@ -471 +474 @@
                                                         sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
                                                         0);
+                                        if (size == (uint8)-1) {
+                                                return;
+                                        }
                                         SCVAL(q, 0, size);
                                         q += (size + 1);
@@ -486 +492 @@
                                                         sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
                                                         STR_UPPER);
+                                        if (size == (uint8)-1) {
+                                                return;
+                                        }
                                         SCVAL(q, 0, size);
                                         q += (size + 1);
@@ -500 +509 @@
                                                         sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
                                                         0);
+                                        if (size == (uint8)-1) {
+                                                return;
+                                        }
                                         SCVAL(q, 0, size);
                                         q += (size + 1);
@@ -515 +527 @@
                                                         sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
                                                         0);
+                                                if (size == (uint8)-1) {
+                                                        return;
+                                                }
                                                 SCVAL(q, 0, size);
                                                 q += (size + 1);
@@ -527 +542 @@
                                                         sizeof(outbuf) - PTR_DIFF(q+1, outbuf),
                                                         0);
+                                        if (size == (uint8)-1) {
+                                                return;
+                                        }
                                         SCVAL(q, 0, size);
                                         q += (size + 1);