diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-31 03:04:26 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-31 03:04:26 +0000 |
commit | 38f80c0a13d58fe27fbf5b2bae09368d3db4c09c (patch) | |
tree | 63e0ba3780758f96272fe74a284406080703ae87 /debian/openssh-client.config | |
parent | 086880515569ec21401dcdc9d1b191de731b0c5e (diff) |
Since ssh-keysign isn't used by default (you need to set EnableSSHKeysign
to "yes" in /etc/ssh/ssh_config), having a debconf question to ask whether
it should be setuid is overkill, and the question text had got out of date
anyway. Remove this question, ship ssh-keysign setuid in
openssh-client.deb, and set a statoverride if the debconf question was
previously set to false.
Diffstat (limited to 'debian/openssh-client.config')
-rw-r--r-- | debian/openssh-client.config | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/debian/openssh-client.config b/debian/openssh-client.config index 7490526fa..736e464ed 100644 --- a/debian/openssh-client.config +++ b/debian/openssh-client.config | |||
@@ -3,17 +3,24 @@ | |||
3 | action=$1 | 3 | action=$1 |
4 | version=$2 | 4 | version=$2 |
5 | 5 | ||
6 | if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then | ||
7 | version=1.2.27 | ||
8 | cp -a /etc/ssh-nonfree /etc/ssh | ||
9 | fi | ||
10 | |||
11 | # Source debconf library. | 6 | # Source debconf library. |
12 | . /usr/share/debconf/confmodule | 7 | . /usr/share/debconf/confmodule |
13 | db_version 2.0 | 8 | db_version 2.0 |
14 | 9 | ||
15 | db_input medium ssh/SUID_client || true | 10 | if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then |
11 | version=1.2.27 | ||
12 | cp -a /etc/ssh-nonfree /etc/ssh | ||
13 | fi | ||
16 | 14 | ||
17 | db_go | 15 | # Was ssh-keysign's setuid bit turned off using the obsolete debconf |
16 | # question? If so, turn this into a statoverride. (Ugh.) | ||
17 | if dpkg --compare-versions "$2" lt 1:4.1p1-2 && \ | ||
18 | db_get ssh/SUID_client && [ "$RET" = false ] && | ||
19 | [ -x /usr/sbin/dpkg-statoverride ] && \ | ||
20 | ! dpkg-statoverride --list /usr/lib/ssh-keysign && \ | ||
21 | ! dpkg-statoverride --list /usr/lib/openssh/ssh-keysign; then | ||
22 | dpkg-statoverride --update --add root root 0755 \ | ||
23 | /usr/lib/openssh/ssh-keysign | ||
24 | fi | ||
18 | 25 | ||
19 | exit 0 | 26 | exit 0 |