mirror of git://anongit.mindrot.org/openssh.git
- (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in
channels.c too, so move the definition for non-IP6 platforms to defines.h where it can be shared.
This commit is contained in:
parent
0d8f2f3afa
commit
642ebe5b51
|
@ -1,3 +1,8 @@
|
|||
20090201
|
||||
- (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in
|
||||
channels.c too, so move the definition for non-IP6 platforms to defines.h
|
||||
where it can be shared.
|
||||
|
||||
20090129
|
||||
- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
|
||||
If the CYGWIN environment variable is empty, the installer script
|
||||
|
@ -5109,5 +5114,5 @@
|
|||
OpenServer 6 and add osr5bigcrypt support so when someone migrates
|
||||
passwords between UnixWare and OpenServer they will still work. OK dtucker@
|
||||
|
||||
$Id: ChangeLog,v 1.5182 2009/01/29 20:40:30 tim Exp $
|
||||
$Id: ChangeLog,v 1.5183 2009/02/01 11:19:54 dtucker Exp $
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#ifndef _DEFINES_H
|
||||
#define _DEFINES_H
|
||||
|
||||
/* $Id: defines.h,v 1.152 2009/01/07 18:04:12 tim Exp $ */
|
||||
/* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */
|
||||
|
||||
|
||||
/* Constants */
|
||||
|
@ -738,4 +738,8 @@ struct winsize {
|
|||
# define EWOULDBLOCK EAGAIN
|
||||
#endif
|
||||
|
||||
#ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */
|
||||
#define INET6_ADDRSTRLEN 46
|
||||
#endif
|
||||
|
||||
#endif /* _DEFINES_H */
|
||||
|
|
|
@ -70,10 +70,6 @@ extern uid_t original_real_uid;
|
|||
extern uid_t original_effective_uid;
|
||||
extern pid_t proxy_command_pid;
|
||||
|
||||
#ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */
|
||||
#define INET6_ADDRSTRLEN 46
|
||||
#endif
|
||||
|
||||
static int show_other_keys(const char *, Key *);
|
||||
static void warn_changed_key(Key *);
|
||||
|
||||
|
|
Loading…
Reference in New Issue