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)
- (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 deb0c6335..b627c1334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120030618
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2003/06/12 07:57:38
4 [monitor.c sshlogin.c sshpty.c]
5 typos; dtucker at zip.com.au
6
7
120030614 820030614
2 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@ 9 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
3 10
@@ -512,4 +519,4 @@
512 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 519 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
513 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 520 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
514 521
515$Id: ChangeLog,v 1.2801 2003/06/13 22:43:22 djm Exp $ 522$Id: ChangeLog,v 1.2802 2003/06/18 10:25:33 djm Exp $
diff --git a/monitor.c b/monitor.c
index 707d314b3..f306794d4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.42 2003/06/02 09:17:34 markus Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.43 2003/06/12 07:57:38 markus Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -93,7 +93,7 @@ struct {
93 u_int olen; 93 u_int olen;
94} child_state; 94} child_state;
95 95
96/* Functions on the montior that answer unprivileged requests */ 96/* Functions on the monitor that answer unprivileged requests */
97 97
98int mm_answer_moduli(int, Buffer *); 98int mm_answer_moduli(int, Buffer *);
99int mm_answer_sign(int, Buffer *); 99int mm_answer_sign(int, Buffer *);
diff --git a/sshlogin.c b/sshlogin.c
index 188a6b3ae..36b648934 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: sshlogin.c,v 1.6 2003/04/08 20:21:29 itojun Exp $"); 42RCSID("$OpenBSD: sshlogin.c,v 1.7 2003/06/12 07:57:38 markus Exp $");
43 43
44#include "loginrec.h" 44#include "loginrec.h"
45 45
@@ -60,8 +60,8 @@ get_last_login_time(uid_t uid, const char *logname,
60} 60}
61 61
62/* 62/*
63 * Records that the user has logged in. I these parts of operating systems 63 * Records that the user has logged in. I wish these parts of operating
64 * were more standardized. 64 * systems were more standardized.
65 */ 65 */
66void 66void
67record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, 67record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
diff --git a/sshpty.c b/sshpty.c
index ee2b9d3b1..109fc96ac 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: sshpty.c,v 1.9 2003/05/24 09:30:40 djm Exp $"); 15RCSID("$OpenBSD: sshpty.c,v 1.10 2003/06/12 07:57:38 markus Exp $");
16 16
17#ifdef HAVE_UTIL_H 17#ifdef HAVE_UTIL_H
18# include <util.h> 18# include <util.h>
@@ -258,7 +258,7 @@ pty_release(const char *ttyname)
258 error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno)); 258 error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno));
259} 259}
260 260
261/* Makes the tty the processes controlling tty and sets it to sane modes. */ 261/* Makes the tty the process's controlling tty and sets it to sane modes. */
262 262
263void 263void
264pty_make_controlling_tty(int *ttyfd, const char *ttyname) 264pty_make_controlling_tty(int *ttyfd, const char *ttyname)