aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2016-01-03 16:04:29 +0200
committerSergey Poznyakoff <gray@gnu.org>2016-01-03 16:04:29 +0200
commit82e4f424e9f4ed16f1521c5bd5df31e0f46ce555 (patch)
treea272a6c44aa2634604fb0bae9dc4475fe772a80d
parent85f2fd8d2772506911e95c3e4a0cb2538594b274 (diff)
downloadpies-82e4f424e9f4ed16f1521c5bd5df31e0f46ce555.tar.gz
pies-82e4f424e9f4ed16f1521c5bd5df31e0f46ce555.tar.bz2
Minor changes
-rw-r--r--NEWS12
-rw-r--r--configure.ac8
-rw-r--r--po/POTFILES.in7
-rw-r--r--src/Makefile.am4
-rw-r--r--src/pies.c4
-rw-r--r--src/piesctl.c42
6 files changed, 37 insertions, 40 deletions
diff --git a/NEWS b/NEWS
index 8cdb1a8..8c888f3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,25 @@
-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
- siggroup
This flag instructs pies to send termination signal to the process
group of the process being stopped.
- nullinput
Do not close standard input. Redirect it from /dev/null
instead. Use this option with commands that require their standard
@@ -79,25 +83,25 @@ Version 1.1, 2009-10-20
* Add Polish and Ukrainian translations.
Version 1.0, 2009-10-17
First stand-alone release. Previous versions were released as
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
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
Permission is granted to distribute modified versions
of this document, or of portions of it,
under the above conditions, provided also that they
carry prominent notices stating who last changed them.
Local variables:
diff --git a/configure.ac b/configure.ac
index d1bb2a9..2b492da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,32 +86,32 @@ AM_GNU_GETTEXT_VERSION([0.18])
# PAM
status_pam=maybe
AC_ARG_ENABLE([pam],
AC_HELP_STRING([--enable-pam],
[enable PAM]),
[
case "${enableval}" in
yes) status_pam=yes ;;
no) status_pam=no ;;
*) 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
fi
if test $pam = yes && test $pam != $status_pam; then
AC_MSG_ERROR([required module PAM cannot be built because of missing prerequisites])
fi
fi
AM_CONDITIONAL([PAM_COND], [test $status_pam = yes])
if test $status_pam = yes; then
AC_DEFINE_UNQUOTED(WITH_PAM, 1, [PAM support enabled])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f1878a6..e075bea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,34 +1,35 @@
# 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
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# GNU Pies is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# 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
src/meta.c
src/meta1gram.y
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
lib/strtotok.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 982bd12..9fb29d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
# 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
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# GNU Pies is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
@@ -42,25 +42,25 @@ noinst_HEADERS = \
meta1gram.h\
meta1lex.h\
pies.h\
prog.h\
piesctl-cl.h
meta1lex.c: meta1gram.h
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:
$(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@
cmdline.h: cmdline.opt
piesctl-cl.h: piesctl-cl.opt
pies_LDADD = \
../ident/libident.a\
../lib/libpies.a\
@GRECS_LDADD@\
diff --git a/src/pies.c b/src/pies.c
index bbbc367..e7c1a22 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1928,40 +1928,40 @@ void
request_restart_components (size_t cc, char **cv)
{
char **argv;
size_t i;
argv = xcalloc (cc + 4, sizeof (*argv));
argv[0] = "piesctl";
argv[1] = "--url";
argv[2] = (char*) pies_control_url ();
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);
}
void
list_components (void)
{
char *argv[5];
argv[0] = "piesctl";
argv[1] = "--url";
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);
}
int
pies_reload ()
{
pid_t pid = pidfile_read (1);
if (pid == -1)
{
diff --git a/src/piesctl.c b/src/piesctl.c
index 626463c..b979c09 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -168,54 +168,46 @@ parse_config ()
exit (EX_CONFIG);
}
}
else if (verbose)
printf ("%s: URL not found in %s\n",
program_name, file_name);
}
free (file_name);
}
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);
}
static void
config_help (void)
{
static char docstring[] =
/* TRANSLATORS: do not translate words between ` and ' */
N_("Configuration file structure for piesctl.\n"
"For more information, use `info piesctl configuration'.");
grecs_print_docstring (docstring, 0, stdout);

Return to:

Send suggestions and report system problems to the System administrator.