[svn-upgrade] Integrating new upstream version, strongswan (4.3.2)

1 files changed, 29 insertions, 31 deletions

diff --git a/src/pluto/kernel_noklips.c b/src/pluto/kernel_noklips.c
index 4ac3eb153..82a6ab648 100644
--- a/src/pluto/kernel_noklips.c
+++ b/src/pluto/kernel_noklips.c
@@ -13,8 +13,6 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
- *
- * RCSID $Id: kernel_noklips.c 3252 2007-10-06 21:24:50Z andreas $
  */
 
 #include <errno.h>
@@ -39,7 +37,7 @@
 #include "kernel.h"
 #include "kernel_noklips.h"
 #include "log.h"
-#include "whack.h"	/* for RC_LOG_SERIOUS */
+#include "whack.h"      /* for RC_LOG_SERIOUS */
 
 void
 init_noklips(void)
@@ -71,30 +69,30 @@ noklips_register(void)
 
 static bool
 noklips_raw_eroute(const ip_address *this_host UNUSED
-		   , const ip_subnet *this_client UNUSED
-		   , const ip_address *that_host UNUSED
-		   , const ip_subnet *that_client UNUSED
-		   , ipsec_spi_t spi UNUSED
-		   , unsigned int satype UNUSED
-		   , unsigned int transport_proto UNUSED
-		   , const struct pfkey_proto_info *proto_info UNUSED
-		   , time_t use_lifetime UNUSED
-		   , unsigned int op UNUSED
-		   , const char *text_said UNUSED)
+				   , const ip_subnet *this_client UNUSED
+				   , const ip_address *that_host UNUSED
+				   , const ip_subnet *that_client UNUSED
+				   , ipsec_spi_t spi UNUSED
+				   , unsigned int satype UNUSED
+				   , unsigned int transport_proto UNUSED
+				   , const struct pfkey_proto_info *proto_info UNUSED
+				   , time_t use_lifetime UNUSED
+				   , unsigned int op UNUSED
+				   , const char *text_said UNUSED)
 {
   return TRUE;
 }
 
 static bool
 noklips_add_sa(const struct kernel_sa *sa UNUSED
-	       , bool replace UNUSED)
+			   , bool replace UNUSED)
 {
   return TRUE;
 }
 
 static bool
 noklips_grp_sa(const struct kernel_sa *sa0 UNUSED
-	       , const struct kernel_sa *sa1 UNUSED)
+			   , const struct kernel_sa *sa1 UNUSED)
 {
   return TRUE;
 }
@@ -107,20 +105,20 @@ noklips_del_sa(const struct kernel_sa *sa UNUSED)
 
 
 const struct kernel_ops noklips_kernel_ops = {
-	type: KERNEL_TYPE_NONE,
-	async_fdp: NULL,
-	
-	init: init_noklips,
-	pfkey_register: noklips_register,
-	pfkey_register_response: noklips_register_response,
-	process_queue: noklips_dequeue,
-	process_msg: noklips_event,
-	raw_eroute: noklips_raw_eroute,
-	add_sa: noklips_add_sa,
-	grp_sa: noklips_grp_sa,
-	del_sa: noklips_del_sa,
-	get_sa: NULL,
-	get_spi: NULL,
-        inbound_eroute: FALSE,
-	policy_lifetime: FALSE
+		type: KERNEL_TYPE_NONE,
+		async_fdp: NULL,
+		
+		init: init_noklips,
+		pfkey_register: noklips_register,
+		pfkey_register_response: noklips_register_response,
+		process_queue: noklips_dequeue,
+		process_msg: noklips_event,
+		raw_eroute: noklips_raw_eroute,
+		add_sa: noklips_add_sa,
+		grp_sa: noklips_grp_sa,
+		del_sa: noklips_del_sa,
+		get_sa: NULL,
+		get_spi: NULL,
+		inbound_eroute: FALSE,
+		policy_lifetime: FALSE
 };