summaryrefslogtreecommitdiff
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 f690573b9..8d628c5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,9 @@
74 [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] 74 [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
75 [sshlogin.c sshpty.c] 75 [sshlogin.c sshpty.c]
76 move #include <fcntl.h> out of includes.h 76 move #include <fcntl.h> out of includes.h
77 - stevesk@cvs.openbsd.org 2006/07/09 15:27:59
78 [ssh-add.c]
79 use O_RDONLY vs. 0 in open(); no binary change
77 80
7820060706 8120060706
79 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 82 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4807,4 +4810,4 @@
4807 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4810 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4808 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4811 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4809 4812
4810$Id: ChangeLog,v 1.4377 2006/07/10 11:13:46 djm Exp $ 4813$Id: ChangeLog,v 1.4378 2006/07/10 11:14:00 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index f8db1eb3d..07de9246e 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.82 2006/07/09 15:15:11 stevesk Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.83 2006/07/09 15:27:59 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -135,7 +135,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
135 char msg[1024]; 135 char msg[1024];
136 int fd, perms_ok, ret = -1; 136 int fd, perms_ok, ret = -1;
137 137
138 if ((fd = open(filename, 0)) < 0) { 138 if ((fd = open(filename, O_RDONLY)) < 0) {
139 perror(filename); 139 perror(filename);
140 return -1; 140 return -1;
141 } 141 }