diff --git a/create_primtux_user.sh b/create_primtux_user.sh index e189394c5415a0b1c37d66761465e62969513307..882c995a7708d1de470b9d4a89bae168d1e22b04 100755 --- a/create_primtux_user.sh +++ b/create_primtux_user.sh @@ -43,12 +43,18 @@ fi . /etc/slis/slis.conf # set -x # Check for LDAP group Primtux -if [ -z "ldapsearch -x cn=Primtux | grep numEntries" ] -then - # insert primtux group - sed -e "s/BASE/$LDAP_BASE_DN/" $DIST/primtux.ldiff > $TEMPF.ldiff - ldapadd -x -D "cn=$LDAP_ADMIN_RDN,$LDAP_BASE_DN" -w $LDAP_ADMIN_PW -f $TEMPF.ldiff -fi +for f in dist/*.ldiff +do + echo $f + group=`head -n 1 $f | sed 's/^[^ ]* \([^,]*\),.*$/\1/'` + if [ -z "`ldapsearch -x $group | grep numEntries`" ] + then + echo "adding group" + # insert primtux group + sed -e "s/BASE/$LDAP_BASE_DN/" $f > $TEMPF.ldiff + ldapadd -x -D "cn=$LDAP_ADMIN_RDN,$LDAP_BASE_DN" -w $LDAP_ADMIN_PW -f $TEMPF.ldiff + fi +done ldapsearch -x -LLL uid=$user > $TEMPF.ldiff if [ ! -s $TEMPF.ldiff ] then