Merging tridge's wins fixes. Tridge - we're supposed to be keeping 3.0 up

to date :-).
Jeremy.
(This used to be commit 5959f35db6b4b23c591799dad7587e6616e5a998)

diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 13554a9430b9f82a3da90fe0f783d041d95001d9..ee47cff0495663fbf6e2474b72178ef035d19a23 100644 (file)
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -1952,8 +1952,8 @@ void nmbd_wins_new_entry(int msg_type, pid_t src, void *buf, size_t len)
                /* I'm giving up on multi homed. Too much complex to understand */
                
                if (record->wins_flags&WINS_MHOMED) {
-                       if (! namerec->data.wins_flags&WINS_ACTIVE) {
-                               if ( !namerec->data.wins_flags&WINS_RELEASED && !namerec->data.wins_flags&WINS_NGROUP)
+                       if (! (namerec->data.wins_flags&WINS_ACTIVE)) {
+                               if ( !(namerec->data.wins_flags&WINS_RELEASED) && !(namerec->data.wins_flags&WINS_NGROUP))
                                        overwrite=True;
                        }
                        else {