make it compile under c++11 (e.g. ubuntu trusty)

diff --git a/Makefile b/Makefile
index ade7784..c37691b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ COMMON_FLAGS += -O2 -c \
        -Ikafel/include
 
 CXXFLAGS += $(COMMON_FLAGS) $(shell pkg-config --cflags protobuf) \
-       -std=c++14 -fno-exceptions -Wno-unused -Wno-unused-parameter
+       -std=c++11 -fno-exceptions -Wno-unused -Wno-unused-parameter
 LDFLAGS += -pie -Wl,-z,noexecstack -lpthread $(shell pkg-config --libs protobuf)
 
 BIN = nsjail

diff --git a/cmdline.cc b/cmdline.cc
index 8ca6464..034fcbe 100644 (file)
--- a/cmdline.cc
+++ b/cmdline.cc
@@ -308,7 +308,8 @@ static std::string argByColon(const char* str, size_t pos) {
 }
 
 std::unique_ptr<nsjconf_t> parseArgs(int argc, char* argv[]) {
-       std::unique_ptr<nsjconf_t> nsjconf = std::make_unique<nsjconf_t>();
+       std::unique_ptr<nsjconf_t> nsjconf;
+       nsjconf.reset(new nsjconf_t);
 
        nsjconf->use_execveat = false;
        nsjconf->exec_fd = -1;

diff --git a/net.cc b/net.cc
index 6c9b091..1b290a9 100644 (file)
--- a/net.cc
+++ b/net.cc
@@ -302,7 +302,8 @@ static bool ifaceUp(const char* ifacename) {
                return false;
        }
 
-       struct ifreq ifr = {};
+       struct ifreq ifr;
+       memset(&ifr, '\0', sizeof(ifr));
        snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", ifacename);
 
        if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) {
@@ -324,7 +325,8 @@ static bool ifaceUp(const char* ifacename) {
 }
 
 static bool netConfigureVs(nsjconf_t* nsjconf) {
-       struct ifreq ifr = {};
+       struct ifreq ifr;
+       memset(&ifr, '\0', sizeof(ifr));
        snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", IFACE_NAME);
        struct in_addr addr;
 
@@ -385,7 +387,8 @@ static bool netConfigureVs(nsjconf_t* nsjconf) {
                return true;
        }
 
-       struct rtentry rt = {};
+       struct rtentry rt;
+       memset(&rt, '\0', sizeof(rt));
 
        struct sockaddr_in* sdest = (struct sockaddr_in*)(&rt.rt_dst);
        struct sockaddr_in* smask = (struct sockaddr_in*)(&rt.rt_genmask);