X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-tools-cn.git;a=blobdiff_plain;f=functions.sh;h=28877c5a1849396ccfe7c09554237795f92581e8;hp=8c2ec0005b3bfe9763c8df88ed0ebe83535abd44;hb=78cf4902f1c46307ce7408229c40f67ecc3552ec;hpb=ee4b21b73a51233003fbbe3d8acd68c9398f6dd9

diff --git a/functions.sh b/functions.sh
index 8c2ec00..28877c5 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1,53 +1,81 @@
 # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
 cp_get_ifaddr() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
-  local ifaddr interface
+  local ifaddr interface echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
 
   interface="$1"
-  [ -z "$interface" ] && interface=lo
+  if [ -z "$interface" ]; then
+    cp_get_ifdefault dev
+    interface="$RET"
+    [ -z "$interface" ] && interface=lo
+  fi
 
   if ! ifconfig $interface 2> /dev/null >> /dev/null; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifaddr: $interface: No such interface"
-    return 1
+    echo "cp_get_ifaddr: $interface: No such interface" 1>&2
+    CP_ECHO_RETURN="$echo_return"
+    return 2
   fi
 
   ifaddr="`/sbin/ifconfig $interface | awk '/inet/{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
 
   if [ -z $ifaddr ]; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifaddr: $interface: No such ipaddress"
+    echo "cp_get_ifaddr: $interface: No ip address found" 1>&2
+    CP_ECHO_RETURN="$echo_return"
     return 1
   fi
 
   RET="$ifaddr"
-  [ -z "$CP_ECHO_RETURN" ] || echo $RET
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
 }
 
 # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
 cp_get_ifmask() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
-  local ifmask interface
+  local ifmask interface echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
 
   interface="$1"
-  [ -z "$interface" ] && interface=lo
+  if [ -z "$interface" ]; then
+    cp_get_ifdefault dev
+    interface="$RET"
+    [ -z "$interface" ] && interface=lo
+  fi
 
   if ! ifconfig $interface 2> /dev/null >> /dev/null; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifmask: $interface: No such interface"
+    echo "cp_get_ifmask: $interface: No such interface" 1>&2
+    CP_ECHO_RETURN="$echo_return"
     return 1
   fi
 
   ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
 
   if [ -z "$ifmask" ]; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifmask: $interface: No such netmask"
+    echo "cp_get_ifmask: $interface: No netmask found" 1>&2
+    CP_ECHO_RETURN="$echo_return"
     return 1
   fi
 
   RET="$ifmask"
-  [ -z "$CP_ECHO_RETURN" ] || echo $RET
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
 }
 
 # by ddzeko, Mon, 21 Mar 2005 07:00:22 +0100
 cp_get_ifdefault() {
+  local echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
+
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   RET=""
   case $1 in
@@ -55,13 +83,14 @@ cp_get_ifdefault() {
     addr) RET=`route -n | awk '/^0.0.0.0/{print $2}'` ;;
     *)    echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;;
   esac
-  [ -z "$RET" -a "$1" -a "$CP_VERBOSE" ] && echo "cp_get_ifdefault: No default route" >&2
-  [ -z "$CP_ECHO_RETURN" ] || echo $RET
+  [ -z "$RET" -a "$1" ] && echo "cp_get_ifdefault: No default route" >&2
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
   [ -z "$RET" ] && return 1
 }
 
 # by ico, Tue, 15 Mar 2005 14:04:21 +0100
-cp_get_cidr() {
+cp_get_netaddr() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   local netmask ipaddress interface cidr echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
@@ -77,20 +106,24 @@ cp_get_cidr() {
   fi
 
   if ! ifconfig $interface 2> /dev/null >> /dev/null; then
-    [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such interface"
-    goto return1
+    echo "cp_get_netaddr: $interface: No such interface" 1>&2
+    CP_ECHO_RETURN="$echo_return"
+    return 1
   fi
 
   cp_get_ifaddr "$interface"
   ipaddress="$RET"
   if [ -z $ipaddress ]; then
-    [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such ipaddress"
-    goto return1
+    echo "cp_get_netaddr: $interface: No IP address found" 1>&2
+    CP_ECHO_RETURN="$echo_return"
+    return 1
   fi
   cp_get_ifmask "$interface"
   netmask="$RET"
   if [ -z $netmask ]; then
-    [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such netmask"
+    echo "cp_get_netaddr: $interface: No netmask found" 1>&2
+    CP_ECHO_RETURN="$echo_return"
+    return 1
   fi
 
   if [ "$netmask" = "255.255.255.255" ]; then
@@ -102,40 +135,56 @@ cp_get_cidr() {
   RET="$cidr"
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
-  return 0
-  
-  return1:
-    CP_ECHO_RETURN="$echo_return"
-    return 1
+}
+
+cp_check_and_backup() {
+  cp_backup_conffile -r "$@"
 }
 
 # by ico, Tue, 15 Mar 2005 14:04:21 +0100
 cp_backup_conffile() {
-  [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
-  local file_bak
-
-  if [ -z $1 ]; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "Usage: cp_backup_conffile <file>"
-    return 1
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+  local file_bak check did
+  
+  if [ "x$1" = "x-r" ]; then
+    check=1
+    shift
   fi
-  if [ ! -f $1 ]; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_backup_conffile: $1: No such file"
+  if [ -z "$1" ]; then
     return 1
   fi
+  if [ ! -f "$1" ]; then
+    echo "cp_backup_conffile: $1: No such file" 1>&2
+    return 2
+  fi
+  if [ -z "$2" ]; then
+    file_bak="/var/backups/`basename $1`.bak"
+  else
+    file_bak="/var/backups/`basename $2`.bak"
+  fi
 
-  file_bak="/var/backups/`basename $1`.bak"
-
-  if [ ! -f $file_bak ]; then
-    cp -pf $1 $file_bak
+  if [ ! -f "$file_bak" ]; then
+    cp -pf "$1" "$file_bak"
+    did=1
   else
-    if ! cmp -s $1 $file_bak; then
-      /usr/bin/savelog -p -c 7 $file_bak > /dev/null 2> /dev/null
-      cp -pf $1 $file_bak
+    if ! cmp -s "$1" "$file_bak"; then
+      /usr/bin/savelog -p -c 7 "$file_bak" > /dev/null 2> /dev/null
+      cp -pf "$1" "$file_bak"
+      did=1
     fi
   fi
+
+  [ -z "$check" ] && return 0
+
+  if [ "$check" -a ! "$did" ]; then
+    return 3
+  else
+    return 0
+  fi
 }
 
 # by jelly, Tue, 15 Mar 2005 14:04:21 +0100
+# modified by ico, Mon,  6 Jun 2005 11:58:08 +0200
 # A sed wrapper, to use instead of perl -pi -e
 #  - relatively safe in-place s///g
 #  - takes care of symlinks and ownership
@@ -143,7 +192,10 @@ cp_backup_conffile() {
 #
 cp_check_and_sed() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
-  local s sedcmd ret i
+  local s sedcmd grepret ret i
+  if [ -z "$3" ]; then
+    return 1
+  fi
   s="$1"
   shift
   sedcmd="$1"
@@ -152,18 +204,25 @@ cp_check_and_sed() {
   for i in "$@"
   do
     [ -e "$i" ]        || continue
-    egrep -q "$s" "$i" || continue
+    if ! egrep -q "$s" "$i"; then
+      grepret=1
+      continue
+    fi
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
-    if ! cmp -s "$i" "$i.dpkg-tmp"; then
-      chown --reference "$i" "$i.dpkg-tmp"
-      chmod --reference "$i" "$i.dpkg-tmp"
-      mv "$i.dpkg-tmp" "$i"
+    if [ $? -ne 0 ]; then
+      rm "$i.dpkg-tmp"
+      echo "cp_check_and_sed: Problem with sed" 1>&2
+      return 5
+    fi
+    if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
+      cp_mv "$i.dpkg-tmp" "$i"
     else
       rm "$i.dpkg-tmp"
     fi
     ret=0
   done
+  [ "$ret" -eq 2 -a "$grepret" ] && ret=1 || true
   return $ret
 }
 
@@ -212,3 +271,138 @@ ${CP_NOTICE}----------"
     sleep 1
   fi
 }
+
+# by ddzeko, Mon, 21 Mar 2005 11:31:59 +0100
+cp_mv () {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+  local new old
+  if [ -z "$2" ]; then
+    return 1
+  fi
+  new="$1"
+  old="$2"
+  if [ -e "$old" ]; then
+    chown --reference "$old" "$new"
+    chmod --reference "$old" "$new"
+  fi
+  mv "$new" "$old"
+}
+
+# by ddzeko, Mon, 21 Mar 2005 13:35:42 +0100
+cp_yes_no () {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+  local prompt answer
+  prompt="$1"
+  [ "$prompt" ] || prompt="Are you sure?"
+  RET=""
+
+  # check to prevent user from using this when debconf is active
+  # (it would break communication with its backend - uses stdin/out)
+  if [ "$DEBCONF_REDIR" ]; then
+    echo "cp_yes_no: debconf redirection detected" >&2
+    return 1
+  fi
+
+  echo -n "$prompt (y)es/(n)o: "
+  read answer
+  case "$answer" in
+    y*)
+      echo
+      RET=y
+      ;;
+    n*)
+      echo
+      RET=n
+      ;;
+    *)
+      echo
+      echo "Please read the message and choose y or n"
+      cp_yes_no
+      ;;
+  esac
+}
+
+# by ddzeko, Tue, 29 Mar 2005 17:37:52 +0200
+#
+# db_get seems to return error messages if the requested variable 
+# is not found - we do not find that desirable, and checking $? with
+# set -e turned on seems to be a bit of a problem
+# --> that's why we wrap the db_get call to return unset RET variable
+#     instead of some gibberish error message that our script does
+#     not expect
+cp_db_get() {
+  local var
+  var="$1"
+  
+  # check to prevent user from using this before activating debconf
+  # confmodule needs to be loaded before accessing db_* functions
+  if [ -z "$DEBCONF_REDIR" ]; then
+    echo "cp_db_get: debconf not activated!" >&2
+    return 1
+  fi
+ 
+  if ! db_get "$var"; then
+    case "$RET" in
+        *doesn\'t\ exist)
+          RET=""
+          ;;
+        [0-9][0-9]\ ?*) # other errors
+          RET=""
+          ;;
+    esac
+  fi
+}
+
+# by ico, Wed, 20 Apr 2005 21:09:54 +0200
+cp_get_ldap_suffix() {
+  local echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
+
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
+  if [ ! -f /etc/ldap/slapd.conf ]; then
+    echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2
+    return 2
+  fi
+  
+  RET="`awk  '/^suffix/      { exit }
+              END            { gsub(/"/, "", $2); print $2 }' \
+	     < /etc/ldap/slapd.conf`"
+
+  if [ "`echo $RET | sed 's/,/ /g' | wc -w`" -gt 2 ]; then
+    RET=""
+    echo "cp_get_ldap_suffix: Invalid LDAP suffix in /etc/ldap/slapd.conf" >&2
+    return 2
+  fi
+    
+  [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
+}
+
+# by ico, Wed, 20 Apr 2005 21:09:54 +0200
+cp_get_ldap_realm() {
+  local echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
+
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
+  if [ ! -f /etc/ldap/slapd.conf ]; then
+    echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
+    return 2
+  fi
+ 
+  cp_get_ldap_suffix || true
+  RET="`echo $RET | awk -F, '{print $1}' | awk -F= '{print $2}'`"
+
+  [ -z "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.conf" >&2
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
+}
+