← Back to branch summary

~ubuntu-branches/ubuntu/hardy/openswan/hardy-updates

« back to all changes in this revision

Viewing changes to nat-t/include/net/sock.h.fs2_4.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rene Mayrhofer
  • Date: 2005-01-27 16:10:11 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050127161011-idgybmyz3vwhpfiq
Tags: 2.3.0-2
http://bugs.debian.org/292458
http://bugs.debian.org/291143
Urgency HIGH due to security issue and problems with build-deps in sarge.
* Fix the security issue. Please see
  http://www.idefense.com/application/poi/display?id=190&
      type=vulnerabilities&flashstatus=false
  for more details. Thanks to Martin Schulze for informing me about
  this issue.
  Closes: #292458: Openswan XAUTH/PAM Buffer Overflow Vulnerability
* Added a Build-Dependency to lynx.
  Closes: #291143: openswan: FTBFS: Missing build dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nat-t/include/net/sock.h.fs2_4.patch
1
 
--- ./include/net/sock.h        2002/02/06 15:25:10     1.1
2
 
+++ ./include/net/sock.h        2002/05/22 12:14:56
3
 
@@ -245,6 +245,13 @@
4
 
        __u32   end_seq;
 
1
--- linux/include/net/sock.h    2002/02/06 15:25:10     1.1
 
2
+++ linux/include/net/sock.h    2002/05/22 12:14:56
 
3
@@ -488,7 +488,13 @@
 
4
        } bictcp;
5
5
 };
6
6
 
 
7
-       
7
8
+#if 1
8
9
+#define UDP_OPT_IN_SOCK 1
9
10
+struct udp_opt {
11
12
+};
12
13
+#endif
13
14
+
14
 
 struct tcp_opt {
15
 
        int     tcp_header_len; /* Bytes of tcp header to send          */
16
 
 
17
 
@@ -584,6 +590,9 @@
 
15
 /*
 
16
  * This structure really needs to be cleaned up.
 
17
  * Most of it is for TCP, and not used by any of
 
18
@@ -655,6 +661,9 @@
18
19
 #if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE)
19
20
                struct spx_opt          af_spx;
20
21
 #endif /* CONFIG_SPX */
21
22
+#if 1
22
 
+               struct udp_opt          af_udp;
 
23
+               struct udp_opt          af_udp;
23
24
+#endif
24
25
 
25
26
        } tp_pinfo;