Merge remote-tracking branch 'origin/next' into kernel-4.14

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index ccf4f592659828a400344c98c9a67cc6df9b41e3..0a0dd050eb543a41eb24f7d50d66a2d97fcc827c 100644 (file)
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -88,32 +88,22 @@ etc/swanctl/x509crl
 etc/swanctl/x509ocsp
 usr/bin/pki
 #usr/lib/ipsec
-#usr/lib/ipsec/libcharon.a
 #usr/lib/ipsec/libcharon.la
 usr/lib/ipsec/libcharon.so
 usr/lib/ipsec/libcharon.so.0
 usr/lib/ipsec/libcharon.so.0.0.0
-#usr/lib/ipsec/libradius.a
 #usr/lib/ipsec/libradius.la
 usr/lib/ipsec/libradius.so
 usr/lib/ipsec/libradius.so.0
 usr/lib/ipsec/libradius.so.0.0.0
-#usr/lib/ipsec/libstrongswan.a
 #usr/lib/ipsec/libstrongswan.la
 usr/lib/ipsec/libstrongswan.so
 usr/lib/ipsec/libstrongswan.so.0
 usr/lib/ipsec/libstrongswan.so.0.0.0
-#usr/lib/ipsec/libtls.a
 #usr/lib/ipsec/libtls.la
 usr/lib/ipsec/libtls.so
 usr/lib/ipsec/libtls.so.0
 usr/lib/ipsec/libtls.so.0.0.0
-#usr/lib/ipsec/libtpmtss.a
-#usr/lib/ipsec/libtpmtss.la
-usr/lib/ipsec/libtpmtss.so
-usr/lib/ipsec/libtpmtss.so.0
-usr/lib/ipsec/libtpmtss.so.0.0.0
-#usr/lib/ipsec/libvici.a
 #usr/lib/ipsec/libvici.la
 usr/lib/ipsec/libvici.so
 usr/lib/ipsec/libvici.so.0

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 83727162efb74cc9696d61a0234370f4a8fa6877..c65a1f0d2a4a992dec50501f7839d70f84c96314 100644 (file)
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -32,14 +32,14 @@
 
 int main(void)
 {
-   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], protocol[STRING_SIZE];
+   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE];
+   const char* protocol;
    char varmessages[STRING_SIZE], asynclog[STRING_SIZE];
    int config_fd,rc,fd,pid;
    struct stat st;
    struct keyvalue *kv = NULL;
    memset(buffer, 0, STRING_SIZE);
    memset(hostname, 0, STRING_SIZE);
-   memset(protocol, 0, STRING_SIZE);
    memset(varmessages, 0, STRING_SIZE);
    memset(asynclog, 0, STRING_SIZE);