tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: syslog when connection is dropped for attempting to run a 

command when ForceCommand=internal-sftp is in effect; bz2960; ok dtucker@

OpenBSD-Commit-ID: 8c87fa66d7fc6c0fffa3a3c28e8ab5e8dde234b8
This commit is contained in:
djm@openbsd.org 2019-02-10 11:10:57 +00:00 committed by Damien Miller
parent 2ff2e19653
commit 318e4f8548
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.313 2019/02/05 11:35:56 dtucker Exp $ */ /* $OpenBSD: session.c,v 1.314 2019/02/10 11:10:57 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1510,12 +1510,13 @@ void
do_child(struct ssh *ssh, Session *s, const char *command) do_child(struct ssh *ssh, Session *s, const char *command)
{ {
extern char **environ; extern char **environ;
char **env; char **env, *argv[ARGV_MAX], remote_id[512];
char *argv[ARGV_MAX];
const char *shell, *shell0; const char *shell, *shell0;
struct passwd *pw = s->pw; struct passwd *pw = s->pw;
int r = 0; int r = 0;
sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
/* remove hostkey from the child's memory */ /* remove hostkey from the child's memory */
destroy_sensitive_data(); destroy_sensitive_data();
ssh_packet_clear_keys(ssh); ssh_packet_clear_keys(ssh);
@ -1638,6 +1639,8 @@ do_child(struct ssh *ssh, Session *s, const char *command)
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
if (s->is_subsystem == SUBSYSTEM_INT_SFTP_ERROR) { if (s->is_subsystem == SUBSYSTEM_INT_SFTP_ERROR) {
error("Connection from %s: refusing non-sftp session",
remote_id);
printf("This service allows sftp connections only.\n"); printf("This service allows sftp connections only.\n");
fflush(NULL); fflush(NULL);
exit(1); exit(1);