summaryrefslogtreecommitdiffstats
path: root/debian/patches/user-group-modes.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-27 08:42:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-27 08:42:41 +0000
commit824f26a90b0875c5697e2adf05360c0193a7c88d (patch)
treecd6784bde264c1c08b1f84557ddeca819ae93a93 /debian/patches/user-group-modes.patch
parentMerging upstream version 1:9.9p1. (diff)
downloadopenssh-824f26a90b0875c5697e2adf05360c0193a7c88d.tar.xz
openssh-824f26a90b0875c5697e2adf05360c0193a7c88d.zip
Merging debian version 1:9.9p1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/user-group-modes.patch')
-rw-r--r--debian/patches/user-group-modes.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index b649927..8b53864 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -1,4 +1,4 @@
-From c02212390140a127d47873d8d27081466bd5daeb Mon Sep 17 00:00:00 2001
+From 2bf33ed3e0d641de721a055f7ea6af01be212cff Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 9 Feb 2014 16:09:58 +0000
Subject: Allow harmless group-writability
@@ -51,7 +51,7 @@ index d5d2c7a12..13c3c201b 100644
"bad modes for %.200s", pw->pw_name, path);
auth_debug_add("Bad file modes for %.200s", path);
diff --git a/auth.c b/auth.c
-index 407b32e78..ec692715e 100644
+index e4578169b..4b878865f 100644
--- a/auth.c
+++ b/auth.c
@@ -430,8 +430,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host,
@@ -169,10 +169,10 @@ index 113403896..4681f79f7 100644
#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b))
#define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))
diff --git a/readconf.c b/readconf.c
-index 7d7296960..eaca29ace 100644
+index f78786964..d3c3056ef 100644
--- a/readconf.c
+++ b/readconf.c
-@@ -2518,8 +2518,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -2552,8 +2552,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
if (fstat(fileno(f), &sb) == -1)
fatal("fstat %s: %s", filename, strerror(errno));
@@ -183,10 +183,10 @@ index 7d7296960..eaca29ace 100644
}
diff --git a/ssh.1 b/ssh.1
-index dc382cd49..55bc1faef 100644
+index 8f78b3a1e..d80ce6bfc 100644
--- a/ssh.1
+++ b/ssh.1
-@@ -1570,6 +1570,8 @@ The file format and configuration options are described in
+@@ -1572,6 +1572,8 @@ The file format and configuration options are described in
.Xr ssh_config 5 .
Because of the potential for abuse, this file must have strict permissions:
read/write for the user, and not writable by others.
@@ -196,10 +196,10 @@ index dc382cd49..55bc1faef 100644
.It Pa ~/.ssh/environment
Contains additional definitions for environment variables; see
diff --git a/ssh_config.5 b/ssh_config.5
-index c6041339b..d1b1da95a 100644
+index 31142f8c5..073ef69e2 100644
--- a/ssh_config.5
+++ b/ssh_config.5
-@@ -2409,6 +2409,8 @@ The format of this file is described above.
+@@ -2417,6 +2417,8 @@ The format of this file is described above.
This file is used by the SSH client.
Because of the potential for abuse, this file must have strict permissions:
read/write for the user, and not writable by others.