[patch] https://bugs.xelerance.com/issues/1112

openswan-2.6.26-KLIPS-PFKEY-prototypes.patch (text/plain), 1.19 KB, created by Mike Kazantsev on 2010-06-13 19:01:38 UTC

# KLIPS vs. PFKEY: Define prototypes only, if function is enabled in c-source.

# 2010-05-24 Henry N.

diff --git a/programs/pluto/kernel_pfkey.h b/programs/pluto/kernel_pfkey.h
index f92438f..be8f08e 100644
--- a/programs/pluto/kernel_pfkey.h
+++ b/programs/pluto/kernel_pfkey.h
@@ -13,15 +13,19 @@
  * for more details.
  */
 
-#ifdef KLIPS
+#ifdef PFKEY
 extern void init_pfkey(void);
+#ifdef KLIPS
 extern void klips_register_proto(unsigned satype, const char *satypename);
+#endif
 extern void pfkey_close(void);
 
 extern void klips_pfkey_register_response(const struct sadb_msg *msg);
 extern void pfkey_dequeue(void);
 extern void pfkey_event(void);
+#ifdef KLIPS
 extern void klips_pfkey_register(void);
+#endif
 extern bool pfkey_add_sa(struct kernel_sa *sa, bool replace);
 extern bool pfkey_grp_sa(const struct kernel_sa *sa0, const struct kernel_sa *sa1);
 extern bool pfkey_del_sa(const struct kernel_sa *sa);
@@ -54,8 +58,7 @@ extern bool pfkey_shunt_eroute(struct connection *c
 			       , enum pluto_sadb_operations op, const char *opname);
 
 extern int pfkeyfd;
-
-#endif
+#endif /* PFKEY */
 
 #ifdef NETKEY_SUPPORT
 extern void netlink_register_proto(unsigned satype, const char *satypename);