mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00
Code Issues Releases Activity

This commit was generated by cvs2svn to compensate for changes in r61199,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
Kris Kennaway 2000-06-03 07:06:14 +00:00
commit 6298712178
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=61200
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crypto/openssh/channels.c
View File

@ -17,7 +17,7 @@
*/
#include "includes.h"
RCSID("$Id: channels.c,v 1.57 2000/05/08 17:42:24 markus Exp $");
RCSID("$Id: channels.c,v 1.59 2000/05/30 17:23:36 markus Exp $");
#include "ssh.h"
#include "packet.h"
@ -147,23 +147,6 @@ channel_lookup(int id)
return c;
}
void
set_nonblock(int fd)
{
int val;
val = fcntl(fd, F_GETFL, 0);
if (val < 0) {
error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));
return;
}
if (val & O_NONBLOCK)
return;
debug("fd %d setting O_NONBLOCK", fd);
val |= O_NONBLOCK;
if (fcntl(fd, F_SETFL, val) == -1)
error("fcntl(%d, F_SETFL, O_NONBLOCK): %s", fd, strerror(errno));
}
/*
* Register filedescriptors for a channel, used when allocating a channel or
* when the channel consumer/producer is ready, e.g. shell exec'd
@ -2074,11 +2057,11 @@ cleanup_socket(void)
}
/*
* This if called to process SSH_CMSG_AGENT_REQUEST_FORWARDING on the server.
* This is called to process SSH_CMSG_AGENT_REQUEST_FORWARDING on the server.
* This starts forwarding authentication requests.
*/
void
int
auth_input_request_forwarding(struct passwd * pw)
{
int sock, newch;
@ -2096,8 +2079,16 @@ auth_input_request_forwarding(struct passwd * pw)
strlcpy(channel_forwarded_auth_socket_dir, "/tmp/ssh-XXXXXXXX", MAX_SOCKET_NAME);
/* Create private directory for socket */
if (mkdtemp(channel_forwarded_auth_socket_dir) == NULL)
packet_disconnect("mkdtemp: %.100s", strerror(errno));
if (mkdtemp(channel_forwarded_auth_socket_dir) == NULL) {
packet_send_debug("Agent forwarding disabled: mkdtemp() failed: %.100s",
strerror(errno));
restore_uid();
xfree(channel_forwarded_auth_socket_name);
xfree(channel_forwarded_auth_socket_dir);
channel_forwarded_auth_socket_name = NULL;
channel_forwarded_auth_socket_dir = NULL;
return 0;
}
snprintf(channel_forwarded_auth_socket_name, MAX_SOCKET_NAME, "%s/agent.%d",
channel_forwarded_auth_socket_dir, (int) getpid());
@ -2132,6 +2123,7 @@ auth_input_request_forwarding(struct passwd * pw)
xstrdup("auth socket"));
strlcpy(channels[newch].path, channel_forwarded_auth_socket_name,
sizeof(channels[newch].path));
return 1;
}
/* This is called to process an SSH_SMSG_AGENT_OPEN message. */

6
crypto/openssh/channels.h
View File

@ -1,4 +1,4 @@
/* RCSID("$Id: channels.h,v 1.12 2000/05/03 18:03:06 markus Exp $"); */
/* RCSID("$Id: channels.h,v 1.13 2000/05/30 17:23:37 markus Exp $"); */
#ifndef CHANNELS_H
#define CHANNELS_H
@ -222,10 +222,10 @@ void auth_request_forwarding(void);
char *auth_get_socket_name(void);
/*
* This if called to process SSH_CMSG_AGENT_REQUEST_FORWARDING on the server.
* This is called to process SSH_CMSG_AGENT_REQUEST_FORWARDING on the server.
* This starts forwarding authentication requests.
*/
void auth_input_request_forwarding(struct passwd * pw);
int auth_input_request_forwarding(struct passwd * pw);
/* This is called to process an SSH_SMSG_AGENT_OPEN message. */
void auth_input_open_request(int type, int plen);