diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2014-04-10 14:04:44 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2014-04-10 21:08:32 +0000 |
| commit | b2eb317cf1393f7d58f842a8dc1eabc81f03166b (patch) | |
| tree | 978547146973a99dc5d0c754e0cedd63e511176e | |
| parent | 8b689f4b02b11c2fbdef42fcc6e7707ead68370a (diff) | |
| parent | 5cf5793d5fcad94d51671d869572248ae90fc375 (diff) | |
| download | vyos-walinuxagent-b2eb317cf1393f7d58f842a8dc1eabc81f03166b.tar.gz vyos-walinuxagent-b2eb317cf1393f7d58f842a8dc1eabc81f03166b.zip | |
Import patches-applied version 2.0.4-0ubuntu2 to applied/ubuntu/trusty-proposed
Imported using git-ubuntu import.
Changelog parent: 8b689f4b02b11c2fbdef42fcc6e7707ead68370a
Unapplied parent: 5cf5793d5fcad94d51671d869572248ae90fc375
New changelog entries:
* Fix for broken sshd configuration (LP: #1305418)
- Change modification of sshd_config to address lack of newline at EOF
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/sshd_config_newline_fix.patch | 22 | ||||
| -rwxr-xr-x | waagent | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index c42e5f4..dac7683 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.0.4-0ubuntu2) trusty; urgency=low + + * Fix for broken sshd configuration (LP: #1305418) + - Change modification of sshd_config to address lack of newline at EOF + + -- Ben Howard <ben.howard@ubuntu.com> Thu, 10 Apr 2014 14:04:44 -0600 + walinuxagent (2.0.4-0ubuntu1) trusty; urgency=medium * Update to latest upstream version 2.0.4 (LP: #1304023). diff --git a/debian/patches/series b/debian/patches/series index 5879858..49ac87a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ disable-udev-rules.patch disable_provisioning.patch fixup_setup_file.patch cloud-init-default-cfg.patch +sshd_config_newline_fix.patch diff --git a/debian/patches/sshd_config_newline_fix.patch b/debian/patches/sshd_config_newline_fix.patch new file mode 100644 index 0000000..a599c81 --- /dev/null +++ b/debian/patches/sshd_config_newline_fix.patch @@ -0,0 +1,22 @@ +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 +@@ -3353,7 +3353,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) @@ -3353,7 +3353,7 @@ class OvfEnv(object): # 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) |