tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2003/05/24 09:30:40 

[authfile.c monitor.c sftp-common.c sshpty.c]
     cast some types for printing; ok markus@
This commit is contained in:
Damien Miller 2003-05-25 14:38:33 +10:00
parent c11fe255ab
commit 04bd8b0bcc
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,9 @@
- djm@cvs.openbsd.org 2003/05/24 09:02:22 - djm@cvs.openbsd.org 2003/05/24 09:02:22
[log.c] [log.c]
pass logged data through strnvis; ok markus pass logged data through strnvis; ok markus
- djm@cvs.openbsd.org 2003/05/24 09:30:40
[authfile.c monitor.c sftp-common.c sshpty.c]
cast some types for printing; ok markus@
20030524 20030524
- (dtucker) Correct --osfsia in INSTALL. Patch by skeleten at shillest.net - (dtucker) Correct --osfsia in INSTALL. Patch by skeleten at shillest.net
@ -1611,4 +1614,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2750 2003/05/25 04:38:02 djm Exp $ $Id: ChangeLog,v 1.2751 2003/05/25 04:38:33 djm Exp $

4
authfile.c
View File

@ -36,7 +36,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: authfile.c,v 1.53 2003/05/11 16:56:48 markus Exp $"); RCSID("$OpenBSD: authfile.c,v 1.54 2003/05/24 09:30:39 djm Exp $");
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
@ -514,7 +514,7 @@ key_perm_ok(int fd, const char *filename)
error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @"); error("@ WARNING: UNPROTECTED PRIVATE KEY FILE! @");
error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
error("Permissions 0%3.3o for '%s' are too open.", error("Permissions 0%3.3o for '%s' are too open.",
st.st_mode & 0777, filename); (u_int)st.st_mode & 0777, filename);
error("It is recommended that your private key files are NOT accessible by others."); error("It is recommended that your private key files are NOT accessible by others.");
error("This private key will be ignored."); error("This private key will be ignored.");
return 0; return 0;

4
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.40 2003/05/14 08:57:49 markus Exp $"); RCSID("$OpenBSD: monitor.c,v 1.41 2003/05/24 09:30:40 djm Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
@ -1164,7 +1164,7 @@ mm_record_login(Session *s, struct passwd *pw)
static void static void
mm_session_close(Session *s) mm_session_close(Session *s)
{ {
debug3("%s: session %d pid %d", __func__, s->self, s->pid); debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid);
if (s->ttyfd != -1) { if (s->ttyfd != -1) {
debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd); debug3("%s: tty %s ptyfd %d", __func__, s->tty, s->ptyfd);
fatal_remove_cleanup(session_pty_cleanup2, (void *)s); fatal_remove_cleanup(session_pty_cleanup2, (void *)s);

6
sftp-common.c
View File

@ -24,7 +24,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-common.c,v 1.8 2002/10/16 14:31:48 itojun Exp $"); RCSID("$OpenBSD: sftp-common.c,v 1.9 2003/05/24 09:30:40 djm Exp $");
#include "buffer.h" #include "buffer.h"
#include "bufaux.h" #include "bufaux.h"
@ -206,8 +206,8 @@ ls_file(char *name, struct stat *st, int remote)
tbuf[0] = '\0'; tbuf[0] = '\0';
ulen = MAX(strlen(user), 8); ulen = MAX(strlen(user), 8);
glen = MAX(strlen(group), 8); glen = MAX(strlen(group), 8);
snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode, snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode,
st->st_nlink, ulen, user, glen, group, (u_int)st->st_nlink, ulen, user, glen, group,
(unsigned long long)st->st_size, tbuf, name); (unsigned long long)st->st_size, tbuf, name);
return xstrdup(buf); return xstrdup(buf);
} }

6
sshpty.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $"); RCSID("$OpenBSD: sshpty.c,v 1.9 2003/05/24 09:30:40 djm Exp $");
#ifdef HAVE_UTIL_H #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>
@ -409,10 +409,10 @@ pty_setowner(struct passwd *pw, const char *ttyname)
if (errno == EROFS && if (errno == EROFS &&
(st.st_mode & (S_IRGRP | S_IROTH)) == 0) (st.st_mode & (S_IRGRP | S_IROTH)) == 0)
debug("chmod(%.100s, 0%o) failed: %.100s", debug("chmod(%.100s, 0%o) failed: %.100s",
ttyname, mode, strerror(errno)); ttyname, (u_int)mode, strerror(errno));
else else
fatal("chmod(%.100s, 0%o) failed: %.100s", fatal("chmod(%.100s, 0%o) failed: %.100s",
ttyname, mode, strerror(errno)); ttyname, (u_int)mode, strerror(errno));
} }
} }
} }