remove trailing whitespace

This commit is contained in:
Love Hornquist Astrand
2011-05-21 11:57:31 -07:00
parent 25e86d6f4d
commit 0879b9831a
539 changed files with 6825 additions and 6825 deletions

View File

@@ -108,7 +108,7 @@ static long i_support_encrypt = typemask(ENCTYPE_DES_CFB64)
static Encryptions encryptions[] = {
#if defined(DES_ENCRYPTION)
{ "DES_CFB64", ENCTYPE_DES_CFB64,
cfb64_encrypt,
cfb64_encrypt,
cfb64_decrypt,
cfb64_init,
cfb64_start,
@@ -118,7 +118,7 @@ static long i_support_encrypt = typemask(ENCTYPE_DES_CFB64)
cfb64_keyid,
cfb64_printsub },
{ "DES_OFB64", ENCTYPE_DES_OFB64,
ofb64_encrypt,
ofb64_encrypt,
ofb64_decrypt,
ofb64_init,
ofb64_start,
@@ -388,7 +388,7 @@ encrypt_display(void)
ENCTYPE_NAME(encrypt_mode));
else
printf("Currently not encrypting output\r\n");
if (decrypt_input)
printf("Currently decrypting input with %s\r\n",
ENCTYPE_NAME(decrypt_mode));
@@ -411,7 +411,7 @@ EncryptStatus(void)
ENCTYPE_NAME(encrypt_mode));
} else
printf("Currently not encrypting output\r\n");
if (decrypt_input) {
printf("Currently decrypting input with %s\r\n",
ENCTYPE_NAME(decrypt_mode));

View File

@@ -75,7 +75,7 @@ char **
genget(char *name, char **table, int stlen)
/* name to match */
/* name entry in table */
{
char **c, **found;
int n;

View File

@@ -135,7 +135,7 @@ Data(Authenticator *ap, int type, const void *d, int c)
memcpy(p0, str_data, sizeof(str_data));
p = p0 + sizeof(str_data);
if (auth_debug_mode) {
printf("%s:%d: [%d] (%d)",
str_data[3] == TELQUAL_IS ? ">>>IS" : ">>>REPLY",
@@ -215,7 +215,7 @@ kerberos5_send(char *name, Authenticator *ap)
}
return 0;
}
if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL)
ap_opts = AP_OPTS_MUTUAL_REQUIRED;
else
@@ -418,13 +418,13 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
free (errbuf);
return;
}
{
char ap_msg[2];
ap_msg[0] = ap->type;
ap_msg[1] = ap->way;
ret = krb5_verify_authenticator_checksum(context,
auth_context,
ap_msg,
@@ -536,7 +536,7 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
}
auth_finished(ap, AUTH_USER);
krb5_free_keyblock(context, key_block);
break;
case KRB_FORWARD: {
struct passwd *pwd;
@@ -628,7 +628,7 @@ kerberos5_reply(Authenticator *ap, unsigned char *data, int cnt)
krb5_error_code ret;
Session_Key skey;
krb5_keyblock *keyblock;
if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL &&
!mutual_complete) {
printf("[ Kerberos V5 accepted you, but didn't provide mutual authentication! ]\r\n");
@@ -639,7 +639,7 @@ kerberos5_reply(Authenticator *ap, unsigned char *data, int cnt)
printf("[ Kerberos V5 accepts you as ``%.*s'' ]\r\n", cnt, data);
else
printf("[ Kerberos V5 accepts you ]\r\n");
ret = krb5_auth_con_getlocalsubkey (context,
auth_context,
&keyblock);
@@ -653,7 +653,7 @@ kerberos5_reply(Authenticator *ap, unsigned char *data, int cnt)
auth_send_retry();
return;
}
skey.type = SK_DES;
skey.length = 8;
skey.data = keyblock->keyvalue.data;
@@ -670,7 +670,7 @@ kerberos5_reply(Authenticator *ap, unsigned char *data, int cnt)
krb5_ap_rep_enc_part *reply;
krb5_data inbuf;
krb5_error_code ret;
inbuf.length = cnt;
inbuf.data = (char *)data;

View File

@@ -2181,7 +2181,7 @@ tn(int argc, char **argv)
addrstr, sizeof(addrstr),
NULL, 0, NI_NUMERICHOST) != 0)
strlcpy (addrstr, "unknown address", sizeof(addrstr));
printf("Trying %s...\r\n", addrstr);
net = socket (a->ai_family, a->ai_socktype, a->ai_protocol);

View File

@@ -164,7 +164,7 @@ main(int argc, char **argv)
#ifdef KRB5
krb5_init();
#endif
tninit(); /* Clear out things */
TerminalSaveState();

View File

@@ -2130,7 +2130,7 @@ my_telnet(char *user)
printf("\nServer disconnected.\n");
Exit(1);
}
}
if (printed_encrypt) {
printf("Encryption negotiated.\n");

View File

@@ -250,7 +250,7 @@ optionstatus(void)
static void __attribute__((format (printf, 3, 4)))
qprintf(int quote, FILE *f, const char *fmt, ...)
{
va_list va;
if (quote)

View File

@@ -506,7 +506,7 @@ willoption(int option)
changeok++;
break;
#endif
default:
break;
}

View File

@@ -391,7 +391,7 @@ int getpty(int *ptynum)
{
char *clone[] = { "/dev/ptc", "/dev/ptmx", "/dev/ptm",
"/dev/ptym/clone", 0 };
char **q;
int p;
for(q=clone; *q; q++){
@@ -415,7 +415,7 @@ int getpty(int *ptynum)
int p;
char *cp, *p1, *p2;
int i;
#ifndef __hpux
snprintf(line, sizeof(Xline), "/dev/ptyXX");
p1 = &line[8];
@@ -425,11 +425,11 @@ int getpty(int *ptynum)
p1 = &line[13];
p2 = &line[14];
#endif
for (cp = "pqrstuvwxyzPQRST"; *cp; cp++) {
struct stat stb;
*p1 = *cp;
*p2 = '0';
/*
@@ -446,7 +446,7 @@ int getpty(int *ptynum)
#if SunOS == 40
int dummy;
#endif
#ifndef __hpux
line[5] = 't';
#else
@@ -474,7 +474,7 @@ int getpty(int *ptynum)
extern lowpty, highpty;
struct stat sb;
int p;
for (*ptynum = lowpty; *ptynum <= highpty; (*ptynum)++) {
snprintf(myline, sizeof(myline), "/dev/pty/%03d", *ptynum);
p = open(myline, 2);
@@ -856,7 +856,7 @@ void getptyslave(void)
#ifdef STREAMSPTY
ttyfd = t;
/*
* Not all systems have (or need) modules ttcompat and pckt so
@@ -876,7 +876,7 @@ void getptyslave(void)
pushed (via autopush, for instance).
*/
char *ttymodules[] = { "ttcompat", "ldterm", "ptem", NULL };
char *ptymodules[] = { "pckt", NULL };
@@ -1289,11 +1289,11 @@ start_login(const char *host, int autologin, char *name)
struct utmpx utmpx;
struct timeval tv;
char *clean_tty;
/*
* Create utmp entry for child
*/
clean_tty = clean_ttyname(line);
memset(&utmpx, 0, sizeof(utmpx));
strncpy(utmpx.ut_user, ".telnet", sizeof(utmpx.ut_user));
@@ -1302,9 +1302,9 @@ start_login(const char *host, int autologin, char *name)
strncpy(utmpx.ut_id, make_id(clean_tty), sizeof(utmpx.ut_id));
#endif
utmpx.ut_pid = pid;
utmpx.ut_type = LOGIN_PROCESS;
gettimeofday (&tv, NULL);
utmpx.ut_tv.tv_sec = tv.tv_sec;
utmpx.ut_tv.tv_usec = tv.tv_usec;
@@ -1315,7 +1315,7 @@ start_login(const char *host, int autologin, char *name)
#endif
scrub_env();
/*
* -h : pass on name of host.
* WARNING: -h is accepted by login if and only if
@@ -1444,7 +1444,7 @@ rmut(void)
#elif defined(__osf__) /* XXX */
utxp->ut_exit.ut_termination = 0;
utxp->ut_exit.ut_exit = 0;
#else
#else
utxp->ut_exit.e_termination = 0;
utxp->ut_exit.e_exit = 0;
#endif

View File

@@ -338,7 +338,7 @@ main(int argc, char **argv)
case 'L':
new_login = optarg;
break;
default:
fprintf(stderr, "telnetd: %c: unknown option\n", ch);
/* FALLTHROUGH */

View File

@@ -922,28 +922,28 @@ printsub(int direction, unsigned char *pointer, size_t length)
output_data("VAR ");
quote = 0;
break;
case NEW_ENV_VALUE:
if (quote)
output_data("\" ");
output_data("VALUE ");
quote = 0;
break;
case ENV_ESC:
if (quote)
output_data("\" ");
output_data("ESC ");
quote = 0;
break;
case ENV_USERVAR:
if (quote)
output_data("\" ");
output_data("USERVAR ");
quote = 0;
break;
default:
if (isprint(pointer[i]) && pointer[i] != '"') {
if (!quote) {