summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-10 11:19:33 +1000
committerDamien Miller <djm@mindrot.org>2010-09-10 11:19:33 +1000
commitdaa7b2254f6391bfddde2c6b4acb1957843feaa1 (patch)
treec3825b8f2636040b65c33fb9b9c47f2024269d01
parent390f1532f2861f6dad19f34852d8088a8ef8bc73 (diff)
- jmc@cvs.openbsd.org 2010/09/04 09:38:34
[ssh-add.1 ssh.1] two more EXIT STATUS sections;
-rw-r--r--ChangeLog3
-rw-r--r--ssh-add.16
-rw-r--r--ssh.112
3 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e0c6722a..134a37162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
32 - jmc@cvs.openbsd.org 2010/09/03 11:09:29 32 - jmc@cvs.openbsd.org 2010/09/03 11:09:29
33 [scp.1] 33 [scp.1]
34 add an EXIT STATUS section for /usr/bin; 34 add an EXIT STATUS section for /usr/bin;
35 - jmc@cvs.openbsd.org 2010/09/04 09:38:34
36 [ssh-add.1 ssh.1]
37 two more EXIT STATUS sections;
35 38
3620100831 3920100831
37 - OpenBSD CVS Sync 40 - OpenBSD CVS Sync
diff --git a/ssh-add.1 b/ssh-add.1
index 3699db5eb..1862eed8d 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.53 2010/08/31 11:54:45 djm Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.54 2010/09/04 09:38:34 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: August 31 2010 $ 40.Dd $Mdocdate: September 4 2010 $
41.Dt SSH-ADD 1 41.Dt SSH-ADD 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -176,7 +176,7 @@ Identity files should not be readable by anyone but the user.
176Note that 176Note that
177.Nm 177.Nm
178ignores identity files if they are accessible by others. 178ignores identity files if they are accessible by others.
179.Sh DIAGNOSTICS 179.Sh EXIT STATUS
180Exit status is 0 on success, 1 if the specified command fails, 180Exit status is 0 on success, 1 if the specified command fails,
181and 2 if 181and 2 if
182.Nm 182.Nm
diff --git a/ssh.1 b/ssh.1
index be4a334f3..95ee85689 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.311 2010/08/31 21:14:58 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.312 2010/09/04 09:38:34 jmc Exp $
38.Dd $Mdocdate: August 31 2010 $ 38.Dd $Mdocdate: September 4 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -647,10 +647,6 @@ may additionally obtain configuration data from
647a per-user configuration file and a system-wide configuration file. 647a per-user configuration file and a system-wide configuration file.
648The file format and configuration options are described in 648The file format and configuration options are described in
649.Xr ssh_config 5 . 649.Xr ssh_config 5 .
650.Pp
651.Nm
652exits with the exit status of the remote command or with 255
653if an error occurred.
654.Sh AUTHENTICATION 650.Sh AUTHENTICATION
655The OpenSSH SSH client supports SSH protocols 1 and 2. 651The OpenSSH SSH client supports SSH protocols 1 and 2.
656The default is to use protocol 2 only, 652The default is to use protocol 2 only,
@@ -1394,6 +1390,10 @@ See the
1394.Xr sshd 8 1390.Xr sshd 8
1395manual page for more information. 1391manual page for more information.
1396.El 1392.El
1393.Sh EXIT STATUS
1394.Nm
1395exits with the exit status of the remote command or with 255
1396if an error occurred.
1397.Sh SEE ALSO 1397.Sh SEE ALSO
1398.Xr scp 1 , 1398.Xr scp 1 ,
1399.Xr sftp 1 , 1399.Xr sftp 1 ,