diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-10-11 05:49:42 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-10-11 05:49:42 +0000 |
| commit | c71c1ff55f60f317039e3399f786e961dfac9e0b (patch) | |
| tree | 06bbbe070f268b827e0ec323496607f2622703d9 | |
| parent | 0b031a3f41158c421f64d2da41645b0c5ec7540d (diff) | |
| download | samba-c71c1ff55f60f317039e3399f786e961dfac9e0b.tar.gz samba-c71c1ff55f60f317039e3399f786e961dfac9e0b.tar.bz2 samba-c71c1ff55f60f317039e3399f786e961dfac9e0b.zip | |
- set default printer driver string to "NULL"
- fixed debug levels for name status parsing
(This used to be commit f2c5f1eab1f3de7a9ae2b7ec4770a5c455dc04e4)
| -rw-r--r-- | source3/libsmb/namequery.c | 7 | ||||
| -rw-r--r-- | source3/nameservresp.c | 7 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
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; } |