diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-01-03 16:04:29 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-01-03 16:04:29 +0200 |
commit | 82e4f424e9f4ed16f1521c5bd5df31e0f46ce555 (patch) | |
tree | a272a6c44aa2634604fb0bae9dc4475fe772a80d | |
parent | 85f2fd8d2772506911e95c3e4a0cb2538594b274 (diff) | |
download | pies-82e4f424e9f4ed16f1521c5bd5df31e0f46ce555.tar.gz pies-82e4f424e9f4ed16f1521c5bd5df31e0f46ce555.tar.bz2 |
Minor changes
-rw-r--r-- | NEWS | 12 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | po/POTFILES.in | 7 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/pies.c | 4 | ||||
-rw-r--r-- | src/piesctl.c | 42 |
6 files changed, 37 insertions, 40 deletions
@@ -1,3 +1,3 @@ -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. @@ -8,3 +8,7 @@ Please send Pies bug reports to <bug-pies@gnu.org> or -Version 1.2.91 (Git) +Version 1.2.92 (Git) + +* Control interface + +* SysV init support @@ -90,3 +94,3 @@ Copyright information: -Copyright (C) 2009-2015 Sergey Poznyakoff +Copyright (C) 2009-2016 Sergey Poznyakoff diff --git a/configure.ac b/configure.ac index d1bb2a9..2b492da 100644 --- a/configure.ac +++ b/configure.ac @@ -97,10 +97,10 @@ 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) diff --git a/po/POTFILES.in b/po/POTFILES.in index f1878a6..e075bea 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,3 +2,3 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2013 Sergey Poznyakoff +# Copyright (C) 2007-2010, 2013, 2016 Sergey Poznyakoff @@ -18,3 +18,3 @@ src/acl.c -src/addrfmt.c +lib/addrfmt.c src/depmap.c @@ -28,4 +28,5 @@ src/progman.c src/socket.c -src/url.c +lib/url.c src/userprivs.c +src/piesctl.c diff --git a/src/Makefile.am b/src/Makefile.am index 982bd12..9fb29d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ # This file is part of GNU Pies. -# Copyright (C) 2008-2013 Sergey Poznyakoff +# Copyright (C) 2008-2016 Sergey Poznyakoff # @@ -53,3 +53,3 @@ 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 @@ -1939,3 +1939,3 @@ request_restart_components (size_t cc, char **cv) argv[3 + i] = NULL; - execv (argv[0], argv); + execvp (argv[0], argv); logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno)); @@ -1954,3 +1954,3 @@ list_components (void) argv[4] = NULL; - execv (argv[0], argv); + execvp (argv[0], argv); logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno)); diff --git a/src/piesctl.c b/src/piesctl.c index 626463c..b979c09 100644 --- a/src/piesctl.c +++ b/src/piesctl.c @@ -179,32 +179,24 @@ parse_config () { - 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) |