aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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,15 +1,19 @@
1GNU Pies NEWS -- history of user-visible changes. 2015-01-21 1GNU Pies NEWS -- history of user-visible changes. 2016-01-03
2Copyright (C) 2009-2015 Sergey Poznyakoff 2Copyright (C) 2009-2016 Sergey Poznyakoff
3See the end of file for copying conditions. 3See the end of file for copying conditions.
4 4
5Please send Pies bug reports to <bug-pies@gnu.org> or 5Please send Pies bug reports to <bug-pies@gnu.org> or
6<bug-pies@gnu.org.ua> 6<bug-pies@gnu.org.ua>
7 7
8 8
9Version 1.2.91 (Git) 9Version 1.2.92 (Git)
10
11* Control interface
12
13* SysV init support
10 14
11* New flags 15* New flags
12 16
13- siggroup 17- siggroup
14 18
15This flag instructs pies to send termination signal to the process 19This flag instructs pies to send termination signal to the process
@@ -85,13 +89,13 @@ First stand-alone release. Previous versions were released as
85part of Mailfromd (http://mailfromd.software.gnu.org.ua). 89part of Mailfromd (http://mailfromd.software.gnu.org.ua).
86 90
87 91
88========================================================================= 92=========================================================================
89Copyright information: 93Copyright information:
90 94
91Copyright (C) 2009-2015 Sergey Poznyakoff 95Copyright (C) 2009-2016 Sergey Poznyakoff
92 96
93 Permission is granted to anyone to make or distribute verbatim copies 97 Permission is granted to anyone to make or distribute verbatim copies
94 of this document as received, in any medium, provided that the 98 of this document as received, in any medium, provided that the
95 copyright notice and this permission notice are preserved, 99 copyright notice and this permission notice are preserved,
96 thus giving the recipient permission to redistribute in turn. 100 thus giving the recipient permission to redistribute in turn.
97 101
diff --git a/configure.ac b/configure.ac
index d1bb2a9..2b492da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,20 +92,20 @@ AC_ARG_ENABLE([pam],
92case "${enableval}" in 92case "${enableval}" in
93 yes) status_pam=yes ;; 93 yes) status_pam=yes ;;
94 no) status_pam=no ;; 94 no) status_pam=no ;;
95 *) AC_MSG_ERROR([bad value ${enableval} for --enable-pam]) ;; 95 *) AC_MSG_ERROR([bad value ${enableval} for --enable-pam]) ;;
96esac],[status_pam=maybe]) 96esac],[status_pam=maybe])
97 97
98AC_SUBST(PAM_LIBS,-lpam) 98AC_SUBST(PAM_LIBS)
99if test "$status_pam" != "no"; then 99if test "$status_pam" != "no"; then
100 pam=$status_pam
101 AC_CHECK_HEADERS(security/pam_appl.h) 100 AC_CHECK_HEADERS(security/pam_appl.h)
102 if test "$ac_cv_header_security_pam_appl_h" = "yes"; then 101 if test "$ac_cv_header_security_pam_appl_h" = "yes"; then
103 AC_CHECK_LIB(dl, dlopen, [PAM_LIBS="$PAM_LIBS -ldl"]) 102 AC_CHECK_LIB(dl, dlopen, [PAM_LIBS="-ldl"])
104 AC_CHECK_LIB(pam, pam_start, 103 AC_CHECK_LIB(pam, pam_start,
105 [status_pam=yes], 104 [status_pam=yes
105 PAM_LIBS="-lpam $PAM_LIBS"],
106 [status_pam=no], $PAM_LIBS) 106 [status_pam=no], $PAM_LIBS)
107 else 107 else
108 status_pam=no 108 status_pam=no
109 fi 109 fi
110 if test $pam = yes && test $pam != $status_pam; then 110 if test $pam = yes && test $pam != $status_pam; then
111 AC_MSG_ERROR([required module PAM cannot be built because of missing prerequisites]) 111 AC_MSG_ERROR([required module PAM cannot be built because of missing prerequisites])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f1878a6..e075bea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
1# List of files in GNU Pies which contain translatable strings. 1# List of files in GNU Pies which contain translatable strings.
2 2
3# Copyright (C) 2007, 2008, 2009, 2010, 2013 Sergey Poznyakoff 3# Copyright (C) 2007-2010, 2013, 2016 Sergey Poznyakoff
4 4
5# GNU Pies is free software; you can redistribute it and/or modify 5# GNU Pies is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 3, or (at your option) 7# the Free Software Foundation; either version 3, or (at your option)
8# any later version. 8# any later version.
9 9
@@ -13,22 +13,23 @@
13# GNU General Public License for more details. 13# GNU General Public License for more details.
14 14
15# You should have received a copy of the GNU General Public License 15# You should have received a copy of the GNU General Public License
16# along with GNU Pies. If not, see <http://www.gnu.org/licenses/>. 16# along with GNU Pies. If not, see <http://www.gnu.org/licenses/>.
17 17
18src/acl.c 18src/acl.c
19src/addrfmt.c 19lib/addrfmt.c
20src/depmap.c 20src/depmap.c
21src/diag.c 21src/diag.c
22src/limits.c 22src/limits.c
23src/meta.c 23src/meta.c
24src/meta1gram.y 24src/meta1gram.y
25src/meta1lex.l 25src/meta1lex.l
26src/pies.c 26src/pies.c
27src/progman.c 27src/progman.c
28src/socket.c 28src/socket.c
29src/url.c 29lib/url.c
30src/userprivs.c 30src/userprivs.c
31src/piesctl.c
31 32
32lib/parsetime.c 33lib/parsetime.c
33lib/proctitle.c 34lib/proctitle.c
34lib/strtotok.c 35lib/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,8 +1,8 @@
1# This file is part of GNU Pies. 1# This file is part of GNU Pies.
2# Copyright (C) 2008-2013 Sergey Poznyakoff 2# Copyright (C) 2008-2016 Sergey Poznyakoff
3# 3#
4# GNU Pies is free software; you can redistribute it and/or modify 4# GNU Pies is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -48,13 +48,13 @@ noinst_HEADERS = \
48meta1lex.c: meta1gram.h 48meta1lex.c: meta1gram.h
49 49
50BUILT_SOURCES=cmdline.h piesctl-cl.h 50BUILT_SOURCES=cmdline.h piesctl-cl.h
51 51
52incdir=$(pkgdatadir)/$(VERSION)/include 52incdir=$(pkgdatadir)/$(VERSION)/include
53inc_DATA = pp-setup 53inc_DATA = pp-setup
54EXTRA_DIST = cmdline.opt pp-setup inetd.in 54EXTRA_DIST = cmdline.opt piesctl-cl.opt pp-setup inetd.in
55 55
56SUFFIXES=.opt .c .h 56SUFFIXES=.opt .c .h
57.opt.h: 57.opt.h:
58 $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@ 58 $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@
59 59
60cmdline.h: cmdline.opt 60cmdline.h: cmdline.opt
diff --git a/src/pies.c b/src/pies.c
index bbbc367..e7c1a22 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1934,13 +1934,13 @@ request_restart_components (size_t cc, char **cv)
1934 argv[0] = "piesctl"; 1934 argv[0] = "piesctl";
1935 argv[1] = "--url"; 1935 argv[1] = "--url";
1936 argv[2] = (char*) pies_control_url (); 1936 argv[2] = (char*) pies_control_url ();
1937 for (i = 0; i < cc; i++) 1937 for (i = 0; i < cc; i++)
1938 argv[3 + i] = cv[i]; 1938 argv[3 + i] = cv[i];
1939 argv[3 + i] = NULL; 1939 argv[3 + i] = NULL;
1940 execv (argv[0], argv); 1940 execvp (argv[0], argv);
1941 logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno)); 1941 logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno));
1942 exit (EX_OSFILE); 1942 exit (EX_OSFILE);
1943} 1943}
1944 1944
1945void 1945void
1946list_components (void) 1946list_components (void)
@@ -1949,13 +1949,13 @@ list_components (void)
1949 1949
1950 argv[0] = "piesctl"; 1950 argv[0] = "piesctl";
1951 argv[1] = "--url"; 1951 argv[1] = "--url";
1952 argv[2] = (char*) pies_control_url (); 1952 argv[2] = (char*) pies_control_url ();
1953 argv[3] = "list"; 1953 argv[3] = "list";
1954 argv[4] = NULL; 1954 argv[4] = NULL;
1955 execv (argv[0], argv); 1955 execvp (argv[0], argv);
1956 logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno)); 1956 logmsg (LOG_ERR, "can't run piesctl: %s", strerror (errno));
1957 exit (EX_OSFILE); 1957 exit (EX_OSFILE);
1958} 1958}
1959 1959
1960 1960
1961int 1961int
diff --git a/src/piesctl.c b/src/piesctl.c
index 626463c..b979c09 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -174,42 +174,34 @@ parse_config ()
174 } 174 }
175 free (file_name); 175 free (file_name);
176 } 176 }
177 177
178 if (!url) 178 if (!url)
179 { 179 {
180 if (strcmp (instance, "pies") == 0) 180 if (verbose)
181 printf ("%s: falling back to default URL\n", program_name);
182 if (default_url)
183 url = default_url;
184 else
181 { 185 {
182 if (verbose) 186 int rc;
183 printf ("%s: falling back to default URL\n", program_name); 187 size_t len = 0;
184 if (default_url) 188 file_name = NULL;
185 url = default_url; 189 grecs_asprintf (&file_name, &len, DEFAULT_CONTROL_URL, instance);
186 else 190 rc = pies_url_create (&url, file_name);
191 free (file_name);
192
193 if (rc)
187 { 194 {
188 int rc; 195 grecs_error (NULL, 0, _("%s: cannot create URL: %s"),
189 size_t len = 0; 196 DEFAULT_CONTROL_URL, strerror (errno));
190 file_name = NULL; 197 exit (EX_SOFTWARE);
191 grecs_asprintf (&file_name, &len, DEFAULT_CONTROL_URL, instance);
192 rc = pies_url_create (&url, file_name);
193 free (file_name);
194
195 if (rc)
196 {
197 grecs_error (NULL, 0, _("%s: cannot create URL: %s"),
198 DEFAULT_CONTROL_URL, strerror (errno));
199 exit (EX_SOFTWARE);
200 }
201 } 198 }
202 } 199 }
203 else
204 {
205 grecs_error (NULL, 0, _("socket name for instance %s not configured"),
206 instance);
207 exit (EX_CONFIG);
208 }
209 } 200 }
201
210 if (verbose) 202 if (verbose)
211 printf ("%s: using URL %s\n", program_name, url->string); 203 printf ("%s: using URL %s\n", program_name, url->string);
212} 204}
213 205
214static void 206static void
215config_help (void) 207config_help (void)

Return to:

Send suggestions and report system problems to the System administrator.