summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 12:35:08 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 12:35:08 +1100
commit30947c72878e2dd1e6cf614d73bae226ab863b60 (patch)
tree0323f87eaf0bd6175077697f08005c582fdae3b1
parentd194048f573136f1c2c34d25f951b78f4ffc7d77 (diff)
- (djm) Bug #501: gai_strerror should return char*;
fix from dtucker@zip.com.au
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/fake-getaddrinfo.c4
-rw-r--r--openbsd-compat/fake-getaddrinfo.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b2d744843..fab77a966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,8 @@
79 ...sizeof(&adat.session) is not good here. 79 ...sizeof(&adat.session) is not good here.
80 henning@, deraadt@, millert@ 80 henning@, deraadt@, millert@
81 - (djm) Add new object files to Makefile and reorder 81 - (djm) Add new object files to Makefile and reorder
82 - (djm) Bug #501: gai_strerror should return char*;
83 fix from dtucker@zip.com.au
82 84
8320030211 8520030211
84 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com 86 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1179,4 +1181,4 @@
1179 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1181 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1180 ok provos@ 1182 ok provos@
1181 1183
1182$Id: ChangeLog,v 1.2616 2003/02/24 01:18:46 djm Exp $ 1184$Id: ChangeLog,v 1.2617 2003/02/24 01:35:08 djm Exp $
diff --git a/openbsd-compat/fake-getaddrinfo.c b/openbsd-compat/fake-getaddrinfo.c
index 2a2f269cb..e04776606 100644
--- a/openbsd-compat/fake-getaddrinfo.c
+++ b/openbsd-compat/fake-getaddrinfo.c
@@ -12,10 +12,10 @@
12#include "includes.h" 12#include "includes.h"
13#include "ssh.h" 13#include "ssh.h"
14 14
15RCSID("$Id: fake-getaddrinfo.c,v 1.3 2003/02/05 23:50:42 djm Exp $"); 15RCSID("$Id: fake-getaddrinfo.c,v 1.4 2003/02/24 01:35:09 djm Exp $");
16 16
17#ifndef HAVE_GAI_STRERROR 17#ifndef HAVE_GAI_STRERROR
18const char *gai_strerror(int ecode) 18char *gai_strerror(int ecode)
19{ 19{
20 switch (ecode) { 20 switch (ecode) {
21 case EAI_NODATA: 21 case EAI_NODATA:
diff --git a/openbsd-compat/fake-getaddrinfo.h b/openbsd-compat/fake-getaddrinfo.h
index a14a2cc11..6943378e9 100644
--- a/openbsd-compat/fake-getaddrinfo.h
+++ b/openbsd-compat/fake-getaddrinfo.h
@@ -1,4 +1,4 @@
1/* $Id: fake-getaddrinfo.h,v 1.3 2003/02/05 23:50:43 djm Exp $ */ 1/* $Id: fake-getaddrinfo.h,v 1.4 2003/02/24 01:35:09 djm Exp $ */
2 2
3#ifndef _FAKE_GETADDRINFO_H 3#ifndef _FAKE_GETADDRINFO_H
4#define _FAKE_GETADDRINFO_H 4#define _FAKE_GETADDRINFO_H
@@ -37,7 +37,7 @@ int getaddrinfo(const char *hostname, const char *servname,
37#endif /* !HAVE_GETADDRINFO */ 37#endif /* !HAVE_GETADDRINFO */
38 38
39#ifndef HAVE_GAI_STRERROR 39#ifndef HAVE_GAI_STRERROR
40const char *gai_strerror(int ecode); 40char *gai_strerror(int ecode);
41#endif /* !HAVE_GAI_STRERROR */ 41#endif /* !HAVE_GAI_STRERROR */
42 42
43#ifndef HAVE_FREEADDRINFO 43#ifndef HAVE_FREEADDRINFO