From 9c5366446a335ca5b53ca3b8813a971ba2b01080 Mon Sep 17 00:00:00 2001
From: Clavister OpenSource <opensource@clavister.com>
Date: Thu, 1 Dec 2011 14:08:24 +0100
Subject: IKEv1 XAuth: Added plugin support for XAuth, which allows us to have
 plugins to talk to servers with different quirks for XAuth authentication.

---
 src/libcharon/daemon.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/libcharon/daemon.h')

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 2e01c8d9b..a887eab79 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -149,6 +149,7 @@ typedef struct daemon_t daemon_t;
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
 #include <sa/authenticators/eap/eap_manager.h>
+#include <sa/authenticators/xauth/xauth_manager.h>
 
 #ifdef ME
 #include <sa/connect_manager.h>
@@ -235,6 +236,11 @@ struct daemon_t {
 	 */
 	eap_manager_t *eap;
 
+	/**
+	 * XAuth manager to maintain registered XAuth methods
+	 */
+	xauth_manager_t *xauth;
+
 #ifdef ME
 	/**
 	 * Connect manager
-- 
cgit v1.2.3


From 15a682f4c23d0b8340b31077698e6f6d924c2861 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Mon, 19 Dec 2011 13:10:29 +0100
Subject: Separated libcharon/sa directory with ikev1 and ikev2 subfolders

---
 src/libcharon/daemon.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libcharon/daemon.h')

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index a887eab79..785ad23bf 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -148,12 +148,12 @@ typedef struct daemon_t daemon_t;
 #include <sa/trap_manager.h>
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
-#include <sa/authenticators/eap/eap_manager.h>
-#include <sa/authenticators/xauth/xauth_manager.h>
+#include <sa/ikev2/authenticators/eap/eap_manager.h>
+#include <sa/ikev1/authenticators/xauth/xauth_manager.h>
 
 #ifdef ME
-#include <sa/connect_manager.h>
-#include <sa/mediation_manager.h>
+#include <sa/ikev2/connect_manager.h>
+#include <sa/ikev2/mediation_manager.h>
 #endif /* ME */
 
 /**
-- 
cgit v1.2.3


From 326a94232d1286336e63fe3b4603f1fcdd6fe0fa Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Mon, 19 Dec 2011 15:22:50 +0100
Subject: Moved eap/xauth classes out of protocol specific subdirectories

---
 src/libcharon/daemon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libcharon/daemon.h')

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 785ad23bf..bfbf774ff 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -148,8 +148,8 @@ typedef struct daemon_t daemon_t;
 #include <sa/trap_manager.h>
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
-#include <sa/ikev2/authenticators/eap/eap_manager.h>
-#include <sa/ikev1/authenticators/xauth/xauth_manager.h>
+#include <sa/eap/eap_manager.h>
+#include <sa/xauth/xauth_manager.h>
 
 #ifdef ME
 #include <sa/ikev2/connect_manager.h>
-- 
cgit v1.2.3