summaryrefslogtreecommitdiffstats
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 b2d74484..fab77a96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,8 @@
...sizeof(&adat.session) is not good here.
henning@, deraadt@, millert@
- (djm) Add new object files to Makefile and reorder
+ - (djm) Bug #501: gai_strerror should return char*;
+ fix from dtucker@zip.com.au
20030211
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1179,4 +1181,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2616 2003/02/24 01:18:46 djm Exp $
+$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 2a2f269c..e0477660 100644
--- a/openbsd-compat/fake-getaddrinfo.c
+++ b/openbsd-compat/fake-getaddrinfo.c
@@ -12,10 +12,10 @@
#include "includes.h"
#include "ssh.h"
-RCSID("$Id: fake-getaddrinfo.c,v 1.3 2003/02/05 23:50:42 djm Exp $");
+RCSID("$Id: fake-getaddrinfo.c,v 1.4 2003/02/24 01:35:09 djm Exp $");
#ifndef HAVE_GAI_STRERROR
-const char *gai_strerror(int ecode)
+char *gai_strerror(int ecode)
{
switch (ecode) {
case EAI_NODATA:
diff --git a/openbsd-compat/fake-getaddrinfo.h b/openbsd-compat/fake-getaddrinfo.h
index a14a2cc1..6943378e 100644
--- a/openbsd-compat/fake-getaddrinfo.h
+++ b/openbsd-compat/fake-getaddrinfo.h
@@ -1,4 +1,4 @@
-/* $Id: fake-getaddrinfo.h,v 1.3 2003/02/05 23:50:43 djm Exp $ */
+/* $Id: fake-getaddrinfo.h,v 1.4 2003/02/24 01:35:09 djm Exp $ */
#ifndef _FAKE_GETADDRINFO_H
#define _FAKE_GETADDRINFO_H
@@ -37,7 +37,7 @@ int getaddrinfo(const char *hostname, const char *servname,
#endif /* !HAVE_GETADDRINFO */
#ifndef HAVE_GAI_STRERROR
-const char *gai_strerror(int ecode);
+char *gai_strerror(int ecode);
#endif /* !HAVE_GAI_STRERROR */
#ifndef HAVE_FREEADDRINFO