PSARC 2006/647 PPD Manager

5100134 print/rfc1179 ends up by default in "offline" state
6236968 No documented way to add PPD file to ppdcache
6527759 Need to delete legacy print/cleanup service
6529794 lpsched not started after first local printer is added

3 files changed, 27 insertions, 25 deletions

diff --git a/usr/src/cmd/svc/profile/generic_limited_net.xml b/usr/src/cmd/svc/profile/generic_limited_net.xml
index 1d22817c36..f8e6357a89 100644
--- a/usr/src/cmd/svc/profile/generic_limited_net.xml
+++ b/usr/src/cmd/svc/profile/generic_limited_net.xml
@@ -20,7 +20,7 @@
    
     CDDL HEADER END
    
-    Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+    Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
     Use is subject to license terms.
 
     ident	"%Z%%M%	%I%	%E% SMI"
@@ -136,9 +136,6 @@
   <service name='system/power' version='1' type='service'>
     <instance name='default' enabled='true'/>
   </service>
-  <service name='application/print/cleanup' version='1' type='service'>
-    <instance name='default' enabled='true' />
-  </service>
   <service name='network/pfil' version='1' type='service'>
     <instance name='default' enabled='true' />
   </service>
@@ -177,10 +174,13 @@
   <service name='application/management/wbem' version='1' type='service'>
     <instance name='default' enabled='true' />
   </service>
-  <service name='application/print/rfc1179' version='1' type='service'>
+  <service name='application/print/ipp-listener' version='1' type='service'>
+    <instance name='default' enabled='false' />
+  </service>
+  <service name='application/print/ppd-cache-update' version='1' type='service'>
     <instance name='default' enabled='true' />
   </service>
-  <service name='application/print/ipp-listener' version='1' type='service'>
+  <service name='application/print/rfc1179' version='1' type='service'>
     <instance name='default' enabled='false' />
   </service>
 
diff --git a/usr/src/cmd/svc/profile/generic_open.xml b/usr/src/cmd/svc/profile/generic_open.xml
index 542c759b64..b3ae55c840 100644
--- a/usr/src/cmd/svc/profile/generic_open.xml
+++ b/usr/src/cmd/svc/profile/generic_open.xml
@@ -20,7 +20,7 @@
    
     CDDL HEADER END
    
-    Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+    Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
     Use is subject to license terms.
 
     ident	"%Z%%M%	%I%	%E% SMI"
@@ -129,9 +129,6 @@
   <service name='system/power' version='1' type='service'>
     <instance name='default' enabled='true'/>
   </service>
-  <service name='application/print/cleanup' version='1' type='service'>
-    <instance name='default' enabled='true' />
-  </service>
 
   <service name='application/management/sma' version='1' type='service'>
     <instance name='default' enabled='true' />
@@ -145,10 +142,15 @@
   <service name='application/management/wbem' version='1' type='service'>
     <instance name='default' enabled='true' />
   </service>
-
   <service name='application/print/ipp-listener' version='1' type='service'>
     <instance name='default' enabled='true' />
   </service>
+  <service name='application/print/ppd-cache-update' version='1' type='service'>
+    <instance name='default' enabled='true' />
+  </service>
+  <service name='application/print/rfc1179' version='1' type='service'>
+    <instance name='default' enabled='true' />
+  </service>
 
   <!--
       Enable CDE services.
diff --git a/usr/src/cmd/svc/shell/netservices.sh b/usr/src/cmd/svc/shell/netservices.sh
index 49e8cd56da..548b49acc0 100644
--- a/usr/src/cmd/svc/shell/netservices.sh
+++ b/usr/src/cmd/svc/shell/netservices.sh
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -32,7 +32,9 @@ CMSD_FMRI=svc:/network/rpc/cde-calendar-manager
 BIND_FMRI=svc:/network/rpc/bind
 XSERVER_FMRI=svc:/application/x11/x11-server
 SENDMAIL_FMRI=svc:/network/smtp:sendmail
+PRINTSERVER_FMRI=svc:/application/print/server
 RFC1179_FMRI=svc:/application/print/rfc1179
+IPPLISTENER_FMRI=svc:/application/print/ipp-listener
 TTDB_FMRI=svc:/network/rpc/cde-ttdbserver
 DTLOGIN_FMRI=svc:/application/graphical-login/cde-login
 WEBCONSOLE_FMRI=svc:/system/webconsole
@@ -136,18 +138,6 @@ set_sendmail()
 	svcadm refresh $SENDMAIL_FMRI
 }
 
-set_rfc1179()
-{
-	svcprop -q $RFC1179_FMRI:default || return
-	if [ "$1" = "local" ]; then
-		val=localhost
-	else
-		val=
-	fi
-	inetadm -m $RFC1179_FMRI:default bind_addr="$val" 2>/dev/null
-	svcadm refresh $RFC1179_FMRI:default
-}
-
 set_ttdbserver()
 {
 	svcprop -q $TTDB_FMRI:tcp || return
@@ -247,7 +237,6 @@ set_cmsd $keyword
 set_rpcbind $keyword
 set_xserver $keyword
 set_sendmail $keyword
-set_rfc1179 $keyword
 set_ttdbserver $keyword
 set_dtlogin $keyword
 set_webconsole $keyword
@@ -262,6 +251,17 @@ if [ $profile = "generic_open.xml" ]
 then
 	# generic_open may not start inetd services on upgraded systems
 	svccfg apply /var/svc/profile/inetd_generic.xml
+
+	# disable rfc1179 and ipp-listener services if server is disabled
+	if [ "`svcprop -p restarter/state $PRINTSERVER_FMRI:default`" = \
+	    "disabled" ]
+	then
+		# need restart since refresh won't pick up new command-line
+		echo "print/server not enabled: disabling print/rfc1779"
+		svcadm disable $RFC1179_FMRI:default
+		echo "print/server not enabled: disabling print/ipp-listener"
+		svcadm disable $IPPLISTENER_FMRI:default
+	fi
 fi
 
 #