diff options
author | Martin Schulze <joey@infodrom.org> | 2004-09-13 09:07:18 +0200 |
---|---|---|
committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 19:58:43 +0200 |
commit | ae03fe5d926a63cab418207f760d62a947957123 (patch) | |
tree | aa48cfe56ac7c47fb9b0abce4d4689033d3098d6 /debian/patches/patch.IP_SRCROUTE | |
parent | dd994db23cb7f88732be927fad3a7039bd6301db (diff) | |
download | sendmail-debian/8.12.3-7.1.tar.gz |
Imported Debian patch 8.12.3-7.1debian/8.12.3-7.1
Diffstat (limited to 'debian/patches/patch.IP_SRCROUTE')
-rw-r--r-- | debian/patches/patch.IP_SRCROUTE | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/debian/patches/patch.IP_SRCROUTE b/debian/patches/patch.IP_SRCROUTE deleted file mode 100644 index 84b7ee8..0000000 --- a/debian/patches/patch.IP_SRCROUTE +++ /dev/null @@ -1,94 +0,0 @@ -*** ../../src/conf.h Mon Apr 12 15:12:30 1999 ---- conf.h Thu Apr 8 15:35:20 1999 -*************** -*** 1284,1290 **** - # define ERRLIST_PREDEFINED /* don't declare sys_errlist */ - # define GIDSET_T gid_t /* from <linux/types.h> */ - # define HASGETUSERSHELL 0 /* getusershell(3) broken in Slackware 2.0 */ -! # define IP_SRCROUTE 0 /* linux <= 1.2.8 doesn't support IP_OPTIONS */ - # define USE_SIGLONGJMP 1 /* sigsetjmp needed for signal handling */ - # ifndef HASFLOCK - # include <linux/version.h> ---- 1284,1290 ---- - # define ERRLIST_PREDEFINED /* don't declare sys_errlist */ - # define GIDSET_T gid_t /* from <linux/types.h> */ - # define HASGETUSERSHELL 0 /* getusershell(3) broken in Slackware 2.0 */ -! # define IP_SRCROUTE 1 /* linux <= 1.2.8 doesn't support IP_OPTIONS */ - # define USE_SIGLONGJMP 1 /* sigsetjmp needed for signal handling */ - # ifndef HASFLOCK - # include <linux/version.h> -*** ../../src/daemon.c Mon Apr 12 15:12:30 1999 ---- daemon.c Mon Apr 12 15:37:50 1999 -*************** -*** 42,48 **** - # if IP_SRCROUTE - # include <netinet/in_systm.h> - # include <netinet/ip.h> -! # include <netinet/ip_var.h> - # endif - - /* ---- 42,50 ---- - # if IP_SRCROUTE - # include <netinet/in_systm.h> - # include <netinet/ip.h> -! # ifndef __linux__ -! # include <netinet/ip_var.h> -! # endif - # endif - - /* -*************** -*** 1570,1584 **** - u_char *o; - int l; - struct in_addr addr; - struct ipoption ipopt; -! - ipoptlen = sizeof ipopt; - if (getsockopt(fd, IPPROTO_IP, IP_OPTIONS, - (char *) &ipopt, &ipoptlen) < 0) - goto noipsr; - if (ipoptlen == 0) - goto noipsr; - o = (u_char *) ipopt.ipopt_list; - while (o != NULL && o < (u_char *) &ipopt + ipoptlen) - { - switch (*o) ---- 1572,1593 ---- - u_char *o; - int l; - struct in_addr addr; -+ # ifndef __linux__ - struct ipoption ipopt; -! # else -! struct ip_options ipopt; -! # endif - ipoptlen = sizeof ipopt; - if (getsockopt(fd, IPPROTO_IP, IP_OPTIONS, - (char *) &ipopt, &ipoptlen) < 0) - goto noipsr; - if (ipoptlen == 0) - goto noipsr; -+ # ifndef __linux__ - o = (u_char *) ipopt.ipopt_list; -+ # else -+ o = (u_char *) ipopt.__data; -+ # endif - while (o != NULL && o < (u_char *) &ipopt + ipoptlen) - { - switch (*o) -*************** -*** 1609,1615 **** ---- 1618,1628 ---- - snprintf(p, SPACELEFT(hbuf, p), " [%s@%.*s", - *o == IPOPT_SSRR ? "!" : "", - l > 240 ? 120 : l / 2, -+ # ifndef __linux__ - inet_ntoa(GET_IPOPT_DST(ipopt.ipopt_dst))); -+ # else -+ ipopt.faddr); -+ # endif - i = strlen(p); - p += i; - l -= strlen(p); |