6 files changed, 37 insertions, 40 deletions

diff --git a/NEWS b/NEWS
index 8cdb1a8..8c888f3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
-GNU Pies NEWS -- history of user-visible changes. 2015-01-21
-Copyright (C) 2009-2015 Sergey Poznyakoff
+GNU Pies NEWS -- history of user-visible changes. 2016-01-03
+Copyright (C) 2009-2016 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send Pies bug reports to <bug-pies@gnu.org> or
 <bug-pies@gnu.org.ua>
 
 
-Version 1.2.91 (Git)
+Version 1.2.92 (Git)
+
+* Control interface
+
+* SysV init support
 
 * New flags
 
@@ -88,7 +92,7 @@ part of Mailfromd (http://mailfromd.software.gnu.org.ua).
 =========================================================================
 Copyright information:
 
-Copyright (C) 2009-2015 Sergey Poznyakoff
+Copyright (C) 2009-2016 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/configure.ac b/configure.ac
index d1bb2a9..2b492da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,14 +95,14 @@ case "${enableval}" in
   *)   AC_MSG_ERROR([bad value ${enableval} for --enable-pam]) ;;
 esac],[status_pam=maybe])
 
-AC_SUBST(PAM_LIBS,-lpam)
+AC_SUBST(PAM_LIBS)
 if test "$status_pam" != "no"; then
-  pam=$status_pam
   AC_CHECK_HEADERS(security/pam_appl.h)
   if test "$ac_cv_header_security_pam_appl_h" = "yes"; then
-    AC_CHECK_LIB(dl, dlopen, [PAM_LIBS="$PAM_LIBS -ldl"])
+    AC_CHECK_LIB(dl, dlopen, [PAM_LIBS="-ldl"])
     AC_CHECK_LIB(pam, pam_start,
-                 [status_pam=yes],
+                 [status_pam=yes
+                  PAM_LIBS="-lpam $PAM_LIBS"],
                  [status_pam=no], $PAM_LIBS)
   else
     status_pam=no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f1878a6..e075bea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of files in GNU Pies which contain translatable strings.
 
-# Copyright (C) 2007, 2008, 2009, 2010, 2013 Sergey Poznyakoff
+# Copyright (C) 2007-2010, 2013, 2016 Sergey Poznyakoff
 
 # GNU Pies is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # along with GNU Pies.  If not, see <http://www.gnu.org/licenses/>.
 
 src/acl.c
-src/addrfmt.c
+lib/addrfmt.c
 src/depmap.c
 src/diag.c
 src/limits.c
@@ -26,8 +26,9 @@ src/meta1lex.l
 src/pies.c
 src/progman.c
 src/socket.c
-src/url.c
+lib/url.c
 src/userprivs.c
+src/piesctl.c
 
 lib/parsetime.c
 lib/proctitle.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 982bd12..9fb29d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU Pies.
-# Copyright (C) 2008-2013 Sergey Poznyakoff
+# Copyright (C) 2008-2016 Sergey Poznyakoff
 #
 # GNU Pies is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ BUILT_SOURCES=cmdline.h piesctl-cl.h
 
 incdir=$(pkgdatadir)/$(VERSION)/include
 inc_DATA = pp-setup
-EXTRA_DIST = cmdline.opt pp-setup inetd.in
+EXTRA_DIST = cmdline.opt piesctl-cl.opt pp-setup inetd.in
 
 SUFFIXES=.opt .c .h
 .opt.h:
diff --git a/src/pies.c b/src/pies.c
index bbbc367..e7c1a22 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1937,7 +1937,7 @@ request_restart_components (size_t cc, char **cv)
   for (i = 0; i < cc; i++)
     argv[3 + i] = cv[i];
   argv[3 + i] = NULL;
-  execv (argv[0], argv);
+  execvp (argv[0], argv);
   logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno));
   exit (EX_OSFILE);
 }
@@ -1952,7 +1952,7 @@ list_components (void)
   argv[2] = (char*) pies_control_url ();
   argv[3] = "list";
   argv[4] = NULL;
-  execv (argv[0], argv);
+  execvp (argv[0], argv);
   logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno));
   exit (EX_OSFILE);
 }
diff --git a/src/piesctl.c b/src/piesctl.c
index 626463c..b979c09 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -177,36 +177,28 @@ parse_config ()
 
   if (!url)
     {
-      if (strcmp (instance, "pies") == 0)
+      if (verbose)
+        printf ("%s: falling back to default URL\n", program_name);
+      if (default_url)
+        url = default_url;
+      else
         {
-          if (verbose)
-            printf ("%s: falling back to default URL\n", program_name);
-          if (default_url)
-            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)
             {
-              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)
-                {
-                  grecs_error (NULL, 0, _("%s: cannot create URL: %s"),
-                               DEFAULT_CONTROL_URL, strerror (errno));
-                  exit (EX_SOFTWARE);
-                }
+              grecs_error (NULL, 0, _("%s: cannot create URL: %s"),
+                           DEFAULT_CONTROL_URL, strerror (errno));
+              exit (EX_SOFTWARE);
             }
         }
-      else
-        {
-          grecs_error (NULL, 0, _("socket name for instance %s not configured"),
-                       instance);
-          exit (EX_CONFIG);
-        }
     }
+  
   if (verbose)
     printf ("%s: using URL %s\n", program_name, url->string);
 }