diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | authfile.c | 4 | ||||
-rw-r--r-- | monitor.c | 4 | ||||
-rw-r--r-- | sftp-common.c | 6 | ||||
-rw-r--r-- | sshpty.c | 6 |
5 files changed, 14 insertions, 11 deletions
@@ -3,6 +3,9 @@ | |||
3 | - djm@cvs.openbsd.org 2003/05/24 09:02:22 | 3 | - djm@cvs.openbsd.org 2003/05/24 09:02:22 |
4 | [log.c] | 4 | [log.c] |
5 | pass logged data through strnvis; ok markus | 5 | pass logged data through strnvis; ok markus |
6 | - djm@cvs.openbsd.org 2003/05/24 09:30:40 | ||
7 | [authfile.c monitor.c sftp-common.c sshpty.c] | ||
8 | cast some types for printing; ok markus@ | ||
6 | 9 | ||
7 | 20030524 | 10 | 20030524 |
8 | - (dtucker) Correct --osfsia in INSTALL. Patch by skeleten at shillest.net | 11 | - (dtucker) Correct --osfsia in INSTALL. Patch by skeleten at shillest.net |
@@ -1611,4 +1614,4 @@ | |||
1611 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1614 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1612 | ok provos@ | 1615 | ok provos@ |
1613 | 1616 | ||
1614 | $Id: ChangeLog,v 1.2750 2003/05/25 04:38:02 djm Exp $ | 1617 | $Id: ChangeLog,v 1.2751 2003/05/25 04:38:33 djm Exp $ |
diff --git a/authfile.c b/authfile.c index d563abb71..1f46093e3 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.53 2003/05/11 16:56:48 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.54 2003/05/24 09:30:39 djm Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -514,7 +514,7 @@ key_perm_ok(int fd, const char *filename) | |||
514 | error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @"); | 514 | error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @"); |
515 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 515 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
516 | error("Permissions 0%3.3o for '%s' are too open.", | 516 | error("Permissions 0%3.3o for '%s' are too open.", |
517 | st.st_mode & 0777, filename); | 517 | (u_int)st.st_mode & 0777, filename); |
518 | error("It is recommended that your private key files are NOT accessible by others."); | 518 | error("It is recommended that your private key files are NOT accessible by others."); |
519 | error("This private key will be ignored."); | 519 | error("This private key will be ignored."); |
520 | return 0; | 520 | return 0; |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.40 2003/05/14 08:57:49 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.41 2003/05/24 09:30:40 djm Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1164,7 +1164,7 @@ mm_record_login(Session *s, struct passwd *pw) | |||
1164 | static void | 1164 | static void |
1165 | mm_session_close(Session *s) | 1165 | mm_session_close(Session *s) |
1166 | { | 1166 | { |
1167 | debug3("%s: session %d pid %d", __func__, s->self, s->pid); | 1167 | debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid); |
1168 | if (s->ttyfd != -1) { | 1168 | if (s->ttyfd != -1) { |
1169 | debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); | 1169 | debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); |
1170 | fatal_remove_cleanup(session_pty_cleanup2, (void *)s); | 1170 | fatal_remove_cleanup(session_pty_cleanup2, (void *)s); |
diff --git a/sftp-common.c b/sftp-common.c index 31d41385b..5313b134d 100644 --- a/sftp-common.c +++ b/sftp-common.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: sftp-common.c,v 1.8 2002/10/16 14:31:48 itojun Exp $"); | 27 | RCSID("$OpenBSD: sftp-common.c,v 1.9 2003/05/24 09:30:40 djm Exp $"); |
28 | 28 | ||
29 | #include "buffer.h" | 29 | #include "buffer.h" |
30 | #include "bufaux.h" | 30 | #include "bufaux.h" |
@@ -206,8 +206,8 @@ ls_file(char *name, struct stat *st, int remote) | |||
206 | tbuf[0] = '\0'; | 206 | tbuf[0] = '\0'; |
207 | ulen = MAX(strlen(user), 8); | 207 | ulen = MAX(strlen(user), 8); |
208 | glen = MAX(strlen(group), 8); | 208 | glen = MAX(strlen(group), 8); |
209 | snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode, | 209 | snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode, |
210 | st->st_nlink, ulen, user, glen, group, | 210 | (u_int)st->st_nlink, ulen, user, glen, group, |
211 | (unsigned long long)st->st_size, tbuf, name); | 211 | (unsigned long long)st->st_size, tbuf, name); |
212 | return xstrdup(buf); | 212 | return xstrdup(buf); |
213 | } | 213 | } |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $"); | 15 | RCSID("$OpenBSD: sshpty.c,v 1.9 2003/05/24 09:30:40 djm Exp $"); |
16 | 16 | ||
17 | #ifdef HAVE_UTIL_H | 17 | #ifdef HAVE_UTIL_H |
18 | # include <util.h> | 18 | # include <util.h> |
@@ -409,10 +409,10 @@ pty_setowner(struct passwd *pw, const char *ttyname) | |||
409 | if (errno == EROFS && | 409 | if (errno == EROFS && |
410 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) | 410 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) |
411 | debug("chmod(%.100s, 0%o) failed: %.100s", | 411 | debug("chmod(%.100s, 0%o) failed: %.100s", |
412 | ttyname, mode, strerror(errno)); | 412 | ttyname, (u_int)mode, strerror(errno)); |
413 | else | 413 | else |
414 | fatal("chmod(%.100s, 0%o) failed: %.100s", | 414 | fatal("chmod(%.100s, 0%o) failed: %.100s", |
415 | ttyname, mode, strerror(errno)); | 415 | ttyname, (u_int)mode, strerror(errno)); |
416 | } | 416 | } |
417 | } | 417 | } |
418 | } | 418 | } |