Skip to content
Browse files

Merge git.joyent.com:illumos-joyent

  • Loading branch information...
2 parents eac2505 + a691877 commit 04b244dd661c24b510ac22936decfc0972d202d3 @JohnSonnenschein JohnSonnenschein committed
Showing with 8,194 additions and 4,492 deletions.
  1. +0 −3 exception_lists/check_rtime
  2. +0 −1 exception_lists/copyright
  3. +0 −242 exception_lists/cstyle
  4. +0 −106 exception_lists/hdrchk
  5. +0 −3 exception_lists/packaging
  6. +121 −33 manifest
  7. +1 −1 usr/src/Makefile.master
  8. +0 −2 usr/src/Targetdirs
  9. +2 −0 usr/src/cmd/Makefile
  10. +2 −2 usr/src/cmd/beadm/beadm.c
  11. +0 −1 usr/src/cmd/cmd-crypto/Makefile
  12. +4 −1 usr/src/cmd/cmd-crypto/etc/Makefile.ca-links
  13. +0 −43 usr/src/cmd/cmd-crypto/kmscfg/Makefile
  14. +0 −179 usr/src/cmd/cmd-crypto/kmscfg/kmscfg.pl
  15. +5 −2 usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt
  16. +14 −18 usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c
  17. +4 −0 usr/src/cmd/cron/cron.c
  18. +27 −3 usr/src/cmd/dd/dd.c
  19. +82 −30 usr/src/cmd/devfsadm/disk_link.c
  20. +1 −3 usr/src/cmd/devmgmt/Makefile
  21. +0 −5 usr/src/cmd/devmgmt/data/device.tab
  22. +0 −5 usr/src/cmd/devmgmt/data/dgroup.tab
  23. +0 −53 usr/src/cmd/devmgmt/mkdtab/Makefile
  24. +0 −560 usr/src/cmd/devmgmt/mkdtab/mkdtab.c
  25. +4 −5 usr/src/cmd/dlmgmtd/svc-dlmgmtd
  26. +13 −10 usr/src/cmd/format/startup.c
  27. +6 −3 usr/src/cmd/fs.d/mount.c
  28. +18 −2 usr/src/cmd/fs.d/nfs/lib/smfcfg.c
  29. +2 −0 usr/src/cmd/fs.d/nfs/lib/smfcfg.h
  30. +14 −5 usr/src/cmd/grep/grep.c
  31. +3,267 −826 usr/src/cmd/hwdata/pci.ids
  32. +3,044 −408 usr/src/cmd/hwdata/usb.ids
  33. +0 −1 usr/src/cmd/initpkg/init.d/Makefile
  34. +0 −39 usr/src/cmd/initpkg/init.d/mkdtab
  35. +1 −2 usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
  36. +4 −2 usr/src/cmd/mdb/common/mdb/mdb_cmds.c
  37. +18 −0 usr/src/cmd/mdb/common/mdb/mdb_help.c
  38. +4 −1 usr/src/cmd/mdb/common/mdb/mdb_help.h
  39. +84 −29 usr/src/cmd/mdb/common/mdb/mdb_print.c
  40. +1 −3 usr/src/cmd/mdb/common/mdb/mdb_print.h
  41. +2 −1 usr/src/cmd/mdb/common/mdb/mdb_tab.c
  42. +90 −38 usr/src/cmd/mdb/common/modules/v8/mdb_v8.c
  43. +167 −139 usr/src/cmd/nscd/cache.c
  44. +21 −22 usr/src/cmd/nscd/nscd_admin.c
  45. +27 −27 usr/src/cmd/nscd/nscd_door.c
  46. +1 −26 usr/src/cmd/nscd/nscd_door.h
  47. +8 −4 usr/src/cmd/nscd/nscd_frontend.c
  48. +27 −20 usr/src/cmd/nscd/nscd_selfcred.c
  49. +38 −21 usr/src/cmd/nscd/nscd_switch.c
  50. +2 −2 usr/src/cmd/nscd/svc-nscd
  51. +1 −1 usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.xs
  52. +1 −1 usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.xs
  53. +16 −4 usr/src/cmd/powertop/common/display.c
  54. +2 −1 usr/src/cmd/sendmail/src/tls.c
  55. +4 −0 usr/src/cmd/sgs/include/rtld.h
  56. +5 −19 usr/src/cmd/sgs/mcs/common/main.c
  57. +211 −81 usr/src/cmd/sgs/rtld/amd64/boot_elf.s
  58. +3 −0 usr/src/cmd/sgs/rtld/common/globals.c
  59. +3 −0 usr/src/cmd/ssh/Makefile.ssh-common
  60. +11 −8 usr/src/cmd/svc/milestone/net-nwam
  61. +7 −4 usr/src/cmd/svc/milestone/net-physical
  62. +6 −0 usr/src/cmd/svc/shell/smf_include.sh
  63. +16 −9 usr/src/cmd/svc/startd/method.c
  64. +32 −8 usr/src/cmd/svc/startd/restarter.c
  65. +15 −0 usr/src/cmd/svc/startd/startd.c
  66. +10 −1 usr/src/cmd/syseventd/modules/zfs_mod/zfs_mod.c
  67. +2 −2 usr/src/cmd/terminfo/terminfo.src
  68. +1 −1 usr/src/cmd/tic/tic_parse.c
  69. +1 −3 usr/src/cmd/tic/tic_scan.c
  70. +5 −3 usr/src/cmd/truss/codes.c
  71. BIN usr/src/cmd/ucodeadm/amd-ucode.bin
  72. +27 −25 usr/src/cmd/wall/wall.c
  73. +11 −7 usr/src/cmd/zfs/zfs_main.c
  74. +2 −1 usr/src/cmd/zoneadm/svc-zones
  75. +2 −1 usr/src/cmd/zoneadm/zfs.c
  76. +47 −202 usr/src/cmd/zoneadmd/vplat.c
  77. +1 −1 usr/src/cmd/zoneadmd/zcons.c
  78. +134 −49 usr/src/cmd/zoneadmd/zoneadmd.c
  79. +2 −1 usr/src/cmd/zoneadmd/zoneadmd.h
  80. +211 −34 usr/src/cmd/zpool/zpool_main.c
  81. +8 −0 usr/src/common/net/wanboot/auxutil.c
  82. +5 −0 usr/src/common/net/wanboot/boot_http.c
  83. +8 −0 usr/src/common/net/wanboot/p12misc.c
  84. +2 −9 usr/src/common/ucode/ucode_utils.c
  85. +3 −1 usr/src/common/zfs/zpool_prop.c
  86. +0 −2 usr/src/lib/Makefile
  87. +17 −15 usr/src/lib/fm/topo/modules/common/ses/ses.c
  88. +177 −198 usr/src/lib/hal/libhal/common/libhal.c
  89. +9 −4 usr/src/lib/krb5/plugins/preauth/pkinit/pkinit_crypto_openssl.c
  90. +20 −1 usr/src/lib/libbe/common/be_mount.c
  91. +2 −1 usr/src/lib/libbe/common/be_rename.c
  92. +1 −1 usr/src/lib/libc/port/fp/floatundidf.c
  93. +1 −1 usr/src/lib/libc/port/fp/floatundisf.c
  94. +2 −2 usr/src/lib/libctf/common/ctf_lib.c
  95. +6 −7 usr/src/lib/libcurses/screen/compiler.h
  96. +18 −0 usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c
  97. +0 −43 usr/src/lib/libkmsagent/Makefile
  98. +0 −160 usr/src/lib/libkmsagent/Makefile.com
  99. +0 −52 usr/src/lib/libkmsagent/THIRDPARTYLICENSE
  100. +0 −1 usr/src/lib/libkmsagent/THIRDPARTYLICENSE.descrip
  101. +0 −36 usr/src/lib/libkmsagent/amd64/Makefile
  102. +0 −402 usr/src/lib/libkmsagent/common/ApplianceParameters.h
  103. +0 −157 usr/src/lib/libkmsagent/common/AutoMutex.h
Sorry, we could not display the entire diff because it was too big.
View
3 exception_lists/check_rtime
@@ -210,9 +210,6 @@ NOSYMSORT lib/libsun_fc\.so\.1 # C++
NOSYMSORT lib/amd64/libsun_fc\.so\.1 # C++
NOSYMSORT lib/sparcv9/libsun_fc\.so\.1 # C++
NOSYMSORT usr/lib/amd64/libfru\.so\.1 # C++
-NOSYMSORT usr/lib/libkmsagent\.so\.1 # C++
-NOSYMSORT usr/lib/amd64/libkmsagent\.so\.1 # C++
-NOSYMSORT usr/lib/sparcv9/libkmsagent\.so\.1 # C++
# The libprtdiag_psr.so.1 objects built under usr/src/lib/libprtdiag_psr
View
1 exception_lists/copyright
@@ -330,7 +330,6 @@ usr/src/lib/krb5/ss/mit-sipb-copyright.h
usr/src/lib/krb5/ss/options.c
usr/src/lib/krb5/ss/std_rqs.c
usr/src/lib/krb5/ss/utils.c
-usr/src/lib/libkmsagent/common/SOAP/*.*
usr/src/lib/librstp/common/*.[ch]
usr/src/lib/librstp/common/[CRT]*
usr/src/uts/intel/nsmb/ioc_check.ref
View
242 exception_lists/cstyle
@@ -870,245 +870,3 @@ usr/src/uts/intel/sys/acpi/platform/acos2.h
usr/src/uts/intel/sys/acpi/platform/acsolaris.h
usr/src/uts/intel/sys/acpi/platform/acwin.h
usr/src/uts/intel/sys/acpi/platform/acwin64.h
-usr/src/lib/libkmsagent/common/ApplianceParameters.h
-usr/src/lib/libkmsagent/common/AutoMutex.h
-usr/src/lib/libkmsagent/common/ClientSoapFaultCodes.h
-usr/src/lib/libkmsagent/common/KMSAgent.cpp
-usr/src/lib/libkmsagent/common/KMSAgent.h
-usr/src/lib/libkmsagent/common/KMSAgentAESKeyWrap.h
-usr/src/lib/libkmsagent/common/KMSAgentChallenge.cpp
-usr/src/lib/libkmsagent/common/KMSAgentChallenge.h
-usr/src/lib/libkmsagent/common/KMSAgentCryptoUtilities.cpp
-usr/src/lib/libkmsagent/common/KMSAgentCryptoUtilities.h
-usr/src/lib/libkmsagent/common/KMSAgentDataUnitCache.cpp
-usr/src/lib/libkmsagent/common/KMSAgentDataUnitCache.h
-usr/src/lib/libkmsagent/common/KMSAgentFatalState.cpp
-usr/src/lib/libkmsagent/common/KMSAgentKeyCallout.cpp
-usr/src/lib/libkmsagent/common/KMSAgentKeyCallout.h
-usr/src/lib/libkmsagent/common/KMSAgentKnownAnswerTests.cpp
-usr/src/lib/libkmsagent/common/KMSAgentKnownAnswerTests.h
-usr/src/lib/libkmsagent/common/KMSAgentLoadBalancer.cpp
-usr/src/lib/libkmsagent/common/KMSAgentLoadBalancer.h
-usr/src/lib/libkmsagent/common/KMSAgentPKICert.cpp
-usr/src/lib/libkmsagent/common/KMSAgentPKICertOpenSSL.cpp
-usr/src/lib/libkmsagent/common/KMSAgentPKICommon.cpp
-usr/src/lib/libkmsagent/common/KMSAgentPKICommon.h
-usr/src/lib/libkmsagent/common/KMSAgentPKIKey.cpp
-usr/src/lib/libkmsagent/common/KMSAgentPKIKeyOpenSSL.cpp
-usr/src/lib/libkmsagent/common/KMSAgentPKIimpl.h
-usr/src/lib/libkmsagent/common/KMSAgentSoapUtilities.cpp
-usr/src/lib/libkmsagent/common/KMSAgentSoapUtilities.h
-usr/src/lib/libkmsagent/common/KMSAgentStorage.cpp
-usr/src/lib/libkmsagent/common/KMSAgentStorage.h
-usr/src/lib/libkmsagent/common/KMSAgentStringUtilities.cpp
-usr/src/lib/libkmsagent/common/KMSAgentStringUtilities.h
-usr/src/lib/libkmsagent/common/KMSAgent_direct.h
-usr/src/lib/libkmsagent/common/KMSAuditLogger.cpp
-usr/src/lib/libkmsagent/common/KMSAuditLogger.h
-usr/src/lib/libkmsagent/common/KMSAuditLogger_meta.cpp
-usr/src/lib/libkmsagent/common/KMSClientProfile.cpp
-usr/src/lib/libkmsagent/common/KMSClientProfile.h
-usr/src/lib/libkmsagent/common/KMSClientProfileImpl.h
-usr/src/lib/libkmsagent/common/PKICert.cpp
-usr/src/lib/libkmsagent/common/SOAP/AgentServiceNamespace.cpp
-usr/src/lib/libkmsagent/common/SOAP/CAServiceNamespace.cpp
-usr/src/lib/libkmsagent/common/SOAP/CertificateServiceNamespace.cpp
-usr/src/lib/libkmsagent/common/SOAP/DiscoveryServiceNamespace.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMSAgentWebServiceNamespaces.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMSAgentWebServiceNamespaces.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_AgentC.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_AgentClient.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_AgentH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_AgentStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_Agent_SOAP.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CAC.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_CAClient.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_CAH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CAStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CertificateC.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_CertificateClient.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_CertificateH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CertificateStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_Certificate_SOAP.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_DiscoveryC.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_DiscoveryClient.cpp
-usr/src/lib/libkmsagent/common/SOAP/KMS_DiscoveryH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_DiscoveryStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_Discovery_SOAP.h
-usr/src/lib/libkmsagent/common/SOAP/envC.cpp
-usr/src/lib/libkmsagent/common/SOAP/envH.h
-usr/src/lib/libkmsagent/common/SOAP/envStub.h
-usr/src/lib/libkmsagent/common/SOAP/stdsoap2.cpp
-usr/src/lib/libkmsagent/common/SOAP/stdsoap2.h
-usr/src/lib/libkmsagent/common/SYSCommon.c
-usr/src/lib/libkmsagent/common/SYSCommon.h
-usr/src/lib/libkmsagent/common/debug.h
-usr/src/lib/libkmsagent/common/ieee80211_crypto.c
-usr/src/lib/libkmsagent/common/k_setupssl.c
-usr/src/lib/libkmsagent/common/k_setupssl.h
-usr/src/lib/libparted/common/libparted/debug.c
-usr/src/lib/libparted/common/libparted/libparted.c
-usr/src/lib/libparted/common/libparted/fs/hfs/file_plus.h
-usr/src/lib/libparted/common/libparted/fs/hfs/journal.c
-usr/src/lib/libparted/common/libparted/fs/hfs/hfs.c
-usr/src/lib/libparted/common/libparted/fs/hfs/file.h
-usr/src/lib/libparted/common/libparted/fs/hfs/advfs.h
-usr/src/lib/libparted/common/libparted/fs/hfs/advfs_plus.c
-usr/src/lib/libparted/common/libparted/fs/hfs/probe.c
-usr/src/lib/libparted/common/libparted/fs/hfs/cache.c
-usr/src/lib/libparted/common/libparted/fs/hfs/reloc_plus.c
-usr/src/lib/libparted/common/libparted/fs/hfs/reloc.c
-usr/src/lib/libparted/common/libparted/fs/hfs/advfs.c
-usr/src/lib/libparted/common/libparted/fs/hfs/advfs_plus.h
-usr/src/lib/libparted/common/libparted/fs/hfs/probe.h
-usr/src/lib/libparted/common/libparted/fs/hfs/hfs.h
-usr/src/lib/libparted/common/libparted/fs/hfs/file.c
-usr/src/lib/libparted/common/libparted/fs/hfs/journal.h
-usr/src/lib/libparted/common/libparted/fs/hfs/file_plus.c
-usr/src/lib/libparted/common/libparted/fs/hfs/reloc.h
-usr/src/lib/libparted/common/libparted/fs/hfs/reloc_plus.h
-usr/src/lib/libparted/common/libparted/fs/hfs/cache.h
-usr/src/lib/libparted/common/libparted/fs/ntfs/ntfs.c
-usr/src/lib/libparted/common/libparted/fs/ext2/interface.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_block_relocator.c
-usr/src/lib/libparted/common/libparted/fs/ext2/tune.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_inode_relocator.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_buffer.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_meta.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_fs.h
-usr/src/lib/libparted/common/libparted/fs/ext2/parted_io.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_mkfs.c
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_resize.c
-usr/src/lib/libparted/common/libparted/fs/ext2/tune.h
-usr/src/lib/libparted/common/libparted/fs/ext2/parted_io.h
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2.h
-usr/src/lib/libparted/common/libparted/fs/reiserfs/reiserfs.c
-usr/src/lib/libparted/common/libparted/fs/reiserfs/geom_dal.h
-usr/src/lib/libparted/common/libparted/fs/reiserfs/reiserfs.h
-usr/src/lib/libparted/common/libparted/fs/reiserfs/geom_dal.c
-usr/src/lib/libparted/common/libparted/fs/linux_swap/linux_swap.c
-usr/src/lib/libparted/common/libparted/fs/ufs/ufs.c
-usr/src/lib/libparted/common/libparted/fs/jfs/jfs.c
-usr/src/lib/libparted/common/libparted/fs/jfs/jfs_superblock.h
-usr/src/lib/libparted/common/libparted/fs/jfs/jfs_types.h
-usr/src/lib/libparted/common/libparted/fs/amiga/interface.c
-usr/src/lib/libparted/common/libparted/fs/amiga/apfs.h
-usr/src/lib/libparted/common/libparted/fs/amiga/amiga.c
-usr/src/lib/libparted/common/libparted/fs/amiga/affs.c
-usr/src/lib/libparted/common/libparted/fs/amiga/asfs.c
-usr/src/lib/libparted/common/libparted/fs/amiga/amiga.h
-usr/src/lib/libparted/common/libparted/fs/amiga/apfs.c
-usr/src/lib/libparted/common/libparted/fs/amiga/asfs.h
-usr/src/lib/libparted/common/libparted/fs/amiga/affs.h
-usr/src/lib/libparted/common/libparted/fs/fat/count.h
-usr/src/lib/libparted/common/libparted/fs/fat/clstdup.h
-usr/src/lib/libparted/common/libparted/fs/fat/fatio.c
-usr/src/lib/libparted/common/libparted/fs/fat/traverse.h
-usr/src/lib/libparted/common/libparted/fs/fat/bootsector.c
-usr/src/lib/libparted/common/libparted/fs/fat/resize.c
-usr/src/lib/libparted/common/libparted/fs/fat/fat.c
-usr/src/lib/libparted/common/libparted/fs/fat/table.c
-usr/src/lib/libparted/common/libparted/fs/fat/context.h
-usr/src/lib/libparted/common/libparted/fs/fat/calc.c
-usr/src/lib/libparted/common/libparted/fs/fat/fatio.h
-usr/src/lib/libparted/common/libparted/fs/fat/traverse.c
-usr/src/lib/libparted/common/libparted/fs/fat/bootsector.h
-usr/src/lib/libparted/common/libparted/fs/fat/count.c
-usr/src/lib/libparted/common/libparted/fs/fat/clstdup.c
-usr/src/lib/libparted/common/libparted/fs/fat/context.c
-usr/src/lib/libparted/common/libparted/fs/fat/calc.h
-usr/src/lib/libparted/common/libparted/fs/fat/fat.h
-usr/src/lib/libparted/common/libparted/fs/fat/table.h
-usr/src/lib/libparted/common/libparted/fs/solaris_x86/solaris_x86.c
-usr/src/lib/libparted/common/libparted/fs/xfs/platform_defs.h
-usr/src/lib/libparted/common/libparted/fs/xfs/xfs_types.h
-usr/src/lib/libparted/common/libparted/fs/xfs/xfs_sb.h
-usr/src/lib/libparted/common/libparted/fs/xfs/xfs.c
-usr/src/lib/libparted/common/libparted/filesys.c
-usr/src/lib/libparted/common/libparted/unit.c
-usr/src/lib/libparted/common/libparted/device.c
-usr/src/lib/libparted/common/libparted/labels/sun.c
-usr/src/lib/libparted/common/libparted/labels/dvh.c
-usr/src/lib/libparted/common/libparted/labels/loop.c
-usr/src/lib/libparted/common/libparted/labels/mac.c
-usr/src/lib/libparted/common/libparted/labels/dos.c
-usr/src/lib/libparted/common/libparted/labels/efi_crc32.c
-usr/src/lib/libparted/common/libparted/labels/pc98.c
-usr/src/lib/libparted/common/libparted/labels/aix.c
-usr/src/lib/libparted/common/libparted/labels/rdb.c
-usr/src/lib/libparted/common/libparted/labels/bsd.c
-usr/src/lib/libparted/common/libparted/labels/dvh.h
-usr/src/lib/libparted/common/libparted/labels/gpt.c
-usr/src/lib/libparted/common/libparted/timer.c
-usr/src/lib/libparted/common/libparted/exception.c
-usr/src/lib/libparted/common/libparted/arch/solaris.c
-usr/src/lib/libparted/common/libparted/cs/natmath.c
-usr/src/lib/libparted/common/libparted/cs/geom.c
-usr/src/lib/libparted/common/libparted/cs/constraint.c
-usr/src/lib/libparted/common/libparted/disk.c
-usr/src/lib/libparted/common/lib/error.c
-usr/src/lib/libparted/common/lib/full-write.h
-usr/src/lib/libparted/common/lib/regex_internal.c
-usr/src/lib/libparted/common/lib/getopt.c
-usr/src/lib/libparted/common/lib/safe-read.c
-usr/src/lib/libparted/common/lib/version-etc.c
-usr/src/lib/libparted/common/lib/localcharset.h
-usr/src/lib/libparted/common/lib/basename.c
-usr/src/lib/libparted/common/lib/regex.c
-usr/src/lib/libparted/common/lib/gettext.h
-usr/src/lib/libparted/common/lib/long-options.c
-usr/src/lib/libparted/common/lib/close-stream.h
-usr/src/lib/libparted/common/lib/quotearg.c
-usr/src/lib/libparted/common/lib/xstrndup.h
-usr/src/lib/libparted/common/lib/closeout.h
-usr/src/lib/libparted/common/lib/__fpending.h
-usr/src/lib/libparted/common/lib/dirname.h
-usr/src/lib/libparted/common/lib/stripslash.c
-usr/src/lib/libparted/common/lib/configmake.h
-usr/src/lib/libparted/common/lib/exitfail.h
-usr/src/lib/libparted/common/lib/safe-write.c
-usr/src/lib/libparted/common/lib/strcspn.c
-usr/src/lib/libparted/common/lib/version-etc.h
-usr/src/lib/libparted/common/lib/localcharset.c
-usr/src/lib/libparted/common/lib/memset.c
-usr/src/lib/libparted/common/lib/rpmatch.c
-usr/src/lib/libparted/common/lib/xalloc-die.c
-usr/src/lib/libparted/common/lib/safe-read.h
-usr/src/lib/libparted/common/lib/regex_internal.h
-usr/src/lib/libparted/common/lib/xalloc.h
-usr/src/lib/libparted/common/lib/memcpy.c
-usr/src/lib/libparted/common/lib/regcomp.c
-usr/src/lib/libparted/common/lib/error.h
-usr/src/lib/libparted/common/lib/config.h
-usr/src/lib/libparted/common/lib/regexec.c
-usr/src/lib/libparted/common/lib/memmove.c
-usr/src/lib/libparted/common/lib/full-write.c
-usr/src/lib/libparted/common/lib/safe-write.h
-usr/src/lib/libparted/common/lib/dirname.c
-usr/src/lib/libparted/common/lib/version-etc-fsf.c
-usr/src/lib/libparted/common/lib/strndup.c
-usr/src/lib/libparted/common/lib/exitfail.c
-usr/src/lib/libparted/common/lib/close-stream.c
-usr/src/lib/libparted/common/lib/quotearg.h
-usr/src/lib/libparted/common/lib/xstrndup.c
-usr/src/lib/libparted/common/lib/getopt_int.h
-usr/src/lib/libparted/common/lib/closeout.c
-usr/src/lib/libparted/common/lib/regex.h
-usr/src/lib/libparted/common/lib/long-options.h
-usr/src/lib/libparted/common/lib/xmalloc.c
-usr/src/lib/libparted/common/include/parted/filesys.h
-usr/src/lib/libparted/common/include/parted/solaris.h
-usr/src/lib/libparted/common/include/parted/disk.h
-usr/src/lib/libparted/common/include/parted/device.h
-usr/src/lib/libparted/common/include/parted/crc32.h
-usr/src/lib/libparted/common/include/parted/timer.h
-usr/src/lib/libparted/common/include/parted/geom.h
-usr/src/lib/libparted/common/include/parted/parted.h
-usr/src/lib/libparted/common/include/parted/endian.h
-usr/src/lib/libparted/common/include/parted/unit.h
-usr/src/lib/libparted/common/include/parted/constraint.h
-usr/src/lib/libparted/common/include/parted/natmath.h
-usr/src/lib/libparted/common/include/parted/exception.h
-usr/src/lib/libparted/common/include/parted/debug.h
-
View
106 exception_lists/hdrchk
@@ -180,109 +180,3 @@ usr/src/uts/intel/sys/acpi/acresrc.h
usr/src/uts/intel/sys/acpi/acstruct.h
usr/src/uts/intel/sys/acpi/amlresrc.h
usr/src/uts/intel/sys/acpi/platform/acwin64.h
-usr/src/lib/libkmsagent/common/ApplianceParameters.h
-usr/src/lib/libkmsagent/common/AutoMutex.h
-usr/src/lib/libkmsagent/common/ClientSoapFaultCodes.h
-usr/src/lib/libkmsagent/common/KMSAgent.h
-usr/src/lib/libkmsagent/common/KMSAgentCryptoUtilities.h
-usr/src/lib/libkmsagent/common/KMSAgentDataUnitCache.h
-usr/src/lib/libkmsagent/common/KMSAgentKeyCallout.h
-usr/src/lib/libkmsagent/common/KMSAgentKnownAnswerTests.h
-usr/src/lib/libkmsagent/common/KMSAgentLoadBalancer.h
-usr/src/lib/libkmsagent/common/KMSAgentPKICommon.h
-usr/src/lib/libkmsagent/common/KMSAgentPKIimpl.h
-usr/src/lib/libkmsagent/common/KMSAgentSoapUtilities.h
-usr/src/lib/libkmsagent/common/KMSAgentStorage.h
-usr/src/lib/libkmsagent/common/KMSAgentStringUtilities.h
-usr/src/lib/libkmsagent/common/KMSAgent_direct.h
-usr/src/lib/libkmsagent/common/KMSAuditLogger.h
-usr/src/lib/libkmsagent/common/KMSClientProfile.h
-usr/src/lib/libkmsagent/common/KMSClientProfileImpl.h
-usr/src/lib/libkmsagent/common/SOAP/KMSAgentWebServiceNamespaces.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_AgentH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_AgentStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_Agent_SOAP.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CAH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CAStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CertificateH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_CertificateStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_Certificate_SOAP.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_DiscoveryH.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_DiscoveryStub.h
-usr/src/lib/libkmsagent/common/SOAP/KMS_Discovery_SOAP.h
-usr/src/lib/libkmsagent/common/SOAP/envH.h
-usr/src/lib/libkmsagent/common/SOAP/envStub.h
-usr/src/lib/libkmsagent/common/SOAP/stdsoap2.h
-usr/src/lib/libkmsagent/common/SYSCommon.h
-usr/src/lib/libkmsagent/common/debug.h
-usr/src/lib/libkmsagent/common/k_setupssl.h
-usr/src/lib/libparted/common/libparted/fs/hfs/file_plus.h
-usr/src/lib/libparted/common/libparted/fs/hfs/file.h
-usr/src/lib/libparted/common/libparted/fs/hfs/advfs.h
-usr/src/lib/libparted/common/libparted/fs/hfs/advfs_plus.h
-usr/src/lib/libparted/common/libparted/fs/hfs/probe.h
-usr/src/lib/libparted/common/libparted/fs/hfs/hfs.h
-usr/src/lib/libparted/common/libparted/fs/hfs/journal.h
-usr/src/lib/libparted/common/libparted/fs/hfs/reloc.h
-usr/src/lib/libparted/common/libparted/fs/hfs/reloc_plus.h
-usr/src/lib/libparted/common/libparted/fs/hfs/cache.h
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2_fs.h
-usr/src/lib/libparted/common/libparted/fs/ext2/tune.h
-usr/src/lib/libparted/common/libparted/fs/ext2/parted_io.h
-usr/src/lib/libparted/common/libparted/fs/ext2/ext2.h
-usr/src/lib/libparted/common/libparted/fs/reiserfs/geom_dal.h
-usr/src/lib/libparted/common/libparted/fs/reiserfs/reiserfs.h
-usr/src/lib/libparted/common/libparted/fs/jfs/jfs_superblock.h
-usr/src/lib/libparted/common/libparted/fs/jfs/jfs_types.h
-usr/src/lib/libparted/common/libparted/fs/amiga/apfs.h
-usr/src/lib/libparted/common/libparted/fs/amiga/amiga.h
-usr/src/lib/libparted/common/libparted/fs/amiga/asfs.h
-usr/src/lib/libparted/common/libparted/fs/amiga/affs.h
-usr/src/lib/libparted/common/libparted/fs/fat/count.h
-usr/src/lib/libparted/common/libparted/fs/fat/clstdup.h
-usr/src/lib/libparted/common/libparted/fs/fat/traverse.h
-usr/src/lib/libparted/common/libparted/fs/fat/context.h
-usr/src/lib/libparted/common/libparted/fs/fat/fatio.h
-usr/src/lib/libparted/common/libparted/fs/fat/bootsector.h
-usr/src/lib/libparted/common/libparted/fs/fat/calc.h
-usr/src/lib/libparted/common/libparted/fs/fat/fat.h
-usr/src/lib/libparted/common/libparted/fs/fat/table.h
-usr/src/lib/libparted/common/libparted/fs/xfs/platform_defs.h
-usr/src/lib/libparted/common/libparted/fs/xfs/xfs_types.h
-usr/src/lib/libparted/common/libparted/fs/xfs/xfs_sb.h
-usr/src/lib/libparted/common/libparted/labels/dvh.h
-usr/src/lib/libparted/common/lib/full-write.h
-usr/src/lib/libparted/common/lib/localcharset.h
-usr/src/lib/libparted/common/lib/gettext.h
-usr/src/lib/libparted/common/lib/close-stream.h
-usr/src/lib/libparted/common/lib/xstrndup.h
-usr/src/lib/libparted/common/lib/closeout.h
-usr/src/lib/libparted/common/lib/__fpending.h
-usr/src/lib/libparted/common/lib/dirname.h
-usr/src/lib/libparted/common/lib/configmake.h
-usr/src/lib/libparted/common/lib/exitfail.h
-usr/src/lib/libparted/common/lib/version-etc.h
-usr/src/lib/libparted/common/lib/safe-read.h
-usr/src/lib/libparted/common/lib/regex_internal.h
-usr/src/lib/libparted/common/lib/xalloc.h
-usr/src/lib/libparted/common/lib/error.h
-usr/src/lib/libparted/common/lib/config.h
-usr/src/lib/libparted/common/lib/safe-write.h
-usr/src/lib/libparted/common/lib/quotearg.h
-usr/src/lib/libparted/common/lib/getopt_int.h
-usr/src/lib/libparted/common/lib/regex.h
-usr/src/lib/libparted/common/lib/long-options.h
-usr/src/lib/libparted/common/include/parted/filesys.h
-usr/src/lib/libparted/common/include/parted/solaris.h
-usr/src/lib/libparted/common/include/parted/disk.h
-usr/src/lib/libparted/common/include/parted/device.h
-usr/src/lib/libparted/common/include/parted/crc32.h
-usr/src/lib/libparted/common/include/parted/timer.h
-usr/src/lib/libparted/common/include/parted/geom.h
-usr/src/lib/libparted/common/include/parted/parted.h
-usr/src/lib/libparted/common/include/parted/endian.h
-usr/src/lib/libparted/common/include/parted/unit.h
-usr/src/lib/libparted/common/include/parted/constraint.h
-usr/src/lib/libparted/common/include/parted/natmath.h
-usr/src/lib/libparted/common/include/parted/exception.h
-usr/src/lib/libparted/common/include/parted/debug.h
View
3 exception_lists/packaging
@@ -59,9 +59,6 @@ usr/lib/llib-lsoftcrypto
usr/lib/llib-lsoftcrypto.ln
usr/lib/amd64/llib-lsoftcrypto.ln i386
usr/lib/sparcv9/llib-lsoftcrypto.ln sparc
-usr/lib/libkmsagent.so
-usr/lib/amd64/libkmsagent.so i386
-usr/lib/sparcv9/libkmsagent.so sparc
#
# The following files are used by the DHCP service, the
View
154 manifest
@@ -335,7 +335,6 @@ f etc/init.d/dhcp 0744 root sys
f etc/init.d/dodatadm.udaplt 0744 root sys
f etc/init.d/drvconfig 0744 root sys
f etc/init.d/ldap.client 0744 root sys
-f etc/init.d/mkdtab 0744 root sys
f etc/init.d/nfs.server 0744 root sys
f etc/init.d/nscd 0744 root sys
f etc/init.d/pppd 0744 root sys
@@ -1181,7 +1180,7 @@ f lib/amd64/libsocket.so.1 0755 root bin
s lib/amd64/libsocket.so=libsocket.so.1
f lib/amd64/libsysevent.so.1 0755 root bin
s lib/amd64/libsysevent.so=libsysevent.so.1
-s lib/amd64/libtermcap.so.1=libcurses.so.1
+f lib/amd64/libtermcap.so.1 0755 root bin
s lib/amd64/libtermcap.so=libtermcap.so.1
s lib/amd64/libtermlib.so.1=libcurses.so.1
s lib/amd64/libtermlib.so=libtermlib.so.1
@@ -1373,7 +1372,7 @@ f lib/libsocket.so.1 0755 root bin
s lib/libsocket.so=libsocket.so.1
f lib/libsysevent.so.1 0755 root bin
s lib/libsysevent.so=libsysevent.so.1
-s lib/libtermcap.so.1=libcurses.so.1
+f lib/libtermcap.so.1 0755 root bin
s lib/libtermcap.so=libtermcap.so.1
s lib/libtermlib.so.1=libcurses.so.1
s lib/libtermlib.so=libtermlib.so.1
@@ -1484,6 +1483,8 @@ f lib/svc/manifest/network/shares/reparsed.xml 0444 root sys
f lib/svc/manifest/network/shell.xml 0444 root sys
f lib/svc/manifest/network/slp.xml 0444 root sys
d lib/svc/manifest/network/smb 0755 root sys
+f lib/svc/manifest/network/smb/client.xml 0444 root sys
+f lib/svc/manifest/network/smb/server.xml 0444 root sys
f lib/svc/manifest/network/ssh.xml 0444 root sys
f lib/svc/manifest/network/time.xml 0444 root sys
f lib/svc/manifest/network/vrrp.xml 0444 root sys
@@ -1921,6 +1922,7 @@ f usr/bin/compress 0555 root bin
f usr/bin/coreadm 0555 root bin
f usr/bin/cp 0555 root bin
f usr/bin/cpio 0555 root bin
+f usr/bin/cputrack 0555 root bin
f usr/bin/crle 0555 root bin
f usr/bin/crontab 4555 root bin
f usr/bin/crypt 0555 root bin
@@ -2256,6 +2258,7 @@ s usr/bin/sh=ksh93
f usr/bin/shcomp 0555 root bin
f usr/bin/size 0555 root bin
h usr/bin/sleep=usr/bin/alias
+f usr/bin/smbutil 0555 root bin
f usr/bin/soelim 0555 root bin
h usr/bin/sort=usr/lib/isaexec
f usr/bin/sortbib 0555 root bin
@@ -2373,27 +2376,27 @@ s usr/ccs/bin/m4=../../bin/m4
s usr/ccs/bin/regcmp=../../bin/regcmp
d usr/ccs/lib 0755 root bin
d usr/ccs/lib/amd64 0755 root bin
-s usr/ccs/lib/amd64/libcurses.so=../../../../lib/amd64/libcurses.so.1
-s usr/ccs/lib/amd64/libform.so=../../../lib/amd64/libform.so.1
-s usr/ccs/lib/amd64/libgen.so=../../../../lib/amd64/libgen.so.1
-s usr/ccs/lib/amd64/libl.so=../../../lib/amd64/libl.so.1
-s usr/ccs/lib/amd64/libmalloc.so=../../../lib/amd64/libmalloc.so.1
-s usr/ccs/lib/amd64/libmenu.so=../../../lib/amd64/libmenu.so.1
-s usr/ccs/lib/amd64/libpanel.so=../../../lib/amd64/libpanel.so.1
-s usr/ccs/lib/amd64/libtermcap.so=../../../../lib/amd64/libcurses.so.1
-s usr/ccs/lib/amd64/libtermlib.so=../../../../lib/amd64/libcurses.so.1
-s usr/ccs/lib/amd64/liby.so=../../../lib/amd64/liby.so.1
+s usr/ccs/lib/amd64/libcurses.so.1=../../../../lib/amd64/libcurses.so.1
+s usr/ccs/lib/amd64/libform.so.1=../../../lib/amd64/libform.so.1
+s usr/ccs/lib/amd64/libgen.so.1=../../../../lib/amd64/libgen.so.1
+s usr/ccs/lib/amd64/libl.so.1=../../../lib/amd64/libl.so.1
+s usr/ccs/lib/amd64/libmalloc.so.1=../../../lib/amd64/libmalloc.so.1
+s usr/ccs/lib/amd64/libmenu.so.1=../../../lib/amd64/libmenu.so.1
+s usr/ccs/lib/amd64/libpanel.so.1=../../../lib/amd64/libpanel.so.1
+s usr/ccs/lib/amd64/libtermcap.so.1=../../../../lib/amd64/libtermcap.so.1
+s usr/ccs/lib/amd64/libtermlib.so.1=../../../../lib/amd64/libcurses.so.1
+s usr/ccs/lib/amd64/liby.so.1=../../../lib/amd64/liby.so.1
s usr/ccs/lib/cpp=../../../lib/cpp
-s usr/ccs/lib/libcurses.so=../../../lib/libcurses.so.1
-s usr/ccs/lib/libform.so=../../lib/libform.so.1
-s usr/ccs/lib/libgen.so=../../../lib/libgen.so.1
-s usr/ccs/lib/libl.so=../../lib/libl.so.1
-s usr/ccs/lib/libmalloc.so=../../lib/libmalloc.so.1
-s usr/ccs/lib/libmenu.so=../../lib/libmenu.so.1
-s usr/ccs/lib/libpanel.so=../../lib/libpanel.so.1
-s usr/ccs/lib/libtermcap.so=../../../lib/libcurses.so.1
-s usr/ccs/lib/libtermlib.so=../../../lib/libcurses.so.1
-s usr/ccs/lib/liby.so=../../lib/liby.so.1
+s usr/ccs/lib/libcurses.so.1=../../../lib/libcurses.so.1
+s usr/ccs/lib/libform.so.1=../../lib/libform.so.1
+s usr/ccs/lib/libgen.so.1=../../../lib/libgen.so.1
+s usr/ccs/lib/libl.so.1=../../lib/libl.so.1
+s usr/ccs/lib/libmalloc.so.1=../../lib/libmalloc.so.1
+s usr/ccs/lib/libmenu.so.1=../../lib/libmenu.so.1
+s usr/ccs/lib/libpanel.so.1=../../lib/libpanel.so.1
+s usr/ccs/lib/libtermcap.so.1=../../../lib/libtermcap.so.1
+s usr/ccs/lib/libtermlib.so.1=../../../lib/libcurses.so.1
+s usr/ccs/lib/liby.so.1=../../lib/liby.so.1
s usr/ccs/lib/link_audit=../../lib/link_audit
s usr/dict=share/lib/dict
d usr/gnu 0755 root bin
@@ -2405,7 +2408,6 @@ d usr/gnu/share/man/man1 0755 root bin
d usr/gnu/share/man/man3 0755 root bin
d usr/gnu/share/man/man5 0755 root bin
d usr/gnu/share/man/man7 0755 root bin
-
d usr/include 0755 root bin
f usr/include/aclutils.h 0644 root bin
f usr/include/aio.h 0644 root bin
@@ -4550,8 +4552,10 @@ d usr/kernel/fs 0755 root sys
d usr/kernel/fs/amd64 0755 root sys
f usr/kernel/fs/amd64/fdfs 0755 root sys
f usr/kernel/fs/amd64/pcfs 0755 root sys
+f usr/kernel/fs/amd64/smbfs 0755 root sys
d usr/kernel/kmdb 0755 root sys
d usr/kernel/kmdb/amd64 0755 root sys
+f usr/kernel/kmdb/amd64/smbfs 0555 root sys
f usr/kernel/kmdb/amd64/smbsrv 0555 root sys
d usr/kernel/sched 0755 root sys
d usr/kernel/sched/amd64 0755 root sys
@@ -4783,8 +4787,6 @@ f usr/lib/amd64/libjdns_sd.so.1 0755 root bin
s usr/lib/amd64/libjdns_sd.so=libjdns_sd.so.1
s usr/lib/amd64/libkmfberder.so=../../../lib/amd64/libkmfberder.so.1
s usr/lib/amd64/libkmfberder.so.1=../../../lib/amd64/libkmfberder.so.1
-f usr/lib/amd64/libkmsagent.so.1 0755 root bin
-s usr/lib/amd64/libkmsagent.so=libkmsagent.so.1
f usr/lib/amd64/libkrb5.so.1 0755 root bin
s usr/lib/amd64/libkrb5.so=libkrb5.so.1
s usr/lib/amd64/libkstat.so.1=../../../lib/amd64/libkstat.so.1
@@ -5384,6 +5386,21 @@ d usr/lib/fs/proc 0755 root sys
f usr/lib/fs/proc/mount 0555 root bin
d usr/lib/fs/sharefs 0755 root sys
f usr/lib/fs/sharefs/mount 0555 root bin
+d usr/lib/fs/smb 0755 root sys
+d usr/lib/fs/smb/amd64 0755 root sys
+f usr/lib/fs/smb/amd64/libshare_smb.so.1 0755 root sys
+f usr/lib/fs/smb/libshare_smb.so.1 0755 root sys
+d usr/lib/fs/smbfs 0755 root sys
+d usr/lib/fs/smbfs/amd64 0755 root sys
+f usr/lib/fs/smbfs/amd64/libshare_smbfs.so.1 0755 root sys
+s usr/lib/fs/smbfs/amd64/libshare_smbfs.so=libshare_smbfs.so.1
+f usr/lib/fs/smbfs/dfshares 0555 root bin
+f usr/lib/fs/smbfs/libshare_smbfs.so.1 0755 root sys
+s usr/lib/fs/smbfs/libshare_smbfs.so=libshare_smbfs.so.1
+f usr/lib/fs/smbfs/mount 0555 root bin
+f usr/lib/fs/smbfs/share 0555 root bin
+f usr/lib/fs/smbfs/umount 0555 root bin
+f usr/lib/fs/smbfs/unshare 0555 root bin
d usr/lib/fs/tmpfs 0755 root sys
f usr/lib/fs/tmpfs/mount 0555 root bin
d usr/lib/fs/ufs 0755 root sys
@@ -6192,8 +6209,6 @@ s usr/lib/libkmf.so=../../lib/libkmf.so.1
s usr/lib/libkmf.so.1=../../lib/libkmf.so.1
s usr/lib/libkmfberder.so=../../lib/libkmfberder.so.1
s usr/lib/libkmfberder.so.1=../../lib/libkmfberder.so.1
-f usr/lib/libkmsagent.so.1 0755 root bin
-s usr/lib/libkmsagent.so=libkmsagent.so.1
f usr/lib/libkrb5.so.1 0755 root bin
s usr/lib/libkrb5.so=libkrb5.so.1
s usr/lib/libkstat.so.1=../../lib/libkstat.so.1
@@ -9750,8 +9765,6 @@ f usr/lib/security/amd64/pam_unix_session.so.1 0755 root bin
s usr/lib/security/amd64/pam_unix_session.so=pam_unix_session.so.1
f usr/lib/security/amd64/pkcs11_kernel.so.1 0755 root bin
s usr/lib/security/amd64/pkcs11_kernel.so=pkcs11_kernel.so.1
-f usr/lib/security/amd64/pkcs11_kms.so.1 0755 root bin
-s usr/lib/security/amd64/pkcs11_kms.so=pkcs11_kms.so.1
f usr/lib/security/amd64/pkcs11_softtoken.so.1 0755 root bin
s usr/lib/security/amd64/pkcs11_softtoken.so=pkcs11_softtoken.so.1
f usr/lib/security/audit_binfile.so.1 0755 root bin
@@ -9817,8 +9830,6 @@ f usr/lib/security/pam_unix_session.so.1 0755 root bin
s usr/lib/security/pam_unix_session.so=pam_unix_session.so.1
f usr/lib/security/pkcs11_kernel.so.1 0755 root bin
s usr/lib/security/pkcs11_kernel.so=pkcs11_kernel.so.1
-f usr/lib/security/pkcs11_kms.so.1 0755 root bin
-s usr/lib/security/pkcs11_kms.so=pkcs11_kms.so.1
f usr/lib/security/pkcs11_softtoken.so.1 0755 root bin
s usr/lib/security/pkcs11_softtoken.so=pkcs11_softtoken.so.1
f usr/lib/sendmail 2555 root smmsp
@@ -9852,6 +9863,7 @@ f usr/lib/smbsrv/libsmbns.so.1 0755 root bin
s usr/lib/smbsrv/libsmbns.so=libsmbns.so.1
f usr/lib/smbsrv/libsqlite.so.1 0755 root bin
s usr/lib/smbsrv/libsqlite.so=libsqlite.so.1
+f usr/lib/smbsrv/smbd 0755 root bin
d usr/lib/smedia 0755 root bin
d usr/lib/smedia/amd64 0755 root bin
f usr/lib/smedia/amd64/sm_blkdev.so.1 0555 root bin
@@ -10109,7 +10121,6 @@ f usr/sadm/install/scripts/r.rbac 0555 root sys
d usr/sadm/sysadm 0755 root bin
d usr/sadm/sysadm/add-ons 0755 root bin
d usr/sadm/sysadm/bin 0755 root bin
-f usr/sadm/sysadm/bin/mkdtab 0755 root bin
f usr/sadm/ugdates 0444 root bin
d usr/sbin 0755 root bin
f usr/sbin/6to4relay 0555 root bin
@@ -10398,7 +10409,9 @@ f usr/sbin/sharectl 0555 root bin
f usr/sbin/sharemgr 0555 root bin
s usr/sbin/showmount=../lib/fs/nfs/showmount
f usr/sbin/shutdown 0755 root sys
+f usr/sbin/smbadm 0555 root bin
f usr/sbin/smbios 0555 root bin
+f usr/sbin/smbstat 0555 root bin
f usr/sbin/snoop 0555 root bin
f usr/sbin/sppptun 0555 root bin
f usr/sbin/spray 0555 root bin
@@ -11366,6 +11379,7 @@ f usr/share/man/man1/command.1 0444 root bin
f usr/share/man/man1/compress.1 0444 root bin
f usr/share/man/man1/cp.1 0444 root bin
f usr/share/man/man1/cpio.1 0444 root bin
+f usr/share/man/man1/cputrack.1 0444 root bin
f usr/share/man/man1/crle.1 0444 root bin
f usr/share/man/man1/crontab.1 0444 root bin
f usr/share/man/man1/crypt.1 0444 root bin
@@ -11603,6 +11617,7 @@ f usr/share/man/man1/sftp.1 0444 root bin
s usr/share/man/man1/sh.1=ksh93.1
f usr/share/man/man1/shcomp.1 0444 root bin
f usr/share/man/man1/sleep.1 0444 root bin
+f usr/share/man/man1/smbutil.1 0444 root bin
f usr/share/man/man1/soelim.1 0444 root bin
f usr/share/man/man1/sort.1 0444 root bin
f usr/share/man/man1/sortbib.1 0444 root bin
@@ -11708,6 +11723,7 @@ f usr/share/man/man1m/clinfo.1m 0444 root bin
f usr/share/man/man1m/clri.1m 0444 root bin
f usr/share/man/man1m/consadm.1m 0444 root bin
f usr/share/man/man1m/coreadm.1m 0444 root bin
+f usr/share/man/man1m/cpustat.1m 0444 root bin
f usr/share/man/man1m/cron.1m 0444 root bin
f usr/share/man/man1m/cryptoadm.1m 0444 root bin
f usr/share/man/man1m/dcopy.1m 0444 root bin
@@ -11789,6 +11805,7 @@ f usr/share/man/man1m/installgrub.1m 0444 root bin
f usr/share/man/man1m/intrstat.1m 0444 root bin
f usr/share/man/man1m/iostat.1m 0444 root bin
f usr/share/man/man1m/ipaddrsel.1m 0444 root bin
+f usr/share/man/man1m/ipadm.1m 0444 root bin
f usr/share/man/man1m/ipdadm.1m 0444 root bin
f usr/share/man/man1m/ipf.1m 0444 root bin
f usr/share/man/man1m/ipmpstat.1m 0444 root bin
@@ -11908,7 +11925,9 @@ f usr/share/man/man1m/sharemgr.1m 0444 root bin
f usr/share/man/man1m/share_nfs.1m 0444 root bin
f usr/share/man/man1m/showmount.1m 0444 root bin
f usr/share/man/man1m/shutdown.1m 0444 root bin
+f usr/share/man/man1m/smbadm.1m 0444 root bin
f usr/share/man/man1m/smbios.1m 0444 root bin
+f usr/share/man/man1m/smbstat.1m 0444 root bin
f usr/share/man/man1m/snoop.1m 0444 root bin
f usr/share/man/man1m/soconfig.1m 0444 root bin
f usr/share/man/man1m/spray.1m 0444 root bin
@@ -13418,15 +13437,84 @@ f usr/share/man/man3commputil/sdp_new_session.3commputil 0444 root bin
f usr/share/man/man3commputil/sdp_parse.3commputil 0444 root bin
f usr/share/man/man3commputil/sdp_session_to_str.3commputil 0444 root bin
d usr/share/man/man3contract 0755 root bin
+f usr/share/man/man3contract/ct_ctl_abandon.3contract 0444 root bin
+f usr/share/man/man3contract/ct_ctl_ack.3contract 0444 root bin
f usr/share/man/man3contract/ct_ctl_adopt.3contract 0444 root bin
+f usr/share/man/man3contract/ct_ctl_nack.3contract 0444 root bin
+f usr/share/man/man3contract/ct_ctl_newct.3contract 0444 root bin
+f usr/share/man/man3contract/ct_ctl_qack.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_status_get_aset.3contract 0444 root bin
f usr/share/man/man3contract/ct_dev_status_get_dev_state.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_status_get_minor.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_status_get_noneg.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_tmpl_clear_noneg.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_tmpl_get_aset.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_tmpl_get_minor.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_tmpl_get_noneg.3contract 0444 root bin
f usr/share/man/man3contract/ct_dev_tmpl_set_aset.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_tmpl_set_minor.3contract 0444 root bin
+f usr/share/man/man3contract/ct_dev_tmpl_set_noneg.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_free.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_get_ctid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_get_evid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_get_flags.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_get_nevid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_get_newct.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_get_type.3contract 0444 root bin
f usr/share/man/man3contract/ct_event_read.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_read_critical.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_reliable.3contract 0444 root bin
+f usr/share/man/man3contract/ct_event_reset.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_exitstatus.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_gcorefile.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_pcorefile.3contract 0444 root bin
f usr/share/man/man3contract/ct_pr_event_get_pid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_ppid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_sender.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_senderct.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_signal.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_event_get_zcorefile.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_contracts.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_fatal.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_members.3contract 0444 root bin
f usr/share/man/man3contract/ct_pr_status_get_param.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_svc_aux.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_svc_creator.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_svc_ctid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_status_get_svc_fmri.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_get_fatal.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_get_param.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_get_svc_aux.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_get_svc_fmri.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_get_transfer.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_set_fatal.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_set_param.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_set_svc_aux.3contract 0444 root bin
+f usr/share/man/man3contract/ct_pr_tmpl_set_svc_fmri.3contract 0444 root bin
f usr/share/man/man3contract/ct_pr_tmpl_set_transfer.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_free.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_cookie.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_critical.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_holder.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_id.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_informative.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_nevents.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_nevid.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_ntime.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_qtime.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_state.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_type.3contract 0444 root bin
+f usr/share/man/man3contract/ct_status_get_zoneid.3contract 0444 root bin
f usr/share/man/man3contract/ct_status_read.3contract 0444 root bin
f usr/share/man/man3contract/ct_tmpl_activate.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_clear.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_create.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_get_cookie.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_get_critical.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_get_informative.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_set_cookie.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_set_critical.3contract 0444 root bin
+f usr/share/man/man3contract/ct_tmpl_set_informative.3contract 0444 root bin
d usr/share/man/man3cpc 0755 root bin
f usr/share/man/man3cpc/cpc.3cpc 0444 root bin
f usr/share/man/man3cpc/cpc_access.3cpc 0444 root bin
View
2 usr/src/Makefile.master
@@ -665,7 +665,7 @@ COMPILE.java= $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH)
# Link time macros
#
CCNEEDED = -lC
-$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ -lgcc_s
+$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS)
View
2 usr/src/Targetdirs
@@ -315,8 +315,6 @@ DIRS= \
/usr/sadm/install \
/usr/sadm/install/bin \
/usr/sadm/install/scripts \
- /usr/sadm/sysadm \
- /usr/sadm/sysadm/add-ons \
/usr/sbin \
/usr/sbin/$(MACH32) \
/usr/share \
View
2 usr/src/cmd/Makefile
@@ -365,6 +365,7 @@ COMMON_SUBDIRS= \
sh \
shcomp \
smbios \
+ smbsrv \
smserverd \
soelim \
sort \
@@ -682,6 +683,7 @@ MSGSUBDIRS= \
sgs \
sh \
shcomp \
+ smbsrv \
sort \
split \
srptadm \
View
4 usr/src/cmd/beadm/beadm.c
@@ -133,8 +133,8 @@ usage(void)
"\tbeadm destroy [-F] beName@snapshot \n"
"\tbeadm list [[-a] | [-d] [-s]] [-H] [beName]\n"
"\tbeadm mount [-s ro|rw] beName [mountpoint]\n"
- "\tbeadm unmount [-f] beName\n"
- "\tbeadm umount [-f] beName\n"
+ "\tbeadm unmount [-f] beName | mountpoint\n"
+ "\tbeadm umount [-f] beName | mountpoint\n"
"\tbeadm rename origBeName newBeName\n"
"\tbeadm rollback beName snapshot\n"
"\tbeadm rollback beName@snapshot\n"));
View
1 usr/src/cmd/cmd-crypto/Makefile
@@ -29,7 +29,6 @@ SUBDIRS1 = \
digest \
elfsign \
kmfcfg \
- kmscfg \
pktool \
tpmadm
View
5 usr/src/cmd/cmd-crypto/etc/Makefile.ca-links
@@ -20,7 +20,7 @@
#
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
+# Copyright (c) 2012, OmniTI Computer Consulting, Inc. All rights reserved.
#
# These CA certs are extracted from the NSS database libnssckbi.so.
@@ -180,3 +180,6 @@ $(ROOTETCCADIR)/%: $(CASRCDIR)/%
ROOTCALINK=$(ROOTETCCALINKDIR)/`$(OPENSSL) x509 -noout -hash -in $<`.0; \
$(RM) $$ROOTCALINK; \
$(LN) -s $(CATARGDIR)/$(@F) $$ROOTCALINK
+ -ROOTCALINK=$(ROOTETCCALINKDIR)/`$(OPENSSL) x509 -noout -subject_hash_old -in $< 2>/dev/null`.0; \
+ test "$$ROOTCALINK" = "$(ROOTETCCALINKDIR)/.0" || $(RM) $$ROOTCALINK; \
+ test "$$ROOTCALINK" = "$(ROOTETCCALINKDIR)/.0" || $(LN) -s $(CATARGDIR)/$(@F) $$ROOTCALINK
View
43 usr/src/cmd/cmd-crypto/kmscfg/Makefile
@@ -1,43 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-include $(SRC)/cmd/Makefile.cmd
-
-PROG= kmscfg
-
-.KEEP_STATE:
-
-all: $(PROG)
-
-install: all .WAIT $(ROOTPROG)
-
-_msg: $(PROG).po
-
-clean:
-
-$(ROOTBINPROG): $(PROG)
- $(INS.file)
-
-lint:
-
-include $(SRC)/cmd/Makefile.targ
View
179 usr/src/cmd/cmd-crypto/kmscfg/kmscfg.pl
@@ -1,179 +0,0 @@
-#!/usr/perl5/bin/perl
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program initializes the private data needed to initialize
-# the PKCS#11 KMS provider (/usr/lib/security/pkcs11_kms.so.1) in
-# the Solaris Cryptographic Framework.
-#
-# It takes the following options:
-# [-p Profile Name]
-# [-a Agent ID]
-# [-i Agent Address]
-# [-t Transaction Timeout]
-# [-f Failover Limit]
-# [-d Discovery Frequency]
-# [-?]
-#
-
-use strict;
-use warnings;
-use locale;
-use Getopt::Std;
-use POSIX qw(locale_h);
-use File::Basename;
-use Sun::Solaris::Utils qw(textdomain gettext gmatch);
-
-my $cmd = basename($0);
-
-sub fatal {
- print STDERR @_;
- exit(1);
-}
-
-sub usage {
- print STDERR gettext("Usage:") . " $cmd\n" .
- gettext(
- "\t[-p[rofile] Profile Name] The name of the KMA profile to use.\n" .
- "\t[-a[gent] Agent ID] The KMA agent ID.\n" .
- "\t[-i[paddr] Agent Address] Address of the KMA\n" .
- "\t[-t[imeout] Transaction Timeout] Transaction timeout period (integer)\n" .
- "\t[-f[ailover] Failover Limit] Maximum failover limit (integer)\n" .
- "\t[-d[iscovery] Discovery Freq] Frequency to attempt KMA discovery\n");
- exit(1);
-}
-
-sub get_input {
- my($prompt, $default) = @_;
- my $resp;
- if (length($default)) {
- print "$prompt [$default]: ";
- } else {
- print "$prompt: ";
- }
- chop ($resp = <STDIN>);
- if (length($default)) {
- return $resp ? $resp : $default;
- }
- return $resp;
-}
-
-setlocale(LC_ALL, "");
-textdomain(TEXT_DOMAIN);
-
-my($profile, $agentid, $address, $timeout, $failover, $discovery, $help);
-
-my (%opt);
-getopts('?p:a:i:t:f:d:', \%opt) || usage();
-usage() if exists ($opt{'?'});
-
-my $TOKENDIR;
-
-if (exists($ENV{KMSTOKEN_DIR})) {
- $TOKENDIR= $ENV{KMSTOKEN_DIR};
-} else {
- my $name = getpwuid($<);
- $TOKENDIR= "/var/kms/$name";
-}
-
-my $cfgfile = "$TOKENDIR/kmstoken.cfg";
-
-if ( ! -d $TOKENDIR ) {
- mkdir ($TOKENDIR, 0700) || die "mkdir $TOKENDIR error: $!\n";
-}
-
-if (-f $cfgfile) {
- my $ans;
- print gettext("KMS Token config file ") . "($cfgfile) " .
- gettext("already exists,\n" .
- "do you want to overwrite it (Y/n)? ");
- chop ($ans = <STDIN>);
- if (length($ans)) {
- if ($ans !~ /^[yY].*/) {
- exit(0);
- }
- }
-}
-
-if (!exists($opt{'p'})) {
- $profile = get_input("Profile Name", "");
- if (!length($profile)) {
- fatal(gettext("You must enter a KMA Profile Name.\n"));
- }
-} else {
- $profile = $opt{'p'};
-}
-
-if (!exists($opt{'a'})) {
- $agentid = get_input("Agent ID", "");
- if (!length($agentid)) {
- fatal(gettext("You must enter a KMA Profile ID.\n"));
- }
-} else {
- $agentid = $opt{'a'};
-}
-
-if (!exists($opt{'i'})) {
- $address = get_input("KMA IP Address", "");
- if (!length($address)) {
- fatal(gettext("You must enter a KMA IP Address.\n"));
- }
-} else {
- $address = $opt{'i'};
-}
-
-if (!exists($opt{'t'})) {
- $timeout = 10;
-} else {
- $timeout = $opt{'t'};
-}
-
-if (!exists($opt{'f'})) {
- $failover = 3;
-} else {
- $failover = $opt{'f'};
-}
-
-if (!exists($opt{'d'})) {
- $discovery = 10;
-} else {
- $discovery = $opt{'d'};
-}
-
-# Save the old one
-if (-f $cfgfile) {
- rename($cfgfile, "$cfgfile.old");
-}
-
-my $FH;
-
-open($FH, ">$cfgfile");
-print $FH "#\n# Profile Name\n#\n$profile\n";
-print $FH "#\n# Agent ID\n#\n$agentid\n";
-print $FH "#\n# KMA Address\n#\n$address\n";
-print $FH "#\n# Transaction Timeout\n#\n$timeout\n";
-print $FH "#\n# Failover Limit\n#\n$failover\n";
-print $FH "#\n# Discovery Frequency\n#\n$discovery\n";
-print $FH "#\n# Security Mode\n#\n1\n";
-close ($FH);
-
-exit(0);
View
7 usr/src/cmd/cmd-inet/lib/ipmgmtd/net-ipmgmt
@@ -21,6 +21,7 @@
#
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Joyent, Inc. All rights reserved.
#
# This daemon stores address object to logical interface number mappings
# (among other things) and reads/writes from/to ipmgmtd data store.
@@ -38,14 +39,16 @@ fi
# When the non-global shared-IP stack zone boots, it tries to bring up this
# service as well. If we don't start a background process and simply exit the
# service, the service will go into maintenance mode and so will all it's
-# dependents.
+# dependents. Ideally we would simply exit with SMF_EXIT_NODAEMON, but since
+# this method is also used in an S10C zone, where support for SMF_EXIT_NODAEMON
+# does not exist, we have to stick around.
#
# In S10C zone (where this script is also used) smf_isnonglobalzone
# function is unavailable in smf_include.sh
#
if [ `/sbin/zonename` != global ]; then
if [ `/sbin/zonename -t` = shared ]; then
- (while true ; do sleep 3600 ; done) &
+ (while true ; do sleep 3600 ; done) &
exit $SMF_EXIT_OK
fi
fi
View
32 usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c
@@ -21,10 +21,9 @@
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright 2012 Joyent, Inc. All rights reserved.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -46,6 +45,7 @@
#include <libscf.h>
#include <libscf_priv.h>
#include <libuutil.h>
+#include <ifaddrs.h>
/*
* This program moves routing management under SMF. We do this by giving
@@ -2335,8 +2335,8 @@ ra_upgrade_from_legacy_conf(void)
/*
*
- * Return the number of IPv6 addresses configured. This answers the
- * generic question, "is IPv6 configured?". We only start in.ndpd if IPv6
+ * Return the number of non-loopback IPv6 addresses configured. This answers
+ * the generic question, "is IPv6 configured?". We only start in.ndpd if IPv6
* is configured, and we also only enable IPv6 routing daemons if IPv6 is
* enabled.
*/
@@ -2344,28 +2344,24 @@ static int
ra_numv6intfs(void)
{
static int num = -1;
- int ipsock;
- struct lifnum lifn;
+ int cnt;
+ struct ifaddrs *ifp_head, *ifp;
if (num != -1)
return (num);
- if ((ipsock = socket(PF_INET6, SOCK_DGRAM, 0)) == -1) {
- (void) fprintf(stderr,
- gettext("%1$s: unable to open %2$s: %3$s\n"),
- myname, IP_DEV_NAME, strerror(errno));
+ if (getifaddrs(&ifp_head) < 0)
return (0);
- }
- lifn.lifn_family = AF_INET6;
- lifn.lifn_flags = 0;
- if (ioctl(ipsock, SIOCGLIFNUM, &lifn) == -1) {
- (void) close(ipsock);
- return (0);
+ cnt = 0;
+ for (ifp = ifp_head; ifp; ifp = ifp->ifa_next) {
+ if (!(ifp->ifa_flags & IFF_LOOPBACK) &&
+ (ifp->ifa_flags & IFF_IPV6))
+ cnt++;
}
- (void) close(ipsock);
- return (num = lifn.lifn_count);
+ freeifaddrs(ifp_head);
+ return (num = cnt);
}
/*
View
4 usr/src/cmd/cron/cron.c
@@ -21,6 +21,7 @@
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright 2012 Joyent, Inc. All rights reserved.
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
@@ -2521,6 +2522,9 @@ ex(struct event *e)
} else {
r = audit_cron_session(e->u->name, CRONDIR,
e->u->uid, e->u->gid, NULL);
+ if (r != 0)
+ r = audit_cron_session(e->u->name, SYSCRONDIR,
+ e->u->uid, e->u->gid, NULL);
}
if (r != 0) {
msg("cron audit problem. job failed (%s) for user %s",
View
30 usr/src/cmd/dd/dd.c
@@ -23,13 +23,12 @@
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright 2012, Josef 'Jeff' Sipek <jeffpc@31bits.net>. All rights reserved.
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* convert and copy
*/
@@ -1642,7 +1641,8 @@ char *s;
/* Arg: big - maximum valid input number */
/* Global arg: string - pointer to command arg */
/* */
-/* Valid forms: 123 | 123k | 123w | 123b | 123*123 | 123x123 */
+/* Valid forms: 123 | 123k | 123M | 123G | 123T | 123P | 123E | 123Z | */
+/* 123w | 123b | 123*123 | 123x123 */
/* plus combinations such as 2b*3kw*4w */
/* */
/* Return: converted number */
@@ -1668,6 +1668,30 @@ long long big;
switch (*cs++)
{
+ case 'Z':
+ n *= 1024;
+ /* FALLTHROUGH */
+
+ case 'E':
+ n *= 1024;
+ /* FALLTHROUGH */
+
+ case 'P':
+ n *= 1024;
+ /* FALLTHROUGH */
+
+ case 'T':
+ n *= 1024;
+ /* FALLTHROUGH */
+
+ case 'G':
+ n *= 1024;
+ /* FALLTHROUGH */
+
+ case 'M':
+ n *= 1024;
+ /* FALLTHROUGH */
+
case 'k':
n *= 1024;
continue;
View
112 usr/src/cmd/devfsadm/disk_link.c
@@ -19,6 +19,7 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -319,51 +320,102 @@ disk_callback_sas(di_minor_t minor, di_node_t node)
/*
* xVM virtual block device
*
- * VBDs are enumerated into xenstore by xend and named using
- * the linux dev_t values for 'hd' and 'xvd' devices. Linux
- * dev_t's are 16-bit values. The upper 8 bits identify the major #
- * of the device (hd, xvd) and the lower 8 bits the instance and partition
+ * Xen passes device number in next format:
*
- * For PV guests, VBDs are named by the virt-tools using
- * the form xvd[a-p][1-15]. The corresponding Solaris /dev/dsk name
- * created by this generator will be c0t[0-15]d[0-15]sN,
- * were the target (t) value represents [a-p] and the
- * disk (d) value is either 0 (e.g. xvda) or contains the partition
- * information if it has been specified [1-15] (e.g. xvda1)
+ * 1 << 28 | disk << 8 | partition xvd, disks or partitions 16 onwards
+ * 202 << 8 | disk << 4 | partition xvd, disks and partitions up to 15
+ * 8 << 8 | disk << 4 | partition sd, disks and partitions up to 15
+ * 3 << 8 | disk << 6 | partition hd, disks 0..1, partitions 0..63
+ * 22 << 8 | (disk-2) << 6 | partition hd, disks 2..3, partitions 0..63
+ * 2 << 28 onwards reserved for future use
+ * other values less than 1 << 28 deprecated / reserved
+ *
+ * The corresponding Solaris /dev/dsk name can be:
+ *
+ * c0tYdXsN
+ *
+ * where Y,X >= 0.
*
* For PV guests using the legacy naming (0, 1, 2, ...)
* the Solaris disk names created will be c0d[0..767]sN
- * The Solaris version of virt-install based on virtinst.101
- * named PV disks as sequential integers. With virtinst.300_1 and
- * beyond, the virt-* tools will no longer create legacy disk
- * names.
+ */
+
+#define HD_BASE (3 << 8)
+#define XEN_EXT_SHIFT (28)
+
+/*
+ * Return: Number of parsed and written parameters
*/
static int
-disk_callback_xvmd(di_minor_t minor, di_node_t node)
+decode_xen_device(uint_t device, uint_t *disk, uint_t *plun)
{
-#define HD_BASE (3 << 8)
-#define XVBDMAJ 202
+ uint_t dsk, lun = 0;
+ int ret = 1;
+
+ if ((device >> XEN_EXT_SHIFT) > 1)
+ return (0);
+ if (device < HD_BASE) {
+ /* legacy device address */
+ dsk = device;
+ goto end;
+ }
+
+ ret = 2;
+ if (device & (1 << XEN_EXT_SHIFT)) {
+ /* extended */
+ dsk = device & (~0xff);
+ lun = device & 0xff;
+ goto end;
+ }
+
+ switch (device >> 8) {
+ case 202: /* xvd */
+ dsk = (device >> 4) & 0xf;
+ lun = device & 0xf;
+ break;
+ case 8: /* sd */
+ dsk = device & (~0xf);
+ lun = device & 0xf;
+ break;
+ case 3: /* hd, disk 0..1 */
+ dsk = device & (~0x3f);
+ lun = device & 0x3f;
+ break;
+ case 22: /* hd, disk 2..3 */
+ dsk = device & (~0x3f);
+ lun = device & 0x3f;
+ break;
+ default:
+ return (0);
+ }
+end:
+ *disk = dsk;
+ *plun = lun;
+ return (ret);
+}
+
+static int
+disk_callback_xvmd(di_minor_t minor, di_node_t node)
+{
char *addr;
char disk[16];
uint_t targ;
- uint_t lun = 0;
- uint_t fmaj;
+ uint_t dsk, lun;
+ int res;
addr = di_bus_addr(node);
targ = strtol(addr, (char **)NULL, 10);
- fmaj = targ >> 8;
-
- /* legacy device address */
- if (targ < HD_BASE)
- (void) snprintf(disk, sizeof (disk), "d%d", targ);
- /* PV VBD */
- else if (fmaj == XVBDMAJ) {
- lun = targ & 0xf;
- targ = (targ & 0xff) >> 4;
- (void) snprintf(disk, sizeof (disk), "t%dd%d", targ, lun);
+
+ res = decode_xen_device(targ, &dsk, &lun);
+
/* HVM device names are generated using the standard generator */
- } else {
+
+ if (res == 1)
+ (void) snprintf(disk, sizeof (disk), "d%d", dsk);
+ else if (res == 2)
+ (void) snprintf(disk, sizeof (disk), "t%dd%d", dsk, lun);
+ else {
devfsadm_errprint("%s: invalid disk device number (%s)\n",
modname, addr);
return (DEVFSADM_CONTINUE);
View
4 usr/src/cmd/devmgmt/Makefile
@@ -20,8 +20,6 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# Copyright 1990,2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -30,7 +28,7 @@
include ../Makefile.cmd
-SUBDIRS = cmds data mkdtab
+SUBDIRS = cmds data
all:= TARGET= all
install:= TARGET= install
View
5 usr/src/cmd/devmgmt/data/device.tab
@@ -1,5 +1,3 @@
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.10.1.1 */
-#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -39,7 +37,4 @@
# where attr is the attribute name and value is the
# value of that attribute.
#
-ctape1:/dev/rSA/ctape1:/dev/SA/ctape1::desc="Cartridge Tape Drive" fmtcmd="/etc/ctcfmt" type="ctape" display="true" volume="cartridge tape"
-disk1:/dev/rdsk/c1d0s6:/dev/dsk/c1d0s6::desc="Disk Drive" type="disk" display="true" remove="true" part="true"
-disk2:/dev/rdsk/c1d1s6:/dev/dsk/c1d1s6::desc="Disk Drive" type="disk" display="true" remove="true" part="true"
spool:::/var/spool/pkg:desc="Packaging Spool Directory"
View
5 usr/src/cmd/devmgmt/data/dgroup.tab
@@ -1,5 +1,3 @@
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */
-#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -32,6 +30,3 @@
# members Comma-list of members in the group. A member is the
# device alias of the device that belongs in the group
#
-ctape:ctape1,ctape2
-diskette:diskette1
-disk:disk1,disk2
View
53 usr/src/cmd/devmgmt/mkdtab/Makefile
@@ -1,53 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# cmd/devmgmt/mkdtab/Makefile
-#
-
-PROG= mkdtab
-
-include ../../Makefile.cmd
-
-ROOTCMDDIR = $(ROOT)/usr/sadm/sysadm/bin
-LIBADMDIR = ../../../lib/libadm/inc
-CPPFLAGS += -I$(LIBADMDIR)
-
-LDLIBS += -ladm -lgen
-FILEMODE= 0755
-CFLAGS += $(CCVERBOSE)
-
-.KEEP_STATE:
-
-all: $(PROG)
-
-install: all $(ROOTCMD)
-
-clean:
-
-lint: lint_PROG
-
-include ../../Makefile.targ
View
560 usr/src/cmd/devmgmt/mkdtab/mkdtab.c
@@ -1,560 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <devmgmt.h>
-#include <devtab.h>
-#include <dirent.h>
-#include <libgen.h>
-#include <sys/stat.h>
-#include <sys/vtoc.h>
-#include <sys/vfstab.h>
-
-/*
- * Update device.tab and dgroup.tab to reflect current configuration.
- * Designed so it can be run either once at installation time or after
- * every reboot. The alias naming scheme used is non-intuitive but
- * is consistent with existing conventions and documentation and with
- * the device numbering scheme used by the disks command.
- * Code borrowed liberally from prtconf, disks and prtvtoc commands.
- */
-
-/*
- * make this long enough to start out with.
- * there are place we write into putdevcmd
- * where we are not testing for overrun.
- */
-#define ORIGLEN 1024
-
-struct dpart {
- char alias[20];
- char *cdevice;
- char *bdevice;
- diskaddr_t capacity;
-};
-
-static int vfsnum;
-static char *putdevcmd;
-static char cmd[80];
-static int lastlen = ORIGLEN;
-#ifdef att3b2
-static struct mainedt *edtp;
-#endif
-static struct vfstab *vfstab;
-
-static void checkandresize(int);
-
-static char *
-memstr(const char *str)
-{
- char *mem;
-
- if ((mem = (char *)malloc((uint_t)strlen(str) + 1)) == NULL) {
- (void) fprintf(stderr,
- "%s: can't update device tables:Out of memory\n", cmd);
- exit(1);
- }
- return (strcpy(mem, str));
-}
-
-
-
-/*
- * Add device table entry for the floppy drive.
- */
-static void
-fdisk(const int diskno, const char *disknm)
-{
- if (snprintf(putdevcmd, lastlen, "/usr/bin/putdev -a diskette%d "
- "cdevice=/dev/r%s bdevice=/dev/%s desc=\"Floppy Drive\" "
- "mountpt=/mnt volume=diskette "
- "type=diskette removable=true capacity=2880 "
- "fmtcmd=\"/usr/bin/fdformat -f -v /dev/r%s\" "
- "erasecmd=\"/usr/sbin/fdformat -f -v /dev/r%s\" "
- "removecmd=\"/usr/bin/eject\" copy=true "
- "mkfscmd=\"/usr/sbin/mkfs -F ufs /dev/r%s 2880 18 "
- "2 4096 512 80 2 5 3072 t\"",
- diskno, disknm, disknm, disknm, disknm, disknm) >= lastlen) {
- (void) fprintf(stderr,
- "%s: Command too long: %s\n", cmd, putdevcmd);
- exit(1);
- }
- (void) system(putdevcmd);
-}
-
-static void
-do_fdisks(void)
-{
- DIR *dp;
- struct dirent *dirp;
- int drive = 1;
-
- if ((dp = opendir("/dev")) == NULL) {
- (void) fprintf(stderr, "%s: can't open /dev\n", cmd);
- return;
- }
-
- while ((dirp = readdir(dp)) != NULL) {
- if (gmatch(dirp->d_name, "diskette*")) {
- fdisk(drive++, dirp->d_name);
- }
- }
-
- (void) closedir(dp);
-}
-
-/*
- * hdisk() gets information about the specified hard drive from the vtoc
- * and vfstab and adds the disk and partition entries to device.tab. If
- * we can't access the raw disk we simply assume it isn't properly configured
- * and we add no entries to device.tab.
- */
-static void
-hdisk(const int drive, const char *drivepfx)
-{
- char *cdskpath;
- char *bdskpath;
- char *mountpoint;
- int i, j, dpartcnt, fd;
- struct extvtoc vtoc;
- static struct dpart *dparttab;
-
- if ((cdskpath = (char *)malloc(strlen(drivepfx) + 13)) == NULL) {
- (void) fprintf(stderr, "%s: Memory request failed\n", cmd);
- exit(1);
- }
-
- (void) snprintf(cdskpath, strlen(drivepfx) + 13, "/dev/rdsk/%ss2",
- drivepfx);
- if ((fd = open(cdskpath, O_RDONLY)) == -1) {
- free(cdskpath);
- return;
- }
-
-
- /*
- * Read volume table of contents.
- */
- if (read_extvtoc(fd, &vtoc) < 0) {
- (void) close(fd);
- free(cdskpath);
- return;
- }
-
- (void) close(fd);
-
- /*
- * Begin building the putdev command string that will be
- * used to make the entry for this disk.
- */
-
- if ((bdskpath = (char *)malloc(strlen(drivepfx) + 13)) == NULL) {
- (void) fprintf(stderr, "%s: Memory request failed\n", cmd);
- exit(1);
- }
-
- (void) snprintf(bdskpath, strlen(drivepfx) + 13, "/dev/dsk/%ss2",
- drivepfx);
- if (snprintf(putdevcmd, lastlen, "/usr/bin/putdev -a disk%d "
- "cdevice=%s bdevice=%s "
- "desc=\"Disk Drive\" type=disk "
- "part=true removable=false capacity=%llu dpartlist=",
- drive, cdskpath, bdskpath, vtoc.v_part[2].p_size) >= lastlen) {
- (void) fprintf(stderr,
- "%s: Command too long: %s\n", cmd, putdevcmd);
- exit(1);
- }
-
- free(cdskpath);
- free(bdskpath);
-
- /*
- * Build a table of disk partitions we are interested in and finish
- * the putdev command string for the disk by adding the dpartlist.
- */
-
- if ((dparttab =
- (struct dpart *)malloc((int)vtoc.v_nparts *
- sizeof (struct dpart))) == NULL) {
- (void) fprintf(stderr,
- "%s: can't disk partitions table: Out of memory\n", cmd);
- exit(1);
- }
-
- dpartcnt = 0;
- for (i = 0; i < (int)vtoc.v_nparts; ++i) {
- if (vtoc.v_part[i].p_size == 0 || vtoc.v_part[i].p_flag != 0)
- continue;
- (void) sprintf(dparttab[dpartcnt].alias, "dpart%d%02d", drive,
- i);
-
- if ((dparttab[dpartcnt].cdevice =
- (char *)malloc(strlen(drivepfx) + 14)) == NULL) {
- (void) fprintf(stderr, "%s: Out of memory\n", cmd);
- exit(1);
- }
-
- (void) snprintf(dparttab[dpartcnt].cdevice,
- strlen(drivepfx) + 14, "/dev/rdsk/%ss%x", drivepfx, i);
- if ((dparttab[dpartcnt].bdevice =
- (char *)malloc(strlen(drivepfx) + 14)) == NULL) {
- (void) fprintf(stderr, "%s: Out of memory\n", cmd);
- exit(1);
- }
- (void) snprintf(dparttab[dpartcnt].bdevice,
- strlen(drivepfx) + 14, "/dev/dsk/%ss%x", drivepfx, i);
- dparttab[dpartcnt].capacity = vtoc.v_part[i].p_size;
-
- if (dpartcnt != 0)
- (void) strcat(putdevcmd, ",");
- (void) strcat(putdevcmd, dparttab[dpartcnt].alias);
- dpartcnt++;
- }
-
- (void) system(putdevcmd);
-
- /*
- * We assemble the rest of the information about the partitions by
- * looking in the vfstab.
- */
- for (i = 0; i < dpartcnt; i++) {
- for (j = 0; j < vfsnum; j++) {
- if (vfstab[j].vfs_special != NULL &&
- strcmp(dparttab[i].bdevice,
- vfstab[j].vfs_special) == 0)
- break;
- }
- if (j < vfsnum) {
- /*
- * Partition found in vfstab.
- */
- if (vfstab[j].vfs_mountp == NULL ||
- strcmp(vfstab[j].vfs_mountp, "-") == 0)
- mountpoint = "/mnt";
- else
- mountpoint = vfstab[j].vfs_mountp;
- if (snprintf(putdevcmd, lastlen, "/usr/bin/putdev "
- "-a %s cdevice=%s bdevice=%s "
- "desc=\"Disk Partition\" type=dpart "
- "removable=false capacity=%llu dparttype=fs "
- "fstype=%s mountpt=%s", dparttab[i].alias,
- dparttab[i].cdevice, dparttab[i].bdevice,
- dparttab[i].capacity, vfstab[j].vfs_fstype,
- mountpoint) >= lastlen) {
- (void) fprintf(stderr,
- "%s: Command too long: %s\n",
- cmd, putdevcmd);
- exit(1);
- }
- (void) system(putdevcmd);
- }
- free(dparttab[i].cdevice);
- free(dparttab[i].bdevice);
- }
- free(dparttab);
-}
-
-static void
-do_hdisks(void)
-{
- DIR *dp;
- struct dirent *dirp;
- int drive = 1; char disknm[MAXNAMLEN+1];
-
- if ((dp = opendir("/dev/rdsk")) == NULL) {
- (void) fprintf(stderr, "%s: can't open /dev/rdsk\n", cmd);
- return;
- }
-
- while ((dirp = readdir(dp)) != NULL) {
- if (gmatch(dirp->d_name, "c[0-9]*s2")) {
- (void) strcpy(disknm, dirp->d_name);
- /*
- * now know off the 's2'
- */
- disknm[strlen(disknm)-2] = '\0';
- /*
- * And do it!
- */
- hdisk(drive++, disknm);
- }
- }
-
- (void) closedir(dp);
-}
-
-
-/*
- * Add device table entry for the cartridge tape drive.
- */
-static void
-tape(const int driveno, const char *drivenm)
-{
- if (snprintf(putdevcmd, lastlen, "/usr/bin/putdev -a ctape%d "
- "cdevice=/dev/rmt/%s "
- "desc=\"Tape Drive\" volume=\"tape\" "
- "type=ctape removable=true capacity=45539 bufsize=15872 "
- "erasecmd=\"/usr/bin/mt -f /dev/rmt/%s erase\" "
- "removecmd=\"/usr/bin/mt -f /dev/rmt/%s offline\"",
- driveno, drivenm, drivenm, drivenm) >= lastlen) {
- (void) fprintf(stderr,
- "%s: Command too long: %s\n", cmd, putdevcmd);
- exit(1);
- }
- (void) system(putdevcmd);
-}
-
-static void
-do_tapes(void)
-{
- DIR *dp;
- struct dirent *dirp;
-
- if ((dp = opendir("/dev/rmt")) == NULL) {
- (void) fprintf(stderr, "%s: can't open /dev/rmt\n", cmd);
- return;
- }
-
- while ((dirp = readdir(dp)) != NULL) {
- if (gmatch(dirp->d_name, "[0-9]") ||
- gmatch(dirp->d_name, "[1-9][0-9]")) {
- tape(atoi(dirp->d_name), dirp->d_name);
- }
- }
-
- (void) closedir(dp);
-}
-
-static void
-initialize(void)
-{
- FILE *fp;
- int i;
- struct vfstab vfsent;
- char *criteria[5];
- char **olddevlist;
-
- /*
- * Build a copy of vfstab in memory for later use.
- */
- if ((fp = fopen("/etc/vfstab", "r")) == NULL) {
- (void) fprintf(stderr,
- "%s: can't update device tables:Can't open /etc/vfstab\n",
- cmd);
- exit(1);
- }
-
- /*
- * Go through the vfstab file once to get the number of entries so
- * we can allocate the right amount of contiguous memory.
- */
- vfsnum = 0;
- while (getvfsent(fp, &vfsent) == 0)
- vfsnum++;
- rewind(fp);
-
- if ((vfstab = (struct vfstab *)malloc(vfsnum * sizeof (struct vfstab)))
- == NULL) {
- (void) fprintf(stderr,
- "%s: can't update device tables:Out of memory\n", cmd);
- exit(1);
- }
-
- /*
- * Go through the vfstab file one more time to populate our copy in
- * memory. We only populate the fields we'll need.
- */
- i = 0;
- while (getvfsent(fp, &vfsent) == 0 && i < vfsnum) {
- if (vfsent.vfs_special == NULL)
- vfstab[i].vfs_special = NULL;
- else
- vfstab[i].vfs_special = memstr(vfsent.vfs_special);
- if (vfsent.vfs_mountp == NULL)
- vfstab[i].vfs_mountp = NULL;
- else
- vfstab[i].vfs_mountp = memstr(vfsent.vfs_mountp);
- if (vfsent.vfs_fstype == NULL)
- vfstab[i].vfs_fstype = NULL;
- else
- vfstab[i].vfs_fstype = memstr(vfsent.vfs_fstype);
- i++;
- }
- (void) fclose(fp);
-
- /*
- * Now remove all current entries of type disk, dpart, ctape
- * and diskette from the device and device group tables.
- * Any changes made manually since the last time this command
- * was run will be lost. Note that after this we are committed
- * to try our best to rebuild the tables (i.e. the command
- * should try not to fail completely after this point).
- */
- criteria[0] = "type=disk";
- criteria[1] = "type=dpart";
- criteria[2] = "type=ctape";
- criteria[3] = "type=diskette";
- criteria[4] = (char *)NULL;
- olddevlist = getdev((char **)NULL, criteria, 0);
- _enddevtab(); /* getdev() should do this but doesn't */
-
- putdevcmd = malloc(ORIGLEN);
-
- if (putdevcmd == NULL) {
- perror("malloc");
- exit(-1);
- }
-
- (void) memset(putdevcmd, 0, ORIGLEN);
-
- for (i = 0; olddevlist[i] != (char *)NULL; i++) {
- if (snprintf(putdevcmd, lastlen,
- "/usr/bin/putdev -d %s", olddevlist[i]) >= lastlen) {
- (void) fprintf(stderr,
- "%s: Command too long: %s\n", cmd, putdevcmd);
- exit(1);
- }
- (void) system(putdevcmd);
- }
-
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp -d disk 2>/dev/null");
- (void) system(putdevcmd);
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp -d dpart 2>/dev/null");
- (void) system(putdevcmd);
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp -d ctape 2>/dev/null");
- (void) system(putdevcmd);
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp -d diskette 2>/dev/null");
- (void) system(putdevcmd);
-}
-
-
-/*
- * Update the dgroup.tab file with information from the updated device.tab.
- */
-static void
-mkdgroups(void)
-{
- int i;
- char *criteria[2];
- char **devlist;
-
- criteria[1] = (char *)NULL;
-
- criteria[0] = "type=disk";
-
- devlist = getdev((char **)NULL, criteria, DTAB_ANDCRITERIA);
-
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp disk");
- for (i = 0; devlist[i] != (char *)NULL; i++) {
- checkandresize((strlen(putdevcmd) + strlen(devlist[i]) + 2));
- (void) strcat(putdevcmd, " ");
- (void) strcat(putdevcmd, devlist[i]);
- }
- if (i != 0)
- (void) system(putdevcmd);
-
- criteria[0] = "type=dpart";
-
- devlist = getdev((char **)NULL, criteria, DTAB_ANDCRITERIA);
-
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp dpart");
- for (i = 0; devlist[i] != (char *)NULL; i++) {
- checkandresize((strlen(putdevcmd) + strlen(devlist[i]) + 2));
- (void) strcat(putdevcmd, " ");
- (void) strcat(putdevcmd, devlist[i]);
- }
- if (i != 0)
- (void) system(putdevcmd);
-
- criteria[0] = "type=ctape";
-
- devlist = getdev((char **)NULL, criteria, DTAB_ANDCRITERIA);
-
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp ctape");
- for (i = 0; devlist[i] != (char *)NULL; i++) {
- checkandresize((strlen(putdevcmd) + strlen(devlist[i]) + 2));
- (void) strcat(putdevcmd, " ");
- (void) strcat(putdevcmd, devlist[i]);
- }
- if (i != 0)
- (void) system(putdevcmd);
-
- criteria[0] = "type=diskette";
-
- devlist = getdev((char **)NULL, criteria, DTAB_ANDCRITERIA);
-
- (void) sprintf(putdevcmd, "/usr/bin/putdgrp diskette");
- for (i = 0; devlist[i] != (char *)NULL; i++) {
- checkandresize((strlen(putdevcmd) + strlen(devlist[i]) + 2));
- (void) strcat(putdevcmd, " ");
- (void) strcat(putdevcmd, devlist[i]);
- }
- if (i != 0)
- (void) system(putdevcmd);
-}
-
-static void
-checkandresize(int size)
-{
- if (size >= lastlen) {
- putdevcmd = realloc(putdevcmd, lastlen * 2);
- lastlen = lastlen * 2;
- }
-}
-
-/*ARGSUSED*/
-int
-main(int argc, char **argv)
-{
- (void) strncpy(cmd, argv[0], 80);
-
- initialize();
-
- /*
- * AT&T code looked at the 3B2 EDT here. Since we have a known-good
- * /dev directory ( presuming 'disks' has already been run), we simply
- * look in the /dev subdirectories.
- */
- do_hdisks();
-
- do_fdisks();
-
- do_tapes();
-
- /*
- * Update the dgroup.tab file.
- */
- mkdgroups();
-
- return (0);
-
-}
View
9 usr/src/cmd/dlmgmtd/svc-dlmgmtd
@@ -23,17 +23,16 @@
#
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
+# Copyright 2012 Joyent, Inc. All rights reserved.
#
-# ident "%Z%%M% %I% %E% SMI"
. /lib/svc/share/smf_include.sh
-# The real daemon is not started in a non-global zone. But we need to
-# create a dummy background process to preserve contract lifetime.
+# The real daemon is not started in a non-global zone. Exit to leave
+# an empty contract.
if smf_is_nonglobalzone; then
- (while true ; do sleep 3600 ; done) &
- exit $SMF_EXIT_OK
+ exit $SMF_EXIT_NODAEMON
fi
# Start the dlmgmtd daemon.
View
23 usr/src/cmd/format/startup.c
@@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ *
* Copyright (c) 2011 Gary Mills
*