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
@@ -3024,6 +3024,10 @@ purposes.
 @itemx --instance=@var{inst}
 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}
 Specifies the URL of the communication socket.  @xref{piesctl 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
@@ -69,6 +69,12 @@ BEGIN
     }
 END  
 
+OPTION(no-netrc,N,,
+       [<don't read ~/.netrc file>])
+BEGIN
+  no_netrc_option = 1;
+END
+
 GROUP(Preprocessor)
 
 OPTION(include-directory,I,DIR,
diff --git a/src/piesctl.c b/src/piesctl.c
index 0cd2736..4c777d7 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -49,6 +49,7 @@ char const *instance = "pies";
 char *config_file;   
 char default_config_file[] = SYSCONFDIR "/piesctl.conf";
 int preprocess_only;
+int no_netrc_option;
 int verbose;
 int dump;
 
@@ -543,6 +544,7 @@ shttp_connect (struct pies_url *url, struct grecs_sockaddr *source_addr)
   if (pies_url_copy (&conn->url, url))
     grecs_alloc_die ();
 
+  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
@@ -15,12 +15,12 @@ component envtest {
   stdout file "$PWD/log";
   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 \
                 --config-file control.conf --config-file envtest.conf 2>errlog
diff --git a/tests/respawn.at b/tests/respawn.at
index 0ba60dc..ab29f11 100644
--- a/tests/respawn.at
+++ b/tests/respawn.at
@@ -27,7 +27,7 @@ component test {
   chdir $PWD;
   return-code 1 {
     action disable;
-    exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+    exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
   }     
 }
 _EOT
diff --git a/tests/shell.at b/tests/shell.at
index e3d104b..b459d02 100644
--- a/tests/shell.at
+++ b/tests/shell.at
@@ -29,7 +29,7 @@ component test {
   chdir $PWD;
   return-code 1 {
     action disable;
-    exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+    exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
   }     
 }
 _EOT
diff --git a/tests/shutdown.at b/tests/shutdown.at
index 1c2a4ef..24a4504 100644
--- a/tests/shutdown.at
+++ b/tests/shutdown.at
@@ -29,7 +29,7 @@ component test {
   chdir $PWD;
   return-code 1 {
     action disable;
-    exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+    exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
   }     
 }
 
@@ -42,7 +42,7 @@ _EOT
 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
@@ -39,7 +39,7 @@ component test {
   stderr file "log.err";
   return-code * {
     action disable;
-    exec "piesctl --url unix:///$PWD/pies.ctl shutdown";
+    exec "piesctl --url unix:///$PWD/pies.ctl --no-netrc shutdown";
   }     
 }
 _EOT
@@ -47,7 +47,7 @@ _EOT
 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
 cat log.err >&2