diff --git a/telnet/commands.c b/telnet/commands.c index 3221699..32aca9f 100644 --- a/telnet/commands.c +++ b/telnet/commands.c @@ -532,11 +532,11 @@ togdebug(void) { #ifndef NOT43 if (net > 0 && - (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, debug)) < 0) { + (SetSockOpt(net, SOL_SOCKET, SO_DEBUG, telnet_debug)) < 0) { perror("setsockopt (SO_DEBUG)"); } #else /* NOT43 */ - if (debug) { + if (telnet_debug) { if (net > 0 && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) perror("setsockopt (SO_DEBUG)"); } else @@ -741,7 +741,7 @@ static struct togglelist Togglelist[] = { { "debug", "debugging", (int (*)(int))togdebug, - &debug, + &telnet_debug, "turn on socket level debugging" }, { "netdata", "printing of hexadecimal network data (debugging)", @@ -2404,7 +2404,7 @@ tn(int argc, char *argv[]) } #endif /* defined(IPPROTO_IP) && defined(IP_TOS) */ - if (debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) { + if (telnet_debug && SetSockOpt(net, SOL_SOCKET, SO_DEBUG, 1) < 0) { perror("setsockopt (SO_DEBUG)"); } diff --git a/telnet/externs.h b/telnet/externs.h index 5ecf114..e9be27e 100644 --- a/telnet/externs.h +++ b/telnet/externs.h @@ -127,7 +127,7 @@ extern int netdata, /* Print out network data flow */ prettydump, /* Print "netdata" output in user readable format */ termdata, /* Print out terminal data flow */ - debug, /* Debug level */ + telnet_debug, /* Debug level */ doaddrlookup, /* do a reverse lookup? */ clienteof; /* Client received EOF */ diff --git a/telnet/main.c b/telnet/main.c index de7e60c..e3fe643 100644 --- a/telnet/main.c +++ b/telnet/main.c @@ -213,7 +213,7 @@ main(int argc, char *argv[]) skiprc = 1; break; case 'd': - debug = 1; + telnet_debug = 1; break; case 'e': set_escape_char(optarg); diff --git a/telnet/telnet.c b/telnet/telnet.c index 2e29989..82ee464 100644 --- a/telnet/telnet.c +++ b/telnet/telnet.c @@ -95,7 +95,7 @@ int connected, showoptions, ISend, /* trying to send network data in */ - debug = 0, + telnet_debug = 0, crmod, netdata, /* Print out network data flow */ crlf, /* Should '\r' be mapped to (or )? */ diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c index 6a5a623..bdb76d7 100644 --- a/telnetd/telnetd.c +++ b/telnetd/telnetd.c @@ -78,7 +78,7 @@ int terminaltypeok(char *); int hostinfo = 1; /* do we print login banner? */ -int debug = 0; +static int debug = 0; int keepalive = 1; const char *altlogin;