summaryrefslogtreecommitdiff
path: root/src/charon/plugins/smp
diff options
context:
space:
mode:
Diffstat (limited to 'src/charon/plugins/smp')
-rw-r--r--src/charon/plugins/smp/Makefile.in2
-rw-r--r--src/charon/plugins/smp/smp.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/charon/plugins/smp/Makefile.in b/src/charon/plugins/smp/Makefile.in
index 198526abb..b255b08fb 100644
--- a/src/charon/plugins/smp/Makefile.in
+++ b/src/charon/plugins/smp/Makefile.in
@@ -188,6 +188,8 @@ localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
+nm_CFLAGS = @nm_CFLAGS@
+nm_LIBS = @nm_LIBS@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
piddir = @piddir@
diff --git a/src/charon/plugins/smp/smp.c b/src/charon/plugins/smp/smp.c
index 3b7fa0070..0870cad4c 100644
--- a/src/charon/plugins/smp/smp.c
+++ b/src/charon/plugins/smp/smp.c
@@ -12,7 +12,7 @@
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
- * $Id: smp.c 4073 2008-06-20 07:14:35Z martin $
+ * $Id: smp.c 4358 2008-09-25 13:56:23Z tobias $
*/
#include <stdlib.h>
@@ -181,7 +181,7 @@ static void write_childend(xmlTextWriterPtr writer, child_sa_t *child, bool loca
*/
static void write_child(xmlTextWriterPtr writer, child_sa_t *child)
{
- mode_t mode;
+ ipsec_mode_t mode;
encryption_algorithm_t encr;
integrity_algorithm_t int_algo;
size_t encr_len, int_len;
@@ -360,7 +360,7 @@ static void request_query_config(xmlTextReaderPtr reader, xmlTextWriterPtr write
* callback which logs to a XML writer
*/
static bool xml_callback(xmlTextWriterPtr writer, signal_t signal, level_t level,
- ike_sa_t* ike_sa, char* format, va_list args)
+ ike_sa_t* ike_sa, void *data, char* format, va_list args)
{
if (level <= 1)
{