aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/pies.texi4
-rw-r--r--src/piesctl-cl.opt6
-rw-r--r--src/piesctl.c2
-rw-r--r--tests/env.at4
-rw-r--r--tests/respawn.at2
-rw-r--r--tests/shell.at2
-rw-r--r--tests/shutdown.at4
-rw-r--r--tests/startup.at4
8 files changed, 20 insertions, 8 deletions
diff --git a/doc/pies.texi b/doc/pies.texi
index 1a798e1..b77a40c 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -3026,2 +3026,6 @@ Talk to @command{pies} instance @var{inst}.
+@item --no-netc
+@itemx -N
+Don't read @file{~/.netrc} file.
+
@item -u @var{url}
diff --git a/src/piesctl-cl.opt b/src/piesctl-cl.opt
index f7eaf2a..ebdfec4 100644
--- a/src/piesctl-cl.opt
+++ b/src/piesctl-cl.opt
@@ -71,2 +71,8 @@ END
+OPTION(no-netrc,N,,
+ [<don't read ~/.netrc file>])
+BEGIN
+ no_netrc_option = 1;
+END
+
GROUP(Preprocessor)
diff --git a/src/piesctl.c b/src/piesctl.c
index 0cd2736..4c777d7 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -51,2 +51,3 @@ char default_config_file[] = SYSCONFDIR "/piesctl.conf";
int preprocess_only;
+int no_netrc_option;
int verbose;
@@ -545,2 +546,3 @@ shttp_connect (struct pies_url *url, struct grecs_sockaddr *source_addr)
+ if (!no_netrc_option)
netrc_scan (conn->url);
diff --git a/tests/env.at b/tests/env.at
index c293c65..18b0e52 100644
--- a/tests/env.at
+++ b/tests/env.at
@@ -17,3 +17,3 @@ component envtest {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
@@ -22,3 +22,3 @@ _EOT
-to 3 \
+to 5 \
envtest -exec \
diff --git a/tests/respawn.at b/tests/respawn.at
index 0ba60dc..ab29f11 100644
--- a/tests/respawn.at
+++ b/tests/respawn.at
@@ -29,3 +29,3 @@ component test {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
diff --git a/tests/shell.at b/tests/shell.at
index e3d104b..b459d02 100644
--- a/tests/shell.at
+++ b/tests/shell.at
@@ -31,3 +31,3 @@ component test {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
diff --git a/tests/shutdown.at b/tests/shutdown.at
index 1c2a4ef..24a4504 100644
--- a/tests/shutdown.at
+++ b/tests/shutdown.at
@@ -31,3 +31,3 @@ component test {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
@@ -44,3 +44,3 @@ to 5 \
pies --foreground --stderr \
- --config-file control.conf --config-file pies.conf 2>errlog
+ --config-file control.conf --config-file pies.conf --debug 1 2>errlog
diff --git a/tests/startup.at b/tests/startup.at
index 22ad25b..b65f9f6 100644
--- a/tests/startup.at
+++ b/tests/startup.at
@@ -41,3 +41,3 @@ component test {
action disable;
- exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+ exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
}
@@ -49,3 +49,3 @@ to 5 \
pies --foreground --stderr \
- --config-file control.conf --config-file pies.conf 2>errlog
+ --config-file control.conf --config-file pies.conf --debug 1 2>errlog

Return to:

Send suggestions and report system problems to the System administrator.