diff options
| -rw-r--r-- | doc/pies.texi | 4 | ||||
| -rw-r--r-- | src/piesctl-cl.opt | 6 | ||||
| -rw-r--r-- | src/piesctl.c | 4 | ||||
| -rw-r--r-- | tests/env.at | 4 | ||||
| -rw-r--r-- | tests/respawn.at | 2 | ||||
| -rw-r--r-- | tests/shell.at | 2 | ||||
| -rw-r--r-- | tests/shutdown.at | 4 | ||||
| -rw-r--r-- | tests/startup.at | 4 |
8 files changed, 21 insertions, 9 deletions
diff --git a/doc/pies.texi b/doc/pies.texi index 1a798e1..b77a40c 100644 --- a/doc/pies.texi +++ b/doc/pies.texi @@ -3025,4 +3025,8 @@ purposes. Talk to @command{pies} instance @var{inst}. +@item --no-netc +@itemx -N +Don't read @file{~/.netrc} file. + @item -u @var{url} @itemx --url=@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 @@ -70,4 +70,10 @@ BEGIN 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 @@ -50,4 +50,5 @@ char *config_file; char default_config_file[] = SYSCONFDIR "/piesctl.conf"; int preprocess_only; +int no_netrc_option; int verbose; int dump; @@ -544,5 +545,6 @@ shttp_connect (struct pies_url *url, struct grecs_sockaddr *source_addr) grecs_alloc_die (); - netrc_scan (conn->url); + if (!no_netrc_option) + netrc_scan (conn->url); return conn; diff --git a/tests/env.at b/tests/env.at index c293c65..18b0e52 100644 --- a/tests/env.at +++ b/tests/env.at @@ -16,10 +16,10 @@ component envtest { return-code 0 { action disable; - exec "piesctl --url unix:///$PWD/pies.ctl shutdown"; + exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown"; } } _EOT -to 3 \ +to 5 \ envtest -exec \ $abs_top_builddir/src/pies --foreground --stderr \ diff --git a/tests/respawn.at b/tests/respawn.at index 0ba60dc..ab29f11 100644 --- a/tests/respawn.at +++ b/tests/respawn.at @@ -28,5 +28,5 @@ component test { return-code 1 { 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 @@ -30,5 +30,5 @@ component test { return-code 1 { 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 @@ -30,5 +30,5 @@ component test { return-code 1 { action disable; - exec "piesctl --url unix:///$PWD/pies.ctl shutdown"; + exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown"; } } @@ -43,5 +43,5 @@ set -e 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 cat shutdown diff --git a/tests/startup.at b/tests/startup.at index 22ad25b..b65f9f6 100644 --- a/tests/startup.at +++ b/tests/startup.at @@ -40,5 +40,5 @@ component test { return-code * { action disable; - exec "piesctl --url unix:///$PWD/pies.ctl shutdown"; + exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown"; } } @@ -48,5 +48,5 @@ set -e 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 cat log.out |