Import sfw build 147 sfwnv_147
authorCyril Plisko <cyril.plisko@grigale.com>
Sat, 21 Aug 2010 11:47:07 -0700
changeset 42 b6f829cb6d9e
parent 41 02f9b601daa1
child 43 394d6ad61a73
Import sfw build 147 Bugs Fixed ---------- 4876883 TrueTime Clock driver support in xntpd fails in year 2032 6641606 Samba 3.0.x should support StartTLS or LDAPS for LDAP access. 6647164 net ads keytab add host fails to create keytab entry 6688158 winbindd: Exceeding 200 client connections, no idle connection found (Bugzilla Bug 3204) 6706912 SWAT component of Samba should be a separate package. 6725643 SUNWsmbar seems to include unused i.services 6749477 Samba source code software should include libsunwrap.a file 6770655 Samba: Bugzilla 5655 "Mac OS X 10.5.4 clients fail to authenticate with Kerberos credententials" 6785625 samba module nss_winbind.so.1 is required as 64 bit version 6852659 Update samba to 3.3.5 or later 6891889 Write keytab to file method is missing in krb5_keytab 6892860 Samba needs Directory Server 6 C-SDK 6949937 BIND validating resolver searches very aggressively for a match for its trust anchor. 6951320 NTP Bug320: restrict default ignore not working with ipv6 6952924 dig(1M) and nslookup(1M) crash in libisc:isc_socket_detach() 6954726 Update samba to 3.5.4 6955224 BIND named dns_db_getnsec3parameters() fails to assert dns_db_iszone(db) == ISC_TRUE 6969855 If autokey is set up with two copies of the same key, ntpd segfaults. 6969858 Missing refclock causes ntpd to exit without logging a reason. 6969878 Upgrade NTP to version ntp-dev 4.2.5p200 6971713 BIND 9.6.1 Makefile.sfw issues 6975270 libtspi does not link with correct _init and _fini sections
usr/src/Targetdirs
usr/src/cmd/bind/METADATA
usr/src/cmd/bind/Makefile.sfw
usr/src/cmd/bind/bind-9.6.1-P3.tar.gz
usr/src/cmd/bind/bind-9.6.2-P2.tar.gz
usr/src/cmd/ntpd/METADATA
usr/src/cmd/ntpd/Makefile.sfw
usr/src/cmd/ntpd/Patches/cve20093563.patch
usr/src/cmd/ntpd/Patches/dnsretry.patch
usr/src/cmd/ntpd/Patches/etcfix.patch
usr/src/cmd/ntpd/Patches/mc.patch
usr/src/cmd/ntpd/Patches/mdns.patch
usr/src/cmd/ntpd/Patches/noextra.patch
usr/src/cmd/ntpd/Patches/timing.patch
usr/src/cmd/ntpd/ntp-dev-4.2.5p172.tar.gz
usr/src/cmd/ntpd/ntp-dev-4.2.5p200.tar.gz
usr/src/cmd/samba/METADATA
usr/src/cmd/samba/Makefile.sfw
usr/src/cmd/samba/Patches/Makefile.in.diff
usr/src/cmd/samba/Patches/conf.in-nsldap.diff
usr/src/cmd/samba/Patches/configure.in.diff
usr/src/cmd/samba/Patches/generate-file-list.diff
usr/src/cmd/samba/Patches/lib-interfaces.c.diff
usr/src/cmd/samba/Patches/lib-replace-test-getifaddrs.c.diff
usr/src/cmd/samba/Patches/libsmb_clikrb5.c.diff
usr/src/cmd/samba/Patches/swat.c.diff
usr/src/cmd/samba/Patches/vfs_samfs.c.diff
usr/src/cmd/samba/Solaris/configure.in-diff
usr/src/cmd/samba/Solaris/docs-xml-built.tar.gz
usr/src/cmd/samba/Solaris/libsam.c
usr/src/cmd/samba/Solaris/pam.conf-winbind
usr/src/cmd/samba/Solaris/sam-lib.h
usr/src/cmd/samba/Solaris/sam-osversion.h
usr/src/cmd/samba/Solaris/sam-stat.h
usr/src/cmd/samba/Solaris/sam-sys_types.h
usr/src/cmd/samba/Solaris/sam-types.h
usr/src/cmd/samba/Solaris/samba.xml
usr/src/cmd/samba/Solaris/smbconf.sed
usr/src/cmd/samba/Solaris/swat.xml
usr/src/cmd/samba/Solaris/winbind.xml
usr/src/cmd/samba/Solaris/wins.xml
usr/src/cmd/samba/configure.in-diff
usr/src/cmd/samba/install-sfw
usr/src/cmd/samba/ldap_add_result_entry.c
usr/src/cmd/samba/libsam.c
usr/src/cmd/samba/makefile-sunwrap
usr/src/cmd/samba/makefile.in-diff
usr/src/cmd/samba/pam.conf-winbind
usr/src/cmd/samba/samba-3.5.4.tar.gz
usr/src/cmd/samba/samba.xml
usr/src/cmd/samba/samfs-configure.in-diff
usr/src/cmd/samba/samfs-includes.h-diff
usr/src/cmd/samba/samfs-makefile.in-diff
usr/src/cmd/samba/samfs-param_loadparm.c-diff
usr/src/cmd/samba/samfs-smbd_dosmode.c-diff
usr/src/cmd/samba/samfs-smbd_service.c-diff
usr/src/cmd/samba/samfs.c
usr/src/cmd/samba/samfs_stat.h
usr/src/cmd/samba/smbconf.sed
usr/src/cmd/samba/sunman-stability
usr/src/cmd/samba/sunwrap.h
usr/src/cmd/samba/swat.c-diff
usr/src/cmd/samba/swat.xml
usr/src/cmd/samba/vfs_zfsacl.c
usr/src/cmd/samba/winbind.xml
usr/src/cmd/samba/wins.xml
usr/src/cmd/vim/runtime.patch
usr/src/lib/Makefile
usr/src/lib/mozldap/METADATA
usr/src/lib/mozldap/Makefile.sfw
usr/src/lib/mozldap/Patches/64bit_build_options.diff
usr/src/lib/mozldap/install-sfw
usr/src/lib/mozldap/mozldap-6.0.6.tar.gz
usr/src/lib/trousers/Makefile.sfw
usr/src/lib/trousers/Patches/hosttable.c.patch
usr/src/lib/trousers/Patches/tspi_Makefile.am.patch
usr/src/pkgdefs/Makefile
usr/src/pkgdefs/SUNWbindc/prototype_com
usr/src/pkgdefs/SUNWmozldapC-SDK/Makefile
usr/src/pkgdefs/SUNWmozldapC-SDK/copyright
usr/src/pkgdefs/SUNWmozldapC-SDK/depend
usr/src/pkgdefs/SUNWmozldapC-SDK/pkginfo.tmpl
usr/src/pkgdefs/SUNWmozldapC-SDK/prototype_com
usr/src/pkgdefs/SUNWmozldapC-SDK/prototype_i386
usr/src/pkgdefs/SUNWmozldapC-SDK/prototype_sparc
usr/src/pkgdefs/SUNWsmbadocr/Makefile
usr/src/pkgdefs/SUNWsmbadocr/copyright
usr/src/pkgdefs/SUNWsmbadocr/depend
usr/src/pkgdefs/SUNWsmbadocr/pkginfo.tmpl
usr/src/pkgdefs/SUNWsmbadocr/preinstall
usr/src/pkgdefs/SUNWsmbadocr/prototype_com
usr/src/pkgdefs/SUNWsmbadocr/prototype_i386
usr/src/pkgdefs/SUNWsmbadocr/prototype_sparc
usr/src/pkgdefs/SUNWsmbadocu/Makefile
usr/src/pkgdefs/SUNWsmbadocu/copyright
usr/src/pkgdefs/SUNWsmbadocu/depend
usr/src/pkgdefs/SUNWsmbadocu/pkginfo.tmpl
usr/src/pkgdefs/SUNWsmbadocu/prototype_com
usr/src/pkgdefs/SUNWsmbadocu/prototype_i386
usr/src/pkgdefs/SUNWsmbadocu/prototype_sparc
usr/src/pkgdefs/SUNWsmbar/Makefile
usr/src/pkgdefs/SUNWsmbar/copyright
usr/src/pkgdefs/SUNWsmbar/preinstall
usr/src/pkgdefs/SUNWsmbar/prototype_com
usr/src/pkgdefs/SUNWsmbar/prototype_i386
usr/src/pkgdefs/SUNWsmbar/prototype_sparc
usr/src/pkgdefs/SUNWsmbau/copyright
usr/src/pkgdefs/SUNWsmbau/depend
usr/src/pkgdefs/SUNWsmbau/prototype_com
usr/src/pkgdefs/SUNWsmbau/prototype_i386
usr/src/pkgdefs/SUNWsmbau/prototype_sparc
usr/src/pkgdefs/etc/exception_list_i386
usr/src/pkgdefs/etc/exception_list_sparc
usr/src/tools/exception_list.check-deps
--- a/usr/src/Targetdirs	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/Targetdirs	Sat Aug 21 11:47:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Targetdirs	1.255	10/07/09 SMI"
+# ident	"@(#)Targetdirs	1.257	10/08/05 SMI"
 #
 
 #
@@ -409,6 +409,7 @@
 	/usr/lib/python2.6/vendor-packages/zenmapCore \
 	/usr/lib/python2.6/vendor-packages/zenmapGUI \
 	/usr/lib/quilt \
+	/usr/lib/samba \
 	/usr/lib/sane \
 	/usr/lib/security \
 	/usr/lib/slib \
@@ -726,8 +727,6 @@
 	/usr/sbin \
 	/usr/sbin/$(MACH64) \
 	/usr/sfw \
-	/usr/sfw/sbin \
-	/usr/sfw/swat \
 	/usr/sfw/bin \
 	/usr/sfw/include \
 	/usr/sfw/lib \
@@ -819,7 +818,6 @@
 	/usr/sfw/share/man/man1 \
 	/usr/sfw/share/man/man1m \
 	/usr/sfw/share/man/man3 \
-	/usr/sfw/share/man/man4 \
 	/usr/sfw/share/man/man7 \
 	/usr/sfw/share/man/man8 \
 	/usr/sfw/share/src \
@@ -1187,6 +1185,8 @@
 	/usr/share/quilt \
 	/usr/share/quilt/compat \
 	/usr/share/quilt/scripts \
+	/usr/share/samba \
+	/usr/share/samba/swat \
 	/usr/share/screen \
 	/usr/share/screen/utf8encodings \
 	/usr/share/stdcxx4 \
--- a/usr/src/cmd/bind/METADATA	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/bind/METADATA	Sat Aug 21 11:47:07 2010 -0700
@@ -1,10 +1,10 @@
 NAME:		  bind
-VERSION:	  9.6.1-P3
+VERSION:	  9.6.2-P2
 DESCRIPTION:	  Berkeley Internet Name Domain server and utilities
 LICENSE:	  ISC
 PACKAGE:	  SUNWbind SUNWbindc SUNWbindr
 PROJECT_URL:	  http://www.isc.org/software/bind
-SOURCE_DOWNLOAD:  http://ftp.isc.org/isc/bind9/9.6.1-P3/bind-9.6.1-P3.tar.gz
+SOURCE_DOWNLOAD:  http://ftp.isc.org/isc/bind9/9.6.2-P2/bind-9.6.2-P2.tar.gz
 SUPPORT:	  B
 BUGTRAQ:	  solaris/network/dns
 OSR:		  11725
--- a/usr/src/cmd/bind/Makefile.sfw	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/bind/Makefile.sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -23,23 +23,20 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#pragma ident	"@(#)Makefile.sfw	1.23	10/04/15 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.24	10/08/04 SMI"
 #
 
 VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 
 TARBALL =	$(VER).tar.gz
 
-#
 # Environment settings.
-#
-TARGET_ENV =	CC="$(CC)" CXX="$(CCC)"
-TARGET_ENV +=	PATH="$(SFW_PATH)"
-TARGET_ENV +=	LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk"
-TARGET_ENV +=	LDFLAGS="-L$(ROOTLIB)/dns"
-TARGET_ENV +=   MAKE="$(CCSMAKE)"
-$(VER)/config.status:= \
-	TARGET_ENV += LD_LIBRARY_PATH="$(CFGLIB)/dns"
+CONFIGURE_ENV = 	CC='$(CC)' CXX='$(CCC)'
+CONFIGURE_ENV +=	PATH='$(SFW_PATH)'
+CONFIGURE_ENV +=	LD_OPTIONS='-M $(SRC)/cmd/mapfile_noexstk'
+CONFIGURE_ENV +=	LDFLAGS='-L$(ROOTLIB)/dns'
+CONFIGURE_ENV +=	MAKE='$(CCSMAKE)'
+CONFIGURE_ENV +=	LD_LIBRARY_PATH='$(CFGLIB)/dns'
 
 # Ideally no patches should be required, where they are needed for a
 # release they should be incorporated or obsoleted in the next ISC
@@ -49,41 +46,25 @@
 
 include ../Makefile.cmd
 
-# the ISC tarball is not /usr/bin/tar-friendly
+# The ISC tarball is not /usr/bin/tar friendly.
 $(VER)/.patched:= UNPACKARCHIVE=$(GTAR) xfz
 
-# CONFIGARGS is printed by 'named -V' and logged at startup too.
+# CONFIGARGS is printed by 'named -V' and logged at start-up.  It is
+# overridden here to prevent the long path names appearing from CC,
+# LDFLAGS and CXX.
 all: $(VER)/config.status
 	(cd $(VER); pwd;\
-	    env - $(TARGET_ENV) $(CCSMAKE) -e \
-	    CONFIGARGS='$(CONFIGURE_OPTIONS)')
-
-#
-# test & fulltest.  The latter configures IP addresses.
-#
-config_ip=$(POUND_SIGN)
-fulltest := config_ip = cd $(VER); $(SHELL) ./bin/tests/system/ifconfig.sh
+	    $(env) - PATH='$(SFW_PATH)' EXT_CFLAGS='$(CFLAGS)' $(CCSMAKE) -e \
+		CONFIGARGS="$(CONFIGURE_OPTIONS)")
 
-test fulltest: all
-	-$(config_ip) up
-	-(cd $(VER); pwd; env \
-	    PATH=$(SFW_PATH) \
-	    MAKE=$(CCSMAKE) \
-	    $(CCSMAKE) -e test)
-	-$(config_ip) down
-
-#
-# Install binaries included in package into ROOT
-#
-install: all
-	$(SH) ./install-bind $(VER)
-
+# The openssl version check is disabled as we rely on dynamic SSL library
+# which is independent of BIND.
 CONFIGURE_OPTIONS +=	--with-libtool
 CONFIGURE_OPTIONS +=	--bindir=$(CFGBIN)
 CONFIGURE_OPTIONS +=	--sbindir=$(CFGUSRSBIN)
-CONFIGURE_OPTIONS +=	--libdir="$(CFGLIB)/dns"
-CONFIGURE_OPTIONS +=	--sysconfdir="/etc"
-CONFIGURE_OPTIONS +=	--localstatedir="/var"
+CONFIGURE_OPTIONS +=	--libdir=$(CFGLIB)/dns
+CONFIGURE_OPTIONS +=	--sysconfdir=/etc
+CONFIGURE_OPTIONS +=	--localstatedir=/var
 CONFIGURE_OPTIONS +=	--with-openssl
 CONFIGURE_OPTIONS +=	--enable-threads=yes
 CONFIGURE_OPTIONS +=	--enable-devpoll=yes
@@ -92,14 +73,53 @@
 CONFIGURE_OPTIONS +=	--disable-getifaddrs
 
 # Configure BIND ready for compilation.
-# The openssl version check is disabled as we rely on dynamic SSL library
-# which is independent of BIND.
 $(VER)/config.status: $(VER)/$(SFW_STAMP_PATCHED)
-	(cd $(VER); pwd; env - $(TARGET_ENV) \
+	(cd $(VER); pwd; $(env) - $(CONFIGURE_ENV) \
 		$(SHELL) ./configure $(CONFIGURE_OPTIONS) )
 
+# Install deliverables into ROOT.
+install: all
+	$(SH) ./install-bind $(VER)
+
+# test & fulltest.  The latter configures IP addresses 10.53.0.1
+# through 10.53.0.5 as aliases on the loopback interface.
+# The default task is to display summary from cache file if it exists.
+# To force a new test either use clean target first or specify FRC=FRC.
+#
+# Nawk script reads ISC output which is of the form:
+# /^T:/ = Start of a test, 
+# /^I:/ = info from a test;  collect in case test did not PASS...
+# /^R:/ = Result. If 'PASS' then continue, else print line and collected info.
+# @ EOF = Display count of RESULTS: i.e. R:PASS=124 R:UNTESTED=26 Total=150
+config_ip=$(POUND_SIGN)
+fulltest := config_ip = cd $(VER); $(SHELL) ./bin/tests/system/ifconfig.sh
+cache_str=I: $(VER) CACHED RESULTS from
+
+test fulltest:  all $$@.$(MACH).results
+	@$(ECHO) 'Sumary of results from $@.$(MACH).results'
+	@$(nawk) '\
+	     /^T:/{name=$$0;info="";}\
+	     /^I:/ {info=sprintf("%s%s\n", info, $$0);}\
+	     /^R:/ {test++; result[$$1]++;}\
+	     /^R:PASS/{next;}\
+	     /^R:/{printf("%s: %s\n%s\n", $$1, name, info);}\
+	     END{for (item in result) printf("%s=%d ", item, result[item]);\
+		 printf("Total=%d\n",test);\
+	     }' $@.$(MACH).results
+	@$(tail) -1 $@.$(MACH).results | $(GREP) '^$(cache_str)' || \
+		$(ECHO) '$(cache_str)' `$(date)` >> $@.$(MACH).results
+
+test.$(MACH).results fulltest.$(MACH).results: $(FRC)
+	-$(config_ip) up
+	-(cd $(VER); pwd; $(env) \
+	    PATH=$(SFW_PATH) \
+	    MAKE=$(CCSMAKE) \
+	    $(CCSMAKE) -e test) 2>&1 | $(tee) $@
+	-$(config_ip) down
+
 clean:
-	-$(RM) -r ${VER}
+	$(RM) -r ./$(VER)
+	$(RM) test.$(MACH).results fulltest.$(MACH).results
 
 prog=	dig dnssec-dsfromkey dnssec-keyfromlabel dnssec-keygen dnssec-signzone \
 	host in.named named named-checkconf named-checkzone ndc nslookup \
@@ -108,6 +128,13 @@
 
 CLOBBERFILES=$(prog:%=$(ROOT)/usr/sbin/%) $(lib:%=$(ROOT)/usr/lib/dns/%.*)
 
+date=/usr/bin/date
+env=/usr/bin/env
+nawk=/usr/bin/nawk
+tail=/usr/bin/tail
+tee=/usr/bin/tee
+
 include ../Makefile.targ
 
 FRC:
+
Binary file usr/src/cmd/bind/bind-9.6.1-P3.tar.gz has changed
Binary file usr/src/cmd/bind/bind-9.6.2-P2.tar.gz has changed
--- a/usr/src/cmd/ntpd/METADATA	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/ntpd/METADATA	Sat Aug 21 11:47:07 2010 -0700
@@ -1,10 +1,10 @@
 NAME:		ntp-dev
-VERSION:	4.2.5p172
+VERSION:	4.2.5p200
 DESCRIPTION:	Network Time Protocol
 PACKAGE:	SUNWntpu SUNWntpr
 LICENSE:	BSD-like
 PROJECT_URL:	http://www.ntp.org/
-SOURCE_DOWNLOAD:	http://archive.ntp.org/ntp4/ntp-dev/ntp-dev-4.2.5p172.tar.gz
+SOURCE_DOWNLOAD:	http://archive.ntp.org/ntp4/ntp-dev/ntp-dev-4.2.5p200.tar.gz
 SUPPORT:	B
 BUGTRAQ:	solaris/network/ntp
 OSR:		6466
--- a/usr/src/cmd/ntpd/Makefile.sfw	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/ntpd/Makefile.sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -23,7 +23,7 @@
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)Makefile.sfw	1.2	10/04/15 SMI"
+#ident	"@(#)Makefile.sfw	1.3	10/07/30 SMI"
 #
 
 include ../Makefile.cmd
@@ -43,6 +43,7 @@
 CONFIGURE_OPTIONS +=	--enable-debug-timing
 CONFIGURE_OPTIONS +=	--disable-optional-args
 CONFIGURE_OPTIONS +=	--enable-parse-clocks
+CONFIGURE_OPTIONS +=	--enable-ignore-dns-errors
 CONFIGURE_OPTIONS +=	--without-ntpsnmpd
 CONFIGURE_OPTIONS +=	--without-lineeditlibs
 CONFIGURE_OPTIONS +=	--with-openssl-libdir=/lib
--- a/usr/src/cmd/ntpd/Patches/cve20093563.patch	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- ntpd/ntp_request.c.fcs	Thu Dec 31 15:12:40 2009
-+++ ntpd/ntp_request.c	Thu Dec 31 15:20:26 2009
-@@ -441,18 +441,20 @@
- #endif
- 
- 	/*
--	 * Do some sanity checks on the packet.  Return a format
--	 * error if it fails.
-+	 * Do some sanity checks on the packet.  Drop it if it is
-+	 * malformed or a response packet. Return a format
-+	 * error if it fails any other tests.
- 	 */
--	ec = 0;
--	if (   (++ec, ISRESPONSE(inpkt->rm_vn_mode))
--	    || (++ec, ISMORE(inpkt->rm_vn_mode))
-+	if (rbufp->recv_length < REQ_LEN_HDR ||
-+	    ISRESPONSE(inpkt->rm_vn_mode)) return;
-+	
-+	ec = 1;
-+	if (   (++ec, ISMORE(inpkt->rm_vn_mode))
- 	    || (++ec, INFO_VERSION(inpkt->rm_vn_mode) > NTP_VERSION)
- 	    || (++ec, INFO_VERSION(inpkt->rm_vn_mode) < NTP_OLDVERSION)
- 	    || (++ec, INFO_SEQ(inpkt->auth_seq) != 0)
- 	    || (++ec, INFO_ERR(inpkt->err_nitems) != 0)
- 	    || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
--	    || (++ec, rbufp->recv_length < REQ_LEN_HDR)
- 		) {
- 		msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
- 		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
--- a/usr/src/cmd/ntpd/Patches/dnsretry.patch	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- ntpd/ntp_intres.c.orig	Thu May 14 06:34:41 2009
-+++ ntpd/ntp_intres.c	Thu May 14 06:15:12 2009
-@@ -96,6 +96,7 @@
- static	volatile int resolve_timer = 0;
- 
- static	int resolve_value;	/* next value of resolve timer */
-+static  int maxresattempts = 7;
- 
- /*
-  * Big hack attack
-@@ -276,6 +277,7 @@
- 
- 			/* prepare retry, in case there's more work to do */
- 			resolve_timer = resolve_value;
-+			maxresattempts--;
- #ifdef DEBUG
- 			if (debug > 2)
- 				msyslog(LOG_INFO, "resolve_timer: 0->%d", resolve_timer);
-@@ -554,11 +556,7 @@
- 		case EAI_AGAIN:
- 			return (1);
- 		case EAI_NONAME:
--#ifndef FORCE_DNSRETRY
--			return (0);
--#else
--			return (1);
--#endif
-+			return((maxresattempts > 0));
- #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
- 		case EAI_NODATA:
- #endif
--- a/usr/src/cmd/ntpd/Patches/etcfix.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/ntpd/Patches/etcfix.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -70,7 +70,7 @@
  #  define	ALT_CONFIG_FILE "%windir%\\ntp.ini"
 --- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
 +++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
-@@ -1141,7 +1141,7 @@
+@@ -1188,7 +1188,7 @@
  
  	FILE	*fd;
  	char	*cp, *cc, *ca, line[100], units[2], device[20], Msg[160], **cpp;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Patches/mc.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,19 @@
+*** ntpd/ntp_io.c.orig	Fri Jul 30 06:57:58 2010
+--- ntpd/ntp_io.c	Fri Jul 30 06:58:46 2010
+***************
+*** 1869,1875 ****
+  
+  	case AF_INET:
+  		if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF,
+! 			       (char *)NSRCADR(&iface->sin),
+  			       sizeof(NSRCADR(&iface->sin)))) {
+  
+  			msyslog(LOG_ERR,
+--- 1869,1875 ----
+  
+  	case AF_INET:
+  		if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF,
+! 			       (void *)&NSRCADR(&iface->sin),
+  			       sizeof(NSRCADR(&iface->sin)))) {
+  
+  			msyslog(LOG_ERR,
--- a/usr/src/cmd/ntpd/Patches/mdns.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/ntpd/Patches/mdns.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -1,6 +1,6 @@
---- ntpd/ntpd-opts.c.orig	Thu May 14 06:34:41 2009
-+++ ntpd/ntpd-opts.c	Thu May 14 06:15:13 2009
-@@ -237,6 +237,24 @@
+--- ntpd/ntpd-opts.c.orig	Thu Jul 29 09:29:51 2010
++++ ntpd/ntpd-opts.c	Thu Jul 29 09:43:40 2010
+@@ -243,6 +243,24 @@
  #define NOVIRTUALIPS_FLAGS       (OPTST_DISABLED)
  
  /*
@@ -25,7 +25,7 @@
   *  Modifymmtimer option description:
   */
  #ifdef SYS_WINNT
-@@ -632,10 +650,22 @@
+@@ -673,10 +691,22 @@
       /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -50,7 +50,7 @@
       /* opt state flags  */ MODIFYMMTIMER_FLAGS, 0,
       /* last opt argumnt */ { NULL },
       /* arg list/cookie  */ NULL,
-@@ -644,8 +674,8 @@
+@@ -685,8 +715,8 @@
       /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -61,7 +61,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ NOFORK_FLAGS, 0,
-@@ -656,8 +686,8 @@
+@@ -697,8 +727,8 @@
       /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -72,7 +72,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ NICE_FLAGS, 0,
-@@ -668,8 +698,8 @@
+@@ -709,8 +739,8 @@
       /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -83,7 +83,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ PIDFILE_FLAGS, 0,
-@@ -680,8 +710,8 @@
+@@ -721,8 +751,8 @@
       /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -94,7 +94,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ PRIORITY_FLAGS, 0,
-@@ -692,8 +722,8 @@
+@@ -733,8 +763,8 @@
       /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -105,7 +105,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ QUIT_FLAGS, 0,
-@@ -704,8 +734,8 @@
+@@ -745,8 +775,8 @@
       /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -116,7 +116,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ PROPAGATIONDELAY_FLAGS, 0,
-@@ -716,8 +746,8 @@
+@@ -757,8 +787,8 @@
       /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -127,7 +127,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ STATSDIR_FLAGS, 0,
-@@ -728,8 +758,8 @@
+@@ -769,8 +799,8 @@
       /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -138,7 +138,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, NOLIMIT, 0,
       /* opt state flags  */ TRUSTEDKEY_FLAGS, 0,
-@@ -740,8 +770,8 @@
+@@ -781,8 +811,8 @@
       /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -149,7 +149,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ USER_FLAGS, 0,
-@@ -752,8 +782,8 @@
+@@ -793,8 +823,8 @@
       /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -160,7 +160,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ UPDATEINTERVAL_FLAGS, 0,
-@@ -764,8 +794,8 @@
+@@ -805,8 +835,8 @@
       /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -171,7 +171,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, NOLIMIT, 0,
       /* opt state flags  */ VAR_FLAGS, 0,
-@@ -776,8 +806,8 @@
+@@ -817,8 +847,8 @@
       /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -182,7 +182,7 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, NOLIMIT, 0,
       /* opt state flags  */ DVAR_FLAGS, 0,
-@@ -788,8 +818,8 @@
+@@ -829,8 +859,8 @@
       /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name,
       /* disablement strs */ NULL, NULL },
  
@@ -193,33 +193,27 @@
       /* equivalenced to  */ NO_EQUIVALENT,
       /* min, max, act ct */ 0, 1, 0,
       /* opt state flags  */ SLEW_FLAGS, 0,
-@@ -899,7 +929,7 @@
-       NO_EQUIVALENT /* index of '-#' option */,
+@@ -967,7 +997,7 @@
+       NO_EQUIVALENT, /* '-#' option index */
        NO_EQUIVALENT /* index of default opt */
      },
--    32 /* full option count */, 29 /* user option count */
-+    33 /* full option count */, 30 /* user option count */
+-    34 /* full option count */, 31 /* user option count */,
++    35 /* full option count */, 32 /* user option count */,
+     ntpd_full_usage, ntpd_short_usage,
+     NULL, NULL
  };
- 
- /*
---- ntpd/ntpd.c.orig	Thu May 14 06:34:41 2009
-+++ ntpd/ntpd.c	Thu May 14 06:15:13 2009
-@@ -160,6 +160,14 @@
+--- ntpd/ntpd.c.orig	Wed Aug 12 04:07:05 2009
++++ ntpd/ntpd.c	Thu Jul 29 09:48:44 2010
+@@ -166,7 +166,7 @@
+  * after we have synched the first time. If the attempt fails, then try again once per 
+  * minute for up to 5 times. After all, we may be starting before mDNS.
   */
- int nofork = 0;			/* Fork by default */
+-int mdnsreg = 1;
++int mdnsreg = 0;
+ int mdnstries = 5;
+ #endif  /* HAVE_DNSREGISTRATION */
  
-+/*
-+ * mDNS registration flag. If set, we attempt to register with the mDNS system, but only
-+ * after we have synched the first time. If the attempt fails, then try again once per 
-+ * minute for up to 5 times. After all, we may be starting before mDNS.
-+ */
-+int mdnsreg = 0;
-+int mdnstries = 5;
-+
- #ifdef HAVE_DROPROOT
- int droproot = 0;
- char *user = NULL;		/* User to switch to */
-@@ -527,6 +535,9 @@
+@@ -540,6 +540,9 @@
  	if (HAVE_OPT( NOVIRTUALIPS ))
  		listen_to_virtual_ips = 0;
  
@@ -229,95 +223,59 @@
  	/*
  	 * Limit specific interfaces
  	 */
-@@ -840,13 +851,6 @@
- 	loop_config(LOOP_DRIFTCOMP, old_drift);
- 	initializing = 0;
- 
--#ifdef HAVE_DNSREGISTRATION
--	msyslog(LOG_INFO, "Attemping to register mDNS");
--	if ( DNSServiceRegister (&mdns, 0, 0, NULL, "_ntp._udp", NULL, NULL, htons(NTP_PORT), 0, NULL, NULL, NULL) != kDNSServiceErr_NoError ) {
--		msyslog(LOG_ERR, "Unable to register mDNS");
--	}
--#endif
--
- #ifdef HAVE_DROPROOT
- 	if( droproot ) {
- 		/* Drop super-user privileges and chroot now if the OS supports this */
-@@ -1148,6 +1152,25 @@
- 		/*
- 		 * Go around again
- 		 */
-+
-+#ifdef HAVE_DNSREGISTRATION
-+		if (mdnsreg && (current_time - mdnsreg ) > 60 && mdnstries && sys_leap != LEAP_NOTINSYNC) {
-+			mdnsreg = current_time;
-+			msyslog(LOG_INFO, "Attemping to register mDNS");
-+			if ( DNSServiceRegister (&mdns, 0, 0, NULL, "_ntp._udp", NULL, NULL, 
-+			    htons(NTP_PORT), 0, NULL, NULL, NULL) != kDNSServiceErr_NoError ) {
-+				if (!--mdnstries) {
-+					msyslog(LOG_ERR, "Unable to register mDNS, giving up.");
-+				} else {	
-+					msyslog(LOG_INFO, "Unable to register mDNS, will try later.");
-+				}
-+			} else {
-+				msyslog(LOG_INFO, "mDNS service registered.");
-+				mdnsreg = 0;
-+			}
-+		}
-+#endif /* HAVE_DNSREGISTRATION */
-+
- 	}
- 	UNBLOCK_IO_AND_ALARM();
- 	return 1;
---- ntpd/ntpd-opts.h.orig	Thu May 14 06:34:41 2009
-+++ ntpd/ntpd-opts.h	Thu May 14 06:15:13 2009
-@@ -67,26 +67,27 @@
-         INDEX_OPT_KEYFILE          = 12,
-         INDEX_OPT_LOGFILE          = 13,
-         INDEX_OPT_NOVIRTUALIPS     = 14,
--        INDEX_OPT_MODIFYMMTIMER    = 15,
--        INDEX_OPT_NOFORK           = 16,
--        INDEX_OPT_NICE             = 17,
--        INDEX_OPT_PIDFILE          = 18,
--        INDEX_OPT_PRIORITY         = 19,
--        INDEX_OPT_QUIT             = 20,
--        INDEX_OPT_PROPAGATIONDELAY = 21,
--        INDEX_OPT_STATSDIR         = 22,
--        INDEX_OPT_TRUSTEDKEY       = 23,
--        INDEX_OPT_USER             = 24,
--        INDEX_OPT_UPDATEINTERVAL   = 25,
--        INDEX_OPT_VAR              = 26,
--        INDEX_OPT_DVAR             = 27,
--        INDEX_OPT_SLEW             = 28,
--        INDEX_OPT_VERSION          = 29,
--        INDEX_OPT_HELP             = 30,
--        INDEX_OPT_MORE_HELP        = 31
-+	INDEX_OPT_MDNS             = 15,
-+        INDEX_OPT_MODIFYMMTIMER    = 16,
-+        INDEX_OPT_NOFORK           = 17,
-+        INDEX_OPT_NICE             = 18,
-+        INDEX_OPT_PIDFILE          = 19,
-+        INDEX_OPT_PRIORITY         = 20,
-+        INDEX_OPT_QUIT             = 21,
-+        INDEX_OPT_PROPAGATIONDELAY = 22,
-+        INDEX_OPT_STATSDIR         = 23,
-+        INDEX_OPT_TRUSTEDKEY       = 24,
-+        INDEX_OPT_USER             = 25,
-+        INDEX_OPT_UPDATEINTERVAL   = 26,
-+        INDEX_OPT_VAR              = 27,
-+        INDEX_OPT_DVAR             = 28,
-+        INDEX_OPT_SLEW             = 29,
-+        INDEX_OPT_VERSION          = 30,
-+        INDEX_OPT_HELP             = 31,
-+        INDEX_OPT_MORE_HELP        = 32
+--- ntpd/ntpd-opts.h.orig	Wed Aug 12 04:42:23 2009
++++ ntpd/ntpd-opts.h	Thu Jul 29 09:39:13 2010
+@@ -67,28 +67,29 @@
+     INDEX_OPT_KEYFILE           = 12,
+     INDEX_OPT_LOGFILE           = 13,
+     INDEX_OPT_NOVIRTUALIPS      = 14,
+-    INDEX_OPT_MODIFYMMTIMER     = 15,
+-    INDEX_OPT_NOFORK            = 16,
+-    INDEX_OPT_NICE              = 17,
+-    INDEX_OPT_PIDFILE           = 18,
+-    INDEX_OPT_PRIORITY          = 19,
+-    INDEX_OPT_QUIT              = 20,
+-    INDEX_OPT_PROPAGATIONDELAY  = 21,
+-    INDEX_OPT_STATSDIR          = 22,
+-    INDEX_OPT_TRUSTEDKEY        = 23,
+-    INDEX_OPT_USER              = 24,
+-    INDEX_OPT_UPDATEINTERVAL    = 25,
+-    INDEX_OPT_VAR               = 26,
+-    INDEX_OPT_DVAR              = 27,
+-    INDEX_OPT_SLEW              = 28,
+-    INDEX_OPT_USEPCC            = 29,
+-    INDEX_OPT_PCCFREQ           = 30,
+-    INDEX_OPT_VERSION           = 31,
+-    INDEX_OPT_HELP              = 32,
+-    INDEX_OPT_MORE_HELP         = 33
++    INDEX_OPT_MDNS              = 15,
++    INDEX_OPT_MODIFYMMTIMER     = 16,
++    INDEX_OPT_NOFORK            = 17,
++    INDEX_OPT_NICE              = 18,
++    INDEX_OPT_PIDFILE           = 19,
++    INDEX_OPT_PRIORITY          = 20,
++    INDEX_OPT_QUIT              = 21,
++    INDEX_OPT_PROPAGATIONDELAY  = 22,
++    INDEX_OPT_STATSDIR          = 23,
++    INDEX_OPT_TRUSTEDKEY        = 24,
++    INDEX_OPT_USER              = 25,
++    INDEX_OPT_UPDATEINTERVAL    = 26,
++    INDEX_OPT_VAR               = 27,
++    INDEX_OPT_DVAR              = 28,
++    INDEX_OPT_SLEW              = 29,
++    INDEX_OPT_USEPCC            = 30,
++    INDEX_OPT_PCCFREQ           = 31,
++    INDEX_OPT_VERSION           = 32,
++    INDEX_OPT_HELP              = 33,
++    INDEX_OPT_MORE_HELP         = 34
  } teOptIndex;
  
--#define OPTION_CT    32
-+#define OPTION_CT    33
- #define NTPD_VERSION       "4.2.5p172"
- #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p172"
+-#define OPTION_CT    34
++#define OPTION_CT    35
+ #define NTPD_VERSION       "4.2.5p200"
+ #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p200"
  
-@@ -175,6 +176,10 @@
+@@ -177,6 +178,10 @@
  #  warning undefining NOVIRTUALIPS due to option name conflict
  #  undef   NOVIRTUALIPS
  # endif
@@ -328,7 +286,7 @@
  # ifdef    MODIFYMMTIMER
  #  warning undefining MODIFYMMTIMER due to option name conflict
  #  undef   MODIFYMMTIMER
-@@ -247,6 +252,7 @@
+@@ -257,6 +262,7 @@
  # undef KEYFILE
  # undef LOGFILE
  # undef NOVIRTUALIPS
@@ -336,7 +294,7 @@
  # undef MODIFYMMTIMER
  # undef NOFORK
  # undef NICE
-@@ -289,6 +295,9 @@
+@@ -302,6 +308,9 @@
  #define VALUE_OPT_KEYFILE        'k'
  #define VALUE_OPT_LOGFILE        'l'
  #define VALUE_OPT_NOVIRTUALIPS   'L'
@@ -346,7 +304,7 @@
  #ifdef SYS_WINNT
  #define VALUE_OPT_MODIFYMMTIMER  'M'
  #endif /* SYS_WINNT */
-@@ -306,8 +315,8 @@
+@@ -319,8 +328,8 @@
  #endif /* HAVE_DROPROOT */
  #define VALUE_OPT_UPDATEINTERVAL 'U'
  #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt)
@@ -355,5 +313,5 @@
 +#define VALUE_OPT_VAR            27
 +#define VALUE_OPT_DVAR           28
  #define VALUE_OPT_SLEW           'x'
- 
- #define VALUE_OPT_VERSION       INDEX_OPT_VERSION
+ #ifdef SYS_WINNT
+ #define VALUE_OPT_USEPCC         29
--- a/usr/src/cmd/ntpd/Patches/noextra.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/ntpd/Patches/noextra.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -9,7 +9,7 @@
  ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP YACC VPATH_HACK_TRUE VPATH_HACK_FALSE LIBOPTS_DIR INSTALL_LIBOPTS_TRUE INSTALL_LIBOPTS_FALSE NEED_LIBOPTS_TRUE NEED_LIBOPTS_FALSE LIBOPTS_LDADD LIBOPTS_CFLAGS BINSUBDIR subdirs ARLIB_DIR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL PATH_SH PATH_PERL PATH_NET_SNMP_CONFIG EDITLINE_LIBS HAVE_INLINE LIBPARSE MAKE_LIBPARSE MAKE_LIBPARSE_KERNEL MAKE_CHECK_Y2K OPENSSL OPENSSL_INC OPENSSL_LIB LCRYPTO EF_PROGS EF_LIBS MAKE_CHECK_LAYOUT TESTDCF DCFD MAKE_PARSEKMODULE PROPDELAY CHUTEST CLKTEST MAKE_ADJTIMED MAKE_NTPTIME MAKE_TICKADJ MAKE_TIMETRIM MAKE_LIBNTPSIM MAKE_NTPDSIM SNMP_LIBS SNMP_CPPFLAGS SNMP_CFLAGS MAKE_NTPSNMPD LSCF LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
-@@ -47422,11 +47420,9 @@
+@@ -48060,11 +48058,9 @@
  
  
  
--- a/usr/src/cmd/ntpd/Patches/timing.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/ntpd/Patches/timing.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -1,6 +1,6 @@
 --- ntpd/ntp_proto.c.orig	Thu May 14 06:34:42 2009
 +++ ntpd/ntp_proto.c	Thu May 14 06:15:13 2009
-@@ -1632,6 +1632,16 @@
+@@ -1629,6 +1629,16 @@
  	char	*fmri;
  #endif /* HAVE_LIBSCF_H */
  
Binary file usr/src/cmd/ntpd/ntp-dev-4.2.5p172.tar.gz has changed
Binary file usr/src/cmd/ntpd/ntp-dev-4.2.5p200.tar.gz has changed
--- a/usr/src/cmd/samba/METADATA	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/samba/METADATA	Sat Aug 21 11:47:07 2010 -0700
@@ -1,28 +1,40 @@
-NAME:             Samba
-VERSION:          3.0.37
+NAME:             samba
+VERSION:          3.5.4
 DESCRIPTION:      CIFS volume and printing server
-LICENSE:          GPLv2
+LICENSE:          GPLv3
 PACKAGE:          SUNWsmbar SUNWsmbau
 PROJECT_URL:      http://www.samba.org
-SOURCE_DOWNLOAD:  http://www.samba.org/samba/ftp/stable/samba-3.0.37.tar.gz
-SUPPORT:          B
+SOURCE_DOWNLOAD:  http://us1.samba.org/samba/ftp/stable/samba-3.5.4.tar.gz
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/samba
-OSR:              11518
+OSR:              8443
 COMMENTS:         
 # Notes to libsam support:
 #
-# libsam is LGPLv2.1 library
+# libsam is LGPLv2.1+ library. It should be linked to samfs VFS-module.
 #
-# patch is orig. created by Michael Adam from Samba.org against samba-3.0.21
-# but it was not integrated into the samba 3.0.x branch because samba 3.0.x
-# is currently obsoleted. This patch was reviewed by Michael Adam and also
-# linking of the libsam library (LGPL) to samba is approved by Samba.org
-# community. Patch is already public.
+# moving to current samba (3.3.x and above) there is File-Off-Line flag
+# directly supported on the Samba VFS layer and need not to be emulated
+# via DOS-flag as in samba-3.0.x
 #
-# there are platform dependent changes against the original patch in
-# configure.in makefile.in ... to be built in SFW env.
-#
-# moving to current samba (3.3.x) there is File-Off-Line flag directly 
-# supported on the Samba VFS layer and need not to be emulated via
-# DOS-flag as in this patch
-#
+############################################################################
+#   Layout
+# bash-3.2$ env - /usr/ccs/bin/make -f Makefile-noincludes showlayout                     
+# Samba will be installed into:
+#   prefix:      /usr
+#   bindir:      /usr/bin
+#   sbindir:     /usr/sbin
+#   libdir:      /usr/lib/samba
+#   modulesdir:  /usr/lib/samba
+#   vardir:      /var/samba
+#   mandir:      /usr/share/man
+#   privatedir:  /etc/samba/private
+#   configdir:   /etc/samba
+#   lockdir:     /var/samba/locks
+#   statedir:    /var/samba/locks
+#   cachedir:    /var/samba/locks
+#   piddir:      /var/samba/locks
+#   swatdir:     /usr/share/samba/swat
+#   codepagedir: /usr/lib/samba
+############################################################################
+# 
--- a/usr/src/cmd/samba/Makefile.sfw	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/samba/Makefile.sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -18,65 +18,161 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.37	10/06/18 SMI"
-
-SAMBAVER=samba-3.0.37
+#ident	"@(#)Makefile.sfw	1.39	10/08/10 SMI"
+#
 
 include ../Makefile.cmd
 
-# Samba is failing being directly built by "dmake" so we have to work-around it
-MAKE = $(CCSMAKE)
+VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+VER64 =		$(VER)-64
+SAMBA30VER =	samba-3.0.37
+TARBALL =	$(VER).tar.gz
+PATCHES:sh =	echo Patches/*.diff
+
+DESTDIR=$(ROOT)
+
+# There are no 64 bits "avahi" libs
+LIBS   = -lrt -lsendfile -lsocket -lnsl
+LIBS32 = $(LIBS) -lavahi-common -lavahi-core
+LIBS64 = $(LIBS)
 
-all:	proto-exists .WAIT all-others
+CPPFLAGS += -I/usr/include/kerberosv5
+CPPFLAGS += -I$(ROOTINCLUDE)/ldap6
+CPPFLAGS += -I$(COMPONENT_TOP)/Solaris
+
+LDFLAGS32 = -L$(ROOTLIB) -R/usr/lib
+LDFLAGS32 += -R/usr/lib/samba
+LDFLAGS32 += $(LIBS32)
+
+LDFLAGS64 = -L$(ROOTLIB64) -R/usr/lib/$(MACH64)
+LDFLAGS64 += -R/usr/lib/samba/$(MACH64)
+LDFLAGS64 += $(LIBS64)
+
+LDFLAGS += -L$(COMPONENT_TOP)
+LDFLAGS += -M $(SRC)/cmd/mapfile_noexstk
 
-proto-exists: $(SAMBAVER)/source/config.status
-	(cd $(SAMBAVER)/source; $(MAKE) proto_exists )
-	@find . -name core -type f | xargs rm -f
+#       configure(1) options to use
+# default:	--prefix=/usr
+#		--mandir=/usr/share/man
+# are set in Makefile.master
+# use the targets "SHOWFLAGS" and "showlayout" to check
+# after the configure
+CONFIGURE32_OPTIONS +=	--libdir=/usr/lib/samba
+CONFIGURE64_OPTIONS +=	--libdir=/usr/lib/samba/64
+CONFIGURE_OPTIONS +=	--includedir=/usr/include/samba
+CONFIGURE_OPTIONS +=	--sysconfdir=/etc/samba
+CONFIGURE_OPTIONS +=	--with-configdir=/etc/samba
+CONFIGURE_OPTIONS +=	--with-privatedir=/etc/samba/private
+CONFIGURE_OPTIONS +=	--with-swatdir=/usr/share/samba/swat
+CONFIGURE_OPTIONS +=	--localstatedir=/var/samba
+CONFIGURE_OPTIONS +=	--with-lockdir=/var/samba/locks
+CONFIGURE_OPTIONS +=	--with-piddir=/var/samba/locks
+CONFIGURE_OPTIONS +=	--with-logfilebase=/var/samba/log
+CONFIGURE_OPTIONS +=	--enable-shared=yes
+CONFIGURE_OPTIONS +=	--enable-static=no
+CONFIGURE_OPTIONS +=	--with-shared-modules=vfs_zfsacl,vfs_samfs,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+CONFIGURE_OPTIONS +=	--with-readline
+CONFIGURE_OPTIONS +=	--with-aio-support
+CONFIGURE_OPTIONS +=	--with-acl-support
+CONFIGURE_OPTIONS +=	--with-ads
+CONFIGURE_OPTIONS +=	--with-ldap
+CONFIGURE_OPTIONS +=	--with-automount
+CONFIGURE_OPTIONS +=	--with-dnsupdate
+CONFIGURE_OPTIONS +=	--with-pam
+CONFIGURE_OPTIONS +=	--with-winbind
 
-all-others:   $(SAMBAVER)/source/config.status
-	(cd $(SAMBAVER)/source; $(MAKE) all )
-	@find . -name core -type f | xargs rm -f
+#####################################################
+# in case of using the $(CCSMAKE) samba configure
+# generates the Makefile.in -> Makefile-noincludes.in
+# than it generated the Makefile-noincludes so the
+#   $(CCSMAKE) -f Makefile-noincludes ...
+# command should be used in such case
+TARGET_ENV +=	"MAKE=$(GMAKE)"
 
-install: all
-	# Install the samba SWAT documentation set and the dyn-load
-	# modules onto its proper locations using the install target
-	# in the samba's original Makefile.
-	mkdir prototmp
-	(cd $(SAMBAVER)/source; env INSTALLCMD=$(GINSTALL) \
-	    $(MAKE) install DESTDIR=$(SRC)/cmd/samba/prototmp )
-	#
-	# Create the temporary prototype file which is suitable to check
-	# if there are no changes in the list of the objects delivered
-	# by the samba.
-	-rm -fr prototmp/usr/sfw/lib/security
-	pkgproto prototmp | sed -e 's# prototmp/# #' \
-	 | sed -e 's/\.8\.html/.1m.html/;s/\.5\.html/.4.html/' \
-	 | sed -e "s/$(STAFFER)/root/;s/staff/bin/" \
-	 | sed -e '/^f /s/644 /444 /' \
-	 | sort -t " " -k 3 > samba-prototype2chk
-	-/bin/echo \
-	 '\ns none usr/sfw/swat/help/manpages/Samba.7.html=samba.7.html' \
-	   >> samba-prototype2chk
-	#
-	# install all of the samba objects into the $ROOT (proto) area
-	SAMBAVERS=$(SAMBAVER) \
-	SMBPROTOTMP=prototmp \
-	$(SH) ./install-sfw
-	#
-	# remove the temporary proto area
-	-rm -fr prototmp
+TARGET_ENV +=	"PERL=$(PERL)"
+TARGET_ENV +=	"PATH=$(SFW_PATH)"
+TARGET_ENV +=	"CUPS_CONFIG=$(ROOTBIN)/cups-config"
+TARGET_ENV +=	"INSTALLCMD=$(GINSTALL)"
+TARGET_ENV +=	"CPPFLAGS=$(CPPFLAGS)"
+TARGET_ENV +=	"LDAP_LIBS=-lldap60"
+TARGET_ENV +=	"INSTALL=$(INSTALL_PROTO)"
+TARGET_ENV +=	"SAMFS_LIBS=-R/opt/SUNWsamfs/lib -lsam"
+
+TARGET32_ENV +=	"CC=$(CC)"
+TARGET32_ENV +=	"CFLAGS=$(CFLAGS)"
+TARGET32_ENV +=	"LDFLAGS=$(LDFLAGS32) $(LDFLAGS)"
+TARGET32_ENV +=	"LIBS=$(LIBS32)"
+TARGET32_ENV += $(TARGET_ENV)
+
+TARGET64_ENV +=	"CC=$(CC64)"
+TARGET64_ENV +=	"CFLAGS=$(CFLAGS64)"
+TARGET64_ENV +=	"LDFLAGS=$(LDFLAGS64) $(LDFLAGS)"
+TARGET64_ENV +=	"LIBS=$(LIBS64)"
+TARGET64_ENV += $(TARGET_ENV)
+
+build:=		TARGET = showlayout everything
+build64:=	TARGET = ../nsswitch/libnss_winbind.so wins pam_winbind
+install:=	TARGET = install
+
+prebuild:
+	env
+	-touch .built
+
+all: prebuild build build64 docs-xml build30libsmbclient
 
-$(SAMBAVER)/source/config.status: $(SAMBAVER)/source/configure
-	(cd $(SAMBAVER)/source; env \
-	    PATH=$(SFW_PATH) \
-	    CC=$(CC) MAKE=$(MAKE) "CFLAGS=$(CFLAGS)" \
-	    "CPPFLAGS=-I${SRC}/cmd/samba/lib-fake/include $(CPPFLAGS)" \
-	    "LIBS=-lrt -lsocket -lnsl -lsunwrap" \
-	    "LDAP_LIBS=-lldap" \
-	    CUPS_CONFIG=$(ROOTBIN)/cups-config \
-	    "LDFLAGS=-L$(SRC)/cmd/samba/lib-fake/lib -L$(SRC)/cmd/samba $(LDFLAGS)" \
+#####################################################
+#
+# 32 bit version
+#
+#####################################################
+build $(VER)/source3/bin/smbd: $(VER)/source3/config.status
+	(cd $(VER)/source3 ; env - $(GMAKE) $(TARGET))
+	# Cripple man installation, since we want to install it by our way
+	echo exit > $(VER)/source3/script/installman.sh
+
+$(VER)/source3/config.status: libsam.so $(VER)/source3/configure
+	(cd $(VER)/source3/ ; env - $(TARGET32_ENV) ./configure $(CONFIGURE32_OPTIONS) $(CONFIGURE_OPTIONS))
+
+$(VER)/source3/configure: $(VER)/.patched
+	(cd $(VER)/source3/ ; $(SH) autogen.sh )
+
+
+#####################################################
+#
+# 64 bit version
+#
+#####################################################
+build64 $(VER64)/source3/bin/smbd: $(VER64)/source3/config.status
+	(cd $(VER64)/source3 ; env - $(GMAKE) $(TARGET))
+
+$(VER64)/source3/config.status: $(VER64)/source3/configure
+	(cd $(VER64)/source3/ ; env - $(TARGET64_ENV) ./configure $(CONFIGURE64_OPTIONS) $(CONFIGURE_OPTIONS))
+
+$(VER64)/source3/configure: $(VER64)/.patched
+	(cd $(VER64)/source3/ ; $(SH) autogen.sh )
+
+
+#####################################################
+#
+# libsmbclient
+#
+#####################################################
+build30libsmbclient $(SAMBA30VER)/source/bin/libsmbclient.so: $(SAMBA30VER)/source/config.status
+	(cd $(SAMBA30VER)/source; mkdir -p bin; env - $(GMAKE) libsmbclient )
+
+$(SAMBA30VER)/source/config.status: $(SAMBA30VER)/source/configure
+	(cd $(SAMBA30VER)/source; env - \
+	    "PATH=$(SFW_PATH)" \
+	    "CC=$(CC)" "MAKE=$(MAKE)" \
+	    "CPPFLAGS=-I$(ROOTINCLUDE)/ldap6 $(CPPFLAGS)" \
+	    "LDFLAGS=-L$(ROOTLIB) -M $(SRC)/cmd/mapfile_noexstk" \
+	    "LIBS=-lrt -lsocket -lnsl" \
+	    "LDAP_LIBS=-lldap60" \
+	    "CUPS_CONFIG=$(ROOTBIN)/cups-config" \
 	    ./configure --prefix=/usr/sfw \
 		--with-configdir=/etc/sfw \
 		--with-privatedir=/etc/sfw/private \
@@ -101,41 +197,58 @@
 		--with-samfs-support=yes \
 		--with-winbind)
 
-$(SAMBAVER)/source/configure: $(SAMBAVER)/source/configure.in
-	#touch $(SAMBAVER)/source/configure
-	#(cd $(SAMBAVER)/source ; /usr/sfw/bin/autoconf -I ./lib/replace -f )
-	(cd $(SAMBAVER)/source ; $(SH) autogen.sh )
+$(SAMBA30VER)/source/configure: $(SAMBA30VER)/source/configure.in
+	(cd $(SAMBA30VER)/source ; ./autogen.sh )
+
+$(SAMBA30VER)/source/configure.in: $(SAMBA30VER).tar.gz
+	gzip -dc $(SAMBA30VER).tar.gz | gtar xopf -
+	find $(SAMBA30VER) -type d | xargs chmod 755
+	(cd $(SAMBA30VER) ; gpatch -p1 < ../Solaris/configure.in-diff )
+	(cd $(SAMBA30VER) ; gpatch -p1 < ../samba-3.0.37-CVE-2010-2063.patch )
+	(cd $(SAMBA30VER) ; gpatch -p1 < ../login_cache-diff )
+
+
+#####################################################
+#
+# documentation
+#
+#####################################################
+docs-xml $(VER)/docs-xml/catalog.xml: $(VER)/source3/config.status
+	(cd $(VER) ; gzip -dc ../Solaris/docs-xml-built.tar.gz | tar xf - )
+
+#####################################################
+#
+# libsam
+#
+#####################################################
+libsam.so: Solaris/libsam.c
+	cd Solaris; $(CC) -G -Kpic -hlibsam.so libsam.c -o ../libsam.so
 
-$(SAMBAVER)/source/configure.in: $(SAMBAVER).tar.gz
-	gzip -dc $(SAMBAVER).tar.gz | gtar xopf -
-	find $(SAMBAVER) -type d | xargs chmod 755
-	(cd $(SAMBAVER) ; gpatch -p1 < ../samba-3.0.37-CVE-2010-2063.patch \
-	 ; gpatch -p1 < ../swat.c-diff \
-	 ; gpatch -p1 < ../configure.in-diff \
-	 ; gpatch -p1 < ../makefile.in-diff \
-	 ; gpatch -p1 < ../login_cache-diff \
-	 ; cp ../vfs_zfsacl.c source/modules/ )
-	# samfs support
-	(cd $(SAMBAVER) ; gpatch -p1 < ../samfs-configure.in-diff \
-	 ; gpatch -p1 < ../samfs-includes.h-diff \
-	 ; gpatch -p1 < ../samfs-makefile.in-diff \
-	 ; gpatch -p1 < ../samfs-param_loadparm.c-diff \
-	 ; gpatch -p1 < ../samfs-smbd_dosmode.c-diff \
-	 ; gpatch -p1 < ../samfs-smbd_service.c-diff \
-	 ; cp ../samfs.c source/smbd/ ; chmod 644 source/smbd/samfs.c )
-	# build of fake libsam library for lazy linking
-	# libsam-LGPL/include/pub/stat.h from LIBSAM is samfs_stat.h here
-	(  rm -fr lib-fake \
-	 ; mkdir -p lib-fake/lib \
-	 ; $(CC) -G -Kpic -hlibsam.so libsam.c -o libsam.so \
-	 ; mv libsam.so lib-fake/lib \
-	 ; mkdir -p lib-fake/include/samfs \
-	 ; cp samfs_stat.h lib-fake/include/samfs/stat.h )
-	$(MAKE) -f makefile-sunwrap all
+
+#####################################################
+#
+# install
+#
+#####################################################
+install: install-protofix
+	(cd $(ROOT); find usr/bin usr/sbin usr/lib/samba -name '*.old' -exec rm -f {} \; )
+
+install-target: all
+	(cd $(VER)/source3/ ; env - INSTALLCMD=$(GINSTALL) $(GMAKE) DESTDIR=$(DESTDIR) $(TARGET))
+	VER=$(VER) VER64=$(VER64) VER30=$(SAMBA30VER) MACH64=$(MACH64) $(SH) ./install-sfw
 
+install-protofix: install-target
+	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
+		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
+	done
+	
+
+#####################################################
+#
+# clean
+#
+#####################################################
 clean:
-	-rm -rf $(SAMBAVER) prototmp lib-fake
-	$(MAKE) -f makefile-sunwrap clean
-	-rm -f samba-prototype2chk
+	-rm -rf $(VER) $(VER64) $(SAMBA30VER) prototmp libsam.so .built
 
 include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/Makefile.in.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,22 @@
+--- source3/Makefile.in.orig	2009-07-03 04:21:14.000000000 -0700
++++ source3/Makefile.in	2009-09-01 07:36:38.949874725 -0700
+@@ -663,6 +663,8 @@
+ VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_acls.o
+ VFS_SOLARISACL_OBJ = modules/vfs_solarisacl.o
+ VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o modules/nfs4_acls.o
++VFS_SAMFS_OBJ = modules/vfs_samfs.o
++SAMFS_LIBS = -R/opt/SUNWsamfs/lib -zlazyload -lsam -znolazyload
+ VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
+ VFS_IRIXACL_OBJ = modules/vfs_irixacl.o
+ VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o
+@@ -2573,6 +2574,10 @@
+ 	@echo "Building plugin $@"
+ 	@$(SHLD_MODULE) $(VFS_ZFSACL_OBJ)
+ 
++bin/samfs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SAMFS_OBJ)
++	@echo "Building plugin $@"
++	@$(SHLD_MODULE) $(VFS_SAMFS_OBJ) $(SAMFS_LIBS)
++
+ bin/irixacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_IRIXACL_OBJ)
+ 	@echo "Building plugin $@"
+ 	@$(SHLD_MODULE) $(VFS_IRIXACL_OBJ)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/conf.in-nsldap.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,56 @@
+--- source3/configure.in	Mon Jan 18 12:38:09 2010
++++ source3/configure.in	Sat Mar 13 19:19:27 2010
+@@ -3063,6 +3063,20 @@
+     with_ldap_support=yes
+     AC_MSG_CHECKING(whether LDAP support is used)
+     AC_MSG_RESULT(yes)
++
++    ################################
++    # Check if the Netscape LDAP SDK
++    AC_CACHE_CHECK([for LDAP_OPT_SIZELIMIT macro],samba_cv_HAVE_LDAP_NSC,[
++    AC_TRY_COMPILE([
++#include <stdio.h>
++#include <ldap.h>],
++    [printf("%s\n", LDAP_OPT_SIZELIMIT);],
++    samba_cv_HAVE_LDAP_NSC=yes,samba_cv_HAVE_LDAP_NSC=no)])
++    if test x"$samba_cv_HAVE_LDAP_NSC" = x"yes"; then
++	AC_DEFINE(HAVE_HAVE_LDAP_NSC,1,
++		[Whether the LDAP API is Netscape SDK])
++    fi
++
+   else
+     if test x"$with_ldap_support" = x"yes"; then
+ 	AC_MSG_ERROR(libldap is needed for LDAP support)
+@@ -3125,15 +3139,25 @@
+     fi
+     ;;
+ 	*)
+-    AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
++    # Omit the ldap_initialize() test if there is a Netscape SDK
++    # (Mozilla Directory server 5)
++    if test x"$samba_cv_HAVE_LDAP_NSC" = x"no"; then
+ 
+-    if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
+-	if test x"$with_ads_support" = x"yes"; then
+-	    AC_MSG_ERROR(Active Directory support requires ldap_initialize)
+-	elif test x"$with_ads_support" = x"auto"; then
+-	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
+-	    with_ads_support=no
++	AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
++
++	if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
++	    if test x"$with_ads_support" = x"yes"; then
++		AC_MSG_ERROR(Active Directory support requires ldap_initialize)
++	    elif test x"$with_ads_support" = x"auto"; then
++		AC_MSG_WARN(Disabling Active Directory support (requires ldap_in
++itialize))
++		with_ads_support=no
++	    fi
++
+ 	fi
++     else
++	AC_MSG_RESULT(Active Directory support on Netscape LDAP SDK - limited fu
++nctionality?)
+     fi
+     ;;
+ esac
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/configure.in.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,33 @@
+--- source3/configure.in	Mon Jan 18 12:38:09 2010
++++ source3/configure.in	Sat Mar 13 19:19:27 2010
+@@ -3282,6 +3360,22 @@
+     fi
+   fi
+ 
++  if test x$FOUND_KRB5 = x"no"; then
++    #################################################
++    # see if this box has Solaris MIT kerberos implementation
++    AC_MSG_CHECKING(for Solaris MIT kerberos)
++    if test -x "$KRB5CONFIG" && $KRB5CONFIG --version | grep -s Solaris | grep -s MIT > /dev/null ; then
++	FOUND_KRB5=yes
++	KRB5_LIBS="`$KRB5CONFIG --libs | sed s/-lkrb5//`"
++	KRB5_LDFLAGS="-lkrb5 -lgss"
++	KRB5_CFLAGS="`$KRB5CONFIG --cflags`"
++	KRB5_CPPFLAGS="`$KRB5CONFIG --cflags`"
++	AC_MSG_RESULT(yes)
++    else
++      AC_MSG_RESULT(${KRB5CONFIG_VER_S})
++    fi
++  fi
++
+   ac_save_CFLAGS=$CFLAGS
+   ac_save_CPPFLAGS=$CPPFLAGS
+   ac_save_LDFLAGS=$LDFLAGS
+@@ -6313,6 +6353,7 @@
+ SMB_MODULE(vfs_preopen, \$(VFS_PREOPEN_OBJ), "bin/preopen.$SHLIBEXT", VFS)
+ SMB_MODULE(vfs_syncops, \$(VFS_SYNCOPS_OBJ), "bin/syncops.$SHLIBEXT", VFS)
+ SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
++SMB_MODULE(vfs_samfs, \$(VFS_SAMFS_OBJ), "bin/samfs.$SHLIBEXT", VFS)
+ SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", VFS)
+ SMB_MODULE(vfs_acl_xattr, \$(VFS_ACL_XATTR_OBJ), "bin/acl_xattr.$SHLIBEXT", VFS)
+ SMB_MODULE(vfs_acl_tdb, \$(VFS_ACL_TDB_OBJ), "bin/acl_tdb.$SHLIBEXT", VFS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/generate-file-list.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,14 @@
+--- docs-xml/smbdotconf/generate-file-list.sh	Sat Feb 20 01:12:25 2010
++++ docs-xml/smbdotconf/generate-file-list.sh	Mon Jan 18 03:38:09 2010
+@@ -9,7 +9,10 @@
+ cd $DIR
+ 
+ echo "<section xmlns:xi=\"http://www.w3.org/2003/XInclude\">"
+-for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs`
++
++#for I in `find . -mindepth 2 -type f -name '*.xml' | sort -t/ -k3 | xargs`
++# Remove lines containing just one slash
++for I in `find . -type f -name '*.xml' | grep -v '^[^/]*/[^/]*$' | sort -t/ -k3 | xargs`
+ do 
+ 	echo "<xi:include href='$I' parse='xml'/>"
+ done
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/lib-interfaces.c.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,11 @@
+--- source3/lib/interfaces.c	2010-07-07 02:27:50.253468600 -0700
++++ source3/lib/interfaces.c	2010-07-07 02:28:09.889882500 -0700
+@@ -172,7 +172,7 @@
+ 		ifaces[total].flags = ifptr->ifa_flags;
+ 
+ #if defined(HAVE_IPV6)
+-		if (ifptr->ifa_addr->sa_family == AF_INET6) {
++		if (ifptr->ifa_addr->ss_family == AF_INET6) {
+ 			copy_size = sizeof(struct sockaddr_in6);
+ 		}
+ #endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/lib-replace-test-getifaddrs.c.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,11 @@
+--- getifaddrs.c	2010-07-07 07:34:49.933019300 -0700
++++ lib/replace/test/getifaddrs.c	2010-07-07 07:35:15.850166600 -0700
+@@ -84,7 +84,7 @@
+ 					printf("NETMASK=%s", addrstring);
+ 				}
+ 			} else {
+-				printf("AF=%d ", ifs->ifa_addr->sa_family);
++				printf("AF=%d ", ifs->ifa_addr->ss_family);
+ 			}
+ 		} else {
+ 			printf("<no address>");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/libsmb_clikrb5.c.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,11 @@
+--- source3/libsmb/clikrb5.c	Mon Jan 18 12:38:09 2010
++++ source3/libsmb/clikrb5.c	Sat Mar 13 19:19:27 2010
+@@ -779,7 +779,7 @@
+ #endif
+ 
+ 	retval = krb5_mk_req_extended(context, auth_context, ap_req_options, 
+-				      &in_data, credsp, outbuf);
++				      /* &in_data */ NULL, credsp, outbuf);
+ 	if (retval) {
+ 		DEBUG(1,("ads_krb5_mk_req: krb5_mk_req_extended failed (%s)\n", 
+ 			 error_message(retval)));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/swat.c.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,26 @@
+--- source3/web/swat.c.orig	2009-07-03 04:21:14.000000000 -0700
++++ source3/web/swat.c	2009-09-01 07:39:04.758980165 -0700
+@@ -203,12 +203,12 @@
+ 	char *output;
+ 	if(strcmp(pLabel, pTranslated) != 0) {
+ 		output = talloc_asprintf(ctx,
+-		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
++		  "<A HREF=\"/swat/help/manpages/smb.conf.4.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
+ 		   pAnchor, pHelp, pLabel, pTranslated);
+ 		return output;
+ 	}
+ 	output = talloc_asprintf(ctx,
+-	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
++	  "<A HREF=\"/swat/help/manpages/smb.conf.4.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
+ 	  pAnchor, pHelp, pLabel);
+ 	return output;
+ }
+@@ -1257,7 +1257,7 @@
+         printf("<H3>%s</H3>\n", _("Important Note:"));
+         printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
+         printf("%s",_("are autoloaded printers from "));
+-        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
++        printf("<A HREF=\"/swat/help/smb.conf.4.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
+         printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
+ 
+ 	if (cgi_variable("Commit") && snum >= 0) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Patches/vfs_samfs.c.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,175 @@
+--- source3/modules/vfs_samfs.c	2010-07-07 10:22:33.756895700 -0700
++++ source3/modules/vfs_samfs.c	2010-07-07 07:13:55.603441200 -0700
+@@ -0,0 +1,172 @@
++/*
++ * Support for offline files with Sun SAM-QFS
++ *
++ * Copyright (C) Dirk Nitschke, 2009
++ *
++ * Modified by Jiri Sasek, 2010
++ * To conform the samba-vfs api
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#include "includes.h"
++/*
++ * Include files for Sun SAM-QFS
++ *
++ */
++#include "sam-stat.h"
++#include "sam-lib.h"
++
++#undef DBGC_CLASS
++#define DBGC_CLASS DBGC_VFS
++
++#define SAMFS_MODULE_NAME "samfs"
++
++NTSTATUS vfs_samfs_init(void);
++
++/*
++ * samfs_is_offline()
++ * check if the local file is offline in the sense of SAM-QFS
++ *
++ * A segmented file is offline if the file's index inode is
++ * offline or at least one of it's segments is offline.
++ *
++ * See sam_stat(3) and sam_segment_stat(3) for details.
++ *
++ * If something goes wrong we assume that the file is offline.
++ */
++static bool samfs_is_offline(struct vfs_handle_struct *handle, const char *path, SMB_STRUCT_STAT *sbuf)
++{
++	struct sam_stat file_info;
++	struct sam_stat *seg_info_ptr;
++	bool offline;
++	int number_of_segments;
++	int result;
++	int i;
++
++	offline = false;
++	if (ISDOT(path) || ISDOTDOT(path)) {
++		return false;
++	}
++
++	/*
++	 * Initialize file_info to be all zero bits
++	 */
++	memset((void *)&file_info, 0, sizeof(struct sam_stat));
++
++	/*
++	 * Stat the file using the regular sam_stat function
++	 */
++	result = sam_stat(path, &file_info, sizeof(struct sam_stat));
++
++	if (result != 0) {
++		DEBUG(10,("samfs_is_offline: cannot sam_stat %s, %s\nAssuming file is offline.\n", \
++				path, strerror(errno)));
++		return true;
++	}
++
++	/*
++	 * Check if file is offline
++	 */
++	if (SS_ISOFFLINE(file_info.attr)) {
++		DEBUG(10,("samfs_is_offline: file %s is offline.\n", path));
++		return true;
++	}
++
++	/*
++	 * Check for segmented file
++	 */
++	if (SS_ISSEGMENT_F(file_info.attr)) {
++		number_of_segments = NUM_SEGS(&file_info);
++		seg_info_ptr = (struct sam_stat *)malloc(number_of_segments *
++						sizeof(struct sam_stat));
++		if (seg_info_ptr != NULL) {
++			/*
++			 * Initialize seg_info_ptr to be all zero bits
++			 */
++			memset((void *)seg_info_ptr, 0, number_of_segments *
++					sizeof(struct sam_stat));
++			/*
++			 * Stat all segments
++			 */
++			result = sam_segment_stat(path, seg_info_ptr,
++					number_of_segments * sizeof(struct sam_stat));
++			if (result != 0) {
++				DEBUG(10,("samfs_is_offline: cannot sam_segment_stat %s, %s\nAssuming file is offline.\n", \
++						path, strerror(errno)));
++				offline = true;
++			}
++			/*
++			 * Loop over segments until we have checked all segments
++			 * or found one which is offline.
++			 */
++			i = 0;
++			while (!offline && (i < number_of_segments)) {
++				if (SS_ISOFFLINE(seg_info_ptr[i].attr)) {
++					DEBUG(10,("samfs_is_offline: file %s has offline segment %d\n", \
++							path, i+1));
++					offline = true;
++				}
++				i++;
++			}
++			SAFE_FREE(seg_info_ptr);
++		} else {
++			DEBUG(10,("samfs_is_offline: cannot malloc for segment stat info %s\nAssuming file is offline.\n", \
++					path));
++			offline = true;
++                }
++	
++	}
++	return offline;
++}
++
++/*
++ * release a file-command to SAM-stagger
++ */
++extern int sam_release(const char *path, const char *command);
++
++/*
++ * samfs_set_offline()
++ *
++ * Release the local file in the sense of SAM-QFS.
++ * See sam_release(3) for details.
++ *
++ */
++static int samfs_set_offline(struct vfs_handle_struct *handle, const char *path)
++{
++	int result;
++
++	result = sam_release(path, "i");
++	if (result != 0) {
++		DEBUG(10,("samfs_set_offline: sam_release %s returned %s\n", \
++				path, strerror(errno)));
++		return -1;
++	}
++	return 0;
++}
++
++/* VFS operations structure */
++
++static struct vfs_fn_pointers samfs_fns = {
++	.is_offline = samfs_is_offline,
++	.set_offline = samfs_set_offline
++};
++
++NTSTATUS vfs_samfs_init(void);
++NTSTATUS vfs_samfs_init(void)
++{
++	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, SAMFS_MODULE_NAME,
++				&samfs_fns);
++}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/configure.in-diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,98 @@
+--- samba-3.0.25/source/configure.in	Mon Apr  9 10:31:00 2007
++++ samba-3.0.25-fix/source/configure.in	Wed Apr 11 02:48:55 2007
+@@ -3299,6 +3299,20 @@
+     with_ldap_support=yes
+     AC_MSG_CHECKING(whether LDAP support is used)
+     AC_MSG_RESULT(yes)
++
++    ################################
++    # Check if the Netscape LDAP SDK
++    AC_CACHE_CHECK([for LDAP_OPT_SIZELIMIT macro],samba_cv_HAVE_LDAP_NSC,[
++    AC_TRY_COMPILE([
++#include <stdio.h>
++#include <ldap.h>],
++    [printf("%s\n", LDAP_OPT_SIZELIMIT);],
++    samba_cv_HAVE_LDAP_NSC=yes,samba_cv_HAVE_LDAP_NSC=no)])
++    if test x"$samba_cv_HAVE_LDAP_NSC" = x"yes"; then
++	AC_DEFINE(HAVE_HAVE_LDAP_NSC,1,
++		[Whether the LDAP API is Netscape SDK])
++    fi
++
+   else
+     if test x"$with_ldap_support" = x"yes"; then
+ 	AC_MSG_ERROR(libldap is needed for LDAP support)
+@@ -3361,15 +3375,25 @@
+     fi
+     ;;
+ 	*)
+-    AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
++    # Omit the ldap_initialize() test if there is a Netscape SDK
++    # (Mozilla Directory server 5)
++    if test x"$samba_cv_HAVE_LDAP_NSC" = x"no"; then
+ 
+-    if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
+-	if test x"$with_ads_support" = x"yes"; then
+-	    AC_MSG_ERROR(Active Directory support requires ldap_initialize)
+-	elif test x"$with_ads_support" = x"auto"; then
+-	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
+-	    with_ads_support=no
++	AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
++
++	if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
++	    if test x"$with_ads_support" = x"yes"; then
++		AC_MSG_ERROR(Active Directory support requires ldap_initialize)
++	    elif test x"$with_ads_support" = x"auto"; then
++		AC_MSG_WARN(Disabling Active Directory support (requires ldap_in
++itialize))
++		with_ads_support=no
++	    fi
++
+ 	fi
++     else
++	AC_MSG_RESULT(Active Directory support on Netscape LDAP SDK - limited fu
++nctionality?)
+     fi
+     ;;
+ esac
+@@ -3425,6 +3449,19 @@
+   #################################################
+   # check for krb5-config from recent MIT and Heimdal kerberos 5
+   AC_PATH_PROG(KRB5CONFIG, krb5-config)
++
++  #################################################
++  # check if MIT krb5 API is present
++  AC_MSG_CHECKING(for type of kerberos)
++  if $KRB5CONFIG --version | grep -s MIT > /dev/null ; then
++    FOUND_KRB5_MIT=yes
++    AC_MSG_RESULT(yes)
++    AC_DEFINE(HAVE_KRB5_MIT,1,[Whether the krb5 API is MIT])
++  else
++    FOUND_KRB5_MIT=no
++    AC_MSG_RESULT(no)
++  fi
++
+   AC_MSG_CHECKING(for working krb5-config)
+   if test -x "$KRB5CONFIG"; then
+     ac_save_CFLAGS=$CFLAGS
+@@ -3431,10 +3468,17 @@
+     CFLAGS="";export CFLAGS
+     ac_save_LDFLAGS=$LDFLAGS
+     LDFLAGS="";export LDFLAGS
+-    KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
+-    KRB5_LDFLAGS="`$KRB5CONFIG --libs gssapi | sed s/-lgss.*//`"
+-    KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
+-    KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
++    if test x"$FOUND_KRB5_MIT" = x"yes"; then
++	KRB5_LIBS="`$KRB5CONFIG --libs | sed s/-lkrb5//`"
++	KRB5_LDFLAGS="-lkrb5 -lgss"
++	KRB5_CFLAGS=""
++	KRB5_CPPFLAGS="`$KRB5CONFIG --cflags`" 
++    else
++	KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
++	KRB5_LDFLAGS="`$KRB5CONFIG --libs gssapi | sed s/-lgss.*//`"
++	KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
++	KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
++    fi
+     CFLAGS=$ac_save_CFLAGS;export CFLAGS
+     LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
+     FOUND_KRB5=yes
Binary file usr/src/cmd/samba/Solaris/docs-xml-built.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/libsam.c	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,33 @@
+/*
+ *
+ * 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 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"@(#)libsam.c	1.1	08/09/17 SMI"
+
+/*
+ * this is the fake library to stub the lazyloaded SUNWsamfs calls
+ */
+int sam_stat() { return (1); }
+int sam_segment_stat() { return (1); }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/pam.conf-winbind	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,124 @@
+#
+# 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
+#
+#ident	"@(#)pam.conf-winbind	1.1	07/02/20 SMI"
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# PAM configuration
+#
+# Unless explicitly defined, all services use the modules
+# defined in the "other" section.
+#
+# Modules are defined with relative pathnames, i.e., they are
+# relative to /usr/lib/security/$ISA. Absolute path names, as
+# present in this file in previous releases are still acceptable.
+#
+# Authentication management
+#
+# login service (explicit because of pam_dial_auth)
+#
+login	auth requisite		pam_authtok_get.so.1
+login	auth required		pam_dhkeys.so.1
+login	auth required		pam_unix_cred.so.1
+login	auth required		pam_unix_auth.so.1
+login	auth required		pam_dial_auth.so.1
+#
+# rlogin service (explicit because of pam_rhost_auth)
+#
+rlogin	auth sufficient		pam_rhosts_auth.so.1
+rlogin	auth requisite		pam_authtok_get.so.1
+rlogin	auth required		pam_dhkeys.so.1
+rlogin	auth required		pam_unix_cred.so.1
+rlogin	auth required		pam_unix_auth.so.1
+#
+# Kerberized rlogin service
+#
+krlogin	auth required		pam_unix_cred.so.1
+krlogin	auth binding		pam_krb5.so.1
+krlogin	auth required		pam_unix_auth.so.1
+#
+# rsh service (explicit because of pam_rhost_auth,
+# and pam_unix_auth for meaningful pam_setcred)
+#
+rsh	auth sufficient		pam_rhosts_auth.so.1
+rsh	auth required		pam_unix_cred.so.1
+#
+# Kerberized rsh service
+#
+krsh	auth required		pam_unix_cred.so.1
+krsh	auth binding		pam_krb5.so.1
+krsh	auth required		pam_unix_auth.so.1
+#
+# Kerberized telnet service
+#
+ktelnet	auth required		pam_unix_cred.so.1
+ktelnet	auth binding		pam_krb5.so.1
+ktelnet	auth required		pam_unix_auth.so.1
+#
+# PPP service (explicit because of pam_dial_auth)
+#
+ppp	auth requisite		pam_authtok_get.so.1
+ppp	auth required		pam_dhkeys.so.1
+ppp	auth required		pam_unix_cred.so.1
+ppp	auth required		pam_unix_auth.so.1
+ppp	auth required		pam_dial_auth.so.1
+#
+# Default definitions for Authentication management
+# Used when service name is not explicitly mentioned for authentication
+#
+other	auth requisite		pam_authtok_get.so.1
+other	auth required		pam_dhkeys.so.1
+other	auth required		pam_unix_cred.so.1
+other	auth required		pam_unix_auth.so.1
+#
+# passwd command (explicit because of a different authentication module)
+#
+passwd	auth required		pam_passwd_auth.so.1
+#
+# cron service (explicit because of non-usage of pam_roles.so.1)
+#
+cron	account required	pam_unix_account.so.1
+#
+# Default definition for Account management
+# Used when service name is not explicitly mentioned for account management
+#
+other	account requisite	pam_roles.so.1
+other	account sufficient	pam_unix_account.so.1
+other	account required	pam_winbind.so
+#
+# Default definition for Session management
+# Used when service name is not explicitly mentioned for session management
+#
+other	session required	pam_unix_session.so.1
+#
+# Default definition for  Password management
+# Used when service name is not explicitly mentioned for password management
+#
+other	password required	pam_dhkeys.so.1
+other	password requisite	pam_authtok_get.so.1
+other	password requisite	pam_authtok_check.so.1
+other	password required	pam_winbind.so
+other	password required	pam_authtok_store.so.1
+#
+# Support for Kerberos V5 authentication and example configurations can
+# be found in the pam_krb5(5) man page under the "EXAMPLES" section.
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/sam-lib.h	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,175 @@
+/*
+ *	lib.h - SAM-FS user library function prototypes.
+ *
+ *	Definitions for SAM-FS user library function prototypes.
+ *
+ */
+
+/*
+ *    SAM-QFS_notice_begin
+ *
+ *      Solaris 2.x Sun Storage & Archiving Management File System
+ *
+ *		Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ *		U.S. Government Rights - Commercial software. Government users are
+ *	subject to the Sun Microsystems, Inc. standard license agreement and applicable
+ *	provisions of the FAR and its supplements.
+ *
+ *      	Use is subject to license terms. Sun, Sun Microsystems and the Sun logo
+ *	are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
+ *	and other countries.
+ *
+ *    SAM-QFS_notice_end
+ */
+
+/*
+ *	LGPL NOTICE
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	This library is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef	_SAM_LIB_H
+#define	_SAM_LIB_H
+
+#ifdef sun
+#pragma ident "$Revision$"
+#endif
+
+#include "sam-types.h"
+
+
+/*
+ * Macros.
+ */
+#define	STR_FROM_ERRNO_BUF_SIZE 	80
+#define	STR_FROM_FSIZE_BUF_SIZE 	12
+#define	STR_FROM_INTERVAL_BUF_SIZE 	18
+#define	STR_FROM_TIME_BUF_SIZE 		18
+#define	STR_FROM_VOLID_BUF_SIZE 	40
+
+/*
+ * Macros for WORM retention period calculations
+ */
+#define	MINS_IN_YEAR 		(365*24*60)
+#define	MINS_IN_LYEAR 		(366*24*60)
+#define	MINS_IN_DAY  		(24*60)
+#define	MINS_IN_HOUR 		(60)
+
+/*
+ * SAM file system request functions
+ */
+
+#ifdef	_SAM_RESOURCE_H
+extern	int	sam_rdrsf(char *, int, sam_resource_file_t *);
+#endif
+
+/*
+ * SAM command utility functions
+ */
+
+extern	char	*device_to_nm(int);
+extern	int	nm_to_device(char *);
+extern	int	media_to_device(char *);
+extern	int 	sam_syscall(int cmd, void *args, int arg_size);
+
+
+/*
+ * Generally useful command utility functions
+ */
+
+pid_t 	FindProc(char *name, char *arg);
+char	*GetParentName(void);
+char	*GetProcName(pid_t pid, char *buf, int buf_size);
+int 	sam_lockout(char *name, char *dir, char *prefix, int *siglist);
+void	*MapFileAttach(char *fileName, uint_t magic, int mode);
+void 	MakeDir(char *dname);
+int 	MapFileDetach(void *mf_a);
+
+int 	percent_used(uint capacity, uint space);
+int 	llpercent_used(u_longlong_t capacity, u_longlong_t space);
+void 	ll2oct(u_longlong_t value, char *dest, int width);
+void 	ll2str(u_longlong_t value, char *dest, int width);
+u_longlong_t llfrom_oct(int digs, char *where);
+u_longlong_t llfrom_str(int digs, char *where);
+
+extern char *time_string(time_t, time_t, char *);
+extern char *TimeString(time_t time, char *str, int size);
+
+time_t StrToTime(char *str);
+
+extern int  StrToMinutes(char *args, long *expiration);
+extern void MinToStr(time_t chgtime, long num_mins, char *gtime, char *str);
+extern int  DateToMinutes(char *args, long *mins);
+
+char	*getuser(uid_t);	/* get user name for uid */
+char	*getgroup(gid_t);	/* get group name for gid */
+
+#ifndef	MAIN
+extern char *program_name;
+#endif
+
+#ifndef	SAM_LIB_GNU		/* Do not define these for GNU code	*/
+extern	void	error		(int, int, char *, ...);
+extern	char	*stpcpy		(char *, char *);
+#endif
+
+extern	int	SAM_fd;		/* File descriptor for .ioctl file	*/
+
+int sam_syscall(int number, void *arg, int size);
+char  *sam_mediatoa(int mt);
+extern int   sam_atomedia(char *name);
+extern void  sam_syslog(int priority, const char *fmt, ...);
+extern char *StrFromErrno(int errno_arg, char *buf, int buf_size);
+extern char *StrFromFsize(uint64_t size, int prec, char *buf, int buf_size);
+extern char *StrFromInterval(int interval, char *buf, int buf_size);
+extern int   StrToFsize(char *string, uint64_t *size);
+extern int   StrToInterval(char *string, int *interval);
+
+#if defined(_AML_CATALOG_H)
+extern int  StrToVolId(char *arg, struct VolId *vid);
+extern char *StrFromVolId(struct VolId *vid, char *buf, int buf_size);
+#endif /* defined(_AML_CATALOG_H) */
+
+#if defined(_SAM_FS_DIRENT_H)
+int sam_getdent(struct sam_dirent ** dirent);
+int sam_opendir(char *dir_name);
+#endif /* defined(_SAM_FS_DIRENT_H) */
+
+#if defined(_SAMFS_MOUNT_H)
+char	*DskToRdsk(char *dsk, char *rdsk);
+int	GetFsInfo(char *name, struct sam_fs_info *fi);
+int	GetFsInfoDefs(char *name, struct sam_fs_info *fi);
+int	GetFsInfoByEq(int eq, struct sam_fs_info *fi);
+int	GetFsInfoByPartEq(int eq, struct sam_fs_info *fi);
+int	GetFsMount(char *fs_name, struct sam_mount_info *mp);
+int	GetFsMountDefs(char *fs_name, struct sam_mount_info *mp);
+char	*GetFsMountName(int eq);
+int 	GetFsParts(char *name, int maxpts, struct sam_fs_part *pts);
+int 	GetFsStatus(struct sam_fs_status **fs);
+int 	OpenInodesFile(char *mountPoint);
+char	*SetFsParam(char *fsname, char *param, char *value);
+char	*SetFsConfig(char *fsname, char *param);
+int 	SetFsPartSt(char *fsname, char *eqnum, int32_t state);
+
+char	*StrFromFsStatus(struct sam_fs_info *fi);
+#endif /* defined(_SAMFS_MOUNT_H) */
+
+#if defined(_AML_DEVICE_H)
+int read_mcf(char *dummy, dev_ent_t **devlist, int *high_eq);
+void WriteMcfbin(int DeviceNumof, dev_ent_t *DeviceTable);
+#endif /* defined(_AML_DEVICE_H) */
+
+#endif /* _SAM_LIB_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/sam-osversion.h	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,59 @@
+/*
+ * sam/osversion.h - define OS version.
+ *
+ *	System type definitions for the SAM-FS filesystem and daemons.
+ *
+ */
+
+/*
+ *    SAM-QFS_notice_begin
+ *
+ *      Solaris 2.x Sun Storage & Archiving Management File System
+ *
+ *		Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ *		U.S. Government Rights - Commercial software. Government users are
+ *	subject to the Sun Microsystems, Inc. standard license agreement and applicable
+ *	provisions of the FAR and its supplements.
+ *
+ *      	Use is subject to license terms. Sun, Sun Microsystems and the Sun logo
+ *	are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
+ *	and other countries.
+ *
+ *    SAM-QFS_notice_end
+ */
+
+/*
+ *	LGPL NOTICE
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	This library is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#if !defined(_SAM_OSVERSION_H)
+#define	_SAM_OSVERSION_H
+
+#ifdef sun
+#pragma ident "$Revision$"
+#endif
+
+#if defined(SOL5_11)
+#define	SOL_511_ABOVE
+#endif
+
+#if defined(SOL5_10) || defined(SOL5_11)
+#define	SOL_510_ABOVE
+#endif
+
+#endif /* !defined(_SAM_OSVERSION_H) */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/sam-stat.h	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,448 @@
+/*
+ * stat.h - SAM-FS file information definitions.
+ *
+ * Defines the SAM-FS file information structure and functions.
+ * The POSIX stat structure and associated macros are used to allow
+ * the sam_stat structure to be used on various client machine
+ * architectures.
+ *
+ */
+
+/*
+ *    SAM-QFS_notice_begin
+ *
+ *      Solaris 2.x Sun Storage & Archiving Management File System
+ *
+ *		Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ *		U.S. Government Rights - Commercial software. Government users are
+ *	subject to the Sun Microsystems, Inc. standard license agreement and applicable
+ *	provisions of the FAR and its supplements.
+ *
+ *      	Use is subject to license terms. Sun, Sun Microsystems and the Sun logo
+ *	are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
+ *	and other countries.
+ *
+ *    SAM-QFS_notice_end
+ */
+
+/*
+ *	LGPL NOTICE
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	This library is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/*
+ * $Revision$
+ */
+
+#ifdef sun
+#pragma ident "$Revision$"
+#endif
+
+
+#ifndef	SAM_STAT_H
+#define	SAM_STAT_H
+
+#ifdef linux
+#include <sam/linux_types.h>	/* u_longlong_t */
+#endif /* linux */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define	MAX_ARCHIVE		4
+#define	SAM_MIN_SEGMENT_SIZE	(1024*1024) 	/* Minimum segment size in bytes */
+
+/*
+ * If sam/stat.h and sys/stat.h are needed in the same module, then
+ * sys/stat.h must be included before sam/stat.h.
+ * The following is provided to avoid compilation errors:
+ */
+#if defined(_SYS_STAT_H) || defined(_LINUX_STAT_H)
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
+#undef S_ISBLK
+#undef S_ISCHR
+#undef S_ISDIR
+#undef S_ISFIFO
+#undef S_ISGID
+#undef S_ISREG
+#undef S_ISUID
+#undef S_ISLNK
+#undef S_ISSOCK
+
+#ifdef	linux
+#undef S_IRWXU
+#undef S_IRUSR
+#undef S_IWUSR
+#undef S_IXUSR
+#undef S_IRWXG
+#undef S_IRGRP
+#undef S_IWGRP
+#undef S_IXGRP
+#undef S_IRWXO
+#undef S_IROTH
+#undef S_IWOTH
+#undef S_IXOTH
+#endif	/* linux */
+
+#endif /* defined(_SYS_STAT_H) */
+
+/*
+ *	NOTE that in order to pass the following structures from a 64-bit
+ *	kernel to a 32-bit application, we need to conditionally define the
+ *	positions of the 32-bit time and the pad differently for SPARC and X86.
+ */
+
+/*
+ * Begin: 32-bit align copyin() structs for amd64 only due to 32-bit x86 ABI
+ */
+#if _LONG_LONG_ALIGNMENT == 8 && _LONG_LONG_ALIGNMENT_32 == 4
+#pragma pack(4)
+#endif
+
+#if defined(__sparcv9) || defined(__amd64) || defined(linux)
+
+struct sam_copy_s {					/* For each archive copy. */
+	u_longlong_t 	position;			/* Location of archive file */
+	time_t		creation_time;			/* Time archive copy created */
+	uint_t		offset;				/* Location of copy in archive file - */
+							/* in units of 512 bytes */
+	ushort_t	flags;
+	short		n_vsns;				/* Number of VSNs the archive used */
+	char		media[4];			/* Media type */
+	char		vsn[32];			/* VSN */
+};
+
+struct sam_stat {
+	/* POSIX stat structure. */
+	uint_t		st_mode;			/* File mode */
+	uint_t		st_ino;				/* File serial number */
+#ifdef  sun
+	dev_t		st_dev;				/* ID of the device containing the file */
+#endif  /* sun */
+#ifdef  linux
+	ushort_t	st_dev;				/* ID of the device containing the file */
+#endif  /* linux */
+	uint_t		st_nlink;			/* Number of links */
+	uint_t		st_uid;				/* User ID of the file's owner */
+	uint_t		st_gid;				/* Group ID of the file's owner */
+	u_longlong_t 	st_size;			/* The file size in bytes */
+	time_t 		st_atime;			/* Time of last access */
+	time_t 		st_mtime;			/* Time of last data modification */
+	time_t 		st_ctime;			/* Time of last file status change */
+
+	/* SAM-FS information. */
+	time_t 		attribute_time;			/* Time attributes last changed */
+	time_t 		creation_time;			/* Time inode created */
+	time_t 		residence_time;			/* Time file changed residence */
+	struct 		sam_copy_s copy[MAX_ARCHIVE];
+	uint_t		attr;				/* File attributes */
+	uchar_t		cs_algo;			/* Checksum algorithm indicator */
+	uchar_t		flags;				/* Flags:  staging, stage err, etc. */
+	uchar_t		stripe_width;			/* Stripe width set by setfa -s */
+	uchar_t		stripe_group;			/* Stripe group set by setfa -g */
+	uint_t 		gen;				/* File generation number */
+	uint_t 		partial_size;			/* Partial size in kilobytes */
+#ifdef	sun
+	dev_t		rdev;				/* ID of device if S_IFBLK or S_IFCHR */
+#endif 	/* sun */
+#ifdef linux
+	ushort_t	rdev;				/* ID of device if S_IFBLK or S_IFCHR */
+#endif /* linux */
+	u_longlong_t 	st_blocks;			/* Block count in units of 512 byte blocks */
+	uint_t 		segment_size;			/* Segment size in megabytes (SS_SEGMENT_A) */
+	uint_t 		segment_number;			/* Number of this segment */
+							/* 0 - SS_SEGMENT_F, 1 .. n - SS_SEGMENT_S */
+	uint_t 		stage_ahead;			/* Number of segments to stage ahead */
+	uint_t 		admin_id;			/* admin ID; inherited from dir */
+	uint_t 		allocahead;			/* Allocate ahead size set by setfa -A */
+	uint_t 		pad9;
+	u_longlong_t 	cs_val[2];			/* 128 bit checksum */
+};
+
+#else   /* __sparcv9 || __amd64 || linux */
+
+struct sam_copy_s {					/* For each archive copy. */
+	u_longlong_t 	position;			/* Location of archive file */
+#if 	defined(__i386)
+	time_t		creation_time;			/* Time archive copy created */
+	ulong_t		pad0;
+#else
+	ulong_t		pad0;
+	time_t		creation_time;			/* Time archive copy created */
+#endif	/* __i386 */
+	ulong_t		offset;				/* Location of copy in archive file - */
+							/*	in units of 512 bytes */
+	ushort_t 	flags;
+	short		n_vsns;				/* Number of VSNs the archive used */
+	char		media[4];			/* Media type */
+	char		vsn[32];			/* VSN */
+};
+
+struct sam_stat {
+	/* POSIX stat structure. */
+	ulong_t		st_mode;			/* File mode */
+	ulong_t		st_ino;				/* File serial number */
+	dev_t		st_dev;				/* ID of the device containing the file */
+	long		pad1;
+	ulong_t		st_nlink;			/* Number of links */
+	ulong_t		st_uid;				/* User ID of the file's owner */
+	ulong_t		st_gid;				/* Group ID of the file's owner */
+	u_longlong_t 	st_size;			/* The file size in bytes */
+#if 	defined(__i386)
+	time_t		st_atime;			/* Time of last access */
+	ulong_t		pad2;
+	time_t		st_mtime;			/* Time of last data modification */
+	ulong_t		pad3;
+	time_t		st_ctime;			/* Time of last file status change */
+	ulong_t		pad4;
+
+	/* SAM-FS information. */
+	time_t		attribute_time;			/* Time attributes last changed */
+	ulong_t		pad5;
+	time_t		creation_time;			/* Time inode created */
+	ulong_t		pad6;
+	time_t		residence_time;			/* Time file changed residence */
+	ulong_t		pad7;
+#else	/* __i386 */
+	ulong_t		pad2;
+	time_t		st_atime;			/* Time of last access */
+	ulong_t		pad3;
+	time_t		st_mtime;			/* Time of last data modification */
+	ulong_t		pad4;
+	time_t		st_ctime;			/* Time of last file status change */
+
+	/* SAM-FS information. */
+	ulong_t		pad5;
+	time_t		attribute_time;			/* Time attributes last changed */
+	ulong_t		pad6;
+	time_t		creation_time;			/* Time inode created */
+	ulong_t		pad7;
+	time_t		residence_time;			/* Time file changed residence */
+#endif	/* __i386 */
+	struct		sam_copy_s copy[MAX_ARCHIVE];
+	uint_t		attr;				/* File attributes */
+	uchar_t 	cs_algo;			/* Checksum algorithm indicator */
+	uchar_t		flags;				/* Flags:  staging, stage err, etc. */
+	uchar_t		stripe_width;			/* Stripe width set by setfa -s */
+	uchar_t		stripe_group;			/* Stripe group set by setfa -g */
+	ulong_t		gen;				/* File generation number */
+	ulong_t		partial_size;			/* Partial size in kilobytes */
+	dev_t		rdev;				/* ID of device if S_IFBLK or S_IFCHR */
+	ulong_t		pad8;
+	u_longlong_t 	st_blocks;			/* Block count in units of 512 byte blocks */
+	ulong_t 	segment_size;			/* Segment size in megabytes (SS_SEGMENT_A) */
+	ulong_t 	segment_number;			/* Number of this segment */
+							/* 0 - SS_SEGMENT_F, 1 .. n - SS_SEGMENT_S */
+	uint_t 		stage_ahead;			/* Number of segments to stage ahead */
+	ulong_t 	admin_id;			/* admin ID; inherited from dir */
+	ulong_t 	allocahead;			/* Allocate ahead size set by setfa -A */
+	ulong_t 	pad9;
+	u_longlong_t 	cs_val[2];			/* 128 bit checksum */
+};
+
+#endif   /* __sparcv9 || __amd64 || linux */
+
+
+#define	SAM_SECTION_SIZE(n) (sizeof (struct sam_section) * n)
+
+struct sam_section {					/* For each archive copy volume section */
+	char		vsn[32];			/* VSN */
+	u_longlong_t 	length;				/* Section length of file on this volume */
+	u_longlong_t 	position;			/* Position of archive file for this section */
+	u_longlong_t 	offset;				/* Location of copy section in archive file */
+};
+
+/*
+ * End: 32-bit align copyin() structs for amd64 only due to 32-bit x86 ABI
+ */
+#if _LONG_LONG_ALIGNMENT == 8 && _LONG_LONG_ALIGNMENT_32 == 4
+#pragma pack()
+#endif
+
+/*
+ * POSIX symbols.
+ */
+
+#define	S_IRWXU 	00700				/* read, write, execute: owner */
+#define	S_IRUSR 	00400				/* read permission: owner */
+#define	S_IWUSR 	00200				/* write permission: owner */
+#define	S_IXUSR 	00100				/* execute permission: owner */
+#define	S_IRWXG 	00070				/* read, write, execute: group */
+#define	S_IRGRP 	00040				/* read permission: group */
+#define	S_IWGRP 	00020				/* write permission: group */
+#define	S_IXGRP 	00010				/* execute permission: group */
+#define	S_IRWXO 	00007				/* read, write, execute: other */
+#define	S_IROTH 	00004				/* read permission: other */
+
+#define	S_IWOTH 	00002				/* write permission: other */
+#define	S_IXOTH 	00001				/* execute permission: other */
+
+#define	S_ISBLK(mode)  	(((mode)&0xf000) == 0x6000)
+#define	S_ISCHR(mode)  	(((mode)&0xf000) == 0x2000)
+#define	S_ISDIR(mode)  	(((mode)&0xf000) == 0x4000)
+#define	S_ISFIFO(mode) 	(((mode)&0xf000) == 0x1000)
+#define	S_ISGID(mode)  	((mode)&0x400)   		/* set group id on execution */
+#define	S_ISREG(mode)  	(((mode)&0xf000) == 0x8000)
+#define	S_ISUID(mode)  	((mode)&0x800)   		/* set user id on execution */
+#define	S_ISLNK(mode)  	(((mode)&0xf000) == 0xa000)
+#define	S_ISSOCK(mode) 	(((mode)&0xf000) == 0xc000)
+
+/*
+ * SAMFS attributes mapped into sam_stat but not in inode (ino_status_t).
+ */
+#define	SS_SAMFS	0x00000800			/* SAM-FS file */
+#define	SS_ARCHIVE_R 	0x00002000			/* Re-archive */
+#define	SS_ARCHIVED  	0x00010000			/* File has at least one archive copy */
+#define	SS_DATA_V	0x00040000 			/* File requires data verification */
+#define	SS_AIO		0x00080000 			/* AIO Char Device file */
+#define	SS_ARCHIVE_A 	0x08000000			/* Archive immediate */
+
+/*
+ * SAMFS attributes from the inode.
+ */
+#define	SS_REMEDIA   	0x00000001			/* Removable media file */
+#define	SS_RELEASE_A 	0x00000002			/* Release after archive */
+#define	SS_RELEASE_N 	0x00000004			/* Release never (nodrop) */
+#define	SS_STAGE_N   	0x00000008			/* Stage never (direct) */
+
+#define	SS_DAMAGED   	0x00000010			/* File is damaged - not online and no copy */
+#define	SS_RELEASE_P 	0x00000020			/* Release partial (bof_online) */
+#define	SS_ARCHIVE_N 	0x00000040			/* Archive never (noarch) */
+#define	SS_STAGE_A	0x00000080			/* Stage associative (stageall) */
+
+#define	SS_CSVAL	0x00000100			/* Valid checksum exists in inode */
+#define	SS_CSUSE	0x00000200			/* Checksum will be used upon stage */
+#define	SS_CSGEN	0x00000400			/* Checksum will be generated upon archive */
+/*	SS_SAMFS	0x00000800			used by sam_stat() - see above */
+
+#define	SS_ARCHDONE  	0x00001000			/* File has all required archiving done */
+/*	SS_ARCHIVE_R    0x00002000    			used by sam_stat() - see above */
+#define	SS_PARTIAL   	0x00004000			/* Partial extents are online */
+#define	SS_OFFLINE   	0x00008000			/* File is offline */
+
+/*	SS_ARCHIVED   	0x00010000    			used by sam_stat() - see above */
+#define	SS_SEGMENT_A 	0x00020000			/* Segment attribute */
+/*	SS_DATA_V    	0x00040000			   used by sam_stat() - see above */
+/*	SS_AIO		0x00080000			used by sam_stat() - see above */
+
+#define	SS_ARCHIVE_C 	0x00100000			/* Archive concurrent */
+#define	SS_DIRECTIO  	0x00200000			/* Directio */
+#define	SS_ARCHIVE_I 	0x00400000			/* Archive inconsistent copies */
+#define	SS_WORM		0x00800000			/* Read only attribute (worm_attr) */
+
+#define	SS_READONLY  	0x01000000			/* Read only file enabled (worm_set) */
+#define	SS_SEGMENT_S 	0x02000000			/* This is a segment of a segmented file */
+#define	SS_SEGMENT_F 	0x04000000			/* Stage/archive this file in segments */
+/*	SS_ARCHIVE_A    0x08000000			used by sam_stat() - see above */
+
+#define	SS_SETFA_S   	0x10000000			/* Stripe width set by setfa -s */
+#define	SS_SETFA_G   	0x20000000			/* Stripe group set by setfa -g */
+
+#define	SS_DFACL	0x40000000			/* Default access control list present */
+#define	SS_ACL		0x80000000			/* Access control list present */
+
+#define	SS_ISSAMFS(attr)	(((attr)&SS_SAMFS) != 0)
+#define	SS_ISREMEDIA(attr)   	(((attr)&SS_REMEDIA) != 0)
+#define	SS_ISARCHIVED(attr)  	(((attr)&SS_ARCHIVED) != 0)
+#define	SS_ISARCHDONE(attr)  	(((attr)&SS_ARCHDONE) != 0)
+#define	SS_ISDAMAGED(attr)   	(((attr)&SS_DAMAGED) != 0)
+#define	SS_ISOFFLINE(attr)   	(((attr)&SS_OFFLINE) != 0)
+#define	SS_ISPARTIAL(attr)   	(((attr)&SS_PARTIAL) != 0)
+#define	SS_ISARCHIVE_C(attr) 	(((attr)&SS_ARCHIVE_C) != 0)
+#define	SS_ISARCHIVE_I(attr) 	(((attr)&SS_ARCHIVE_I) != 0)
+#define	SS_ISARCHIVE_N(attr) 	(((attr)&SS_ARCHIVE_N) != 0)
+#define	SS_ISARCHIVE_A(attr) 	(((attr)&SS_ARCHIVE_A) != 0)
+#define	SS_ISARCHIVE_R(attr) 	(((attr)&SS_ARCHIVE_R) != 0)
+#define	SS_ISRELEASE_A(attr) 	(((attr)&SS_RELEASE_A) != 0)
+#define	SS_ISRELEASE_N(attr) 	(((attr)&SS_RELEASE_N) != 0)
+#define	SS_ISRELEASE_P(attr) 	(((attr)&SS_RELEASE_P) != 0)
+#define	SS_ISSTAGE_A(attr)   	(((attr)&SS_STAGE_A) != 0)
+#define	SS_ISSTAGE_N(attr)   	(((attr)&SS_STAGE_N) != 0)
+#define	SS_ISSEGMENT_A(attr) 	(((attr)&SS_SEGMENT_A) != 0)
+#define	SS_ISSEGMENT_S(attr) 	(((attr)&SS_SEGMENT_S) != 0)
+#define	SS_ISSEGMENT_F(attr) 	(((attr)&SS_SEGMENT_F) != 0)
+#define	SS_ISCSGEN(attr)	(((attr)&SS_CSGEN) != 0)
+#define	SS_ISCSUSE(attr)	(((attr)&SS_CSUSE) != 0)
+#define	SS_ISCSVAL(attr)	(((attr)&SS_CSVAL) != 0)
+#define	SS_ISDIRECTIO(attr)  	(((attr)&SS_DIRECTIO) != 0)
+#define	SS_ISSTAGE_M(attr)   	(((attr)&SS_STAGE_M) != 0)
+#define	SS_ISWORM(attr)		(((attr)&SS_WORM) != 0)
+#define	SS_ISREADONLY(attr)  	(((attr)&SS_READONLY) != 0)
+#define	SS_ISSETFA_G(attr)   	(((attr)&SS_SETFA_G) != 0)
+#define	SS_ISSETFA_S(attr)   	(((attr)&SS_SETFA_S) != 0)
+#define	SS_ISDFACL(attr)	(((attr)&SS_DFACL) != 0)
+#define	SS_ISACL(attr)		(((attr)&SS_ACL) != 0)
+#define	SS_ISDATAV(attr)	(((attr)&SS_DATA_V) != 0)
+#define	SS_ISAIO(attr)		(((attr)&SS_AIO) != 0)
+
+/*
+ * SAMFS flags.
+ */
+
+#define	SS_STAGING		0x01	/* Stage is pending on the file */
+#define	SS_STAGEFAIL		0x02	/* Error occurred on last stage attempt */
+
+#define	SS_ISSTAGING(flags)	(((flags)&SS_STAGING) != 0)
+#define	SS_ISSTAGEFAIL(flags)	(((flags)&SS_STAGEFAIL) != 0)
+
+/*
+ * Copy flag masks.
+ */
+#define	CF_STALE		0x0001	/* This archive copy is stale */
+#define	CF_REARCH		0x0002	/* Copy is to be rearchived */
+#define	CF_ARCH_I		0x0004	/* Copy is to be archived immediately */
+#define	CF_VERIFIED		0x0008	/* Copy has been verified */
+#define	CF_DAMAGED		0x0010	/* This archive copy is damaged */
+#define	CF_UNARCHIVED		0x0020	/* This archive copy was unarchived */
+#define	CF_INCONSISTENT 	0x0040	/* This archive copy is inconsistent */
+#define	CF_ARCHIVED		0x0080	/* This archive copy made */
+
+int sam_stat(const char *path, struct sam_stat *buf, size_t bufsize);
+int sam_lstat(const char *path, struct sam_stat *buf, size_t bufsize);
+int sam_vsn_stat(const char *path, int copy, struct sam_section *buf,
+	size_t bufsize);
+int sam_segment_vsn_stat(const char *path, int copy, int segment_index,
+	struct sam_section *buf, size_t bufsize);
+int sam_segment_stat(const char *path, struct sam_stat *buf,
+	size_t bufsize);
+int sam_segment_lstat(const char *path, struct sam_stat *buf,
+	size_t bufsize);
+int sam_restore_file(const char *path, struct sam_stat *buf,
+	size_t bufsize);
+int sam_restore_copy(const char *path, int copy, struct sam_stat *buf,
+	size_t bufsize, struct sam_section *vbuf, size_t vbufsize);
+
+/*
+ * macro NUM_SEGS, takes in, fsbuff,  a ptr to a sam_stat struct, returns the
+ * number of segments of the file associated with fsbuff.
+ */
+
+#define	NUM_SEGS(fsbuff) (int)(((fsbuff) == NULL || (fsbuff)->st_size <= 0 || \
+				(fsbuff)->segment_size <= 0 || \
+				!SS_ISSEGMENT_F((fsbuff)->attr)) ? 0 : \
+				((fsbuff)->st_size + \
+				(offset_t)(fsbuff)->segment_size * (SAM_MIN_SEGMENT_SIZE) - 1LL) / \
+				((offset_t)(fsbuff)->segment_size * (SAM_MIN_SEGMENT_SIZE)))
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* SAM_STAT_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/sam-sys_types.h	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,123 @@
+/*
+ *	sam/sys_types.h - SAM-FS system types.
+ *
+ *	System type definitions for the SAM-FS filesystem and daemons.
+ *
+ */
+
+/*
+ *    SAM-QFS_notice_begin
+ *
+ *      Solaris 2.x Sun Storage & Archiving Management File System
+ *
+ *		Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ *		U.S. Government Rights - Commercial software. Government users are
+ *	subject to the Sun Microsystems, Inc. standard license agreement and applicable
+ *	provisions of the FAR and its supplements.
+ *
+ *      	Use is subject to license terms. Sun, Sun Microsystems and the Sun logo
+ *	are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
+ *	and other countries.
+ *
+ *    SAM-QFS_notice_end
+ */
+
+/*
+ *	LGPL NOTICE
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	This library is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef	_SAM_SYS_TYPES_H
+#define	_SAM_SYS_TYPES_H
+
+#ifdef sun
+#pragma ident "$Revision$"
+#endif
+
+
+#ifdef linux
+
+#include <sam/linux_types.h>
+#include <sam/osversion.h>
+
+#ifndef __KERNEL__
+#include <sys/fcntl.h>
+#include <sam/linux_types.h>	/* struct statvfs */
+#include <sys/time.h>
+#endif	/* __KERNEL__ */
+
+#else	/* linux */
+
+#include <sam-osversion.h>
+#include <sys/fcntl.h>
+
+#include <sys/dirent.h>
+#include <sys/statvfs.h>
+#include <sys/time.h>
+
+#endif	/* linux */
+
+
+#ifdef sun
+#include <sys/types32.h>
+
+typedef int64_t		sam_tr_t;
+typedef size_t		sam_size_t;
+typedef ssize_t		sam_ssize_t;
+typedef intptr_t	sam_intptr_t;
+typedef uintptr_t	sam_uintptr_t;
+
+typedef uint32_t	sam_mode_t;
+
+#endif
+
+#ifdef linux
+
+typedef int64_t		sam_tr_t;
+#ifdef _LP64
+typedef int64_t		sam_intptr_t;
+typedef uint64_t	sam_uintptr_t;
+typedef int64_t		sam_ssize_t;
+typedef uint64_t 	sam_size_t;
+#else
+typedef int		sam_intptr_t;
+typedef uint_t		sam_uintptr_t;
+typedef int		sam_ssize_t;
+typedef uint_t		sam_size_t;
+#endif
+typedef int32_t		time32_t;
+
+typedef uint32_t	sam_mode_t;
+
+struct timeval32 {
+	time32_t	tv_sec;		/* seconds */
+	int32_t		tv_usec;	/* and microseconds */
+};
+#endif /* linux */
+
+#define	SAM_MAXOFFSET_T	MAXOFFSET_T
+
+typedef offset_t	sam_offset_t;
+typedef u_offset_t	sam_u_offset_t;
+typedef uint32_t	sam_bn_t;
+typedef u_offset_t	sam_daddr_t;
+typedef flock64_t	sam_flock_t;
+typedef dirent64_t	sam_dirent64_t;
+typedef statvfs64_t	sam_statvfs_t;
+
+
+#endif	/* _SAM_SYS_TYPES_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/sam-types.h	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,276 @@
+/*
+ *	sam/types.h - SAM-FS types.
+ *
+ *  Description:
+ *      Defines SAM-FS types and lots of other things.
+ *
+ */
+
+/*
+ *    SAM-QFS_notice_begin
+ *
+ *      Solaris 2.x Sun Storage & Archiving Management File System
+ *
+ *		Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ *		U.S. Government Rights - Commercial software. Government users are
+ *	subject to the Sun Microsystems, Inc. standard license agreement and applicable
+ *	provisions of the FAR and its supplements.
+ *
+ *      	Use is subject to license terms. Sun, Sun Microsystems and the Sun logo
+ *	are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
+ *	and other countries.
+ *
+ *    SAM-QFS_notice_end
+ */
+
+/*
+ *	LGPL NOTICE
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	This library is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *	Lesser General Public License for more details.
+ *
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef	_SAM_TYPES_H
+#define	_SAM_TYPES_H
+
+#ifdef sun
+#pragma ident "$Revision$"
+#endif
+
+#ifdef linux
+
+#ifndef __KERNEL__
+#include <sys/types.h>
+#include <netdb.h>
+#endif /* __KERNEL__ */
+
+#else /* linux */
+
+#include <sys/types.h>
+#include <netdb.h>
+
+#endif /* linux */
+
+#include "sam-sys_types.h"
+
+/*
+ * These typedefs are part of an emerging ANSI-C standard for fixed-size
+ * integer types.
+ * They are available in Solaris 2.6 (and above) in /usr/include/sys/types.h.
+ */
+
+#if defined _SYS_INT_TYPES_H
+/*
+ * (uint8_t, uint32_t and uint64_t are defined in Solaris 2.5
+ * /usr/include/sys/synch.h.
+ */
+#define	_UINT8_T
+#define	_UINT16_T
+#define	_INT32_T
+#define	_UINT32_T
+#define	_INT64_T
+#define	_UINT64_T
+#endif  /* defined _SYS_INTTYPES_H */
+
+#if !defined _UINT8_T
+#define	_UINT8_T
+typedef unsigned char uint8_t;
+#endif  /* !defined _UINT8_T */
+#if !defined _UINT16_T
+#define	_UINT16_T
+typedef unsigned short uint16_t;
+#endif  /* !defined uint16_t */
+#if !defined _INT32_T
+#define	_INT32_T
+typedef int int32_t;
+#endif  /* !defined _INT32_T */
+#if !defined _UINT32_T
+#define	_UINT32_T
+typedef unsigned int uint32_t;
+#endif  /* !defined _UINT32_T */
+#if !defined _INT64_T
+#define	_INT64_T
+typedef long long int64_t;
+#endif  /* !defined _INT64_T */
+#if !defined _UINT64_T
+#define	_UINT64_T
+typedef unsigned long long uint64_t;
+#endif  /* !defined _UINT64_T */
+
+#if !defined(FALSE)
+#define	FALSE   (0)
+#endif
+#if !defined(TRUE)
+#define	TRUE	(1)
+#endif
+
+/* The following is for the lawyers */
+#define	COPYRIGHT "Copyright (c) 2001 Sun Microsystems, Inc. All Rights Reserved. SUN PROPRIETARY/CONFIDENTIAL."
+
+#define	RESELL_LIB "libresel.so"
+
+/*
+ *  Set errno for MT and non-MT callers.
+ *  errno is defined differently for MT and non-MT compiled modules.
+ *  This macro may be used to properly return errno for both types
+ *  of modules linked to non-MT compiled library modules.
+ *  The underlying Solaris errno function is ___errno().
+ */
+extern int *___errno(void);
+#define	SetErrno (*(___errno()))
+
+/*
+ *  Return the difference between two pointers.
+ *  lint produces warning: possible ptrdiff_t overflow when two pointers
+ *  are subtracted.
+ *  Returns 0 if the difference is negative.
+ *  The 'lint' version obviously will not do the work.
+ */
+#if !defined(lint)
+#define	Ptrdiff(a, b) ((((char *)(a) - (char *)(b)) > 0) ? \
+		((char *)(a) - (char *)(b)) : 0)
+#else /* !defined(lint) */
+#define	Ptrdiff(a, b) (memcmp((a), (b), 1))
+#endif /* !defined(lint) */
+
+/*
+ *  Round value to be structure aligned.
+ *  Structures may have a size that is not a multiple of 64-bits.
+ *  When these structures are packed in a file that will be memory
+ *  mapped, the size must be rounded to a 64-bit multiple for SPARC
+ *  and a 32-bit multiple for AMD.
+ */
+#if defined(__sparc)
+#define	STRUCT_RND(v) ((((v)+sizeof (longlong_t)-1) \
+	/ sizeof (longlong_t)) * sizeof (longlong_t))
+#elif defined(__i386) || defined(__amd64) || defined(x86_64) || defined(ia64)
+#define	STRUCT_RND(v) ((((v)+sizeof (int32_t)-1) \
+	/ sizeof (int32_t)) * sizeof (int32_t))
+#else
+	** ERROR **  unknown architecture
+#endif
+
+/*
+ *  All filesystem OTW structures must be 64-bit aligned,
+ *  regardless of the architecture for the server and clients.
+ */
+#define	STRUCT_RND64(v) ((((v)+sizeof (longlong_t)-1) \
+	/ sizeof (longlong_t)) * sizeof (longlong_t))
+
+#if defined(O_LARGEFILE)		/* Needed on open for large files */
+#define	SAM_O_LARGEFILE O_LARGEFILE
+#else
+#define	SAM_O_LARGEFILE 0
+#endif
+
+#define	SAM_FSTYPE 	"samfs"		/* st_fstype string for SAM-FS */
+
+#define	ROBOT_NO_SLOT 	0xffffffff	/* used to flag no slot. */
+
+/*
+ * When the space left on a tape (in units of 1024) falls below this,
+ * the tape will be considered full.
+ */
+#define	TAPE_IS_FULL 100
+
+/*
+ * HASAM running file
+ */
+
+#define	HASAM_TMP_DIR   "/var/run"
+#define	HASAM_RUN_FILE  HASAM_TMP_DIR"/hasam_running"
+
+#define	BARCODE_LEN 	36		/* length of barcode w/o null by */
+
+typedef	int		ATOM_INT_T;	/* Int with atomic memory reference */
+
+typedef uint64_t 	fsize_t;	/* Size of a file in bytes */
+typedef int64_t 	sfsize_t;
+#define	FSIZE_MAX 	0x7fffffffffffffff
+
+typedef char uname_t[32];		/* Device name */
+typedef char upath_t[128];		/* Path name */
+
+typedef char mtype_t[5];		/* Media type */
+typedef char vsn_t[32];			/* ANSI Volume serial name, 31 chars */
+					/* null terminated */
+					/* Tape VSNs are 6 chars or less */
+
+typedef char host_t[MAXHOSTNAMELEN];	/* Host name */
+
+typedef uint16_t media_t;		/* Media type */
+typedef uint16_t dtype_t;		/* Device type */
+typedef uint16_t equ_t;			/* Equipment ordinal */
+#define	EQU_MAX 65534			/* Maximum value for equipment ordinal */
+					/* (need one reserved for historian) */
+
+/*
+ * Common memory mapped file prefix.
+ * If the MfValid field becomes zero, the file should be renewed.
+ * MapFileDetach() then MapFileAttach().
+ */
+typedef struct MappedFile {
+	uint32_t MfMagic;		/* Magic number of file */
+	uint32_t MfLen;			/* Length of file mapped */
+	uint32_t MfValid;		/* File valid if non-zero */
+} MappedFile_t;
+
+typedef uint32_t sam_ino_t;
+
+typedef struct sam_id {			/* Inode identification */
+	sam_ino_t ino;			/* I-number */
+	int32_t gen;			/* Generation number */
+} sam_id_t;
+
+typedef struct csum {			/* Data verification value */
+	uint32_t csum_val[4];
+} csum_t;
+
+typedef int32_t sam_time_t;		/* 32-bit time */
+
+typedef struct sam_timestruc {
+	int32_t	tv_sec;
+	int32_t	tv_nsec;
+} sam_timestruc_t;
+
+typedef struct sam_flagtext {
+	uint64_t flagmask;
+	char	*flagtext;
+} sam_flagtext_t;
+
+#define	SAM_POINTER(t) union { t *ptr; uint32_t p32; uint64_t p64; }
+
+
+/*
+ * the following used in the SC_fsreleaser system call
+ */
+#define	RELEASER_STARTED	1
+#define	RELEASER_FINISHED	0
+
+#define	DF_THR_STK		(0)
+#define	SM_THR_STK		DF_THR_STK
+#define	MD_THR_STK		DF_THR_STK
+#define	LG_THR_STK		DF_THR_STK
+#define	HG_THR_STK		DF_THR_STK
+
+/*
+ * Rounding directions
+ */
+typedef enum sam_round {
+	SAM_ROUND_DOWN = 0,
+	SAM_ROUND_UP = 1
+} sam_round_t;
+
+#endif  /* _SAM_TYPES_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/samba.xml	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,94 @@
+<?xml version="1.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
+#
+-->
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+	Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+
+	#ident	"@(#)samba.xml	1.6	10/07/26 SMI"
+
+	NOTE:  This service manifest is not editable; its contents will
+	be overwritten by package or patch operations, including
+	operating system upgrade.  Make customizations in a different
+	file.
+-->
+
+<service_bundle type='manifest' name='SUNWsmbar:samba'>
+
+<service name='network/samba' type='service' version='1'>
+
+	<create_default_instance enabled='false' />
+
+	<single_instance/>
+
+	<dependency name='net-loopback' grouping='require_any'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/loopback' />
+	</dependency>
+
+	<dependency name='net-service' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/service'/>
+	</dependency>
+
+	<dependency name='net-physical' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/physical' />
+	</dependency>
+
+	<dependency name='filesystem-local' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/system/filesystem/local' />
+	</dependency>
+
+	<dependent name='samba_multi-user-server' grouping='optional_all'
+			restart_on='none'>
+		<service_fmri value='svc:/milestone/multi-user-server' />
+	</dependent>
+
+	<exec_method type='method' name='start'
+		exec='/usr/sbin/smbd -D'
+		timeout_seconds='170' />
+
+	<exec_method type='method' name='stop'
+		exec='/usr/bin/kill `cat /var/samba/locks/smbd.pid`'
+		timeout_seconds='60' />
+
+	<stability value='Unstable' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+			SMB file server
+			</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='smbsmbd' section='1m'
+			    manpath='/usr/share/man' />
+			<manpage title='smb.conf' section='4'
+			    manpath='/usr/share/man' />
+		</documentation>
+	</template>
+</service>
+
+</service_bundle>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/smbconf.sed	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,8 @@
+s/\/usr\/local\/samba\/lib/\/usr\/sfw\/lib/
+/log file = /c\
+   log file = /var/samba/log/log.%m
+/passdb backend = /c\
+   passdb backend = smbpasswd
+/include = /c\
+;  include = /usr/sfw/lib/smb.conf.%m
+s/\/usr\/spool/\/var\/spool/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/swat.xml	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,83 @@
+<?xml version="1.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
+#
+-->
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+	Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+
+	#ident	"@(#)swat.xml	1.4	10/07/26 SMI"
+
+	NOTE:  This service manifest is not editable; its contents will
+	be overwritten by package or patch operations, including
+	operating system upgrade.  Make customizations in a different
+	file.
+-->
+<!--
+	  Service manifest for the swat service
+	swat is the samba web administration tool
+-->
+<service_bundle type='manifest' name='SUNWsmbau:swat'>
+<service name='network/swat' type='service' version='1'>
+	<create_default_instance enabled='false' />
+	<restarter>
+		<service_fmri value='svc:/network/inetd:default' />
+	</restarter>
+	<exec_method type='method' name='inetd_start'
+		exec='/usr/sbin/swat' timeout_seconds='0'>
+		<method_context>
+			<method_credential user='root' group='root' />
+		</method_context>
+	</exec_method>
+	<exec_method type='method' name='inetd_disable'
+		exec=':kill' timeout_seconds='0'>
+	</exec_method>
+	<property_group name='inetd' type='framework'>
+		<stability value='Evolving' />
+		<propval name='name' type='astring' value='swat' />
+		<propval name='endpoint_type' type='astring' value='stream' />
+		<propval name='proto' type='astring' value='tcp' />
+		<propval name='wait' type='boolean' value='false' />
+		<propval name='isrpc' type='boolean' value='false' />
+	</property_group>
+
+	<stability value='Unstable' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'> swat </loctext>
+		</common_name>
+		<description>
+			<loctext xml:lang='C'>
+Swat support a browser interface to configure samba generating the /etc/samba/smb.conf .
+			</loctext>
+		</description>
+		<documentation>
+			<manpage title='samba' section='5'
+				manpath='/usr/share/man' />
+			<manpage title='smb.conf' section='4'
+			    manpath='/usr/share/man' />
+		</documentation>
+	</template>
+</service>
+
+</service_bundle>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/winbind.xml	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,94 @@
+<?xml version="1.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
+#
+-->
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+	Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+
+	#ident	"@(#)winbind.xml	1.2	10/07/26 SMI"
+
+	NOTE:  This service manifest is not editable; its contents will
+	be overwritten by package or patch operations, including
+	operating system upgrade.  Make customizations in a different
+	file.
+-->
+
+<service_bundle type='manifest' name='SUNWsmbar:winbind'>
+
+<service name='network/winbind' type='service' version='1'>
+
+	<create_default_instance enabled='false' />
+
+	<single_instance/>
+
+	<dependency name='net-loopback' grouping='require_any'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/loopback' />
+	</dependency>
+
+	<dependency name='net-service' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/service'/>
+	</dependency>
+
+	<dependency name='net-physical' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/physical' />
+	</dependency>
+
+	<dependency name='filesystem-local' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/system/filesystem/local' />
+	</dependency>
+
+	<dependent name='winbind_multi-user-server' grouping='optional_all'
+			restart_on='none'>
+		<service_fmri value='svc:/milestone/multi-user-server' />
+	</dependent>
+
+	<exec_method type='method' name='start'
+		exec='/usr/sbin/winbindd'
+		timeout_seconds='60' />
+
+	<exec_method type='method' name='stop'
+		exec='/usr/bin/kill `/usr/bin/cat /var/samba/locks/winbindd.pid`'
+		timeout_seconds='60' />
+
+	<stability value='Unstable' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+			MS Win. domain naming daemon
+			</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='winbindd' section='1m'
+			    manpath='/usr/share/man' />
+			<manpage title='smb.conf' section='4'
+			    manpath='/usr/share/man' />
+		</documentation>
+	</template>
+</service>
+
+</service_bundle>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/Solaris/wins.xml	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,94 @@
+<?xml version="1.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
+#
+-->
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+	Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+
+	#ident	"@(#)wins.xml	1.2	10/07/26 SMI"
+
+	NOTE:  This service manifest is not editable; its contents will
+	be overwritten by package or patch operations, including
+	operating system upgrade.  Make customizations in a different
+	file.
+-->
+
+<service_bundle type='manifest' name='SUNWsmbar:wins'>
+
+<service name='network/wins' type='service' version='1'>
+
+	<create_default_instance enabled='false' />
+
+	<single_instance/>
+
+	<dependency name='net-loopback' grouping='require_any'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/loopback' />
+	</dependency>
+
+	<dependency name='net-service' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/service'/>
+	</dependency>
+
+	<dependency name='net-physical' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/network/physical' />
+	</dependency>
+
+	<dependency name='filesystem-local' grouping='require_all'
+			restart_on='none' type='service'>
+		<service_fmri value='svc:/system/filesystem/local' />
+	</dependency>
+
+	<dependent name='wins_multi-user-server' grouping='optional_all'
+			restart_on='none'>
+		<service_fmri value='svc:/milestone/multi-user-server' />
+	</dependent>
+
+	<exec_method type='method' name='start'
+		exec='/usr/sbin/nmbd -D'
+		timeout_seconds='60' />
+
+	<exec_method type='method' name='stop'
+		exec='/usr/bin/kill `cat /var/samba/locks/nmbd.pid`'
+		timeout_seconds='60' />
+
+	<stability value='Unstable' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+			MS Win. domain naming daemon
+			</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='nmbd' section='1m'
+			    manpath='/usr/share/man' />
+			<manpage title='smb.conf' section='4'
+			    manpath='/usr/share/man' />
+		</documentation>
+	</template>
+</service>
+
+</service_bundle>
--- a/usr/src/cmd/samba/configure.in-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
---- samba-3.0.25/source/configure.in	Mon Apr  9 10:31:00 2007
-+++ samba-3.0.25-fix/source/configure.in	Wed Apr 11 02:48:55 2007
-@@ -3247,6 +3247,20 @@
-     with_ldap_support=yes
-     AC_MSG_CHECKING(whether LDAP support is used)
-     AC_MSG_RESULT(yes)
-+
-+    ################################
-+    # Check if the Netscape LDAP SDK
-+    AC_CACHE_CHECK([for LDAP_OPT_SIZELIMIT macro],samba_cv_HAVE_LDAP_NSC,[
-+    AC_TRY_COMPILE([
-+#include <stdio.h>
-+#include <ldap.h>],
-+    [printf("%s\n", LDAP_OPT_SIZELIMIT);],
-+    samba_cv_HAVE_LDAP_NSC=yes,samba_cv_HAVE_LDAP_NSC=no)])
-+    if test x"$samba_cv_HAVE_LDAP_NSC" = x"yes"; then
-+	AC_DEFINE(HAVE_HAVE_LDAP_NSC,1,
-+		[Whether the LDAP API is Netscape SDK])
-+    fi
-+
-   else
-     if test x"$with_ldap_support" = x"yes"; then
- 	AC_MSG_ERROR(libldap is needed for LDAP support)
-@@ -3309,15 +3323,25 @@
-     fi
-     ;;
- 	*)
--    AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
-+    # Omit the ldap_initialize() test if there is a Netscape SDK
-+    # (Mozilla Directory server 5)
-+    if test x"$samba_cv_HAVE_LDAP_NSC" = x"no"; then
- 
--    if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
--	if test x"$with_ads_support" = x"yes"; then
--	    AC_MSG_ERROR(Active Directory support requires ldap_initialize)
--	elif test x"$with_ads_support" = x"auto"; then
--	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
--	    with_ads_support=no
-+	AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
-+
-+	if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
-+	    if test x"$with_ads_support" = x"yes"; then
-+		AC_MSG_ERROR(Active Directory support requires ldap_initialize)
-+	    elif test x"$with_ads_support" = x"auto"; then
-+		AC_MSG_WARN(Disabling Active Directory support (requires ldap_in
-+itialize))
-+		with_ads_support=no
-+	    fi
-+
- 	fi
-+     else
-+	AC_MSG_RESULT(Active Directory support on Netscape LDAP SDK - limited fu
-+nctionality?)
-     fi
-     ;;
- esac
-@@ -3373,6 +3397,19 @@
-   #################################################
-   # check for krb5-config from recent MIT and Heimdal kerberos 5
-   AC_PATH_PROG(KRB5CONFIG, krb5-config)
-+
-+  #################################################
-+  # check if MIT krb5 API is present
-+  AC_MSG_CHECKING(for type of kerberos)
-+  if $KRB5CONFIG --version | grep -s MIT > /dev/null ; then
-+    FOUND_KRB5_MIT=yes
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(HAVE_KRB5_MIT,1,[Whether the krb5 API is MIT])
-+  else
-+    FOUND_KRB5_MIT=no
-+    AC_MSG_RESULT(no)
-+  fi
-+
-   AC_MSG_CHECKING(for working krb5-config)
-   if test -x "$KRB5CONFIG"; then
-     ac_save_CFLAGS=$CFLAGS
-@@ -3379,10 +3416,17 @@
-     CFLAGS="";export CFLAGS
-     ac_save_LDFLAGS=$LDFLAGS
-     LDFLAGS="";export LDFLAGS
--    KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
--    KRB5_LDFLAGS="`$KRB5CONFIG --libs gssapi | sed s/-lgss.*//`"
--    KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
--    KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+    if test x"$FOUND_KRB5_MIT" = x"yes"; then
-+	KRB5_LIBS="`$KRB5CONFIG --libs | sed s/-lkrb5//`"
-+	KRB5_LDFLAGS="-lkrb5 -lgss"
-+	KRB5_CFLAGS=""
-+	KRB5_CPPFLAGS="`$KRB5CONFIG --cflags`" 
-+    else
-+	KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
-+	KRB5_LDFLAGS="`$KRB5CONFIG --libs gssapi | sed s/-lgss.*//`"
-+	KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+	KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+    fi
-     CFLAGS=$ac_save_CFLAGS;export CFLAGS
-     LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
-     FOUND_KRB5=yes
-@@ -6034,6 +6078,7 @@
- SMB_MODULE(vfs_aixacl, \$(VFS_AIXACL_OBJ), "bin/aixacl.$SHLIBEXT", VFS)
- SMB_MODULE(vfs_aixacl2, \$(VFS_AIXACL2_OBJ), "bin/aixacl2.$SHLIBEXT", VFS)
- SMB_MODULE(vfs_solarisacl, \$(VFS_SOLARISACL_OBJ), "bin/solarisacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
- SMB_MODULE(vfs_irixacl, \$(VFS_IRIXACL_OBJ), "bin/irixacl.$SHLIBEXT", VFS)
- SMB_MODULE(vfs_hpuxacl, \$(VFS_HPUXACL_OBJ), "bin/hpuxacl.$SHLIBEXT", VFS)
- SMB_MODULE(vfs_tru64acl, \$(VFS_TRU64ACL_OBJ), "bin/tru64acl.$SHLIBEXT", VFS)
--- a/usr/src/cmd/samba/install-sfw	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/samba/install-sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -19,263 +19,182 @@
 #
 # CDDL HEADER END
 #
-#
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)install-sfw	1.34	10/04/22 SMI"
+#ident	"@(#)install-sfw	1.36	10/08/05 SMI"
+
+set -e
 
 TOP=`pwd`
-PREFIX=${ROOT}/usr/sfw
+PREFIX=${ROOT}/usr
 PAMDIR=${ROOT}/usr/lib/security
+PAMDIR64=${ROOT}/usr/lib/security/${MACH64}
 BINDIR=${PREFIX}/bin
 SBINDIR=${PREFIX}/sbin
 LIBDIR=${PREFIX}/lib
-INCLUDEDIR=${PREFIX}/include
+LIBDIR64=${PREFIX}/lib/${MACH64}
+SAMBALIBDIR=${PREFIX}/lib/samba
+SAMBALIBDIR64=${PREFIX}/lib/samba/${MACH64}
+INCLUDEDIR=${PREFIX}/include/samba
+SFWINCLUDEDIR=${PREFIX}/sfw/include
+SFWLIBDIR=${PREFIX}/sfw/lib
 VARDIR=${ROOT}/var/samba
 SHAREDIR=${PREFIX}/share
 MANDIR=${SHAREDIR}/man
 MAN1DIR=${SHAREDIR}/man/man1
 MAN4DIR=${SHAREDIR}/man/man4
-MAN7DIR=${SHAREDIR}/man/man7
+MAN5DIR=${SHAREDIR}/man/man5
 MAN1MDIR=${SHAREDIR}/man/man1m
-SWATDIR=${PREFIX}/swat
-CODEPAGEDIR=${LIBDIR}/codepages
+SWATDIR=${PREFIX}/share/samba/swat
+CODEPAGEDIR=${SAMBALIBDIR}/codepages
 ETC=${ROOT}/etc
-ETCSFWDIR=${ETC}/sfw
+ETCSMBDIR=${ETC}/samba
 
 . ${SRC}/tools/install.subr
 
-SMBBUILD=${TOP}/${SAMBAVERS}
-PROTOTMP=${TOP}/${SMBPROTOTMP}
-
-fix_man() {
-# This is workaround for incompatibility between nroff and groff
-# See CR 6902485
-# It might not work for any samba different from 3.0.37
-
-	chmod +w "$1"
-
-	ed "$1" <<-'EOT'
-		/^\.TH/+1,/^\.\\" \* MAIN CONTENT STARTS HERE/-10d
-		,s/\\FC//g
-		,s/\\F\[\]//g
-		w
-		q
-	EOT
-}
-
-# The samba manpages are updated by Sun to include a comment, an
-# ATTRIBUTES section with stability classification, and a NOTES
-# section containing a pointer to the source package. We do this
-# automatically at install time.
-
 MANSCRIPT=${TOP}/sunman-stability
 
-cd ${PROTOTMP}/usr/sfw/share/man/man1
-
-for i in *.1
-do
-	fix_man $i
-	base=`basename $i 1`
-	manpage=${base}1
-	_install M ${i} ${MAN1DIR}/${manpage} 444
-done
-
-# Section 5 of the Solaris man pages is normally reserved for
-# "Standards, Environments, and Macros".  Therefore, any man
-# pages describing "File Formats" should be moved to section 4
-# as per project requirements described in PSARC/2000/488.
-
-cd ${PROTOTMP}/usr/sfw/share/man/man5
-
-for i in *.5
-do
-	fix_man $i
-	base=`basename $i 5`
-	manpage=${base}4
-	_install M ${i} ${MAN4DIR}/${manpage} 444
-done
-
-cd ${PROTOTMP}/usr/sfw/share/man/man7
-
-for i in *.7
-do
-	fix_man $i
-	base=`basename $i 7`
-	manpage=${base}7
-	_install M ${i} ${MAN7DIR}/${manpage} 444
-done
-
-cd ${PROTOTMP}/usr/sfw/share/man/man8
+# profiles already does exist in Solaris, we have to rename (see PSARC/2009/682)
+mv -f ${BINDIR}/profiles ${BINDIR}/smbprofiles
 
-for i in *.8
-do
-  case `basename $i .8` in
-    smbmount | smbmnt | smbumount | mount.cifs | umount.cifs | cifs.upcall | \
-    vfs_xattr_tdb | vfs_default_quota | vfs_cap | idmap_ad | vfs_gpfs | \
-    idmap_tdb | idmap_rid | vfs_catia | idmap_nss | vfs_audit | idmap_ldap | \
-    vfs_commit | vfs_recycle | eventlogadm | vfs_prealloc | vfs_netatalk | \
-    vfs_readonly | vfs_readahead | vfs_cacheprime | vfs_fake_perms | \
-    vfs_full_audit | vfs_extd_audit | vfs_notify_fam | vfs_shadow_copy)
-	echo "Man page of $i vfs-module will not be installed"
-		;;
-    *)
-	fix_man $i
-	base=`basename $i 8`
-	manpage=${base}1m
-	_install M ${i} ${MAN1MDIR}/${manpage} 444
-		;;
-  esac
-done
-
-#
-# transfer the SWAT pages
-#
-
-cd ${PROTOTMP}/usr/sfw
-
-# copy the directory structure
-for i in `find swat -type d | tail '+2l' | sed -e 's#^swat/##'`
-do
-	if [ -d ${SWATDIR}/$i ] ; then
-		chmod 755 ${SWATDIR}/$i
-	else
-		rm -f ${SWATDIR}/${i}
-		mkdir -m 755 ${SWATDIR}/${i}
-	fi
-done
-
-# transfer the non-html files
-for i in `find swat -type f \! -name \*.html | sed -e 's#^swat/##'`
-do
-	_install N swat/${i} ${SWATDIR}/${i} 444
-done
+# smbtorture
+cd ${TOP}/${VER}/source3/bin
+_install E smbtorture ${SAMBALIBDIR}/smbtorture 755
 
-MANSCRIPT=${TOP}/sunhtml-stability
-# transfer the html files
-for i in `find swat -type f -name \*.html | sed -e 's#^swat/##'`
-do
-	di=`echo ${i} | sed -e 's/\.8\.html$/\.1m\.html/;s/\.5\.html$/\.4\.html/'`
-	_install M swat/${i} ${SWATDIR}/${di} 444
-done
-
-_install L samba.7.html ${SWATDIR}/help/manpages/Samba.7.html
-
-# Samba daemons
-cd ${PROTOTMP}/usr/sfw/sbin
-for i in *
-do
-        _install E $i ${SBINDIR}/$i 555
-done
-
-# Samba executables
-cd ${PROTOTMP}/usr/sfw/bin
-for i in *
-do
-	if file $i | grep script > /dev/null ; then
-		if file $i | grep perl > /dev/null ; then
-			_fixup_perl $i
-		fi
-		_install S $i ${BINDIR}/$i 555
-	else
-		_install E $i ${BINDIR}/$i 555
-	fi
-done
-
-# create the /usr/sfw/lib samba subdirs
-cd ${PROTOTMP}/usr/sfw
-for i in `find lib  -type d | tail '+2l' | sed -e 's#lib/##'`
-do
-	if [ -d ${LIBDIR}/$i ] ; then
-		chmod 755 ${LIBDIR}/$i
-	else
-		rm -f ${LIBDIR}/$i
-		mkdir -m 755 ${LIBDIR}/$i
-	fi
-done
-if [ -d ${CODEPAGEDIR} ] ; then
-	chmod 755 ${CODEPAGEDIR}
-else
-	rm -f ${CODEPAGEDIR}
-	mkdir -m 755 ${CODEPAGEDIR}
-fi
-
-# Samba shared libraries
-cd ${PROTOTMP}/usr/sfw/lib
-for i in lib*.so
-do
-        _install D $i ${LIBDIR}/$i.0 555
-	_install L $i.0 ${LIBDIR}/$i
-	rm $i
-done
-
-_install L ../idmap/ad.so ${LIBDIR}/nss_info/sfu.so
-_install L ../idmap/ad.so ${LIBDIR}/nss_info/rfc2307.so
-
-# UTF-8 case conversion tables
-cd ${PROTOTMP}/usr/sfw/lib
-for i in lowcase.dat upcase.dat valid.dat
-do
-	_install N $i ${CODEPAGEDIR}/${i} 444
-	_install L codepages/$i ${LIBDIR}/$i
-	rm $i
-done
-
-# Samba dynamic loadable modules
-cd ${PROTOTMP}/usr/sfw
-for i in `find lib -type f -name \*.so | sed -e 's#lib/##'`
-do
-	_install D lib/$i ${LIBDIR}/$i 555
-	rm lib/$i
-done
-
-# other files than modules
-for i in `find lib -type f | sed -e 's#lib/##'`
-do
-	_install N lib/$i ${LIBDIR}/$i 444
-	rm lib/$i
-done
+# Samba 64 bit shared libraries
+cd ${TOP}/${VER64}/source3/bin
+${SRC}/tools/install-proto -d -m 0755 ${SAMBALIBDIR64}
+_install D libtalloc.so ${SAMBALIBDIR64}/libtalloc.so.1 555
+_install L libtalloc.so.1 ${SAMBALIBDIR64}/libtalloc.so
+_install D libtdb.so ${SAMBALIBDIR64}/libtdb.so.1 555
+_install L libtdb.so.1 ${SAMBALIBDIR64}/libtdb.so
+_install D libwbclient.so ${SAMBALIBDIR64}/libwbclient.so.0 555
+_install L libwbclient.so.0 ${SAMBALIBDIR64}/libwbclient.so
 
 # Samba PAM module(s)
-cd ${SMBBUILD}/source/bin
-for i in pam_winbind
-do
-	_install D $i.so ${PAMDIR}/$i.so.1 555
-	_install L $i.so.1 ${PAMDIR}/$i.so
-done
+${SRC}/tools/install-proto -d -m 0755 ${PAMDIR}
+cd ${TOP}/${VER}/source3/bin
+_install D pam_winbind.so ${PAMDIR}/pam_winbind.so.1 555
+_install L pam_winbind.so.1 ${PAMDIR}/pam_winbind.so
+${SRC}/tools/install-proto -d -m 0755 ${PAMDIR64}
+cd ${TOP}/${VER64}/source3/bin
+_install D pam_winbind.so ${PAMDIR64}/pam_winbind.so.1 555
+_install L pam_winbind.so.1 ${PAMDIR64}/pam_winbind.so
 
 # Samba nsswitch modules
-cd ${SMBBUILD}/source/nsswitch
-_install D libnss_wins.so ${ROOT}/usr/lib/nss_wins.so.1 555
-_install D libnss_winbind.so ${ROOT}/usr/lib/nss_winbind.so.1 555
-_install L nss_wins.so.1 ${ROOT}/usr/lib/nss_wins.so
-_install L nss_winbind.so.1 ${ROOT}/usr/lib/nss_winbind.so
+cd ${TOP}/${VER}/nsswitch
+_install D libnss_wins.so ${LIBDIR}/nss_wins.so.1 555
+_install D libnss_winbind.so ${LIBDIR}/nss_winbind.so.1 555
+_install L nss_wins.so.1 ${LIBDIR}/nss_wins.so
+_install L nss_winbind.so.1 ${LIBDIR}/nss_winbind.so
+
+${SRC}/tools/install-proto -d -m 0755 ${LIBDIR64}
+cd ${TOP}/${VER64}/nsswitch
+_install D libnss_wins.so ${LIBDIR64}/nss_wins.so.1 555
+_install D libnss_winbind.so ${LIBDIR64}/nss_winbind.so.1 555
+_install L nss_wins.so.1 ${LIBDIR64}/nss_wins.so
+_install L nss_winbind.so.1 ${LIBDIR64}/nss_winbind.so
 
 
 # header files deployment - used by other packages built:
-#    libsmbclient.h - is used by gnome-vfs (JDS)
+${SRC}/tools/install-proto -d -m 0755 ${INCLUDEDIR}
+cd ${INCLUDEDIR}
+mv -f ../libsmbclient.h ../netapi.h ../smb_share_modes.h \
+      ../talloc.h ../tdb.h ../wbclient.h ../wbc_async.h .
 
-cd ${SMBBUILD}/source/
-_install N include/libsmbclient.h ${INCLUDEDIR}/libsmbclient.h 444
-
+################################################################################
+# Application released under GPLv2 can not link GPLv3 libraries so the original
+# libsmbclient API from samba 3.0.x released under the GPLv2 should be provided
+# for such apps.
+# Currently only JDS part called gnome-VFS is using libsmbclient under the
+# LSARC/2006/350/commitment.materials/materials/contracts/PSARC-2000-488-samba.txt
+#
+cd ${TOP}/${VER30}/source
+_install N include/libsmbclient.h ${SFWINCLUDEDIR}/libsmbclient.h 444
+_install D bin/libsmbclient.so ${SFWLIBDIR}/libsmbclient.so.0 555
+_install L libsmbclient.so.0 ${SFWLIBDIR}/libsmbclient.so
+################################################################################
 
 cd ${TOP}
 
 # deliver the service files
 
-# Edited and renamed smb.conf.default to smb.conf-sample for Solaris use.
-rm -f ${ETCSFWDIR}/smb.conf-example
-sed -f smbconf.sed ${SMBBUILD}/examples/smb.conf.default \
-	> ${ETCSFWDIR}/smb.conf-example
-chmod 444 ${ETCSFWDIR}/smb.conf-example
+# Modify smb.conf.default as smb.conf-example for Solaris use.
+rm -f ${ETCSMBDIR}/smb.conf-example
+sed -f Solaris/smbconf.sed ${VER}/examples/smb.conf.default \
+	> ${ETCSMBDIR}/smb.conf-example
+chmod 444 ${ETCSMBDIR}/smb.conf-example
 
 # deliver the pam.conf-winbind configuration template
-_install N pam.conf-winbind ${ROOT}/etc/pam.conf-winbind 444
+_install N Solaris/pam.conf-winbind ${ROOT}/etc/pam.conf-winbind 444
 
 # install smf manifests
-_install N wins.xml ${ROOT}/lib/svc/manifest/network/wins.xml 444
-_install N samba.xml ${ROOT}/lib/svc/manifest/network/samba.xml 444
-_install N swat.xml ${ROOT}/lib/svc/manifest/network/swat.xml 444
-_install N winbind.xml ${ROOT}/lib/svc/manifest/network/winbind.xml 444
+_install N Solaris/wins.xml ${ROOT}/lib/svc/manifest/network/wins.xml 444
+_install N Solaris/samba.xml ${ROOT}/lib/svc/manifest/network/samba.xml 444
+_install N Solaris/swat.xml ${ROOT}/lib/svc/manifest/network/swat.xml 444
+_install N Solaris/winbind.xml ${ROOT}/lib/svc/manifest/network/winbind.xml 444
+
+
+################################################################################
+# Man pages
+################################################################################
+
+(
+	cd ${VER}/docs-xml/output/manpages-3
+
+	for i in *.1
+	do
+		case "$i" in
+			profiles.1)
+				# Name clash
+				_install M ${i} ${MAN1DIR}/smb${i} 444
+				;;
+			*)
+				_install M ${i} ${MAN1DIR}/${i} 444
+				;;
+		esac
+	done
+
+	# *.7 go to section .5 "facilities"
+	for i in *.7
+	do
+		base=`basename $i 7`
+		manpage=${base}5
+		_install M ${i} ${MAN5DIR}/${manpage} 444
+	done
+
+
+	# Section 5 of the Solaris man pages is normally reserved for
+	# "Standards, Environments, and Macros".  Therefore, any man
+	# pages describing "File Formats" should be moved to section 4
+	# as per project requirements described in PSARC/2000/488.
+	for i in *.5
+	do
+		base=`basename $i 5`
+		manpage=${base}4
+		_install M ${i} ${MAN4DIR}/${manpage} 444
+	done
+
+	# *.8 goes to section 1m
+	for i in *.8
+	do
+		case "$i" in
+			mount.cifs.8 | umount.cifs.8 )
+				echo Not installing $i
+				;;
+			smbd.8)
+				# Name clash
+				base=`basename $i 8`
+				manpage=${base}1m
+				_install M ${i} ${MAN1MDIR}/smb${manpage} 444
+				;;
+			*)
+				base=`basename $i 8`
+				manpage=${base}1m
+				_install M ${i} ${MAN1MDIR}/${manpage} 444
+				;;
+		esac
+	done
+)
 
 exit 0
--- a/usr/src/cmd/samba/ldap_add_result_entry.c	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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
- */
-/*
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 or any later version
- * as published by the Free Software Foundation.
- *
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"@(#)ldap_add_result_entry.c	1.2	07/05/14 SMI"
-
-#include "sunwrap.h"
-
-/* "e_" like "exposed" :-) */
-
-typedef struct e_ldapmsg {
-	int		lm_msgid;	/* the message id */
-	int		lm_msgtype;	/* the message type */
-	BerElement	*lm_ber;	/* the ber encoded message contents */
-	struct e_ldapmsg *lm_chain;	/* for search - next msg in the resp */
-	struct e_ldapmsg *lm_next;	/* next response */
-	unsigned long	lm_time;	/* used to maintain cache */
-} e_LDAPMessage;
-
-void ldap_add_result_entry(LDAPMessage **list, LDAPMessage *e) {
-	e_LDAPMessage *e_e = (e_LDAPMessage *) e,
-		**e_list = (e_LDAPMessage **) list;
-	e_e->lm_chain = *e_list; *e_list = e_e;
-}
--- a/usr/src/cmd/samba/libsam.c	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"@(#)libsam.c	1.1	08/09/17 SMI"
-
-/*
- * this is the fake library to stub the lazyloaded SUNWsamfs calls
- */
-int sam_stat() { return (1); }
-int sam_segment_stat() { return (1); }
--- a/usr/src/cmd/samba/makefile-sunwrap	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)makefile-sunwrap	1.1	07/02/20 SMI"
-
-SOURCES= ldap_add_result_entry.c
-OBJS= $(SOURCES:.c=.o)
-
-all:	libsunwrap.a
-
-include ../Makefile.cmd
-
-clean:
-	-rm -f $(OBJS) libsunwrap.a
-
-%.o:%.c sunwrap.h
-	$(CC) $(CPPFLAGS) -I/usr/include/kerberosv5 $(CFLAGS) -c $< -o $@
-
-libsunwrap.a:	$(OBJS)
-	$(AR) rv $@ $?
-
-include ../Makefile.targ
-
-.SUFFIXES:
-
--- a/usr/src/cmd/samba/makefile.in-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- samba-3.0.25/source/Makefile.in	Wed Feb 28 20:55:16 2007
-+++ samba-3.0.25-fix/source/Makefile.in	Tue Mar 20 07:48:26 2007
-@@ -415,6 +415,7 @@
- VFS_AIXACL_OBJ = modules/vfs_aixacl.o modules/vfs_aixacl_util.o
- VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_acls.o
- VFS_SOLARISACL_OBJ = modules/vfs_solarisacl.o
-+VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o modules/nfs4_acls.o
- VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
- VFS_IRIXACL_OBJ = modules/vfs_irixacl.o
- VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o
-@@ -1436,6 +1437,11 @@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_SOLARISACL_OBJ) \
- 		@SONAMEFLAG@`basename $@`
- 
-+bin/zfsacl.@SHLIBEXT@: $(VFS_ZFSACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_ZFSACL_OBJ) \
-+		@SONAMEFLAG@`basename $@`
-+
- bin/irixacl.@SHLIBEXT@: proto_exists $(VFS_IRIXACL_OBJ)
- 	@echo "Building plugin $@"
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(VFS_IRIXACL_OBJ) \
--- a/usr/src/cmd/samba/pam.conf-winbind	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +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
-#
-#ident	"@(#)pam.conf-winbind	1.1	07/02/20 SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# PAM configuration
-#
-# Unless explicitly defined, all services use the modules
-# defined in the "other" section.
-#
-# Modules are defined with relative pathnames, i.e., they are
-# relative to /usr/lib/security/$ISA. Absolute path names, as
-# present in this file in previous releases are still acceptable.
-#
-# Authentication management
-#
-# login service (explicit because of pam_dial_auth)
-#
-login	auth requisite		pam_authtok_get.so.1
-login	auth required		pam_dhkeys.so.1
-login	auth required		pam_unix_cred.so.1
-login	auth required		pam_unix_auth.so.1
-login	auth required		pam_dial_auth.so.1
-#
-# rlogin service (explicit because of pam_rhost_auth)
-#
-rlogin	auth sufficient		pam_rhosts_auth.so.1
-rlogin	auth requisite		pam_authtok_get.so.1
-rlogin	auth required		pam_dhkeys.so.1
-rlogin	auth required		pam_unix_cred.so.1
-rlogin	auth required		pam_unix_auth.so.1
-#
-# Kerberized rlogin service
-#
-krlogin	auth required		pam_unix_cred.so.1
-krlogin	auth binding		pam_krb5.so.1
-krlogin	auth required		pam_unix_auth.so.1
-#
-# rsh service (explicit because of pam_rhost_auth,
-# and pam_unix_auth for meaningful pam_setcred)
-#
-rsh	auth sufficient		pam_rhosts_auth.so.1
-rsh	auth required		pam_unix_cred.so.1
-#
-# Kerberized rsh service
-#
-krsh	auth required		pam_unix_cred.so.1
-krsh	auth binding		pam_krb5.so.1
-krsh	auth required		pam_unix_auth.so.1
-#
-# Kerberized telnet service
-#
-ktelnet	auth required		pam_unix_cred.so.1
-ktelnet	auth binding		pam_krb5.so.1
-ktelnet	auth required		pam_unix_auth.so.1
-#
-# PPP service (explicit because of pam_dial_auth)
-#
-ppp	auth requisite		pam_authtok_get.so.1
-ppp	auth required		pam_dhkeys.so.1
-ppp	auth required		pam_unix_cred.so.1
-ppp	auth required		pam_unix_auth.so.1
-ppp	auth required		pam_dial_auth.so.1
-#
-# Default definitions for Authentication management
-# Used when service name is not explicitly mentioned for authentication
-#
-other	auth requisite		pam_authtok_get.so.1
-other	auth required		pam_dhkeys.so.1
-other	auth required		pam_unix_cred.so.1
-other	auth required		pam_unix_auth.so.1
-#
-# passwd command (explicit because of a different authentication module)
-#
-passwd	auth required		pam_passwd_auth.so.1
-#
-# cron service (explicit because of non-usage of pam_roles.so.1)
-#
-cron	account required	pam_unix_account.so.1
-#
-# Default definition for Account management
-# Used when service name is not explicitly mentioned for account management
-#
-other	account requisite	pam_roles.so.1
-other	account sufficient	pam_unix_account.so.1
-other	account required	pam_winbind.so
-#
-# Default definition for Session management
-# Used when service name is not explicitly mentioned for session management
-#
-other	session required	pam_unix_session.so.1
-#
-# Default definition for  Password management
-# Used when service name is not explicitly mentioned for password management
-#
-other	password required	pam_dhkeys.so.1
-other	password requisite	pam_authtok_get.so.1
-other	password requisite	pam_authtok_check.so.1
-other	password required	pam_winbind.so
-other	password required	pam_authtok_store.so.1
-#
-# Support for Kerberos V5 authentication and example configurations can
-# be found in the pam_krb5(5) man page under the "EXAMPLES" section.
-#
Binary file usr/src/cmd/samba/samba-3.5.4.tar.gz has changed
--- a/usr/src/cmd/samba/samba.xml	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?xml version="1.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
-#
--->
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
-	Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-	Use is subject to license terms.
-
-	#ident	"@(#)samba.xml	1.5	07/05/14 SMI"
-
-	NOTE:  This service manifest is not editable; its contents will
-	be overwritten by package or patch operations, including
-	operating system upgrade.  Make customizations in a different
-	file.
--->
-
-<service_bundle type='manifest' name='SUNWsmbar:samba'>
-
-<service name='network/samba' type='service' version='1'>
-
-	<create_default_instance enabled='false' />
-
-	<single_instance/>
-
-	<dependency name='net-loopback' grouping='require_any'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/loopback' />
-	</dependency>
-
-	<dependency name='net-service' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/service'/>
-	</dependency>
-
-	<dependency name='net-physical' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/physical' />
-	</dependency>
-
-	<dependency name='filesystem-local' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/system/filesystem/local' />
-	</dependency>
-
-	<dependent name='samba_multi-user-server' grouping='optional_all'
-			restart_on='none'>
-		<service_fmri value='svc:/milestone/multi-user-server' />
-	</dependent>
-
-	<exec_method type='method' name='start'
-		exec='/usr/sfw/sbin/smbd -D'
-		timeout_seconds='170' />
-
-	<exec_method type='method' name='stop'
-		exec='/usr/bin/kill `cat /var/samba/locks/smbd.pid`'
-		timeout_seconds='60' />
-
-	<stability value='Unstable' />
-
-	<template>
-		<common_name>
-			<loctext xml:lang='C'>
-			SMB file server
-			</loctext>
-		</common_name>
-		<documentation>
-			<manpage title='smbd' section='1m'
-			    manpath='/usr/sfw/man' />
-			<manpage title='smb.conf' section='4'
-			    manpath='/usr/sfw/man' />
-		</documentation>
-	</template>
-</service>
-
-</service_bundle>
--- a/usr/src/cmd/samba/samfs-configure.in-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
---- configure.in-1st	Thu Sep 11 07:28:09 2008
-+++ samba-3.0.32/source/configure.in	Thu Sep 11 17:42:40 2008
-@@ -305,6 +305,7 @@
- AC_SUBST(KRB5_LIBS)
- AC_SUBST(UUID_LIBS)
- AC_SUBST(LDAP_LIBS)
-+AC_SUBST(SAMFS_LIBS)
- AC_SUBST(PAM_MODULES)
- AC_SUBST(INSTALL_PAM_MODULES)
- AC_SUBST(UNINSTALL_PAM_MODULES)
-@@ -5494,6 +5495,28 @@
- )
- 
- #################################################
-+# check for samfs support
-+
-+#with_samfs_support=no
-+AC_MSG_CHECKING(whether to support samfs)
-+AC_ARG_WITH(samfs-support,
-+[  --with-samfs-support    Include Solaris SamFS support (default=no)],
-+[ case "$withval" in
-+  yes)
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(WITH_SAMFS,1,[Whether to include Sun SamFS support])
-+	SAMFS_LIBS="-R/opt/SUNWsamfs/lib -zlazyload -lsam -znolazyload"
-+	;;
-+  *)
-+	AC_MSG_RESULT(no)
-+	SAMFS_LIBS=""
-+	;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+
-+#################################################
- # check for sendfile support
- 
- with_sendfile_support=yes
--- a/usr/src/cmd/samba/samfs-includes.h-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
---- includes.h	Thu Sep 11 08:04:14 2008
-+++ samba-3.0.32/source/include/includes.h	Thu Sep 11 08:13:28 2008
-@@ -216,6 +216,31 @@
- #include <gssapi/gssapi_generic.h>
- #endif
- 
-+#ifdef WITH_SAMFS
-+/* Michael Adam <[email protected]>: sun samfs stuff 
-+ *   should be included after sys/stat.h but this breaks compilation
-+ *   since some macros are undefined, some redefined differently.
-+ *   so I undo some defines done by samfs stat.h */
-+
-+#include <samfs/stat.h>
-+/* repare samfs-stat.h */
-+#undef S_ISUID
-+#define S_ISUID         0x800   /* set user id on execution */
-+#undef S_ISGID
-+#define S_ISGID         0x400   /* set group id on execution */
-+
-+#if !defined(_XOPEN_SOURCE) && !defined(_POSIX_C_SOURCE) || \
-+	        defined(__EXTENSIONS__)
-+#define st_atime        st_atim.tv_sec
-+#define st_mtime        st_mtim.tv_sec
-+#define st_ctime        st_ctim.tv_sec
-+#else
-+#define st_atime        st_atim.__tv_sec
-+#define st_mtime        st_mtim.__tv_sec
-+#define st_ctime        st_ctim.__tv_sec
-+#endif /* !defined(_XOPEN_SOURCE) && !defined(_POSIX_C_SOURCE) || ... */
-+#endif /* defined WITH_SAMFS */
-+
- #if HAVE_COM_ERR_H
- #include <com_err.h>
- #endif
--- a/usr/src/cmd/samba/samfs-makefile.in-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
---- makefile.in-1st	Thu Sep 11 07:49:05 2008
-+++ samba-3.0.32/source/Makefile.in	Thu Sep 11 08:00:55 2008
-@@ -42,6 +42,7 @@
- IDMAP_LIBS=@IDMAP_LIBS@
- KRB5LIBS=@KRB5_LIBS@
- LDAP_LIBS=@LDAP_LIBS@
-+SAMFS_LIBS=@SAMFS_LIBS@
- NSCD_LIBS=@NSCD_LIBS@
- UUID_LIBS=@UUID_LIBS@
- 
-@@ -235,6 +236,8 @@
- 
- TALLOC_OBJ = lib/talloc/talloc.o
- 
-+SAMFS_OBJ = smbd/samfs.o
-+
- LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(TALLOC_OBJ)
- 
- LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
-@@ -474,6 +477,7 @@
- 	       smbd/change_trust_pw.o smbd/fake_file.o \
- 	       smbd/quotas.o smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
- 	       $(AFS_SETTOKEN_OBJ) smbd/aio.o smbd/statvfs.o \
-+	       $(SAMFS_OBJ) \
- 	       smbd/dmapi.o $(MANGLE_OBJ) @VFS_STATIC@
- 
- SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
-@@ -966,7 +970,8 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
- 		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
--		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @SMBD_LIBS@
-+		$(ACL_LIBS) $(PASSDB_LIBS) $(SAMFS_LIBS) \
-+		$(LIBS) @POPTLIBS@ @SMBD_LIBS@
- 
- bin/nmbd@EXEEXT@: proto_exists $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
- 	@echo Linking $@
--- a/usr/src/cmd/samba/samfs-param_loadparm.c-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
---- loadparm.c	Thu Sep 11 08:19:03 2008
-+++ samba-3.0.32/source/param/loadparm.c	Thu Sep 11 08:24:32 2008
-@@ -449,6 +449,7 @@
- 	BOOL bProfileAcls;
- 	BOOL bMap_acl_inherit;
- 	BOOL bAfs_Share;
-+	BOOL bSamfs_Share;
- 	BOOL bEASupport;
- 	BOOL bAclCheckPermissions;
- 	BOOL bAclMapFullControl;
-@@ -592,6 +593,7 @@
- 	False,			/* bProfileAcls */
- 	False,			/* bMap_acl_inherit */
- 	False,			/* bAfs_Share */
-+	False,			/* bSamfs_Share */
- 	False,			/* bEASupport */
- 	True,			/* bAclCheckPermissions */
- 	True,			/* bAclMapFullControl */
-@@ -1015,6 +1017,7 @@
- 
- 	{"enable asu support", P_BOOL, P_GLOBAL, &Globals.bASUSupport, NULL, NULL, FLAG_ADVANCED}, 
- 	{"svcctl list", P_LIST, P_GLOBAL, &Globals.szServicesList, NULL, NULL, FLAG_ADVANCED},
-+	{"samfs share", P_BOOL, P_LOCAL, &sDefault.bSamfs_Share, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL},
- 
- 	{N_("Tuning Options"), P_SEP, P_SEPARATOR}, 
- 
-@@ -2137,6 +2140,7 @@
- FN_LOCAL_BOOL(lp_profile_acls, bProfileAcls)
- FN_LOCAL_BOOL(lp_map_acl_inherit, bMap_acl_inherit)
- FN_LOCAL_BOOL(lp_afs_share, bAfs_Share)
-+FN_LOCAL_BOOL(lp_samfs_share, bSamfs_Share)
- FN_LOCAL_BOOL(lp_acl_check_permissions, bAclCheckPermissions)
- FN_LOCAL_BOOL(lp_acl_group_control, bAclGroupControl)
- FN_LOCAL_BOOL(lp_acl_map_full_control, bAclMapFullControl)
--- a/usr/src/cmd/samba/samfs-smbd_dosmode.c-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- dosmode.c	Thu Sep 11 08:26:11 2008
-+++ samba-3.0.32/source/smbd/dosmode.c	Thu Sep 11 08:27:43 2008
-@@ -406,6 +406,8 @@
- 		result |= aHIDDEN;
- 	}
- 
-+	result |= samfs_mode(conn, path);
-+
- 	DEBUG(8,("dos_mode returning "));
- 
- 	if (result & aHIDDEN) DEBUG(8, ("h"));
-@@ -414,6 +416,7 @@
- 	if (result & aDIR   ) DEBUG(8, ("d"));
- 	if (result & aARCH  ) DEBUG(8, ("a"));
- 	if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]"));
-+	if (result & FILE_ATTRIBUTE_OFFLINE ) DEBUG(8, ("[offline]"));
- 	
- 	DEBUG(8,("\n"));
- 
-@@ -463,6 +466,15 @@
- 		return(0);
- 	}
- 
-+	if (samfs_make_file_worm(conn, fname, st, dosmode)) {
-+		DEBUG(5,("file_set_dosmode: samfs_make_file worm tells "\
-+			"me to use mode 0%o on file %s\n", unixmode, fname));
-+		unixmode = S_ISUID;
-+		/* I'm doing a direct chmod call here because SMB_VFS_CHMOD
-+		 * uses chmod_acl and this drops the SUID flag... */
-+		return chmod(fname, unixmode);
-+	}
-+
- 	/* Store the DOS attributes in an EA by preference. */
- 	if (set_ea_dos_attribute(conn, fname, st, dosmode)) {
- 		st->st_mode = unixmode;
--- a/usr/src/cmd/samba/samfs-smbd_service.c-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- service.c	Wed Sep 17 17:17:30 2008
-+++ samba-3.0.32/source/smbd/service.c	Wed Sep 17 17:18:32 2008
-@@ -22,7 +22,7 @@
- 
- extern userdom_struct current_user_info;
- 
--static BOOL canonicalize_path(connection_struct *conn, pstring path)
-+BOOL canonicalize_path(connection_struct *conn, pstring path)
- {
- #ifdef REALPATH_TAKES_NULL
- 	char *resolved_name = SMB_VFS_REALPATH(conn,path,NULL);
--- a/usr/src/cmd/samba/samfs.c	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Solaris SamFS handling functions.
-   Copyright (C) Michael Adam <[email protected]> 2006
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-/*
-   This module implements a mapping of the Solaris SamFS Offline
-   and WORM flags to dos-modes:
-   
-   - The offline flag is read from samfs_stat call and if set,
-     the FILE_ATTRIBUTE_OFFLINE is added to the dosmode.
-   
-   - The offline flag can not be set by a samba-client.
-     This is done by the releaser daemon.
-
-   - The WORM flag ist mapped bidirectionally to the system+readonly
-     dosmode flags.
-
- */
-
-#ifdef WITH_SAMFS
-
-#define WORM_TRIGGER (aRONLY|aSYSTEM)
-
-static BOOL samfs_worm_capable(const char *path, SMB_STRUCT_STAT *st);
-
-/*******************************************************************
- Get samfs flags from samfs stat call (offline and WORM)
- and map them to dos mode flags.
-*******************************************************************/
-uint32 samfs_mode(connection_struct *conn, const char *path)
-{
-        struct sam_stat file_info;
-        struct sam_stat *segment_info;
-        int num_segs;
-        int num_segs_offline;
-        int i;
-        int sam_stat_result;
-	uint32 mode = 0;
-	pstring pathreal;
-
-	if (!lp_samfs_share(SNUM(conn))) {
-		DEBUG(5,("samfs_mode: share '%s' is not a samfs share\n",
-			lp_servicename(SNUM(conn))));
-		goto SAMFS_MODE_EXIT;
-	}
-
-	pstrcpy(pathreal,path);
-	canonicalize_path(conn, pathreal);
-	DEBUG(8,("samfs_mode: conn->dirpath '%s', fname '%s', pathreal '%s'\n", 
-		conn->dirpath, path, pathreal));
-	
-	DEBUG(5,("samfs_mode: testing sam_stat properties of file %s\n",
-		pathreal));
-
-	ZERO_STRUCT(file_info);
-	sam_stat_result = sam_stat(pathreal, &file_info, sizeof(struct sam_stat));
-	if (sam_stat_result != 0) {
-		DEBUG(5,("samfs_mode: " \
-			"sam_stat call on file %s returned " \
-			"with error code %d\n", 
-			pathreal, sam_stat_result));
-		goto SAMFS_MODE_EXIT;
-		
-	}
-	if (SS_ISOFFLINE(file_info.attr)) {
-		DEBUG(5,("samfs_mode: file %s is offline\n", pathreal));
-		mode |= FILE_ATTRIBUTE_OFFLINE;
-	}
-	if (SS_ISREADONLY(file_info.attr)) {
-		DEBUG(5,("samfs_mode: file %s is a WORM file\n", pathreal));
-		mode |= WORM_TRIGGER;
-	}
-	if (SS_ISSEGMENT_F(file_info.attr)) {
-		DEBUG(5,("samfs_mode: file %s is segmented\n", pathreal));
-                num_segs = NUM_SEGS(&file_info);
-                printf("segmented (%d segments)\n", num_segs);
-                segment_info = (struct sam_stat *)malloc(num_segs *
-                                                sizeof(struct sam_stat));
-                if (segment_info == NULL) {
-                        DEBUG(5, ("samfs_mode: error allocating memory for " \
-				"data segment stat info\n"));
-                }
-                memset((void *)segment_info, 0,
-                        num_segs * sizeof(struct sam_stat));
-                sam_stat_result = sam_segment_stat(pathreal, segment_info,
-                                        num_segs * sizeof(struct sam_stat));
-                if (sam_stat_result != 0) {
-                        DEBUG(5,("samfs_mode: ERROR %d returned from " \
-				"sam_segment_stat\n", sam_stat_result));
-                }
-                num_segs_offline = 0;
-                for (i=0; i < num_segs; i++) {
-                        if (SS_ISOFFLINE(segment_info[i].attr)) {
-                                num_segs_offline++;
-                        }
-                }
-                if (num_segs_offline) {
-                        DEBUG(5,("samfs_stat: offline (%d segments offline)\n",
-                                num_segs_offline));
-			mode |= FILE_ATTRIBUTE_OFFLINE;
-                }
-		SAFE_FREE(segment_info);
-	}
-SAMFS_MODE_EXIT:
-	DEBUG(5,("samfs_mode: returning 0x%x\n", mode));
-	return mode;
-}
-
-/*******************************************************************
- Check if the resulting mode triggers the convert-to-WORM action.
-*******************************************************************/
-BOOL samfs_make_file_worm(connection_struct *conn, const char *path,
-	SMB_STRUCT_STAT *st, uint32 dosmode)
-{
-	pstring pathreal;
-
-        pstrcpy(pathreal,path);
-        canonicalize_path(conn, pathreal);
-
-	if (!lp_samfs_share(SNUM(conn))) {
-		DEBUG(5,("samfs_mode: '%s' is not a samfs share\n",
-			lp_servicename(SNUM(conn))));
-		return False;
-	}
-
-	DEBUG(8,("samfs_make_file_worm: called with dosmode 0x%x for file %s\n",
-		dosmode, path));
-		
-	if (!(dosmode & aDIR) && !samfs_worm_capable(pathreal, st)) {
-		DEBUG(8,("samfs_make_worm_file: %s is not worm capable\n",
-			pathreal));
-		return False;
-	}
-	
-	if ((dosmode & WORM_TRIGGER) != WORM_TRIGGER) {
-		DEBUG(8,("samfs_make_worm_file: dos mode 0x%x " \
-			"does not trigger WORM status\n", 
-			dosmode));
-		return False;
-	}
-	DEBUG(8,("samfs_make_file_worm: WORM status triggered for file %s\n",
-		path));
-	return True;
-}
-
-/*******************************************************************
- Check if file is worm capable.
- (File is worm capable if parent dir is worm.)
-*******************************************************************/
-static BOOL samfs_worm_capable(const char *path, SMB_STRUCT_STAT *st)
-{
-	struct sam_stat file_info;
-	int sam_stat_result;
-	char *parent_dir = parent_dirname(path);
-
-	if (S_ISDIR(st->st_mode)) {
-		return True;
-	}
-	
-	ZERO_STRUCT(file_info);
-	sam_stat_result = sam_stat(parent_dir, &file_info, 
-				sizeof(struct sam_stat));
-	if (sam_stat_result != 0) {
-		DEBUG(5,("samfs_worm_capable: " \
-			"sam_stat call on file %s returned " \
-			"with error code %d\n", 
-			parent_dir, sam_stat_result));
-		return False;
-	}
-	if (SS_ISREADONLY(file_info.attr)) {
-		return True;	
-	}
-	return False;
-}
-
-#else /* defined WITH_SAMFS */
-
-/* provide stubs for configure without "--with-samfs-support" */
-
-uint32 samfs_mode(connection_struct *conn, const char *path)
-{
-	return 0;
-}
-
-BOOL samfs_make_file_worm(connection_struct *conn, const char *path,
-	SMB_STRUCT_STAT *st, uint32 dosmode)
-{
-	return False;
-}
-
-#endif
-
-/* END  smbd/samfs.c */
--- a/usr/src/cmd/samba/samfs_stat.h	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,448 +0,0 @@
-/*
- * stat.h - SAM-FS file information definitions.
- *
- * Defines the SAM-FS file information structure and functions.
- * The POSIX stat structure and associated macros are used to allow
- * the sam_stat structure to be used on various client machine
- * architectures.
- *
- */
-
-/*
- *    SAM-QFS_notice_begin
- *
- *      Solaris 2.x Sun Storage & Archiving Management File System
- *
- *		Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
- *
- *		U.S. Government Rights - Commercial software. Government users are
- *	subject to the Sun Microsystems, Inc. standard license agreement and applicable
- *	provisions of the FAR and its supplements.
- *
- *      	Use is subject to license terms. Sun, Sun Microsystems and the Sun logo
- *	are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S.
- *	and other countries.
- *
- *    SAM-QFS_notice_end
- */
-
-/*
- *	LGPL NOTICE
- *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/*
- * $Revision$
- */
-
-#ifdef sun
-#pragma ident "$Revision$"
-#endif
-
-
-#ifndef	SAM_STAT_H
-#define	SAM_STAT_H
-
-#ifdef linux
-#include <sam/linux_types.h>	/* u_longlong_t */
-#endif /* linux */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define	MAX_ARCHIVE		4
-#define	SAM_MIN_SEGMENT_SIZE	(1024*1024) 	/* Minimum segment size in bytes */
-
-/*
- * If sam/stat.h and sys/stat.h are needed in the same module, then
- * sys/stat.h must be included before sam/stat.h.
- * The following is provided to avoid compilation errors:
- */
-#if defined(_SYS_STAT_H) || defined(_LINUX_STAT_H)
-#undef st_atime
-#undef st_mtime
-#undef st_ctime
-#undef S_ISBLK
-#undef S_ISCHR
-#undef S_ISDIR
-#undef S_ISFIFO
-#undef S_ISGID
-#undef S_ISREG
-#undef S_ISUID
-#undef S_ISLNK
-#undef S_ISSOCK
-
-#ifdef	linux
-#undef S_IRWXU
-#undef S_IRUSR
-#undef S_IWUSR
-#undef S_IXUSR
-#undef S_IRWXG
-#undef S_IRGRP
-#undef S_IWGRP
-#undef S_IXGRP
-#undef S_IRWXO
-#undef S_IROTH
-#undef S_IWOTH
-#undef S_IXOTH
-#endif	/* linux */
-
-#endif /* defined(_SYS_STAT_H) */
-
-/*
- *	NOTE that in order to pass the following structures from a 64-bit
- *	kernel to a 32-bit application, we need to conditionally define the
- *	positions of the 32-bit time and the pad differently for SPARC and X86.
- */
-
-/*
- * Begin: 32-bit align copyin() structs for amd64 only due to 32-bit x86 ABI
- */
-#if _LONG_LONG_ALIGNMENT == 8 && _LONG_LONG_ALIGNMENT_32 == 4
-#pragma pack(4)
-#endif
-
-#if defined(__sparcv9) || defined(__amd64) || defined(linux)
-
-struct sam_copy_s {					/* For each archive copy. */
-	u_longlong_t 	position;			/* Location of archive file */
-	time_t		creation_time;			/* Time archive copy created */
-	uint_t		offset;				/* Location of copy in archive file - */
-							/* in units of 512 bytes */
-	ushort_t	flags;
-	short		n_vsns;				/* Number of VSNs the archive used */
-	char		media[4];			/* Media type */
-	char		vsn[32];			/* VSN */
-};
-
-struct sam_stat {
-	/* POSIX stat structure. */
-	uint_t		st_mode;			/* File mode */
-	uint_t		st_ino;				/* File serial number */
-#ifdef  sun
-	dev_t		st_dev;				/* ID of the device containing the file */
-#endif  /* sun */
-#ifdef  linux
-	ushort_t	st_dev;				/* ID of the device containing the file */
-#endif  /* linux */
-	uint_t		st_nlink;			/* Number of links */
-	uint_t		st_uid;				/* User ID of the file's owner */
-	uint_t		st_gid;				/* Group ID of the file's owner */
-	u_longlong_t 	st_size;			/* The file size in bytes */
-	time_t 		st_atime;			/* Time of last access */
-	time_t 		st_mtime;			/* Time of last data modification */
-	time_t 		st_ctime;			/* Time of last file status change */
-
-	/* SAM-FS information. */
-	time_t 		attribute_time;			/* Time attributes last changed */
-	time_t 		creation_time;			/* Time inode created */
-	time_t 		residence_time;			/* Time file changed residence */
-	struct 		sam_copy_s copy[MAX_ARCHIVE];
-	uint_t		attr;				/* File attributes */
-	uchar_t		cs_algo;			/* Checksum algorithm indicator */
-	uchar_t		flags;				/* Flags:  staging, stage err, etc. */
-	uchar_t		stripe_width;			/* Stripe width set by setfa -s */
-	uchar_t		stripe_group;			/* Stripe group set by setfa -g */
-	uint_t 		gen;				/* File generation number */
-	uint_t 		partial_size;			/* Partial size in kilobytes */
-#ifdef	sun
-	dev_t		rdev;				/* ID of device if S_IFBLK or S_IFCHR */
-#endif 	/* sun */
-#ifdef linux
-	ushort_t	rdev;				/* ID of device if S_IFBLK or S_IFCHR */
-#endif /* linux */
-	u_longlong_t 	st_blocks;			/* Block count in units of 512 byte blocks */
-	uint_t 		segment_size;			/* Segment size in megabytes (SS_SEGMENT_A) */
-	uint_t 		segment_number;			/* Number of this segment */
-							/* 0 - SS_SEGMENT_F, 1 .. n - SS_SEGMENT_S */
-	uint_t 		stage_ahead;			/* Number of segments to stage ahead */
-	uint_t 		admin_id;			/* admin ID; inherited from dir */
-	uint_t 		allocahead;			/* Allocate ahead size set by setfa -A */
-	uint_t 		pad9;
-	u_longlong_t 	cs_val[2];			/* 128 bit checksum */
-};
-
-#else   /* __sparcv9 || __amd64 || linux */
-
-struct sam_copy_s {					/* For each archive copy. */
-	u_longlong_t 	position;			/* Location of archive file */
-#if 	defined(__i386)
-	time_t		creation_time;			/* Time archive copy created */
-	ulong_t		pad0;
-#else
-	ulong_t		pad0;
-	time_t		creation_time;			/* Time archive copy created */
-#endif	/* __i386 */
-	ulong_t		offset;				/* Location of copy in archive file - */
-							/*	in units of 512 bytes */
-	ushort_t 	flags;
-	short		n_vsns;				/* Number of VSNs the archive used */
-	char		media[4];			/* Media type */
-	char		vsn[32];			/* VSN */
-};
-
-struct sam_stat {
-	/* POSIX stat structure. */
-	ulong_t		st_mode;			/* File mode */
-	ulong_t		st_ino;				/* File serial number */
-	dev_t		st_dev;				/* ID of the device containing the file */
-	long		pad1;
-	ulong_t		st_nlink;			/* Number of links */
-	ulong_t		st_uid;				/* User ID of the file's owner */
-	ulong_t		st_gid;				/* Group ID of the file's owner */
-	u_longlong_t 	st_size;			/* The file size in bytes */
-#if 	defined(__i386)
-	time_t		st_atime;			/* Time of last access */
-	ulong_t		pad2;
-	time_t		st_mtime;			/* Time of last data modification */
-	ulong_t		pad3;
-	time_t		st_ctime;			/* Time of last file status change */
-	ulong_t		pad4;
-
-	/* SAM-FS information. */
-	time_t		attribute_time;			/* Time attributes last changed */
-	ulong_t		pad5;
-	time_t		creation_time;			/* Time inode created */
-	ulong_t		pad6;
-	time_t		residence_time;			/* Time file changed residence */
-	ulong_t		pad7;
-#else	/* __i386 */
-	ulong_t		pad2;
-	time_t		st_atime;			/* Time of last access */
-	ulong_t		pad3;
-	time_t		st_mtime;			/* Time of last data modification */
-	ulong_t		pad4;
-	time_t		st_ctime;			/* Time of last file status change */
-
-	/* SAM-FS information. */
-	ulong_t		pad5;
-	time_t		attribute_time;			/* Time attributes last changed */
-	ulong_t		pad6;
-	time_t		creation_time;			/* Time inode created */
-	ulong_t		pad7;
-	time_t		residence_time;			/* Time file changed residence */
-#endif	/* __i386 */
-	struct		sam_copy_s copy[MAX_ARCHIVE];
-	uint_t		attr;				/* File attributes */
-	uchar_t 	cs_algo;			/* Checksum algorithm indicator */
-	uchar_t		flags;				/* Flags:  staging, stage err, etc. */
-	uchar_t		stripe_width;			/* Stripe width set by setfa -s */
-	uchar_t		stripe_group;			/* Stripe group set by setfa -g */
-	ulong_t		gen;				/* File generation number */
-	ulong_t		partial_size;			/* Partial size in kilobytes */
-	dev_t		rdev;				/* ID of device if S_IFBLK or S_IFCHR */
-	ulong_t		pad8;
-	u_longlong_t 	st_blocks;			/* Block count in units of 512 byte blocks */
-	ulong_t 	segment_size;			/* Segment size in megabytes (SS_SEGMENT_A) */
-	ulong_t 	segment_number;			/* Number of this segment */
-							/* 0 - SS_SEGMENT_F, 1 .. n - SS_SEGMENT_S */
-	uint_t 		stage_ahead;			/* Number of segments to stage ahead */
-	ulong_t 	admin_id;			/* admin ID; inherited from dir */
-	ulong_t 	allocahead;			/* Allocate ahead size set by setfa -A */
-	ulong_t 	pad9;
-	u_longlong_t 	cs_val[2];			/* 128 bit checksum */
-};
-
-#endif   /* __sparcv9 || __amd64 || linux */
-
-
-#define	SAM_SECTION_SIZE(n) (sizeof (struct sam_section) * n)
-
-struct sam_section {					/* For each archive copy volume section */
-	char		vsn[32];			/* VSN */
-	u_longlong_t 	length;				/* Section length of file on this volume */
-	u_longlong_t 	position;			/* Position of archive file for this section */
-	u_longlong_t 	offset;				/* Location of copy section in archive file */
-};
-
-/*
- * End: 32-bit align copyin() structs for amd64 only due to 32-bit x86 ABI
- */
-#if _LONG_LONG_ALIGNMENT == 8 && _LONG_LONG_ALIGNMENT_32 == 4
-#pragma pack()
-#endif
-
-/*
- * POSIX symbols.
- */
-
-#define	S_IRWXU 	00700				/* read, write, execute: owner */
-#define	S_IRUSR 	00400				/* read permission: owner */
-#define	S_IWUSR 	00200				/* write permission: owner */
-#define	S_IXUSR 	00100				/* execute permission: owner */
-#define	S_IRWXG 	00070				/* read, write, execute: group */
-#define	S_IRGRP 	00040				/* read permission: group */
-#define	S_IWGRP 	00020				/* write permission: group */
-#define	S_IXGRP 	00010				/* execute permission: group */
-#define	S_IRWXO 	00007				/* read, write, execute: other */
-#define	S_IROTH 	00004				/* read permission: other */
-
-#define	S_IWOTH 	00002				/* write permission: other */
-#define	S_IXOTH 	00001				/* execute permission: other */
-
-#define	S_ISBLK(mode)  	(((mode)&0xf000) == 0x6000)
-#define	S_ISCHR(mode)  	(((mode)&0xf000) == 0x2000)
-#define	S_ISDIR(mode)  	(((mode)&0xf000) == 0x4000)
-#define	S_ISFIFO(mode) 	(((mode)&0xf000) == 0x1000)
-#define	S_ISGID(mode)  	((mode)&0x400)   		/* set group id on execution */
-#define	S_ISREG(mode)  	(((mode)&0xf000) == 0x8000)
-#define	S_ISUID(mode)  	((mode)&0x800)   		/* set user id on execution */
-#define	S_ISLNK(mode)  	(((mode)&0xf000) == 0xa000)
-#define	S_ISSOCK(mode) 	(((mode)&0xf000) == 0xc000)
-
-/*
- * SAMFS attributes mapped into sam_stat but not in inode (ino_status_t).
- */
-#define	SS_SAMFS	0x00000800			/* SAM-FS file */
-#define	SS_ARCHIVE_R 	0x00002000			/* Re-archive */
-#define	SS_ARCHIVED  	0x00010000			/* File has at least one archive copy */
-#define	SS_DATA_V	0x00040000 			/* File requires data verification */
-#define	SS_AIO		0x00080000 			/* AIO Char Device file */
-#define	SS_ARCHIVE_A 	0x08000000			/* Archive immediate */
-
-/*
- * SAMFS attributes from the inode.
- */
-#define	SS_REMEDIA   	0x00000001			/* Removable media file */
-#define	SS_RELEASE_A 	0x00000002			/* Release after archive */
-#define	SS_RELEASE_N 	0x00000004			/* Release never (nodrop) */
-#define	SS_STAGE_N   	0x00000008			/* Stage never (direct) */
-
-#define	SS_DAMAGED   	0x00000010			/* File is damaged - not online and no copy */
-#define	SS_RELEASE_P 	0x00000020			/* Release partial (bof_online) */
-#define	SS_ARCHIVE_N 	0x00000040			/* Archive never (noarch) */
-#define	SS_STAGE_A	0x00000080			/* Stage associative (stageall) */
-
-#define	SS_CSVAL	0x00000100			/* Valid checksum exists in inode */
-#define	SS_CSUSE	0x00000200			/* Checksum will be used upon stage */
-#define	SS_CSGEN	0x00000400			/* Checksum will be generated upon archive */
-/*	SS_SAMFS	0x00000800			used by sam_stat() - see above */
-
-#define	SS_ARCHDONE  	0x00001000			/* File has all required archiving done */
-/*	SS_ARCHIVE_R    0x00002000    			used by sam_stat() - see above */
-#define	SS_PARTIAL   	0x00004000			/* Partial extents are online */
-#define	SS_OFFLINE   	0x00008000			/* File is offline */
-
-/*	SS_ARCHIVED   	0x00010000    			used by sam_stat() - see above */
-#define	SS_SEGMENT_A 	0x00020000			/* Segment attribute */
-/*	SS_DATA_V    	0x00040000			   used by sam_stat() - see above */
-/*	SS_AIO		0x00080000			used by sam_stat() - see above */
-
-#define	SS_ARCHIVE_C 	0x00100000			/* Archive concurrent */
-#define	SS_DIRECTIO  	0x00200000			/* Directio */
-#define	SS_ARCHIVE_I 	0x00400000			/* Archive inconsistent copies */
-#define	SS_WORM		0x00800000			/* Read only attribute (worm_attr) */
-
-#define	SS_READONLY  	0x01000000			/* Read only file enabled (worm_set) */
-#define	SS_SEGMENT_S 	0x02000000			/* This is a segment of a segmented file */
-#define	SS_SEGMENT_F 	0x04000000			/* Stage/archive this file in segments */
-/*	SS_ARCHIVE_A    0x08000000			used by sam_stat() - see above */
-
-#define	SS_SETFA_S   	0x10000000			/* Stripe width set by setfa -s */
-#define	SS_SETFA_G   	0x20000000			/* Stripe group set by setfa -g */
-
-#define	SS_DFACL	0x40000000			/* Default access control list present */
-#define	SS_ACL		0x80000000			/* Access control list present */
-
-#define	SS_ISSAMFS(attr)	(((attr)&SS_SAMFS) != 0)
-#define	SS_ISREMEDIA(attr)   	(((attr)&SS_REMEDIA) != 0)
-#define	SS_ISARCHIVED(attr)  	(((attr)&SS_ARCHIVED) != 0)
-#define	SS_ISARCHDONE(attr)  	(((attr)&SS_ARCHDONE) != 0)
-#define	SS_ISDAMAGED(attr)   	(((attr)&SS_DAMAGED) != 0)
-#define	SS_ISOFFLINE(attr)   	(((attr)&SS_OFFLINE) != 0)
-#define	SS_ISPARTIAL(attr)   	(((attr)&SS_PARTIAL) != 0)
-#define	SS_ISARCHIVE_C(attr) 	(((attr)&SS_ARCHIVE_C) != 0)
-#define	SS_ISARCHIVE_I(attr) 	(((attr)&SS_ARCHIVE_I) != 0)
-#define	SS_ISARCHIVE_N(attr) 	(((attr)&SS_ARCHIVE_N) != 0)
-#define	SS_ISARCHIVE_A(attr) 	(((attr)&SS_ARCHIVE_A) != 0)
-#define	SS_ISARCHIVE_R(attr) 	(((attr)&SS_ARCHIVE_R) != 0)
-#define	SS_ISRELEASE_A(attr) 	(((attr)&SS_RELEASE_A) != 0)
-#define	SS_ISRELEASE_N(attr) 	(((attr)&SS_RELEASE_N) != 0)
-#define	SS_ISRELEASE_P(attr) 	(((attr)&SS_RELEASE_P) != 0)
-#define	SS_ISSTAGE_A(attr)   	(((attr)&SS_STAGE_A) != 0)
-#define	SS_ISSTAGE_N(attr)   	(((attr)&SS_STAGE_N) != 0)
-#define	SS_ISSEGMENT_A(attr) 	(((attr)&SS_SEGMENT_A) != 0)
-#define	SS_ISSEGMENT_S(attr) 	(((attr)&SS_SEGMENT_S) != 0)
-#define	SS_ISSEGMENT_F(attr) 	(((attr)&SS_SEGMENT_F) != 0)
-#define	SS_ISCSGEN(attr)	(((attr)&SS_CSGEN) != 0)
-#define	SS_ISCSUSE(attr)	(((attr)&SS_CSUSE) != 0)
-#define	SS_ISCSVAL(attr)	(((attr)&SS_CSVAL) != 0)
-#define	SS_ISDIRECTIO(attr)  	(((attr)&SS_DIRECTIO) != 0)
-#define	SS_ISSTAGE_M(attr)   	(((attr)&SS_STAGE_M) != 0)
-#define	SS_ISWORM(attr)		(((attr)&SS_WORM) != 0)
-#define	SS_ISREADONLY(attr)  	(((attr)&SS_READONLY) != 0)
-#define	SS_ISSETFA_G(attr)   	(((attr)&SS_SETFA_G) != 0)
-#define	SS_ISSETFA_S(attr)   	(((attr)&SS_SETFA_S) != 0)
-#define	SS_ISDFACL(attr)	(((attr)&SS_DFACL) != 0)
-#define	SS_ISACL(attr)		(((attr)&SS_ACL) != 0)
-#define	SS_ISDATAV(attr)	(((attr)&SS_DATA_V) != 0)
-#define	SS_ISAIO(attr)		(((attr)&SS_AIO) != 0)
-
-/*
- * SAMFS flags.
- */
-
-#define	SS_STAGING		0x01	/* Stage is pending on the file */
-#define	SS_STAGEFAIL		0x02	/* Error occurred on last stage attempt */
-
-#define	SS_ISSTAGING(flags)	(((flags)&SS_STAGING) != 0)
-#define	SS_ISSTAGEFAIL(flags)	(((flags)&SS_STAGEFAIL) != 0)
-
-/*
- * Copy flag masks.
- */
-#define	CF_STALE		0x0001	/* This archive copy is stale */
-#define	CF_REARCH		0x0002	/* Copy is to be rearchived */
-#define	CF_ARCH_I		0x0004	/* Copy is to be archived immediately */
-#define	CF_VERIFIED		0x0008	/* Copy has been verified */
-#define	CF_DAMAGED		0x0010	/* This archive copy is damaged */
-#define	CF_UNARCHIVED		0x0020	/* This archive copy was unarchived */
-#define	CF_INCONSISTENT 	0x0040	/* This archive copy is inconsistent */
-#define	CF_ARCHIVED		0x0080	/* This archive copy made */
-
-int sam_stat(const char *path, struct sam_stat *buf, size_t bufsize);
-int sam_lstat(const char *path, struct sam_stat *buf, size_t bufsize);
-int sam_vsn_stat(const char *path, int copy, struct sam_section *buf,
-	size_t bufsize);
-int sam_segment_vsn_stat(const char *path, int copy, int segment_index,
-	struct sam_section *buf, size_t bufsize);
-int sam_segment_stat(const char *path, struct sam_stat *buf,
-	size_t bufsize);
-int sam_segment_lstat(const char *path, struct sam_stat *buf,
-	size_t bufsize);
-int sam_restore_file(const char *path, struct sam_stat *buf,
-	size_t bufsize);
-int sam_restore_copy(const char *path, int copy, struct sam_stat *buf,
-	size_t bufsize, struct sam_section *vbuf, size_t vbufsize);
-
-/*
- * macro NUM_SEGS, takes in, fsbuff,  a ptr to a sam_stat struct, returns the
- * number of segments of the file associated with fsbuff.
- */
-
-#define	NUM_SEGS(fsbuff) (int)(((fsbuff) == NULL || (fsbuff)->st_size <= 0 || \
-				(fsbuff)->segment_size <= 0 || \
-				!SS_ISSEGMENT_F((fsbuff)->attr)) ? 0 : \
-				((fsbuff)->st_size + \
-				(offset_t)(fsbuff)->segment_size * (SAM_MIN_SEGMENT_SIZE) - 1LL) / \
-				((offset_t)(fsbuff)->segment_size * (SAM_MIN_SEGMENT_SIZE)))
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* SAM_STAT_H */
--- a/usr/src/cmd/samba/smbconf.sed	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-s/\/usr\/local\/samba\/lib/\/usr\/sfw\/lib/
-/log file = /c\
-   log file = /var/samba/log/log.%m
-/passdb backend = /c\
-   passdb backend = smbpasswd
-/include = /c\
-;  include = /usr/sfw/lib/smb.conf.%m
-s/\/usr\/spool/\/var\/spool/
--- a/usr/src/cmd/samba/sunman-stability	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/samba/sunman-stability	Sat Aug 21 11:47:07 2010 -0700
@@ -17,11 +17,12 @@
 s/\\fRprogram be installed under the \\fI\/usr\/local\/samba/\\fRprogram be installed under the \\fI\/usr\/sfw/
 /^\.TH/s/ \"5\" / \"4\" /g
 /^\.TH/ s/ 5 / 4 /g
+/^\.TH/s/ \"7\" / \"5\" /g
+/^\.TH/ s/ 7 / 5 /g
 /^\.TH/s/ \"8\" / \"1M\" /g
 /^\.TH/ s/ 8 / 1M /g
 s/(8)/(1M)/g
 s/(5)/(4)/g
-s/\\m\[[^]]*]//g
 $a\
 \.\\" Begin Sun update\
 .SH ATTRIBUTES\
@@ -35,7 +36,7 @@
 l | l .\
 ATTRIBUTE TYPE	ATTRIBUTE VALUE\
 =\
-Availability	service/network/samba\
+Availability	SUNWsmbar, SUNWsmbau\
 =\
 Interface Stability	External\
 .TE \
@@ -43,7 +44,7 @@
 .SH NOTES\
 Source for Samba is available on http://opensolaris.org.\
 \
-Samba(7) delivers the set of four SMF(5) services as can be seen\
+Samba(5) delivers the set of four SMF(5) services as can be seen\
 from the following example:\
 .PP\
      $ svcs samba wins winbind swat\
@@ -79,6 +80,20 @@
 in browser will access the SWAT service on local machine.\
 .RE\
 .PP\
+Because of name collisions between Solaris and Samba man pages, theese\
+Samba pages has been renamed:\
+.TS\
+box;\
+cbp-1 | cbp-1\
+l | l .\
+Original name	Page was renamed to\
+=\
+profiles(1)	smbprofiles(1)\
+=\
+smbd(8)	smbsmbd(1m)\
+.TE \
+.RE\
+.PP\
 Please note: SWAT uses HTTP Basic Authentication scheme where user name\
 and passwords are sent over the network in clear text. In the SWAT case\
 the user name is root. Transferring such sensitive data is advisable only\
--- a/usr/src/cmd/samba/sunwrap.h	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _SAMBA_SUNWRAP_H
-#define	_SAMBA_SUNWRAP_H
-
-#pragma ident	"@(#)sunwrap.h	1.1	07/02/20 SMI"
-
-/*
- * This file contains the list of all "problematic" function calls when
- * the samba is compiled on Solaris using:
- *    - iPlanet LDAP client library instead on OpenLDAP ones
- *    - MIT kerberos API instead of the Heimdal
- */
-
-#include <ldap.h>
-/* #include <krb5.h> */
-
-/* LDAP */
-/* these 2 funcs below are supported by samba internaly */
-/* int ldap_initialize( LDAP **ldp, const char *url); */
-/* int ldap_domain2hostlist(const char *domain, char** hostlist); */
-
-/*
- * ldap_add_result_entry is missing in libldap.so.5 API but it is required by
- * samba.
- */
-void ldap_add_result_entry(LDAPMessage **list, LDAPMessage *e);
-
-/*
- * Servicing the ldap_add_result_entry call by this way violating RFC 1823
- * and nobody want it but this is the only way how to do it
- * When the conditions will change the ldap_add_result_entry will be
- * removed from here
- */
-
-/* Kerberos v5 */
-/*
- * krb5_locate_kdc was removed from the MIT krb5 API. Calling of it was removed
- * from samba code
- */
-/*
- * krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
- * struct sockaddr **addr_pp, int *naddrs, int get_masters);
- */
-
-#endif /* _SAMBA_SUNWRAP_H */
--- a/usr/src/cmd/samba/swat.c-diff	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- samba-3.0.21b/source/web/swat.c	Fri Jan 27 06:09:41 2006
-+++ samba-3.0.21b-solaris/source/web/swat.c	Mon Mar 27 02:49:15 2006
-@@ -188,12 +188,12 @@
- 	if(strcmp(pLabel, pTranslated) != 0)
- 	{
- 		pstr_sprintf(output,
--		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
-+		  "<A HREF=\"/swat/help/manpages/smb.conf.4.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
- 		   pAnchor, pHelp, pLabel, pTranslated);
- 		return output;
- 	}
- 	pstr_sprintf(output, 
--	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
-+	  "<A HREF=\"/swat/help/manpages/smb.conf.4.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
- 	  pAnchor, pHelp, pLabel);
- 	return output;
- }
-@@ -1230,7 +1230,7 @@
-         printf("<H3>%s</H3>\n", _("Important Note:"));
-         printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
-         printf(_("are autoloaded printers from "));
--        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-+        printf("<A HREF=\"/swat/help/smb.conf.4.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-         printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
- 
- 	if (cgi_variable("Commit") && snum >= 0) {
--- a/usr/src/cmd/samba/swat.xml	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.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
-#
--->
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
-	Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-	Use is subject to license terms.
-
-	#ident	"@(#)swat.xml	1.3	07/02/20 SMI"
-
-	NOTE:  This service manifest is not editable; its contents will
-	be overwritten by package or patch operations, including
-	operating system upgrade.  Make customizations in a different
-	file.
--->
-<!--
-	  Service manifest for the swat service
-	swat is the samba web administration tool
--->
-<service_bundle type='manifest' name='SUNWsmbau:swat'>
-<service name='network/swat' type='service' version='1'>
-	<create_default_instance enabled='false' />
-	<restarter>
-		<service_fmri value='svc:/network/inetd:default' />
-	</restarter>
-	<exec_method type='method' name='inetd_start'
-		exec='/usr/sfw/sbin/swat' timeout_seconds='0'>
-		<method_context>
-			<method_credential user='root' group='root' />
-		</method_context>
-	</exec_method>
-	<exec_method type='method' name='inetd_disable'
-		exec=':kill' timeout_seconds='0'>
-	</exec_method>
-	<property_group name='inetd' type='framework'>
-		<stability value='Evolving' />
-		<propval name='name' type='astring' value='swat' />
-		<propval name='endpoint_type' type='astring' value='stream' />
-		<propval name='proto' type='astring' value='tcp' />
-		<propval name='wait' type='boolean' value='false' />
-		<propval name='isrpc' type='boolean' value='false' />
-	</property_group>
-
-	<stability value='Unstable' />
-
-	<template>
-		<common_name>
-			<loctext xml:lang='C'> swat </loctext>
-		</common_name>
-		<description>
-			<loctext xml:lang='C'>
-Swat support a browser interface to configure samba generating the /etc/sfw/smb.conf .
-			</loctext>
-		</description>
-	</template>
-</service>
-
-</service_bundle>
--- a/usr/src/cmd/samba/vfs_zfsacl.c	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,319 +0,0 @@
-/*
- * Convert ZFS/NFSv4 acls to NT acls and vice versa.
- *
- * Copyright (C) Jiri Sasek, 2007
- * based on the foobar.c module which is copyrighted by Volker Lendecke
- *
- * Many thanks to Axel Apitz for help to fix the special ace's handling
- * issues.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include "includes.h"
-#include "nfs4_acls.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_VFS
-
-#define ZFSACL_MODULE_NAME "zfsacl"
-
-/* zfs_get_nt_acl()
- * read the local file's acls and return it in NT form
- * using the NFSv4 format conversion
- */
-static size_t zfs_get_nt_acl(struct files_struct *fsp, uint32 security_info,
-			     SEC_DESC **ppdesc)
-{
-	int naces, i;
-	ace_t *acebuf;
-	SMB4ACL_T *pacl;
-	TALLOC_CTX	*mem_ctx;
-
-	/* read the number of file aces */
-	if((naces = acl(fsp->fsp_name, ACE_GETACLCNT, 0, NULL)) == -1) {
-		if(errno == ENOSYS) {
-			DEBUG(9, ("acl(ACE_GETACLCNT, %s): Operation is not supported on the filesystem where the file reside"));
-		} else {
-			DEBUG(9, ("acl(ACE_GETACLCNT, %s): %s ", fsp->fsp_name,
-					strerror(errno)));
-		}
-		return 0;
-	}
-	/* allocate the field of ZFS aces */
-	mem_ctx = main_loop_talloc_get();
-	acebuf = (ace_t *) talloc_size(mem_ctx, sizeof(ace_t)*naces);
-	if(acebuf == NULL) {
-		errno = ENOMEM;
-		return 0;
-	}
-	/* read the aces into the field */
-	if(acl(fsp->fsp_name, ACE_GETACL, naces, acebuf) < 0) {
-		DEBUG(9, ("acl(ACE_GETACL, %s): %s ", fsp->fsp_name,
-				strerror(errno)));
-		return 0;
-	}
-	/* create SMB4ACL data */
-	if((pacl = smb_create_smb4acl()) == NULL) return 0;
-
-	for(i=0; i<naces; i++) {
-		SMB_ACE4PROP_T aceprop;
-
-		aceprop.aceType  = (uint32) acebuf[i].a_type;
-		aceprop.aceFlags = (uint32) acebuf[i].a_flags;
-		aceprop.aceMask  = (uint32) acebuf[i].a_access_mask;
-		aceprop.who.id   = (uint32) acebuf[i].a_who;
-
-		if(aceprop.aceFlags & ACE_OWNER) {
-			aceprop.flags = SMB_ACE4_ID_SPECIAL;
-			aceprop.who.special_id = SMB_ACE4_WHO_OWNER;
-		} else if(aceprop.aceFlags & ACE_GROUP) {
-			aceprop.flags = SMB_ACE4_ID_SPECIAL;
-			aceprop.who.special_id = SMB_ACE4_WHO_GROUP;
-		} else if(aceprop.aceFlags & ACE_EVERYONE) {
-			aceprop.flags = SMB_ACE4_ID_SPECIAL;
-			aceprop.who.special_id = SMB_ACE4_WHO_EVERYONE;
-		} else {
-			aceprop.flags   = 0;
-		}
-		if(smb_add_ace4(pacl, &aceprop) == NULL) return 0;
-	}
-
-	return smb_get_nt_acl_nfs4(fsp, security_info, ppdesc, pacl);
-}
-
-/* call-back function processing the NT acl -> ZFS acl using NFSv4 conv. */
-static BOOL zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
-{
-	int naces = smb_get_naces(smbacl), i;
-	ace_t *acebuf;
-	SMB4ACE_T *smbace;
-	TALLOC_CTX	*mem_ctx;
-
-	/* allocate the field of ZFS aces */
-	mem_ctx = main_loop_talloc_get();
-	acebuf = (ace_t *) talloc_size(mem_ctx, sizeof(ace_t)*naces);
-	if(acebuf == NULL) {
-		errno = ENOMEM;
-		return False;
-	}
-	/* handle all aces */
-	for(smbace = smb_first_ace4(smbacl), i = 0;
-			smbace!=NULL;
-			smbace = smb_next_ace4(smbace), i++) {
-		SMB_ACE4PROP_T *aceprop = smb_get_ace4(smbace);
-
-		acebuf[i].a_type        = aceprop->aceType;
-		acebuf[i].a_flags       = aceprop->aceFlags;
-		acebuf[i].a_access_mask = aceprop->aceMask;
-		acebuf[i].a_who         = aceprop->who.id;
-		if(aceprop->flags & SMB_ACE4_ID_SPECIAL) {
-			switch(aceprop->who.special_id) {
-			case SMB_ACE4_WHO_EVERYONE:
-				acebuf[i].a_flags |= ACE_EVERYONE;
-				break;
-			case SMB_ACE4_WHO_OWNER:
-				acebuf[i].a_flags |= ACE_OWNER;
-				break;
-			case SMB_ACE4_WHO_GROUP:
-				acebuf[i].a_flags |= ACE_GROUP;
-				break;
-			default:
-				DEBUG(8, ("unsupported special_id %d\n", \
-					aceprop->who.special_id));
-				continue; /* don't add it !!! */
-			}
-		}
-	}
-	SMB_ASSERT(i == naces);
-
-	/* store acl */
-	if(acl(fsp->fsp_name, ACE_SETACL, naces, acebuf)) {
-		if(errno == ENOSYS) {
-			DEBUG(9, ("acl(ACE_SETACL, %s): Operation is not supported on the filesystem where the file reside"));
-		} else {
-			DEBUG(9, ("acl(ACE_SETACL, %s): %s ", fsp->fsp_name,
-					strerror(errno)));
-		}
-		return 0;
-	}
-
-	return True;
-}
-
-/* zfs_set_nt_acl()
- * set the local file's acls obtaining it in NT form
- * using the NFSv4 format conversion
- */
-static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-			   uint32 security_info_sent,
-			   SEC_DESC *psd)
-{
-	return smb_set_nt_acl_nfs4(fsp, security_info_sent, psd,
-			zfs_process_smbacl);
-}
-
-static size_t zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
-				 struct files_struct *fsp,
-				 int fd,  uint32 security_info,
-				 SEC_DESC **ppdesc)
-{
-	return zfs_get_nt_acl(fsp, security_info, ppdesc);
-}
-
-static size_t zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
-				struct files_struct *fsp,
-				const char *name,  uint32 security_info,
-				SEC_DESC **ppdesc)
-{
-	return zfs_get_nt_acl(fsp, security_info, ppdesc);
-}
-
-static NTSTATUS zfsacl_fset_nt_acl(vfs_handle_struct *handle,
-			 files_struct *fsp,
-			 int fd, uint32 security_info_sent,
-			 SEC_DESC *psd)
-{
-	return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
-}
-
-static NTSTATUS zfsacl_set_nt_acl(vfs_handle_struct *handle,
-		       files_struct *fsp,
-		       const char *name, uint32 security_info_sent,
-		       SEC_DESC *psd)
-{
-	return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
-}
-
-/* [email protected] 2008-06-16 :
-
-   See also 
-   - https://bugzilla.samba.org/show_bug.cgi?id=5446
-   - http://bugs.opensolaris.org/view_bug.do?bug_id=6688240
-   
-   Solaris supports NFSv4 and ZFS ACLs through a common system call, acl(2)
-   with ACE_SETACL / ACE_GETACL / ACE_GETACLCNT, which is being wrapped for
-   use by samba in this module.
-
-   As the acl(2) interface is identical for ZFS and for NFS, this module,
-   vfs_zfsacl, can not only be used for ZFS, but also for sharing NFSv4
-   mounts on Solaris.
-
-   But while "traditional" POSIX DRAFT ACLs (using acl(2) with SETACL
-   / GETACL / GETACLCNT) fail for ZFS, the Solaris NFS client
-   implemets a compatibility wrapper, which will make calls to
-   traditional ACL calls though vfs_solarisacl succeed. As the
-   compatibility wrapper's implementation is (by design) incomplete,
-   we want to make sure that it is never being called.
-
-   As long as Samba does not support an exiplicit method for a module
-   to define conflicting vfs methods, we should override all conflicting
-   methods here.
-
-   For this to work, we need to make sure that this module is initialised
-   *after* vfs_solarisacl
-
-   Function declarations taken from vfs_solarisacl
-*/
-
-SMB_ACL_T zfsacl_fail__sys_acl_get_file(vfs_handle_struct *handle,
-					const char *path_p,
-					SMB_ACL_TYPE_T type)
-{  
-	return (SMB_ACL_T)NULL;
-}
-SMB_ACL_T zfsacl_fail__sys_acl_get_fd(vfs_handle_struct *handle,
-				      files_struct *fsp,
-				      int fd)
-{
-	return (SMB_ACL_T)NULL;
-}
-
-int zfsacl_fail__sys_acl_set_file(vfs_handle_struct *handle,
-				  const char *name,
-				  SMB_ACL_TYPE_T type,
-				  SMB_ACL_T theacl)
-{
-	return(-1);
-}
-
-int zfsacl_fail__sys_acl_set_fd(vfs_handle_struct *handle,
-				files_struct *fsp,
-				int fd, SMB_ACL_T theacl)
-{
-	return(-1);
-}
-
-int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle,
-					 const char *path)
-{
-	return(-1);
-}
-
-/* VFS operations structure */
-
-static vfs_op_tuple zfsacl_ops[] = {	
-	/* invalidate conflicting VFS methods */
-	{SMB_VFS_OP(zfsacl_fail__sys_acl_get_file),
-         SMB_VFS_OP_SYS_ACL_GET_FILE,
-         SMB_VFS_LAYER_OPAQUE},
-        {SMB_VFS_OP(zfsacl_fail__sys_acl_get_fd),
-         SMB_VFS_OP_SYS_ACL_GET_FD,
-         SMB_VFS_LAYER_OPAQUE},
-        {SMB_VFS_OP(zfsacl_fail__sys_acl_set_file),
-         SMB_VFS_OP_SYS_ACL_SET_FILE,
-         SMB_VFS_LAYER_OPAQUE},
-        {SMB_VFS_OP(zfsacl_fail__sys_acl_set_fd),
-         SMB_VFS_OP_SYS_ACL_SET_FD,
-         SMB_VFS_LAYER_OPAQUE},
-        {SMB_VFS_OP(zfsacl_fail__sys_acl_delete_def_file),
-         SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
-         SMB_VFS_LAYER_OPAQUE},
-
-	/* actual methods */
-	{SMB_VFS_OP(zfsacl_fget_nt_acl), SMB_VFS_OP_FGET_NT_ACL,
-	 SMB_VFS_LAYER_OPAQUE},
-	{SMB_VFS_OP(zfsacl_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
-	 SMB_VFS_LAYER_OPAQUE},
-	{SMB_VFS_OP(zfsacl_fset_nt_acl), SMB_VFS_OP_FSET_NT_ACL,
-	 SMB_VFS_LAYER_OPAQUE},
-	{SMB_VFS_OP(zfsacl_set_nt_acl), SMB_VFS_OP_SET_NT_ACL,
-	 SMB_VFS_LAYER_OPAQUE},
-	{SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
-};
-
-/* != 0 if this module will be compiled as static */
-
-#define STATIC 0
-
-#if STATIC
-NTSTATUS vfs_zfsacl_init(void);
-#else
-NTSTATUS init_module(void);
-#endif
-
-NTSTATUS
-#if STATIC
-	vfs_zfsacl_init
-#else
-	init_module
-#endif
-		(void)
-{
-	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
-			ZFSACL_MODULE_NAME ,
-			zfsacl_ops);
-}
--- a/usr/src/cmd/samba/winbind.xml	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?xml version="1.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
-#
--->
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
-	Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-	Use is subject to license terms.
-
-	#ident	"@(#)winbind.xml	1.1	07/02/20 SMI"
-
-	NOTE:  This service manifest is not editable; its contents will
-	be overwritten by package or patch operations, including
-	operating system upgrade.  Make customizations in a different
-	file.
--->
-
-<service_bundle type='manifest' name='SUNWsmbar:winbind'>
-
-<service name='network/winbind' type='service' version='1'>
-
-	<create_default_instance enabled='false' />
-
-	<single_instance/>
-
-	<dependency name='net-loopback' grouping='require_any'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/loopback' />
-	</dependency>
-
-	<dependency name='net-service' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/service'/>
-	</dependency>
-
-	<dependency name='net-physical' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/physical' />
-	</dependency>
-
-	<dependency name='filesystem-local' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/system/filesystem/local' />
-	</dependency>
-
-	<dependent name='winbind_multi-user-server' grouping='optional_all'
-			restart_on='none'>
-		<service_fmri value='svc:/milestone/multi-user-server' />
-	</dependent>
-
-	<exec_method type='method' name='start'
-		exec='/usr/sfw/sbin/winbindd'
-		timeout_seconds='60' />
-
-	<exec_method type='method' name='stop'
-		exec='/usr/bin/kill `/usr/bin/cat /var/samba/locks/winbindd.pid`'
-		timeout_seconds='60' />
-
-	<stability value='Unstable' />
-
-	<template>
-		<common_name>
-			<loctext xml:lang='C'>
-			MS Win. domain naming daemon
-			</loctext>
-		</common_name>
-		<documentation>
-			<manpage title='winbindd' section='1m'
-			    manpath='/usr/sfw/man' />
-			<manpage title='smb.conf' section='4'
-			    manpath='/usr/sfw/man' />
-		</documentation>
-	</template>
-</service>
-
-</service_bundle>
--- a/usr/src/cmd/samba/wins.xml	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?xml version="1.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
-#
--->
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
-	Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-	Use is subject to license terms.
-
-	#ident	"@(#)wins.xml	1.1	07/02/20 SMI"
-
-	NOTE:  This service manifest is not editable; its contents will
-	be overwritten by package or patch operations, including
-	operating system upgrade.  Make customizations in a different
-	file.
--->
-
-<service_bundle type='manifest' name='SUNWsmbar:wins'>
-
-<service name='network/wins' type='service' version='1'>
-
-	<create_default_instance enabled='false' />
-
-	<single_instance/>
-
-	<dependency name='net-loopback' grouping='require_any'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/loopback' />
-	</dependency>
-
-	<dependency name='net-service' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/service'/>
-	</dependency>
-
-	<dependency name='net-physical' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/network/physical' />
-	</dependency>
-
-	<dependency name='filesystem-local' grouping='require_all'
-			restart_on='none' type='service'>
-		<service_fmri value='svc:/system/filesystem/local' />
-	</dependency>
-
-	<dependent name='wins_multi-user-server' grouping='optional_all'
-			restart_on='none'>
-		<service_fmri value='svc:/milestone/multi-user-server' />
-	</dependent>
-
-	<exec_method type='method' name='start'
-		exec='/usr/sfw/sbin/nmbd -D'
-		timeout_seconds='60' />
-
-	<exec_method type='method' name='stop'
-		exec='/usr/bin/kill `cat /var/samba/locks/nmbd.pid`'
-		timeout_seconds='60' />
-
-	<stability value='Unstable' />
-
-	<template>
-		<common_name>
-			<loctext xml:lang='C'>
-			MS Win. domain naming daemon
-			</loctext>
-		</common_name>
-		<documentation>
-			<manpage title='named' section='1m'
-			    manpath='/usr/sfw/man' />
-			<manpage title='smb.conf' section='4'
-			    manpath='/usr/sfw/man' />
-		</documentation>
-	</template>
-</service>
-
-</service_bundle>
--- a/usr/src/cmd/vim/runtime.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \10/08/02*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \10/08/16*\\a[%*\\d]:\ Entering\ directory\ `%f',
 diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
 --- runtime.patched/compiler/jikes.vim	2004-06-07 07:32:36.000000000 -0700
 +++ runtime/compiler/jikes.vim	2009-01-28 08:23:44.000000000 -0800
--- a/usr/src/lib/Makefile	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/lib/Makefile	Sat Aug 21 11:47:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.95	10/07/09 SMI"
+# ident	"@(#)Makefile	1.96	10/08/03 SMI"
 #
 
 #
@@ -98,6 +98,7 @@
 	logilab-astng \
 	memcached \
 	memcached-java \
+	mozldap \
 	mpfr \
 	pmdbi \
 	pth \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/mozldap/METADATA	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,18 @@
+NAME:             mozldap
+VERSION:          6.0.6
+DESCRIPTION:      Mozilla LDAP C-SDK
+LICENSE:          GPL
+PACKAGE:          SUNWsmbau
+PROJECT_URL:      https://wiki.mozilla.org/LDAP_C_SDK
+SOURCE_DOWNLOAD:  ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.6/src/mozldap-6.0.6.tar.gz
+SUPPORT:          C
+BUGTRAQ:          solaris/utility/samba
+OSR:              13041
+COMMENTS:         
+
+mozldap is Samba project private library
+
+build directory in tarball: mozldap-6.0.6/mozilla/directory/c-sdk
+examples: ldap/examples
+API: Extensions to RFC 1823 are provided in:
+http://www.mozilla.org/directory/ietf-docs/draft-ietf-ldapext-ldap-c-api-05.txt	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/mozldap/Makefile.sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,130 @@
+#
+# 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.
+#
+#ident	"@(#)Makefile.sfw	1.1	10/07/30 SMI"
+#
+
+include ../Makefile.lib
+
+VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+TARBALL =	$(VER).tar.gz
+CONFIGUREDIR =	${VER}/mozilla/directory/c-sdk
+VER64 =		$(VER)-64
+CONFIGUREDIR64 =${VER64}/mozilla/directory/c-sdk
+
+PATCHES:sh=    echo Patches/*.diff
+GPATCH_FLAGS= -p1
+
+MOZLIBDIR=${SRC}/lib/mozldap
+LDSOFLAGS=-z defs -z text -z combreloc
+#
+# perl found in the default PATH is too archaic
+#
+RECENT_PERL=/usr/perl5/5.10.0/bin/perl
+
+LDFLAGS     =       -L$(ROOT)/usr/lib
+
+TARGET_ENV +=       MAKE="$(GMAKE)"
+TARGET_ENV +=       AR=/usr/ccs/bin/ar
+TARGET_ENV +=       LD="${LD}"
+TARGET_ENV +=       PERL="$(RECENT_PERL)"
+
+TARGET_ENV32 +=    CC="$(CC)"
+TARGET_ENV32 +=    CXX="$(CCC)"
+TARGET_ENV32 +=    CFLAGS="$(CFLAGS)"
+TARGET_ENV32 +=    LDFLAGS="$(LDFLAGS.lib) $(LDSOFLAGS)"
+
+TARGET_ENV64 +=    CC="$(CC64)"
+TARGET_ENV64 +=    CXX="$(CCC64)" 
+TARGET_ENV64 +=    CFLAGS="$(CFLAGS64)"
+TARGET_ENV64 +=    LDFLAGS="$(LDFLAGS.lib) $(LDSOFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)"
+TARGET_ENV64 +=    CPPFLAGS="$(CPPFLAGS)"
+TARGET_ENV64 +=    CPP="$(CC64) $(CFLAGS64) $(CPPFLAGS) -E"
+TARGET_ENV64 +=    CXXFLAGS="$(CPPFLAGS) $(CCFLAGS64)"
+TARGET_ENV64 +=    CXXCPP="$(CCC64) $(CPPFLAGS) $(CCFLAGS64) -E"
+TARGET_ENV64 +=    CXXLDFLAGS="$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)"
+TARGET_ENV64 +=    CXXLD="$(CCC64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)"
+TARGET_ENV64 +=    CXXLINKLIB="$(CCC64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)"
+TARGET_ENV64 +=    MACH64="$(MACH64)"
+
+CONFIGURE_OPTIONS += --sysconfdir=/etc/ldap
+# DS60 C-SDK includes will not be propagated into the package
+# and will remain Samba private
+# see usr/src/pkgdefs/etc/exception_list_* for details
+CONFIGURE_OPTIONS += --includedir=/usr/include/ldap6
+CONFIGURE_OPTIONS += --with-nss-inc=/usr/include/mps
+CONFIGURE_OPTIONS += --enable-optimize
+CONFIGURE_OPTIONS += --with-pthreads
+CONFIGURE_OPTIONS += --enable-shared --disable-static
+CONFIGURE_OPTIONS += --enable-ipv6
+CONFIGURE_OPTIONS += --with-nspr-inc=/usr/include/mps
+
+CONFIGURE_OPTIONS32 += --libdir=/usr/lib
+CONFIGURE_OPTIONS32 += --with-nss-lib=/usr/lib/mps
+CONFIGURE_OPTIONS32 += --with-nspr-lib=/usr/lib/mps
+CONFIGURE_OPTIONS32 += --with-dist-prefix=$(MOZLIBDIR)/dist
+
+CONFIGURE_OPTIONS64 += --enable-64bit
+CONFIGURE_OPTIONS64 += --libdir=/usr/lib/$(MACH64)
+CONFIGURE_OPTIONS64 += --with-nss-lib=/usr/lib/mps/$(MACH64)
+CONFIGURE_OPTIONS64 += --with-nspr-lib=/usr/lib/mps/$(MACH64)
+CONFIGURE_OPTIONS64 += --with-dist-prefix=$(MOZLIBDIR)/dist64
+
+MPS_LIBS=-L/usr/lib/mps -R/usr/lib/mps
+MPS_LIBS64=-L/usr/lib/mps/$(MACH64) -R/usr/lib/mps/$(MACH64)
+
+all: real-all
+
+all32: $(CONFIGUREDIR)/config.status
+	(cd $(CONFIGUREDIR); env - $(GMAKE) -e BUILD_OPT=1 NS_USE_GCC=0 NSS_LIBS="$(MPS_LIBS)" NSPR_LIBS="$(MPS_LIBS)")
+
+all64: $(CONFIGUREDIR64)/config.status
+	(cd $(CONFIGUREDIR64); env - $(GMAKE) -e BUILD_OPT=1 NS_USE_GCC=0 NSS_LIBS="$(MPS_LIBS64)" NSPR_LIBS="$(MPS_LIBS64)")
+
+install: all
+	VERS=$(VER) DIST=dist $(SH) ./install-sfw
+	VERS=$(VER64) DIST=dist64 MACH64=$(MACH64) $(SH) ./install-sfw
+
+real-all: all32 all64
+
+test: test32 test64
+
+$(CONFIGUREDIR)/config.status: $(VER)/.patched
+	( \
+	cd $(CONFIGUREDIR); \
+	env - $(TARGET_ENV) $(TARGET_ENV32) ./configure \
+		$(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS32); \
+	 )
+
+$(CONFIGUREDIR64)/config.status: $(VER64)/.patched
+	( \
+	cd $(CONFIGUREDIR64); \
+	env - $(TARGET_ENV) $(TARGET_ENV64) ./configure \
+		$(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS64); \
+	 )
+
+clean:
+	$(RM) -r $(VER) dist $(VER64) dist64
+
+install_h:
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/mozldap/Patches/64bit_build_options.diff	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,18 @@
+--- mozldap-6.0.6-64/./mozilla/directory/c-sdk/configure	Tue Feb 16 10:21:41 2010
++++ mozldap-6.0.6/./mozilla/directory/c-sdk/configure	Tue Feb 16 10:28:27 2010
+@@ -5511,13 +5511,8 @@
+     	DSO_LDOPTS='-G -h $(notdir $@)'
+         DSO_CFLAGS=-KPIC
+     	if test -n "$USE_64"; then
+-    		if test "$OS_TEST" = "i86pc"; then
+-    			CC="$CC -xarch=amd64"
+-            	CXX="$CXX -xarch=amd64"
+-            else
+-            	CC="$CC -xarch=v9"
+-            	CXX="$CXX -xarch=v9"
+-            fi
++		CC="$CC -m64"
++            	CXX="$CXX -m64"
+         fi
+         CC="$CC -xstrconst"
+         if test -z "$MOZ_OPTIMIZE"; then
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/mozldap/install-sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,64 @@
+#!/usr/bin/sh
+#
+# 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.
+#
+#ident	"@(#)install-sfw	1.1	10/07/30 SMI"
+#
+
+VERS=${VERS}
+DIST=${DIST}
+MACH64=${MACH64}
+
+PREFIX=${ROOT}/usr
+LIBDIR=${PREFIX}/lib
+PKGCONFIGDIR=${LIBDIR}/pkgconfig
+INCDIR=${PREFIX}/include
+BINDIR=${PREFIX}/bin
+MAN1DIR=${PREFIX}/share/man/man1
+MAN3DIR=${PREFIX}/share/man/man3
+ROOTMAN1DIR=${MAN1DIR}
+ROOTMAN3DIR=${MAN3DIR}
+
+MANSCRIPT=../sunman-stability
+. ${SRC}/tools/install.subr
+
+cd ${DIST}
+
+if [ "_${MACH64}" = "_" ] ; then
+  for f in libldap60 libldif60 libprldap60 libssldap60 ; do
+    _install D bin/${f}.so ${LIBDIR}/${f}.so.1 0755
+    _install L ${f}.so.1 ${LIBDIR}/${f}.so
+  done
+
+  ${SRC}/tools/install-proto -d -m 0755 ${INCDIR}/ldap6/
+  for f in public/ldap/* ; do
+    tf=`basename ${f}`
+    _install N ${f} ${INCDIR}/ldap6/${tf} 0444
+  done
+
+else
+  for f in libldap60 libldif60 libprldap60 libssldap60 ; do
+    _install D bin/${f}.so ${LIBDIR}/${MACH64}/${f}.so.1 0755
+    _install L ${f}.so.1 ${LIBDIR}/${MACH64}/${f}.so
+  done
+
+fi
Binary file usr/src/lib/mozldap/mozldap-6.0.6.tar.gz has changed
--- a/usr/src/lib/trousers/Makefile.sfw	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/lib/trousers/Makefile.sfw	Sat Aug 21 11:47:07 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. 
 #
-#ident	"@(#)Makefile.sfw	1.9	10/03/15 SMI"
+#ident	"@(#)Makefile.sfw	1.11	10/08/17 SMI"
 
 VER	=	trousers-0.3.4
 TARBALL =	$(VER).tar.gz
@@ -67,7 +66,7 @@
 	(cd $(VER); env - $(CCSMAKE) MAKE=$(CCSMAKE))
 
 all64: $(VER64)/config.status
-	(cd $(VER64); env - $(CCSMAKE) MAKE=$(CCSMAKE))
+	(cd $(VER64); env - LDARCHFLAG="-Wl,-m64" $(CCSMAKE) MAKE=$(CCSMAKE))
 
 install: real-all
 	$(SH) ./install-sfw
@@ -77,7 +76,8 @@
 
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER); \
-	env "CC=$(CC)" "CFLAGS=$(CFLAGS)" "CPPFLAGS=$(CPPFLAGS)" "LIBS=$(LIBS)" \
+	env "CC=$(CC)" "LD=$(CC)" "CFLAGS=$(CFLAGS)" \
+	"CPPFLAGS=$(CPPFLAGS)" "LIBS=$(LIBS)" \
 	PATH=$(SFW_PATH) MAKE=$(CCSMAKE) ./configure $(CONFIGURE_OPTIONS); \
 	$(SHELL) ../fixheaders.ksh src/include/tss; \
 	$(SHELL) ../fixheaders.ksh src/include/trousers; \
@@ -85,11 +85,14 @@
 
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64); \
-	env "CC=$(CC)" "CFLAGS=$(CFLAGS64)" "CPPFLAGS=$(CPPFLAGS64)" "LIBS=$(LIBS)" \
+	env "CC=$(CC)" "LD=$(CC)" "CFLAGS=$(CFLAGS64)" \
+	"CPPFLAGS=$(CPPFLAGS64)" "LIBS=$(LIBS)" \
 	PATH=$(SFW_PATH) MAKE=$(CCSMAKE) ./configure $(CONFIGURE_OPTIONS); \
 	$(SHELL) ../fixheaders.ksh src/include/tss; \
 	$(SHELL) ../fixheaders.ksh src/include/trousers; \
-	$(SHELL) ../fixheaders.ksh src/include)
+	$(SHELL) ../fixheaders.ksh src/include; \
+	$(SED) -e 's/cc -64/cc -m64/g' < libtool > libtool.new; \
+	$(MV) libtool.new libtool)
 
 $(VER)/configure: $(VER)/configure.in
 	(cd $(VER); \
--- a/usr/src/lib/trousers/Patches/hosttable.c.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/lib/trousers/Patches/hosttable.c.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -1,21 +1,37 @@
---- src/tspi/rpc/hosttable.c.orig	Wed Mar 10 11:43:02 2010
-+++ src/tspi/rpc/hosttable.c	Wed Mar 10 11:46:24 2010
-@@ -34,6 +34,7 @@
+--- src/tspi/rpc/hosttable.c.old	Thu Jan 28 13:27:59 2010
++++ src/tspi/rpc/hosttable.c	Thu Aug  5 14:24:00 2010
+@@ -22,7 +22,7 @@
+ struct host_table *ht = NULL;
+ 
+ TSS_RESULT
+-host_table_init()
++static host_table_init()
+ {
+ 	ht = calloc(1, sizeof(struct host_table));
+ 	if (ht == NULL) {
+@@ -34,9 +34,9 @@
  
  	return TSS_SUCCESS;
  }
 +
  #ifdef SOLARIS
- #pragma init(_init)
- void _init(void)
-@@ -45,7 +46,6 @@
+-#pragma init(_init)
+-void _init(void)
++static void my_init(void)
+ #else
+ void __attribute__ ((constructor)) my_init(void)
+ #endif
+@@ -45,8 +45,8 @@
  	__tspi_obj_list_init();
  }
  
 -#if 0
- void
+-void
++
++static void
  host_table_final()
  {
+ 	struct host_table_entry *hte, *next = NULL;
 @@ -56,6 +56,10 @@
  	for (hte = ht->entries; hte; hte = next) {
  		if (hte)
@@ -27,24 +43,28 @@
  		free(hte);
  	}
  
-@@ -65,11 +69,15 @@
+@@ -65,10 +69,20 @@
  	ht = NULL;
  }
  
 +#ifdef SOLARIS
-+#pragma fini(_fini)
-+void _fini(void)
++static void my_fini(void)
 +#else
  void __attribute__ ((destructor)) my_fini(void)
 +#endif
  {
  	host_table_final();
  }
--#endif
++
++#ifdef SOLARIS
++
++#pragma init(my_init)
++#pragma fini(my_fini)
++
+ #endif
  
  TSS_RESULT
- __tspi_add_table_entry(TSS_HCONTEXT tspContext, BYTE *host, int type, struct host_table_entry **ret)
-@@ -100,6 +108,7 @@
+@@ -100,6 +114,7 @@
  		if (tmp->tspContext == tspContext) {
  			LogError("Tspi_Context_Connect attempted on an already connected context!");
  			MUTEX_UNLOCK(ht->lock);
@@ -52,7 +72,7 @@
  			free(entry->comm.buf);
  			free(entry);
  			return TSPERR(TSS_E_CONNECTION_FAILED);
-@@ -133,6 +142,8 @@
+@@ -133,6 +148,8 @@
  				prev->next = hte->next;
  			else
  				ht->entries = hte->next;
--- a/usr/src/lib/trousers/Patches/tspi_Makefile.am.patch	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/lib/trousers/Patches/tspi_Makefile.am.patch	Sat Aug 21 11:47:07 2010 -0700
@@ -5,7 +5,7 @@
  # 6. If any interfaces have been removed since the last public release, then set age to 0.
  
 -libtspi_la_LDFLAGS=-version-info 2:3:1 -lpthread @CRYPTOLIB@
-+libtspi_la_LDFLAGS=-version-info 2:3:1 @CRYPTOLIB@
++libtspi_la_LDFLAGS=$(LDARCHFLAG) -version-info 2:3:1 @CRYPTOLIB@
  
  libtspi_la_CFLAGS=-I$(top_srcdir)/src/include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
  
--- a/usr/src/pkgdefs/Makefile	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/Makefile	Sat Aug 21 11:47:07 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.283	10/07/09 SMI"
+# ident	"@(#)Makefile	1.284	10/08/03 SMI"
 #
 
 #
@@ -249,6 +249,7 @@
 	SUNWmercurial \
 	SUNWmkcd \
 	SUNWmkcdr \
+	SUNWmozldapC-SDK \
 	SUNWmrtg \
 	SUNWmrxvt \
 	SUNWmtx \
@@ -355,6 +356,8 @@
 	SUNWslang \
 	SUNWslangr \
 	SUNWslrn \
+	SUNWsmbadocr \
+	SUNWsmbadocu \
 	SUNWsmbar \
 	SUNWsmbau \
 	SUNWsnack \
--- a/usr/src/pkgdefs/SUNWbindc/prototype_com	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWbindc/prototype_com	Sat Aug 21 11:47:07 2010 -0700
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#pragma ident	"@(#)prototype_com	1.2	09/12/14 SMI"
+#pragma ident	"@(#)prototype_com	1.3	10/07/28 SMI"
 
 #
 # This file was auto-generated.  Refer to Makefile target prototype_com.new.
@@ -54,21 +53,21 @@
 f none usr/lib/dns/libbind9.so.50.0.3 555 root bin
 s none usr/lib/dns/libbind9.so.50=libbind9.so.50.0.3
 s none usr/lib/dns/libbind9.so=libbind9.so.50.0.3
-f none usr/lib/dns/libdns.so.53.0.0 555 root bin
-s none usr/lib/dns/libdns.so.53=libdns.so.53.0.0
-s none usr/lib/dns/libdns.so=libdns.so.53.0.0
-f none usr/lib/dns/libisc.so.50.1.1 555 root bin
-s none usr/lib/dns/libisc.so.50=libisc.so.50.1.1
-s none usr/lib/dns/libisc.so=libisc.so.50.1.1
-f none usr/lib/dns/libisccc.so.50.0.0 555 root bin
-s none usr/lib/dns/libisccc.so.50=libisccc.so.50.0.0
-s none usr/lib/dns/libisccc.so=libisccc.so.50.0.0
-f none usr/lib/dns/libisccfg.so.50.0.0 555 root bin
-s none usr/lib/dns/libisccfg.so.50=libisccfg.so.50.0.0
-s none usr/lib/dns/libisccfg.so=libisccfg.so.50.0.0
-f none usr/lib/dns/liblwres.so.50.0.2 555 root bin
-s none usr/lib/dns/liblwres.so.50=liblwres.so.50.0.2
-s none usr/lib/dns/liblwres.so=liblwres.so.50.0.2
+f none usr/lib/dns/libdns.so.55.1.1 555 root bin
+s none usr/lib/dns/libdns.so=libdns.so.55.1.1
+s none usr/lib/dns/libdns.so.55=libdns.so.55.1.1
+f none usr/lib/dns/libisc.so.50.2.1 555 root bin
+s none usr/lib/dns/libisc.so.50=libisc.so.50.2.1
+s none usr/lib/dns/libisc.so=libisc.so.50.2.1
+f none usr/lib/dns/libisccc.so.50.0.1 555 root bin
+s none usr/lib/dns/libisccc.so.50=libisccc.so.50.0.1
+s none usr/lib/dns/libisccc.so=libisccc.so.50.0.1
+f none usr/lib/dns/libisccfg.so.50.0.1 555 root bin
+s none usr/lib/dns/libisccfg.so.50=libisccfg.so.50.0.1
+s none usr/lib/dns/libisccfg.so=libisccfg.so.50.0.1
+f none usr/lib/dns/liblwres.so.50.0.3 555 root bin
+s none usr/lib/dns/liblwres.so.50=liblwres.so.50.0.3
+s none usr/lib/dns/liblwres.so=liblwres.so.50.0.3
 d none usr/sbin 755 root bin
 f none usr/sbin/dig 555 root bin
 f none usr/sbin/host 555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/Makefile	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+#ident	"@(#)Makefile	1.1	10/08/03 SMI"
+#
+
+include ../Makefile.com
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/copyright	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,1536 @@
+Oracle elects to have Mozilla LDAP C SDK available under and governed by the
+LGPLv2.1 (see below for full license text).   However, the following notice
+accompanied the original version of the related files:
+
+=============================================================================
+
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+
+
+The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
+
+
+
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
+
+
+
+The Original Code is mozilla.org code.
+
+
+
+The Initial Developer of the Original Code is Netscape Communications Corporation.
+
+Portions created by the Initial Developer are Copyright (C) 2002 the Initial Developer. All Rights Reserved.
+
+
+
+Contributor(s):
+
+
+
+Alternatively, the contents of this file may be used under the terms of either of the GNU General Public License Version 2 or later (the "GPL"), or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), in which case the provisions of the GPL or the LGPL are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of either the GPL or the LGPL, and not to allow others to use your version of this file under the terms of the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the GPL or the LGPL. If you do not delete the provisions above, a recipient may use your version of this file under the terms of any one of the MPL, the GPL or the LGPL.
+
+
+
+And, for the following Mozilla LDAP C SDK files, in addition to the above notice, the following notices were also included:
+
+
+
+ldap/include/regex.h
+
+/*
+
+ * Copyright (c) 1993 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/include/srchpref.h
+
+/*
+
+ * Copyright (c) 1993, 1994 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ *
+
+ * searchpref.h:  display template library defines
+
+ */
+
+
+
+ldap/include/portable.h
+
+/*
+
+ * Copyright (c) 1994 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/include/ldif.h
+
+/*
+
+ * Copyright (c) 1996 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/libldap/disptmpl.c
+
+/*
+
+ * Copyright (c) 1993, 1994 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/libldap/sort.c
+
+/*
+
+ * Copyright (c) 1994 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/libldap/srchpref.c
+
+/*
+
+ * Copyright (c) 1993, 1994 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ *
+
+ */
+
+
+
+ldap/libraries/libldap/dsparse.c
+
+/*
+
+ * Copyright (c) 1993, 1994 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/macintosh/strings.c
+
+/*
+
+ * Copyright (c) 1987 Regents of the University of California.
+
+ * All rights reserved.  The Berkeley software License Agreement
+
+ * specifies the terms and conditions for redistribution.
+
+ */
+
+
+
+ldap/libraries/macintosh/getopt.c
+
+/*
+
+ * Copyright (c) 1987 Regents of the University of California.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that: (1) source distributions retain this entire copyright
+
+ * notice and comment, and (2) distributions including binaries display
+
+ * the following acknowledgement:  ``This product includes software
+
+ * developed by the University of California, Berkeley and its contributors''
+
+ * in the documentation or other materials provided with the distribution
+
+ * and in all advertising materials mentioning features or use of this
+
+ * software. Neither the name of the University nor the names of its
+
+ * contributors may be used to endorse or promote products derived
+
+ * from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ */
+
+
+
+ldap/libraries/libutil/getopt.c
+
+/*
+
+ * Copyright (c) 1987 Regents of the University of California.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that: (1) source distributions retain this entire copyright
+
+ * notice and comment, and (2) distributions including binaries display
+
+ * the following acknowledgement:  ``This product includes software
+
+ * developed by the University of California, Berkeley and its contributors''
+
+ * in the documentation or other materials provided with the distribution
+
+ * and in all advertising materials mentioning features or use of this
+
+ * software. Neither the name of the University nor the names of its
+
+ * contributors may be used to endorse or promote products derived
+
+ * from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ */
+
+
+
+ldap/libraries/liblber/lber-int.h
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/liblber/idtest.c
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/liblber/encode.c
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/liblber/decode.c
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/liblber/dtest.c
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/liblber/etest.c
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+ldap/libraries/liblber/io.c
+
+/*
+
+ * Copyright (c) 1990 Regents of the University of Michigan.
+
+ * All rights reserved.
+
+ *
+
+ * Redistribution and use in source and binary forms are permitted
+
+ * provided that this notice is preserved and that due credit is given
+
+ * to the University of Michigan at Ann Arbor. The name of the University
+
+ * may not be used to endorse or promote products derived from this
+
+ * software without specific prior written permission. This software
+
+ * is provided ``as is'' without express or implied warranty.
+
+ */
+
+
+
+
+
+
+
+GNU LESSER GENERAL PUBLIC LICENSE
+
+                       Version 2.1, February 1999
+
+
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+
+ of this license document, but changing it is not allowed.
+
+
+
+[This is the first released version of the Lesser GPL.  It also counts
+
+ as the successor of the GNU Library Public License, version 2, hence
+
+ the version number 2.1.]
+
+
+
+                            Preamble
+
+
+
+  The licenses for most software are designed to take away your
+
+freedom to share and change it.  By contrast, the GNU General Public
+
+Licenses are intended to guarantee your freedom to share and change
+
+free software--to make sure the software is free for all its users.
+
+
+
+  This license, the Lesser General Public License, applies to some
+
+specially designated software packages--typically libraries--of the
+
+Free Software Foundation and other authors who decide to use it.  You
+
+can use it too, but we suggest you first think carefully about whether
+
+this license or the ordinary General Public License is the better
+
+strategy to use in any particular case, based on the explanations below.
+
+
+
+  When we speak of free software, we are referring to freedom of use,
+
+not price.  Our General Public Licenses are designed to make sure that
+
+you have the freedom to distribute copies of free software (and charge
+
+for this service if you wish); that you receive source code or can get
+
+it if you want it; that you can change the software and use pieces of
+
+it in new free programs; and that you are informed that you can do
+
+these things.
+
+
+
+  To protect your rights, we need to make restrictions that forbid
+
+distributors to deny you these rights or to ask you to surrender these
+
+rights.  These restrictions translate to certain responsibilities for
+
+you if you distribute copies of the library or if you modify it.
+
+
+
+  For example, if you distribute copies of the library, whether gratis
+
+or for a fee, you must give the recipients all the rights that we gave
+
+you.  You must make sure that they, too, receive or can get the source
+
+code.  If you link other code with the library, you must provide
+
+complete object files to the recipients, so that they can relink them
+
+with the library after making changes to the library and recompiling
+
+it.  And you must show them these terms so they know their rights.
+
+
+
+  We protect your rights with a two-step method: (1) we copyright the
+
+library, and (2) we offer you this license, which gives you legal
+
+permission to copy, distribute and/or modify the library.
+
+
+
+  To protect each distributor, we want to make it very clear that
+
+there is no warranty for the free library.  Also, if the library is
+
+modified by someone else and passed on, the recipients should know
+
+that what they have is not the original version, so that the original
+
+author's reputation will not be affected by problems that might be
+
+introduced by others.
+
+
+
+  Finally, software patents pose a constant threat to the existence of
+
+any free program.  We wish to make sure that a company cannot
+
+effectively restrict the users of a free program by obtaining a
+
+restrictive license from a patent holder.  Therefore, we insist that
+
+any patent license obtained for a version of the library must be
+
+consistent with the full freedom of use specified in this license.
+
+
+
+  Most GNU software, including some libraries, is covered by the
+
+ordinary GNU General Public License.  This license, the GNU Lesser
+
+General Public License, applies to certain designated libraries, and
+
+is quite different from the ordinary General Public License.  We use
+
+this license for certain libraries in order to permit linking those
+
+libraries into non-free programs.
+
+
+
+  When a program is linked with a library, whether statically or using
+
+a shared library, the combination of the two is legally speaking a
+
+combined work, a derivative of the original library.  The ordinary
+
+General Public License therefore permits such linking only if the
+
+entire combination fits its criteria of freedom.  The Lesser General
+
+Public License permits more lax criteria for linking other code with
+
+the library.
+
+
+
+  We call this license the "Lesser" General Public License because it
+
+does Less to protect the user's freedom than the ordinary General
+
+Public License.  It also provides other free software developers Less
+
+of an advantage over competing non-free programs.  These disadvantages
+
+are the reason we use the ordinary General Public License for many
+
+libraries.  However, the Lesser license provides advantages in certain
+
+special circumstances.
+
+
+
+  For example, on rare occasions, there may be a special need to
+
+encourage the widest possible use of a certain library, so that it becomes
+
+a de-facto standard.  To achieve this, non-free programs must be
+
+allowed to use the library.  A more frequent case is that a free
+
+library does the same job as widely used non-free libraries.  In this
+
+case, there is little to gain by limiting the free library to free
+
+software only, so we use the Lesser General Public License.
+
+
+
+  In other cases, permission to use a particular library in non-free
+
+programs enables a greater number of people to use a large body of
+
+free software.  For example, permission to use the GNU C Library in
+
+non-free programs enables many more people to use the whole GNU
+
+operating system, as well as its variant, the GNU/Linux operating
+
+system.
+
+
+
+  Although the Lesser General Public License is Less protective of the
+
+users' freedom, it does ensure that the user of a program that is
+
+linked with the Library has the freedom and the wherewithal to run
+
+that program using a modified version of the Library.
+
+
+
+  The precise terms and conditions for copying, distribution and
+
+modification follow.  Pay close attention to the difference between a
+
+"work based on the library" and a "work that uses the library".  The
+
+former contains code derived from the library, whereas the latter must
+
+be combined with the library in order to run.
+
+
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+
+
+  0. This License Agreement applies to any software library or other
+
+program which contains a notice placed by the copyright holder or
+
+other authorized party saying it may be distributed under the terms of
+
+this Lesser General Public License (also called "this License").
+
+Each licensee is addressed as "you".
+
+
+
+  A "library" means a collection of software functions and/or data
+
+prepared so as to be conveniently linked with application programs
+
+(which use some of those functions and data) to form executables.
+
+
+
+  The "Library", below, refers to any such software library or work
+
+which has been distributed under these terms.  A "work based on the
+
+Library" means either the Library or any derivative work under
+
+copyright law: that is to say, a work containing the Library or a
+
+portion of it, either verbatim or with modifications and/or translated
+
+straightforwardly into another language.  (Hereinafter, translation is
+
+included without limitation in the term "modification".)
+
+
+
+  "Source code" for a work means the preferred form of the work for
+
+making modifications to it.  For a library, complete source code means
+
+all the source code for all modules it contains, plus any associated
+
+interface definition files, plus the scripts used to control compilation
+
+and installation of the library.
+
+
+
+  Activities other than copying, distribution and modification are not
+
+covered by this License; they are outside its scope.  The act of
+
+running a program using the Library is not restricted, and output from
+
+such a program is covered only if its contents constitute a work based
+
+on the Library (independent of the use of the Library in a tool for
+
+writing it).  Whether that is true depends on what the Library does
+
+and what the program that uses the Library does.
+
+
+
+  1. You may copy and distribute verbatim copies of the Library's
+
+complete source code as you receive it, in any medium, provided that
+
+you conspicuously and appropriately publish on each copy an
+
+appropriate copyright notice and disclaimer of warranty; keep intact
+
+all the notices that refer to this License and to the absence of any
+
+warranty; and distribute a copy of this License along with the
+
+Library.
+
+
+
+  You may charge a fee for the physical act of transferring a copy,
+
+and you may at your option offer warranty protection in exchange for a
+
+fee.
+
+
+
+  2. You may modify your copy or copies of the Library or any portion
+
+of it, thus forming a work based on the Library, and copy and
+
+distribute such modifications or work under the terms of Section 1
+
+above, provided that you also meet all of these conditions:
+
+
+
+    a) The modified work must itself be a software library.
+
+
+
+    b) You must cause the files modified to carry prominent notices
+
+    stating that you changed the files and the date of any change.
+
+
+
+    c) You must cause the whole of the work to be licensed at no
+
+    charge to all third parties under the terms of this License.
+
+
+
+    d) If a facility in the modified Library refers to a function or a
+
+    table of data to be supplied by an application program that uses
+
+    the facility, other than as an argument passed when the facility
+
+    is invoked, then you must make a good faith effort to ensure that,
+
+    in the event an application does not supply such function or
+
+    table, the facility still operates, and performs whatever part of
+
+    its purpose remains meaningful.
+
+
+
+    (For example, a function in a library to compute square roots has
+
+    a purpose that is entirely well-defined independent of the
+
+    application.  Therefore, Subsection 2d requires that any
+
+    application-supplied function or table used by this function must
+
+    be optional: if the application does not supply it, the square
+
+    root function must still compute square roots.)
+
+
+
+These requirements apply to the modified work as a whole.  If
+
+identifiable sections of that work are not derived from the Library,
+
+and can be reasonably considered independent and separate works in
+
+themselves, then this License, and its terms, do not apply to those
+
+sections when you distribute them as separate works.  But when you
+
+distribute the same sections as part of a whole which is a work based
+
+on the Library, the distribution of the whole must be on the terms of
+
+this License, whose permissions for other licensees extend to the
+
+entire whole, and thus to each and every part regardless of who wrote
+
+it.
+
+
+
+Thus, it is not the intent of this section to claim rights or contest
+
+your rights to work written entirely by you; rather, the intent is to
+
+exercise the right to control the distribution of derivative or
+
+collective works based on the Library.
+
+
+
+In addition, mere aggregation of another work not based on the Library
+
+with the Library (or with a work based on the Library) on a volume of
+
+a storage or distribution medium does not bring the other work under
+
+the scope of this License.
+
+
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+
+License instead of this License to a given copy of the Library.  To do
+
+this, you must alter all the notices that refer to this License, so
+
+that they refer to the ordinary GNU General Public License, version 2,
+
+instead of to this License.  (If a newer version than version 2 of the
+
+ordinary GNU General Public License has appeared, then you can specify
+
+that version instead if you wish.)  Do not make any other change in
+
+these notices.
+
+
+
+  Once this change is made in a given copy, it is irreversible for
+
+that copy, so the ordinary GNU General Public License applies to all
+
+subsequent copies and derivative works made from that copy.
+
+
+
+  This option is useful when you wish to copy part of the code of
+
+the Library into a program that is not a library.
+
+
+
+  4. You may copy and distribute the Library (or a portion or
+
+derivative of it, under Section 2) in object code or executable form
+
+under the terms of Sections 1 and 2 above provided that you accompany
+
+it with the complete corresponding machine-readable source code, which
+
+must be distributed under the terms of Sections 1 and 2 above on a
+
+medium customarily used for software interchange.
+
+
+
+  If distribution of object code is made by offering access to copy
+
+from a designated place, then offering equivalent access to copy the
+
+source code from the same place satisfies the requirement to
+
+distribute the source code, even though third parties are not
+
+compelled to copy the source along with the object code.
+
+
+
+  5. A program that contains no derivative of any portion of the
+
+Library, but is designed to work with the Library by being compiled or
+
+linked with it, is called a "work that uses the Library".  Such a
+
+work, in isolation, is not a derivative work of the Library, and
+
+therefore falls outside the scope of this License.
+
+
+
+  However, linking a "work that uses the Library" with the Library
+
+creates an executable that is a derivative of the Library (because it
+
+contains portions of the Library), rather than a "work that uses the
+
+library".  The executable is therefore covered by this License.
+
+Section 6 states terms for distribution of such executables.
+
+
+
+  When a "work that uses the Library" uses material from a header file
+
+that is part of the Library, the object code for the work may be a
+
+derivative work of the Library even though the source code is not.
+
+Whether this is true is especially significant if the work can be
+
+linked without the Library, or if the work is itself a library.  The
+
+threshold for this to be true is not precisely defined by law.
+
+
+
+  If such an object file uses only numerical parameters, data
+
+structure layouts and accessors, and small macros and small inline
+
+functions (ten lines or less in length), then the use of the object
+
+file is unrestricted, regardless of whether it is legally a derivative
+
+work.  (Executables containing this object code plus portions of the
+
+Library will still fall under Section 6.)
+
+
+
+  Otherwise, if the work is a derivative of the Library, you may
+
+distribute the object code for the work under the terms of Section 6.
+
+Any executables containing that work also fall under Section 6,
+
+whether or not they are linked directly with the Library itself.
+
+
+
+  6. As an exception to the Sections above, you may also combine or
+
+link a "work that uses the Library" with the Library to produce a
+
+work containing portions of the Library, and distribute that work
+
+under terms of your choice, provided that the terms permit
+
+modification of the work for the customer's own use and reverse
+
+engineering for debugging such modifications.
+
+
+
+  You must give prominent notice with each copy of the work that the
+
+Library is used in it and that the Library and its use are covered by
+
+this License.  You must supply a copy of this License.  If the work
+
+during execution displays copyright notices, you must include the
+
+copyright notice for the Library among them, as well as a reference
+
+directing the user to the copy of this License.  Also, you must do one
+
+of these things:
+
+
+
+    a) Accompany the work with the complete corresponding
+
+    machine-readable source code for the Library including whatever
+
+    changes were used in the work (which must be distributed under
+
+    Sections 1 and 2 above); and, if the work is an executable linked
+
+    with the Library, with the complete machine-readable "work that
+
+    uses the Library", as object code and/or source code, so that the
+
+    user can modify the Library and then relink to produce a modified
+
+    executable containing the modified Library.  (It is understood
+
+    that the user who changes the contents of definitions files in the
+
+    Library will not necessarily be able to recompile the application
+
+    to use the modified definitions.)
+
+
+
+    b) Use a suitable shared library mechanism for linking with the
+
+    Library.  A suitable mechanism is one that (1) uses at run time a
+
+    copy of the library already present on the user's computer system,
+
+    rather than copying library functions into the executable, and (2)
+
+    will operate properly with a modified version of the library, if
+
+    the user installs one, as long as the modified version is
+
+    interface-compatible with the version that the work was made with.
+
+
+
+    c) Accompany the work with a written offer, valid for at
+
+    least three years, to give the same user the materials
+
+    specified in Subsection 6a, above, for a charge no more
+
+    than the cost of performing this distribution.
+
+
+
+    d) If distribution of the work is made by offering access to copy
+
+    from a designated place, offer equivalent access to copy the above
+
+    specified materials from the same place.
+
+
+
+    e) Verify that the user has already received a copy of these
+
+    materials or that you have already sent this user a copy.
+
+
+
+  For an executable, the required form of the "work that uses the
+
+Library" must include any data and utility programs needed for
+
+reproducing the executable from it.  However, as a special exception,
+
+the materials to be distributed need not include anything that is
+
+normally distributed (in either source or binary form) with the major
+
+components (compiler, kernel, and so on) of the operating system on
+
+which the executable runs, unless that component itself accompanies
+
+the executable.
+
+
+
+  It may happen that this requirement contradicts the license
+
+restrictions of other proprietary libraries that do not normally
+
+accompany the operating system.  Such a contradiction means you cannot
+
+use both them and the Library together in an executable that you
+
+distribute.
+
+
+
+  7. You may place library facilities that are a work based on the
+
+Library side-by-side in a single library together with other library
+
+facilities not covered by this License, and distribute such a combined
+
+library, provided that the separate distribution of the work based on
+
+the Library and of the other library facilities is otherwise
+
+permitted, and provided that you do these two things:
+
+
+
+    a) Accompany the combined library with a copy of the same work
+
+    based on the Library, uncombined with any other library
+
+    facilities.  This must be distributed under the terms of the
+
+    Sections above.
+
+
+
+    b) Give prominent notice with the combined library of the fact
+
+    that part of it is a work based on the Library, and explaining
+
+    where to find the accompanying uncombined form of the same work.
+
+
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+
+the Library except as expressly provided under this License.  Any
+
+attempt otherwise to copy, modify, sublicense, link with, or
+
+distribute the Library is void, and will automatically terminate your
+
+rights under this License.  However, parties who have received copies,
+
+or rights, from you under this License will not have their licenses
+
+terminated so long as such parties remain in full compliance.
+
+
+
+  9. You are not required to accept this License, since you have not
+
+signed it.  However, nothing else grants you permission to modify or
+
+distribute the Library or its derivative works.  These actions are
+
+prohibited by law if you do not accept this License.  Therefore, by
+
+modifying or distributing the Library (or any work based on the
+
+Library), you indicate your acceptance of this License to do so, and
+
+all its terms and conditions for copying, distributing or modifying
+
+the Library or works based on it.
+
+
+
+  10. Each time you redistribute the Library (or any work based on the
+
+Library), the recipient automatically receives a license from the
+
+original licensor to copy, distribute, link with or modify the Library
+
+subject to these terms and conditions.  You may not impose any further
+
+restrictions on the recipients' exercise of the rights granted herein.
+
+You are not responsible for enforcing compliance by third parties with
+
+this License.
+
+
+
+  11. If, as a consequence of a court judgment or allegation of patent
+
+infringement or for any other reason (not limited to patent issues),
+
+conditions are imposed on you (whether by court order, agreement or
+
+otherwise) that contradict the conditions of this License, they do not
+
+excuse you from the conditions of this License.  If you cannot
+
+distribute so as to satisfy simultaneously your obligations under this
+
+License and any other pertinent obligations, then as a consequence you
+
+may not distribute the Library at all.  For example, if a patent
+
+license would not permit royalty-free redistribution of the Library by
+
+all those who receive copies directly or indirectly through you, then
+
+the only way you could satisfy both it and this License would be to
+
+refrain entirely from distribution of the Library.
+
+
+
+If any portion of this section is held invalid or unenforceable under any
+
+particular circumstance, the balance of the section is intended to apply,
+
+and the section as a whole is intended to apply in other circumstances.
+
+
+
+It is not the purpose of this section to induce you to infringe any
+
+patents or other property right claims or to contest validity of any
+
+such claims; this section has the sole purpose of protecting the
+
+integrity of the free software distribution system which is
+
+implemented by public license practices.  Many people have made
+
+generous contributions to the wide range of software distributed
+
+through that system in reliance on consistent application of that
+
+system; it is up to the author/donor to decide if he or she is willing
+
+to distribute software through any other system and a licensee cannot
+
+impose that choice.
+
+
+
+This section is intended to make thoroughly clear what is believed to
+
+be a consequence of the rest of this License.
+
+
+
+  12. If the distribution and/or use of the Library is restricted in
+
+certain countries either by patents or by copyrighted interfaces, the
+
+original copyright holder who places the Library under this License may add
+
+an explicit geographical distribution limitation excluding those countries,
+
+so that distribution is permitted only in or among countries not thus
+
+excluded.  In such case, this License incorporates the limitation as if
+
+written in the body of this License.
+
+
+
+  13. The Free Software Foundation may publish revised and/or new
+
+versions of the Lesser General Public License from time to time.
+
+Such new versions will be similar in spirit to the present version,
+
+but may differ in detail to address new problems or concerns.
+
+
+
+Each version is given a distinguishing version number.  If the Library
+
+specifies a version number of this License which applies to it and
+
+"any later version", you have the option of following the terms and
+
+conditions either of that version or of any later version published by
+
+the Free Software Foundation.  If the Library does not specify a
+
+license version number, you may choose any version ever published by
+
+the Free Software Foundation.
+
+
+
+  14. If you wish to incorporate parts of the Library into other free
+
+programs whose distribution conditions are incompatible with these,
+
+write to the author to ask for permission.  For software which is
+
+copyrighted by the Free Software Foundation, write to the Free
+
+Software Foundation; we sometimes make exceptions for this.  Our
+
+decision will be guided by the two goals of preserving the free status
+
+of all derivatives of our free software and of promoting the sharing
+
+and reuse of software generally.
+
+
+
+                            NO WARRANTY
+
+
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+
+DAMAGES.
+
+
+
+                     END OF TERMS AND CONDITIONS
+
+
+
+           How to Apply These Terms to Your New Libraries
+
+
+
+  If you develop a new library, and you want it to be of the greatest
+
+possible use to the public, we recommend making it free software that
+
+everyone can redistribute and change.  You can do so by permitting
+
+redistribution under these terms (or, alternatively, under the terms of the
+
+ordinary General Public License).
+
+
+
+  To apply these terms, attach the following notices to the library.  It is
+
+safest to attach them to the start of each source file to most effectively
+
+convey the exclusion of warranty; and each file should have at least the
+
+"copyright" line and a pointer to where the full notice is found.
+
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+
+    Copyright (C) <year>  <name of author>
+
+
+
+    This library is free software; you can redistribute it and/or
+
+    modify it under the terms of the GNU Lesser General Public
+
+    License as published by the Free Software Foundation; either
+
+    version 2.1 of the License, or (at your option) any later version.
+
+
+
+    This library is distributed in the hope that it will be useful,
+
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+
+    Lesser General Public License for more details.
+
+
+
+    You should have received a copy of the GNU Lesser General Public
+
+    License along with this library; if not, write to the Free Software
+
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+
+
+You should also get your employer (if you work as a programmer) or your
+
+school, if any, to sign a "copyright disclaimer" for the library, if
+
+necessary.  Here is a sample; alter the names:
+
+
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+
+
+  <signature of Ty Coon>, 1 April 1990
+
+  Ty Coon, President of Vice
+
+
+
+That's all there is to it!
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/depend	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+#ident	"@(#)depend	1.1	10/08/03 SMI"
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+#
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWesu	Extended System Utilities
+P SUNWgcmn	GNU Common Package
+P SUNWopenssl-libraries	SUNWopenssl-libraries OpenSSL Libraries (Usr)
+P SUNWtls	Network Security Services
+P SUNWpr	Netscape Portable Runtime
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/pkginfo.tmpl	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,50 @@
+#
+# 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.
+#
+#ident	"@(#)pkginfo.tmpl	1.1	10/08/03 SMI"
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+B
+B
+B
+PKG="SUNWmozldapC-SDK"
+NAME="Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)"
+ARCH="ISA"
+VERSION="SFWVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="usr"
+MAXINST="1000"
+CATEGORY="system"
+DESC="Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)"
+VENDOR="COMPANY"
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="false"
+SUNW_PKG_HOLLOW="false"
+SUNW_PKG_THISZONE="false"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/prototype_com	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,72 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_com	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+# source locations relative to the prototype file
+#
+# SUNWmozldapC-SDK
+#
+
+d none usr 755 root sys
+
+d none usr/lib 755 root bin
+f none usr/lib/libldap60.so.1 0755 root bin
+s none usr/lib/libldap60.so=libldap60.so.1
+f none usr/lib/libldif60.so.1 0755 root bin
+s none usr/lib/libldif60.so=libldif60.so.1
+f none usr/lib/libprldap60.so.1 0755 root bin
+s none usr/lib/libprldap60.so=libprldap60.so.1
+f none usr/lib/libssldap60.so.1 0755 root bin
+s none usr/lib/libssldap60.so=libssldap60.so.1
+
+# Mozldap is private interface for samba. We need the headers in proto for
+# building, but they are not shipped to any package
+# d none usr/include 755 root bin
+# d none usr/include/ldap6 0755 root bin
+# f none usr/include/ldap6/disptmpl.h 0444 root bin
+# f none usr/include/ldap6/iutil.h 0444 root bin
+# f none usr/include/ldap6/lber.h 0444 root bin
+# f none usr/include/ldap6/ldap-deprecated.h 0444 root bin
+# f none usr/include/ldap6/ldap-extension.h 0444 root bin
+# f none usr/include/ldap6/ldap-platform.h 0444 root bin
+# f none usr/include/ldap6/ldap-standard.h 0444 root bin
+# f none usr/include/ldap6/ldap-to-be-deprecated.h 0444 root bin
+# f none usr/include/ldap6/ldap.h 0444 root bin
+# f none usr/include/ldap6/ldap_ssl.h 0444 root bin
+# f none usr/include/ldap6/ldappr.h 0444 root bin
+# f none usr/include/ldap6/ldif.h 0444 root bin
+# f none usr/include/ldap6/srchpref.h 0444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/prototype_i386	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,58 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_i386	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are I386 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWmozldapC-SDK
+#
+#
+d none usr/lib/amd64 0755 root bin
+f none usr/lib/amd64/libldap60.so.1 0755 root bin
+s none usr/lib/amd64/libldap60.so=libldap60.so.1
+f none usr/lib/amd64/libldif60.so.1 0755 root bin
+s none usr/lib/amd64/libldif60.so=libldif60.so.1
+f none usr/lib/amd64/libprldap60.so.1 0755 root bin
+s none usr/lib/amd64/libprldap60.so=libprldap60.so.1
+f none usr/lib/amd64/libssldap60.so.1 0755 root bin
+s none usr/lib/amd64/libssldap60.so=libssldap60.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWmozldapC-SDK/prototype_sparc	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,58 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_sparc	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWmozldapC-SDK
+#
+#
+d none usr/lib/sparcv9 0755 root bin
+f none usr/lib/sparcv9/libldap60.so.1 0755 root bin
+s none usr/lib/sparcv9/libldap60.so=libldap60.so.1
+f none usr/lib/sparcv9/libldif60.so.1 0755 root bin
+s none usr/lib/sparcv9/libldif60.so=libldif60.so.1
+f none usr/lib/sparcv9/libprldap60.so.1 0755 root bin
+s none usr/lib/sparcv9/libprldap60.so=libprldap60.so.1
+f none usr/lib/sparcv9/libssldap60.so.1 0755 root bin
+s none usr/lib/sparcv9/libssldap60.so=libssldap60.so.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/Makefile	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+#ident	"@(#)Makefile	1.1	10/08/03 SMI"
+#
+
+include ../Makefile.com
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/copyright	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,725 @@
+For the avoidance of doubt, except that if any license choice other than
+GPL or LGPL is available it will apply instead, Oracle elects to use
+only the General Public License version 3 (GPLv3) at this time for any
+software where a choice of GPL license versions is made available with
+the language indicating that GPLv3 or any later version may be used.
+
+================================================================================
+
+                        GNU GENERAL PUBLIC LICENSE
+                          Version 3, 29 June 2007
+
+    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+                               Preamble
+
+     The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+     The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+     When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+     To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+     For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+     Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+     For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+     Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+     Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+     The precise terms and conditions for copying, distribution and
+modification follow.
+
+                          TERMS AND CONDITIONS
+
+     0. Definitions.
+
+     "This License" refers to version 3 of the GNU General Public License.
+
+     "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+     "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+     To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+     A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+     To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+     To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+     An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+     1. Source Code.
+
+     The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+     A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+     The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+     The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+     The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+     The Corresponding Source for a work in source code form is that
+same work.
+
+     2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+     You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+     4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+     5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+       a) The work must carry prominent notices stating that you modified
+       it, and giving a relevant date.
+
+       b) The work must carry prominent notices stating that it is
+       released under this License and any conditions added under section
+       7.  This requirement modifies the requirement in section 4 to
+       "keep intact all notices".
+
+       c) You must license the entire work, as a whole, under this
+       License to anyone who comes into possession of a copy.  This
+       License will therefore apply, along with any applicable section 7
+       additional terms, to the whole of the work, and all its parts,
+       regardless of how they are packaged.  This License gives no
+       permission to license the work in any other way, but it does not
+       invalidate such permission if you have separately received it.
+
+       d) If the work has interactive user interfaces, each must display
+       Appropriate Legal Notices; however, if the Program has interactive
+       interfaces that do not display Appropriate Legal Notices, your
+       work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+     6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+       a) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by the
+       Corresponding Source fixed on a durable physical medium
+       customarily used for software interchange.
+
+       b) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by a
+       written offer, valid for at least three years and valid for as
+       long as you offer spare parts or customer support for that product
+       model, to give anyone who possesses the object code either (1) a
+       copy of the Corresponding Source for all the software in the
+       product that is covered by this License, on a durable physical
+       medium customarily used for software interchange, for a price no
+       more than your reasonable cost of physically performing this
+       conveying of source, or (2) access to copy the
+       Corresponding Source from a network server at no charge.
+
+       c) Convey individual copies of the object code with a copy of the
+       written offer to provide the Corresponding Source.  This
+       alternative is allowed only occasionally and non-commercially, and
+       only if you received the object code with such an offer, in accord
+       with subsection 6b.
+
+       d) Convey the object code by offering access from a designated
+       place (gratis or for a charge), and offer equivalent access to the
+       Corresponding Source in the same way through the same place at no
+       further charge.  You need not require recipients to copy the
+       Corresponding Source along with the object code.  If the place to
+       copy the object code is a network server, the Corresponding Source
+       may be on a different server (operated by you or a third party)
+       that supports equivalent copying facilities, provided you maintain
+       clear directions next to the object code saying where to find the
+       Corresponding Source.  Regardless of what server hosts the
+       Corresponding Source, you remain obligated to ensure that it is
+       available for as long as needed to satisfy these requirements.
+
+       e) Convey the object code using peer-to-peer transmission, provided
+       you inform other peers where the object code and Corresponding
+       Source of the work are being offered to the general public at no
+       charge under subsection 6d.
+
+     A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+     A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+     "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+     If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+     The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+     Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+     7. Additional Terms.
+
+     "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+     When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+       a) Disclaiming warranty or limiting liability differently from the
+       terms of sections 15 and 16 of this License; or
+
+       b) Requiring preservation of specified reasonable legal notices or
+       author attributions in that material or in the Appropriate Legal
+       Notices displayed by works containing it; or
+
+       c) Prohibiting misrepresentation of the origin of that material, or
+       requiring that modified versions of such material be marked in
+       reasonable ways as different from the original version; or
+
+       d) Limiting the use for publicity purposes of names of licensors or
+       authors of the material; or
+
+       e) Declining to grant rights under trademark law for use of some
+       trade names, trademarks, or service marks; or
+
+       f) Requiring indemnification of licensors and authors of that
+       material by anyone who conveys the material (or modified versions of
+       it) with contractual assumptions of liability to the recipient, for
+       any liability that these contractual assumptions directly impose on
+       those licensors and authors.
+
+     All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+     If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+     8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+     Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+     9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+     10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+     An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+     You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+     11. Patents.
+
+     A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+     A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+     Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+     In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+     A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+     Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+     12. No Surrender of Others' Freedom.
+
+     If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+     13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+     14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+     Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+     If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+     Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+     15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+     16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+     17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                        END OF TERMS AND CONDITIONS
+
+               How to Apply These Terms to Your New Programs
+
+     If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+     To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+       Copyright (C)
+
+       This program is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program.  If not, see_http://www.gnu.org/licenses/_.
+
+Also add information on how to contact you by electronic and paper mail.
+
+     If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+         Copyright (C)
+       This program comes with ABSOLUTELY NO WARRANTY; for details type
+`show w'.
+       This is free software, and you are welcome to redistribute it
+       under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+     You should also get your employer (if you work as a programmer) or
+school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+_http://www.gnu.org/licenses/_.
+
+     The GNU General Public License does not permit incorporating your
+program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+_http://www.gnu.org/philosophy/why-not-lgpl.html_.
+
+--------------------------------------------------------------------
+
+Written Offer to Provide Certain Source Code
+
+The Oracle software and/or hardware you have received may contain or
+include certain portions that are licensed under license terms provided
+by third parties not associated with Oracle. For binaries that you
+receive from Oracle that are licensed under any version of the GNU
+General Public License (GPL) or the GNU LGPL, you can receive a complete
+machine-readable copy of the source code by sending a written request to:
+
+Oracle America, Inc.
+
+Attn: Associate General Counsel,
+
+Development and Engineering Legal
+
+500 Oracle Parkway, 7th Floor
+
+Redwood Shores, CA 94065
+
+
+
+Your request should include (i) the name of the covered binary, (ii) the
+version number of the Oracle product containing the covered binary,
+(iii) your name, (iv) your company name (if applicable) and (v) your
+return mailing and email address (if available).
+
+We may charge you a nominal fee to cover the cost of the media and
+distribution.
+
+Your request must be sent within three (3) years of the date you
+received the GPL or LGPL covered code.
+
+
+
+
+
+-- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/depend	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,52 @@
+#
+# 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.
+#
+#ident	"@(#)depend	1.1	10/08/03 SMI"
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+#
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWesu	Extended System Utilities
+P SUNWsmbar	samba - A Windows SMB/CIFS fileserver for UNIX (Root)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/pkginfo.tmpl	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+#ident	"@(#)pkginfo.tmpl	1.1	10/08/03 SMI"
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWsmbadocr"
+NAME="Samba documentation (Root) package"
+ARCH="ISA"
+VERSION="SFWVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+MAXINST="1000"
+CATEGORY="system"
+DESC="samba - A Windows SMB/CIFS fileserver for UNIX (Root)"
+VENDOR="COMPANY"
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none manifest"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="false"
+SUNW_PKG_HOLLOW="false"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/preinstall	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# 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.
+#
+#ident	"@(#)preinstall	1.2	08/05/25 SMI"
+#
+# preinstall - register the swat service on port: 901/tcp
+#
+
+ed -s ${PKG_INSTALL_ROOT}/etc/inet/services >/dev/null <<EDITFILE
+g/^swat[ 	]/d
+g/^\#\[swat\]/d
+$
+a
+#[swat] The swat service is added by the SUNWsmbar package.
+#[swat] Removing the swat service manually while SUNWsmbar
+#[swat] package is installed in the system can cause issues
+#[swat] with smf(5) stability or with zones(5) installation.
+swat		901/tcp				# Samba Web Adm.Tool
+.
+w
+q
+EDITFILE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/prototype_com	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,51 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_com	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+i preinstall
+
+# source locations relative to the prototype file
+
+#
+# SUNWsmbadocr
+#
+
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/swat.xml 444 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/prototype_i386	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_i386	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are I386 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsmbadocr
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocr/prototype_sparc	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_sparc	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsmbadocr
+#
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/Makefile	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+#ident	"@(#)Makefile	1.1	10/08/03 SMI"
+#
+
+include ../Makefile.com
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/copyright	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,725 @@
+For the avoidance of doubt, except that if any license choice other than
+GPL or LGPL is available it will apply instead, Oracle elects to use
+only the General Public License version 3 (GPLv3) at this time for any
+software where a choice of GPL license versions is made available with
+the language indicating that GPLv3 or any later version may be used.
+
+================================================================================
+
+                        GNU GENERAL PUBLIC LICENSE
+                          Version 3, 29 June 2007
+
+    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+                               Preamble
+
+     The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+     The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+     When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+     To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+     For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+     Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+     For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+     Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+     Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+     The precise terms and conditions for copying, distribution and
+modification follow.
+
+                          TERMS AND CONDITIONS
+
+     0. Definitions.
+
+     "This License" refers to version 3 of the GNU General Public License.
+
+     "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+     "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+     To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+     A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+     To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+     To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+     An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+     1. Source Code.
+
+     The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+     A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+     The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+     The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+     The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+     The Corresponding Source for a work in source code form is that
+same work.
+
+     2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+     You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+     4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+     5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+       a) The work must carry prominent notices stating that you modified
+       it, and giving a relevant date.
+
+       b) The work must carry prominent notices stating that it is
+       released under this License and any conditions added under section
+       7.  This requirement modifies the requirement in section 4 to
+       "keep intact all notices".
+
+       c) You must license the entire work, as a whole, under this
+       License to anyone who comes into possession of a copy.  This
+       License will therefore apply, along with any applicable section 7
+       additional terms, to the whole of the work, and all its parts,
+       regardless of how they are packaged.  This License gives no
+       permission to license the work in any other way, but it does not
+       invalidate such permission if you have separately received it.
+
+       d) If the work has interactive user interfaces, each must display
+       Appropriate Legal Notices; however, if the Program has interactive
+       interfaces that do not display Appropriate Legal Notices, your
+       work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+     6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+       a) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by the
+       Corresponding Source fixed on a durable physical medium
+       customarily used for software interchange.
+
+       b) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by a
+       written offer, valid for at least three years and valid for as
+       long as you offer spare parts or customer support for that product
+       model, to give anyone who possesses the object code either (1) a
+       copy of the Corresponding Source for all the software in the
+       product that is covered by this License, on a durable physical
+       medium customarily used for software interchange, for a price no
+       more than your reasonable cost of physically performing this
+       conveying of source, or (2) access to copy the
+       Corresponding Source from a network server at no charge.
+
+       c) Convey individual copies of the object code with a copy of the
+       written offer to provide the Corresponding Source.  This
+       alternative is allowed only occasionally and non-commercially, and
+       only if you received the object code with such an offer, in accord
+       with subsection 6b.
+
+       d) Convey the object code by offering access from a designated
+       place (gratis or for a charge), and offer equivalent access to the
+       Corresponding Source in the same way through the same place at no
+       further charge.  You need not require recipients to copy the
+       Corresponding Source along with the object code.  If the place to
+       copy the object code is a network server, the Corresponding Source
+       may be on a different server (operated by you or a third party)
+       that supports equivalent copying facilities, provided you maintain
+       clear directions next to the object code saying where to find the
+       Corresponding Source.  Regardless of what server hosts the
+       Corresponding Source, you remain obligated to ensure that it is
+       available for as long as needed to satisfy these requirements.
+
+       e) Convey the object code using peer-to-peer transmission, provided
+       you inform other peers where the object code and Corresponding
+       Source of the work are being offered to the general public at no
+       charge under subsection 6d.
+
+     A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+     A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+     "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+     If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+     The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+     Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+     7. Additional Terms.
+
+     "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+     When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+       a) Disclaiming warranty or limiting liability differently from the
+       terms of sections 15 and 16 of this License; or
+
+       b) Requiring preservation of specified reasonable legal notices or
+       author attributions in that material or in the Appropriate Legal
+       Notices displayed by works containing it; or
+
+       c) Prohibiting misrepresentation of the origin of that material, or
+       requiring that modified versions of such material be marked in
+       reasonable ways as different from the original version; or
+
+       d) Limiting the use for publicity purposes of names of licensors or
+       authors of the material; or
+
+       e) Declining to grant rights under trademark law for use of some
+       trade names, trademarks, or service marks; or
+
+       f) Requiring indemnification of licensors and authors of that
+       material by anyone who conveys the material (or modified versions of
+       it) with contractual assumptions of liability to the recipient, for
+       any liability that these contractual assumptions directly impose on
+       those licensors and authors.
+
+     All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+     If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+     8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+     Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+     9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+     10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+     An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+     You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+     11. Patents.
+
+     A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+     A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+     Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+     In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+     A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+     Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+     12. No Surrender of Others' Freedom.
+
+     If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+     13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+     14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+     Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+     If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+     Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+     15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+     16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+     17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                        END OF TERMS AND CONDITIONS
+
+               How to Apply These Terms to Your New Programs
+
+     If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+     To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+       Copyright (C)
+
+       This program is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program.  If not, see_http://www.gnu.org/licenses/_.
+
+Also add information on how to contact you by electronic and paper mail.
+
+     If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+         Copyright (C)
+       This program comes with ABSOLUTELY NO WARRANTY; for details type
+`show w'.
+       This is free software, and you are welcome to redistribute it
+       under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+     You should also get your employer (if you work as a programmer) or
+school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+_http://www.gnu.org/licenses/_.
+
+     The GNU General Public License does not permit incorporating your
+program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+_http://www.gnu.org/philosophy/why-not-lgpl.html_.
+
+--------------------------------------------------------------------
+
+Written Offer to Provide Certain Source Code
+
+The Oracle software and/or hardware you have received may contain or
+include certain portions that are licensed under license terms provided
+by third parties not associated with Oracle. For binaries that you
+receive from Oracle that are licensed under any version of the GNU
+General Public License (GPL) or the GNU LGPL, you can receive a complete
+machine-readable copy of the source code by sending a written request to:
+
+Oracle America, Inc.
+
+Attn: Associate General Counsel,
+
+Development and Engineering Legal
+
+500 Oracle Parkway, 7th Floor
+
+Redwood Shores, CA 94065
+
+
+
+Your request should include (i) the name of the covered binary, (ii) the
+version number of the Oracle product containing the covered binary,
+(iii) your name, (iv) your company name (if applicable) and (v) your
+return mailing and email address (if available).
+
+We may charge you a nominal fee to cover the cost of the media and
+distribution.
+
+Your request must be sent within three (3) years of the date you
+received the GPL or LGPL covered code.
+
+
+
+
+
+-- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/depend	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+#ident	"@(#)depend	1.1	10/08/03 SMI"
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+#
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWesu	Extended System Utilities
+P SUNWgcmn	GNU Common Package
+P SUNWsmbau	samba - A Windows SMB/CIFS fileserver for UNIX (Usr)
+P SUNWavahi-bridge-dsd	Avahi client and bridge to SUNWdsd
+P SUNWmozldapC-SDK	Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/pkginfo.tmpl	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+#ident	"@(#)pkginfo.tmpl	1.1	10/08/03 SMI"
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWsmbadocu"
+NAME="Samba documentation (Usr) package"
+ARCH="ISA"
+VERSION="SFWVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="usr"
+MAXINST="1000"
+CATEGORY="system"
+DESC="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)"
+VENDOR="COMPANY"
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="false"
+SUNW_PKG_HOLLOW="false"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/prototype_com	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,380 @@
+#
+#
+# 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.
+#
+#ident	"@(#)prototype_com	1.2	10/08/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+# source locations relative to the prototype file
+#
+# SUNWsmbadocu
+#
+
+d none usr 0755 root sys
+d none usr/sbin 0755 root bin
+f none usr/sbin/swat 0755 root bin
+
+d none usr/share 0755 root sys
+d none usr/share/man 0755 root bin
+d none usr/share/man/man1 0755 root bin
+f none usr/share/man/man1/findsmb.1 0444 root bin
+f none usr/share/man/man1/ldbadd.1 0444 root bin
+f none usr/share/man/man1/ldbdel.1 0444 root bin
+f none usr/share/man/man1/ldbedit.1 0444 root bin
+f none usr/share/man/man1/ldbmodify.1 0444 root bin
+f none usr/share/man/man1/ldbrename.1 0444 root bin
+f none usr/share/man/man1/ldbsearch.1 0444 root bin
+f none usr/share/man/man1/log2pcap.1 0444 root bin
+f none usr/share/man/man1/nmblookup.1 0444 root bin
+f none usr/share/man/man1/ntlm_auth.1 0444 root bin
+f none usr/share/man/man1/smbprofiles.1 0444 root bin
+f none usr/share/man/man1/rpcclient.1 0444 root bin
+f none usr/share/man/man1/sharesec.1 0444 root bin
+f none usr/share/man/man1/smbcacls.1 0444 root bin
+f none usr/share/man/man1/smbclient.1 0444 root bin
+f none usr/share/man/man1/smbcontrol.1 0444 root bin
+f none usr/share/man/man1/smbcquotas.1 0444 root bin
+f none usr/share/man/man1/smbget.1 0444 root bin
+f none usr/share/man/man1/smbstatus.1 0444 root bin
+f none usr/share/man/man1/smbtar.1 0444 root bin
+f none usr/share/man/man1/smbtree.1 0444 root bin
+f none usr/share/man/man1/testparm.1 0444 root bin
+f none usr/share/man/man1/vfstest.1 0444 root bin
+f none usr/share/man/man1/wbinfo.1 0444 root bin
+d none usr/share/man/man4 0755 root bin
+f none usr/share/man/man4/lmhosts.4 0444 root bin
+f none usr/share/man/man4/pam_winbind.conf.4 0444 root bin
+f none usr/share/man/man4/smb.conf.4 0444 root bin
+f none usr/share/man/man4/smbgetrc.4 0444 root bin
+f none usr/share/man/man4/smbpasswd.4 0444 root bin
+d none usr/share/man/man5 0755 root bin
+f none usr/share/man/man5/libsmbclient.5 0444 root bin
+f none usr/share/man/man5/samba.5 0444 root bin
+f none usr/share/man/man5/winbind_krb5_locator.5 0444 root bin
+d none usr/share/man/man1m 0755 root bin
+f none usr/share/man/man1m/cifs.upcall.1m 0444 root bin
+f none usr/share/man/man1m/eventlogadm.1m 0444 root bin
+f none usr/share/man/man1m/idmap_ad.1m 0444 root bin
+f none usr/share/man/man1m/idmap_adex.1m 0444 root bin
+f none usr/share/man/man1m/idmap_hash.1m 0444 root bin
+f none usr/share/man/man1m/idmap_ldap.1m 0444 root bin
+f none usr/share/man/man1m/idmap_nss.1m 0444 root bin
+f none usr/share/man/man1m/idmap_rid.1m 0444 root bin
+f none usr/share/man/man1m/idmap_tdb.1m 0444 root bin
+f none usr/share/man/man1m/idmap_tdb2.1m 0444 root bin
+f none usr/share/man/man1m/net.1m 0444 root bin
+f none usr/share/man/man1m/nmbd.1m 0444 root bin
+f none usr/share/man/man1m/pam_winbind.1m 0444 root bin
+f none usr/share/man/man1m/pdbedit.1m 0444 root bin
+f none usr/share/man/man1m/smbsmbd.1m 0444 root bin
+f none usr/share/man/man1m/smbpasswd.1m 0444 root bin
+f none usr/share/man/man1m/smbspool.1m 0444 root bin
+f none usr/share/man/man1m/swat.1m 0444 root bin
+f none usr/share/man/man1m/tdbbackup.1m 0444 root bin
+f none usr/share/man/man1m/tdbdump.1m 0444 root bin
+f none usr/share/man/man1m/tdbtool.1m 0444 root bin
+f none usr/share/man/man1m/vfs_acl_tdb.1m 0444 root bin
+f none usr/share/man/man1m/vfs_acl_xattr.1m 0444 root bin
+f none usr/share/man/man1m/vfs_audit.1m 0444 root bin
+f none usr/share/man/man1m/vfs_cacheprime.1m 0444 root bin
+f none usr/share/man/man1m/vfs_cap.1m 0444 root bin
+f none usr/share/man/man1m/vfs_catia.1m 0444 root bin
+f none usr/share/man/man1m/vfs_commit.1m 0444 root bin
+f none usr/share/man/man1m/vfs_default_quota.1m 0444 root bin
+f none usr/share/man/man1m/vfs_dirsort.1m 0444 root bin
+f none usr/share/man/man1m/vfs_extd_audit.1m 0444 root bin
+f none usr/share/man/man1m/vfs_fake_perms.1m 0444 root bin
+f none usr/share/man/man1m/vfs_fileid.1m 0444 root bin
+f none usr/share/man/man1m/vfs_full_audit.1m 0444 root bin
+f none usr/share/man/man1m/vfs_gpfs.1m 0444 root bin
+f none usr/share/man/man1m/vfs_netatalk.1m 0444 root bin
+f none usr/share/man/man1m/vfs_notify_fam.1m 0444 root bin
+f none usr/share/man/man1m/vfs_prealloc.1m 0444 root bin
+f none usr/share/man/man1m/vfs_preopen.1m 0444 root bin
+f none usr/share/man/man1m/vfs_readahead.1m 0444 root bin
+f none usr/share/man/man1m/vfs_readonly.1m 0444 root bin
+f none usr/share/man/man1m/vfs_recycle.1m 0444 root bin
+f none usr/share/man/man1m/vfs_scannedonly.1m 0444 root bin
+f none usr/share/man/man1m/vfs_shadow_copy.1m 0444 root bin
+f none usr/share/man/man1m/vfs_shadow_copy2.1m 0444 root bin
+f none usr/share/man/man1m/vfs_smb_traffic_analyzer.1m 0444 root bin
+f none usr/share/man/man1m/vfs_streams_depot.1m 0444 root bin
+f none usr/share/man/man1m/vfs_streams_xattr.1m 0444 root bin
+f none usr/share/man/man1m/vfs_xattr_tdb.1m 0444 root bin
+f none usr/share/man/man1m/winbindd.1m 0444 root bin
+
+d none usr/share/samba 0755 root bin
+d none usr/share/samba/swat 0755 root bin
+d none usr/share/samba/swat/help 0755 root bin
+d none usr/share/samba/swat/help/Samba3-ByExample 0755 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/Big500users.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/DMSMig.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/DomApps.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/ExNetworks.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/HA.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/RefSection.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/apa.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/appendix.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/ch14.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/go01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/happy.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/index.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/ix01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/kerberos.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/net2000users.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/ntmigration.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/nw4migration.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/pr01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/pr02.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/pr03.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/preface.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/primer.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/secure.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/simple.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/small.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/unixclients.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-ByExample/upgrades.html 0644 root bin
+d none usr/share/samba/swat/help/Samba3-Developers-Guide 0755 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/Packaging.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/architecture.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/contributing.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/debug.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/devprinting.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/index.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/internals.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/modules.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/parsing.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pr01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pt01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pt02.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pt03.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pt04.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pt05.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/tracing.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/vfs.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-Developers-Guide/wins.html 0644 root bin
+d none usr/share/samba/swat/help/Samba3-HOWTO 0755 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/AccessControls.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/Appendix.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/Backup.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ClientConfig.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/FastStart.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/IntroSMB.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/NT4Migration.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/NetCommand.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/Other-Clients.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/Portability.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/SWAT.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/SambaHA.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ServerType.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/VFS.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/apa.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/bugreport.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ch47.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/classicalprinting.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/compiling.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/diagnosis.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/domain-member.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/go01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/groupmapping.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/idmapper.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/index.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/install.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/introduction.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/ix01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/largefile.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/locking.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/migration.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/msdfs.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/optional.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/pam.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/passdb.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/pr01.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/pr02.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/pr03.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/problems.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/rights.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/samba-bdc.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/samba-pdc.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/securing-samba.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/speed.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/tdb.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/troubleshooting.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/type.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/unicode.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html 0644 root bin
+f none usr/share/samba/swat/help/Samba3-HOWTO/winbind.html 0644 root bin
+d none usr/share/samba/swat/help/manpages 0755 root bin
+f none usr/share/samba/swat/help/manpages/cifs.upcall.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/eventlogadm.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/findsmb.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_ad.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_adex.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_hash.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_ldap.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_nss.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_rid.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_tdb.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/idmap_tdb2.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/index.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldb.3.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldbadd.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldbdel.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldbedit.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldbmodify.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldbrename.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ldbsearch.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/libsmbclient.7.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/lmhosts.5.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/log2pcap.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/mount.cifs.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/net.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/nmbd.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/nmblookup.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/ntlm_auth.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/pam_winbind.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/pam_winbind.conf.5.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/pdbedit.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/profiles.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/rpcclient.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/samba.7.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/sharesec.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smb.conf.5.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbcacls.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbclient.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbcontrol.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbcquotas.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbd.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbget.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbgetrc.5.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbpasswd.5.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbpasswd.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbspool.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbstatus.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbtar.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/smbtree.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/swat.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/tdbbackup.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/tdbdump.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/tdbtool.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/testparm.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/umount.cifs.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_acl_tdb.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_acl_xattr.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_audit.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_cap.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_catia.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_commit.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_default_quota.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_dirsort.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_extd_audit.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_fake_perms.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_fileid.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_full_audit.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_gpfs.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_netatalk.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_notify_fam.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_prealloc.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_preopen.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_readahead.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_readonly.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_recycle.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_scannedonly.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_shadow_copy.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_shadow_copy2.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_streams_depot.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_streams_xattr.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfs_xattr_tdb.8.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/vfstest.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/wbinfo.1.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/winbind_krb5_locator.7.html 0644 root bin
+f none usr/share/samba/swat/help/manpages/winbindd.8.html 0644 root bin
+f none usr/share/samba/swat/help/welcome-no-samba-doc.html 0644 root bin
+f none usr/share/samba/swat/help/welcome.html 0644 root bin
+d none usr/share/samba/swat/images 0755 root bin
+f none usr/share/samba/swat/images/globals.gif 0644 root bin
+f none usr/share/samba/swat/images/home.gif 0644 root bin
+f none usr/share/samba/swat/images/passwd.gif 0644 root bin
+f none usr/share/samba/swat/images/printers.gif 0644 root bin
+f none usr/share/samba/swat/images/samba.gif 0644 root bin
+f none usr/share/samba/swat/images/shares.gif 0644 root bin
+f none usr/share/samba/swat/images/status.gif 0644 root bin
+f none usr/share/samba/swat/images/viewconfig.gif 0644 root bin
+f none usr/share/samba/swat/images/wizard.gif 0644 root bin
+d none usr/share/samba/swat/include 0755 root bin
+f none usr/share/samba/swat/include/footer.html 0644 root bin
+f none usr/share/samba/swat/include/header.html 0644 root bin
+d none usr/share/samba/swat/js 0755 root bin
+d none usr/share/samba/swat/lang 0755 root bin
+d none usr/share/samba/swat/lang/ja 0755 root bin
+d none usr/share/samba/swat/lang/ja/help 0755 root bin
+f none usr/share/samba/swat/lang/ja/help/welcome.html 0644 root bin
+d none usr/share/samba/swat/lang/ja/images 0755 root bin
+d none usr/share/samba/swat/lang/ja/include 0755 root bin
+d none usr/share/samba/swat/lang/ja/js 0755 root bin
+d none usr/share/samba/swat/lang/tr 0755 root bin
+d none usr/share/samba/swat/lang/tr/help 0755 root bin
+f none usr/share/samba/swat/lang/tr/help/welcome.html 0644 root bin
+d none usr/share/samba/swat/lang/tr/images 0755 root bin
+f none usr/share/samba/swat/lang/tr/images/globals.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/home.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/passwd.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/printers.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/samba.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/shares.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/status.gif 0644 root bin
+f none usr/share/samba/swat/lang/tr/images/viewconfig.gif 0644 root bin
+d none usr/share/samba/swat/lang/tr/include 0755 root bin
+d none usr/share/samba/swat/lang/tr/js 0755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/prototype_i386	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,48 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_i386	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are I386 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsmbadocu
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWsmbadocu/prototype_sparc	Sat Aug 21 11:47:07 2010 -0700
@@ -0,0 +1,48 @@
+#
+# 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.
+#
+#ident	"@(#)prototype_sparc	1.1	10/08/03 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWsmbadocu
+#
--- a/usr/src/pkgdefs/SUNWsmbar/Makefile	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbar/Makefile	Sat Aug 21 11:47:07 2010 -0700
@@ -18,18 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile	1.9	07/12/14 SMI"
+#ident	"@(#)Makefile	1.10	10/07/30 SMI"
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-DATAFILES = i.services
-
 all: $(FILES)
 install: all pkg
 
--- a/usr/src/pkgdefs/SUNWsmbar/copyright	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbar/copyright	Sat Aug 21 11:47:07 2010 -0700
@@ -1,25 +1,725 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
+For the avoidance of doubt, except that if any license choice other than
+GPL or LGPL is available it will apply instead, Oracle elects to use
+only the General Public License version 3 (GPLv3) at this time for any
+software where a choice of GPL license versions is made available with
+the language indicating that GPLv3 or any later version may be used.
+
+================================================================================
+
+                        GNU GENERAL PUBLIC LICENSE
+                          Version 3, 29 June 2007
+
+    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+                               Preamble
+
+     The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+     The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+     When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+     To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+     For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+     Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+     For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+     Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+     Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+     The precise terms and conditions for copying, distribution and
+modification follow.
+
+                          TERMS AND CONDITIONS
+
+     0. Definitions.
+
+     "This License" refers to version 3 of the GNU General Public License.
+
+     "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+     "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+     To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+     A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+     To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+     To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+     An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+     1. Source Code.
+
+     The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+     A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+     The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+     The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+     The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+     The Corresponding Source for a work in source code form is that
+same work.
+
+     2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-    Copyright (C) 2001 Samba Team
+     You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+     4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+     5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+       a) The work must carry prominent notices stating that you modified
+       it, and giving a relevant date.
+
+       b) The work must carry prominent notices stating that it is
+       released under this License and any conditions added under section
+       7.  This requirement modifies the requirement in section 4 to
+       "keep intact all notices".
+
+       c) You must license the entire work, as a whole, under this
+       License to anyone who comes into possession of a copy.  This
+       License will therefore apply, along with any applicable section 7
+       additional terms, to the whole of the work, and all its parts,
+       regardless of how they are packaged.  This License gives no
+       permission to license the work in any other way, but it does not
+       invalidate such permission if you have separately received it.
+
+       d) If the work has interactive user interfaces, each must display
+       Appropriate Legal Notices; however, if the Program has interactive
+       interfaces that do not display Appropriate Legal Notices, your
+       work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+     6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+       a) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by the
+       Corresponding Source fixed on a durable physical medium
+       customarily used for software interchange.
+
+       b) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by a
+       written offer, valid for at least three years and valid for as
+       long as you offer spare parts or customer support for that product
+       model, to give anyone who possesses the object code either (1) a
+       copy of the Corresponding Source for all the software in the
+       product that is covered by this License, on a durable physical
+       medium customarily used for software interchange, for a price no
+       more than your reasonable cost of physically performing this
+       conveying of source, or (2) access to copy the
+       Corresponding Source from a network server at no charge.
+
+       c) Convey individual copies of the object code with a copy of the
+       written offer to provide the Corresponding Source.  This
+       alternative is allowed only occasionally and non-commercially, and
+       only if you received the object code with such an offer, in accord
+       with subsection 6b.
+
+       d) Convey the object code by offering access from a designated
+       place (gratis or for a charge), and offer equivalent access to the
+       Corresponding Source in the same way through the same place at no
+       further charge.  You need not require recipients to copy the
+       Corresponding Source along with the object code.  If the place to
+       copy the object code is a network server, the Corresponding Source
+       may be on a different server (operated by you or a third party)
+       that supports equivalent copying facilities, provided you maintain
+       clear directions next to the object code saying where to find the
+       Corresponding Source.  Regardless of what server hosts the
+       Corresponding Source, you remain obligated to ensure that it is
+       available for as long as needed to satisfy these requirements.
+
+       e) Convey the object code using peer-to-peer transmission, provided
+       you inform other peers where the object code and Corresponding
+       Source of the work are being offered to the general public at no
+       charge under subsection 6d.
+
+     A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+     A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+     "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+     If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+     The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+     Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+     7. Additional Terms.
+
+     "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+     When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+       a) Disclaiming warranty or limiting liability differently from the
+       terms of sections 15 and 16 of this License; or
+
+       b) Requiring preservation of specified reasonable legal notices or
+       author attributions in that material or in the Appropriate Legal
+       Notices displayed by works containing it; or
+
+       c) Prohibiting misrepresentation of the origin of that material, or
+       requiring that modified versions of such material be marked in
+       reasonable ways as different from the original version; or
+
+       d) Limiting the use for publicity purposes of names of licensors or
+       authors of the material; or
+
+       e) Declining to grant rights under trademark law for use of some
+       trade names, trademarks, or service marks; or
+
+       f) Requiring indemnification of licensors and authors of that
+       material by anyone who conveys the material (or modified versions of
+       it) with contractual assumptions of liability to the recipient, for
+       any liability that these contractual assumptions directly impose on
+       those licensors and authors.
+
+     All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+     If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+     8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+     Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+     9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+     10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+     An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+     You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+     11. Patents.
+
+     A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+     A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+     Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+     In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+     A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+     Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+     12. No Surrender of Others' Freedom.
+
+     If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+     13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+     14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+     Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+     If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+     Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+     15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+     16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+     17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                        END OF TERMS AND CONDITIONS
+
+               How to Apply These Terms to Your New Programs
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+     To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+       Copyright (C)
+
+       This program is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program.  If not, see_http://www.gnu.org/licenses/_.
+
+Also add information on how to contact you by electronic and paper mail.
+
+     If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+         Copyright (C)
+       This program comes with ABSOLUTELY NO WARRANTY; for details type
+`show w'.
+       This is free software, and you are welcome to redistribute it
+       under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+     You should also get your employer (if you work as a programmer) or
+school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+_http://www.gnu.org/licenses/_.
+
+     The GNU General Public License does not permit incorporating your
+program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+_http://www.gnu.org/philosophy/why-not-lgpl.html_.
+
+--------------------------------------------------------------------
+
+Written Offer to Provide Certain Source Code
+
+The Oracle software and/or hardware you have received may contain or
+include certain portions that are licensed under license terms provided
+by third parties not associated with Oracle. For binaries that you
+receive from Oracle that are licensed under any version of the GNU
+General Public License (GPL) or the GNU LGPL, you can receive a complete
+machine-readable copy of the source code by sending a written request to:
+
+Oracle America, Inc.
+
+Attn: Associate General Counsel,
+
+Development and Engineering Legal
+
+500 Oracle Parkway, 7th Floor
+
+Redwood Shores, CA 94065
+
+
+
+Your request should include (i) the name of the covered binary, (ii) the
+version number of the Oracle product containing the covered binary,
+(iii) your name, (iv) your company name (if applicable) and (v) your
+return mailing and email address (if available).
+
+We may charge you a nominal fee to cover the cost of the media and
+distribution.
+
+Your request must be sent within three (3) years of the date you
+received the GPL or LGPL covered code.
+
+
+
+
+
+-- 
--- a/usr/src/pkgdefs/SUNWsmbar/preinstall	Thu Aug 05 23:45:52 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-#ident	"@(#)preinstall	1.2	08/05/25 SMI"
-#
-# preinstall - register the swat service on port: 901/tcp
-#
-
-ed -s ${PKG_INSTALL_ROOT}/etc/inet/services >/dev/null <<EDITFILE
-g/^swat[ 	]/d
-g/^\#\[swat\]/d
-$
-a
-#[swat] The swat service is added by the SUNWsmbar package.
-#[swat] Removing the swat service manually while SUNWsmbar
-#[swat] package is installed in the system can cause issues
-#[swat] with smf(5) stability or with zones(5) installation.
-swat		901/tcp				# Samba Web Adm.Tool
-.
-w
-q
-EDITFILE
-
--- a/usr/src/pkgdefs/SUNWsmbar/prototype_com	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbar/prototype_com	Sat Aug 21 11:47:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -21,7 +20,7 @@
 #
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_com	1.16	10/04/22 SMI"
+#ident	"@(#)prototype_com	1.17	10/07/26 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -38,27 +37,25 @@
 i copyright
 i depend
 i postinstall
-i preinstall
 # source locations relative to the prototype file
 #
 # SUNWsmbar
 #
 d none etc 755 root sys
 f none etc/pam.conf-winbind 444 root bin
-d none etc/sfw 755 root bin
-f none etc/sfw/smb.conf-example 444 root bin
-d none etc/sfw/private 500 root bin
-d none lib 755 root bin
-d none lib/svc 755 root bin
-d none lib/svc/manifest 755 root sys
-d none lib/svc/manifest/network 755 root sys
-f manifest lib/svc/manifest/network/samba.xml 444 root sys
-f manifest lib/svc/manifest/network/swat.xml 444 root sys
-f manifest lib/svc/manifest/network/winbind.xml 444 root sys
-f manifest lib/svc/manifest/network/wins.xml 444 root sys
+d none etc/samba 755 root bin
+f none etc/samba/smb.conf-example 444 root bin
+d none etc/samba/private 500 root bin
 d none var 755 root sys
 d none var/samba 755 root bin
 d none var/samba/log 755 root bin
 d none var/samba/locks 755 root bin
 d none var/spool 755 root bin
 d none var/spool/samba 1777 root bin
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/manifest 755 root sys
+d none lib/svc/manifest/network 755 root sys
+f manifest lib/svc/manifest/network/samba.xml 444 root sys
+f manifest lib/svc/manifest/network/winbind.xml 444 root sys
+f manifest lib/svc/manifest/network/wins.xml 444 root sys
--- a/usr/src/pkgdefs/SUNWsmbar/prototype_i386	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbar/prototype_i386	Sat Aug 21 11:47:07 2010 -0700
@@ -1,4 +1,3 @@
-#Copyright (c) 2001 Sun Microsystems, Inc.
 #
 # CDDL HEADER START
 #
@@ -19,9 +18,9 @@
 #
 # CDDL HEADER END
 #
-#All rights Reserved.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_i386	1.3	06/03/18 SMI"
+#ident	"@(#)prototype_i386	1.4	10/07/26 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
--- a/usr/src/pkgdefs/SUNWsmbar/prototype_sparc	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbar/prototype_sparc	Sat Aug 21 11:47:07 2010 -0700
@@ -1,4 +1,3 @@
-#Copyright (c) 2001 Sun Microsystems, Inc.
 #
 # CDDL HEADER START
 #
@@ -19,9 +18,9 @@
 #
 # CDDL HEADER END
 #
-#All rights Reserved.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_sparc	1.3	06/03/18 SMI"
+#ident	"@(#)prototype_sparc	1.4	10/07/26 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
--- a/usr/src/pkgdefs/SUNWsmbau/copyright	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbau/copyright	Sat Aug 21 11:47:07 2010 -0700
@@ -1,25 +1,725 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
+For the avoidance of doubt, except that if any license choice other than
+GPL or LGPL is available it will apply instead, Oracle elects to use
+only the General Public License version 3 (GPLv3) at this time for any
+software where a choice of GPL license versions is made available with
+the language indicating that GPLv3 or any later version may be used.
+
+================================================================================
+
+                        GNU GENERAL PUBLIC LICENSE
+                          Version 3, 29 June 2007
+
+    Copyright (C) 2007 Free Software Foundation, Inc._http://fsf.org/_.
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+                               Preamble
+
+     The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+     The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+     When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+     To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+     For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+     Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+     For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+     Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+     Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+     The precise terms and conditions for copying, distribution and
+modification follow.
+
+                          TERMS AND CONDITIONS
+
+     0. Definitions.
+
+     "This License" refers to version 3 of the GNU General Public License.
+
+     "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+     "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+     To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+     A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+     To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+     To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+     An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+     1. Source Code.
+
+     The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+     A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+     The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+     The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+     The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+     The Corresponding Source for a work in source code form is that
+same work.
+
+     2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-    Copyright (C) 2001 Samba Team
+     You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+     4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+     5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+       a) The work must carry prominent notices stating that you modified
+       it, and giving a relevant date.
+
+       b) The work must carry prominent notices stating that it is
+       released under this License and any conditions added under section
+       7.  This requirement modifies the requirement in section 4 to
+       "keep intact all notices".
+
+       c) You must license the entire work, as a whole, under this
+       License to anyone who comes into possession of a copy.  This
+       License will therefore apply, along with any applicable section 7
+       additional terms, to the whole of the work, and all its parts,
+       regardless of how they are packaged.  This License gives no
+       permission to license the work in any other way, but it does not
+       invalidate such permission if you have separately received it.
+
+       d) If the work has interactive user interfaces, each must display
+       Appropriate Legal Notices; however, if the Program has interactive
+       interfaces that do not display Appropriate Legal Notices, your
+       work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+     6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+       a) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by the
+       Corresponding Source fixed on a durable physical medium
+       customarily used for software interchange.
+
+       b) Convey the object code in, or embodied in, a physical product
+       (including a physical distribution medium), accompanied by a
+       written offer, valid for at least three years and valid for as
+       long as you offer spare parts or customer support for that product
+       model, to give anyone who possesses the object code either (1) a
+       copy of the Corresponding Source for all the software in the
+       product that is covered by this License, on a durable physical
+       medium customarily used for software interchange, for a price no
+       more than your reasonable cost of physically performing this
+       conveying of source, or (2) access to copy the
+       Corresponding Source from a network server at no charge.
+
+       c) Convey individual copies of the object code with a copy of the
+       written offer to provide the Corresponding Source.  This
+       alternative is allowed only occasionally and non-commercially, and
+       only if you received the object code with such an offer, in accord
+       with subsection 6b.
+
+       d) Convey the object code by offering access from a designated
+       place (gratis or for a charge), and offer equivalent access to the
+       Corresponding Source in the same way through the same place at no
+       further charge.  You need not require recipients to copy the
+       Corresponding Source along with the object code.  If the place to
+       copy the object code is a network server, the Corresponding Source
+       may be on a different server (operated by you or a third party)
+       that supports equivalent copying facilities, provided you maintain
+       clear directions next to the object code saying where to find the
+       Corresponding Source.  Regardless of what server hosts the
+       Corresponding Source, you remain obligated to ensure that it is
+       available for as long as needed to satisfy these requirements.
+
+       e) Convey the object code using peer-to-peer transmission, provided
+       you inform other peers where the object code and Corresponding
+       Source of the work are being offered to the general public at no
+       charge under subsection 6d.
+
+     A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+     A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+     "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+     If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+     The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+     Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+     7. Additional Terms.
+
+     "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+     When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+       a) Disclaiming warranty or limiting liability differently from the
+       terms of sections 15 and 16 of this License; or
+
+       b) Requiring preservation of specified reasonable legal notices or
+       author attributions in that material or in the Appropriate Legal
+       Notices displayed by works containing it; or
+
+       c) Prohibiting misrepresentation of the origin of that material, or
+       requiring that modified versions of such material be marked in
+       reasonable ways as different from the original version; or
+
+       d) Limiting the use for publicity purposes of names of licensors or
+       authors of the material; or
+
+       e) Declining to grant rights under trademark law for use of some
+       trade names, trademarks, or service marks; or
+
+       f) Requiring indemnification of licensors and authors of that
+       material by anyone who conveys the material (or modified versions of
+       it) with contractual assumptions of liability to the recipient, for
+       any liability that these contractual assumptions directly impose on
+       those licensors and authors.
+
+     All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+     If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+     8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+     Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+     9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+     10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+     An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+     You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+     11. Patents.
+
+     A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+     A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+     Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+     In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+     A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+     Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+     12. No Surrender of Others' Freedom.
+
+     If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+     13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+     14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+     Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+     If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+     Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+     15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+     16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+     17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                        END OF TERMS AND CONDITIONS
+
+               How to Apply These Terms to Your New Programs
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+     To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+       Copyright (C)
+
+       This program is free software: you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation, either version 3 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program.  If not, see_http://www.gnu.org/licenses/_.
+
+Also add information on how to contact you by electronic and paper mail.
+
+     If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+         Copyright (C)
+       This program comes with ABSOLUTELY NO WARRANTY; for details type
+`show w'.
+       This is free software, and you are welcome to redistribute it
+       under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+     You should also get your employer (if you work as a programmer) or
+school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+_http://www.gnu.org/licenses/_.
+
+     The GNU General Public License does not permit incorporating your
+program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+_http://www.gnu.org/philosophy/why-not-lgpl.html_.
+
+--------------------------------------------------------------------
+
+Written Offer to Provide Certain Source Code
+
+The Oracle software and/or hardware you have received may contain or
+include certain portions that are licensed under license terms provided
+by third parties not associated with Oracle. For binaries that you
+receive from Oracle that are licensed under any version of the GNU
+General Public License (GPL) or the GNU LGPL, you can receive a complete
+machine-readable copy of the source code by sending a written request to:
+
+Oracle America, Inc.
+
+Attn: Associate General Counsel,
+
+Development and Engineering Legal
+
+500 Oracle Parkway, 7th Floor
+
+Redwood Shores, CA 94065
+
+
+
+Your request should include (i) the name of the covered binary, (ii) the
+version number of the Oracle product containing the covered binary,
+(iii) your name, (iv) your company name (if applicable) and (v) your
+return mailing and email address (if available).
+
+We may charge you a nominal fee to cover the cost of the media and
+distribution.
+
+Your request must be sent within three (3) years of the date you
+received the GPL or LGPL covered code.
+
+
+
+
+
+-- 
--- a/usr/src/pkgdefs/SUNWsmbau/depend	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbau/depend	Sat Aug 21 11:47:07 2010 -0700
@@ -1,6 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -21,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-#ident	"@(#)depend	1.8	08/11/04 SMI"
+#ident	"@(#)depend	1.9	10/07/28 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -57,3 +56,6 @@
 P SUNWperl584core SUNWperl584core Perl 5.8.4 (core)
 P SUNWcupsu	CUPS (usr)
 P SUNWgamin	Library providing the FAM File Alteration Monitor API
+P SUNWavahi-bridge-dsd	Avahi client and bridge to SUNWdsd
+P SUNWmozldapC-SDK	Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)
+P SUNWgnu-readline	GNU readline
--- a/usr/src/pkgdefs/SUNWsmbau/prototype_com	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbau/prototype_com	Sat Aug 21 11:47:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_com	1.26	09/09/04 SMI"
+#ident	"@(#)prototype_com	1.28	10/08/05 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -44,642 +41,226 @@
 # SUNWsmbau
 #
 
-d none usr 755 root sys
-d none usr/lib 755 root bin
+d none usr 0755 root sys
+
+################################################################################
+# Application released under GPLv2 can not link GPLv3 libraries so the original
+# libsmbclient API from samba 3.0.x released under the GPLv2 should be provided
+# for such apps.
+# Currently only JDS part called gnome-VFS is using libsmbclient under the
+# LSARC/2006/350/commitment.materials/materials/contracts/PSARC-2000-488-samba.txt
+#
+d none etc 755 root sys
+d none etc/sfw 755 root bin
+d none etc/sfw/private 500 root bin
+d none usr/sfw 755 root bin
+d none usr/sfw/lib 755 root bin
+f none usr/sfw/lib/libsmbclient.so.0 0555 root bin
+s none usr/sfw/lib/libsmbclient.so=libsmbclient.so.0
+d none usr/sfw/include 755 root bin
+f none usr/sfw/include/libsmbclient.h 0444 root bin
+################################################################################
+
+d none usr/bin 0755 root bin
+f none usr/bin/eventlogadm 0555 root bin
+f none usr/bin/findsmb 0555 root bin
+f none usr/bin/ldbadd 0555 root bin
+f none usr/bin/ldbdel 0555 root bin
+f none usr/bin/ldbedit 0555 root bin
+f none usr/bin/ldbmodify 0555 root bin
+f none usr/bin/ldbrename 0555 root bin
+f none usr/bin/ldbsearch 0555 root bin
+f none usr/bin/net 0555 root bin
+f none usr/bin/nmblookup 0555 root bin
+f none usr/bin/ntlm_auth 0555 root bin
+f none usr/bin/pdbedit 0555 root bin
+f none usr/bin/smbprofiles 0555 root bin
+f none usr/bin/rpcclient 0555 root bin
+f none usr/bin/sharesec 0555 root bin
+f none usr/bin/smbcacls 0555 root bin
+f none usr/bin/smbclient 0555 root bin
+f none usr/bin/smbcontrol 0555 root bin
+f none usr/bin/smbcquotas 0555 root bin
+f none usr/bin/smbget 0555 root bin
+f none usr/bin/smbpasswd 0555 root bin
+f none usr/bin/smbspool 0555 root bin
+f none usr/bin/smbstatus 0555 root bin
+f none usr/bin/smbtar 0555 root bin
+f none usr/bin/smbtree 0555 root bin
+f none usr/bin/tdbbackup 0555 root bin
+f none usr/bin/tdbdump 0555 root bin
+f none usr/bin/tdbtool 0555 root bin
+f none usr/bin/testparm 0555 root bin
+f none usr/bin/wbinfo 0555 root bin
+
+d none usr/sbin 0755 root bin
+f none usr/sbin/nmbd 0555 root bin
+f none usr/sbin/smbd 0555 root bin
+f none usr/sbin/winbindd 0555 root bin
+
+d none usr/include 0755 root bin
+d none usr/include/samba 0755 root bin
+f none usr/include/samba/libsmbclient.h 0444 root bin
+f none usr/include/samba/netapi.h 0444 root bin
+f none usr/include/samba/smb_share_modes.h 0444 root bin
+f none usr/include/samba/talloc.h 0444 root bin
+f none usr/include/samba/tdb.h 0444 root bin
+f none usr/include/samba/wbclient.h 0444 root bin
+f none usr/include/samba/wbc_async.h 0444 root bin
+
+d none usr/lib 0755 root bin
+f none usr/lib/nss_winbind.so.1 0555 root bin
+s none usr/lib/nss_winbind.so=nss_winbind.so.1
 f none usr/lib/nss_wins.so.1 0555 root bin
-f none usr/lib/nss_winbind.so.1 0555 root bin
 s none usr/lib/nss_wins.so=nss_wins.so.1
-s none usr/lib/nss_winbind.so=nss_winbind.so.1
+
+d none usr/lib/samba 0755 root bin
+f none usr/lib/samba/libnetapi.so.0 0555 root bin
+s none usr/lib/samba/libnetapi.so=libnetapi.so.0
+f none usr/lib/samba/libsmbclient.so.0 0555 root bin
+s none usr/lib/samba/libsmbclient.so=libsmbclient.so.0
+f none usr/lib/samba/libsmbsharemodes.so.0 0555 root bin
+s none usr/lib/samba/libsmbsharemodes.so=libsmbsharemodes.so.0
+f none usr/lib/samba/libtalloc.so.2 0555 root bin
+s none usr/lib/samba/libtalloc.so=libtalloc.so.2
+f none usr/lib/samba/libtdb.so.1 0555 root bin
+s none usr/lib/samba/libtdb.so=libtdb.so.1
+f none usr/lib/samba/libwbclient.so.0 0555 root bin
+s none usr/lib/samba/libwbclient.so=libwbclient.so.0
+f none usr/lib/samba/smbtorture 0555 root bin
+
+d none usr/lib/samba/auth 0755 root bin
+f none usr/lib/samba/auth/script.so 0555 root bin
+d none usr/lib/samba/charset 0755 root bin
+f none usr/lib/samba/charset/CP437.so 0555 root bin
+f none usr/lib/samba/charset/CP850.so 0555 root bin
+f none usr/lib/samba/de.msg 0444 root bin
+f none usr/lib/samba/en.msg 0444 root bin
+f none usr/lib/samba/fi.msg 0444 root bin
+f none usr/lib/samba/fr.msg 0444 root bin
+d none usr/lib/samba/gpext 0755 root bin
+d none usr/lib/samba/idmap 0755 root bin
+f none usr/lib/samba/idmap/ad.so 0555 root bin
+f none usr/lib/samba/idmap/adex.so 0555 root bin
+f none usr/lib/samba/idmap/hash.so 0555 root bin
+f none usr/lib/samba/idmap/ldap.so 0555 root bin
+f none usr/lib/samba/idmap/rid.so 0555 root bin
+f none usr/lib/samba/idmap/tdb2.so 0555 root bin
+f none usr/lib/samba/it.msg 0444 root bin
+f none usr/lib/samba/ja.msg 0444 root bin
+f none usr/lib/samba/lowcase.dat 0444 root bin
+f none usr/lib/samba/nl.msg 0444 root bin
+d none usr/lib/samba/nss_info 0755 root bin
+s none usr/lib/samba/nss_info/adex.so=../idmap/adex.so
+s none usr/lib/samba/nss_info/hash.so=../idmap/hash.so
+s none usr/lib/samba/nss_info/rfc2307.so=../idmap/ad.so
+s none usr/lib/samba/nss_info/sfu.so=../idmap/ad.so
+s none usr/lib/samba/nss_info/sfu20.so=../idmap/ad.so
+d none usr/lib/samba/pdb 0755 root bin
+d none usr/lib/samba/perfcount 0755 root bin
+f none usr/lib/samba/pl.msg 0444 root bin
+d none usr/lib/samba/rpc 0755 root bin
+f none usr/lib/samba/ru.msg 0444 root bin
+d none usr/lib/samba/security 0755 root bin
+f none usr/lib/samba/security/pam_smbpass.so 0555 root bin
+f none usr/lib/samba/security/pam_winbind.so 0555 root bin
+f none usr/lib/samba/tr.msg 0444 root bin
+f none usr/lib/samba/upcase.dat 0444 root bin
+f none usr/lib/samba/valid.dat 0444 root bin
+d none usr/lib/samba/vfs 0755 root bin
+f none usr/lib/samba/vfs/acl_tdb.so 0555 root bin
+f none usr/lib/samba/vfs/acl_xattr.so 0555 root bin
+f none usr/lib/samba/vfs/audit.so 0555 root bin
+f none usr/lib/samba/vfs/cacheprime.so 0555 root bin
+f none usr/lib/samba/vfs/cap.so 0555 root bin
+f none usr/lib/samba/vfs/catia.so 0555 root bin
+f none usr/lib/samba/vfs/commit.so 0555 root bin
+f none usr/lib/samba/vfs/default_quota.so 0555 root bin
+f none usr/lib/samba/vfs/dirsort.so 0555 root bin
+f none usr/lib/samba/vfs/expand_msdfs.so 0555 root bin
+f none usr/lib/samba/vfs/extd_audit.so 0555 root bin
+f none usr/lib/samba/vfs/fake_perms.so 0555 root bin
+f none usr/lib/samba/vfs/full_audit.so 0555 root bin
+f none usr/lib/samba/vfs/netatalk.so 0555 root bin
+f none usr/lib/samba/vfs/notify_fam.so 0555 root bin
+f none usr/lib/samba/vfs/prealloc.so 0555 root bin
+f none usr/lib/samba/vfs/preopen.so 0555 root bin
+f none usr/lib/samba/vfs/readahead.so 0555 root bin
+f none usr/lib/samba/vfs/readonly.so 0555 root bin
+f none usr/lib/samba/vfs/recycle.so 0555 root bin
+f none usr/lib/samba/vfs/samfs.so 0555 root bin
+f none usr/lib/samba/vfs/scannedonly.so 0555 root bin
+f none usr/lib/samba/vfs/shadow_copy.so 0555 root bin
+f none usr/lib/samba/vfs/shadow_copy2.so 0555 root bin
+f none usr/lib/samba/vfs/smb_traffic_analyzer.so 0555 root bin
+f none usr/lib/samba/vfs/streams_depot.so 0555 root bin
+f none usr/lib/samba/vfs/streams_xattr.so 0555 root bin
+f none usr/lib/samba/vfs/syncops.so 0555 root bin
+f none usr/lib/samba/vfs/xattr_tdb.so 0555 root bin
+f none usr/lib/samba/vfs/zfsacl.so 0555 root bin
+
 d none usr/lib/security 0755 root bin
 f none usr/lib/security/pam_winbind.so.1 0555 root bin
 s none usr/lib/security/pam_winbind.so=pam_winbind.so.1
 
-d none usr/sfw 755 root bin
-d none usr/sfw/bin 755 root bin
-
-f none usr/sfw/bin/eventlogadm 0555 root bin
-f none usr/sfw/bin/findsmb 0555 root bin
-f none usr/sfw/bin/net 0555 root bin
-f none usr/sfw/bin/nmblookup 0555 root bin
-f none usr/sfw/bin/ntlm_auth 0555 root bin
-f none usr/sfw/bin/pdbedit 0555 root bin
-f none usr/sfw/bin/profiles 0555 root bin
-f none usr/sfw/bin/rpcclient 0555 root bin
-f none usr/sfw/bin/smbcacls 0555 root bin
-f none usr/sfw/bin/smbclient 0555 root bin
-f none usr/sfw/bin/smbcontrol 0555 root bin
-f none usr/sfw/bin/smbcquotas 0555 root bin
-f none usr/sfw/bin/smbget 0555 root bin
-f none usr/sfw/bin/smbpasswd 0555 root bin
-f none usr/sfw/bin/smbspool 0555 root bin
-f none usr/sfw/bin/smbstatus 0555 root bin
-f none usr/sfw/bin/smbtar 0555 root bin
-f none usr/sfw/bin/smbtree 0555 root bin
-f none usr/sfw/bin/tdbbackup 0555 root bin
-f none usr/sfw/bin/tdbdump 0555 root bin
-f none usr/sfw/bin/tdbtool 0555 root bin
-f none usr/sfw/bin/testparm 0555 root bin
-f none usr/sfw/bin/wbinfo 0555 root bin
-
-d none usr/sfw/lib 755 root bin
-f none usr/sfw/lib/libmsrpc.so.0 0555 root bin
-s none usr/sfw/lib/libmsrpc.so=libmsrpc.so.0
-f none usr/sfw/lib/libsmbclient.so.0 0555 root bin
-s none usr/sfw/lib/libsmbclient.so=libsmbclient.so.0
-f none usr/sfw/lib/libsmbsharemodes.so.0 0555 root bin
-s none usr/sfw/lib/libsmbsharemodes.so=libsmbsharemodes.so.0
-
-f none usr/sfw/lib/de.msg 0444 root bin
-f none usr/sfw/lib/en.msg 0444 root bin
-f none usr/sfw/lib/fi.msg 0444 root bin
-f none usr/sfw/lib/fr.msg 0444 root bin
-f none usr/sfw/lib/it.msg 0444 root bin
-f none usr/sfw/lib/ja.msg 0444 root bin
-f none usr/sfw/lib/nl.msg 0444 root bin
-f none usr/sfw/lib/pl.msg 0444 root bin
-f none usr/sfw/lib/tr.msg 0444 root bin
-
-d none usr/sfw/lib/auth 0755 root bin
-f none usr/sfw/lib/auth/script.so 0555 root bin
-
-d none usr/sfw/lib/charset 0755 root bin
-f none usr/sfw/lib/charset/CP437.so 0555 root bin
-f none usr/sfw/lib/charset/CP850.so 0555 root bin
-
-d none usr/sfw/lib/codepages 0755 root bin
-f none usr/sfw/lib/codepages/lowcase.dat 0444 root bin
-s none usr/sfw/lib/lowcase.dat=codepages/lowcase.dat
-f none usr/sfw/lib/codepages/upcase.dat 0444 root bin
-s none usr/sfw/lib/upcase.dat=codepages/upcase.dat
-f none usr/sfw/lib/codepages/valid.dat 0444 root bin
-s none usr/sfw/lib/valid.dat=codepages/valid.dat
-
-d none usr/sfw/lib/idmap 0755 root bin
-f none usr/sfw/lib/idmap/ad.so 0555 root bin
-f none usr/sfw/lib/idmap/ldap.so 0555 root bin
-f none usr/sfw/lib/idmap/rid.so 0555 root bin
-
-d none usr/sfw/lib/nss_info 0755 root bin
-s none usr/sfw/lib/nss_info/rfc2307.so=../idmap/ad.so
-s none usr/sfw/lib/nss_info/sfu.so=../idmap/ad.so
-
-d none usr/sfw/lib/pdb 0755 root bin
-d none usr/sfw/lib/rpc 0755 root bin
-
-d none usr/sfw/lib/vfs 0755 root bin
-f none usr/sfw/lib/vfs/audit.so 0555 root bin
-f none usr/sfw/lib/vfs/cap.so 0555 root bin
-f none usr/sfw/lib/vfs/default_quota.so 0555 root bin
-f none usr/sfw/lib/vfs/expand_msdfs.so 0555 root bin
-f none usr/sfw/lib/vfs/extd_audit.so 0555 root bin
-f none usr/sfw/lib/vfs/fake_perms.so 0555 root bin
-f none usr/sfw/lib/vfs/full_audit.so 0555 root bin
-f none usr/sfw/lib/vfs/netatalk.so 0555 root bin
-f none usr/sfw/lib/vfs/notify_fam.so 0555 root bin
-f none usr/sfw/lib/vfs/readahead.so 0555 root bin
-f none usr/sfw/lib/vfs/readonly.so 0555 root bin
-f none usr/sfw/lib/vfs/recycle.so 0555 root bin
-f none usr/sfw/lib/vfs/shadow_copy.so 0555 root bin
-f none usr/sfw/lib/vfs/zfsacl.so 0555 root bin
-
-d none usr/sfw/include 755 root bin
-f none usr/sfw/include/libsmbclient.h 0444 root bin
-
-d none usr/sfw/sbin 0755 root bin
-f none usr/sfw/sbin/nmbd 0555 root bin
-f none usr/sfw/sbin/smbd 0555 root bin
-f none usr/sfw/sbin/swat 0555 root bin
-f none usr/sfw/sbin/winbindd 0555 root bin
-
-d none usr/sfw/share 755 root bin
-d none usr/sfw/share/man 755 root bin
-d none usr/sfw/share/man/man1 755 root bin
-d none usr/sfw/share/man/man1m 755 root bin
-d none usr/sfw/share/man/man4 755 root bin
-d none usr/sfw/share/man/man7 755 root bin
-
-f none usr/sfw/share/man/man1/findsmb.1 0444 root bin
-f none usr/sfw/share/man/man1/log2pcap.1 0444 root bin
-f none usr/sfw/share/man/man1/nmblookup.1 0444 root bin
-f none usr/sfw/share/man/man1/ntlm_auth.1 0444 root bin
-f none usr/sfw/share/man/man1/profiles.1 0444 root bin
-f none usr/sfw/share/man/man1/rpcclient.1 0444 root bin
-f none usr/sfw/share/man/man1/smbcacls.1 0444 root bin
-f none usr/sfw/share/man/man1/smbclient.1 0444 root bin
-f none usr/sfw/share/man/man1/smbcontrol.1 0444 root bin
-f none usr/sfw/share/man/man1/smbcquotas.1 0444 root bin
-f none usr/sfw/share/man/man1/smbget.1 0444 root bin
-f none usr/sfw/share/man/man1/smbstatus.1 0444 root bin
-f none usr/sfw/share/man/man1/smbtar.1 0444 root bin
-f none usr/sfw/share/man/man1/smbtree.1 0444 root bin
-f none usr/sfw/share/man/man1/testparm.1 0444 root bin
-f none usr/sfw/share/man/man1/vfstest.1 0444 root bin
-f none usr/sfw/share/man/man1/wbinfo.1 0444 root bin
-
-f none usr/sfw/share/man/man1m/net.1m 0444 root bin
-f none usr/sfw/share/man/man1m/nmbd.1m 0444 root bin
-f none usr/sfw/share/man/man1m/pdbedit.1m 0444 root bin
-f none usr/sfw/share/man/man1m/smbd.1m 0444 root bin
-f none usr/sfw/share/man/man1m/smbpasswd.1m 0444 root bin
-f none usr/sfw/share/man/man1m/smbspool.1m 0444 root bin
-f none usr/sfw/share/man/man1m/swat.1m 0444 root bin
-f none usr/sfw/share/man/man1m/tdbbackup.1m 0444 root bin
-f none usr/sfw/share/man/man1m/tdbdump.1m 0444 root bin
-f none usr/sfw/share/man/man1m/tdbtool.1m 0444 root bin
-f none usr/sfw/share/man/man1m/winbindd.1m 0444 root bin
-
-f none usr/sfw/share/man/man4/lmhosts.4 0444 root bin
-f none usr/sfw/share/man/man4/smb.conf.4 0444 root bin
-f none usr/sfw/share/man/man4/smbgetrc.4 0444 root bin
-f none usr/sfw/share/man/man4/smbpasswd.4 0444 root bin
-
-f none usr/sfw/share/man/man7/libsmbclient.7 0444 root bin
-f none usr/sfw/share/man/man7/pam_winbind.7 0444 root bin
-f none usr/sfw/share/man/man7/samba.7 0444 root bin
-
-
-d none usr/sfw/swat 755 root bin
-
-### the rest of the file is generated/sorted: 'sort -t " " -k 3'
+d none usr/share 0755 root sys
+d none usr/share/locale 0755 root other
+d none usr/share/locale/de 0755 root other
+d none usr/share/locale/de/LC_MESSAGES 0755 root other
+f none usr/share/locale/de/LC_MESSAGES/net.mo 0444 root bin
+f none usr/share/locale/de/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/da 0755 root other
+d none usr/share/locale/da/LC_MESSAGES 0755 root other
+f none usr/share/locale/da/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/ja 0755 root other
+d none usr/share/locale/ja/LC_MESSAGES 0755 root other
+f none usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/fi 0755 root other
+d none usr/share/locale/fi/LC_MESSAGES 0755 root other
+f none usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/nb 0755 root other
+d none usr/share/locale/nb/LC_MESSAGES 0755 root other
+f none usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/ar 0755 root other
+d none usr/share/locale/ar/LC_MESSAGES 0755 root other
+f none usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/cs 0755 root other
+d none usr/share/locale/cs/LC_MESSAGES 0755 root other
+f none usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/es 0755 root other
+d none usr/share/locale/es/LC_MESSAGES 0755 root other
+f none usr/share/locale/es/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/fr 0755 root other
+d none usr/share/locale/fr/LC_MESSAGES 0755 root other
+f none usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/ko 0755 root other
+d none usr/share/locale/ko/LC_MESSAGES 0755 root other
+f none usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/nl 0755 root other
+d none usr/share/locale/nl/LC_MESSAGES 0755 root other
+f none usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/pl 0755 root other
+d none usr/share/locale/pl/LC_MESSAGES 0755 root other
+f none usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/hu 0755 root other
+d none usr/share/locale/hu/LC_MESSAGES 0755 root other
+f none usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/it 0755 root other
+d none usr/share/locale/it/LC_MESSAGES 0755 root other
+f none usr/share/locale/it/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/ru 0755 root other
+d none usr/share/locale/ru/LC_MESSAGES 0755 root other
+f none usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/sv 0755 root other
+d none usr/share/locale/sv/LC_MESSAGES 0755 root other
+f none usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/zh_CN 0755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 0755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/pt_BR 0755 root other
+d none usr/share/locale/pt_BR/LC_MESSAGES 0755 root other
+f none usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo 0444 root bin
+d none usr/share/locale/zh_TW 0755 root other
+d none usr/share/locale/zh_TW/LC_MESSAGES 0755 root other
+f none usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo 0444 root bin
 
-d none usr/sfw/swat/help 0755 root bin
-d none usr/sfw/swat/help/Samba3-ByExample 0755 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/2000users.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/Big500users.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/DMSMig.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/DomApps.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/ExNetworks.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/HA.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/RefSection.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/apa.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/appendix.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/ch14.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/go01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/happy.html 0444 root bin
-d none usr/sfw/swat/help/Samba3-ByExample/images 0755 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/AccountingNetwork.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/Charity-Network.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/HostAnnouncment.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/NullConnect.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/UserConnect.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/UserMgrNT4.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/XP-screen001.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/acct2net.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/ch8-migration.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap4-net.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap5-net.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap6-net.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap7-idresol.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap7-net-Ar.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap7-net2-Br.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap9-ADSDC.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/chap9-SambaDC.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/imc-usermanager2.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/lam-config.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/lam-group-members.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/lam-groups.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/lam-hosts.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/lam-login.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/lam-users.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/openmag.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/wxpp001.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/wxpp004.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/wxpp006.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/wxpp007.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/images/wxpp008.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/index.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/ix01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/kerberos.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/ntmigration.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/nw4migration.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/pr01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/pr02.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/pr03.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/preface.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/primer.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/secure.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/simple.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/small.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/unixclients.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-ByExample/upgrades.html 0444 root bin
-d none usr/sfw/swat/help/Samba3-Developers-Guide 0755 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/CodingSuggestions.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/Packaging.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/architecture.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/contributing.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/debug.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/devprinting.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/index.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/internals.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/modules.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/ntdomain.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/parsing.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pr01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pt01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pt02.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pt03.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pt04.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pt05.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/pwencrypt.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/rpc-plugin.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/tracing.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/unix-smb.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/vfs.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-Developers-Guide/wins.html 0444 root bin
-d none usr/sfw/swat/help/Samba3-HOWTO 0755 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/AccessControls.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/Appendix.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/Backup.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/CUPS-printing.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ChangeNotes.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ClientConfig.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/DNSDHCP.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/FastStart.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/InterdomainTrusts.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/IntroSMB.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/NT4Migration.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/NetCommand.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/NetworkBrowsing.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/Other-Clients.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/PolicyMgmt.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/Portability.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ProfileMgmt.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/SWAT.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/SambaHA.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ServerType.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/StandAloneServer.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/TOSHpreface.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/VFS.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/apa.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/bugreport.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/cfgsmarts.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ch-ldap-tls.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ch47.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/classicalprinting.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/compiling.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/diagnosis.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/domain-member.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/go01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/groupmapping.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/idmapper.html 0444 root bin
-d none usr/sfw/swat/help/Samba3-HOWTO/images 0755 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/10small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/11small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/12small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/13small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/14small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/1small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/2small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/3small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/4small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/5small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/6small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/7small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/8small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/9small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME001.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME002.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME003.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME005.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME009.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME010.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME013.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WME014.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WXPP002.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WXPP003.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WXPP005.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WXPP009.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/WXPP014.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/a_small.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/access1.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/browsing1.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/cups1.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/cups2.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/domain.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/ethereal1.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/ethereal2.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/pdftosocket.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/trusts1.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/w2kp001.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/w2kp002.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/w2kp003.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/w2kp004.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/w2kp005.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/wxpp001.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/wxpp004.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/wxpp006.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/wxpp007.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/images/wxpp008.png 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/index.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/install.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/integrate-ms-networks.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/introduction.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/ix01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/largefile.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/locking.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/migration.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/msdfs.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/optional.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/pam.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/passdb.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/pr01.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/pr02.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/pr03.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/problems.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/rights.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/samba-bdc.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/samba-pdc.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/securing-samba.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/speed.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/troubleshooting.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/type.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/unicode.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/upgrading-to-3.0.html 0444 root bin
-f none usr/sfw/swat/help/Samba3-HOWTO/winbind.html 0444 root bin
-d none usr/sfw/swat/help/manpages 0755 root bin
-s none usr/sfw/swat/help/manpages/Samba.7.html=samba.7.html
-f none usr/sfw/swat/help/manpages/cifs.upcall.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/eventlogadm.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/findsmb.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/idmap_ad.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/idmap_ldap.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/idmap_nss.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/idmap_rid.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/idmap_tdb.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/index.html 0444 root bin
-f none usr/sfw/swat/help/manpages/libsmbclient.7.html 0444 root bin
-f none usr/sfw/swat/help/manpages/lmhosts.4.html 0444 root bin
-f none usr/sfw/swat/help/manpages/log2pcap.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/mount.cifs.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/net.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/nmbd.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/nmblookup.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/ntlm_auth.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/pam_winbind.7.html 0444 root bin
-f none usr/sfw/swat/help/manpages/pdbedit.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/profiles.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/rpcclient.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/samba.7.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smb.conf.4.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbcacls.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbclient.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbcontrol.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbcquotas.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbd.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbget.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbgetrc.4.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbmnt.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbmount.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbpasswd.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbpasswd.4.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbspool.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbstatus.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbtar.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbtree.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/smbumount.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/swat.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/tdbbackup.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/tdbdump.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/tdbtool.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/testparm.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/umount.cifs.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_audit.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_cacheprime.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_cap.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_catia.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_commit.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_default_quota.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_extd_audit.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_fake_perms.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_full_audit.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_gpfs.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_netatalk.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_notify_fam.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_prealloc.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_readahead.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_readonly.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_recycle.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_shadow_copy.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfs_xattr_tdb.1m.html 0444 root bin
-f none usr/sfw/swat/help/manpages/vfstest.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/wbinfo.1.html 0444 root bin
-f none usr/sfw/swat/help/manpages/winbindd.1m.html 0444 root bin
-f none usr/sfw/swat/help/welcome-no-samba-doc.html 0444 root bin
-f none usr/sfw/swat/help/welcome.html 0444 root bin
-d none usr/sfw/swat/images 0755 root bin
-f none usr/sfw/swat/images/globals.gif 0444 root bin
-f none usr/sfw/swat/images/home.gif 0444 root bin
-f none usr/sfw/swat/images/passwd.gif 0444 root bin
-f none usr/sfw/swat/images/printers.gif 0444 root bin
-f none usr/sfw/swat/images/samba.gif 0444 root bin
-f none usr/sfw/swat/images/shares.gif 0444 root bin
-f none usr/sfw/swat/images/status.gif 0444 root bin
-f none usr/sfw/swat/images/viewconfig.gif 0444 root bin
-f none usr/sfw/swat/images/wizard.gif 0444 root bin
-d none usr/sfw/swat/include 0755 root bin
-f none usr/sfw/swat/include/footer.html 0444 root bin
-f none usr/sfw/swat/include/header.html 0444 root bin
-d none usr/sfw/swat/js 0755 root bin
-d none usr/sfw/swat/lang 0755 root bin
-d none usr/sfw/swat/lang/ja 0755 root bin
-d none usr/sfw/swat/lang/ja/help 0755 root bin
-f none usr/sfw/swat/lang/ja/help/welcome.html 0444 root bin
-d none usr/sfw/swat/lang/ja/images 0755 root bin
-d none usr/sfw/swat/lang/ja/include 0755 root bin
-d none usr/sfw/swat/lang/ja/js 0755 root bin
-d none usr/sfw/swat/lang/tr 0755 root bin
-d none usr/sfw/swat/lang/tr/help 0755 root bin
-f none usr/sfw/swat/lang/tr/help/welcome.html 0444 root bin
-d none usr/sfw/swat/lang/tr/images 0755 root bin
-f none usr/sfw/swat/lang/tr/images/globals.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/home.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/passwd.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/printers.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/samba.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/shares.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/status.gif 0444 root bin
-f none usr/sfw/swat/lang/tr/images/viewconfig.gif 0444 root bin
-d none usr/sfw/swat/lang/tr/include 0755 root bin
-d none usr/sfw/swat/lang/tr/js 0755 root bin
-d none usr/sfw/swat/using_samba 0755 root bin
-f none usr/sfw/swat/using_samba/appa.html 0444 root bin
-f none usr/sfw/swat/using_samba/appb.html 0444 root bin
-f none usr/sfw/swat/using_samba/appc.html 0444 root bin
-f none usr/sfw/swat/using_samba/appd.html 0444 root bin
-f none usr/sfw/swat/using_samba/appe.html 0444 root bin
-f none usr/sfw/swat/using_samba/appf.html 0444 root bin
-f none usr/sfw/swat/using_samba/appg.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch00.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch01.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch02.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch03.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch04.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch05.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch06.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch07.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch08.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch09.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch10.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch11.html 0444 root bin
-f none usr/sfw/swat/using_samba/ch12.html 0444 root bin
-d none usr/sfw/swat/using_samba/figs 0755 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0101.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0102.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0103.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0104.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0105.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0106.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0107.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0108.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0109.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0110.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0111.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0112.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0113.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0114.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0201.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0202.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0203.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0204.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0301.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0302.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0303.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0304.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0305.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0306.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0307.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0308.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0309.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0310.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0311.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0312.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0313.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0314.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0315.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0316.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0317.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0318.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0319.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0320.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0321.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0322.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0323.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0324.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0325.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0326.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0327.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0328.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0329.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0330.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0331.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0332.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0333.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0334.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0335.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0336.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0337.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0338.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0339.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0340.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0341.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0342.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0343.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0344.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0345.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0346.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0347.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0348.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0349.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0350.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0351.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0352.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0353.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0354.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0355.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0356.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0357.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0358.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0359.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0360.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0361.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0401.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0402.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0403.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0404.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0405.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0406.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0407.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0408.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0409.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0410.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0411.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0412.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0413.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0414.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0415.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0416.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0417.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0501.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0502.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0503.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0504.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0505.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0506.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0507.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0508.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0601.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0602.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0603.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0604.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0605.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0701.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0801.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0802.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0803.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0804.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0805.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0806.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0807.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0808.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0809.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0810.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0811.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0901.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0902.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_0903.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1001.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1002.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1003.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1004.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1005.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1006.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1101.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_1102.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af01.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af02.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af03.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af04.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af05.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af06.gif 0444 root bin
-f none usr/sfw/swat/using_samba/figs/sam2_af07.gif 0444 root bin
-f none usr/sfw/swat/using_samba/inx.html 0444 root bin
-f none usr/sfw/swat/using_samba/samba2_s.gif 0444 root bin
-f none usr/sfw/swat/using_samba/samba2_xs.gif 0444 root bin
-f none usr/sfw/swat/using_samba/toc.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWsmbau/prototype_i386	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbau/prototype_i386	Sat Aug 21 11:47:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,9 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#ident	"@(#)prototype_i386	1.3	06/03/18 SMI"
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+#ident	"@(#)prototype_i386	1.4	10/07/28 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,3 +47,19 @@
 # SUNWsmbau
 #
 #
+
+d none usr/lib/amd64 0755 root bin
+f none usr/lib/amd64/nss_winbind.so.1 0755 root bin
+s none usr/lib/amd64/nss_winbind.so=nss_winbind.so.1
+f none usr/lib/amd64/nss_wins.so.1 0755 root bin
+s none usr/lib/amd64/nss_wins.so=nss_wins.so.1
+d none usr/lib/samba/amd64 0755 root bin
+f none usr/lib/samba/amd64/libtalloc.so.1 0755 root bin
+s none usr/lib/samba/amd64/libtalloc.so=libtalloc.so.1
+f none usr/lib/samba/amd64/libtdb.so.1 0755 root bin
+s none usr/lib/samba/amd64/libtdb.so=libtdb.so.1
+f none usr/lib/samba/amd64/libwbclient.so.0 0755 root bin
+s none usr/lib/samba/amd64/libwbclient.so=libwbclient.so.0
+d none usr/lib/security/amd64 0755 root bin
+f none usr/lib/security/amd64/pam_winbind.so.1 0755 root bin
+s none usr/lib/security/amd64/pam_winbind.so=pam_winbind.so.1
--- a/usr/src/pkgdefs/SUNWsmbau/prototype_sparc	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/SUNWsmbau/prototype_sparc	Sat Aug 21 11:47:07 2010 -0700
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_sparc	1.3	06/03/18 SMI"
+#ident	"@(#)prototype_sparc	1.4	10/07/28 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,3 +47,19 @@
 # SUNWsmbau
 #
 #
+
+d none usr/lib/sparcv9 0755 root bin
+f none usr/lib/sparcv9/nss_winbind.so.1 0755 root bin
+s none usr/lib/sparcv9/nss_winbind.so=nss_winbind.so.1
+f none usr/lib/sparcv9/nss_wins.so.1 0755 root bin
+s none usr/lib/sparcv9/nss_wins.so=nss_wins.so.1
+d none usr/lib/samba/sparcv9 0755 root bin
+f none usr/lib/samba/sparcv9/libtalloc.so.1 0755 root bin
+s none usr/lib/samba/sparcv9/libtalloc.so=libtalloc.so.1
+f none usr/lib/samba/sparcv9/libtdb.so.1 0755 root bin
+s none usr/lib/samba/sparcv9/libtdb.so=libtdb.so.1
+f none usr/lib/samba/sparcv9/libwbclient.so.0 0755 root bin
+s none usr/lib/samba/sparcv9/libwbclient.so=libwbclient.so.0
+d none usr/lib/security/sparcv9 0755 root bin
+f none usr/lib/security/sparcv9/pam_winbind.so.1 0755 root bin
+s none usr/lib/security/sparcv9/pam_winbind.so=pam_winbind.so.1
--- a/usr/src/pkgdefs/etc/exception_list_i386	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/etc/exception_list_i386	Sat Aug 21 11:47:07 2010 -0700
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)exception_list_i386	1.22	10/07/09 SMI"
+# ident	"@(#)exception_list_i386	1.23	10/08/03 SMI"
 #
 # Exception List for protocmp
 #
@@ -31,6 +31,19 @@
 #
 #####################################################################
 #
+usr/include/ldap6/disptmpl.h					i386
+usr/include/ldap6/iutil.h					i386
+usr/include/ldap6/lber.h					i386
+usr/include/ldap6/ldap-deprecated.h				i386
+usr/include/ldap6/ldap-extension.h				i386
+usr/include/ldap6/ldap-platform.h				i386
+usr/include/ldap6/ldap-standard.h				i386
+usr/include/ldap6/ldap-to-be-deprecated.h			i386
+usr/include/ldap6/ldap.h					i386
+usr/include/ldap6/ldap_ssl.h					i386
+usr/include/ldap6/ldappr.h					i386
+usr/include/ldap6/ldif.h					i386
+usr/include/ldap6/srchpref.h					i386
 #####################################################################
 #
 # ENTRIES FILTERED OUT OF THE protodirs
@@ -38,3 +51,4 @@
 #####################################################################
 #
 usr/lib/64							i386
+usr/include/ldap6						i386
--- a/usr/src/pkgdefs/etc/exception_list_sparc	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/pkgdefs/etc/exception_list_sparc	Sat Aug 21 11:47:07 2010 -0700
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)exception_list_sparc	1.24	10/07/09 SMI"
+# ident	"@(#)exception_list_sparc	1.25	10/08/03 SMI"
 #
 # Exception List for protocmp
 #
@@ -31,6 +31,19 @@
 #
 ######################################################################
 #
+usr/include/ldap6/disptmpl.h					sparc
+usr/include/ldap6/iutil.h					sparc
+usr/include/ldap6/lber.h					sparc
+usr/include/ldap6/ldap-deprecated.h				sparc
+usr/include/ldap6/ldap-extension.h				sparc
+usr/include/ldap6/ldap-platform.h				sparc
+usr/include/ldap6/ldap-standard.h				sparc
+usr/include/ldap6/ldap-to-be-deprecated.h			sparc
+usr/include/ldap6/ldap.h					sparc
+usr/include/ldap6/ldap_ssl.h					sparc
+usr/include/ldap6/ldappr.h					sparc
+usr/include/ldap6/ldif.h					sparc
+usr/include/ldap6/srchpref.h					sparc
 ######################################################################
 #
 # ENTRIES FILTERED OUT OF THE protodirs
@@ -38,3 +51,4 @@
 ######################################################################
 #
 usr/lib/64							sparc
+usr/include/ldap6						sparc
--- a/usr/src/tools/exception_list.check-deps	Thu Aug 05 23:45:52 2010 -0700
+++ b/usr/src/tools/exception_list.check-deps	Sat Aug 21 11:47:07 2010 -0700
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#pragma ident	"@(#)exception_list.check-deps	1.21	10/07/07 SMI"
+#pragma ident	"@(#)exception_list.check-deps	1.22	10/07/26 SMI"
 #
 # These execptions are here and marked KNOWN so that new things (and updates)
 # can be caught more easily. They are not necessarily ok, and while some should
@@ -112,8 +112,11 @@
 # on SUNWconmanu
 SUNWconmanr:NotInDepend:/lib/svc/method/svc-conmand:/usr/sbin/conmand:KNOWN:
 #
-SUNWsmbau:NotInPkg:/usr/sfw/sbin/smbd:libsam.so:KNOWN:
-SUNWsmbau:RunPathDirNotInPkg:/usr/sfw/sbin/smbd:/opt/SUNWsamfs/lib:KNOWN:
+# Samba VFS-module samfs.so is linking the libsam.so
+# which is part of the SAM-QFS optional package
+SUNWsmbau:NotInPkg:/usr/lib/samba/vfs/samfs.so:libsam.so:KNOWN:
+SUNWsmbau:RunPathDirNotInPkg:/usr/lib/samba/vfs/samfs.so:/opt/SUNWsamfs/lib:KNOWN:
+#
 SUNWgutenprint:NotInDepend:/usr/lib/pkgconfig/gutenprintui2.pc:/usr/lib/pkgconfig/gtk+-2.0.pc:KNOWN:
 #
 # SUNWgnu-gettext