diff options
Diffstat (limited to 'debian/patches/selinux-role.patch')
-rw-r--r-- | debian/patches/selinux-role.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch index 8a7e7c687..74cd06201 100644 --- a/debian/patches/selinux-role.patch +++ b/debian/patches/selinux-role.patch | |||
@@ -33,7 +33,7 @@ Index: b/auth1.c | |||
33 | /* Get the name of the user that we wish to log in as. */ | 33 | /* Get the name of the user that we wish to log in as. */ |
34 | packet_read_expect(SSH_CMSG_USER); | 34 | packet_read_expect(SSH_CMSG_USER); |
35 | @@ -392,11 +392,17 @@ | 35 | @@ -392,11 +392,17 @@ |
36 | user = packet_get_string(&ulen); | 36 | user = packet_get_cstring(&ulen); |
37 | packet_check_eom(); | 37 | packet_check_eom(); |
38 | 38 | ||
39 | + if ((role = strchr(user, '/')) != NULL) | 39 | + if ((role = strchr(user, '/')) != NULL) |
@@ -173,7 +173,7 @@ Index: b/monitor_wrap.c | |||
173 | =================================================================== | 173 | =================================================================== |
174 | --- a/monitor_wrap.c | 174 | --- a/monitor_wrap.c |
175 | +++ b/monitor_wrap.c | 175 | +++ b/monitor_wrap.c |
176 | @@ -279,10 +279,10 @@ | 176 | @@ -280,10 +280,10 @@ |
177 | return (banner); | 177 | return (banner); |
178 | } | 178 | } |
179 | 179 | ||
@@ -186,7 +186,7 @@ Index: b/monitor_wrap.c | |||
186 | { | 186 | { |
187 | Buffer m; | 187 | Buffer m; |
188 | 188 | ||
189 | @@ -291,12 +291,30 @@ | 189 | @@ -292,11 +292,29 @@ |
190 | buffer_init(&m); | 190 | buffer_init(&m); |
191 | buffer_put_cstring(&m, service); | 191 | buffer_put_cstring(&m, service); |
192 | buffer_put_cstring(&m, style ? style : ""); | 192 | buffer_put_cstring(&m, style ? style : ""); |
@@ -196,7 +196,7 @@ Index: b/monitor_wrap.c | |||
196 | 196 | ||
197 | buffer_free(&m); | 197 | buffer_free(&m); |
198 | } | 198 | } |
199 | 199 | + | |
200 | +/* Inform the privileged process about role */ | 200 | +/* Inform the privileged process about role */ |
201 | + | 201 | + |
202 | +void | 202 | +void |
@@ -213,10 +213,9 @@ Index: b/monitor_wrap.c | |||
213 | + | 213 | + |
214 | + buffer_free(&m); | 214 | + buffer_free(&m); |
215 | +} | 215 | +} |
216 | + | 216 | |
217 | /* Do the password authentication */ | 217 | /* Do the password authentication */ |
218 | int | 218 | int |
219 | mm_auth_password(Authctxt *authctxt, char *password) | ||
220 | Index: b/monitor_wrap.h | 219 | Index: b/monitor_wrap.h |
221 | =================================================================== | 220 | =================================================================== |
222 | --- a/monitor_wrap.h | 221 | --- a/monitor_wrap.h |