openssh: Update to 6.8p1.

[people/amarx/ipfire-3.x.git] / openssh / patches / openssh-6.6p1-keyperm.patch

diff --git a/openssh/patches/openssh-5.8p1-keyperm.patch b/openssh/patches/openssh-6.6p1-keyperm.patch
similarity index 54%
rename from openssh/patches/openssh-5.8p1-keyperm.patch
rename to openssh/patches/openssh-6.6p1-keyperm.patch
index 6167c149da50b0d04be30961082b4d582d1cd03d..fbe33b0e12c0becb4b482d261c37ca03235f6a07 100644 (file)
--- a/openssh/patches/openssh-5.8p1-keyperm.patch
+++ b/openssh/patches/openssh-6.6p1-keyperm.patch
@@ -1,15 +1,16 @@
-diff -up openssh-5.8p1/authfile.c.keyperm openssh-5.8p1/authfile.c
---- openssh-5.8p1/authfile.c.keyperm   2010-12-01 02:03:39.000000000 +0100
-+++ openssh-5.8p1/authfile.c   2011-04-21 16:43:36.859648916 +0200
-@@ -57,6 +57,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <grp.h>
+diff --git a/authfile.c b/authfile.c
+index e93d867..4fc5b3d 100644
+--- a/authfile.c
++++ b/authfile.c
+@@ -32,6 +32,7 @@
  
- #include "xmalloc.h"
- #include "cipher.h"
-@@ -600,6 +612,13 @@ key_perm_ok(int fd, const char *filename
+ #include <errno.h>
+ #include <fcntl.h>
++#include <grp.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+@@ -207,6 +208,13 @@ sshkey_perm_ok(int fd, const char *filename)
  #ifdef HAVE_CYGWIN
        if (check_ntsec(filename))
  #endif