From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Mon, 19 Mar 2012 14:51:39 +0000 (+0100)
Subject: Handle port number in pam_radius_auth.conf.
X-Git-Tag: debian/6.0.4~2
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=0ded29d74f100f20d8aab848d69eb17d9a68ee40;p=carnet-upgrade.git

Handle port number in pam_radius_auth.conf.
---

diff --git a/src/functions.sh b/src/functions.sh
index 0fee7ca..ce861a3 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -942,10 +942,10 @@ upgrade_freeradius () {
       sed -n '/^[[:space:]]*client[[:space:]]\+localhost/,/^[[:space:]]*}/ { /^[[:space:]]*secret[[:space:]]*=[[:space:]]*\([^[:space:]]*\)/s//\1/p }' /etc/freeradius/clients.conf
     )
     if [ "$password" ] \
-       && ! grep -q "^127.0.0.1[[:space:]]\+$password[[:space:]]\+" \
+       && ! grep -q "^127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+$password[[:space:]]\+" \
          /etc/pam_radius_auth.conf
     then
-      sed -i.$backup_ext "s/^\(127.0.0.1[[:space:]]*\)[^[:space:]]*\(.*\)/\1$password\2/" /etc/pam_radius_auth.conf
+      sed -i.$backup_ext "s/^\(127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+\)[^[:space:]]\+\(.*\)/\1$password\3/" /etc/pam_radius_auth.conf
     fi
   fi
 }