Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid conflict with reserved identifier "log".

Browse Source
This commit is contained in:
thorpej 2002-12-06 03:39:06 +00:00
parent 9104ddf809
commit b33be07056
41 changed files with 213 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crypto/dist/ssh/auth-krb4.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth-krb4.c,v 1.8 2002/10/01 14:07:26 itojun Exp $ */
/* $NetBSD: auth-krb4.c,v 1.9 2002/12/06 03:39:06 thorpej Exp $ */
/*
* Copyright (c) 1999 Dug Song. All rights reserved.
*
@ -79,7 +79,7 @@ krb4_init(void *context)
return (1);
}
/* Failure - cancel cleanup function, leaving ticket for inspection. */
log("WARNING: bad ticket file %s", authctxt->krb4_ticket_file);
logit("WARNING: bad ticket file %s", authctxt->krb4_ticket_file);
fatal_remove_cleanup(krb4_cleanup_proc, authctxt);
cleanup_registered = 0;
@ -115,7 +115,7 @@ auth_krb4_password(Authctxt *authctxt, const char *password)
if (pw->pw_uid != 0 && krb_get_lrealm(realm, 1) == KSUCCESS) {
/* Set up our ticket file. */
if (!krb4_init(authctxt)) {
log("Couldn't initialize Kerberos ticket file for %s!",
logit("Couldn't initialize Kerberos ticket file for %s!",
pw->pw_name);
goto failure;
}
@ -142,7 +142,7 @@ auth_krb4_password(Authctxt *authctxt, const char *password)
if (r == KSUCCESS) {
if ((hp = gethostbyname(localhost)) == NULL) {
log("Couldn't get local host address!");
logit("Couldn't get local host address!");
goto failure;
}
memmove((void *)&faddr, (void *)hp->h_addr,
@ -156,12 +156,12 @@ auth_krb4_password(Authctxt *authctxt, const char *password)
* Probably didn't have a srvtab on
* localhost. Disallow login.
*/
log("Kerberos v4 TGT for %s unverifiable, "
logit("Kerberos v4 TGT for %s unverifiable, "
"no srvtab installed? krb_rd_req: %s",
pw->pw_name, krb_err_txt[r]);
goto failure;
} else if (r != KSUCCESS) {
log("Kerberos v4 %s ticket unverifiable: %s",
logit("Kerberos v4 %s ticket unverifiable: %s",
KRB4_SERVICE_NAME, krb_err_txt[r]);
goto failure;
}
@ -170,7 +170,7 @@ auth_krb4_password(Authctxt *authctxt, const char *password)
* Disallow login if no rcmd service exists, and
* log the error.
*/
log("Kerberos v4 TGT for %s unverifiable: %s; %s.%s "
logit("Kerberos v4 TGT for %s unverifiable: %s; %s.%s "
"not registered, or srvtab is wrong?", pw->pw_name,
krb_err_txt[r], KRB4_SERVICE_NAME, phost);
goto failure;
@ -250,7 +250,7 @@ auth_krb4(Authctxt *authctxt, KTEXT auth, char **client, KTEXT reply)
/* Check ~/.klogin authorization now. */
if (kuserok(&adat, authctxt->user) != KSUCCESS) {
log("Kerberos v4 .klogin authorization failed for %s to "
logit("Kerberos v4 .klogin authorization failed for %s to "
"account %s", *client, authctxt->user);
xfree(*client);
*client = NULL;
@ -290,14 +290,14 @@ auth_krb4_tgt(Authctxt *authctxt, const char *string)
temporarily_use_uid(pw);
if (!radix_to_creds(string, &creds)) {
log("Protocol error decoding Kerberos v4 TGT");
logit("Protocol error decoding Kerberos v4 TGT");
goto failure;
}
if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */
strlcpy(creds.service, "krbtgt", sizeof creds.service);
if (strcmp(creds.service, "krbtgt")) {
log("Kerberos v4 TGT (%s%s%s@%s) rejected for %s",
logit("Kerberos v4 TGT (%s%s%s@%s) rejected for %s",
creds.pname, creds.pinst[0] ? "." : "", creds.pinst,
creds.realm, pw->pw_name);
goto failure;
@ -344,7 +344,7 @@ auth_afs_token(Authctxt *authctxt, const char *token_string)
return (0);
if (!radix_to_creds(token_string, &creds)) {
log("Protocol error decoding AFS token");
logit("Protocol error decoding AFS token");
return (0);
}
if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */
@ -356,7 +356,7 @@ auth_afs_token(Authctxt *authctxt, const char *token_string)
uid = pw->pw_uid;
if (kafs_settoken(creds.realm, uid, &creds)) {
log("AFS token (%s@%s) rejected for %s",
logit("AFS token (%s@%s) rejected for %s",
creds.pname, creds.realm, pw->pw_name);
memset(&creds, 0, sizeof(creds));
return (0);

6
crypto/dist/ssh/auth-options.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth-options.c,v 1.1.1.12 2002/10/01 13:39:55 itojun Exp $ */
/* $NetBSD: auth-options.c,v 1.2 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -202,7 +202,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
if (match_host_and_ip(remote_host, remote_ip,
patterns) != 1) {
xfree(patterns);
log("Authentication tried for %.100s with "
logit("Authentication tried for %.100s with "
"correct key but not from a permitted "
"host (host=%.200s, ip=%.200s).",
pw->pw_name, remote_host, remote_ip);
@ -288,7 +288,7 @@ next_option:
return 1;
bad_option:
log("Bad options in %.100s file, line %lu: %.50s",
logit("Bad options in %.100s file, line %lu: %.50s",
file, linenum, opts);
auth_debug_add("Bad options in %.100s file, line %lu: %.50s",
file, linenum, opts);

4
crypto/dist/ssh/auth-rh-rsa.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth-rh-rsa.c,v 1.1.1.8 2002/04/22 07:35:43 itojun Exp $ */
/* $NetBSD: auth-rh-rsa.c,v 1.2 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -76,7 +76,7 @@ auth_rhosts_rsa(struct passwd *pw, char *cuser, Key *client_host_key)
/* Perform the challenge-response dialog with the client for the host key. */
if (!auth_rsa_challenge_dialog(client_host_key)) {
log("Client on %.800s failed to respond correctly to host authentication.",
logit("Client on %.800s failed to respond correctly to host authentication.",
chost);
return 0;
}

8
crypto/dist/ssh/auth-rhosts.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth-rhosts.c,v 1.11 2002/05/27 13:45:17 itojun Exp $ */
/* $NetBSD: auth-rhosts.c,v 1.12 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -221,7 +221,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
* not group or world writable.
*/
if (stat(pw->pw_dir, &st) < 0) {
log("Rhosts authentication refused for %.100s: "
logit("Rhosts authentication refused for %.100s: "
"no home directory %.200s", pw->pw_name, pw->pw_dir);
auth_debug_add("Rhosts authentication refused for %.100s: "
"no home directory %.200s", pw->pw_name, pw->pw_dir);
@ -230,7 +230,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
if (options.strict_modes &&
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
(st.st_mode & 022) != 0)) {
log("Rhosts authentication refused for %.100s: "
logit("Rhosts authentication refused for %.100s: "
"bad ownership or modes for home directory.", pw->pw_name);
auth_debug_add("Rhosts authentication refused for %.100s: "
"bad ownership or modes for home directory.", pw->pw_name);
@ -257,7 +257,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam
if (options.strict_modes &&
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
(st.st_mode & 022) != 0)) {
log("Rhosts authentication refused for %.100s: bad modes for %.200s",
logit("Rhosts authentication refused for %.100s: bad modes for %.200s",
pw->pw_name, buf);
auth_debug_add("Bad file modes for %.200s", buf);
continue;

6
crypto/dist/ssh/auth-rsa.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth-rsa.c,v 1.1.1.11 2002/06/24 05:25:41 itojun Exp $ */
/* $NetBSD: auth-rsa.c,v 1.2 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -188,7 +188,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
secure_filename(f, file, pw, line, sizeof(line)) != 0) {
xfree(file);
fclose(f);
log("Authentication refused: %s", line);
logit("Authentication refused: %s", line);
restore_uid();
return (0);
}
@ -247,7 +247,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
/* check the real bits */
if (bits != BN_num_bits(key->rsa->n))
log("Warning: %s, line %lu: keysize mismatch: "
logit("Warning: %s, line %lu: keysize mismatch: "
"actual %d vs. announced %d.",
file, linenum, BN_num_bits(key->rsa->n), bits);

26
crypto/dist/ssh/auth.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth.c,v 1.15 2002/10/01 14:07:26 itojun Exp $ */
/* $NetBSD: auth.c,v 1.16 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -181,13 +181,13 @@ allowed_user(struct passwd * pw)
* XXX requesting user. --thorpej
*/
if (stat(shell, &st) != 0) {
log("User %.100s not allowed because shell %.100s does not exist",
logit("User %.100s not allowed because shell %.100s does not exist",
pw->pw_name, shell);
return 0;
}
if (S_ISREG(st.st_mode) == 0 ||
(st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) {
log("User %.100s not allowed because shell %.100s is not executable",
logit("User %.100s not allowed because shell %.100s is not executable",
pw->pw_name, shell);
return 0;
}
@ -207,7 +207,7 @@ allowed_user(struct passwd * pw)
for (i = 0; i < options.num_deny_users; i++)
if (match_user(pw->pw_name, hostname, ipaddr,
options.deny_users[i])) {
log("User %.100s not allowed because listed in DenyUsers",
logit("User %.100s not allowed because listed in DenyUsers",
pw->pw_name);
return 0;
}
@ -220,7 +220,7 @@ allowed_user(struct passwd * pw)
break;
/* i < options.num_allow_users iff we break for loop */
if (i >= options.num_allow_users) {
log("User %.100s not allowed because not listed in AllowUsers",
logit("User %.100s not allowed because not listed in AllowUsers",
pw->pw_name);
return 0;
}
@ -228,7 +228,7 @@ allowed_user(struct passwd * pw)
if (options.num_deny_groups > 0 || options.num_allow_groups > 0) {
/* Get the user's group access list (primary and supplementary) */
if (ga_init(pw->pw_name, pw->pw_gid) == 0) {
log("User %.100s not allowed because not in any group",
logit("User %.100s not allowed because not in any group",
pw->pw_name);
return 0;
}
@ -238,7 +238,7 @@ allowed_user(struct passwd * pw)
if (ga_match(options.deny_groups,
options.num_deny_groups)) {
ga_free();
log("User %.100s not allowed because a group is listed in DenyGroups",
logit("User %.100s not allowed because a group is listed in DenyGroups",
pw->pw_name);
return 0;
}
@ -250,7 +250,7 @@ allowed_user(struct passwd * pw)
if (!ga_match(options.allow_groups,
options.num_allow_groups)) {
ga_free();
log("User %.100s not allowed because none of user's groups are listed in AllowGroups",
logit("User %.100s not allowed because none of user's groups are listed in AllowGroups",
pw->pw_name);
return 0;
}
@ -279,7 +279,7 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
!authctxt->valid ||
authctxt->failures >= AUTH_FAIL_LOG ||
strcmp(method, "password") == 0)
authlog = log;
authlog = logit;
if (authctxt->postponed)
authmsg = "Postponed";
@ -312,12 +312,12 @@ auth_root_allowed(char *method)
break;
case PERMIT_FORCED_ONLY:
if (forced_command) {
log("Root login accepted for forced command.");
logit("Root login accepted for forced command.");
return 1;
}
break;
}
log("ROOT LOGIN REFUSED FROM %.200s", get_remote_ipaddr());
logit("ROOT LOGIN REFUSED FROM %.200s", get_remote_ipaddr());
return 0;
}
@ -409,7 +409,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
(stat(user_hostfile, &st) == 0) &&
((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
(st.st_mode & 022) != 0)) {
log("Authentication refused for %.100s: "
logit("Authentication refused for %.100s: "
"bad owner or modes for %.200s",
pw->pw_name, user_hostfile);
} else {
@ -515,7 +515,7 @@ getpwnamallow(const char *user)
pw = getpwnam(user);
if (pw == NULL) {
log("Illegal user %.100s from %.100s",
logit("Illegal user %.100s from %.100s",
user, get_remote_ipaddr());
return (NULL);
}

4
crypto/dist/ssh/auth1.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth1.c,v 1.20 2002/10/01 14:07:27 itojun Exp $ */
/* $NetBSD: auth1.c,v 1.21 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@ -302,7 +302,7 @@ do_authloop(Authctxt *authctxt)
* Any unknown messages will be ignored (and failure
* returned) during authentication.
*/
log("Unknown message during authentication: type %d", type);
logit("Unknown message during authentication: type %d", type);
break;
}
#ifdef BSD_AUTH

6
crypto/dist/ssh/auth2-hostbased.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth2-hostbased.c,v 1.1.1.1 2002/06/24 05:26:12 itojun Exp $ */
/* $NetBSD: auth2-hostbased.c,v 1.2 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -78,7 +78,7 @@ userauth_hostbased(Authctxt *authctxt)
pktype = key_type_from_name(pkalg);
if (pktype == KEY_UNSPEC) {
/* this is perfectly legal */
log("userauth_hostbased: unsupported "
logit("userauth_hostbased: unsupported "
"public key algorithm: %s", pkalg);
goto done;
}
@ -153,7 +153,7 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
chost[len - 1] = '\0';
}
if (strcasecmp(resolvedname, chost) != 0)
log("userauth_hostbased mismatch: "
logit("userauth_hostbased mismatch: "
"client sends %s, but we resolve %s to %s",
chost, ipaddr, resolvedname);
if (auth_rhosts2(pw, cuser, resolvedname, ipaddr) == 0)

4
crypto/dist/ssh/auth2-passwd.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth2-passwd.c,v 1.1.1.1 2002/06/24 05:26:12 itojun Exp $ */
/* $NetBSD: auth2-passwd.c,v 1.2 2002/12/06 03:39:07 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -45,7 +45,7 @@ userauth_passwd(Authctxt *authctxt)
u_int len;
change = packet_get_char();
if (change)
log("password change not supported");
logit("password change not supported");
password = packet_get_string(&len);
packet_check_eom();
if (authctxt->valid &&

6
crypto/dist/ssh/auth2-pubkey.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth2-pubkey.c,v 1.1.1.1 2002/06/24 05:26:12 itojun Exp $ */
/* $NetBSD: auth2-pubkey.c,v 1.2 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -79,7 +79,7 @@ userauth_pubkey(Authctxt *authctxt)
pktype = key_type_from_name(pkalg);
if (pktype == KEY_UNSPEC) {
/* this is perfectly legal */
log("userauth_pubkey: unsupported public key algorithm: %s",
logit("userauth_pubkey: unsupported public key algorithm: %s",
pkalg);
goto done;
}
@ -196,7 +196,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
if (options.strict_modes &&
secure_filename(f, file, pw, line, sizeof(line)) != 0) {
fclose(f);
log("Authentication refused: %s", line);
logit("Authentication refused: %s", line);
restore_uid();
return 0;
}

4
crypto/dist/ssh/auth2.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: auth2.c,v 1.19 2002/10/01 14:07:27 itojun Exp $ */
/* $NetBSD: auth2.c,v 1.20 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -154,7 +154,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
authctxt->valid = 1;
debug2("input_userauth_request: setting up authctxt for %s", user);
} else {
log("input_userauth_request: illegal user %s", user);
logit("input_userauth_request: illegal user %s", user);
}
setproctitle("%s%s", authctxt->pw ? user : "unknown",
use_privsep ? " [net]" : "");

12
crypto/dist/ssh/authfd.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: authfd.c,v 1.13 2002/10/01 14:07:28 itojun Exp $ */
/* $NetBSD: authfd.c,v 1.14 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -333,7 +333,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
buffer_get_bignum(&auth->identities, key->rsa->n);
*comment = buffer_get_string(&auth->identities, NULL);
if (bits != BN_num_bits(key->rsa->n))
log("Warning: identity keysize mismatch: actual %d, announced %u",
logit("Warning: identity keysize mismatch: actual %d, announced %u",
BN_num_bits(key->rsa->n), bits);
break;
case 2:
@ -374,7 +374,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
if (key->type != KEY_RSA1)
return 0;
if (response_type == 0) {
log("Compatibility with ssh protocol version 1.0 no longer supported.");
logit("Compatibility with ssh protocol version 1.0 no longer supported.");
return 0;
}
buffer_init(&buffer);
@ -393,7 +393,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
type = buffer_get_char(&buffer);
if (agent_failed(type)) {
log("Agent admitted failure to authenticate using the key.");
logit("Agent admitted failure to authenticate using the key.");
} else if (type != SSH_AGENT_RSA_RESPONSE) {
fatal("Bad authentication response: %d", type);
} else {
@ -442,7 +442,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
}
type = buffer_get_char(&msg);
if (agent_failed(type)) {
log("Agent admitted failure to sign using the key.");
logit("Agent admitted failure to sign using the key.");
} else if (type != SSH2_AGENT_SIGN_RESPONSE) {
fatal("Bad authentication response: %d", type);
} else {
@ -640,7 +640,7 @@ decode_reply(int type)
case SSH_AGENT_FAILURE:
case SSH_COM_AGENT2_FAILURE:
case SSH2_AGENT_FAILURE:
log("SSH_AGENT_FAILURE");
logit("SSH_AGENT_FAILURE");
return 0;
case SSH_AGENT_SUCCESS:
return 1;

4
crypto/dist/ssh/bufaux.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: bufaux.c,v 1.1.1.9 2002/06/26 14:02:54 itojun Exp $ */
/* $NetBSD: bufaux.c,v 1.2 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -120,7 +120,7 @@ buffer_put_bignum2(Buffer *buffer, BIGNUM *value)
/**XXX should be two's-complement */
int i, carry;
u_char *uc = buf;
log("negativ!");
logit("negativ!");
for (i = bytes-1, carry = 1; i>=0; i--) {
uc[i] ^= 0xff;
if (carry)

10
crypto/dist/ssh/canohost.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: canohost.c,v 1.14 2002/10/01 14:07:28 itojun Exp $ */
/* $NetBSD: canohost.c,v 1.15 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -57,7 +57,7 @@ get_remote_hostname(int socket, int verify_reverse_mapping)
NULL, 0, NI_NAMEREQD) != 0) {
/* Host name not found. Use ip address. */
#if 0
log("Could not reverse map address %.100s.", ntop);
logit("Could not reverse map address %.100s.", ntop);
#endif
return xstrdup(ntop);
}
@ -87,7 +87,7 @@ get_remote_hostname(int socket, int verify_reverse_mapping)
hints.ai_family = from.ss_family;
hints.ai_socktype = SOCK_STREAM;
if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
log("reverse mapping checking getaddrinfo for %.700s "
logit("reverse mapping checking getaddrinfo for %.700s "
"failed - POSSIBLE BREAKIN ATTEMPT!", name);
return xstrdup(ntop);
}
@ -102,7 +102,7 @@ get_remote_hostname(int socket, int verify_reverse_mapping)
/* If we reached the end of the list, the address was not there. */
if (!ai) {
/* Address not found for the host name. */
log("Address %.100s maps to %.600s, but this does not "
logit("Address %.100s maps to %.600s, but this does not "
"map back to the address - POSSIBLE BREAKIN ATTEMPT!",
ntop, name);
return xstrdup(ntop);
@ -142,7 +142,7 @@ check_ip_options(int socket, char *ipaddr)
for (i = 0; i < option_size; i++)
snprintf(text + i*3, sizeof(text) - i*3,
" %2.2x", options[i]);
log("Connection from %.100s with IP options:%.800s",
logit("Connection from %.100s with IP options:%.800s",
ipaddr, text);
packet_disconnect("Connection from %.100s with IP options:%.800s",
ipaddr, text);

40
crypto/dist/ssh/channels.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: channels.c,v 1.25 2002/10/01 14:07:28 itojun Exp $ */
/* $NetBSD: channels.c,v 1.26 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -144,12 +144,12 @@ channel_lookup(int id)
Channel *c;
if (id < 0 || id >= channels_alloc) {
log("channel_lookup: %d: bad id", id);
logit("channel_lookup: %d: bad id", id);
return NULL;
}
c = channels[id];
if (c == NULL) {
log("channel_lookup: %d: bad id: channel free", id);
logit("channel_lookup: %d: bad id: channel free", id);
return NULL;
}
return c;
@ -576,7 +576,7 @@ channel_send_open(int id)
Channel *c = channel_lookup(id);
if (c == NULL) {
log("channel_send_open: %d: bad id", id);
logit("channel_send_open: %d: bad id", id);
return;
}
debug("send channel open %d", id);
@ -594,7 +594,7 @@ channel_request_start(int local_id, char *service, int wantconfirm)
Channel *c = channel_lookup(local_id);
if (c == NULL) {
log("channel_request_start: %d: unknown channel id", local_id);
logit("channel_request_start: %d: unknown channel id", local_id);
return;
}
debug("channel request %d: %s", local_id, service) ;
@ -609,7 +609,7 @@ channel_register_confirm(int id, channel_callback_fn *fn)
Channel *c = channel_lookup(id);
if (c == NULL) {
log("channel_register_comfirm: %d: bad id", id);
logit("channel_register_comfirm: %d: bad id", id);
return;
}
c->confirm = fn;
@ -620,7 +620,7 @@ channel_register_cleanup(int id, channel_callback_fn *fn)
Channel *c = channel_lookup(id);
if (c == NULL) {
log("channel_register_cleanup: %d: bad id", id);
logit("channel_register_cleanup: %d: bad id", id);
return;
}
c->detach_user = fn;
@ -631,7 +631,7 @@ channel_cancel_cleanup(int id)
Channel *c = channel_lookup(id);
if (c == NULL) {
log("channel_cancel_cleanup: %d: bad id", id);
logit("channel_cancel_cleanup: %d: bad id", id);
return;
}
c->detach_user = NULL;
@ -642,7 +642,7 @@ channel_register_filter(int id, channel_filter_fn *fn)
Channel *c = channel_lookup(id);
if (c == NULL) {
log("channel_register_filter: %d: bad id", id);
logit("channel_register_filter: %d: bad id", id);
return;
}
c->input_filter = fn;
@ -834,7 +834,7 @@ channel_pre_x11_open_13(Channel *c, fd_set * readset, fd_set * writeset)
* We have received an X11 connection that has bad
* authentication information.
*/
log("X11 connection rejected because of wrong authentication.");
logit("X11 connection rejected because of wrong authentication.");
buffer_clear(&c->input);
buffer_clear(&c->output);
channel_close_fd(&c->sock);
@ -857,7 +857,7 @@ channel_pre_x11_open(Channel *c, fd_set * readset, fd_set * writeset)
c->type = SSH_CHANNEL_OPEN;
channel_pre_open(c, readset, writeset);
} else if (ret == -1) {
log("X11 connection rejected because of wrong authentication.");
logit("X11 connection rejected because of wrong authentication.");
debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);
chan_read_failed(c);
buffer_clear(&c->input);
@ -1713,11 +1713,11 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
if (compat20) {
if (data_len > c->local_maxpacket) {
log("channel %d: rcvd big packet %d, maxpack %d",
logit("channel %d: rcvd big packet %d, maxpack %d",
c->self, data_len, c->local_maxpacket);
}
if (data_len > c->local_window) {
log("channel %d: rcvd too much data %d, win %d",
logit("channel %d: rcvd too much data %d, win %d",
c->self, data_len, c->local_window);
xfree(data);
return;
@ -1744,7 +1744,7 @@ channel_input_extended_data(int type, u_int32_t seq, void *ctxt)
if (c == NULL)
packet_disconnect("Received extended_data for bad channel %d.", id);
if (c->type != SSH_CHANNEL_OPEN) {
log("channel %d: ext data for non open", id);
logit("channel %d: ext data for non open", id);
return;
}
if (c->flags & CHAN_EOF_RCVD) {
@ -1758,13 +1758,13 @@ channel_input_extended_data(int type, u_int32_t seq, void *ctxt)
if (c->efd == -1 ||
c->extended_usage != CHAN_EXTENDED_WRITE ||
tcode != SSH2_EXTENDED_DATA_STDERR) {
log("channel %d: bad ext data", c->self);
logit("channel %d: bad ext data", c->self);
return;
}
data = packet_get_string(&data_len);
packet_check_eom();
if (data_len > c->local_window) {
log("channel %d: rcvd too much extended_data %d, win %d",
logit("channel %d: rcvd too much extended_data %d, win %d",
c->self, data_len, c->local_window);
xfree(data);
return;
@ -1930,7 +1930,7 @@ channel_input_open_failure(int type, u_int32_t seq, void *ctxt)
msg = packet_get_string(NULL);
lang = packet_get_string(NULL);
}
log("channel %d: open failed: %s%s%s", id,
logit("channel %d: open failed: %s%s%s", id,
reason2txt(reason), msg ? ": ": "", msg ? msg : "");
if (msg != NULL)
xfree(msg);
@ -1957,7 +1957,7 @@ channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
c = channel_lookup(id);
if (c == NULL || c->type != SSH_CHANNEL_OPEN) {
log("Received window adjust for "
logit("Received window adjust for "
"non-open channel %d.", id);
return;
}
@ -2158,7 +2158,7 @@ channel_request_remote_forwarding(u_short listen_port,
success = 1;
break;
case SSH_SMSG_FAILURE:
log("Warning: Server denied remote port forwarding.");
logit("Warning: Server denied remote port forwarding.");
break;
default:
/* Unknown packet */
@ -2326,7 +2326,7 @@ channel_connect_to(const char *host, u_short port)
}
if (!permit) {
log("Received request to connect to host %.100s port %d, "
logit("Received request to connect to host %.100s port %d, "
"but the request was denied.", host, port);
return -1;
}

16
crypto/dist/ssh/clientloop.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: clientloop.c,v 1.22 2002/10/01 14:07:30 itojun Exp $ */
/* $NetBSD: clientloop.c,v 1.23 2002/12/06 03:39:08 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -491,13 +491,13 @@ process_cmdline(void)
if (*s == 0)
goto out;
if (strlen(s) < 2 || s[0] != '-' || !(s[1] == 'L' || s[1] == 'R')) {
log("Invalid command.");
logit("Invalid command.");
goto out;
}
if (s[1] == 'L')
local = 1;
if (!local && !compat20) {
log("Not supported for SSH protocol version 1.");
logit("Not supported for SSH protocol version 1.");
goto out;
}
s += 2;
@ -508,24 +508,24 @@ process_cmdline(void)
sfwd_port, buf, sfwd_host_port) != 3 &&
sscanf(s, "%5[0-9]/%255[^/]/%5[0-9]",
sfwd_port, buf, sfwd_host_port) != 3) {
log("Bad forwarding specification.");
logit("Bad forwarding specification.");
goto out;
}
if ((fwd_port = a2port(sfwd_port)) == 0 ||
(fwd_host_port = a2port(sfwd_host_port)) == 0) {
log("Bad forwarding port(s).");
logit("Bad forwarding port(s).");
goto out;
}
if (local) {
if (channel_setup_local_fwd_listener(fwd_port, buf,
fwd_host_port, options.gateway_ports) < 0) {
log("Port forwarding failed.");
logit("Port forwarding failed.");
goto out;
}
} else
channel_request_remote_forwarding(fwd_port, buf,
fwd_host_port);
log("Forwarding port.");
logit("Forwarding port.");
out:
signal(SIGINT, handler);
enter_raw_mode();
@ -578,7 +578,7 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
case 'R':
if (compat20) {
if (datafellows & SSH_BUG_NOREKEY)
log("Server does not support re-keying");
logit("Server does not support re-keying");
else
need_rekeying = 1;
}

4
crypto/dist/ssh/compat.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat.c,v 1.1.1.12 2002/10/01 13:39:57 itojun Exp $ */
/* $NetBSD: compat.c,v 1.2 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@ -185,7 +185,7 @@ proto_spec(const char *spec)
ret |= SSH_PROTO_2;
break;
default:
log("ignoring bad proto spec: '%s'.", p);
logit("ignoring bad proto spec: '%s'.", p);
break;
}
}

10
crypto/dist/ssh/dh.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: dh.c,v 1.9 2002/07/01 06:17:11 itojun Exp $ */
/* $NetBSD: dh.c,v 1.10 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
*
@ -113,7 +113,7 @@ choose_dh(int min, int wantbits, int max)
if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL &&
(f = fopen(_PATH_DH_PRIMES, "r")) == NULL) {
log("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI);
logit("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI);
return (dh_new_group1());
}
@ -141,7 +141,7 @@ choose_dh(int min, int wantbits, int max)
if (bestcount == 0) {
fclose(f);
log("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
return (NULL);
}
@ -177,7 +177,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
int bits_set = 0;
if (dh_pub->neg) {
log("invalid public DH value: negativ");
logit("invalid public DH value: negativ");
return 0;
}
for (i = 0; i <= n; i++)
@ -188,7 +188,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
/* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial */
if (bits_set > 1 && (BN_cmp(dh_pub, dh->p) == -1))
return 1;
log("invalid public DH value (%d/%d)", bits_set, BN_num_bits(dh->p));
logit("invalid public DH value (%d/%d)", bits_set, BN_num_bits(dh->p));
return 0;
}

6
crypto/dist/ssh/dispatch.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: dispatch.c,v 1.1.1.6 2002/03/08 01:20:44 itojun Exp $ */
/* $NetBSD: dispatch.c,v 1.2 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -40,7 +40,7 @@ dispatch_fn *dispatch[DISPATCH_MAX];
void
dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
{
log("dispatch_protocol_error: type %d seq %u", type, seq);
logit("dispatch_protocol_error: type %d seq %u", type, seq);
if (!compat20)
fatal("protocol error");
packet_start(SSH2_MSG_UNIMPLEMENTED);
@ -51,7 +51,7 @@ dispatch_protocol_error(int type, u_int32_t seq, void *ctxt)
void
dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt)
{
log("dispatch_protocol_ignore: type %d seq %u", type, seq);
logit("dispatch_protocol_ignore: type %d seq %u", type, seq);
}
void
dispatch_init(dispatch_fn *dflt)

4
crypto/dist/ssh/groupaccess.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: groupaccess.c,v 1.4 2002/03/08 02:00:52 itojun Exp $ */
/* $NetBSD: groupaccess.c,v 1.5 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Copyright (c) 2001 Kevin Steves. All rights reserved.
*
@ -50,7 +50,7 @@ ga_init(const char *user, gid_t base)
ngroups = sizeof(groups_bygid) / sizeof(gid_t);
if (getgrouplist(user, base, groups_bygid, &ngroups) == -1)
log("getgrouplist: groups list too small");
logit("getgrouplist: groups list too small");
for (i = 0, j = 0; i < ngroups; i++)
if ((gr = getgrgid(groups_bygid[i])) != NULL)
groups_byname[j++] = xstrdup(gr->gr_name);

6
crypto/dist/ssh/hostfile.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: hostfile.c,v 1.9 2002/10/01 14:07:31 itojun Exp $ */
/* $NetBSD: hostfile.c,v 1.10 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -78,10 +78,10 @@ hostfile_check_key(int bits, Key *key, const char *host, const char *filename, i
if (key == NULL || key->type != KEY_RSA1 || key->rsa == NULL)
return 1;
if (bits != BN_num_bits(key->rsa->n)) {
log("Warning: %s, line %d: keysize mismatch for host %s: "
logit("Warning: %s, line %d: keysize mismatch for host %s: "
"actual %d vs. announced %d.",
filename, linenum, host, BN_num_bits(key->rsa->n), bits);
log("Warning: replace %d with %d in %s, line %d.",
logit("Warning: replace %d with %d in %s, line %d.",
bits, BN_num_bits(key->rsa->n), filename, linenum);
}
return 1;

4
crypto/dist/ssh/log.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: log.c,v 1.4 2002/10/01 14:07:32 itojun Exp $ */
/* $NetBSD: log.c,v 1.5 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -125,7 +125,7 @@ error(const char *fmt,...)
/* Log this message (information that usually should go to the log). */
void
log(const char *fmt,...)
logit(const char *fmt,...)
{
va_list args;

4
crypto/dist/ssh/log.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: log.h,v 1.7 2002/10/01 14:07:32 itojun Exp $ */
/* $NetBSD: log.h,v 1.8 2002/12/06 03:39:09 thorpej Exp $ */
/* $OpenBSD: log.h,v 1.8 2002/07/19 15:43:33 markus Exp $ */
/*
@ -51,7 +51,7 @@ LogLevel log_level_number(char *);
void fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
void error(const char *, ...) __attribute__((format(printf, 1, 2)));
void log(const char *, ...) __attribute__((format(printf, 1, 2)));
void logit(const char *, ...) __attribute__((format(printf, 1, 2)));
void verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
void debug(const char *, ...) __attribute__((format(printf, 1, 2)));
void debug2(const char *, ...) __attribute__((format(printf, 1, 2)));

6
crypto/dist/ssh/monitor.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: monitor.c,v 1.9 2002/10/01 14:07:33 itojun Exp $ */
/* $NetBSD: monitor.c,v 1.10 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -834,7 +834,7 @@ monitor_valid_userblob(u_char *data, u_int datalen)
fail++;
p = buffer_get_string(&b, NULL);
if (strcmp(authctxt->user, p) != 0) {
log("wrong user name passed to monitor: expected %s != %.100s",
logit("wrong user name passed to monitor: expected %s != %.100s",
authctxt->user, p);
fail++;
}
@ -882,7 +882,7 @@ monitor_valid_hostbasedblob(u_char *data, u_int datalen, char *cuser,
fail++;
p = buffer_get_string(&b, NULL);
if (strcmp(authctxt->user, p) != 0) {
log("wrong user name passed to monitor: expected %s != %.100s",
logit("wrong user name passed to monitor: expected %s != %.100s",
authctxt->user, p);
fail++;
}

6
crypto/dist/ssh/nchan.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: nchan.c,v 1.1.1.12 2002/06/24 05:25:51 itojun Exp $ */
/* $NetBSD: nchan.c,v 1.2 2002/12/06 03:39:09 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@ -452,7 +452,7 @@ chan_shutdown_write(Channel *c)
c->self, c->sock, strerror(errno));
} else {
if (channel_close_fd(&c->wfd) < 0)
log("channel %d: chan_shutdown_write: "
logit("channel %d: chan_shutdown_write: "
"close() failed for fd%d: %.100s",
c->self, c->wfd, strerror(errno));
}
@ -471,7 +471,7 @@ chan_shutdown_read(Channel *c)
strerror(errno));
} else {
if (channel_close_fd(&c->rfd) < 0)
log("channel %d: chan_shutdown_read: "
logit("channel %d: chan_shutdown_read: "
"close() failed for fd%d: %.100s",
c->self, c->rfd, strerror(errno));
}

18
crypto/dist/ssh/packet.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: packet.c,v 1.18 2002/10/01 14:07:34 itojun Exp $ */
/* $NetBSD: packet.c,v 1.19 2002/12/06 03:39:10 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -712,7 +712,7 @@ packet_send2(void)
#endif
/* increment sequence number for outgoing packets */
if (++send_seqnr == 0)
log("outgoing seqnr wraps around");
logit("outgoing seqnr wraps around");
buffer_clear(&outgoing_packet);
if (type == SSH2_MSG_NEWKEYS)
@ -780,7 +780,7 @@ packet_read_seqnr(u_int32_t *seqnr_p)
/* Read data from the socket. */
len = read(connection_in, buf, sizeof(buf));
if (len == 0) {
log("Connection closed by %.200s", get_remote_ipaddr());
logit("Connection closed by %.200s", get_remote_ipaddr());
fatal_cleanup();
}
if (len < 0)
@ -973,7 +973,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
if (seqnr_p != NULL)
*seqnr_p = read_seqnr;
if (++read_seqnr == 0)
log("incoming seqnr wraps around");
logit("incoming seqnr wraps around");
/* get padlen */
cp = buffer_ptr(&incoming_packet);
@ -1038,7 +1038,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
case SSH2_MSG_DISCONNECT:
reason = packet_get_int();
msg = packet_get_string(NULL);
log("Received disconnect from %s: %u: %.400s",
logit("Received disconnect from %s: %u: %.400s",
get_remote_ipaddr(), reason, msg);
xfree(msg);
fatal_cleanup();
@ -1064,7 +1064,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
break;
case SSH_MSG_DISCONNECT:
msg = packet_get_string(NULL);
log("Received disconnect from %s: %.400s",
logit("Received disconnect from %s: %.400s",
get_remote_ipaddr(), msg);
fatal_cleanup();
xfree(msg);
@ -1242,7 +1242,7 @@ packet_disconnect(const char *fmt,...)
packet_close();
/* Display the error locally and exit. */
log("Disconnecting: %.100s", buf);
logit("Disconnecting: %.100s", buf);
fatal_cleanup();
}
@ -1368,12 +1368,12 @@ packet_set_maxsize(int s)
static int called = 0;
if (called) {
log("packet_set_maxsize: called twice: old %d new %d",
logit("packet_set_maxsize: called twice: old %d new %d",
max_packet_size, s);
return -1;
}
if (s < 4 * 1024 || s > 1024 * 1024) {
log("packet_set_maxsize: bad size %d", s);
logit("packet_set_maxsize: bad size %d", s);
return -1;
}
called = 1;

4
crypto/dist/ssh/packet.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: packet.h,v 1.1.1.12 2002/06/24 05:25:52 itojun Exp $ */
/* $NetBSD: packet.h,v 1.2 2002/12/06 03:39:10 thorpej Exp $ */
/* $OpenBSD: packet.h,v 1.35 2002/06/19 18:01:00 markus Exp $ */
/*
@ -91,7 +91,7 @@ int packet_set_maxsize(int);
do { \
int _len = packet_remaining(); \
if (_len > 0) { \
log("Packet integrity error (%d bytes remaining) at %s:%d", \
logit("Packet integrity error (%d bytes remaining) at %s:%d", \
_len ,__FILE__, __LINE__); \
packet_disconnect("Packet integrity error."); \
} \

6
crypto/dist/ssh/scard.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: scard.c,v 1.5 2002/06/24 05:48:32 itojun Exp $ */
/* $NetBSD: scard.c,v 1.6 2002/12/06 03:39:10 thorpej Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@ -527,7 +527,7 @@ sc_put_key(Key *prv, const char *id)
}
if (!sectok_swOK(sw))
goto done;
log("cyberflex_load_rsa_priv done");
logit("cyberflex_load_rsa_priv done");
key_fid[0] = 0x73;
key_fid[1] = 0x68;
if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5],
@ -537,7 +537,7 @@ sc_put_key(Key *prv, const char *id)
}
if (!sectok_swOK(sw))
goto done;
log("cyberflex_load_rsa_pub done");
logit("cyberflex_load_rsa_pub done");
status = 0;
done:

4
crypto/dist/ssh/servconf.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: servconf.c,v 1.21 2002/10/01 14:07:36 itojun Exp $ */
/* $NetBSD: servconf.c,v 1.22 2002/12/06 03:39:10 thorpej Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@ -879,7 +879,7 @@ parse_flag:
goto parse_int;
case sDeprecated:
log("%s line %d: Deprecated option %s",
logit("%s line %d: Deprecated option %s",
filename, linenum, arg);
while (arg)
arg = strdelim(&cp);

12
crypto/dist/ssh/session.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: session.c,v 1.27 2002/10/01 14:07:37 itojun Exp $ */
/* $NetBSD: session.c,v 1.28 2002/12/06 03:39:10 thorpej Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@ -397,7 +397,7 @@ do_authenticated1(Authctxt *authctxt)
* Any unknown messages in this phase are ignored,
* and a failure message is returned.
*/
log("Unknown packet type received after authentication: %d", type);
logit("Unknown packet type received after authentication: %d", type);
}
packet_start(success ? SSH_SMSG_SUCCESS : SSH_SMSG_FAILURE);
packet_send();
@ -1016,7 +1016,7 @@ do_nologin(struct passwd *pw)
#endif
if (f) {
/* /etc/nologin exists. Print its contents and exit. */
log("User %.100s not allowed because %s exists",
logit("User %.100s not allowed because %s exists",
pw->pw_name, _PATH_NOLOGIN);
while (fgets(buf, sizeof(buf), f))
fputs(buf, stderr);
@ -1440,7 +1440,7 @@ session_subsystem_req(Session *s)
int i;
packet_check_eom();
log("subsystem request for %.100s", subsys);
logit("subsystem request for %.100s", subsys);
for (i = 0; i < options.num_subsystems; i++) {
if (strcmp(subsys, options.subsystem_name[i]) == 0) {
@ -1459,7 +1459,7 @@ session_subsystem_req(Session *s)
}
if (!success)
log("subsystem request for %.100s failed, subsystem not found",
logit("subsystem request for %.100s failed, subsystem not found",
subsys);
xfree(subsys);
@ -1530,7 +1530,7 @@ session_input_channel_req(Channel *c, const char *rtype)
Session *s;
if ((s = session_by_channel(c->self)) == NULL) {
log("session_input_channel_req: no session %d req %.100s",
logit("session_input_channel_req: no session %d req %.100s",
c->self, rtype);
return 0;
}

4
crypto/dist/ssh/sftp-client.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sftp-client.c,v 1.18 2002/10/01 14:07:38 itojun Exp $ */
/* $NetBSD: sftp-client.c,v 1.19 2002/12/06 03:39:10 thorpej Exp $ */
/*
* Copyright (c) 2001,2002 Damien Miller. All rights reserved.
*
@ -504,7 +504,7 @@ do_lstat(struct sftp_conn *conn, char *path, int quiet)
if (quiet)
debug("Server version does not support lstat operation");
else
log("Server version does not support lstat operation");
logit("Server version does not support lstat operation");
return(do_stat(conn, path, quiet));
}

6
crypto/dist/ssh/sftp-server.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sftp-server.c,v 1.17 2002/10/01 14:07:40 itojun Exp $ */
/* $NetBSD: sftp-server.c,v 1.18 2002/12/06 03:39:11 thorpej Exp $ */
/*
* Copyright (c) 2000, 2001, 2002 Markus Friedl. All rights reserved.
*
@ -435,7 +435,7 @@ process_read(void)
(unsigned long long)off, len);
if (len > sizeof buf) {
len = sizeof buf;
log("read change len %d", len);
logit("read change len %d", len);
}
fd = handle_to_fd(handle);
if (fd >= 0) {
@ -488,7 +488,7 @@ process_write(void)
} else if (ret == len) {
status = SSH2_FX_OK;
} else {
log("nothing at all written");
logit("nothing at all written");
}
}
}

6
crypto/dist/ssh/ssh-agent.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ssh-agent.c,v 1.18 2002/10/01 14:07:41 itojun Exp $ */
/* $NetBSD: ssh-agent.c,v 1.19 2002/12/06 03:39:11 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -229,7 +229,7 @@ process_authentication_challenge1(SocketEntry *e)
/* The response is MD5 of decrypted challenge plus session id. */
len = BN_num_bytes(challenge);
if (len <= 0 || len > 32) {
log("process_authentication_challenge: bad challenge length %d", len);
logit("process_authentication_challenge: bad challenge length %d", len);
goto failure;
}
memset(buf, 0, 32);
@ -318,7 +318,7 @@ process_remove_identity(SocketEntry *e, int version)
buffer_get_bignum(&e->request, key->rsa->n);
if (bits != key_size(key))
log("Warning: identity keysize mismatch: actual %u, announced %u",
logit("Warning: identity keysize mismatch: actual %u, announced %u",
key_size(key), bits);
break;
case 2:

4
crypto/dist/ssh/ssh-keygen.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ssh-keygen.c,v 1.17 2002/06/24 05:48:37 itojun Exp $ */
/* $NetBSD: ssh-keygen.c,v 1.18 2002/12/06 03:39:11 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -413,7 +413,7 @@ do_upload(struct passwd *pw, const char *sc_reader_id)
key_free(prv);
if (ret < 0)
exit(1);
log("loading key done");
logit("loading key done");
exit(0);
}

18
crypto/dist/ssh/ssh.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ssh.c,v 1.25 2002/10/01 14:07:44 itojun Exp $ */
/* $NetBSD: ssh.c,v 1.26 2002/12/06 03:39:11 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -241,7 +241,7 @@ main(int ac, char **av)
/* Get user data. */
pw = getpwuid(original_real_uid);
if (!pw) {
log("You don't exist, go away!");
logit("You don't exist, go away!");
exit(1);
}
/* Take a copy of the returned structure. */
@ -548,7 +548,7 @@ again:
/* Do not allocate a tty if stdin is not a tty. */
if (!isatty(fileno(stdin)) && !force_tty_flag) {
if (tty_flag)
log("Pseudo-terminal will not be allocated because stdin is not a terminal.");
logit("Pseudo-terminal will not be allocated because stdin is not a terminal.");
tty_flag = 0;
}
@ -767,7 +767,7 @@ x11_get_proto(char **_proto, char **_data)
if (!got_data) {
u_int32_t rand = 0;
log("Warning: No xauth data; using fake authentication data for X11 forwarding.");
logit("Warning: No xauth data; using fake authentication data for X11 forwarding.");
strlcpy(proto, "MIT-MAGIC-COOKIE-1", sizeof proto);
for (i = 0; i < 16; i++) {
if (i % 4 == 0)
@ -847,7 +847,7 @@ ssh_session(void)
if (type == SSH_SMSG_SUCCESS)
packet_start_compression(options.compression_level);
else if (type == SSH_SMSG_FAILURE)
log("Warning: Remote host refused compression.");
logit("Warning: Remote host refused compression.");
else
packet_disconnect("Protocol error waiting for compression response.");
}
@ -886,7 +886,7 @@ ssh_session(void)
interactive = 1;
have_tty = 1;
} else if (type == SSH_SMSG_FAILURE)
log("Warning: Remote host failed or refused to allocate a pseudo tty.");
logit("Warning: Remote host failed or refused to allocate a pseudo tty.");
else
packet_disconnect("Protocol error waiting for pty request response.");
}
@ -904,7 +904,7 @@ ssh_session(void)
if (type == SSH_SMSG_SUCCESS) {
interactive = 1;
} else if (type == SSH_SMSG_FAILURE) {
log("Warning: Remote host denied X11 forwarding.");
logit("Warning: Remote host denied X11 forwarding.");
} else {
packet_disconnect("Protocol error waiting for X11 forwarding");
}
@ -923,7 +923,7 @@ ssh_session(void)
type = packet_read();
packet_check_eom();
if (type != SSH_SMSG_SUCCESS)
log("Warning: Remote host denied authentication agent forwarding.");
logit("Warning: Remote host denied authentication agent forwarding.");
}
/* Initiate port forwardings. */
@ -991,7 +991,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
options.remote_forwards[i].host,
options.remote_forwards[i].host_port);
if (type == SSH2_MSG_REQUEST_FAILURE)
log("Warning: remote port forwarding failed for listen port %d",
logit("Warning: remote port forwarding failed for listen port %d",
options.remote_forwards[i].port);
}

22
crypto/dist/ssh/sshconnect.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sshconnect.c,v 1.24 2002/10/01 14:07:45 itojun Exp $ */
/* $NetBSD: sshconnect.c,v 1.25 2002/12/06 03:39:11 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -329,7 +329,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
/* Return failure if we didn't get a successful connection. */
if (attempt >= connection_attempts) {
log("ssh: connect to host %s port %s: %s",
logit("ssh: connect to host %s port %s: %s",
host, strport, strerror(errno));
return full_failure ? ECONNABORTED : ECONNREFUSED;
}
@ -418,7 +418,7 @@ ssh_exchange_identification(void)
enable_compat13();
minor1 = 3;
if (options.forward_agent) {
log("Agent forwarding disabled for protocol 1.3");
logit("Agent forwarding disabled for protocol 1.3");
options.forward_agent = 0;
}
}
@ -605,16 +605,16 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
debug("Found key in %s:%d", host_file, host_line);
if (options.check_host_ip && ip_status == HOST_NEW) {
if (readonly)
log("%s host key for IP address "
logit("%s host key for IP address "
"'%.128s' not in list of known hosts.",
type, ip);
else if (!add_host_to_hostfile(user_hostfile, ip,
host_key))
log("Failed to add the %s host key for IP "
logit("Failed to add the %s host key for IP "
"address '%.128s' to the list of known "
"hosts (%.30s).", type, ip, user_hostfile);
else
log("Warning: Permanently added the %s host "
logit("Warning: Permanently added the %s host "
"key for IP address '%.128s' to the list "
"of known hosts.", type, ip);
}
@ -661,10 +661,10 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
* local known_hosts file.
*/
if (!add_host_to_hostfile(user_hostfile, hostp, host_key))
log("Failed to add the host to the list of known "
logit("Failed to add the host to the list of known "
"hosts (%.500s).", user_hostfile);
else
log("Warning: Permanently added '%.200s' (%s) to the "
logit("Warning: Permanently added '%.200s' (%s) to the "
"list of known hosts.", hostp, type);
break;
case HOST_CHANGED:
@ -767,7 +767,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
host_file, host_line);
}
if (options.strict_host_key_checking == 1) {
log(msg);
logit(msg);
error("Exiting, you have requested strict checking.");
goto fail;
} else if (options.strict_host_key_checking == 2) {
@ -776,7 +776,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
if (!confirm(msg))
goto fail;
} else {
log(msg);
logit(msg);
}
}
@ -874,7 +874,7 @@ show_key_from_file(const char *file, const char *host, int keytype)
if ((ret = lookup_key_in_hostfile_by_type(file, host,
keytype, found, &line))) {
fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
log("WARNING: %s key found for host %s\n"
logit("WARNING: %s key found for host %s\n"
"in %s:%d\n"
"%s key fingerprint %s.",
key_type(found), host, file, line,

24
crypto/dist/ssh/sshconnect1.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sshconnect1.c,v 1.22 2002/10/01 14:07:45 itojun Exp $ */
/* $NetBSD: sshconnect1.c,v 1.23 2002/12/06 03:39:12 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -120,7 +120,7 @@ try_agent_authentication(void)
* although it advertised it supports this. Just
* return a wrong value.
*/
log("Authentication agent failed to decrypt challenge.");
logit("Authentication agent failed to decrypt challenge.");
memset(response, 0, sizeof(response));
}
key_free(key);
@ -845,7 +845,7 @@ try_challenge_response_authentication(void)
if (i != 0)
error("Permission denied, please try again.");
if (options.cipher == SSH_CIPHER_NONE)
log("WARNING: Encryption is disabled! "
logit("WARNING: Encryption is disabled! "
"Response will be transmitted in clear text.");
response = read_passphrase(prompt, 0);
if (strcmp(response, "") == 0) {
@ -880,7 +880,7 @@ try_password_authentication(char *prompt)
debug("Doing password authentication.");
if (options.cipher == SSH_CIPHER_NONE)
log("WARNING: Encryption is disabled! Password will be transmitted in clear text.");
logit("WARNING: Encryption is disabled! Password will be transmitted in clear text.");
for (i = 0; i < options.number_of_password_prompts; i++) {
if (i != 0)
error("Permission denied, please try again.");
@ -936,9 +936,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
rbits = BN_num_bits(server_key->rsa->n);
if (bits != rbits) {
log("Warning: Server lies about size of server public key: "
logit("Warning: Server lies about size of server public key: "
"actual size is %d bits vs. announced %d.", rbits, bits);
log("Warning: This may be due to an old implementation of ssh.");
logit("Warning: This may be due to an old implementation of ssh.");
}
/* Get the host key. */
host_key = key_new(KEY_RSA1);
@ -948,9 +948,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
rbits = BN_num_bits(host_key->rsa->n);
if (bits != rbits) {
log("Warning: Server lies about size of server host key: "
logit("Warning: Server lies about size of server host key: "
"actual size is %d bits vs. announced %d.", rbits, bits);
log("Warning: This may be due to an old implementation of ssh.");
logit("Warning: This may be due to an old implementation of ssh.");
}
/* Get protocol flags. */
@ -1041,7 +1041,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
options.cipher = ssh_cipher_default;
} else if (options.cipher == SSH_CIPHER_ILLEGAL ||
!(cipher_mask_ssh1(1) & (1 << options.cipher))) {
log("No valid SSH1 cipher, using %.100s instead.",
logit("No valid SSH1 cipher, using %.100s instead.",
cipher_name(ssh_cipher_default));
options.cipher = ssh_cipher_default;
}
@ -1231,7 +1231,7 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
if ((supported_authentications & (1 << SSH_PASS_KERBEROS_TGT)) &&
options.kerberos_tgt_passing && context && auth_context) {
if (options.cipher == SSH_CIPHER_NONE)
log("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
logit("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
send_krb5_tgt(context, auth_context);
}
if (auth_context)
@ -1245,14 +1245,14 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host,
if ((supported_authentications & (1 << SSH_PASS_KERBEROS_TGT)) &&
options.kerberos_tgt_passing) {
if (options.cipher == SSH_CIPHER_NONE)
log("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
logit("WARNING: Encryption is disabled! Ticket will be transmitted in the clear!");
send_krb4_tgt();
}
/* Try AFS token passing if the server supports it. */
if ((supported_authentications & (1 << SSH_PASS_AFS_TOKEN)) &&
options.afs_token_passing && k_hasafs()) {
if (options.cipher == SSH_CIPHER_NONE)
log("WARNING: Encryption is disabled! Token will be transmitted in the clear!");
logit("WARNING: Encryption is disabled! Token will be transmitted in the clear!");
send_afs_tokens();
}
#endif /* AFS */

14
crypto/dist/ssh/sshconnect2.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sshconnect2.c,v 1.20 2002/07/03 10:07:48 itojun Exp $ */
/* $NetBSD: sshconnect2.c,v 1.21 2002/12/06 03:39:12 thorpej Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@ -83,7 +83,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
xxx_hostaddr = hostaddr;
if (options.ciphers == (char *)-1) {
log("No valid ciphers for protocol version 2 given, using defaults.");
logit("No valid ciphers for protocol version 2 given, using defaults.");
options.ciphers = NULL;
}
if (options.ciphers != NULL) {
@ -347,7 +347,7 @@ input_userauth_failure(int type, u_int32_t seq, void *ctxt)
packet_check_eom();
if (partial != 0)
log("Authenticated with partial success.");
logit("Authenticated with partial success.");
debug("authentications that can continue: %s", authlist);
clear_auth_state(authctxt);
@ -492,7 +492,7 @@ input_userauth_passwd_changereq(int type, uint32_t seqnr, void *ctxt)
info = packet_get_string(NULL);
lang = packet_get_string(NULL);
if (strlen(info) > 0)
log("%s", info);
logit("%s", info);
xfree(info);
xfree(lang);
packet_start(SSH2_MSG_USERAUTH_REQUEST);
@ -524,7 +524,7 @@ input_userauth_passwd_changereq(int type, uint32_t seqnr, void *ctxt)
if (strcmp(password, retype) != 0) {
memset(password, 0, strlen(password));
xfree(password);
log("Mismatch; try again, EOF to quit.");
logit("Mismatch; try again, EOF to quit.");
password = NULL;
}
memset(retype, 0, strlen(retype));
@ -863,9 +863,9 @@ input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
inst = packet_get_string(NULL);
lang = packet_get_string(NULL);
if (strlen(name) > 0)
log("%s", name);
logit("%s", name);
if (strlen(inst) > 0)
log("%s", inst);
logit("%s", inst);
xfree(name);
xfree(inst);
xfree(lang);

30
crypto/dist/ssh/sshd.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sshd.c,v 1.26 2002/10/01 14:07:47 itojun Exp $ */
/* $NetBSD: sshd.c,v 1.27 2002/12/06 03:39:12 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -246,11 +246,11 @@ sighup_handler(int sig)
static void
sighup_restart(void)
{
log("Received SIGHUP; restarting.");
logit("Received SIGHUP; restarting.");
close_listen_socks();
close_startup_pipes();
execv(saved_argv[0], saved_argv);
log("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0],
logit("RESTART FAILED: av[0]='%.100s', error: %.100s.", saved_argv[0],
strerror(errno));
exit(1);
}
@ -364,7 +364,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
if (atomic_write(sock_out, server_version_string,
strlen(server_version_string))
!= strlen(server_version_string)) {
log("Could not write ident string to %s", get_remote_ipaddr());
logit("Could not write ident string to %s", get_remote_ipaddr());
fatal_cleanup();
}
@ -372,7 +372,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
memset(buf, 0, sizeof(buf));
for (i = 0; i < sizeof(buf) - 1; i++) {
if (atomic_read(sock_in, &buf[i], 1) != 1) {
log("Did not receive identification string from %s",
logit("Did not receive identification string from %s",
get_remote_ipaddr());
fatal_cleanup();
}
@ -403,7 +403,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
(void) atomic_write(sock_out, s, strlen(s));
close(sock_in);
close(sock_out);
log("Bad protocol version identification '%.100s' from %s",
logit("Bad protocol version identification '%.100s' from %s",
client_version_string, get_remote_ipaddr());
fatal_cleanup();
}
@ -413,13 +413,13 @@ sshd_exchange_identification(int sock_in, int sock_out)
compat_datafellows(remote_version);
if (datafellows & SSH_BUG_PROBE) {
log("probed from %s with %s. Don't panic.",
logit("probed from %s with %s. Don't panic.",
get_remote_ipaddr(), client_version_string);
fatal_cleanup();
}
if (datafellows & SSH_BUG_SCANNER) {
log("scanned from %s with %s. Don't panic.",
logit("scanned from %s with %s. Don't panic.",
get_remote_ipaddr(), client_version_string);
fatal_cleanup();
}
@ -464,7 +464,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
(void) atomic_write(sock_out, s, strlen(s));
close(sock_in);
close(sock_out);
log("Protocol major versions differ for %s: %.200s vs. %.200s",
logit("Protocol major versions differ for %s: %.200s vs. %.200s",
get_remote_ipaddr(),
server_version_string, client_version_string);
fatal_cleanup();
@ -973,15 +973,15 @@ main(int ac, char **av)
key_type(key));
}
if ((options.protocol & SSH_PROTO_1) && !sensitive_data.have_ssh1_key) {
log("Disabling protocol version 1. Could not load host key");
logit("Disabling protocol version 1. Could not load host key");
options.protocol &= ~SSH_PROTO_1;
}
if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) {
log("Disabling protocol version 2. Could not load host key");
logit("Disabling protocol version 2. Could not load host key");
options.protocol &= ~SSH_PROTO_2;
}
if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
log("sshd: no hostkeys available -- exiting.");
logit("sshd: no hostkeys available -- exiting.");
exit(1);
}
@ -1131,7 +1131,7 @@ main(int ac, char **av)
num_listen_socks++;
/* Start listening on the port. */
log("Server listening on %s port %s.", ntop, strport);
logit("Server listening on %s port %s.", ntop, strport);
if (listen(listen_sock, 5) < 0)
fatal("listen: %.100s", strerror(errno));
@ -1207,7 +1207,7 @@ main(int ac, char **av)
if (ret < 0 && errno != EINTR)
error("select: %.100s", strerror(errno));
if (received_sigterm) {
log("Received signal %d; terminating.",
logit("Received signal %d; terminating.",
(int) received_sigterm);
close_listen_socks();
unlink(options.pid_file);
@ -1682,7 +1682,7 @@ do_ssh1_kex(void)
u_char *buf = xmalloc(bytes);
MD5_CTX md;
log("do_connection: generating a fake encryption key");
logit("do_connection: generating a fake encryption key");
BN_bn2bin(session_key_int, buf);
MD5_Init(&md);
MD5_Update(&md, buf, bytes);

10
crypto/dist/ssh/sshlogin.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sshlogin.c,v 1.7 2002/10/01 14:07:48 itojun Exp $ */
/* $NetBSD: sshlogin.c,v 1.8 2002/12/06 03:39:13 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -149,7 +149,7 @@ record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
if (fd >= 0) {
lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
if (write(fd, &ll, sizeof(ll)) != sizeof(ll))
log("Could not write %.100s: %.100s",
logit("Could not write %.100s: %.100s",
_PATH_LASTLOG, strerror(errno));
close(fd);
}
@ -175,17 +175,17 @@ record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
/* XXX: It would be better if we had sockaddr_storage here */
memcpy(&ux.ut_ss, addr, sizeof(*addr));
if (pututxline(&ux) == NULL)
log("could not add utmpx line: %.100s",
logit("could not add utmpx line: %.100s",
strerror(errno));
} else {
if ((uxp = getutxline(&ux)) == NULL)
log("could not find utmpx line for %.100s",
logit("could not find utmpx line for %.100s",
ttyname);
uxp->ut_type = DEAD_PROCESS;
uxp->ut_tv = tv;
/* XXX: we don't record exit info yet */
if (pututxline(&ux) == NULL)
log("could not replace utmpx line: %.100s",
logit("could not replace utmpx line: %.100s",
strerror(errno));
}
endutxent();

14
crypto/dist/ssh/ttymodes.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ttymodes.c,v 1.1.1.9 2002/06/24 05:26:09 itojun Exp $ */
/* $NetBSD: ttymodes.c,v 1.2 2002/12/06 03:39:13 thorpej Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -268,7 +268,7 @@ tty_make_modes(int fd, struct termios *tiop)
if (tiop == NULL) {
if (tcgetattr(fd, &tio) == -1) {
log("tcgetattr: %.100s", strerror(errno));
logit("tcgetattr: %.100s", strerror(errno));
goto end;
}
} else
@ -342,7 +342,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
* modes, they will initially have reasonable values.
*/
if (tcgetattr(fd, &tio) == -1) {
log("tcgetattr: %.100s", strerror(errno));
logit("tcgetattr: %.100s", strerror(errno));
failure = -1;
}
@ -421,7 +421,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
* left in the packet; hopefully there is nothing
* more coming after the mode data.
*/
log("parse_tty_modes: unknown opcode %d", opcode);
logit("parse_tty_modes: unknown opcode %d", opcode);
goto set;
}
} else {
@ -437,7 +437,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
(void) packet_get_int();
break;
} else {
log("parse_tty_modes: unknown opcode %d", opcode);
logit("parse_tty_modes: unknown opcode %d", opcode);
goto set;
}
}
@ -447,7 +447,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
set:
if (*n_bytes_ptr != n_bytes) {
*n_bytes_ptr = n_bytes;
log("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d",
logit("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d",
*n_bytes_ptr, n_bytes);
return; /* Don't process bytes passed */
}
@ -456,5 +456,5 @@ set:
/* Set the new modes for the terminal. */
if (tcsetattr(fd, TCSANOW, &tio) == -1)
log("Setting tty modes failed: %.100s", strerror(errno));
logit("Setting tty modes failed: %.100s", strerror(errno));
}