Respect line with in Makefile.am's, other cosmetics

This commit is contained in:
Martin Willi 2010-03-25 14:54:56 +01:00
parent 6d6994c6c9
commit 89bf11d204
35 changed files with 76 additions and 41 deletions

2
NEWS
View File

@ -10,7 +10,7 @@ strongswan-4.4.0
- A new plugin called farp fakes ARP responses for virtual IP addresses - A new plugin called farp fakes ARP responses for virtual IP addresses
handed out to clients from the IKEv2 daemon charon. The plugin lets a handed out to clients from the IKEv2 daemon charon. The plugin lets a
road-warrior act a client on the local LAN if it uses a virtual IP road-warrior act as a client on the local LAN if it uses a virtual IP
from the responders subnet, e.g. acquired using the DHCP plugin. from the responders subnet, e.g. acquired using the DHCP plugin.
- The existing IKEv2 socket implementations have been migrated to the - The existing IKEv2 socket implementations have been migrated to the

View File

@ -297,9 +297,9 @@ struct daemon_t {
void (*keep_cap)(daemon_t *this, u_int cap); void (*keep_cap)(daemon_t *this, u_int cap);
/** /**
* Drop all capabilities of the current process, but keep those that have * Drop all capabilities of the current process.
* been set with a call to keep_cap.
* *
* Drops all capabalities, excect those exlcuded using keep_cap().
* This should be called after the initialization of the daemon because * This should be called after the initialization of the daemon because
* some plugins require the process to keep additional capabilities. * some plugins require the process to keep additional capabilities.
* *
@ -320,13 +320,15 @@ struct daemon_t {
}; };
/** /**
* The one and only instance of the daemon. Set between libcharon_init() and * The one and only instance of the daemon.
* libcharon_deinit() calls. *
* Set between libcharon_init() and libcharon_deinit() calls.
*/ */
extern daemon_t *charon; extern daemon_t *charon;
/** /**
* Initialize libcharon and create the "charon" instance of daemon_t. * Initialize libcharon and create the "charon" instance of daemon_t.
*
* @return FALSE if integrity check failed * @return FALSE if integrity check failed
*/ */
bool libcharon_init(); bool libcharon_init();

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon \ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon \ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libsimaka -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libsimaka
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\" AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic \ AM_CFLAGS = -rdynamic \
-DROUTING_TABLE=${routing_table} \ -DROUTING_TABLE=${routing_table} \

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon ${nm_CFLAGS} INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon ${nm_CFLAGS}
AM_CFLAGS = -rdynamic \ AM_CFLAGS = -rdynamic \
-DNM_CA_DIR=\"${nm_ca_dir}\" -DNM_CA_DIR=\"${nm_ca_dir}\"

View File

@ -1,8 +1,9 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic \ AM_CFLAGS = -rdynamic \
-DRESOLV_CONF=\"${resolv_conf}\" -DRESOLV_CONF=\"${resolv_conf}\"
if MONOLITHIC if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-resolve.la noinst_LTLIBRARIES = libstrongswan-resolve.la

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon ${xml_CFLAGS} INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon ${xml_CFLAGS}
AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\" AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic \ AM_CFLAGS = -rdynamic \
-DPLUGINS=\""${libstrongswan_plugins}\"" -DPLUGINS=\""${libstrongswan_plugins}\""

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/stroke INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/stroke
AM_CFLAGS = \ AM_CFLAGS = \
-rdynamic \ -rdynamic \

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -1,5 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic

View File

@ -23,6 +23,7 @@ typedef struct private_hydra_t private_hydra_t;
* Private additions to hydra_t. * Private additions to hydra_t.
*/ */
struct private_hydra_t { struct private_hydra_t {
/** /**
* Public members of hydra_t. * Public members of hydra_t.
*/ */

View File

@ -39,6 +39,7 @@ typedef struct hydra_t hydra_t;
* IKE Daemon support object. * IKE Daemon support object.
*/ */
struct hydra_t { struct hydra_t {
/** /**
* manager for payload attributes * manager for payload attributes
*/ */
@ -46,13 +47,15 @@ struct hydra_t {
}; };
/** /**
* The single instance of hydra_t. Set between calls to libhydra_init() and * The single instance of hydra_t.
* libhydra_deinit() calls. *
* Set between calls to libhydra_init() and libhydra_deinit() calls.
*/ */
extern hydra_t *hydra; extern hydra_t *hydra;
/** /**
* Initialize libhydra. * Initialize libhydra.
*
* @return FALSE if integrity check failed * @return FALSE if integrity check failed
*/ */
bool libhydra_init(); bool libhydra_init();