[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-45-g8173030
"Alfred M. Szmidt" <[email protected]>
| Newsgroups | gmane.comp.gnu.inetutils.cvs |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via 8173030af23ddb67c3834c79226c17a5f8175c6e (commit)
from d7be6fbb79bc1ed57d07f42b6c67d66d59b2bfc9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8173030af23ddb67c3834c79226c17a5f8175c6e
commit 8173030af23ddb67c3834c79226c17a5f8175c6e
Author: Alfred M. Szmidt <[email protected]>
Date: Sun Feb 26 21:01:56 2012 +0100
Revert to commit 99c71142f24033c2027a846df7c68be60f0625ef. (silent
change)
diff --git a/telnetd/state.c b/telnetd/state.c
index c52d232..6c8a59a 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -54,10 +54,10 @@
#if defined HAVE_STREAMSPTY && defined TIOCSIGNAL \
&& defined HAVE_STROPTS_H
-# include <stropts.h> /* I_FLUSH, FLUSHR */
+# include <stropts.h> /* I_FLUSH, FLUSHR */
#endif
-#ifndef NTELOPTS /* OpenSolaris */
+#ifndef NTELOPTS /* OpenSolaris */
# define NTELOPTS (1+TELOPT_NEW_ENVIRON)
#endif
@@ -66,7 +66,6 @@ char doopt[] = { IAC, DO, '%', 'c', 0 };
char dont[] = { IAC, DONT, '%', 'c', 0 };
char will[] = { IAC, WILL, '%', 'c', 0 };
char wont[] = { IAC, WONT, '%', 'c', 0 };
-
int not42 = 1;
/*
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index f19a72a..22f1a96 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -28,10 +28,6 @@
#include <error.h>
#include <libinetutils.h>
-#if defined AUTHENTICATION || defined ENCRYPTION
-# include <libtelnet/misc.h>
-#endif
-
static void parse_authmode (char *str);
static void parse_linemode (char *str);
static void parse_debug_level (char *str);
@@ -92,29 +88,29 @@ char *terminaltype;
int SYNCHing; /* we are in TELNET SYNCH mode */
struct telnetd_clocks clocks;
-
+
static struct argp_option argp_options[] = {
- {"authmode", 'a', "MODE", 0,
- "specify what mode to use for authentication"},
- {"debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
- "set debugging level"},
- {"exec-login", 'E', "STRING", 0,
- "set program to be executed instead of " PATH_LOGIN},
- {"no-hostinfo", 'h', NULL, 0,
- "do not print host information before login has been completed"},
- {"linemode", 'l', "MODE", OPTION_ARG_OPTIONAL,
- "set line mode"},
- {"no-keepalive", 'n', NULL, 0,
- "disable TCP keep-alives"},
- {"reverse-lookup", 'U', NULL, 0,
- "refuse connections from addresses that "
- "cannot be mapped back into a symbolic name"},
+ { "authmode", 'a', "MODE", 0,
+ "specify what mode to use for authentication" },
+ { "debug", 'D', "LEVEL", OPTION_ARG_OPTIONAL,
+ "set debugging level" },
+ { "exec-login", 'E', "STRING", 0,
+ "set program to be executed instead of " PATH_LOGIN },
+ { "no-hostinfo", 'h', NULL, 0,
+ "do not print host information before login has been completed" },
+ { "linemode", 'l', "MODE", OPTION_ARG_OPTIONAL,
+ "set line mode" },
+ { "no-keepalive", 'n', NULL, 0,
+ "disable TCP keep-alives" },
+ { "reverse-lookup", 'U', NULL, 0,
+ "refuse connections from addresses that "
+ "cannot be mapped back into a symbolic name" },
#ifdef AUTHENTICATION
- {"disable-auth-type", 'X', "TYPE", 0,
- "disable the use of given authentication option"},
+ { "disable-auth-type", 'X', "TYPE", 0,
+ "disable the use of given authentication option" },
#endif
- {NULL}
+ { NULL }
};
static error_t
@@ -163,14 +159,15 @@ parse_opt (int key, char *arg, struct argp_state *state)
return 0;
}
-static struct argp argp = {
- argp_options,
- parse_opt,
- NULL,
- "DARPA telnet protocol server"
-};
-
+static struct argp argp =
+ {
+ argp_options,
+ parse_opt,
+ NULL,
+ "DARPA telnet protocol server"
+ };
+
int
main (int argc, char **argv)
@@ -223,16 +220,11 @@ static struct
int modnum;
} debug_mode[debug_max_mode] =
{
- {
- "options", debug_options},
- {
- "report", debug_report},
- {
- "netdata", debug_net_data},
- {
- "ptydata", debug_pty_data},
- {
-"auth", debug_auth},};
+ {"options", debug_options},
+ {"report", debug_report},
+ {"netdata", debug_net_data},
+ {"ptydata", debug_pty_data},
+ {"auth", debug_auth},};
void
parse_debug_level (char *str)
diff --git a/telnetd/term.c b/telnetd/term.c
index 68e6e4e..6ee845e 100644
--- a/telnetd/term.c
+++ b/telnetd/term.c
@@ -656,70 +656,47 @@ struct termspeeds
int speed;
int value;
} termspeeds[] =
-{
- {
- 0, B0},
- {
- 50, B50},
- {
- 75, B75},
- {
- 110, B110},
- {
- 134, B134},
- {
- 150, B150},
- {
- 200, B200},
- {
- 300, B300},
- {
- 600, B600},
- {
- 1200, B1200},
- {
- 1800, B1800},
{
- 2400, B2400},
- {
- 4800, B4800},
+ {0, B0},
+ {50, B50},
+ {75, B75},
+ {110, B110},
+ {134, B134},
+ {150, B150},
+ {200, B200},
+ {300, B300},
+ {600, B600},
+ {1200, B1200},
+ {1800, B1800},
+ {2400, B2400},
+ {4800, B4800},
# ifdef B7200
- {
- 7200, B7200},
+ {7200, B7200},
# endif
- {
- 9600, B9600},
+ {9600, B9600},
# ifdef B14400
- {
- 14400, B14400},
+ {14400, B14400},
# endif
# ifdef B19200
- {
- 19200, B19200},
+ {19200, B19200},
# endif
# ifdef B28800
- {
- 28800, B28800},
+ {28800, B28800},
# endif
# ifdef B38400
- {
- 38400, B38400},
+ {38400, B38400},
# endif
# ifdef B57600
- {
- 57600, B57600},
+ {57600, B57600},
# endif
# ifdef B115200
- {
- 115200, B115200},
+ {115200, B115200},
# endif
# ifdef B230400
- {
- 230400, B230400},
+ {230400, B230400},
# endif
- {
- -1, 0}
-};
+ {-1, 0}
+ };
#endif /* DECODE_BAUD */
void
diff --git a/telnetd/utility.c b/telnetd/utility.c
index ba1d440..cdd1d9a 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -1347,12 +1347,12 @@ printsub (int direction, unsigned char *pointer, int length)
default:
if (isprint (pointer[i]) && pointer[i] != '"')
{
- if (noquote)
+ if (noquote)
{
debug_output_data ("\"");
noquote = 0;
}
- debug_output_datalen ((char *) &pointer[i], 1);
+ debug_output_datalen ((char*) &pointer[i], 1);
}
else
{
diff --git a/tests/addrpeek.c b/tests/addrpeek.c
index e2405ef..dbac011 100644
--- a/tests/addrpeek.c
+++ b/tests/addrpeek.c
@@ -84,14 +84,14 @@ write_address (int fd)
{
sslen = sizeof (ss);
recvfrom (fd, answer, sizeof (answer), 0,
- (struct sockaddr *) &ss, &sslen);
+ (struct sockaddr *) &ss, &sslen);
shutdown (fd, SHUT_RD);
}
else
- return;
+ return;
getnameinfo ((struct sockaddr *) &ss, sslen, addr, sizeof (addr),
- NULL, 0, NI_NUMERICHOST);
+ NULL, 0, NI_NUMERICHOST);
len = snprintf (answer, sizeof (answer),
"Your address is %s." SEPARATOR, addr);
-----------------------------------------------------------------------
Summary of changes:
telnetd/state.c | 5 +--
telnetd/telnetd.c | 72 +++++++++++++++++++++++-----------------------------
telnetd/term.c | 71 +++++++++++++++++----------------------------------
telnetd/utility.c | 4 +-
tests/addrpeek.c | 6 ++--
5 files changed, 63 insertions(+), 95 deletions(-)
hooks/post-receive
--
GNU Inetutils