whitelist cleanups

diff --git a/lib/planetlab.c b/lib/planetlab.c
index a412940..b1a4e8e 100644 (file)
--- a/lib/planetlab.c
+++ b/lib/planetlab.c
@@ -249,8 +249,6 @@ pl_get_limits(char *context, struct sliver_resources *slr)
     {"rlimits/openfd.soft", &slr->vs_openfd.soft},
     {"rlimits/openfd.min", &slr->vs_openfd.min},
 
-    {"whitelisted", &slr->vs_whitelisted},
-
     {"bcapabilities", NULL},
     {0,0}
   };
@@ -277,8 +275,6 @@ pl_get_limits(char *context, struct sliver_resources *slr)
   slr->vs_openfd.soft = VC_LIM_KEEP;
   slr->vs_openfd.min = VC_LIM_KEEP;
 
-  slr->vs_whitelisted = 1;
-
   slr->vs_capabilities.bcaps = 0;
   slr->vs_capabilities.bmask = 0;
   slr->vs_capabilities.ccaps = 0;

diff --git a/lib/planetlab.h b/lib/planetlab.h
index ef6aad4..38a5634 100644 (file)
--- a/lib/planetlab.h
+++ b/lib/planetlab.h
@@ -43,7 +43,6 @@ struct sliver_resources {
   struct vc_rlimit vs_as;
   struct vc_rlimit vs_nproc;
   struct vc_rlimit vs_openfd;
-  unsigned long long vs_whitelisted;
   struct vc_ctx_caps vs_capabilities;
 };
 

diff --git a/src/vsh.c b/src/vsh.c
index ee6ba76..8ea3645 100644 (file)
--- a/src/vsh.c
+++ b/src/vsh.c
@@ -48,6 +48,7 @@
 
 #undef CONFIG_VSERVER_LEGACY
 
+#if 0
 /* Base for all vserver roots for chroot */
 #define VSERVER_ROOT_BASE       "/vservers"
 
@@ -208,13 +209,6 @@ static int sandbox_processes(xid_t ctx, char *context)
            exit(1);
          }
 
-       /* check whether the slice has been taken off of the whitelist */
-       if (slr.vs_whitelisted==0)
-         {
-           fprintf(stderr, "*** %s: %s has not been allocated resources on this node ***\n", hostname, context);
-           exit(0);
-         }
-
        /* check whether the slice has been suspended */
        if (slr.vs_cpu==0)
          {
@@ -479,3 +473,10 @@ int main(int argc, char **argv)
 
     return 0; /* shutup compiler */
 }
+#else
+int main(int argc, char *argv[])
+{
+       
+       return 0;
+}
+#endif