X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=773e5225ba53d8162be00c17f7d10f1adc9eb683;hb=a0b0241a8a528c25da8763e783b42f43db156f6a;hp=2f91b8251921536162571d3e75190c0e4afb3ce3;hpb=4750707795d8a2c3a518b3f14414cd4a3c05aa70;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index 2f91b82..773e522 100644
--- a/functions.sh
+++ b/functions.sh
@@ -83,7 +83,7 @@ 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 "$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
@@ -183,7 +183,7 @@ cp_check_and_sed() {
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
     if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
-      cp_safe_file_replace "$i.dpkg-tmp" "$i"
+      cp_mv "$i.dpkg-tmp" "$i"
     else
       rm "$i.dpkg-tmp"
     fi
@@ -239,7 +239,7 @@ ${CP_NOTICE}----------"
 }
 
 # by ddzeko, Mon, 21 Mar 2005 11:31:59 +0100
-cp_safe_file_replace () {
+cp_mv () {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   local new old
   if [ -z "$2" ]; then
@@ -253,3 +253,120 @@ cp_safe_file_replace () {
   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 1
+  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 1
+  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"
+}