11 files changed, 250 insertions, 166 deletions

diff --git a/configure.ac b/configure.ac
index ae3a9c7..3a23a1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,2 +127,26 @@ AC_ARG_ENABLE([inetd],
 
+sysvinit_status=maybe
+AC_ARG_ENABLE([sysvinit],
+ AC_HELP_STRING([--enable-sysvinit],
+                [compile the SystemV init support]),
+ [sysvinit_status=$enableval])
+
+if test $sysvinit_status = "maybe"; then
+  AC_TRY_COMPILE([#ifdef  HAVE_UTMPX_H
+# include <utmpx.h>
+#else
+# include <utmp.h>
+#endif
+],
+[int x = RUN_LVL;],
+[sysvinit_status=yes],
+[sysvinit_status=no])
+fi
+
+test $sysvinit_status = "no"
+PIES_SYSVINIT_ENABLED=$?
+AC_DEFINE_UNQUOTED([PIES_SYSVINIT_ENABLED],[$PIES_SYSVINIT_ENABLED],
+                   [whether SystemV init support is compiled])
+AM_CONDITIONAL([PIES_COND_SYSVINIT],[test $sysvinit_status = "yes"])
+
 AH_BOTTOM([
@@ -149,2 +173,24 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
+AC_CONFIG_COMMANDS([status],[
+cat <<EOF
+Configuration summary:
+
+URL of the control API ............................. $control_url
+PAM support ........................................ $status_pam
+SystemV initialization support ..................... $sysvinit_status
+EOF
+if test $sysvinit_status = "yes"; then
+  cat <<EOF
+URL of the SystemV init ............................ $sysvinit_control_url
+Emergency shell .................................... $emergency_shell
+EOF
+fi
+],
+[sysvinit_status=$sysvinit_status
+control_url=`echo "$DEFAULT_PIES_CONTROL_URL" | sed 's/\\\$/\\\\\$/g'`
+sysvinit_control_url=$DEFAULT_INIT_CONTROL_URL
+emergency_shell=$EMERGENCY_SHELL
+status_pam=$status_pam
+])
+
 AC_CONFIG_FILES([Makefile
diff --git a/grecs b/grecs
-Subproject 12304127b52650588877f00b0c4b32dae083e85
+Subproject ee35adccec058a5a8cc62f5030b9a925168236d
diff --git a/src/Makefile.am b/src/Makefile.am
index 16f8a75..925da88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,11 @@ pies_SOURCES = \
  socket.c\
- sysdep.c\
- sysvinit.c\
- utmp.c\
  userprivs.c
 
+if PIES_COND_SYSVINIT
+pies_SOURCES += \
+ sysvinit.c\
+ sysdep.c\
+ utmp.c
+endif
+
 noinst_HEADERS = \
diff --git a/src/cmdline.opt b/src/cmdline.opt
index d2aaf6d..d9d90e1 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -120,2 +120,3 @@ END
 
+CPP(#if PIES_SYSVINIT_ENABLED)
 OPTION(telinit,T,,
@@ -126,2 +127,3 @@ BEGIN
 END
+CPP(#endif)
 
@@ -222,3 +224,3 @@ parse_options (int *pargc, char ***pargv)
   
-  if (init_process)
+  if (SYSVINIT_ACTIVE)
     {
diff --git a/src/comp.c b/src/comp.c
index 6eeeeed..7b2b373 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -676,2 +676,5 @@ component_verify (struct component *comp, grecs_locus_t *locus)
     default:
+      if (PIES_SYSVINIT_ENABLED && comp->mode >= pies_mark_sysvinit)
+        COMPERR (grecs_error,
+                 "%s", _("SystemV init support is not compiled in"));
       /* FIXME: more checks perhaps */
diff --git a/src/ctl.c b/src/ctl.c
index d9a8998..5609f19 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -920,2 +920,6 @@ static void res_programs (struct ctlio *, enum http_method, char const *,
                           struct json_value *);
+static void res_conf (struct ctlio *, enum http_method, char const *,
+                      struct json_value *);
+
+#if PIES_SYSVINIT_ENABLED
 static void res_runlevel (struct ctlio *, enum http_method, char const *,
@@ -924,6 +928,5 @@ static void res_environ  (struct ctlio *, enum http_method, char const *,
                           struct json_value *);
-static void res_conf (struct ctlio *, enum http_method, char const *,
-                      struct json_value *);
-
 static int pred_sysvinit (void);
+#endif
+
 
@@ -945,4 +948,6 @@ static struct ctlio_resource restab[] = {
     res_programs },
+#if PIES_SYSVINIT_ENABLED
   { S(/runlevel), CTL_ADMIN_STATE, pred_sysvinit, res_runlevel },
   { S(/environ),  CTL_ADMIN_STATE, pred_sysvinit, res_environ },
+#endif
   { NULL }
@@ -2119,2 +2124,3 @@ res_programs (struct ctlio *io, enum http_method meth,
 
+#if PIES_SYSVINIT_ENABLED
 static int
@@ -2166,2 +2172,85 @@ res_runlevel (struct ctlio *io, enum http_method meth,
 
+/* GET /environ          -     List entire environment
+ *   ["RUNLEVEL=3", "CONSOLE=/dev/tty", ...]  
+ * GET /environ/NAME     -     Get value of variable NAME
+ *   { "status":"OK", "value":"..." }
+ *   { "status":"ER", "error_message":"..." }
+ * DELETE /environ/NAME  -     Unset variable
+ *   { "status":"OK" }
+ *   { "status":"ER", "error_message":"..." }
+ * PUT /environ/NAME=VALUE -   Set variable 
+ *   { "status":"OK" }
+ *   { "status":"ER", "error_message":"..." }
+ */
+static void
+env_reply (struct ctlio *io, int ok, int rc)
+{
+  switch (rc)
+    {
+    case 0:
+      io->code = ok;
+      io->output.reply = json_reply_create ();
+      json_object_set_string (io->output.reply, "status", "OK");
+      break;
+
+    case 1:
+      ctlio_reply (io, 403, NULL);
+      break;
+      
+    case -1:
+      ctlio_reply (io, 404, NULL);
+    }
+}
+
+static void
+res_environ (struct ctlio *io, enum http_method meth,
+             char const *uri, struct json_value *json)
+{
+  if (meth == METH_GET)
+    {
+      if (uri && uri[1])
+        {
+          char *value;
+          
+          if (sysvinit_envlocate (uri + 1, &value) == -1)
+            ctlio_reply (io, 404, NULL);
+          else
+            {
+              env_reply (io, 200, 0);
+              json_object_set_string (io->output.reply, "value", "%s", value);
+            }
+        }
+      else
+        {
+          size_t i;
+      
+          io->output.reply = json_new_array ();
+          io->code = 200;
+          for (i = 0; sysvinit_environ_hint[i]; i++)
+            {
+              json_array_append (io->output.reply,
+                                 json_new_string (sysvinit_environ_hint[i]));
+            }
+        }
+    }
+  else if (meth == METH_DELETE)
+    {
+      if (!(uri && uri[0]))
+        ctlio_reply (io, 400, NULL);
+      else
+        env_reply (io, 200, sysvinit_envupdate (uri + 1));
+    }
+  else if (meth == METH_PUT)
+    {
+      if (!(uri && uri[0]))
+        ctlio_reply (io, 400, NULL);
+      else
+        env_reply (io, 201, sysvinit_envupdate (uri + 1));
+    }
+  else
+    ctlio_reply (io, 405, NULL);
+    
+}
+#endif
+
 /* GET /conf/runtime     -     List configuration
@@ -2410,82 +2499 @@ res_conf (struct ctlio *io, enum http_method meth,
 
-/* GET /environ          -     List entire environment
- *   ["RUNLEVEL=3", "CONSOLE=/dev/tty", ...]  
- * GET /environ/NAME     -     Get value of variable NAME
- *   { "status":"OK", "value":"..." }
- *   { "status":"ER", "error_message":"..." }
- * DELETE /environ/NAME  -     Unset variable
- *   { "status":"OK" }
- *   { "status":"ER", "error_message":"..." }
- * PUT /environ/NAME=VALUE -   Set variable 
- *   { "status":"OK" }
- *   { "status":"ER", "error_message":"..." }
- */
-static void
-env_reply (struct ctlio *io, int ok, int rc)
-{
-  switch (rc)
-    {
-    case 0:
-      io->code = ok;