- updated load_netbios_names() to cope with new wins.dat format

  it doesn't support loading of Internet Group names yet, but then again,
  you can't create Internet Group names yet, so it's not a problem!
(This used to be commit 960aad39ac7b9d8c9820fbf7c4cb640ba96a29d6)

diff --git a/source3/namedbname.c b/source3/namedbname.c
index 3e6b8428cf270d3f3ecd716450ceabe2eb9e6bac..b8edfa255413c5c95851715ecee0dcbc9a978246 100644 (file)
--- a/source3/namedbname.c
+++ b/source3/namedbname.c
@@ -284,8 +284,10 @@ void dump_names(void)
 
 
 /****************************************************************************
-load a netbios name database file
-****************************************************************************/
+  load a netbios name database file
+
+  XXXX we cannot cope with loading Internet Group names, yet
+  ****************************************************************************/
 void load_netbios_names(void)
 {
   struct subnet_record *d = find_subnet(ipgrp);
@@ -332,8 +334,8 @@ void load_netbios_names(void)
        ptr = line;
 
        if (next_token(&ptr,name_str    ,NULL)) ++count;
-       if (next_token(&ptr,ip_str      ,NULL)) ++count;
        if (next_token(&ptr,ttd_str     ,NULL)) ++count;
+       if (next_token(&ptr,ip_str      ,NULL)) ++count;
        if (next_token(&ptr,nb_flags_str,NULL)) ++count;
 
        if (count <= 0) continue;