summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-18 20:25:33 +1000
committerDamien Miller <djm@mindrot.org>2003-06-18 20:25:33 +1000
commit469954debd6cb78d8c109785e418b235cf004565 (patch)
tree4bfa283da1fd145995b767e80743e57ad0492998
parent53950b68bf28a8d3eebdf39bea96a9046806c5d2 (diff)
downloadopenssh-git-469954debd6cb78d8c109785e418b235cf004565.tar.gz
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/06/12 07:57:38 [monitor.c sshlogin.c sshpty.c] typos; dtucker at zip.com.au
-rw-r--r--ChangeLog9
-rw-r--r--monitor.c4
-rw-r--r--sshlogin.c6
-rw-r--r--sshpty.c4
4 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index deb0c633..b627c133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20030618
+ - (djm) OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2003/06/12 07:57:38
+ [monitor.c sshlogin.c sshpty.c]
+ typos; dtucker at zip.com.au
+
+
20030614
- (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -512,4 +519,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2801 2003/06/13 22:43:22 djm Exp $
+$Id: ChangeLog,v 1.2802 2003/06/18 10:25:33 djm Exp $
diff --git a/monitor.c b/monitor.c
index 707d314b..f306794d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.42 2003/06/02 09:17:34 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.43 2003/06/12 07:57:38 markus Exp $");
#include <openssl/dh.h>
@@ -93,7 +93,7 @@ struct {
u_int olen;
} child_state;
-/* Functions on the montior that answer unprivileged requests */
+/* Functions on the monitor that answer unprivileged requests */
int mm_answer_moduli(int, Buffer *);
int mm_answer_sign(int, Buffer *);
diff --git a/sshlogin.c b/sshlogin.c
index 188a6b3a..36b64893 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshlogin.c,v 1.6 2003/04/08 20:21:29 itojun Exp $");
+RCSID("$OpenBSD: sshlogin.c,v 1.7 2003/06/12 07:57:38 markus Exp $");
#include "loginrec.h"
@@ -60,8 +60,8 @@ get_last_login_time(uid_t uid, const char *logname,
}
/*
- * Records that the user has logged in. I these parts of operating systems
- * were more standardized.
+ * Records that the user has logged in. I wish these parts of operating
+ * systems were more standardized.
*/
void
record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
diff --git a/sshpty.c b/sshpty.c
index ee2b9d3b..109fc96a 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.9 2003/05/24 09:30:40 djm Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.10 2003/06/12 07:57:38 markus Exp $");
#ifdef HAVE_UTIL_H
# include <util.h>
@@ -258,7 +258,7 @@ pty_release(const char *ttyname)
error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno));
}
-/* Makes the tty the processes controlling tty and sets it to sane modes. */
+/* Makes the tty the process's controlling tty and sets it to sane modes. */
void
pty_make_controlling_tty(int *ttyfd, const char *ttyname)