aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--lib/libpies.h1
-rw-r--r--src/Makefile.am6
-rw-r--r--src/progman.c5
-rw-r--r--tests/accept.at2
-rw-r--r--tests/builtin.at2
-rw-r--r--tests/inet.at2
-rw-r--r--tests/maxinst.at8
-rw-r--r--tests/passfd.at2
-rw-r--r--tests/version.at2
10 files changed, 17 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 3a23a1a..149657d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,6 +173,7 @@ AM_MISSING_PROG([AUTOM4TE], [autom4te])
173 173
174AC_CONFIG_COMMANDS([status],[ 174AC_CONFIG_COMMANDS([status],[
175cat <<EOF 175cat <<EOF
176
176Configuration summary: 177Configuration summary:
177 178
178URL of the control API ............................. $control_url 179URL of the control API ............................. $control_url
@@ -185,6 +186,7 @@ URL of the SystemV init ............................ $sysvinit_control_url
185Emergency shell .................................... $emergency_shell 186Emergency shell .................................... $emergency_shell
186EOF 187EOF
187fi 188fi
189echo
188], 190],
189[sysvinit_status=$sysvinit_status 191[sysvinit_status=$sysvinit_status
190control_url=`echo "$DEFAULT_PIES_CONTROL_URL" | sed 's/\\\$/\\\\\$/g'` 192control_url=`echo "$DEFAULT_PIES_CONTROL_URL" | sed 's/\\\$/\\\\\$/g'`
diff --git a/lib/libpies.h b/lib/libpies.h
index 40364a6..9086712 100644
--- a/lib/libpies.h
+++ b/lib/libpies.h
@@ -20,6 +20,7 @@
20#include <gettext.h> 20#include <gettext.h>
21#include <netinet/in.h> 21#include <netinet/in.h>
22#include <sys/un.h> 22#include <sys/un.h>
23#include <sys/socket.h>
23#include <grecs.h> 24#include <grecs.h>
24 25
25#if defined HAVE_SYSCONF && defined _SC_OPEN_MAX 26#if defined HAVE_SYSCONF && defined _SC_OPEN_MAX
diff --git a/src/Makefile.am b/src/Makefile.am
index 925da88..d30eab8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,14 +68,16 @@ pies_LDADD = \
68 @GRECS_LDADD@\ 68 @GRECS_LDADD@\
69 ../gnu/libgnu.a\ 69 ../gnu/libgnu.a\
70 $(MF_PROCTITLE_LIBS)\ 70 $(MF_PROCTITLE_LIBS)\
71 @PAM_LIBS@ 71 @PAM_LIBS@\
72 $(LTLIBINTL) $(LTLIBICONV)
72 73
73piesctl_SOURCES = piesctl.c 74piesctl_SOURCES = piesctl.c
74 75
75piesctl_LDADD = \ 76piesctl_LDADD = \
76 ../lib/libpies.a\ 77 ../lib/libpies.a\
77 @GRECS_LDADD@\ 78 @GRECS_LDADD@\
78 ../gnu/libgnu.a 79 ../gnu/libgnu.a\
80 $(LTLIBINTL) $(LTLIBICONV)
79 81
80pkgstatedir=$(localstatedir)/pies 82pkgstatedir=$(localstatedir)/pies
81 83
diff --git a/src/progman.c b/src/progman.c
index 70ebf68..e255c33 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -1501,10 +1501,7 @@ prog_start_prerequisites (struct prog *prog)
1501 } 1501 }
1502 1502
1503 if (!prog->active) 1503 if (!prog->active)
1504 { 1504 return 1;
1505 prog->active = 0;
1506 return 1;
1507 }
1508 1505
1509 p = comp->prog; 1506 p = comp->prog;
1510 switch (p->v.p.status) 1507 switch (p->v.p.status)
diff --git a/tests/accept.at b/tests/accept.at
index f76a05a..f222d6a 100644
--- a/tests/accept.at
+++ b/tests/accept.at
@@ -34,7 +34,7 @@ component pfd {
34 stderr file "$PWD/log.err"; 34 stderr file "$PWD/log.err";
35} 35}
36component controller { 36component controller {
37 command "nt $PIES_TEST_INET_SOCKET -i input"; 37 command "nt -i input $PIES_TEST_INET_SOCKET";
38} 38}
39_EOT 39_EOT
40 40
diff --git a/tests/builtin.at b/tests/builtin.at
index 893f213..80f060c 100644
--- a/tests/builtin.at
+++ b/tests/builtin.at
@@ -37,7 +37,7 @@ component in {
37 stderr file "$PWD/log.err"; 37 stderr file "$PWD/log.err";
38} 38}
39component controller { 39component controller {
40 command "nt $PIES_TEST_INET_SOCKET -i input -o output"; 40 command "nt -i input -o output $PIES_TEST_INET_SOCKET";
41 return-code * { 41 return-code * {
42 action disable; 42 action disable;
43 exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown"; 43 exec "piesctl --url '$PIES_CTLSOCK' --no-netrc shutdown";
diff --git a/tests/inet.at b/tests/inet.at
index 893e45f..7d1d99f 100644
--- a/tests/inet.at
+++ b/tests/inet.at
@@ -31,7 +31,7 @@ component in {
31 stderr file "$PWD/log.err"; 31 stderr file "$PWD/log.err";
32} 32}
33component controller { 33component controller {
34 command "nt $PIES_TEST_INET_SOCKET -i input"; 34 command "nt -i input $PIES_TEST_INET_SOCKET";
35} 35}
36_EOT 36_EOT
37set -e 37set -e
diff --git a/tests/maxinst.at b/tests/maxinst.at
index f67d15e..c3b642b 100644
--- a/tests/maxinst.at
+++ b/tests/maxinst.at
@@ -37,7 +37,7 @@ quit
37 37
38cat > pies.conf <<_EOT 38cat > pies.conf <<_EOT
39component in { 39component in {
40 command "$auxdir/in.test /tmp/in.log"; 40 command "$auxdir/in.test $PWD/in.log";
41 mode inetd; 41 mode inetd;
42 socket "$PIES_TEST_INET_SOCKET"; 42 socket "$PIES_TEST_INET_SOCKET";
43 stderr file "$PWD/in.err"; 43 stderr file "$PWD/in.err";
@@ -45,17 +45,17 @@ component in {
45 max-instances-message "too many instances running\n"; 45 max-instances-message "too many instances running\n";
46} 46}
47component con1 { 47component con1 {
48 command "nt $PIES_TEST_INET_SOCKET -i in1 -o con1.out"; 48 command "nt -i in1 -o con1.out $PIES_TEST_INET_SOCKET";
49 stderr file "/tmp/con1.err"; 49 stderr file "/tmp/con1.err";
50} 50}
51component con2 { 51component con2 {
52 command "nt $PIES_TEST_INET_SOCKET -i in2 -o con2.out"; 52 command "nt -i in2 -o con2.out $PIES_TEST_INET_SOCKET";
53 stderr file "/tmp/con2.err"; 53 stderr file "/tmp/con2.err";
54 flags (disable); 54 flags (disable);
55} 55}
56component con3 { 56component con3 {
57 flags (disable); 57 flags (disable);
58 command "nt $PIES_TEST_INET_SOCKET -o con3.out"; 58 command "nt -o con3.out $PIES_TEST_INET_SOCKET";
59 stderr file "/tmp/con3.err"; 59 stderr file "/tmp/con3.err";
60 return-code * { 60 return-code * {
61 action disable; 61 action disable;
diff --git a/tests/passfd.at b/tests/passfd.at
index 8a7eecb..11fbece 100644
--- a/tests/passfd.at
+++ b/tests/passfd.at
@@ -37,7 +37,7 @@ component pfd {
37 stderr file "$PWD/log.err"; 37 stderr file "$PWD/log.err";
38} 38}
39component controller { 39component controller {
40 command "nt $PIES_TEST_INET_SOCKET -i input"; 40 command "nt -i input $PIES_TEST_INET_SOCKET";
41} 41}
42_EOT 42_EOT
43 43
diff --git a/tests/version.at b/tests/version.at
index 4d71ee1..bbf0144 100644
--- a/tests/version.at
+++ b/tests/version.at
@@ -16,7 +16,7 @@
16 16
17AT_SETUP([GNU pies version]) 17AT_SETUP([GNU pies version])
18 18
19AT_CHECK([pies --version | sed '1{s/ *[\[.*\]]//;q}' ], 19AT_CHECK([pies --version | sed -n '1{s/ *[\[.*\]]//;p;}' ],
20 [0], 20 [0],
21 [pies (AT_PACKAGE_NAME) AT_PACKAGE_VERSION 21 [pies (AT_PACKAGE_NAME) AT_PACKAGE_VERSION
22], 22],

Return to:

Send suggestions and report system problems to the System administrator.