Changeset 810

Timestamp:

07/19/10 18:36:52 (22 months ago)

Author:

tschmitt

Message:

• Skript update-logins.sh hinzugefügt, aktualisiert die Logindaten unter /var/cache/linuxmuster/logins.
• wimport.sh:
  • remove_account(): Computeraccount-Check ergänzt, damit keine gleichlautenden Useraccounts entfernt

werden (schließt #137).

• verbesserte Workstationsdatenüberprüfung (schließt #269).

Location:

main/linuxmuster-base/tags/1.5.3.3

Files:

• debian/changelog (modified) (1 diff)
• share/scripts/helperfunctions.sh (modified) (2 diffs, 1 prop)
• share/scripts/update-logins.sh (added)
• share/scripts/wimport.sh (modified) (11 diffs, 1 prop)

main/linuxmuster-base/tags/1.5.3.3/debian/changelog

@@ +1 @@
+linuxmuster-base (1.5.3.3-etch7) etch; urgency=low
+
+  * added bash script "update-logins.sh" to be able to update the cached logins
+    in /var/cache/linuxmuster/logins (#202).
+  * wimport.sh:
+    - remove_account(): added check for computer account so that user accounts
+      identical to the hostname were not removed (finally closes #137).
+    - improved workstations data checks (closes #269).
+  * helperfunctions.sh, check_string(): fixed unescaped underscore.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon,  19 Jul 2010 18:31:17 +0200
+
 linuxmuster-base (1.5.3.3-etch6) etch; urgency=low
 

main/linuxmuster-base/tags/1.5.3.3/share/scripts/helperfunctions.sh

@@ -5 +5 @@
 # GPL v3
 #
-# 06.07.2010 
+# $Id$
 #
 
@@ -874 +874 @@
 # check valid string without special characters
 check_string() {
-  if (expr match "$1" '\([a-zA-Z0-9_\-]\+$\)') &> /dev/null; then
+  if (expr match "$1" '\([a-zA-Z0-9\_\-]\+$\)') &> /dev/null; then
     return 0
   else

main/linuxmuster-base/tags/1.5.3.3/share/scripts/wimport.sh

@@ -2 +2 @@
 #
 # Thomas Schmitt <schmitt@lmz-bw.de>
-# 19.11.2008
+# $Id$
 #
-# GPL v2
+# GPL v3
 #
 
@@ -68 +68 @@
  # check if hostname exists already as a user account
  if echo "$ACCOUNTS_LDAP" | grep -qw "$hostname"; then
-  echo "  * ERROR: $hostname is already a ldap user account! Skipping!"
+  echo "  > ERROR: $hostname is already a ldap user account! Skipping!"
   echo
   return 1
  fi
  if echo "$ACCOUNTS_DB" | grep -qw "$hostname"; then
-  echo "  * ERROR: $hostname is already a postgresql user account! Skipping!"
+  echo "  > ERROR: $hostname is already a postgresql user account! Skipping!"
   echo
   return 1
  fi
  if grep -q ^"${hostname}"\: /etc/passwd; then
-  echo "  * ERROR: $hostname is already a system account! Skipping!"
+  echo "  > ERROR: $hostname is already a system account! Skipping!"
   echo
   return 1
  fi
  if [ -e "$SOPHOMORIXLOCK" ]; then
-  echo "Fatal! Sophomorix lockfile $SOPHOMORIXLOCK detected!"
+  echo "  > Fatal! Sophomorix lockfile $SOPHOMORIXLOCK detected!"
   return 1
  fi
@@ -94 +94 @@
  fi
  if ! sophomorix-passwd -u $hostname --pass $HOST_PASSWORD 2>> $TMPLOG 1>> $TMPLOG; then
-  echo "  * Error: Cannot set password for $hostname!"
+  echo "  > Error: Cannot set password for $hostname!"
   return 1
  fi
@@ -120 +120 @@
 # remove workstation and machine accounts
 remove_account() {
+ if ! check_account $hostname; then
+  echo "  > Fatal! $hostname is no computer account! Not removing!"
+  return 1
+ fi
  if [ -e "$SOPHOMORIXLOCK" ]; then
-  echo "Fatal! Sophomorix lockfile $SOPHOMORIXLOCK detected!"
+  echo "  > Fatal! Sophomorix lockfile $SOPHOMORIXLOCK detected!"
   return 1
  fi
@@ -209 +213 @@
 
 
-# Check if workstation data file is empty
+# filter out bad workstation data
+touch $WDATATMP
 if [ -s "$WIMPORTDATA" ]; then
 
  # create a clean workstation data file
+ RC_LINE=0
  echo "Checking workstation data:"
  while read line; do
 
+  # skip comment lines
   [ "${line:0:1}" = "#" ] && continue
 
-  # strip spaces from $line
+  # strip spaces and skip empty lines
   line=${line// /}
+  [ -z "$line" ] && continue
 
   room=`echo $line | awk -F\; '{ print $1 }'`
-  [ -z "$room" ] && continue
+  if ! validname "$room"; then
+   [ -z "$room" ] && room="<empty>"
+   echo "  > $room is no valid room name! Skipping."
+   RC_LINE=1
+   continue
+  fi
 
   hostname=`echo $line | awk -F\; '{ print $2 }'`
   tolower $hostname
   hostname=$RET
-  [ -z "$hostname" ] && continue
+  if ! validhostname "$hostname"; then
+   [ -z "$hostname" ] && hostname="<empty>"
+   echo "  > $hostname is no valid hostname! Skipping."
+   RC_LINE=1
+   continue
+  fi
 
   hostgroup=`echo $line | awk -F\; '{ print $3 }'`
-  [ -z "$hostgroup" ] && continue
+  if ! validname "$hostgroup"; then
+   [ -z "$hostgroup" ] && hostgroup="<empty>"
+   echo "  > $hostgroup is no valid group name! Skipping $hostname."
+   RC_LINE=1
+   continue
+  fi
 
   mac=`echo $line | awk -F\; '{ print $4 }'`
   toupper $mac
   mac=$RET
-  [ -z "$mac" ] && continue
+  if ! validmac "$mac"; then
+   [ -z "$mac" ] && mac="<empty>"
+   echo "  > $mac is no valid mac address! Skipping $hostname."
+   RC_LINE=1
+   continue
+  fi
 
   ip=`echo $line | awk -F\; '{ print $5 }'`
-  [ -z "$ip" ] && continue
+  if ! validip "$ip"; then
+   [ -z "$ip" ] && ip="<empty>"
+   echo "  > $ip is no valid ip address! Skipping $hostname."
+   RC_LINE=1
+   continue
+  fi
 
   pxe=`echo $line | awk -F\; '{ print $11 }'`
-  [ -z "$pxe" ] && continue
+  if [ -z "$pxe" ]; then
+   echo "  > PXE-Flag is not set! Skipping $hostname."
+   RC_LINE=1
+   continue
+  fi
 
   echo "$room;$hostname;$hostgroup;$mac;$ip;$internmask;1;1;1;1;$pxe" >> $WDATATMP
 
  done <$WIMPORTDATA
+
+fi
+
+# check for repeated hostnames, macs and ips
+if [ -s "$WDATATMP" ]; then
 
  # check hostnames
  hostnames=`awk -F\; '{ print $2 }' $WDATATMP`
  for i in $hostnames; do
-  validhostname "$i" || exitmsg "Hostname $i does not comply with RFC 952!"
   check_unique "$i" "$hostnames" || exitmsg "Hostname $i is not unique!"
  done
@@ -257 +298 @@
  macs=`awk -F\; '{ print $4 }' $WDATATMP`
  for i in $macs; do
-  validmac $i || exitmsg "Invalid MAC address: $i!"
   check_unique "$i" "$macs" || exitmsg "MAC address $i is not unique!"
  done
@@ -264 +304 @@
  ips=`awk -F\; '{ print $5 }' $WDATATMP`
  for i in $ips; do
-  validip $i || exitmsg "Invalid IP address: $i!"
   check_unique "$i" "$ips" || exitmsg "IP address $i is not unique!"
  done
 
- echo "  * Workstation data are Ok! :-)"
-
-else
-
- touch $WDATATMP
- echo "  * No workstation data found! Skipping workstation import!"
-
-fi
+fi
+
+# evaluate workstation data checks
+[ "$RC_LINE" = "0" -a -s "$WDATATMP" ] && echo "  * Workstation data are Ok! :-)"
+if [ "$RC_LINE" != "0" ]; then
+ RC=1
+ echo "  > Workstation data with errors! :-("
+fi
+[ -s "$WDATATMP" ] || echo "  * No valid workstation data found! Skipping workstation import!"
+
 echo
 
@@ -291 +332 @@
 
 # Check if workstation data file is empty
-if [ -s "$WIMPORTDATA" ]; then
+if [ -s "$WDATATMP" ]; then
 
  # write configuration files and create host accounts
@@ -331 +372 @@
   else
    if ! sophomorix-passwd --force -u ${hostname}$ --pass $MACHINE_PASSWORD 2>> $TMPLOG 1>> $TMPLOG; then
-    echo "  * Error: Cannot set machine password for ${hostname}$!"
+    echo "  > Error: Cannot set machine password for ${hostname}$!"
     RC=1
     continue
@@ -448 +489 @@
 
   hostname=${i##*/}
-  if ! grep -qw $hostname $WDATATMP; then
+  if ! awk -F\; '{ print "X"$2"X" }' $WDATATMP | grep -q X${hostname}X; then
    FOUND=1
    remove_account ; RC_LINE="$?"
    [ $RC_LINE -eq 0 ] || RC=1
-   if [ -z "$HOSTS_REMOVED" ]; then
-    HOSTS_REMOVED=$hostname
-   else
-    HOSTS_REMOVED="$HOSTS_REMOVED $hostname"
-   fi
-
    if grep -v ^# $PRINTERS | grep -qw $hostname; then
     remove_printeraccess $hostname ; RC_LINE="$?"
@@ -480 +515 @@
 for room in $rooms; do
 
- if ! grep -qw $room $WDATATMP; then
+ if ! awk -F\; '{ print "X"$1"X" }' $WDATATMP | grep -q X${room}X; then
   FOUND=1
   echo -n "  * Removing room: $room ... "