1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00

- set default printer driver string to "NULL"

- fixed debug levels for name status parsing
(This used to be commit f2c5f1eab1)
This commit is contained in:
Andrew Tridgell 1996-10-11 05:49:42 +00:00
parent 0b031a3f41
commit c71c1ff55f
3 changed files with 7 additions and 8 deletions

View File

@ -31,9 +31,8 @@ interpret a node status response
****************************************************************************/ ****************************************************************************/
static void _interpret_node_status(char *p, char *master,char *rname) static void _interpret_node_status(char *p, char *master,char *rname)
{ {
int level = (master||rname)?4:0;
int numnames = CVAL(p,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 (rname) *rname = 0;
if (master) *master = 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 ; ) { for (i = strlen( qname) ; --i >= 0 ; ) {
if (!isprint(qname[i])) qname[i] = '.'; 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; 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))); IVAL(p,20),IVAL(p,24)));
} }

View File

@ -211,11 +211,10 @@ static BOOL interpret_node_status(struct subnet_record *d,
char *p, struct nmb_name *name,int t, char *p, struct nmb_name *name,int t,
char *serv_name, struct in_addr ip, BOOL bcast) char *serv_name, struct in_addr ip, BOOL bcast)
{ {
int level = t==0x20 ? 4 : 0;
int numnames = CVAL(p,0); int numnames = CVAL(p,0);
BOOL found = False; BOOL found = False;
DEBUG(level,("received %d names\n",numnames)); DEBUG(4,("received %d names\n",numnames));
p += 1; 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))); IVAL(p,20),IVAL(p,24)));
return found; return found;
} }

View File

@ -539,6 +539,7 @@ static void init_globals(void)
string_init(parm_table[i].ptr,""); string_init(parm_table[i].ptr,"");
string_set(&sDefault.szGuestaccount, GUEST_ACCOUNT); string_set(&sDefault.szGuestaccount, GUEST_ACCOUNT);
string_set(&sDefault.szPrinterDriver, "NULL");
done_init = True; done_init = True;
} }