Update to 4.3.0

Changelog:
                   =============================
                   Release Notes for Samba 4.3.0
                           September 8, 2015
                   =============================


This is the first stable release of Samba 4.3.


UPGRADING
=========

Read the "New FileChangeNotify subsystem" and "smb.conf changes" sections
(below).


NEW FEATURES
============

Logging
-------

The logging code now supports logging to multiple backends.  In
addition to the previously available syslog and file backends, the
backends for logging to the systemd-journal, lttng and gpfs have been
added. Please consult the section for the 'logging' parameter in the
smb.conf manpage for details.

Spotlight
---------

Support for Apple's Spotlight has been added by integrating with Gnome
Tracker.

For detailed instructions how to build and setup Samba for Spotlight,
please see the Samba wiki: <https://wiki.samba.org/index.php/Spotlight>

New FileChangeNotify subsystem
------------------------------

Samba now contains a new subsystem to do FileChangeNotify. The
previous system used a central database, notify_index.tdb, to store
all notification requests. In particular in a cluster this turned out
to be a major bottleneck, because some hot records need to be bounced
back and forth between nodes on every change event like a new created
file.

The new FileChangeNotify subsystem works with a central daemon per
node. Every FileChangeNotify request and every event are handled by an
asynchronous message from smbd to the notify daemon. The notify daemon
maintains a database of all FileChangeNotify requests in memory and
will distribute the notify events accordingly. This database is
asynchronously distributed in the cluster by the notify daemons.

The notify daemon is supposed to scale a lot better than the previous
implementation. The functional advantage is cross-node kernel change
notify: Files created via NFS will be seen by SMB clients on other
nodes per FileChangeNotify, despite the fact that popular cluster file
systems do not offer cross-node inotify.

Two changes to the configuration were required for this new subsystem:
The parameters "change notify" and "kernel change notify" are not
per-share anymore but must be set globally. So it is no longer
possible to enable or disable notify per share, the notify daemon has
no notion of a share, it only works on absolute paths.

New SMB profiling code
----------------------

The code for SMB (SMB1, SMB2 and SMB3) profiling uses a tdb instead
of sysv IPC shared memory. This avoids performance problems and NUMA
effects. The profile stats are a bit more detailed than before.

Improved DCERPC man in the middle detection for kerberos
--------------------------------------------------------

The gssapi based kerberos backends for gensec have support for
DCERPC header signing when using DCERPC_AUTH_LEVEL_PRIVACY.

SMB signing required in winbindd by default
-------------------------------------------

The effective value for "client signing" is required
by default for winbindd, if the primary domain uses active directory.

Experimental NTDB was removed
-----------------------------

The experimental NTDB library introduced in Samba 4.0 has been
removed again.

Improved support for trusted domains (as AD DC)
-----------------------------------------------

The support for trusted domains/forests has improved a lot.

samba-tool got "domain trust" subcommands to manage trusts:

  create      - Create a domain or forest trust.
  delete      - Delete a domain trust.
  list        - List domain trusts.
  namespaces  - Manage forest trust namespaces.
  show        - Show trusted domain details.
  validate    - Validate a domain trust.

External trusts between individual domains work in both ways
(inbound and outbound). The same applies to root domains of
a forest trust. The transitive routing into the other forest
is fully functional for kerberos, but not yet supported for NTLMSSP.

While a lot of things are working fine, there are currently a few limitations:

  - Both sides of the trust need to fully trust each other!
  - No SID filtering rules are applied at all!
  - This means DCs of domain A can grant domain admin rights
    in domain B.
  - It's not possible to add users/groups of a trusted domain
    into domain groups.

SMB 3.1.1 supported
-------------------

Both client and server have support for SMB 3.1.1 now.

This is the dialect introduced with Windows 10, it improves the secure
negotiation of SMB dialects and features.

There's also a new optinal encryption algorithm aes-gcm-128,
but for now this is only selected as fallback and aes-ccm-128
is preferred because of the better performance. This might change
in future versions when hardware encryption will be supported.
See https://bugzilla.samba.org/show_bug.cgi?id=11451.

New smbclient subcommands
-------------------------

  - Query a directory for change notifications: notify <dir name>
  - Server side copy: scopy <source filename> <destination filename>

New rpcclient subcommands
-------------------------

  netshareenumall 	- Enumerate all shares
  netsharegetinfo 	- Get Share Info
  netsharesetinfo 	- Set Share Info
  netsharesetdfsflags	- Set DFS flags
  netfileenum		- Enumerate open files
  netnamevalidate	- Validate sharename
  netfilegetsec		- Get File security
  netsessdel		- Delete Session
  netsessenum		- Enumerate Sessions
  netdiskenum		- Enumerate Disks
  netconnenum		- Enumerate Connections
  netshareadd		- Add share
  netsharedel		- Delete share

New modules
-----------

  idmap_script 		- see 'man 8 idmap_script'
  vfs_unityed_media	- see 'man 8 vfs_unityed_media'
  vfs_shell_snap	- see 'man 8 vfs_shell_snap'

New sparsely connected replia graph (Improved KCC)
--------------------------------------------------

The Knowledge Consistency Checker (KCC) maintains a replication graph
for DCs across an AD network. The existing Samba KCC uses a fully
connected graph, so that each DC replicates from all the others, which
does not scale well with large networks. In 4.3 there is an
experimental new KCC that creates a sparsely connected replication
graph and closely follows Microsoft's specification. It is turned off
by default. To use the new KCC, set "kccsrv:samba_kcc=true" in
smb.conf and let us know how it goes. You should consider doing this
if you are making a large new network. For small networks there is
little benefit and you can always switch over at a later date.

Configurable TLS protocol support, with better defaults
-------------------------------------------------------

The "tls priority" option can be used to change the supported TLS
protocols. The default is to disable SSLv3, which is no longer
considered secure.

Samba-tool now supports all 7 FSMO roles
-------------------------------------------------------

Previously "samba-tool fsmo" could only show, transfer or seize the
five well-known FSMO roles:

	Schema Master
	Domain Naming Master
	RID Master
	PDC Emulator
	Infrastructure Master

It can now also show, transfer or seize the DNS infrastructure roles:

	DomainDnsZones Infrastructure Master
	ForestDnsZones Infrastructure Master

CTDB logging changes
--------------------

The destination for CTDB logging is now set via a single new
configuration variable CTDB_LOGGING.  This replaces CTDB_LOGFILE and
CTDB_SYSLOG, which have both been removed.  See ctdbd.conf(5) for
details of CTDB_LOGGING.

CTDB no longer runs a separate logging daemon.

CTDB NFS support changes
------------------------

CTDB's NFS service management has been combined into a single 60.nfs
event script.  This updated 60.nfs script now uses a call-out to
interact with different NFS implementations.  See the CTDB_NFS_CALLOUT
option in the ctdbd.conf(5) manual page for details.  A default
call-out is provided to interact with the Linux kernel NFS
implementation.  The 60.ganesha event script has been removed - a
sample call-out is provided for NFS Ganesha, based on this script.

The method of configuring NFS RPC checks has been improved.  See
ctdb/config/nfs-checks.d/README for details.

Improved Cross-Compiling Support
--------------------------------

A new "hybrid" build configuration mode is added to improve
cross-compilation support.

A common challenge in cross-compilation is that of obtaining the results
of tests that have to run on the target, during the configuration
phase of the build. The Samba build system already supports the following
means to do so:

  - Executing configure tests using the --cross-execute parameter
  - Obtaining the results from an answers file using the --cross-answers
    parameter

The first method has the drawback of inaccurate results if the tests are
run using an emulator, or a need to be connected to a running target
while building, if the tests are to be run on an actual target. The
second method presents a challenge of figuring out the test results.

The new hybrid mode runs the tests and records the result in an answer file.
To activate this mode, use both --cross-execute and --cross-answers in the
same configure invocation. This mode can be activated once against a
running target, and then the generated answers file can be used in
subsequent builds.

Also supplied is an example script that can be used as the
cross-execute program. This script copies the test to a running target
and runs the test on the target, obtaining the result. The obtained
results are more accurate than running the test with an emulator, because
they reflect the exact kernel and system libraries that exist on the
target.

Improved Sparse File Support
----------------------------
Support for the FSCTL_SET_ZERO_DATA and FSCTL_QUERY_ALLOCATED_RANGES
SMB2 requests has been added to the smbd file server.
This allows for clients to deallocate (hole punch) regions within a
sparse file, and check which portions of a file are allocated.


######################################################################
Changes
#######

smb.conf changes
----------------

  Parameter Name		Description		Default
  --------------		-----------		-------
  logging			New			(empty)
  msdfs shuffle referrals	New			no
  smbd profiling level		New			off
  spotlight			New			no
  tls priority			New 			NORMAL:-VERS-SSL3.0
  use ntdb			Removed
  change notify			Changed to [global]
  kernel change notify		Changed to [global]
  client max protocol		Changed	default		SMB3_11
  server max protocol		Changed default		SMB3_11

Removed modules
---------------

vfs_notify_fam - see section 'New FileChangeNotify subsystem'.


KNOWN ISSUES
============

Currently none.


CHANGES SINCE 4.2.0rc4
======================

o   Andrew Bartlett <abartlet@samba.org>
    * Bug 10973: No objectClass found in replPropertyMetaData on ordinary
      objects (non-deleted)
    * Bug 11429: Python bindings don't check integer types
    * Bug 11430: Python bindings don't check array sizes

o   Ralph Boehme <slow@samba.org>
    * Bug 11467: Handling of 0 byte resource fork stream

o   Volker Lendecke <vl@samba.org>
    * Bug 11488: AD samr GetGroupsForUser fails for users with "()" in
      their name

o   Stefan Metzmacher <metze@samba.org>
    * Bug 11429: Python bindings don't check integer types

o   Matthieu Patou <mat@matws.net>
    * Bug 10973: No objectClass found in replPropertyMetaData on ordinary
      objects (non-deleted)


CHANGES SINCE 4.2.0rc3
======================

o   Ralph Boehme <slow@samba.org>
    * Bug 11444: Crash in notify_remove caused by change notify = no

o   Günther Deschner <gd@samba.org>
    * Bug 11411: smbtorture does not build when configured --with-system-mitkrb5

o   Volker Lendecke <vl@samba.org>
    * Bug 11455: fix recursion problem in rep_strtoll in lib/replace/replace.c
    * Bug 11464: xid2sid gives inconsistent results
    * Bug 11465: ctdb: Fix the build on FreeBSD 10.1

o   Roel van Meer <roel@1afa.com>
    * Bug 11427: nmbd incorrectly matches netbios names as own name

o   Stefan Metzmacher <metze@samba.org>
    * Bug 11451: Poor SMB3 encryption performance with AES-GCM
    * Bug 11458: --bundled-libraries=!ldb,!pyldb,!pyldb-util doesn't
      disable ldb build and install

o   Andreas Schneider <asn@samba.org>
    * Bug 9862: Samba "map to guest = Bad uid" doesn't work


CHANGES SINCE 4.3.0rc2
======================

o   Andrew Bartlett <abartlet@samba.org>
    * Bug 11436: samba-tool uncaught exception error
    * Bug 10493: revert LDAP extended rule 1.2.840.113556.1.4.1941
                 LDAP_MATCHING_RULE_IN_CHAIN changes

o   Ralph Boehme <slow@samba.org>
    * Bug 11278: Stream names with colon don't work with
                 fruit:encoding = native
    * Bug 11426: net share allowedusers crashes

o   Amitay Isaacs <amitay@gmail.com>
    * Bug 11432: Fix crash in nested ctdb banning
    * Bug 11434: Cannot build ctdbpmda
    * Bug 11431: CTDB's eventscript error handling is broken

o   Stefan Metzmacher <metze@samba.org>
    * Bug 11451: Poor SMB3 encryption performance with AES-GCM (part1)
    * Bug 11316: tevent_fd needs to be destroyed before closing the fd

o   Arvid Requate <requate@univention.de>
    * Bug 11291: NetApp joined to a Samba/ADDC cannot resolve SIDs

o   Martin Schwenke <martin@meltin.net>
    * Bug 11432: Fix crash in nested ctdb banning


CHANGES SINCE 4.3.0rc1
======================

o   Jeremy Allison <jra@samba.org>
    * BUG 11359: strsep is not available on Solaris

o   Björn Baumbach <bb@sernet.de>
    * BUG 11421: Build with GPFS support is broken

o   Justin Maggard <jmaggard@netgear.com>
    * BUG 11320: "force group" with local group not working

o   Martin Schwenke <martin@meltin.net
    * BUG 11424: Build broken with --disable-python


#######################################
Reporting bugs & Development Discussion
#######################################

Please discuss this release on the samba-technical mailing list or by
joining the #samba-technical IRC channel on irc.freenode.net.

If you do report problems then please try to send high quality
feedback. If you don't provide vital information to help us track down
the problem then you will probably be ignored.  All bug reports should
be filed under the "Samba 4.1 and newer" product in the project's Bugzilla
database (https://bugzilla.samba.org/).


======================================================================
== Our Code, Our Bugs, Our Responsibility.
== The Samba Team
======================================================================

6 files changed, 163 insertions, 202 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 608b7db37df..4e8aff14bdb 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/08/23 14:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/09/28 17:37:04 ryoon Exp $
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://download.samba.org/pub/samba/
 
@@ -12,7 +11,7 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-VERSION=	4.2.1
+VERSION=	4.3.0
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
diff --git a/net/samba4/PLIST b/net/samba4/PLIST
index 3f237dced53..a694b000853 100644
--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/26 16:09:49 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/09/28 17:37:04 ryoon Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/eventlogadm
@@ -14,10 +14,6 @@ bin/masktest
 bin/ndrdump
 bin/net
 bin/nmblookup
-bin/ntdbbackup
-bin/ntdbdump
-bin/ntdbrestore
-bin/ntdbtool
 bin/ntlm_auth
 bin/oLschema2ldif
 bin/pdbedit
@@ -151,6 +147,7 @@ include/util/byteorder.h
 include/util/data_blob.h
 include/util/debug.h
 include/util/fault.h
+include/util/genrand.h
 include/util/idtree.h
 include/util/idtree_random.h
 include/util/memory.h
@@ -192,7 +189,7 @@ lib/libndr-standard.so.0
 lib/libndr-standard.so.0.0.1
 lib/libndr.so
 lib/libndr.so.0
-lib/libndr.so.0.0.3
+lib/libndr.so.0.0.5
 lib/libnetapi.so
 lib/libnetapi.so.0
 lib/libnss_winbind.so
@@ -222,7 +219,7 @@ lib/libsmbclient-raw.so.0
 lib/libsmbclient-raw.so.0.0.1
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-lib/libsmbclient.so.0.2.1
+lib/libsmbclient.so.0.2.3
 lib/libsmbconf.so
 lib/libsmbconf.so.0
 ${PLIST.ldap}lib/libsmbldap.so
@@ -281,9 +278,9 @@ lib/pkgconfig/smbclient-raw.pc
 lib/pkgconfig/smbclient.pc
 lib/pkgconfig/torture.pc
 lib/pkgconfig/wbclient.pc
+${PYSITELIB}/_tdb_text.py
 ${PYSITELIB}/_tevent.so
 ${PYSITELIB}/ldb.so
-${PYSITELIB}/ntdb.so
 ${PYSITELIB}/samba/__init__.py
 ${PYSITELIB}/samba/_glue.so
 ${PYSITELIB}/samba/_ldb.so
@@ -328,175 +325,17 @@ ${PYSITELIB}/samba/dcerpc/xattr.so
 ${PYSITELIB}/samba/descriptor.py
 ${PYSITELIB}/samba/drs_utils.py
 ${PYSITELIB}/samba/dsdb.so
-${PYSITELIB}/samba/external/__init__.py
-${PYSITELIB}/samba/external/dns/__init__.py
-${PYSITELIB}/samba/external/dns/dnssec.py
-${PYSITELIB}/samba/external/dns/e164.py
-${PYSITELIB}/samba/external/dns/edns.py
-${PYSITELIB}/samba/external/dns/entropy.py
-${PYSITELIB}/samba/external/dns/exception.py
-${PYSITELIB}/samba/external/dns/flags.py
-${PYSITELIB}/samba/external/dns/hash.py
-${PYSITELIB}/samba/external/dns/inet.py
-${PYSITELIB}/samba/external/dns/ipv4.py
-${PYSITELIB}/samba/external/dns/ipv6.py
-${PYSITELIB}/samba/external/dns/message.py
-${PYSITELIB}/samba/external/dns/name.py
-${PYSITELIB}/samba/external/dns/namedict.py
-${PYSITELIB}/samba/external/dns/node.py
-${PYSITELIB}/samba/external/dns/opcode.py
-${PYSITELIB}/samba/external/dns/query.py
-${PYSITELIB}/samba/external/dns/rcode.py
-${PYSITELIB}/samba/external/dns/rdata.py
-${PYSITELIB}/samba/external/dns/rdataclass.py
-${PYSITELIB}/samba/external/dns/rdataset.py
-${PYSITELIB}/samba/external/dns/rdatatype.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/AFSDB.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/CERT.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/CNAME.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/DLV.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/DNAME.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/DNSKEY.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/DS.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/GPOS.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/HINFO.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/HIP.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/ISDN.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/LOC.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/MX.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/NS.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/NSEC.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/NSEC3.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/PTR.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/RP.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/RRSIG.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/RT.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/SOA.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/SPF.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/SSHFP.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/TXT.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/X25.py
-${PYSITELIB}/samba/external/dns/rdtypes/ANY/__init__.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/A.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/AAAA.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/APL.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/DHCID.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/IPSECKEY.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/KX.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/NAPTR.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/NSAP.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/NSAP_PTR.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/PX.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/SRV.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/WKS.py
-${PYSITELIB}/samba/external/dns/rdtypes/IN/__init__.py
-${PYSITELIB}/samba/external/dns/rdtypes/__init__.py
-${PYSITELIB}/samba/external/dns/rdtypes/dsbase.py
-${PYSITELIB}/samba/external/dns/rdtypes/mxbase.py
-${PYSITELIB}/samba/external/dns/rdtypes/nsbase.py
-${PYSITELIB}/samba/external/dns/rdtypes/txtbase.py
-${PYSITELIB}/samba/external/dns/renderer.py
-${PYSITELIB}/samba/external/dns/resolver.py
-${PYSITELIB}/samba/external/dns/reversename.py
-${PYSITELIB}/samba/external/dns/rrset.py
-${PYSITELIB}/samba/external/dns/set.py
-${PYSITELIB}/samba/external/dns/tokenizer.py
-${PYSITELIB}/samba/external/dns/tsig.py
-${PYSITELIB}/samba/external/dns/tsigkeyring.py
-${PYSITELIB}/samba/external/dns/ttl.py
-${PYSITELIB}/samba/external/dns/update.py
-${PYSITELIB}/samba/external/dns/version.py
-${PYSITELIB}/samba/external/dns/wiredata.py
-${PYSITELIB}/samba/external/dns/zone.py
-${PYSITELIB}/samba/external/extras/__init__.py
-${PYSITELIB}/samba/external/extras/tests/__init__.py
-${PYSITELIB}/samba/external/extras/tests/test_extras.py
-${PYSITELIB}/samba/external/subunit/__init__.py
-${PYSITELIB}/samba/external/subunit/chunked.py
-${PYSITELIB}/samba/external/subunit/details.py
-${PYSITELIB}/samba/external/subunit/filters.py
-${PYSITELIB}/samba/external/subunit/iso8601.py
-${PYSITELIB}/samba/external/subunit/progress_model.py
-${PYSITELIB}/samba/external/subunit/run.py
-${PYSITELIB}/samba/external/subunit/test_results.py
-${PYSITELIB}/samba/external/subunit/tests/TestUtil.py
-${PYSITELIB}/samba/external/subunit/tests/__init__.py
-${PYSITELIB}/samba/external/subunit/tests/sample-script.py
-${PYSITELIB}/samba/external/subunit/tests/sample-two-script.py
-${PYSITELIB}/samba/external/subunit/tests/test_chunked.py
-${PYSITELIB}/samba/external/subunit/tests/test_details.py
-${PYSITELIB}/samba/external/subunit/tests/test_progress_model.py
-${PYSITELIB}/samba/external/subunit/tests/test_run.py
-${PYSITELIB}/samba/external/subunit/tests/test_subunit_filter.py
-${PYSITELIB}/samba/external/subunit/tests/test_subunit_stats.py
-${PYSITELIB}/samba/external/subunit/tests/test_subunit_tags.py
-${PYSITELIB}/samba/external/subunit/tests/test_tap2subunit.py
-${PYSITELIB}/samba/external/subunit/tests/test_test_protocol.py
-${PYSITELIB}/samba/external/subunit/tests/test_test_results.py
-${PYSITELIB}/samba/external/testtools/__init__.py
-${PYSITELIB}/samba/external/testtools/_compat2x.py
-${PYSITELIB}/samba/external/testtools/_compat3x.py
-${PYSITELIB}/samba/external/testtools/_spinner.py
-${PYSITELIB}/samba/external/testtools/compat.py
-${PYSITELIB}/samba/external/testtools/content.py
-${PYSITELIB}/samba/external/testtools/content_type.py
-${PYSITELIB}/samba/external/testtools/deferredruntest.py
-${PYSITELIB}/samba/external/testtools/distutilscmd.py
-${PYSITELIB}/samba/external/testtools/helpers.py
-${PYSITELIB}/samba/external/testtools/matchers/__init__.py
-${PYSITELIB}/samba/external/testtools/matchers/_basic.py
-${PYSITELIB}/samba/external/testtools/matchers/_datastructures.py
-${PYSITELIB}/samba/external/testtools/matchers/_dict.py
-${PYSITELIB}/samba/external/testtools/matchers/_doctest.py
-${PYSITELIB}/samba/external/testtools/matchers/_exception.py
-${PYSITELIB}/samba/external/testtools/matchers/_filesystem.py
-${PYSITELIB}/samba/external/testtools/matchers/_higherorder.py
-${PYSITELIB}/samba/external/testtools/matchers/_impl.py
-${PYSITELIB}/samba/external/testtools/monkey.py
-${PYSITELIB}/samba/external/testtools/run.py
-${PYSITELIB}/samba/external/testtools/runtest.py
-${PYSITELIB}/samba/external/testtools/tags.py
-${PYSITELIB}/samba/external/testtools/testcase.py
-${PYSITELIB}/samba/external/testtools/testresult/__init__.py
-${PYSITELIB}/samba/external/testtools/testresult/doubles.py
-${PYSITELIB}/samba/external/testtools/testresult/real.py
-${PYSITELIB}/samba/external/testtools/tests/__init__.py
-${PYSITELIB}/samba/external/testtools/tests/helpers.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/__init__.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/helpers.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_basic.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_datastructures.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_dict.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_doctest.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_exception.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_filesystem.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_higherorder.py
-${PYSITELIB}/samba/external/testtools/tests/matchers/test_impl.py
-${PYSITELIB}/samba/external/testtools/tests/test_compat.py
-${PYSITELIB}/samba/external/testtools/tests/test_content.py
-${PYSITELIB}/samba/external/testtools/tests/test_content_type.py
-${PYSITELIB}/samba/external/testtools/tests/test_deferredruntest.py
-${PYSITELIB}/samba/external/testtools/tests/test_distutilscmd.py
-${PYSITELIB}/samba/external/testtools/tests/test_fixturesupport.py
-${PYSITELIB}/samba/external/testtools/tests/test_helpers.py
-${PYSITELIB}/samba/external/testtools/tests/test_monkey.py
-${PYSITELIB}/samba/external/testtools/tests/test_run.py
-${PYSITELIB}/samba/external/testtools/tests/test_runtest.py
-${PYSITELIB}/samba/external/testtools/tests/test_spinner.py
-${PYSITELIB}/samba/external/testtools/tests/test_tags.py
-${PYSITELIB}/samba/external/testtools/tests/test_testcase.py
-${PYSITELIB}/samba/external/testtools/tests/test_testresult.py
-${PYSITELIB}/samba/external/testtools/tests/test_testsuite.py
-${PYSITELIB}/samba/external/testtools/tests/test_with_with.py
-${PYSITELIB}/samba/external/testtools/testsuite.py
-${PYSITELIB}/samba/external/testtools/utils.py
 ${PYSITELIB}/samba/gensec.so
 ${PYSITELIB}/samba/getopt.py
 ${PYSITELIB}/samba/hostconfig.py
 ${PYSITELIB}/samba/idmap.py
 ${PYSITELIB}/samba/join.py
-${PYSITELIB}/samba/kcc_utils.py
+${PYSITELIB}/samba/kcc/__init__.py
+${PYSITELIB}/samba/kcc/debug.py
+${PYSITELIB}/samba/kcc/graph.py
+${PYSITELIB}/samba/kcc/graph_utils.py
+${PYSITELIB}/samba/kcc/kcc_utils.py
+${PYSITELIB}/samba/kcc/ldif_import_export.py
 ${PYSITELIB}/samba/messaging.so
 ${PYSITELIB}/samba/ms_display_specifiers.py
 ${PYSITELIB}/samba/ms_schema.py
@@ -544,6 +383,8 @@ ${PYSITELIB}/samba/sd_utils.py
 ${PYSITELIB}/samba/security.so
 ${PYSITELIB}/samba/sites.py
 ${PYSITELIB}/samba/smb.so
+${PYSITELIB}/samba/subunit/__init__.py
+${PYSITELIB}/samba/subunit/run.py
 ${PYSITELIB}/samba/tdb_util.py
 ${PYSITELIB}/samba/tests/__init__.py
 ${PYSITELIB}/samba/tests/auth.py
@@ -556,6 +397,7 @@ ${PYSITELIB}/samba/tests/credentials.py
 ${PYSITELIB}/samba/tests/dcerpc/__init__.py
 ${PYSITELIB}/samba/tests/dcerpc/bare.py
 ${PYSITELIB}/samba/tests/dcerpc/dnsserver.py
+${PYSITELIB}/samba/tests/dcerpc/integer.py
 ${PYSITELIB}/samba/tests/dcerpc/misc.py
 ${PYSITELIB}/samba/tests/dcerpc/registry.py
 ${PYSITELIB}/samba/tests/dcerpc/rpc_talloc.py
@@ -570,6 +412,11 @@ ${PYSITELIB}/samba/tests/dsdb.py
 ${PYSITELIB}/samba/tests/gensec.py
 ${PYSITELIB}/samba/tests/getopt.py
 ${PYSITELIB}/samba/tests/hostconfig.py
+${PYSITELIB}/samba/tests/kcc/__init__.py
+${PYSITELIB}/samba/tests/kcc/graph.py
+${PYSITELIB}/samba/tests/kcc/graph_utils.py
+${PYSITELIB}/samba/tests/kcc/kcc_utils.py
+${PYSITELIB}/samba/tests/kcc/ldif_import_export.py
 ${PYSITELIB}/samba/tests/libsmb_samba_internal.py
 ${PYSITELIB}/samba/tests/messaging.py
 ${PYSITELIB}/samba/tests/netcmd.py
@@ -599,6 +446,90 @@ ${PYSITELIB}/samba/tests/upgrade.py
 ${PYSITELIB}/samba/tests/upgradeprovision.py
 ${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py
 ${PYSITELIB}/samba/tests/xattr.py
+${PYSITELIB}/samba/third_party/__init__.py
+${PYSITELIB}/samba/third_party/dns/__init__.py
+${PYSITELIB}/samba/third_party/dns/dnssec.py
+${PYSITELIB}/samba/third_party/dns/e164.py
+${PYSITELIB}/samba/third_party/dns/edns.py
+${PYSITELIB}/samba/third_party/dns/entropy.py
+${PYSITELIB}/samba/third_party/dns/exception.py
+${PYSITELIB}/samba/third_party/dns/flags.py
+${PYSITELIB}/samba/third_party/dns/hash.py
+${PYSITELIB}/samba/third_party/dns/inet.py
+${PYSITELIB}/samba/third_party/dns/ipv4.py
+${PYSITELIB}/samba/third_party/dns/ipv6.py
+${PYSITELIB}/samba/third_party/dns/message.py
+${PYSITELIB}/samba/third_party/dns/name.py
+${PYSITELIB}/samba/third_party/dns/namedict.py
+${PYSITELIB}/samba/third_party/dns/node.py
+${PYSITELIB}/samba/third_party/dns/opcode.py
+${PYSITELIB}/samba/third_party/dns/query.py
+${PYSITELIB}/samba/third_party/dns/rcode.py
+${PYSITELIB}/samba/third_party/dns/rdata.py
+${PYSITELIB}/samba/third_party/dns/rdataclass.py
+${PYSITELIB}/samba/third_party/dns/rdataset.py
+${PYSITELIB}/samba/third_party/dns/rdatatype.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/AFSDB.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/CERT.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/CNAME.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DLV.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DNAME.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DNSKEY.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DS.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/GPOS.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/HINFO.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/HIP.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/ISDN.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/LOC.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/MX.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NS.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NSEC.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NSEC3.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NSEC3PARAM.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/PTR.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/RP.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/RRSIG.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/RT.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/SOA.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/SPF.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/SSHFP.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/TXT.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/X25.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/__init__.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/A.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/AAAA.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/APL.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/DHCID.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/IPSECKEY.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/KX.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/NAPTR.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/NSAP.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/NSAP_PTR.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/PX.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/SRV.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/WKS.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/IN/__init__.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/__init__.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/dsbase.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/mxbase.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/nsbase.py
+${PYSITELIB}/samba/third_party/dns/rdtypes/txtbase.py
+${PYSITELIB}/samba/third_party/dns/renderer.py
+${PYSITELIB}/samba/third_party/dns/resolver.py
+${PYSITELIB}/samba/third_party/dns/reversename.py
+${PYSITELIB}/samba/third_party/dns/rrset.py
+${PYSITELIB}/samba/third_party/dns/set.py
+${PYSITELIB}/samba/third_party/dns/tokenizer.py
+${PYSITELIB}/samba/third_party/dns/tsig.py
+${PYSITELIB}/samba/third_party/dns/tsigkeyring.py
+${PYSITELIB}/samba/third_party/dns/ttl.py
+${PYSITELIB}/samba/third_party/dns/update.py
+${PYSITELIB}/samba/third_party/dns/version.py
+${PYSITELIB}/samba/third_party/dns/wiredata.py
+${PYSITELIB}/samba/third_party/dns/zone.py
+${PYSITELIB}/samba/third_party/iso8601/__init__.py
+${PYSITELIB}/samba/third_party/iso8601/iso8601.py
+${PYSITELIB}/samba/third_party/iso8601/test_iso8601.py
 ${PYSITELIB}/samba/upgrade.py
 ${PYSITELIB}/samba/upgradehelpers.py
 ${PYSITELIB}/samba/web_server/__init__.py
@@ -612,6 +543,7 @@ lib/samba/idmap/autorid.so
 lib/samba/idmap/hash.so
 ${PLIST.ldap}lib/samba/idmap/rfc2307.so
 lib/samba/idmap/rid.so
+lib/samba/idmap/script.so
 lib/samba/idmap/tdb2.so
 lib/samba/ldb/asq.so
 lib/samba/ldb/ildap.so
@@ -638,7 +570,6 @@ lib/samba/private/libauth-samba4.so
 lib/samba/private/libauth-unix-token-samba4.so
 lib/samba/private/libauth4-samba4.so
 lib/samba/private/libauthkrb5-samba4.so
-lib/samba/private/libccan-samba4.so
 lib/samba/private/libcli-cldap-samba4.so
 lib/samba/private/libcli-ldap-common-samba4.so
 lib/samba/private/libcli-ldap-samba4.so
@@ -651,25 +582,28 @@ lib/samba/private/libcmdline-credentials-samba4.so
 lib/samba/private/libdbwrap-samba4.so
 lib/samba/private/libdcerpc-samba-samba4.so
 lib/samba/private/libdcerpc-samba4.so
-lib/samba/private/libdfs-server-ad-samba4.so
-lib/samba/private/libdnsserver-common-samba4.so
 lib/samba/private/libdsdb-module-samba4.so
 lib/samba/private/liberrors-samba4.so
 lib/samba/private/libevents-samba4.so
 lib/samba/private/libflag-mapping-samba4.so
+lib/samba/private/libgenrand-samba4.so
 lib/samba/private/libgpo-samba4.so
 lib/samba/private/libgse-samba4.so
 lib/samba/private/libhttp-samba4.so
 lib/samba/private/libidmap-samba4.so
 lib/samba/private/libinterfaces-samba4.so
+lib/samba/private/libiov-buf-samba4.so
 lib/samba/private/libkrb5samba-samba4.so
 lib/samba/private/libldb-cmdline-samba4.so
 lib/samba/private/libldb.so.1
-lib/samba/private/libldb.so.1.1.20
+lib/samba/private/libldb.so.1.1.21
 lib/samba/private/libldbsamba-samba4.so
 lib/samba/private/liblibcli-lsa3-samba4.so
 lib/samba/private/liblibcli-netlogon3-samba4.so
 lib/samba/private/liblibsmb-samba4.so
+lib/samba/private/libmessages-dgm-samba4.so
+lib/samba/private/libmessages-util-samba4.so
+lib/samba/private/libmsghdr-samba4.so
 lib/samba/private/libmsrpc3-samba4.so
 lib/samba/private/libndr-samba-samba4.so
 lib/samba/private/libndr-samba4.so
@@ -678,14 +612,12 @@ lib/samba/private/libnetif-samba4.so
 lib/samba/private/libnon-posix-acls-samba4.so
 lib/samba/private/libnpa-tstream-samba4.so
 lib/samba/private/libnss-info-samba4.so
-lib/samba/private/libntdb.so.1
-lib/samba/private/libntdb.so.1.0
 lib/samba/private/libpopt-samba3-samba4.so
 lib/samba/private/libprinting-migrate-samba4.so
 lib/samba/private/libpyldb-util.so.1
-lib/samba/private/libpyldb-util.so.1.1.20
+lib/samba/private/libpyldb-util.so.1.1.21
 lib/samba/private/libpytalloc-util.so.2
-lib/samba/private/libpytalloc-util.so.2.1.2
+lib/samba/private/libpytalloc-util.so.2.1.3
 lib/samba/private/libreplace-samba4.so
 lib/samba/private/libsamba-cluster-support-samba4.so
 lib/samba/private/libsamba-debug-samba4.so
@@ -697,6 +629,7 @@ lib/samba/private/libsamba-sockets-samba4.so
 lib/samba/private/libsamba3-util-samba4.so
 lib/samba/private/libsamdb-common-samba4.so
 lib/samba/private/libsecrets3-samba4.so
+lib/samba/private/libserver-id-db-samba4.so
 lib/samba/private/libserver-role-samba4.so
 lib/samba/private/libshares-samba4.so
 lib/samba/private/libsmb-transport-samba4.so
@@ -707,18 +640,18 @@ ${PLIST.ldap}lib/samba/private/libsmbldaphelper-samba4.so
 lib/samba/private/libsmbpasswdparser-samba4.so
 lib/samba/private/libsmbregistry-samba4.so
 lib/samba/private/libsocket-blocking-samba4.so
-lib/samba/private/libsubunit-samba4.so
+lib/samba/private/libsys-rw-samba4.so
+lib/samba/private/libtalloc-report-samba4.so
 lib/samba/private/libtalloc.so.2
-lib/samba/private/libtalloc.so.2.1.2
-lib/samba/private/libtdb-compat-samba4.so
+lib/samba/private/libtalloc.so.2.1.3
 lib/samba/private/libtdb-wrap-samba4.so
 lib/samba/private/libtdb.so.1
-lib/samba/private/libtdb.so.1.3.4
+lib/samba/private/libtdb.so.1.3.7
 lib/samba/private/libtevent.so.0
-lib/samba/private/libtevent.so.0.9.24
+lib/samba/private/libtevent.so.0.9.25
+lib/samba/private/libtime-basic-samba4.so
 lib/samba/private/libtrusts-util-samba4.so
 lib/samba/private/libutil-cmdline-samba4.so
-lib/samba/private/libutil-ntdb-samba4.so
 lib/samba/private/libutil-reg-samba4.so
 lib/samba/private/libutil-setid-samba4.so
 lib/samba/private/libutil-tdb-samba4.so
@@ -753,10 +686,12 @@ lib/samba/vfs/recycle.so
 lib/samba/vfs/scannedonly.so
 lib/samba/vfs/shadow_copy.so
 lib/samba/vfs/shadow_copy2.so
+lib/samba/vfs/shell_snap.so
 lib/samba/vfs/smb_traffic_analyzer.so
 lib/samba/vfs/streams_depot.so
 lib/samba/vfs/streams_xattr.so
 lib/samba/vfs/time_audit.so
+lib/samba/vfs/unityed_media.so
 lib/samba/vfs/worm.so
 lib/samba/vfs/xattr_tdb.so
 lib/winbind_krb5_locator.so
@@ -790,7 +725,3 @@ ${PLIST.pam}share/examples/samba/pam_smbpass/password-migration
 ${PLIST.pam}share/examples/samba/pam_smbpass/password-sync
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
-share/samba/codepages/lowcase.dat
-share/samba/codepages/upcase.dat
-share/samba/codepages/valid.dat
-@pkgdir etc/samba
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 8e570ffe914..e94cc4563af 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.3 2015/06/26 16:09:49 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2015/09/28 17:37:04 ryoon Exp $
 
-SHA1 (samba-4.2.1.tar.gz) = f5d0471efc459898344866b5bc518c80ce67e8d5
-RMD160 (samba-4.2.1.tar.gz) = 539f915c0c80cf67b8a73b6d7924804609801fb8
-Size (samba-4.2.1.tar.gz) = 20701467 bytes
+SHA1 (samba-4.3.0.tar.gz) = 0ad147d8570bf11715156c654942216b7ac77869
+RMD160 (samba-4.3.0.tar.gz) = ac416fa1bc45b8bc12ba9e567412aa7e0f003d6f
+Size (samba-4.3.0.tar.gz) = 20417699 bytes
 SHA1 (patch-buildtools_wafsamba_wscript) = 5604936a825675647157331df2333f4237c611f5
 SHA1 (patch-lib_nss__wrapper_nss__wrapper.c) = c692fa33ec17ed4f1dc1e40c1fadf7846d976824
 SHA1 (patch-lib_nss__wrapper_wscript) = 1ce37974f93e791c9e0b1bdc34d26890583fdbfb
+SHA1 (patch-lib_param_loadparm.h) = d1c9df37bb9969d2788dd70e613067df6bb64f26
 SHA1 (patch-lib_replace_wscript) = b6a042c2c13c0be78d7b64c0ce2efdaf4bbb1f3b
 SHA1 (patch-lib_tevent_wscript) = 9617b9e40d2ffc8d6297390a20ba9bd44147d669
 SHA1 (patch-nsswitch_wscript__build) = e8a6251e031ffa13d6347fade8891f7afd65d3eb
+SHA1 (patch-source3_script_tests_test__smbclient__s3.sh) = f55b02e266dc82cabf32723b66b5759e76213ab5
 SHA1 (patch-source4_scripting_wsript_build) = 6053076427835ac4fe97d93b2ff67d2caccc71f4
-SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 3448ae91a57123ac820d71892851b165477bc499
+SHA1 (patch-testprogs_blackbox_dbcheck-oldrelease.sh) = 0bd2067b77a1db93e3cb5d80964a7be2b06802ff
diff --git a/net/samba4/patches/patch-lib_param_loadparm.h b/net/samba4/patches/patch-lib_param_loadparm.h
new file mode 100644
index 00000000000..e736952fcbc
--- /dev/null
+++ b/net/samba4/patches/patch-lib_param_loadparm.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_param_loadparm.h,v 1.1 2015/09/28 17:37:04 ryoon Exp $
+
+* Fix NetBSD build.
+
+--- lib/param/loadparm.h.orig	2015-07-21 09:47:48.000000000 +0000
++++ lib/param/loadparm.h
+@@ -31,6 +31,9 @@
+ #define _LOADPARM_H
+ 
+ #include <talloc.h>
++#if defined(__NetBSD__)
++#include <sys/time.h>
++#endif
+ #include "../lib/util/parmlist.h"
+ 
+ /* the following are used by loadparm for option lists */
diff --git a/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh b/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh
new file mode 100644
index 00000000000..6ea1f375b02
--- /dev/null
+++ b/net/samba4/patches/patch-source3_script_tests_test__smbclient__s3.sh
@@ -0,0 +1,13 @@
+$NetBSD: patch-source3_script_tests_test__smbclient__s3.sh,v 1.1 2015/09/28 17:37:04 ryoon Exp $
+
+--- source3/script/tests/test_smbclient_s3.sh.orig	2015-07-21 09:47:49.000000000 +0000
++++ source3/script/tests/test_smbclient_s3.sh
+@@ -889,7 +889,7 @@ EOF
+ 
+     echo "$out" | grep 'NT_STATUS'
+     ret=$?
+-    if [ $ret == 0 ] ; then
++    if [ $ret = 0 ] ; then
+ 	echo "$out"
+ 	echo "failed - NT_STATUS_XXXX listing \\manglenames_share\\FF4GBY~Q"
+ 	false
diff --git a/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh b/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh
index d5b33f00f0f..96a5fbf2ee3 100644
--- a/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh
+++ b/net/samba4/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh
@@ -1,16 +1,16 @@
-$NetBSD: patch-testprogs_blackbox_dbcheck-oldrelease.sh,v 1.2 2015/06/26 16:09:49 jperkin Exp $
+$NetBSD: patch-testprogs_blackbox_dbcheck-oldrelease.sh,v 1.3 2015/09/28 17:37:04 ryoon Exp $
 
 ERROR: [check-portability.awk] 
 
---- testprogs/blackbox/dbcheck-oldrelease.sh.orig	2014-10-01 09:16:22.000000000 +0000
+--- testprogs/blackbox/dbcheck-oldrelease.sh.orig	2015-09-08 13:45:25.000000000 +0000
 +++ testprogs/blackbox/dbcheck-oldrelease.sh
-@@ -178,19 +178,19 @@ dbcheck_clean2() {
+@@ -208,19 +208,19 @@ dbcheck_clean2() {
  }
  
  referenceprovision() {
 -    if [ x$RELEASE == x"release-4-0-0" ]; then
 +    if [ x$RELEASE = x"release-4-0-0" ]; then
-         $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1
+         $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003
      fi
  }