backing out to version 208 of util-vserver

[util-vserver.git] / src / chcontext.c

diff --git a/src/chcontext.c b/src/chcontext.c
index e41203c..fe66a22 100644 (file)
--- a/src/chcontext.c
+++ b/src/chcontext.c
@@ -1,4 +1,4 @@
-// $Id: chcontext.c 2403 2006-11-24 23:06:08Z dhozac $
+// $Id: chcontext.c,v 1.24 2005/03/22 15:05:24 ensc Exp $
 
 // Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 // based on chcontext.cc by Jacques Gelinas
@@ -95,10 +95,6 @@ static void
 showHelp(int fd, char const *cmd, int res)
 {
   VSERVER_DECLARE_CMD(cmd);
-
-#if !defined(VC_ENABLE_API_COMPAT) && !defined(VC_ENABLE_API_LEGACY)
-  WRITE_MSG(1, "ERROR: tools were built without legacy API support; chcontext will not work!\n\n");
-#endif
   
   WRITE_MSG(fd, "Usage: ");
   WRITE_STR(fd, cmd);
@@ -182,8 +178,6 @@ showVersion()
   exit(0);
 }
 
-#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY)
-
 static inline void
 setCap(char const *str, uint32_t *add_caps, uint32_t *remove_caps)
 {
@@ -272,9 +266,6 @@ tellContext(xid_t ctx)
 
 #include "context-sync.hc"
 
-#endif
-
-
 int main (int argc, char *argv[])
 {
   struct Arguments args = {
@@ -287,13 +278,10 @@ int main (int argc, char *argv[])
     .hostname      = 0,
     .domainname    = 0
   };
-
-#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY)
   xid_t                newctx;
   int          xflags;
   int          p[2][2];
   pid_t                pid;
-#endif
   
   global_args = &args;
   signal(SIGCHLD, SIG_DFL);
@@ -310,7 +298,6 @@ int main (int argc, char *argv[])
       case CMD_DOMAINNAME      :  args.domainname    = optarg; break;
       case CMD_HOSTNAME                :  args.hostname      = optarg; break;
        
-#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY)
       case CMD_CAP             :
        setCap(optarg, &args.add_caps, &args.remove_caps);
        break;
@@ -329,23 +316,17 @@ int main (int argc, char *argv[])
        }
        args.ctxs[args.nbctx++] = Evc_xidopt2xid(optarg, true);
        break;
-#else
-      case CMD_CAP             :
-      case CMD_SECURE          :
-      case CMD_FLAG            :
-      case CMD_CTX             :  break;
-#endif 
+
          
       default          :
        WRITE_MSG(2, "Try '");
        WRITE_STR(2, argv[0]);
-       WRITE_MSG(2, " --help' for more information.\n");
+       WRITE_MSG(2, " --help\" for more information.\n");
        return 255;
        break;
     }
   }
 
-#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY)
   if (optind>=argc) {
     WRITE_MSG(2, "No command given; use '--help' for more information.\n");
     exit(255);
@@ -383,14 +364,8 @@ int main (int argc, char *argv[])
 
   waitOnSync(pid, p, args.ctxs[0]!=VC_DYNAMIC_XID);
   return EXIT_SUCCESS;
-#else
-  WRITE_MSG(2, "chcontext: tools were built without legacy API support; can not continue\n");
-  return EXIT_FAILURE;
-#endif
 }
 
-#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY)
-
 #ifdef ENSC_TESTSUITE
 #define FLAG_TEST(STR,EXP) \
   {                       \
@@ -419,7 +394,3 @@ test()
   CAP_TEST("!CAP_CHOWN", 0, 1);
 }
 #endif
-
-#else
-void test() {}
-#endif