X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-tools-cn.git;a=blobdiff_plain;f=functions.sh;h=ed67fb04871d66bfcad810e49db4a22436845797;hp=84af78032ba88e54cec649e2012d70a9cef1adea;hb=HEAD;hpb=dd60228fb054bcc7ad1f222d1de6c7f351c00069 diff --git a/functions.sh b/functions.sh index 84af780..ed67fb0 100644 --- a/functions.sh +++ b/functions.sh @@ -5,6 +5,7 @@ if [ -z "$_CP_INIT_ECHO_RETURN" ]; then fi # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100 +# modified by irako, Mon, 02 Jul 2018 21:46:29 +0200 cp_get_ifaddr() { [ "$CP_SCRIPT_DEBUG" ] && set -vx @@ -21,13 +22,16 @@ cp_get_ifaddr() { [ -z "$interface" ] && interface=lo fi - if ! ifconfig $interface 2> /dev/null >> /dev/null; then + #if ! ifconfig $interface 2> /dev/null >> /dev/null; then + if ! ip addr show $interface 2> /dev/null >> /dev/null; then 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)) }'`" + #ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf("%s\n",substr($2,index($2,":")+1)) }'`" + #ifaddr="`/sbin/ifconfig $interface | awk '/inet /{ printf($2) }'`" + ifaddr="`ip -o -4 addr show $interface scope global | awk '{print $4;}' | cut -d/ -f 1 | head -1`" if [ -z $ifaddr ]; then echo "cp_get_ifaddr: $interface: No ip address found" 1>&2 @@ -41,10 +45,11 @@ cp_get_ifaddr() { } # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100 +# modified by irako, Mon, 02 Jul 2018 21:46:29 +0200 cp_get_ifmask() { [ "$CP_SCRIPT_DEBUG" ] && set -vx - local ifmask interface echo_return + local ifmask interface echo_return cidr 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 @@ -57,13 +62,17 @@ cp_get_ifmask() { [ -z "$interface" ] && interface=lo fi - if ! ifconfig $interface 2> /dev/null >> /dev/null; then + #if ! ifconfig $interface 2> /dev/null >> /dev/null; then + if ! ip addr show $interface 2> /dev/null >> /dev/null; then 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))}'`" + #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))}'`" + #ifmask="`/sbin/ifconfig $interface | awk '/netmask /{ printf($4) }'`" + cidr="`ip -o -4 addr show $interface scope global | awk '{print $4;}'`" + ifmask="`ipcalc -nb $cidr | awk '/^Netmask:/{print $2}'`" if [ -z "$ifmask" ]; then echo "cp_get_ifmask: $interface: No netmask found" 1>&2 @@ -77,6 +86,7 @@ cp_get_ifmask() { } # by ddzeko, Mon, 21 Mar 2005 07:00:22 +0100 +# modified by irako, Mon, 02 Jul 2018 21:46:29 +0200 cp_get_ifdefault() { [ "$CP_SCRIPT_DEBUG" ] && set -vx @@ -89,14 +99,16 @@ cp_get_ifdefault() { RET="" case $1 in dev) - RET=`route -n | awk 'BEGIN {m = 2^32} - /^0\.0\.0\.0[ \t]/ {if ($5 < m) {r = $8; m = $5}} - END {print r}'` + #RET=`route -n | awk 'BEGIN {m = 2^32} + # /^0\.0\.0\.0[ \t]/ {if ($5 < m) {r = $8; m = $5}} + # END {print r}'` + RET=`ip route | grep ^default | awk '{print $5}'` ;; addr) - RET=`route -n | awk 'BEGIN {m = 2^32} - /^0\.0\.0\.0[ \t]/ {if ($5 < m) {r = $2; m = $5}} - END {print r}'` + #RET=`route -n | awk 'BEGIN {m = 2^32} + # /^0\.0\.0\.0[ \t]/ {if ($5 < m) {r = $2; m = $5}} + # END {print r}'` + RET=`ip route | grep ^default | awk '{print $3}'` ;; *) echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 @@ -111,6 +123,7 @@ cp_get_ifdefault() { } # by ico, Tue, 15 Mar 2005 14:04:21 +0100 +# modified by irako, Mon, 02 Jul 2018 21:46:29 +0200 cp_get_netaddr() { [ "$CP_SCRIPT_DEBUG" ] && set -vx @@ -127,7 +140,8 @@ cp_get_netaddr() { [ -z "$interface" ] && interface=lo fi - if ! ifconfig $interface 2> /dev/null >> /dev/null; then + #if ! ifconfig $interface 2> /dev/null >> /dev/null; then + if ! ip addr show $interface 2> /dev/null >> /dev/null; then echo "cp_get_netaddr: $interface: No such interface" 1>&2 CP_ECHO_RETURN="$echo_return" return 1 @@ -151,7 +165,7 @@ cp_get_netaddr() { if [ "$netmask" = "255.255.255.255" ]; then cidr="$ipaddress/32" else - cidr="`ipcalc -ncb $ipaddress $netmask | awk '/^Network:/{print $2}'`" + cidr="`ipcalc -nb $ipaddress $netmask | awk '/^Network:/{print $2}'`" fi RET="$cidr" @@ -327,8 +341,8 @@ cp_mail () { CP_NOTICE="From: $pkg postinst script To: root Subject: $pkg$version package install log -Date: $(/bin/date +'%a, %d %b %Y %H:%M:%S %z') - +Date: $(LC_ALL=C /bin/date --rfc-2822) + Hello! The $pkg package has been successfully installed on your computer. @@ -337,9 +351,11 @@ is included below. ---------- ${CP_NOTICE}----------" - - echo "$CP_NOTICE" | /usr/sbin/sendmail -t & - sleep 1 + + if [ -x /usr/sbin/sendmail ]; then + echo "$CP_NOTICE" | /usr/sbin/sendmail -t -oi & + sleep 1 + fi fi } @@ -356,6 +372,7 @@ cp_mv () { if [ -e "$old" ]; then chown --reference "$old" "$new" chmod --reference "$old" "$new" + cp -pf "$old" "$old.cn-old" fi mv "$new" "$old" } @@ -378,6 +395,14 @@ cp_yes_no () { echo -n "$prompt (y)es/(n)o: " read answer case "$answer" in + Y*) + echo + RET=y + ;; + N*) + echo + RET=n + ;; y*) echo RET=y @@ -389,7 +414,7 @@ cp_yes_no () { *) echo echo "Please read the message and choose y or n" - cp_yes_no + cp_yes_no "$prompt" ;; esac } @@ -427,7 +452,7 @@ cp_db_get() { fi } -# by ico, Wed, 20 Apr 2005 21:09:54 +0200 +# by ico, Wed, 07 Dec 2011 13:30:02 +0100 cp_get_ldap_suffix() { [ "$CP_SCRIPT_DEBUG" ] && set -vx @@ -437,22 +462,27 @@ cp_get_ldap_suffix() { # but preserving initial state so it could be used afterwards CP_ECHO_RETURN="" - if [ ! -f /etc/ldap/slapd.conf ]; then - echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2 + RET="" + + if [ -d /etc/ldap/slapd.d/ ]; then + RET="`grep -r olcSuffix: /etc/ldap/slapd.d/ | awk '{print $2}' | head -1`" + elif [ -f /etc/ldap/slapd.conf ]; then + RET="`awk '/^suffix/ { exit } + END { gsub(/"/, "", $2); print $2 }' \ + < /etc/ldap/slapd.conf`" + else + RET="" + echo "cp_get_ldap_suffix: /etc/ldap/slapd.{d/,conf}: No such file or directory" >&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 + echo "cp_get_ldap_suffix: Invalid LDAP suffix in /etc/ldap/slapd.d/" >&2 return 2 fi - [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2 + [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.{d/,conf}" >&2 [ -z "$echo_return" ] || echo $RET CP_ECHO_RETURN="$echo_return" } @@ -467,16 +497,96 @@ cp_get_ldap_realm() { # but preserving initial state so it could be used afterwards CP_ECHO_RETURN="" - if [ ! -f /etc/ldap/slapd.conf ]; then - echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2 + RET="" + + if [ ! -d /etc/ldap/slapd.d/ -a ! -f /etc/ldap/slapd.conf ]; then + echo "cp_get_ldap_realm: /etc/ldap/slapd.{d/,conf}: No such file or directory" >&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 "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.{d/,conf}" >&2 [ -z "$echo_return" ] || echo $RET CP_ECHO_RETURN="$echo_return" } +# if fqdn is name.dom3.dom2.dom1.hr, check if this host is MX for +# either dom3.dom2.dom1.hr, dom2.dom1.hr or dom1.hr and dump highest level +# domain on stdout +cp_get_mx_domain() { + [ "$CP_SCRIPT_DEBUG" ] && set -vx + + local domains d host + + host=$(hostname -f) + RET="$host" + if ! echo "$host" | grep -q '\.'; then + return + fi + if [ ! -x /usr/bin/host ]; then + # no host command + return + fi + domains=$(/bin/hostname -f | awk -F. ' + { + for (i=2; i output_functions + # new-prefix list-of-functions + perl -e ' + $prefix = shift; %keep = (); $output = ""; + $keep{$_} = 1 for @ARGV; + # add dependent functions + %deps = ( + get_ifaddr => [ "get_ifdefault" ], + get_netaddr => [ "get_ifdefault", "get_ifaddr", "get_ifmask" ], + check_and_backup => [ "backup_conffile" ], + check_and_sed => [ "mv" ], + get_ldap_realm => [ "get_ldap_suffix" ], + ); + foreach my $f (keys(%keep)) { + if (exists($deps{$f})) { + $keep{$_} = 1 for (@{$deps{$f}}); + } + } + while () { + if (/^_?cp_(\w+) *\(\) *\{/) { + if (! exists($keep{$1})) { + while () { last if /^\}/; } # skip it + next; + } else { + $output .= "\n"; + } + } + next if /^\s*(\#|$)/; + $output .= $_; + } + $output =~ s/\b(_?)cp_/$1${prefix}_/sg; + $prefix = uc($prefix); + $output =~ s/\b(_?)CP_/$1${prefix}_/sg; + print $output; + ' -- $* +}