Merge pull request #9 from sroettger/newuidmap

Support more complex uid and gid mappings

diff --cc cmdline.c
index 9937dd15bae55474515be65b92ee4d40ed9b434d,c60ca7b4bf57d7de5bed0b62c6e6f27ba40646e3..84a60526605252c9cd962cfa7742e9f272b180db
--- 1/cmdline.c
--- 2/cmdline.c
+++ b/cmdline.c
@@@ -116,13 -112,26 +116,27 @@@ void cmdlineLogParams(struct nsjconf_t 
             logYesNo(nsjconf->clone_newuser), logYesNo(nsjconf->clone_newns),
             logYesNo(nsjconf->clone_newpid), logYesNo(nsjconf->clone_newipc),
             logYesNo(nsjconf->clone_newuts), logYesNo(nsjconf->clone_newcgroup),
 -           logYesNo(nsjconf->apply_sandbox), logYesNo(nsjconf->keep_caps), nsjconf->tmpfs_size);
 +           logYesNo(nsjconf->apply_sandbox), logYesNo(nsjconf->keep_caps), nsjconf->tmpfs_size,
 +           logYesNo(nsjconf->disable_no_new_privs));
  
-       struct mounts_t *p;
-       TAILQ_FOREACH(p, &nsjconf->mountpts, pointers) {
-               LOG_I("Mount point: src:'%s' dst:'%s' type:'%s' flags:0x%tx options:'%s'",
-                     p->src, p->dst, p->fs_type, p->flags, p->options);
+       {
+               struct mounts_t *p;
+               TAILQ_FOREACH(p, &nsjconf->mountpts, pointers) {
+                       LOG_I("Mount point: src:'%s' dst:'%s' type:'%s' flags:0x%tx options:'%s'",
+                                               p->src, p->dst, p->fs_type, p->flags, p->options);
+               }
+       }
+       {
+               struct mapping_t *p;
+               TAILQ_FOREACH(p, &nsjconf->uid_mappings, pointers) {
+                       LOG_I("Uid mapping: inside_uid:'%s' outside_uid:'%s' count:'%s'",
+                                               p->inside_id, p->outside_id, p->count);
+               }
+ 
+               TAILQ_FOREACH(p, &nsjconf->gid_mappings, pointers) {
+                       LOG_I("Gid mapping: inside_uid:'%s' outside_uid:'%s' count:'%s'",
+                                               p->inside_id, p->outside_id, p->count);
+               }
        }
  }
  

diff --cc common.h
Simple merge