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,3 +1,3 @@
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.
@@ -8,3 +8,7 @@ Please send Pies bug reports to <bug-pies@gnu.org> or
8 8
9Version 1.2.91 (Git) 9Version 1.2.92 (Git)
10
11* Control interface
12
13* SysV init support
10 14
@@ -90,3 +94,3 @@ Copyright information:
90 94
91Copyright (C) 2009-2015 Sergey Poznyakoff 95Copyright (C) 2009-2016 Sergey Poznyakoff
92 96
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])
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)
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 @@
2 2
3# Copyright (C) 2007, 2008, 2009, 2010, 2013 Sergey Poznyakoff 3# Copyright (C) 2007-2010, 2013, 2016 Sergey Poznyakoff
4 4
@@ -18,3 +18,3 @@
18src/acl.c 18src/acl.c
19src/addrfmt.c 19lib/addrfmt.c
20src/depmap.c 20src/depmap.c
@@ -28,4 +28,5 @@ src/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
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 @@
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#
@@ -53,3 +53,3 @@ incdir=$(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
diff --git a/src/pies.c b/src/pies.c
index bbbc367..e7c1a22 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1939,3 +1939,3 @@ request_restart_components (size_t cc, char **cv)
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));
@@ -1954,3 +1954,3 @@ list_components (void)
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));
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 ()
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)

Return to:

Send suggestions and report system problems to the System administrator.