Changeset 233 for branches/samba-3.2.x/source/nmbd

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/nmbd

Files:

• nmbd_become_dmb.c (modified) (1 diff)
• nmbd_elections.c (modified) (1 diff)
• nmbd_subnetdb.c (modified) (1 diff)

branches/samba-3.2.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.2.x/source/nmbd/nmbd_elections.c

@@ -131 +131 @@
         const char *workgroup_name = lp_workgroup();
 
-        if (!lastrun)
-                lastrun = t;
-
         if (t < (lastrun + (CHECK_TIME_MST_BROWSE * 60)))
                 return;

branches/samba-3.2.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();