diff options
Diffstat (limited to 'debian/patches/user-group-modes.patch')
-rw-r--r-- | debian/patches/user-group-modes.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch index d0de9c006..ac00edac6 100644 --- a/debian/patches/user-group-modes.patch +++ b/debian/patches/user-group-modes.patch | |||
@@ -9,7 +9,7 @@ Description: Allow harmless group-writability | |||
9 | Author: Colin Watson <cjwatson@debian.org> | 9 | Author: Colin Watson <cjwatson@debian.org> |
10 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060 | 10 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060 |
11 | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347 | 11 | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347 |
12 | Last-Update: 2013-05-16 | 12 | Last-Update: 2013-09-14 |
13 | 13 | ||
14 | Index: b/readconf.c | 14 | Index: b/readconf.c |
15 | =================================================================== | 15 | =================================================================== |
@@ -21,10 +21,10 @@ Index: b/readconf.c | |||
21 | #include <unistd.h> | 21 | #include <unistd.h> |
22 | +#include <pwd.h> | 22 | +#include <pwd.h> |
23 | +#include <grp.h> | 23 | +#include <grp.h> |
24 | 24 | #ifdef HAVE_UTIL_H | |
25 | #include "xmalloc.h" | 25 | #include <util.h> |
26 | #include "ssh.h" | 26 | #endif |
27 | @@ -1150,8 +1152,7 @@ | 27 | @@ -1160,8 +1162,7 @@ |
28 | 28 | ||
29 | if (fstat(fileno(f), &sb) == -1) | 29 | if (fstat(fileno(f), &sb) == -1) |
30 | fatal("fstat %s: %s", filename, strerror(errno)); | 30 | fatal("fstat %s: %s", filename, strerror(errno)); |
@@ -38,10 +38,10 @@ Index: b/ssh.1 | |||
38 | =================================================================== | 38 | =================================================================== |
39 | --- a/ssh.1 | 39 | --- a/ssh.1 |
40 | +++ b/ssh.1 | 40 | +++ b/ssh.1 |
41 | @@ -1320,6 +1320,8 @@ | 41 | @@ -1338,6 +1338,8 @@ |
42 | .Xr ssh_config 5 . | 42 | .Xr ssh_config 5 . |
43 | Because of the potential for abuse, this file must have strict permissions: | 43 | Because of the potential for abuse, this file must have strict permissions: |
44 | read/write for the user, and not accessible by others. | 44 | read/write for the user, and not writable by others. |
45 | +It may be group-writable provided that the group in question contains only | 45 | +It may be group-writable provided that the group in question contains only |
46 | +the user. | 46 | +the user. |
47 | .Pp | 47 | .Pp |
@@ -51,7 +51,7 @@ Index: b/ssh_config.5 | |||
51 | =================================================================== | 51 | =================================================================== |
52 | --- a/ssh_config.5 | 52 | --- a/ssh_config.5 |
53 | +++ b/ssh_config.5 | 53 | +++ b/ssh_config.5 |
54 | @@ -1356,6 +1356,8 @@ | 54 | @@ -1382,6 +1382,8 @@ |
55 | This file is used by the SSH client. | 55 | This file is used by the SSH client. |
56 | Because of the potential for abuse, this file must have strict permissions: | 56 | Because of the potential for abuse, this file must have strict permissions: |
57 | read/write for the user, and not accessible by others. | 57 | read/write for the user, and not accessible by others. |
@@ -64,7 +64,7 @@ Index: b/auth.c | |||
64 | =================================================================== | 64 | =================================================================== |
65 | --- a/auth.c | 65 | --- a/auth.c |
66 | +++ b/auth.c | 66 | +++ b/auth.c |
67 | @@ -386,8 +386,7 @@ | 67 | @@ -408,8 +408,7 @@ |
68 | user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); | 68 | user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); |
69 | if (options.strict_modes && | 69 | if (options.strict_modes && |
70 | (stat(user_hostfile, &st) == 0) && | 70 | (stat(user_hostfile, &st) == 0) && |
@@ -74,7 +74,7 @@ Index: b/auth.c | |||
74 | logit("Authentication refused for %.100s: " | 74 | logit("Authentication refused for %.100s: " |
75 | "bad owner or modes for %.200s", | 75 | "bad owner or modes for %.200s", |
76 | pw->pw_name, user_hostfile); | 76 | pw->pw_name, user_hostfile); |
77 | @@ -449,8 +448,7 @@ | 77 | @@ -471,8 +470,7 @@ |
78 | snprintf(err, errlen, "%s is not a regular file", buf); | 78 | snprintf(err, errlen, "%s is not a regular file", buf); |
79 | return -1; | 79 | return -1; |
80 | } | 80 | } |
@@ -84,7 +84,7 @@ Index: b/auth.c | |||
84 | snprintf(err, errlen, "bad ownership or modes for file %s", | 84 | snprintf(err, errlen, "bad ownership or modes for file %s", |
85 | buf); | 85 | buf); |
86 | return -1; | 86 | return -1; |
87 | @@ -465,8 +463,7 @@ | 87 | @@ -487,8 +485,7 @@ |
88 | strlcpy(buf, cp, sizeof(buf)); | 88 | strlcpy(buf, cp, sizeof(buf)); |
89 | 89 | ||
90 | if (stat(buf, &st) < 0 || | 90 | if (stat(buf, &st) < 0 || |
@@ -117,7 +117,7 @@ Index: b/misc.c | |||
117 | 117 | ||
118 | /* remove newline at end of string */ | 118 | /* remove newline at end of string */ |
119 | char * | 119 | char * |
120 | @@ -641,6 +643,71 @@ | 120 | @@ -642,6 +644,71 @@ |
121 | return -1; | 121 | return -1; |
122 | } | 122 | } |
123 | 123 | ||
@@ -193,7 +193,7 @@ Index: b/misc.h | |||
193 | =================================================================== | 193 | =================================================================== |
194 | --- a/misc.h | 194 | --- a/misc.h |
195 | +++ b/misc.h | 195 | +++ b/misc.h |
196 | @@ -103,4 +103,6 @@ | 196 | @@ -104,4 +104,6 @@ |
197 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | 197 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); |
198 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | 198 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); |
199 | 199 | ||