mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-24 19:53:24 +08:00
67bd062b27
[ssh.c sshconnect.c sshconnect.h]
make ssh(1)'s ConnectTimeout option apply to both the TCP connection and
SSH banner exchange (previously it just covered the TCP connection).
This allows callers of ssh(1) to better detect and deal with stuck servers
that accept a TCP connection but don't progress the protocol, and also
makes ConnectTimeout useful for connections via a ProxyCommand;
feedback and "looks ok" markus@
70 lines
2.4 KiB
C
70 lines
2.4 KiB
C
/* $OpenBSD: sshconnect.h,v 1.24 2007/09/04 11:15:56 djm Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
typedef struct Sensitive Sensitive;
|
|
struct Sensitive {
|
|
Key **keys;
|
|
int nkeys;
|
|
int external_keysign;
|
|
};
|
|
|
|
int
|
|
ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
|
|
int *, int, int, const char *);
|
|
|
|
void
|
|
ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *, int);
|
|
|
|
int verify_host_key(char *, struct sockaddr *, Key *);
|
|
|
|
void ssh_kex(char *, struct sockaddr *);
|
|
void ssh_kex2(char *, struct sockaddr *);
|
|
|
|
void ssh_userauth1(const char *, const char *, char *, Sensitive *);
|
|
void ssh_userauth2(const char *, const char *, char *, Sensitive *);
|
|
|
|
void ssh_put_password(char *);
|
|
int ssh_local_cmd(const char *);
|
|
|
|
/*
|
|
* Macros to raise/lower permissions.
|
|
*/
|
|
#define PRIV_START do { \
|
|
int save_errno = errno; \
|
|
if (seteuid(original_effective_uid) != 0) \
|
|
fatal("PRIV_START: seteuid: %s", \
|
|
strerror(errno)); \
|
|
errno = save_errno; \
|
|
} while (0)
|
|
|
|
#define PRIV_END do { \
|
|
int save_errno = errno; \
|
|
if (seteuid(original_real_uid) != 0) \
|
|
fatal("PRIV_END: seteuid: %s", \
|
|
strerror(errno)); \
|
|
errno = save_errno; \
|
|
} while (0)
|