Enable control socket when run as init process.

* configure.ac (DEFAULT_CONTROL_URL): Rename to
DEFAULT_PIES_CONTROL_URL.  Change default value.
(DEFAULT_INIT_CONTROL_URL): New subst variable.
* lib/libpies.h (pies_basic_url_create): New prototype.
* lib/url.c (pies_basic_url_create): New function (renamed
from pies_url_create).
(pies_url_create): Expand variable references in the input string.
* src/Makefile.am (AM_CPPFLAGS): Pass DEFAULT_INIT_CONTROL_URL
* src/ctl.c (pies_control_url)
(ctl_open): Don't exit on errors, return -1 instead.
* src/pies.c (default_control_url): New variable.
(config_parse): Create default socket url.
(pies_control_url): New macro
(main): Set environment variable PIES_INSTANCE.
Try to open control socket in init process mode as well.
* src/pies.h (default_control_url): New extern.
(ctl_open): Change prototype.
(pies_control_url): Remove.
* src/piesctl-cl.opt (parse_options): Set environment variable
 PIES_INSTANCE.
* src/piesctl.c (parse_config): Use pies_url_create and
DEFAULT_PIES_CONTROL_URL when falling back to the default socket.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/piesctl.c b/src/piesctl.c
index 301e7ac..dba8988 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -188,17 +188,10 @@ parse_config ()
 	url = default_url;
       else
 	{
-	  int rc;
-	  size_t len = 0;
-	  file_name = NULL;
-	  grecs_asprintf (&file_name, &len, DEFAULT_CONTROL_URL, instance);
-	  rc = pies_url_create (&url, file_name);
-	  free (file_name);
-	  
-	  if (rc)
+	  if (pies_url_create (&url, DEFAULT_PIES_CONTROL_URL))
 	    {
 	      grecs_error (NULL, 0, _("%s: cannot create URL: %s"),
-			   DEFAULT_CONTROL_URL, strerror (errno));
+			   DEFAULT_PIES_CONTROL_URL, strerror (errno));
 	      exit (EX_SOFTWARE);
 	    }
 	}