aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2009-05-24 11:25:46 +0000
committerMatthias Andree <matthias.andree@gmx.de>2009-05-24 11:25:46 +0000
commit138ce54c5e8498dcdcf385bf2d662892ff258982 (patch)
tree411f5740124237312ebf4fe2f79e2efb35c7f121
parent1a2f4254b58bdacf40b876ccdef4096741e18632 (diff)
downloadfetchmail-138ce54c5e8498dcdcf385bf2d662892ff258982.tar.gz
fetchmail-138ce54c5e8498dcdcf385bf2d662892ff258982.tar.bz2
fetchmail-138ce54c5e8498dcdcf385bf2d662892ff258982.zip
Fix bashism ($UID). Debian Bug#530081.
svn path=/branches/BRANCH_6-3/; revision=5308
-rw-r--r--NEWS3
-rwxr-xr-xcontrib/fetchsetup2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6dddbd6a..a347f207 100644
--- a/NEWS
+++ b/NEWS
@@ -70,6 +70,9 @@ fetchmail 6.3.10 (not yet released):
* Make the comparison of the SSL fingerprints case insensitive, to
ease its use. Suggested by Daniel Richard G.
+# CHANGES TO CONTRIB
+* Fix bashism in contrib/fetchsetup. Fixes Debian Bug#530081.
+
# DOCUMENTATION
* Some parts of the the manual page were revised for clarity, accuracy, and
updated recommendations (particularly SSL/TLS) and formatting conventions from
diff --git a/contrib/fetchsetup b/contrib/fetchsetup
index 0adf4751..e3584b03 100755
--- a/contrib/fetchsetup
+++ b/contrib/fetchsetup
@@ -12,12 +12,12 @@ cat << EOF
EOF
}
-if [ ! "$UID" = "0" ]; then
echo "[$LOGNAME] You need to be [root] to run this script."
echo "You could login: root"
echo "You could also try one of these: # sudo fetchsetup"
echo " # su -c fetchsetup"
exit 1
+if [ "$(id -ur)" != "0" ]; then
fi
MSG