summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2006-11-06 23:09:18 +0000
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:21 +0200
commitfbbdb79b12e67ec10e0c810773367c6188789cc5 (patch)
tree48d07a8a13b754ae4671fd79fcd420c60b59da39
parent9f769a4c2497c180f14c863155e866fae20c3707 (diff)
downloadinetutils-fbbdb79b12e67ec10e0c810773367c6188789cc5.tar.gz
Fix implicit conversions to int for return value
Making the code segfault on 64 bit architectures. Closes: #395216, #395218 Thanks-to: Dann Frazier <dannf@debian.org>
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/43_ret_converted_to_int.patch25
-rw-r--r--debian/patches/series1
3 files changed, 30 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5c644ea..6752d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ inetutils (2:1.5.dfsg.1-2) UNRELEASED; urgency=low
- debian/patches/41_gethostbyname_segfault.patch: Likewise.
* Fix file descriptor leaks (from the Coverity reports).
- debian/patches/42_syslogd_leaks.patch: New file.
+ * Fix implicit conversions to int for return value making the code segfault
+ on 64 bit architectures. (Closes: #395216, #395218)
+ - debian/patches/43_ret_converted_to_int.patch: New file.
+ Thanks to Dann Frazier <dannf@debian.org>.
-- Guillem Jover <guillem@debian.org> Mon, 6 Nov 2006 07:23:09 +0200
diff --git a/debian/patches/43_ret_converted_to_int.patch b/debian/patches/43_ret_converted_to_int.patch
new file mode 100644
index 0000000..951446d
--- /dev/null
+++ b/debian/patches/43_ret_converted_to_int.patch
@@ -0,0 +1,25 @@
+Index: rsh/rsh.c
+===================================================================
+--- rsh/rsh.c.orig 2006-11-07 01:01:29.000000000 +0200
++++ rsh/rsh.c 2006-11-07 01:01:46.000000000 +0200
+@@ -70,6 +70,8 @@
+ # include <sys/select.h>
+ #endif
+
++#include "xalloc.h"
++
+ #ifdef SHISHI
+ #define REALM_SZ 1040
+ #endif
+Index: telnet/authenc.c
+===================================================================
+--- telnet/authenc.c.orig 2006-11-07 01:01:06.000000000 +0200
++++ telnet/authenc.c 2006-11-07 01:01:14.000000000 +0200
+@@ -40,6 +40,7 @@ static char sccsid[] = "@(#)authenc.c 8.
+ #include <arpa/telnet.h>
+ #include <libtelnet/encrypt.h>
+ #include <libtelnet/misc.h>
++#include <unistd.h>
+
+ #include "general.h"
+ #include "ring.h"
diff --git a/debian/patches/series b/debian/patches/series
index c54897c..7e8db5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
40_ftpd_LOGCMD_NULL.patch -p0
41_gethostbyname_segfault.patch -p0
42_syslogd_leaks.patch -p0
+43_ret_converted_to_int.patch -p0