diff options
Diffstat (limited to 'debian/patches/user-group-modes.patch')
| -rw-r--r-- | debian/patches/user-group-modes.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch index 163039d..194c730 100644 --- a/debian/patches/user-group-modes.patch +++ b/debian/patches/user-group-modes.patch @@ -1,4 +1,4 @@ -From 673c225f85e2666e10be71a1d87225de2bb2aeb2 Mon Sep 17 00:00:00 2001 +From 04ef461f5d8a7ec8840db50ccb841aaa26687b6e 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 @@ -27,10 +27,10 @@ Patch-Name: user-group-modes.patch 7 files changed, 62 insertions(+), 13 deletions(-) diff --git a/auth-rhosts.c b/auth-rhosts.c -index 56724677a..e15f5bc5a 100644 +index d5d2c7a12..13c3c201b 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c -@@ -266,8 +266,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, +@@ -265,8 +265,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, return 0; } if (options.strict_modes && @@ -40,7 +40,7 @@ index 56724677a..e15f5bc5a 100644 logit("Rhosts authentication refused for %.100s: " "bad ownership or modes for home directory.", pw->pw_name); auth_debug_add("Rhosts authentication refused for %.100s: " -@@ -296,8 +295,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, +@@ -295,8 +294,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, * allowing access to their account by anyone. */ if (options.strict_modes && @@ -51,10 +51,10 @@ index 56724677a..e15f5bc5a 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 8ccf06370..08a75fc4e 100644 +index 407b32e78..ec692715e 100644 --- a/auth.c +++ b/auth.c -@@ -431,8 +431,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host, +@@ -430,8 +430,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host, user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); if (options.strict_modes && (stat(user_hostfile, &st) == 0) && @@ -65,7 +65,7 @@ index 8ccf06370..08a75fc4e 100644 "bad owner or modes for %.200s", pw->pw_name, user_hostfile); diff --git a/misc.c b/misc.c -index 5dc9d54a2..d0d9301d7 100644 +index afdf5142e..8776fc1dc 100644 --- a/misc.c +++ b/misc.c @@ -62,9 +62,9 @@ @@ -79,7 +79,7 @@ index 5dc9d54a2..d0d9301d7 100644 #ifdef SSH_TUN_OPENBSD #include <net/if.h> #endif -@@ -1414,6 +1414,55 @@ percent_dollar_expand(const char *string, ...) +@@ -1428,6 +1428,55 @@ percent_dollar_expand(const char *string, ...) return ret; } @@ -135,7 +135,7 @@ index 5dc9d54a2..d0d9301d7 100644 int tun_open(int tun, int mode, char **ifname) { -@@ -2223,8 +2272,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir, +@@ -2250,8 +2299,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir, snprintf(err, errlen, "%s is not a regular file", buf); return -1; } @@ -145,7 +145,7 @@ index 5dc9d54a2..d0d9301d7 100644 snprintf(err, errlen, "bad ownership or modes for file %s", buf); return -1; -@@ -2239,8 +2287,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir, +@@ -2266,8 +2314,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir, strlcpy(buf, cp, sizeof(buf)); if (stat(buf, &st) == -1 || @@ -156,10 +156,10 @@ index 5dc9d54a2..d0d9301d7 100644 "bad ownership or modes for directory %s", buf); return -1; diff --git a/misc.h b/misc.h -index 9bacce520..a1fb74579 100644 +index 113403896..4681f79f7 100644 --- a/misc.h +++ b/misc.h -@@ -238,6 +238,8 @@ struct notifier_ctx *notify_start(int, const char *, ...) +@@ -246,6 +246,8 @@ struct notifier_ctx *notify_start(int, const char *, ...) void notify_complete(struct notifier_ctx *, const char *, ...) __attribute__((format(printf, 2, 3))); @@ -169,7 +169,7 @@ index 9bacce520..a1fb74579 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 c6e609fca..d68658185 100644 +index 7d7296960..eaca29ace 100644 --- a/readconf.c +++ b/readconf.c @@ -2518,8 +2518,7 @@ read_config_file_depth(const char *filename, struct passwd *pw, @@ -183,10 +183,10 @@ index c6e609fca..d68658185 100644 } diff --git a/ssh.1 b/ssh.1 -index 877c3bc64..2d07c919e 100644 +index dc382cd49..55bc1faef 100644 --- a/ssh.1 +++ b/ssh.1 -@@ -1577,6 +1577,8 @@ The file format and configuration options are described in +@@ -1570,6 +1570,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 877c3bc64..2d07c919e 100644 .It Pa ~/.ssh/environment Contains additional definitions for environment variables; see diff --git a/ssh_config.5 b/ssh_config.5 -index 6b482ee15..4afb8fb7a 100644 +index c6041339b..d1b1da95a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 -@@ -2405,6 +2405,8 @@ The format of this file is described above. +@@ -2409,6 +2409,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. |