summaryrefslogtreecommitdiff
path: root/debian/patches/sshd_config_newline_fix.patch
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2015-03-25 11:04:05 -0600
committerusd-importer <ubuntu-server@lists.ubuntu.com>2015-04-10 23:48:27 +0000
commit84a3d292f81a5fa2c827eca3b31501f2c3d973e5 (patch)
tree165d3033645468cfa6b852e88f8377c2d3408967 /debian/patches/sshd_config_newline_fix.patch
parent2761a00bd67c512b1e47619f6f945ba2e4c7f83c (diff)
parent5b26ef33dbffbb2cebbfb996f8799d131dc842ae (diff)
downloadvyos-walinuxagent-84a3d292f81a5fa2c827eca3b31501f2c3d973e5.tar.gz
vyos-walinuxagent-84a3d292f81a5fa2c827eca3b31501f2c3d973e5.zip
Import patches-applied version 2.0.12-0ubuntu1 to applied/ubuntu/vivid-proposed
Imported using git-ubuntu import. Changelog parent: 2761a00bd67c512b1e47619f6f945ba2e4c7f83c Unapplied parent: 5b26ef33dbffbb2cebbfb996f8799d131dc842ae New changelog entries: * New upstream release. * Added debian/watch for easier maintenance. * Fix regression of missing dataloss warning by adding systemd unit file.
Diffstat (limited to 'debian/patches/sshd_config_newline_fix.patch')
-rw-r--r--debian/patches/sshd_config_newline_fix.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/debian/patches/sshd_config_newline_fix.patch b/debian/patches/sshd_config_newline_fix.patch
deleted file mode 100644
index b2db231..0000000
--- a/debian/patches/sshd_config_newline_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix for broken sshd configuration (LP: #1305418)
- Change modification of sshd_config to address lack of newline at EOF.
- Lack of newline resulted in appended config line on same line
- as existing configuration option, breaking sshd_config.
-
-Author: Robert C Jennings <robert.jennings@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1305418
----
- waagent | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/waagent
-+++ b/waagent
-@@ -3838,7 +3838,7 @@
- # Disable RFC 4252 and RFC 4256 authentication schemes.
- ReplaceFileContentsAtomic(filepath, "\n".join(filter(lambda a: not
- (a.startswith("PasswordAuthentication") or a.startswith("ChallengeResponseAuthentication")),
-- GetFileContents(filepath).split('\n'))) + "PasswordAuthentication no\nChallengeResponseAuthentication no\n")
-+ GetFileContents(filepath).split('\n'))) + "\nPasswordAuthentication no\nChallengeResponseAuthentication no\n")
- Log("Disabled SSH password-based authentication methods.")
- if self.AdminPassword != None:
- MyDistro.changePass('root',self.AdminPassword)