Update usercmd branch with latest vendor changes.rancid-2.3.2a7-usercmd.patch

1 files changed, 46 insertions, 22 deletions

diff --git a/man/cloginrc.5 b/man/cloginrc.5
index 36709c2..49553fd 100644
--- a/man/cloginrc.5
+++ b/man/cloginrc.5
@@ -1,8 +1,8 @@
 .\"
-.\" $Id: cloginrc.5,v 1.31 2004/01/11 01:53:10 heas Exp $
+.\" $Id: cloginrc.5,v 1.37 2005/09/12 18:48:19 heas Exp $
 .\"
 .hys 50
-.TH "cloginrc" "5" "11 Jan 2004"
+.TH "cloginrc" "5" "12 September 2005"
 .SH NAME
  \.cloginrc \- clogin configuration file
 .SH DESCRIPTION
@@ -42,12 +42,13 @@ include {<file>}
 .PP
 Note: the braces ({}) surrounding the values is significant when the values
 include TCL meta-characters.  Best common practice is to always enclose the
-values in braces.  If a value includes a (left or right) brace, it must
-be backslash-escaped, as in:
+values in braces.  If a value includes a (left or right) brace or space
+character, it must be backslash-escaped, as in:
 .PP
 .in +1i
 .nf
 add user <hostname glob> {foo\\}bar}
+add user <hostname glob> {foo\\ bar}
 .fi
 .in -1i
 .PP
@@ -91,7 +92,7 @@ which is automatically enabled.  This is, that user has enable privileges
 without the need to execute the enable command.  The router's prompt is
 different for enabled mode, ending with a # rather than a >.
 .sp
-Example: add autoenable * 1
+Example: add autoenable * {1}
 .sp
 Default: 0
 .sp
@@ -100,6 +101,10 @@ the user is not automatically enabled and
 .IR clogin
 should execute the enable command to gain enable privileges, unless
 negated by the noenable directive or \-noenable command\-line option.
+.sp
+Also see the
+.B noenable
+directive.
 .\"
 .TP
 .B add cyphertype <router name glob> {<ssh encryption type>}
@@ -119,7 +124,7 @@ may be used to adjust the prompt that
 should look for when trying to login.  Note that enableprompt can be a Tcl
 style regular expression.
 .sp
-Example: add enableprompt rc*.example.net {"\\[Ee]nter the enable password:"}
+Example: add enableprompt rc*.example.net {"\\[Ee]nter\\ the\\ enable\\ password:"}
 .sp
 Default: "\\[Pp]assword:"
 .\"
@@ -153,7 +158,7 @@ add "mode character" to .telnetrc.  See
 for more information on telnet command-line syntax, telnet options,
 and .telnetrc.
 .sp
-Example: add method * {ssh} {telnet:3000} {rsh}
+Example: add method * {ssh} {telnet:-3000} {rsh}
 .sp
 Which would cause
 .IR clogin
@@ -166,13 +171,32 @@ Note that not all platforms support all of these connection methods.
 Default: {telnet} {ssh}
 .\"
 .TP
-.B add noenable <router name glob>
+.B add noenable <router name glob> {1}
 .IR clogin
 will not try to gain enable privileges when noenable is matched for a
 device.  This is equivalent to
 .IR "clogin" 's
--noenable command-line option.  This does not apply to
-.BR jlogin (1).
+-noenable command-line option.
+.sp
+Note that this directive is meaningless for
+.BR jlogin (1),
+.BR nlogin (1)
+and
+.BR clogin (1)
+[for Extreme]
+which do not have the concept of "enabled" and/or no way to elevate
+privleges once logged in; a user either has the necessary privleges or
+doesn't.
+.\"
+.TP
+.B add passphrase <router name glob> {"<SSH passphrase>"}
+Specify the SSH passphrase.  Note that this may be particular to an
+.B identity
+directive.  The passphrase will default to the
+.B password
+for the given router.
+.sp
+Example: add passphrase rc*.example.net {the\\ bird\\ goes\\ tweet}
 .\"
 .TP
 .B add passprompt <router name glob> {"<password prompt>"}
@@ -183,7 +207,7 @@ used to adjust the prompt that
 should look for when trying to login.  Note that passprompt can be a Tcl
 style regular expression.
 .sp
-Example: add passprompt rc*.example.net {"\\[Ee]nter the password:"}
+Example: add passprompt rc*.example.net {"\\[Ee]nter\\ the\\ password:"}
 .sp
 Default: "(\\[Pp]assword|passwd):"
 .\"
@@ -194,6 +218,16 @@ to the router.  The last argument is the enable password and need not be
 specified if the device also has a matching noenable or autoenable
 directive or the corresponding command-line options are used.
 .\"
+.TP
+.B add sshcmd <router name glob> {<ssh>}
+<ssh> is the name of the ssh executable.  OpenSSH uses a command-line
+option to specify the protocol version, but other implementations use
+a separate binary such as "ssh1".
+.B sshcmd
+allows this to be adjusted as necessary for the local environment.
+.sp
+Default: ssh
+.\"
 .\" .TP
 .\" .B add rc <router name glob> {<cmd;cmd>}
 .\" rc is used to specifies a command that will be run by
@@ -227,7 +261,7 @@ used to adjust the prompt that
 should look for when trying to login.  Note that userprompt can be a Tcl
 style regular expression.
 .sp
-Example: add userprompt rc*.example.net {"\\[Ee]nter your username:"}
+Example: add userprompt rc*.example.net {"\\[Ee]nter\\ your\\ username:"}
 .sp
 Default: "(Username|login|user name):"
 .\"
@@ -246,16 +280,6 @@ file that is shared among a group of folks.
 If <file> is not a full pathname, $HOME/ will be prepended.
 .sp
 Example: include {.cloginrc.group}
-.\"
-.TP
-.B add sshcmd {<ssh>}
-<ssh> is the name of the ssh executable.  OpenSSH uses a command-line
-option to specify the protocol version, but other implementations use
-a separate binary such as "ssh1".
-.B sshcmd
-allows this to be adjusted as necessary for the local environment.
-.sp
-Default: ssh
 .El
 .SH FILES
 .br