summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-03-22 12:35:46 +0000
committerColin Watson <cjwatson@debian.org>2008-03-22 12:35:46 +0000
commit64039657105c48c475c621684a8d09abcdd5dbf6 (patch)
tree1f6e926ecd577ec4690bf349aa39d4ebfdcf6160
parent1fd4eb3d0025d544928da833ad1d171bbc785149 (diff)
* Use printf rather than echo -en (a bashism) in openssh-server.config and
openssh-server.preinst.
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.config2
-rw-r--r--debian/openssh-server.preinst2
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e68474857..c5536d281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ openssh (1:4.7p1-5) UNRELEASED; urgency=low
8 address families, preventing hijacking of X11 forwarding by 8 address families, preventing hijacking of X11 forwarding by
9 unprivileged users when both IPv4 and IPv6 are configured (closes: 9 unprivileged users when both IPv4 and IPv6 are configured (closes:
10 #463011). 10 #463011).
11 * Use printf rather than echo -en (a bashism) in openssh-server.config and
12 openssh-server.preinst.
11 * debconf template translations: 13 * debconf template translations:
12 - Update Finnish (thanks, Esko Arajärvi; closes: #468563). 14 - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
13 15
diff --git a/debian/openssh-server.config b/debian/openssh-server.config
index f8ba7c7f7..d977cb918 100644
--- a/debian/openssh-server.config
+++ b/debian/openssh-server.config
@@ -62,7 +62,7 @@ then
62 # actually does the work, but if the old ssh-keygen is not found, 62 # actually does the work, but if the old ssh-keygen is not found,
63 # it can't do that -- thus, we tell the user that he must create 63 # it can't do that -- thus, we tell the user that he must create
64 # a new host key. 64 # a new host key.
65 echo -en '\0\0' | 3<&0 sh -c \ 65 printf '\0\0' | 3<&0 sh -c \
66 'dd if=$key bs=1 skip=32 count=2 2>/dev/null | cmp -s - /dev/fd/3' || { 66 'dd if=$key bs=1 skip=32 count=2 2>/dev/null | cmp -s - /dev/fd/3' || {
67 # this means that bytes 32&33 of the key were not both zero, in which 67 # this means that bytes 32&33 of the key were not both zero, in which
68 # case the key is encrypted, which we need to fix 68 # case the key is encrypted, which we need to fix
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 4ca7f2f6e..e6c150ba5 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -112,7 +112,7 @@ EOF
112 # nonfree ssh-keygen at this point 112 # nonfree ssh-keygen at this point
113 # 113 #
114 # First, check if we need to bother 114 # First, check if we need to bother
115 echo -en '\0\0' | 3<&0 sh -c \ 115 printf '\0\0' | 3<&0 sh -c \
116 'dd if=$key bs=1 skip=32 count=2 2>/dev/null | cmp -s - /dev/fd/3' || { 116 'dd if=$key bs=1 skip=32 count=2 2>/dev/null | cmp -s - /dev/fd/3' || {
117 # this means that bytes 32&33 of the key were not both zero, in which 117 # this means that bytes 32&33 of the key were not both zero, in which
118 # case the key is encrypted, which we need to fix 118 # case the key is encrypted, which we need to fix