summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/libsmb/namequery.c7
-rw-r--r--source3/nameservresp.c7
-rw-r--r--source3/param/loadparm.c1
3 files changed, 7 insertions, 8 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index f1847e38ba..fc02add5b5 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/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/source3/nameservresp.c b/source3/nameservresp.c
index a4cda7cdfb..1c53e80b9d 100644
--- a/source3/nameservresp.c
+++ b/source3/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/source3/param/loadparm.c b/source3/param/loadparm.c
index 8b2806f075..34c9f27129 100644
--- a/source3/param/loadparm.c
+++ b/source3/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;
}