- (djm) [sshd.c auth.c] Set up fakepw() with privsep uid/gid, so it can

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 1cc10295f255d00d07b1f4691423774c771310bc..4dc46f6db6ef5c7dbb75d9a8d1fb2fda68f09b94 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.81 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.89 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,16 +39,24 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #include <openssl/evp.h>
 
+#include <fcntl.h>
 #include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
+#include "xmalloc.h"
 #include "ssh.h"
 #include "rsa.h"
 #include "log.h"
-#include "xmalloc.h"
 #include "key.h"
+#include "buffer.h"
 #include "authfd.h"
 #include "authfile.h"
 #include "pathnames.h"
@@ -134,7 +142,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;
        }