summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-07-10 21:14:00 +1000
committerDamien Miller <djm@mindrot.org>2006-07-10 21:14:00 +1000
commit211838d8e22bf1af0bacb7619ba541c5d4f3650a (patch)
treee51dbe15f65c836fb0c5a931bdecd60689540c80
parent57cf638577052cfec0d4bce197c5597588a8b813 (diff)
- stevesk@cvs.openbsd.org 2006/07/09 15:27:59
[ssh-add.c] use O_RDONLY vs. 0 in open(); no binary change
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f690573b..8d628c5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,9 @@
[ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
[sshlogin.c sshpty.c]
move #include <fcntl.h> out of includes.h
+ - stevesk@cvs.openbsd.org 2006/07/09 15:27:59
+ [ssh-add.c]
+ use O_RDONLY vs. 0 in open(); no binary change
20060706
- (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4807,4 +4810,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4377 2006/07/10 11:13:46 djm Exp $
+$Id: ChangeLog,v 1.4378 2006/07/10 11:14:00 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index f8db1eb3..07de9246 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.82 2006/07/09 15:15:11 stevesk Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.83 2006/07/09 15:27:59 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -135,7 +135,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
char msg[1024];
int fd, perms_ok, ret = -1;
- if ((fd = open(filename, 0)) < 0) {
+ if ((fd = open(filename, O_RDONLY)) < 0) {
perror(filename);
return -1;
}