make hide_password the default

diff --git a/pppd/pppd.8 b/pppd/pppd.8
index 94c5ca094c2fe9fecdeeadbae9c11d040b7be4fe..582d071ae2588ac7becb1a62408721096efb388c 100644 (file)
--- a/pppd/pppd.8
+++ b/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
 .\" manual page [] for pppd 2.3

-.\" $Id: pppd.8,v 1.49 1999/11/17 03:49:56 paulus Exp $
+.\" $Id: pppd.8,v 1.50 1999/11/20 05:11:47 paulus Exp $

 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph


@@ -292,7 +292,7 @@ to the peer.  This option is privileged.
 .TP
 .B hide-password
 When logging the contents of PAP packets, this option causes pppd to
 .TP
 .B hide-password
 When logging the contents of PAP packets, this option causes pppd to

-exclude the password string from the log.
+exclude the password string from the log.  This is the default.

 .TP
 .B holdoff \fIn
 Specifies how many seconds to wait before re-initiating the link after
 .TP
 .B holdoff \fIn
 Specifies how many seconds to wait before re-initiating the link after


@@ -735,7 +735,9 @@ rather than a specific terminal device.  Pppd will allocate itself a
 pseudo-tty master/slave pair and use the slave as its terminal
 device.  The \fIscript\fR will be run in a child process with the
 pseudo-tty master as its standard input and output.  An explicit
 pseudo-tty master/slave pair and use the slave as its terminal
 device.  The \fIscript\fR will be run in a child process with the
 pseudo-tty master as its standard input and output.  An explicit

-device name may not be given if this option is used.
+device name may not be given if this option is used.  (Note: if the
+\fIrecord\fR option is used in conjuction with the \fIpty\fR option,
+the child process will have pipes on its standard input and output.)

 .TP
 .B receive-all
 With this option, pppd will accept all control characters from the
 .TP
 .B receive-all
 With this option, pppd will accept all control characters from the


@@ -773,6 +775,10 @@ Handshake Authentication Protocol] authentication.
 Require the peer to authenticate itself using PAP [Password
 Authentication Protocol] authentication.
 .TP
 Require the peer to authenticate itself using PAP [Password
 Authentication Protocol] authentication.
 .TP

+.B show-password
+When logging the contents of PAP packets, this option causes pppd to
+show the password string in the log message.
+.TP

 .B silent
 With this option, pppd will not transmit LCP packets to initiate a
 connection until a valid LCP packet is received from the peer (as for
 .B silent
 With this option, pppd will not transmit LCP packets to initiate a
 connection until a valid LCP packet is received from the peer (as for

diff --git a/pppd/upap.c b/pppd/upap.c
index 4e5c045a71ce344a465d0804586e24164c4469ae..7e5f0d56ecc37193c4efe3c3ed53c99aeeba55d3 100644 (file)
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -17,7 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define RCSID  "$Id: upap.c,v 1.22 1999/11/15 01:51:53 paulus Exp $"
+#define RCSID  "$Id: upap.c,v 1.23 1999/11/20 05:11:47 paulus Exp $"

 
 /*
  * TODO:
 
 /*
  * TODO:


@@ -31,7 +31,7 @@
 
 static const char rcsid[] = RCSID;
 
 
 static const char rcsid[] = RCSID;
 

-static bool hide_password;
+static bool hide_password = 1;

 
 /*
  * Command-line options.
 
 /*
  * Command-line options.


@@ -39,6 +39,8 @@ static bool hide_password;
 static option_t pap_option_list[] = {
     { "hide-password", o_bool, &hide_password,
       "Don't output passwords to log", 1 },
 static option_t pap_option_list[] = {
     { "hide-password", o_bool, &hide_password,
       "Don't output passwords to log", 1 },

+    { "show-password", o_bool, &hide_password,
+      "Show password string in debug log messages", 0 },

     { "pap-restart", o_int, &upap[0].us_timeouttime,
       "Set retransmit timeout for PAP" },
     { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
     { "pap-restart", o_int, &upap[0].us_timeouttime,
       "Set retransmit timeout for PAP" },
     { "pap-max-authreq", o_int, &upap[0].us_maxtransmits,