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

« back to all changes in this revision

Viewing changes to linux/net/ipv4/af_inet.c.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
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:
1
 
RCSID $Id: af_inet.c.fs2_4.patch,v 1.6 2002/04/24 07:36:36 mcr Exp $
2
 
--- ./net/ipv4/af_inet.c.preipsec       Wed Apr 26 15:13:17 2000
3
 
+++ ./net/ipv4/af_inet.c        Fri Jun 30 15:01:27 2000
 
1
RCSID $Id: af_inet.c.fs2_4.patch,v 1.9 2004/11/29 17:53:20 mcr Exp $
 
2
--- linux/net/ipv4/af_inet.c.preipsec   Wed Apr 26 15:13:17 2000
 
3
+++ linux/net/ipv4/af_inet.c    Fri Jun 30 15:01:27 2000
4
4
@@ -1019,6 +1019,17 @@
5
5
        ip_mr_init();
6
6
 #endif
7
7
 
8
 
+#if defined(CONFIG_IPSEC)
 
8
+#if defined(CONFIG_KLIPS)
9
9
+       {
10
 
+               extern /* void */ int ipsec_init(void);
 
10
+               extern /* void */ int ipsec_klips_init(void);
11
11
+               /*
12
12
+                *  Initialise AF_INET ESP and AH protocol support including 
13
13
+                *  e-routing and SA tables
14
14
+                */
15
 
+               ipsec_init();
 
15
+               ipsec_klips_init();
16
16
+       }
17
 
+#endif /* CONFIG_IPSEC */
 
17
+#endif /* CONFIG_KLIPS */
18
18
+
19
19
        /*
20
20
         *      Create all the /proc entries.