diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-02-01 22:19:54 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-02-01 22:19:54 +1100 |
commit | 642ebe5b51112862f4c041abf6064fe711f56009 (patch) | |
tree | b2c6de5c883700063ec8d0f5a5732093ba7d4229 | |
parent | 0d8f2f3afa1663386ac80a0b7835b6776d5bcae1 (diff) |
- (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.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | defines.h | 6 | ||||
-rw-r--r-- | sshconnect.c | 4 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20090201 | ||
2 | - (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in | ||
3 | channels.c too, so move the definition for non-IP6 platforms to defines.h | ||
4 | where it can be shared. | ||
5 | |||
1 | 20090129 | 6 | 20090129 |
2 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. | 7 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. |
3 | If the CYGWIN environment variable is empty, the installer script | 8 | If the CYGWIN environment variable is empty, the installer script |
@@ -5109,5 +5114,5 @@ | |||
5109 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5114 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5110 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5115 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5111 | 5116 | ||
5112 | $Id: ChangeLog,v 1.5182 2009/01/29 20:40:30 tim Exp $ | 5117 | $Id: ChangeLog,v 1.5183 2009/02/01 11:19:54 dtucker Exp $ |
5113 | 5118 | ||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.152 2009/01/07 18:04:12 tim Exp $ */ | 28 | /* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -738,4 +738,8 @@ struct winsize { | |||
738 | # define EWOULDBLOCK EAGAIN | 738 | # define EWOULDBLOCK EAGAIN |
739 | #endif | 739 | #endif |
740 | 740 | ||
741 | #ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */ | ||
742 | #define INET6_ADDRSTRLEN 46 | ||
743 | #endif | ||
744 | |||
741 | #endif /* _DEFINES_H */ | 745 | #endif /* _DEFINES_H */ |
diff --git a/sshconnect.c b/sshconnect.c index 1c4c744ec..c04aa1057 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -70,10 +70,6 @@ extern uid_t original_real_uid; | |||
70 | extern uid_t original_effective_uid; | 70 | extern uid_t original_effective_uid; |
71 | extern pid_t proxy_command_pid; | 71 | extern pid_t proxy_command_pid; |
72 | 72 | ||
73 | #ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */ | ||
74 | #define INET6_ADDRSTRLEN 46 | ||
75 | #endif | ||
76 | |||
77 | static int show_other_keys(const char *, Key *); | 73 | static int show_other_keys(const char *, Key *); |
78 | static void warn_changed_key(Key *); | 74 | static void warn_changed_key(Key *); |
79 | 75 | ||