--- /opt/SUNWut/sbin/utconfig.SUN	Wed Aug 11 21:44:26 2004
+++ /opt/SUNWut/sbin/utconfig	Wed Aug 11 21:44:56 2004
@@ -1664,23 +1664,23 @@
 # SRDS_VERSION="2.0"	# XXX until SRDS 2.0 is part of Solaris image <===
 SRDS_PACKAGE="SUNWutdso"
 
-if ! SRDSInstalled; then
-  Fatal "$SRDS_PROD_NAME is not installed on this host"
-elif ! SRDSVersion $SRDS_VERSION; then
-  Fatal "version $SRDS_VERSION of $SRDS_PROD_NAME is not installed on this host"
-elif SRDSInstallPartial; then
-  Fatal "$SRDS_PROD_NAME version $SRDS_VERSION is only partially installed"
-fi
+#if ! SRDSInstalled; then
+#  Fatal "$SRDS_PROD_NAME is not installed on this host"
+#elif ! SRDSVersion $SRDS_VERSION; then
+#  Fatal "version $SRDS_VERSION of $SRDS_PROD_NAME is not installed on this host"
+#elif SRDSInstallPartial; then
+#  Fatal "$SRDS_PROD_NAME version $SRDS_VERSION is only partially installed"
+#fi
 
 SRDS_BASEDIR="$(${G_MEDIA_DIR}/utprodinfo -r $SRDS_PACKAGE)/SUNWut"
 
 LCL_PROD_NAME="LDAP Client Libraries"
 
-if ! LdapClientInstalled; then
-  Fatal "$LCL_PROD_NAME is not installed on this host"
-elif LdapClientInstallPartial; then
-  Fatal "$LCL_PROD_NAME is only partially installed"
-fi
+#if ! LdapClientInstalled; then
+#  Fatal "$LCL_PROD_NAME is not installed on this host"
+#elif LdapClientInstallPartial; then
+#  Fatal "$LCL_PROD_NAME is only partially installed"
+#fi
 
 UT_ROOT_S="Sun Ray root"
 DEFAULT_ROOTENTRY="o=utdata"
--- /opt/SUNWut/lib/utprodinfo.SUN	Wed Aug 11 21:43:29 2004
+++ /opt/SUNWut/lib/utprodinfo	Wed Aug 11 21:44:09 2004
@@ -339,7 +339,8 @@
 		# found no params, just return
 		return 0
 	fi
-	rpm -q --queryformat ${MAPPEDLIST} $PKGNAME 2>/dev/null
+	echo "/opt"
+	#rpm -q --queryformat ${MAPPEDLIST} $PKGNAME 2>/dev/null
 	return 0
 }
 
@@ -354,6 +355,7 @@
 	if [[ $# -ne 2 ]]; then
 		return 1
 	fi
+	return 0
 	case $1 in
 	"installed")	# package installed, could be either partial or complete
 		rpm -q --quiet $2 > /dev/null 2>&1
--- /opt/SUNWut/sbin/utreplica.SUN	Thu Aug 12 21:21:31 2004
+++ /opt/SUNWut/sbin/utreplica	Thu Aug 12 16:21:27 2004
@@ -1708,25 +1708,25 @@
 SDS_PROD_NAME="Sun Ray Data Store"
 SDS_VERSION="2.0"
 SDS_PACKAGE="SUNWutdso"
-if ! SunDSInstalled; then
-  Fatal "$SDS_PROD_NAME is not installed on this host"
-elif ! SunDSVersion $SDS_VERSION; then
-  Fatal "version $SDS_VERSION of $SDS_PROD_NAME is not installed on this host"
-elif SunDSInstallPartial; then
-  Fatal "$SDS_PROD_NAME version $SDS_VERSION is only partially installed"
-fi
+#if ! SunDSInstalled; then
+#  Fatal "$SDS_PROD_NAME is not installed on this host"
+#elif ! SunDSVersion $SDS_VERSION; then
+#  Fatal "version $SDS_VERSION of $SDS_PROD_NAME is not installed on this host"
+#elif SunDSInstallPartial; then
+#  Fatal "$SDS_PROD_NAME version $SDS_VERSION is only partially installed"
+#fi
 
 
 # check for LDAP Client libs
 LCL_PROD_NAME="LDAP Client Libraries"
 
-if [ -z $LCL_PACKAGE ]; then
-   Fatal "$LCL_PROD_NAME is not installed on this host"
-elif ! LdapClientInstalled; then
-   Fatal "$LCL_PROD_NAME is not installed on this host"
-elif LdapClientInstallPartial; then
-   Fatal "$LCL_PROD_NAME is only partially installed"
-fi
+#if [ -z $LCL_PACKAGE ]; then
+#   Fatal "$LCL_PROD_NAME is not installed on this host"
+#elif ! LdapClientInstalled; then
+#   Fatal "$LCL_PROD_NAME is not installed on this host"
+#elif LdapClientInstallPartial; then
+#   Fatal "$LCL_PROD_NAME is only partially installed"
+#fi
 
 # Ensure that utconfig has been utilised
 if [[ ! -f $UT_ADM_CONF ]]; then
--- /opt/SUNWut/lib/dhcp/isc/utdhcpservice.SUN	Thu Aug 12 21:35:27 2004
+++ /opt/SUNWut/lib/dhcp/isc/utdhcpservice	Thu Aug 12 21:38:07 2004
@@ -86,11 +86,16 @@
 }
 
 function StatusDHCP {
+    DHCP_INSTALLED=true
+    DHCP_ENABLED=true
+    DHCP_CONFIGURED=true
+    DHCP_RUNNING=true
+    DHCP_PACKAGE="dhcp3-server"
     typeset PACKAGE="${DHCP_PACKAGE}"
-    if $DHCP_INSTALLED ; then
-      # get the actual package name including version and release
-      PACKAGE="$(rpm -q ${DHCP_PACKAGE} 2> /dev/null)"
-    fi
+    #if $DHCP_INSTALLED ; then
+    #  # get the actual package name including version and release
+    #  PACKAGE="$(rpm -q ${DHCP_PACKAGE} 2> /dev/null)"
+    #fi
     print "begin dhcpstate"
     print "installed=${DHCP_INSTALLED}"
     print "enabled=${DHCP_ENABLED}"
--- /opt/SUNWut/sbin/utadm.orig	2004-12-06 00:03:32.000000000 +0100
+++ /opt/SUNWut/sbin/utadm	2004-12-06 00:03:43.000000000 +0100
@@ -3106,7 +3106,7 @@
 CountIPLeases() {
 	tmp_leases=/var/opt/SUNWut/tmp/tmpLeases.$$
 	dhcpd_hosts=/var/opt/SUNWut/tmp/dhcpdHosts.$$
-	lease_file=/var/lib/dhcp/dhcpd.leases
+	lease_file=/var/lib/dhcp3/dhcpd.leases
 
 	rm -f $tmp_leases
         rm -f $dhcpd_hosts
--- /opt/SUNWut/lib/utadmingid.orig	2004-12-15 16:31:44.000000000 +0000
+++ /opt/SUNWut/lib/utadmingid	2004-12-15 15:13:11.000000000 +0000
@@ -15,7 +15,7 @@
 ETCDIR="/etc/opt/SUNWut"
 UTADMINPW=${ETCDIR}/utadmin.pw
 if [ -f $UTADMINPW ] ; then
-	WEBGUI_GROUP=`/bin/ls -gn $UTADMINPW | /bin/awk '{print $3}' `
+	WEBGUI_GROUP=`/bin/ls -gn $UTADMINPW | /usr/bin/awk '{print $3}' `
 fi
 WEBGUI_GROUP=${WEBGUI_GROUP:-root}
 print $WEBGUI_GROUP