Ubuntu
openssh package

Merge lp:~clint-fewbar/ubuntu/natty/openssh/upstart-noexpect into lp:ubuntu/natty/openssh

Proposed by Clint Byrum on 2010-12-13

Status:

Merged

Merged at revision:

3221

Proposed branch:

Merge into:

Diff against target:

2 files modified

debian/changelog (+7/-0)
debian/openssh-server.ssh.upstart (+1/-2)

To merge this branch:

bzr merge lp:~clint-fewbar/ubuntu/natty/openssh/upstart-noexpect

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Colin Watson	2010-12-13	Approve on 2010-12-14
Ubuntu Sponsors	2010-12-13	Pending
Review via email: mp+43583@code.launchpad.net

Please see full explanation of why I believe this to be safe in the description of bug #687535

Revision history for this message

Colin Watson (cjwatson) on 2010-12-14:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2010-12-10 13:47:02 +0000
3	+++ debian/changelog 2010-12-13 22:11:49 +0000
4	@@ -1,3 +1,10 @@
5	+openssh (1:5.6p1-2ubuntu3) natty; urgency=low
6	+
7	+ * debian/openssh-server.ssh.upstart: drop 'expect fork' and run sshd
8	+ with -D to avoid losing track on reload (LP: #687535)
9	+
10	+ -- Clint Byrum <clint@ubuntu.com> Mon, 13 Dec 2010 14:04:50 -0800
11	+
12	openssh (1:5.6p1-2ubuntu2) natty; urgency=low
13
14	* add mention of ssh-keygen in ssh connect warning (LP: #686607)
15
16	=== modified file 'debian/openssh-server.ssh.upstart'
17	--- debian/openssh-server.ssh.upstart 2010-07-09 11:20:44 +0000
18	+++ debian/openssh-server.ssh.upstart 2010-12-13 22:11:49 +0000
19	@@ -7,7 +7,6 @@
20	start on filesystem
21	stop on runlevel [!2345]
22
23	-expect fork
24	respawn
25	respawn limit 10 5
26	umask 022
27	@@ -22,4 +21,4 @@
28
29	# if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
30	# 'exec' line here instead
31	-exec /usr/sbin/sshd
32	+exec /usr/sbin/sshd -D