# HG changeset patch # User David Powell # Date 1304626594 25200 # Node ID 3c730b38d1b015bc4b195686c3696e957d8865d7 # Parent c0854426239dcae17c0ebdfa8d71b269add19a21 18261 panel packages should depend on visual-panels-core 18262 listen_on_port doesn't fully initialize sockaddr structure diff -r c0854426239d -r 3c730b38d1b0 usr/src/cmd/rad/mod/rad_listen.c --- a/usr/src/cmd/rad/mod/rad_listen.c Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/cmd/rad/mod/rad_listen.c Thu May 05 13:16:34 2011 -0700 @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. */ #include @@ -37,7 +37,11 @@ int listen_on_port(int port, boolean_t local) { - struct sockaddr_in6 sa; + struct sockaddr_in6 sa = { + .sin6_family = AF_INET6, + .sin6_port = htons(port), + .sin6_addr = (local ? in6addr_loopback : in6addr_any) + }; int fd, option; rad_log(RL_DEBUG, "attempting to listen on port %d (%s)", port, @@ -57,9 +61,6 @@ return (-1); } - sa.sin6_family = AF_INET6; - sa.sin6_port = htons(port); - sa.sin6_addr = (local ? in6addr_loopback : in6addr_any); if (bind(fd, (struct sockaddr *)&sa, sizeof (sa)) == -1) { rad_log(RL_ERROR, "failed to bind to address: %s", strerror(errno)); diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-apache.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-apache.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-apache.p5m Thu May 05 13:16:34 2011 -0700 @@ -50,6 +50,6 @@ file path=usr/share/vpanels/panels/apache.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/apache.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require depend fmri=pkg:/web/server/apache-22 type=require depend fmri=pkg:/web/server/apache-22/module/apache-php5 type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-coreadm.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-coreadm.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-coreadm.p5m Thu May 05 13:16:34 2011 -0700 @@ -40,4 +40,4 @@ file path=usr/share/vpanels/panels/coreadm.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/coreadm.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-firewall.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-firewall.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-firewall.p5m Thu May 05 13:16:34 2011 -0700 @@ -40,5 +40,5 @@ file path=usr/share/vpanels/panels/firewall.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/firewall.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require depend fmri=pkg:/network/ipfilter type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-sharemgr.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-sharemgr.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-sharemgr.p5m Thu May 05 13:16:34 2011 -0700 @@ -46,4 +46,4 @@ # file path=usr/share/vpanels/panels/sharemgr.xml # dir path=usr/share/vpanels/pixmaps # file path=usr/share/vpanels/pixmaps/sharemgr.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-smf.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-smf.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-smf.p5m Thu May 05 13:16:34 2011 -0700 @@ -51,5 +51,4 @@ file path=usr/share/vpanels/panels/svcs.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/svcs.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require - +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-sysid.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-sysid.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-sysid.p5m Thu May 05 13:16:34 2011 -0700 @@ -40,5 +40,5 @@ file path=usr/share/vpanels/panel/vpanels-panels-sysid.jar dir path=usr/share/vpanels/panels file path=usr/share/vpanels/panels/sysid.xml -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require depend fmri=pkg:/system/management/visual-panels/panel-time@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-sysmon.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-sysmon.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-sysmon.p5m Thu May 05 13:16:34 2011 -0700 @@ -41,4 +41,4 @@ file path=usr/share/vpanels/panels/sysmon.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/sysmon.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels-panel-time.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels-panel-time.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels-panel-time.p5m Thu May 05 13:16:34 2011 -0700 @@ -44,5 +44,5 @@ file path=usr/share/vpanels/panels/time.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/time.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require depend fmri=pkg:/service/network/ntp type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests/system-management-visual-panels.p5m --- a/usr/src/pkg/manifests/system-management-visual-panels.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests/system-management-visual-panels.p5m Thu May 05 13:16:34 2011 -0700 @@ -29,11 +29,10 @@ set name=pkg.description value="Visual Panels group package" set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=group -depend fmri=pkg:/system/management/visual-panels/panel-apache@$(PKGVERS) type=group +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require +#depend fmri=pkg:/system/management/visual-panels/panel-apache@$(PKGVERS) type=group depend fmri=pkg:/system/management/visual-panels/panel-coreadm@$(PKGVERS) type=group depend fmri=pkg:/system/management/visual-panels/panel-firewall@$(PKGVERS) type=group depend fmri=pkg:/system/management/visual-panels/panel-smf@$(PKGVERS) type=group -depend fmri=pkg:/system/management/visual-panels/panel-sysid@$(PKGVERS) type=group depend fmri=pkg:/system/management/visual-panels/panel-sysmon@$(PKGVERS) type=group depend fmri=pkg:/system/management/visual-panels/panel-time@$(PKGVERS) type=group diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests_dev/system-management-visual-panels-panel-examples.p5m --- a/usr/src/pkg/manifests_dev/system-management-visual-panels-panel-examples.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests_dev/system-management-visual-panels-panel-examples.p5m Thu May 05 13:16:34 2011 -0700 @@ -41,4 +41,4 @@ dir path=usr/share/vpanels/panels file path=usr/share/vpanels/panels/example-time1.xml file path=usr/share/vpanels/panels/example-time2.xml -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests_dev/system-management-visual-panels-panel-usermgr.p5m --- a/usr/src/pkg/manifests_dev/system-management-visual-panels-panel-usermgr.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests_dev/system-management-visual-panels-panel-usermgr.p5m Thu May 05 13:16:34 2011 -0700 @@ -44,4 +44,4 @@ file path=usr/share/vpanels/panels/usermgr.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/usermgr.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require diff -r c0854426239d -r 3c730b38d1b0 usr/src/pkg/manifests_dev/system-management-visual-panels-panel-zconsole.p5m --- a/usr/src/pkg/manifests_dev/system-management-visual-panels-panel-zconsole.p5m Wed May 04 13:13:22 2011 -0700 +++ b/usr/src/pkg/manifests_dev/system-management-visual-panels-panel-zconsole.p5m Thu May 05 13:16:34 2011 -0700 @@ -38,5 +38,5 @@ file path=usr/share/vpanels/panels/zconsole.xml dir path=usr/share/vpanels/pixmaps file path=usr/share/vpanels/pixmaps/zconsole.png -depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require +depend fmri=pkg:/system/management/visual-panels-core@$(PKGVERS) type=require depend fmri=pkg:/system/management/rad/module/rad-zones-bridge@$(PKGVERS) type=require