Indent/Depend
authorRobert Swiecki <swiecki@google.com>
Mon, 29 Feb 2016 17:56:52 +0000 (18:56 +0100)
committerRobert Swiecki <swiecki@google.com>
Mon, 29 Feb 2016 17:56:52 +0000 (18:56 +0100)
Makefile
net.c

index 53b624f998b80b479f263e1fd8ec542af660a0e8..b9c8e84c2fe97d9c4ac47e09819988e4d2407243 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ indent:
 
 nsjail.o: nsjail.h cmdline.h common.h log.h net.h subproc.h
 cmdline.o: cmdline.h common.h log.h util.h
-contain.o: contain.h common.h log.h
+contain.o: contain.h common.h log.h net.h util.h
 log.o: log.h common.h
 net.o: net.h common.h log.h
 subproc.o: subproc.h common.h contain.h log.h net.h sandbox.h util.h
diff --git a/net.c b/net.c
index 00f153f21421f74255c598b8ae0ad9ab1c1a168f..0c52c8422a4ee51d03df7ace1d0e148355367a5c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -98,7 +98,8 @@ bool netCloneMacVtapAndNS(struct nsjconf_t *nsjconf, int pid)
 
        char *const argv_add[] =
            { "ip", "link", "add", "link", (char *)nsjconf->iface, "name", IFACE_NAME, "netns",
-pid_str, "type", "macvlan", "mode", "bridge", NULL };
+               pid_str, "type", "macvlan", "mode", "bridge", NULL
+       };
        if (netSystemSbinIp(nsjconf, argv_add) == false) {
                LOG_E("Couldn't create MACVTAP interface for '%s'", nsjconf->iface);
                return false;