- set default printer driver string to "NULL"

- fixed debug levels for name status parsing

diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index f1847e38baaeff698388a16b91596376f6acf666..fc02add5b50bc5ee1235187191dbb701e94d0676 100644 (file)
--- a/source/libsmb/namequery.c
+++ b/source/libsmb/namequery.c
@@ -31,9 +31,8 @@ interpret a node status response
 ****************************************************************************/
 static void _interpret_node_status(char *p, char *master,char *rname)
 {
-  int level = (master||rname)?4:0;
   int numnames = CVAL(p,0);
-  DEBUG(level,("received %d names\n",numnames));
+  DEBUG(1,("received %d names\n",numnames));
 
   if (rname) *rname = 0;
   if (master) *master = 0;
@@ -73,10 +72,10 @@ static void _interpret_node_status(char *p, char *master,char *rname)
       for (i = strlen( qname) ; --i >= 0 ; ) {
        if (!isprint(qname[i])) qname[i] = '.';
       }
-      DEBUG(level,("\t%-15s <%02x> - %s\n",qname,type,flags));
+      DEBUG(1,("\t%-15s <%02x> - %s\n",qname,type,flags));
       p+=2;
     }
-  DEBUG(level,("num_good_sends=%d num_good_receives=%d\n",
+  DEBUG(1,("num_good_sends=%d num_good_receives=%d\n",
               IVAL(p,20),IVAL(p,24)));
 }
 

diff --git a/source/nameservresp.c b/source/nameservresp.c
index a4cda7cdfb5a412dbcce1de5036f68f5a648372c..1c53e80b9dc0172793c83ff05983ab91fbd32508 100644 (file)
--- a/source/nameservresp.c
+++ b/source/nameservresp.c
@@ -211,11 +211,10 @@ static BOOL interpret_node_status(struct subnet_record *d,
                                char *p, struct nmb_name *name,int t,
                           char *serv_name, struct in_addr ip, BOOL bcast)
 {
-  int level = t==0x20 ? 4 : 0;
   int numnames = CVAL(p,0);
   BOOL found = False;
 
-  DEBUG(level,("received %d names\n",numnames));
+  DEBUG(4,("received %d names\n",numnames));
 
   p += 1;
 
@@ -286,9 +285,9 @@ static BOOL interpret_node_status(struct subnet_record *d,
            }
        }
       
-      DEBUG(level,("\t%s(0x%x)\t%s\n",qname,type,flags));
+      DEBUG(4,("\t%s(0x%x)\t%s\n",qname,type,flags));
     }
-  DEBUG(level,("num_good_sends=%d num_good_receives=%d\n",
+  DEBUG(4,("num_good_sends=%d num_good_receives=%d\n",
               IVAL(p,20),IVAL(p,24)));
   return found;
 }

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 8b2806f0759b740e2d826219984dfed300a0e413..34c9f27129aa83ef3c372f8297cc7588bda28590 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -539,6 +539,7 @@ static void init_globals(void)
          string_init(parm_table[i].ptr,"");
 
       string_set(&sDefault.szGuestaccount, GUEST_ACCOUNT);
+      string_set(&sDefault.szPrinterDriver, "NULL");
 
       done_init = True;
     }