From d725ecd04b7fff0d8ea47988be5a9640c895e9aa Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Tue, 29 May 2012 13:05:45 +0200 Subject: [PATCH] Fixed ppp-2.4.5-eaptls-mppe-0.99.patch, #817011 Added definition of global variable, function pointer (eaptls_check_hook) --- ppp-2.4.5-eaptls-mppe-0.99.patch | 3 ++- ppp.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ppp-2.4.5-eaptls-mppe-0.99.patch b/ppp-2.4.5-eaptls-mppe-0.99.patch index 04d6b26..e0f78d4 100644 --- a/ppp-2.4.5-eaptls-mppe-0.99.patch +++ b/ppp-2.4.5-eaptls-mppe-0.99.patch @@ -283,13 +283,14 @@ diff -Naur ppp-2.4.5/pppd/auth.c ppp-2.4.5-eaptls-mppe-0.99/pppd/auth.c #ifdef CBCP_SUPPORT #include "cbcp.h" #endif -@@ -183,6 +186,11 @@ +@@ -183,6 +186,12 @@ /* Hook for a plugin to get the CHAP password for authenticating us */ int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL; +#ifdef USE_EAPTLS +/* Hook for a plugin to get the EAP-TLS password for authenticating us */ +int (*eaptls_passwd_hook) __P((char *user, char *passwd)) = NULL; +++int (*eaptls_check_hook) __P((void)) = NULL; +#endif + /* Hook for a plugin to say whether it is OK if the peer diff --git a/ppp.spec b/ppp.spec index 956f328..90c8d89 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,7 +1,7 @@ Summary: The Point-to-Point Protocol daemon Name: ppp Version: 2.4.5 -Release: 21%{?dist} +Release: 22%{?dist} License: BSD and LGPLv2+ and GPLv2+ and Public Domain Group: System Environment/Daemons URL: http://www.samba.org/ppp @@ -159,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT %doc PLUGINS %changelog +* Tue May 29 2012 Michal Sekletar +- Resolves: #817011 - fixed ppp-2.4.5-eaptls-mppe-0.99 patch, added variable definition + * Mon May 21 2012 Michal Sekletar - Resolves: #817013 - fixed support for multilink channels in pppol2tp plugin