Changeset 549 for main/linuxmuster-base/trunk/share/scripts/helperfunctions.sh

Timestamp:

10/22/09 11:07:40 (3 years ago)

Author:

tschmitt

Message:

• Release-Nr. in dist.conf auf 4.0.4 aktualisiert.
• smb.conf-Anpassungen:
  • "unix charset = UTF8" und "ldap ssl = Off" im globalen Bereich ergänzt.
  • "write list = @@administrator@@,@@@teachersgroup@@" in students share geändert.
• "TLS_REQCERT never" in /etc/ldap/ldap.conf ergänzt, neue dynamische Vorlage für ldap.conf hinzugefügt (#144).
• Apache's UserDir? Statement in /etc/apache2/mods-enabled/userdir.conf gefixt (public_html nur für Lehrer) (#143).
• ldap-Abfrage für Maschinenaccounts in helperfunctions.sh gefixt (#116).
• Fehlende Prüfung auf existierenden user account in wimport.sh ergänzt (#137).
• Windows 7 Registry-Patch-Beispiel-Datei hinzugefügt.

File:

• main/linuxmuster-base/trunk/share/scripts/helperfunctions.sh (modified) (4 diffs)

main/linuxmuster-base/trunk/share/scripts/helperfunctions.sh

@@ -660 +660 @@
   RET=`psql -U ldap -d ldap -t -c "select uid from posix_account where firstname = 'Exam';"`
   if [ -n "$RET" ]; then
-                echo "$RET"
-    return 0
-  else
-    return 1
+                echo "$RET" | awk '{ print $1 }'
+   return 0
+  else
+   return 1
   fi
 }
@@ -670 +670 @@
 hosts_ldap() {
   unset RET
-  RET=`ldapsearch -c -LL -b ou=accounts,$basedn -x filter cn=ExamAccount | grep uid= | awk -F= '{ print $2 }' | awk -F, '{ print $1 }'`
+  RET=`ldapsearch -x -ZZ -h localhost "(cn=ExamAccount)" | grep ^uid\: | awk '{ print $2 }'`
   if [ -n "$RET" ]; then
                 echo "$RET"
@@ -684 +684 @@
   RET=`psql -U ldap -d ldap -t -c "select uid from posix_account where firstname = 'Computer';"`
   if [ -n "$RET" ]; then
+                 echo "$RET" | awk '{ print $1 }'
+   return 0
+  else
+   return 1
+  fi
+}
+
+# get all host accounts from ldap
+machines_ldap() {
+  unset RET
+  RET=`ldapsearch -x -ZZ -h localhost "(cn=Computer)" | grep ^uid\: | awk '{ print $2 }'`
+  if [ -n "$RET" ]; then
                 echo "$RET"
     return 0
@@ -691 +703 @@
 }
 
-# get all host accounts from ldap
-machines_ldap() {
-  unset RET
-  RET=`ldapsearch -c -LL -b ou=machines,$basedn -x filter cn=Computer | grep uid= | awk -F= '{ print $2 }' | awk -F, '{ print $1 }'`
+# get all user accounts
+accounts_db() {
+  unset RET
+  RET=`psql -U ldap -d ldap -t -c "select uid from posix_account where firstname <> 'Computer' and firstname <> 'Exam';"`
+  if [ -n "$RET" ]; then
+                 echo "$RET" | awk '{ print $1 }'
+   return 0
+  else
+   return 1
+  fi
+}
+
+# get all user accounts from ldap
+accounts_ldap() {
+  unset RET
+  RET=`ldapsearch -x -ZZ -h localhost "(&(!(cn=Computer))(!(cn=ExamAccount)))" | grep ^uid\: | awk '{ print $2 }'`
   if [ -n "$RET" ]; then
                 echo "$RET"