[173524] setup scripts retrieves incorrect adminid

Fixed to get the adminid from the right place: adminpw in the 2 setup scripts: one for rpm and another for the classic setup.

2 files changed, 39 insertions, 9 deletions

diff --git a/ldap/cm/newinst/setup b/ldap/cm/newinst/setup
index 0fc0412d..ac0e8327 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -137,6 +137,19 @@ getValFromAdminConf() {
 	echo $rval
 }
 
+getValFromAdmpw() {
+	cfile=$1
+	rval=`head -1 $sroot/admin-serv/config/$cfile | cut -f1 -d\:`
+	echo $rval
+}
+
+getValFromInf() {
+	cattr=$1
+	cfile=$2
+	rval=`grep -i ^$cattr $cfile | head -1 | sed -e 's/^.*=[ 	]*//'`
+	echo $rval
+}
+
 logfile=`doMktmp log`
 myargs=
 silent=
@@ -365,7 +378,7 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
 		ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
 		adminport=`getValFromAdminConf "\<port:" "adm.conf"`
-		siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+		adminid=`getValFromAdmpw "admpw"`
 		sysuser=`getValFromAdminConf "nsSuiteSpotUser:" "local.conf"`
 		suitespotuser=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $3}'`
 		suitespotgroup=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
@@ -378,11 +391,11 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		echo "Administrator password is required.  Here is your current information:"
 		echo ""
 		echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
-		echo "Configuration Administrator ID: $siepid"
+		echo "Configuration Administrator ID: $adminid"
 		echo ""
 		echo "At the prompt, please enter the password for the Configuration Administrator."
 		echo ""
-		echo "administrator ID: $siepid"
+		echo "administrator ID: $adminid"
 		siepasswd=""
 		while [ "$siepasswd" = "" ]; do
 			printf "Password: "
@@ -396,12 +409,12 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		echo "SuitespotGroup=   $suitespotgroup" >> $inffile
 		echo "ServerRoot=   $sroot" >> $inffile
 		echo "ConfigDirectoryLdapURL=   ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile
-		echo "ConfigDirectoryAdminID=   $siepid" >> $inffile
+		echo "ConfigDirectoryAdminID=   $adminid" >> $inffile
 		echo "AdminDomain=   $admindomain" >> $inffile
 		echo "ConfigDirectoryAdminPwd=   $siepasswd" >> $inffile
 		echo "" >> $inffile
 		echo "[admin]" >> $inffile
-		echo "ServerAdminID=   $siepid" >> $inffile
+		echo "ServerAdminID=   $adminid" >> $inffile
 		echo "ServerAdminPwd=   $siepasswd" >> $inffile
 		echo "SysUser=   $sysuser" >> $inffile
 		echo "Port=   $adminport" >> $inffile
@@ -508,6 +521,16 @@ SSLOn
 sed -e "s/jvm.option=\(.*\)/jvm.option=\1 -Djava.compiler=NONE/" admin-serv/config/jvm12.conf > admin-serv/config/jvm12.tmp
 mv admin-serv/config/jvm12.tmp admin-serv/config/jvm12.conf
 
+# get user, host, port for startconsole
+adminport=`getValFromInf Port $inffile`
+adminhost=`getValFromInf FullMachineName $inffile`
+adminuser=`getValFromInf ConfigDirectoryAdminID $inffile`
+
+echo ""
+echo "You can now use the console.  Here is the command to use to start the console:" | tee -a $logfile
+echo "cd $sroot" | tee -a $logfile
+echo "./startconsole -u $adminuser -a http://$adminhost:$adminport/" | tee -a $logfile
+echo""
 echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
 if [ -f setup/setup.log ] ; then
 	cat $logfile >> setup/setup.log
@@ -527,4 +550,5 @@ if [ $tmpinffile ]; then
 	fi
 	rm -f $inffile
 fi
+
 exit 0
diff --git a/ldap/cm/newinst/setup.patch b/ldap/cm/newinst/setup.patch
index 7637b386..ebc67ec0 100755
--- a/ldap/cm/newinst/setup.patch
+++ b/ldap/cm/newinst/setup.patch
@@ -95,6 +95,12 @@ getValFromAdminConf() {
     echo $rval
 }
 
+getValFromAdmpw() {
+    cfile=$1
+    rval=`head -1 $serverroot/admin-serv/config/$cfile | awk -F\: '{print $1}'`
+    echo $rval
+}
+
 dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
 dsconffile=$serverroot/$dsinst/config/dse.ldif
 if [ ! -f $dsconffile ]; then
@@ -197,7 +203,7 @@ fi
 
 ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
 ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
-siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+adminid=`getValFromAdmpw "admpw"`
 suitespotuser=`ls -l $dsconffile | awk '{print $3}'`
 suitespotgroup=`ls -l $dsconffile | awk '{print $4}'`
 admindomain=`echo $ldaphost | awk -F. '{if ($5) {print $2 "." $3 "." $4 "." $5} else if ($4) {print $2 "." $3 "." $4} else if ($3) {print $2 "." $3} else if ($2) {print $2} else {print ""}}'`
@@ -215,11 +221,11 @@ echo "In order to reconfigure your installation, the Configuration Directory"
 echo "Administrator password is required.  Here is your current information:"
 echo ""
 echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
-echo "Configuration Administrator ID: $siepid"
+echo "Configuration Administrator ID: $adminid"
 echo ""
 echo "At the prompt, please enter the password for the Configuration Administrator."
 echo ""
-echo "administrator ID: $siepid"
+echo "administrator ID: $adminid"
 siepasswd=""
 while [ "$siepasswd" = "" ]; do
     printf "Password: "
@@ -234,7 +240,7 @@ echo "SuiteSpotUserID=   $suitespotuser" >> $inffile
 echo "SuitespotGroup=   $suitespotgroup" >> $inffile
 echo "ServerRoot=   $serverroot" >> $inffile
 echo "ConfigDirectoryLdapURL=   ldap://$ldaphost:$ldapport/" >> $inffile
-echo "ConfigDirectoryAdminID=   $siepid" >> $inffile
+echo "ConfigDirectoryAdminID=   $adminid" >> $inffile
 echo "AdminDomain=   $admindomain" >> $inffile
 echo "ConfigDirectoryAdminPwd=   $siepasswd" >> $inffile
 echo "Components=   slapd-71sp1" >> $inffile