X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=6f98950ab56f2a6fd6044693f5ab790620de5064;hb=refs%2Ftags%2Fdebian%2F6.0.4;hp=0fee7ca38ac0fa4b2ab36348633dcc205f107484;hpb=a15294f52fc01f32e55378ef8f3ef8973700e743;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 0fee7ca..6f98950 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -201,6 +201,7 @@ remove_bloat() {
       fi
     done
   done
+  IFS="$oldifs"
   [ "$DEBUG" ] && echo "DEBUG: pkgs_to_remove=$pkgs_to_remove" 1>&2
   # Finally, remove those
   if [ -n "$update_selections" ]; then
@@ -942,10 +943,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
 }