Changeset 221 for branches/samba-3.3.x/source/nmbd

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/nmbd

Files:

• nmbd.c (modified) (3 diffs)
• nmbd_become_dmb.c (modified) (1 diff)
• nmbd_subnetdb.c (modified) (1 diff)

branches/samba-3.3.x/source/nmbd/nmbd.c

@@ -382 +382 @@
         const struct in_addr *local_ip;
 
-        DEBUG(10, ("Received send_packet from %d\n", procid_to_pid(&src)));
+        DEBUG(10, ("Received send_packet from %u\n", (unsigned int)procid_to_pid(&src)));
 
         if (data->length != sizeof(struct packet_struct)) {
-                DEBUG(2, ("Discarding invalid packet length from %d\n",
-                          procid_to_pid(&src)));
+                DEBUG(2, ("Discarding invalid packet length from %u\n",
+                          (unsigned int)procid_to_pid(&src)));
                 return;
         }
@@ -392 +392 @@
         if ((p->packet_type != NMB_PACKET) &&
             (p->packet_type != DGRAM_PACKET)) {
-                DEBUG(2, ("Discarding invalid packet type from %d: %d\n",
-                          procid_to_pid(&src), p->packet_type));
+                DEBUG(2, ("Discarding invalid packet type from %u: %d\n",
+                          (unsigned int)procid_to_pid(&src), p->packet_type));
                 return;
         }
@@ -401 +401 @@
 
         if (pss == NULL) {
-                DEBUG(2, ("Could not find ip for packet from %d\n",
-                          procid_to_pid(&src)));
+                DEBUG(2, ("Could not find ip for packet from %u\n",
+                          (unsigned int)procid_to_pid(&src)));
                 return;
         }

branches/samba-3.3.x/source/nmbd/nmbd_become_dmb.c

@@ -129 +129 @@
                 work->dmb_name = nmbname;
 
-                /* Pick the first interface IPv4 address as the domain master browser ip. */
+                /* Pick the first interface IPv4 address as the domain master
+                 * browser ip. */
                 nip = first_ipv4_iface();
                 if (!nip) {

branches/samba-3.3.x/source/nmbd/nmbd_subnetdb.c

@@ -288 +288 @@
 
         if (lp_we_are_a_wins_server()) {
-                /* Pick the first interface IPv4 address as the WINS server ip. */
+                /* Pick the first interface IPv4 address as the WINS server
+                 * ip. */
                 const struct in_addr *nip = first_ipv4_iface();