[Gforge-commits] gforge/deb-specific install-ldap.sh, 1.57.2.1, 1.57.2.2

[lo-lan-do]

Update of /cvsroot/gforge/gforge/deb-specific
In directory db.perdue.net:/tmp/cvs-serv32094/deb-specific

Modified Files:
      Tag: Branch_3_1
        install-ldap.sh 
Log Message:
Yet another LDAP fix.  This one would completely prevent installation
from scratch.


Index: install-ldap.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-ldap.sh,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -u -d -r1.57.2.1 -r1.57.2.2
--- install-ldap.sh     10 Jan 2004 21:41:13 -0000      1.57.2.1
+++ install-ldap.sh     11 Jan 2004 01:17:38 -0000      1.57.2.2
@@ -315,7 +315,7 @@
        tmpldifadd=$(mktemp $tmpfile_pattern)
        tmpldifmod=$(mktemp $tmpfile_pattern)
        dc=$(echo $gforge_base_dn | cut -d, -f1 | cut -d= -f2)
-       echo >> $tmpldif <<EOF
+       cat >> $tmpldif <<EOF
 dn: $sys_ldap_base_dn
 dc: $dc
 objectClass: top
@@ -416,7 +416,7 @@
        tmpldif=$(mktemp $tmpfile_pattern)
        tmpldifadd=$(mktemp $tmpfile_pattern)
        tmpldifmod=$(mktemp $tmpfile_pattern)
-       echo > $tmpldif <<-FIN
+       cat > $tmpldif <<-FIN
 dn: $gforge_base_dn
 objectClass: domain
 dc: $dc
@@ -476,8 +476,8 @@
 
 FIN
        
-       if ! eval "ldapadd -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' > $tmpldifadd 2>&1" < $tmpldif ; then
-           if ! eval "ldapmodify -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' > $tmpldifadd 2>&1" < $tmpldif ; then
+       if ! eval "ldapadd -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' -f $tmpldif > $tmpldifadd 2>&1" ; then
+           if ! eval "ldapmodify -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' -f $tmpldif > $tmpldifadd 2>&1" ; then
                echo "WARNING WARNING WARNING Something wrong happened when 
setting up the robot"
                echo "please check and report following error"
                echo 
========================================================================================