diff options
| author | Colin Watson <cjwatson@debian.org> | 2018-07-10 15:06:26 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2018-07-10 15:06:26 +0000 |
| commit | 064fa3f4a8bd3b2e297bc4cfbaa7a22375323663 (patch) | |
| tree | c23159a23239438f10da5f025ca2297ad44ca9d5 /debian/patches/gnome-ssh-askpass2-icon.patch | |
| parent | 970f1c25f7c73067f2f07e2e64c88201c90ff490 (diff) | |
| parent | 92d266b9e75233afd4a1ce663f062b7e9a843e65 (diff) | |
Merge branch 'fix-authorized_keys-environment-var' into 'master'
Fix ENV restriction of authorized keys
See merge request ssh-team/openssh!2
Diffstat (limited to 'debian/patches/gnome-ssh-askpass2-icon.patch')
| -rw-r--r-- | debian/patches/gnome-ssh-askpass2-icon.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch index 2959854e4..3a4a5c896 100644 --- a/debian/patches/gnome-ssh-askpass2-icon.patch +++ b/debian/patches/gnome-ssh-askpass2-icon.patch | |||
| @@ -12,7 +12,7 @@ Patch-Name: gnome-ssh-askpass2-icon.patch | |||
| 12 | 1 file changed, 2 insertions(+) | 12 | 1 file changed, 2 insertions(+) |
| 13 | 13 | ||
| 14 | diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c | 14 | diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c |
| 15 | index 535a6927..e37a1338 100644 | 15 | index 535a69274..e37a13382 100644 |
| 16 | --- a/contrib/gnome-ssh-askpass2.c | 16 | --- a/contrib/gnome-ssh-askpass2.c |
| 17 | +++ b/contrib/gnome-ssh-askpass2.c | 17 | +++ b/contrib/gnome-ssh-askpass2.c |
| 18 | @@ -211,6 +211,8 @@ main(int argc, char **argv) | 18 | @@ -211,6 +211,8 @@ main(int argc, char **argv) |