23004781 Update Samba to version 4.4.2
23284150 samba doesn't package on the 99 nightly
23088978 problem in UTILITY/SAMBA
23088910 problem in UTILITY/SAMBA
23088950 problem in UTILITY/SAMBA
23088868 problem in UTILITY/SAMBA
23088773 problem in UTILITY/SAMBA
23088523 problem in UTILITY/SAMBA
23074375 problem in UTILITY/SAMBA
--- a/components/samba/Makefile Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/Makefile Mon May 16 06:32:39 2016 -0700
@@ -27,7 +27,7 @@
# Samba does not work properly on i386 when built by studio with -xO3+.
ifeq ($(MACH), sparc)
-# standard options
+WAFOPT1 = -j64
else
# Both SPRO_VROOT and studio_OPT vars must use the override keyword otherwise
# Userland will ignore it and use its default value.
@@ -37,10 +37,13 @@
override studio_OPT = -xO1
endif
+# parfait seems to spin on us
+export PARFAIT_BUILD=no
+
COMPONENT_NAME= samba
-COMPONENT_VERSION= 4.1.23
-TPNO= 27625
-COMPONENT_ARCHIVE_HASH= sha256:2c33291bf5454ba05e8b5fdc2c57ee010cf44d077e57a307ad2e7be9fac27cd2
+COMPONENT_VERSION= 4.4.2
+TPNO= 27969
+COMPONENT_ARCHIVE_HASH= sha256:eaecd41a85ebb9507b8db9856ada2a949376e9d53cf75664b5493658f6e5926a
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://www.samba.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -67,43 +70,16 @@
# directory to search for "include" in samba.p5m
PKG_OPTIONS += -I $(COMPONENT_DIR)
+# Set the pkg... path to search files in ./Solaris/ dir (mainly the SMF manifests are there)
+PKG_PROTO_DIRS += $(COMPONENT_DIR)
# Oracle HSM is not supported on 12.0 yet but the libsam.so target should rather be commented out than removed
-# (note) change compiler bitness here when Samba became 64bits
#$(PROTO_DIR)/opt/SUNWsamfs/lib/$(MACH64)/libsam.so: Solaris/libsam.c
# $(MKDIR) $(@D)
# $(CC.studio.64) -m64 -G $(studio_PIC) -hlibsam.so Solaris/libsam.c \
# -I$(COMPONENT_DIR)/Solaris/include \
# -o $@
-# Samba 4 needs extension of krb5 API, which is implemented in a Samba private
-# library libgssapi_krb5.so. Once MIT Kerberos is updated in Solaris 12 to
-# version 1.9 or higher this extension will no longer be needed
-# see Bug 18308792 for details.
-$(PROTO_DIR)/usr/lib/samba/libgssapi_krb5.so: Solaris/dummy.c
- $(MKDIR) $(@D)
- $(CC.studio.32) -m32 -G $(studio_PIC) -hlibgssapi_krb5.so Solaris/dummy.c \
- -R/usr/lib/gss \
- -M$(COMPONENT_DIR)/Solaris/gssapi_krb5-mapfile-vers \
- -o $@
-
-$(PROTO_DIR)/usr/lib/samba/$(MACH64)/libgssapi_krb5.so: Solaris/dummy.c
- $(MKDIR) $(@D)
- $(CC.studio.64) -m64 -G $(studio_PIC) -hlibgssapi_krb5.so Solaris/dummy.c \
- -R/usr/lib/gss/$(MACH64) \
- -M$(COMPONENT_DIR)/Solaris/gssapi_krb5-mapfile-vers \
- -o $@
-
-$(PROTO_DIR)/usr/include/gssapi/gssapi_krb5.h: Solaris/gssapi_krb5.h
- $(MKDIR) $(@D)
- $(CP) Solaris/gssapi_krb5.h $@
-
-$(PROTO_DIR)/usr/bin/krb5-config: Solaris/krb5-config
- $(MKDIR) $(@D)
- sed -e "s#_SAMBA_BUILD_PROTO_#$(PROTO_DIR)#" \
- $(COMPONENT_DIR)/Solaris/krb5-config > $@
- $(CHMOD) 755 $@
-
# Compiler settings
CFLAGS.studio += $(studio_C99_ENABLE)
@@ -142,15 +118,15 @@
CONFIGURE_OPTIONS += --with-logfilebase=/var/samba/log
CONFIGURE_OPTIONS += --sharedstatedir=/var/samba/com
CONFIGURE_OPTIONS += --libexecdir=/usr/lib/samba
-
+# Whenever getfacl is found HAVE_SOLARIS_UNIXWARE_ACLS is set and
+# vfs_solarisacl is placed into the list of the static modules
CONFIGURE_OPTIONS += --with-static-modules=
$(BUILD_DIR_SMB)/.configured: CONFIGURE_OPTIONS += \
- --with-shared-modules=vfs_worm,vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex,vfs_solarisacl
+ --with-shared-modules=vfs_worm,vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
$(BUILD_DIR_WINB)/.configured: CONFIGURE_OPTIONS += \
--with-shared-modules=idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
CONFIGURE_OPTIONS += --with-ads
CONFIGURE_OPTIONS += --with-winbind
-CONFIGURE_OPTIONS += --enable-nss-wrapper
CONFIGURE_OPTIONS += --with-ldap
CONFIGURE_OPTIONS += --with-libldap=ldap_r
CONFIGURE_OPTIONS += --with-system-mitkrb5
@@ -177,6 +153,7 @@
CONFIGURE_ENV.64 += MACH64="$(MACH64)"
CONFIGURE_ENV += LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)"
CONFIGURE_ENV += CUPS_CONFIG=$(USRBINDIR)/cups-config
+CONFIGURE_ENV += INSTALL="$(INSTALL)"
# Propagation of smb.conf with default settings.
$(PROTO_DIR)/etc/samba/smb.conf-example: $(BUILD_DIR_SMB)/.built
@@ -194,8 +171,7 @@
# enough.
# Prepare build dir for Samba + Winbind.
-$(BUILD_DIR_SMB)/.BDprep: $(SOURCE_DIR)/.prep $(PROTO_DIR)/usr/include/gssapi/gssapi_krb5.h \
- $(PROTO_DIR)/usr/bin/krb5-config
+$(BUILD_DIR_SMB)/.BDprep: $(SOURCE_DIR)/.prep
# re-create configure dir
$(MKDIR) $(@D)
# Clone SOURCE_DIR
@@ -205,7 +181,7 @@
$(TOUCH) $@
# Configure of Samba + Winbind.
-$(BUILD_DIR_SMB)/.configured: $(BUILD_DIR_SMB)/.BDprep $(PROTO_DIR)/usr/lib/samba/$(MACH64)/libgssapi_krb5.so
+$(BUILD_DIR_SMB)/.configured: $(BUILD_DIR_SMB)/.BDprep
(cd $(@D) ; $(ENV) $(WAF_PATH) $(CONFIGURE_ENV) $(CONFIGURE_ENV.$(BITS)) \
waf configure $(WAFOPT1) $(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS.$(BITS)) )
$(TOUCH) $@
@@ -231,8 +207,7 @@
$(TOUCH) $@
# Prepare build dir for Winbind (without Samba) for different bitness.
-$(BUILD_DIR_WINB)/.BDprep: $(SOURCE_DIR)/.prep $(PROTO_DIR)/usr/include/gssapi/gssapi_krb5.h \
- $(PROTO_DIR)/usr/bin/krb5-config
+$(BUILD_DIR_WINB)/.BDprep: $(SOURCE_DIR)/.prep
# re-create configure dir
$(MKDIR) $(@D)
# Clone SOURCE_DIR
@@ -242,13 +217,13 @@
$(TOUCH) $@
# Configure of Winbind (without Samba) for different bitness.
-$(BUILD_DIR_WINB)/.configured: $(BUILD_DIR_WINB)/.BDprep $(PROTO_DIR)/usr/lib/samba/libgssapi_krb5.so
+$(BUILD_DIR_WINB)/.configured: $(BUILD_DIR_WINB)/.BDprep
(cd $(@D) ; $(ENV) $(WAF_PATH) $(CONFIGURE_ENV) $(CONFIGURE_ENV.$(BITS)) \
waf configure $(WAFOPT1) $(CONFIGURE_OPTIONS) $(CONFIGURE_OPTIONS.$(BITS)) )
$(TOUCH) $@
# Build of Winbind (without Samba) for different bitness.
-WB_TARGETS = --targets=nss_winbind,pamsmbpass,pamwinbind
+WB_TARGETS = --targets=nss_winbind,pamwinbind
$(BUILD_DIR_WINB)/.built: $(BUILD_DIR_WINB)/.configured
(cd $(@D) ; $(ENV) $(WAF_PATH) LD_EXEC_OPTIONS="$(LD_EXEC_OPTIONS)" waf build $(WAFOPT1) \
$(WB_TARGETS) )
@@ -279,6 +254,16 @@
include $(WS_MAKE_RULES)/shared-targets.mk
install: $(BUILD_DIR_SMB)/.installed $(BUILD_DIR_WINB)/.installed
+ # set version of python interpreter for pkglint
+ find $(PROTO_DIR) -name \*.py -print0 | \
+ while IFS= read -r -d $$'\0' file; do \
+ /usr/bin/sed -e '1,1s&^#!.*python[:blank:]\{0,\}$$&#!$(PYTHON.$(PYTHON_VERSION))&' \
+ $$file > $$file.pyverset ; \
+ done
+ find $(PROTO_DIR) -name \*.py.pyverset -print0 | \
+ while IFS= read -r -d $$'\0' file; do \
+ $(MV) $$file `echo $$file | sed -e 's/[.]pyverset$$//'` ; \
+ done
test: $(NO_TESTS)
@@ -288,20 +273,18 @@
$(RM) -r $(BUILD_DIR)
REQUIRED_PACKAGES += library/file-monitor/gamin
+REQUIRED_PACKAGES += library/libarchive
REQUIRED_PACKAGES += library/openldap
REQUIRED_PACKAGES += library/print/cups-libs
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += runtime/python-27
-REQUIRED_PACKAGES += service/security/kerberos-5
+REQUIRED_PACKAGES += security/kerberos-5
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/libdbus
REQUIRED_PACKAGES += system/library/security/crypto
-REQUIRED_PACKAGES += system/library/security/gss
-REQUIRED_PACKAGES += system/library/security/libsasl
-REQUIRED_PACKAGES += system/library/security/libsasl2
-REQUIRED_PACKAGES += system/linker
REQUIRED_PACKAGES += system/network
REQUIRED_PACKAGES += system/network/avahi
REQUIRED_PACKAGES += system/network/ldap/openldap
--- a/components/samba/Solaris/dummy.c Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* dummy .c file */
-/* see https://bugzilla.samba.org/show_bug.cgi?id=10630 */
-/* Metze fixed it for Samba 4.2 (Bug 11073) by patching waf directly */
--- a/components/samba/Solaris/gssapi_krb5-mapfile-vers Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# MAPFILE HEADER START
-#
-# WARNING: STOP NOW. DO NOT MODIFY THIS FILE.
-# Object versioning must comply with the rules detailed in
-#
-# usr/src/lib/README.mapfiles
-#
-# You should not be making modifications here until you've read the most current
-# copy of that file. If you need help, contact a gatekeeper for guidance.
-#
-# MAPFILE HEADER END
-#
-
-$mapfile_version 2
-
-STUB_OBJECT;
-
-#
-# This is a mapfile that defines a filter for mech_krb5 so that
-# a new public library can be made to access certain functions in
-# the private library.
-#
-# New functions can be added as needed.
-#
-
-SYMBOL_VERSION SUNWprivate {
- global:
-
-# gssapi_krb5.h private to Samba
- gss_krb5_import_cred { TYPE = FUNCTION; FILTER = mech_krb5.so.1; };
-
-# lucid context required by Samba4 (filter to gss/mech_krb5.so.1)
- gss_krb5_export_lucid_sec_context { TYPE = FUNCTION; FILTER = mech_krb5.so.1; };
- gss_krb5_free_lucid_sec_context { TYPE = FUNCTION; FILTER = mech_krb5.so.1; };
- gss_krb5_set_allowable_enctypes { TYPE = FUNCTION; FILTER = mech_krb5.so.1; };
-
- gss_krb5_copy_ccache { TYPE = FUNCTION; FILTER = mech_krb5.so.1; };
- gsskrb5_extract_authz_data_from_sec_context { TYPE = FUNCTION; FILTER = mech_krb5.so.1; };
-
- local:
- *;
-};
--- a/components/samba/Solaris/gssapi_krb5.h Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved
- */
-/*
- * This file is a local copy of:
- * ON:usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_krb5.h
- * which is not published as the public API in /usr/include/gssapi/
- * It is extended by gss_krb5_import_cred() entry needed for Samba4
- * build.
- */
-/*
- * Copyright 1993 by OpenVision Technologies, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose. It is provided "as is" without express or implied warranty.
- *
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _GSSAPI_KRB5_H_
-#define _GSSAPI_KRB5_H_
-
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_ext.h>
-#include <krb5.h>
-
-/* SUNW15resync */
-#ifndef GSS_DLLIMP
-#define GSS_DLLIMP
-#endif
-
-/* C++ friendlyness */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Reserved static storage for GSS_oids. See rfc 1964 for more details. */
-
-/* 2.1.1. Kerberos Principal Name Form: */
-GSS_DLLIMP extern const gss_OID_desc * const GSS_KRB5_NT_PRINCIPAL_NAME;
-/* This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * krb5(2) krb5_name(1)}. The recommended symbolic name for this type
- * is "GSS_KRB5_NT_PRINCIPAL_NAME". */
-
-/* 2.1.2. Host-Based Service Name Form */
-#define GSS_KRB5_NT_HOSTBASED_SERVICE_NAME GSS_C_NT_HOSTBASED_SERVICE
-/* This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) service_name(4)}. The previously recommended symbolic
- * name for this type is "GSS_KRB5_NT_HOSTBASED_SERVICE_NAME". The
- * currently preferred symbolic name for this type is
- * "GSS_C_NT_HOSTBASED_SERVICE". */
-
-/* 2.2.1. User Name Form */
-#define GSS_KRB5_NT_USER_NAME GSS_C_NT_USER_NAME
-/* This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) user_name(1)}. The recommended symbolic name for this
- * type is "GSS_KRB5_NT_USER_NAME". */
-
-/* 2.2.2. Machine UID Form */
-#define GSS_KRB5_NT_MACHINE_UID_NAME GSS_C_NT_MACHINE_UID_NAME
-/* This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) machine_uid_name(2)}. The recommended symbolic name for
- * this type is "GSS_KRB5_NT_MACHINE_UID_NAME". */
-
-/* 2.2.3. String UID Form */
-#define GSS_KRB5_NT_STRING_UID_NAME GSS_C_NT_STRING_UID_NAME
-/* This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) string_uid_name(3)}. The recommended symbolic name for
- * this type is "GSS_KRB5_NT_STRING_UID_NAME". */
-
-GSS_DLLIMP extern const gss_OID_desc * const gss_mech_krb5;
-GSS_DLLIMP extern const gss_OID_desc * const gss_mech_krb5_old;
-GSS_DLLIMP extern const gss_OID_desc * const gss_mech_krb5_wrong;
-GSS_DLLIMP extern const gss_OID_set_desc * const gss_mech_set_krb5;
-GSS_DLLIMP extern const gss_OID_set_desc * const gss_mech_set_krb5_old;
-GSS_DLLIMP extern const gss_OID_set_desc * const gss_mech_set_krb5_both;
-
-GSS_DLLIMP extern const gss_OID_desc * const gss_nt_krb5_name;
-GSS_DLLIMP extern const gss_OID_desc * const gss_nt_krb5_principal;
-
-GSS_DLLIMP extern const gss_OID_desc krb5_gss_oid_array[];
-
-#define gss_krb5_nt_general_name gss_nt_krb5_name
-#define gss_krb5_nt_principal gss_nt_krb5_principal
-#define gss_krb5_nt_service_name gss_nt_service_name
-#define gss_krb5_nt_user_name gss_nt_user_name
-#define gss_krb5_nt_machine_uid_name gss_nt_machine_uid_name
-#define gss_krb5_nt_string_uid_name gss_nt_string_uid_name
-
-
-#if defined(_WIN32)
-typedef unsigned __int64 gss_uint64;
-#else /*windows*/
-
-#ifdef _KERNEL
-#include <sys/inttypes.h>
-#else /* _KERNEL */
-#include <inttypes.h>
-#endif /* _KERNEL */
-
-typedef uint64_t gss_uint64;
-#endif
-
-
-typedef struct gss_krb5_lucid_key {
- OM_uint32 type; /* key encryption type */
- OM_uint32 length; /* length of key data */
- void * data; /* actual key data */
-} gss_krb5_lucid_key_t;
-
-typedef struct gss_krb5_rfc1964_keydata {
- OM_uint32 sign_alg; /* signing algorthm */
- OM_uint32 seal_alg; /* seal/encrypt algorthm */
- gss_krb5_lucid_key_t ctx_key;
- /* Context key
- (Kerberos session key or subkey) */
-} gss_krb5_rfc1964_keydata_t;
-
-typedef struct gss_krb5_cfx_keydata {
- OM_uint32 have_acceptor_subkey;
- /* 1 if there is an acceptor_subkey
- present, 0 otherwise */
- gss_krb5_lucid_key_t ctx_key;
- /* Context key
- (Kerberos session key or subkey) */
- gss_krb5_lucid_key_t acceptor_subkey;
- /* acceptor-asserted subkey or
- 0's if no acceptor subkey */
-} gss_krb5_cfx_keydata_t;
-
-typedef struct gss_krb5_lucid_context_v1 {
- OM_uint32 version; /* Structure version number (1)
- MUST be at beginning of struct! */
- OM_uint32 initiate; /* Are we the initiator? */
- OM_uint32 endtime; /* expiration time of context */
- gss_uint64 send_seq; /* sender sequence number */
- gss_uint64 recv_seq; /* receive sequence number */
- OM_uint32 protocol; /* 0: rfc1964,
- 1: draft-ietf-krb-wg-gssapi-cfx-07 */
- /*
- * if (protocol == 0) rfc1964_kd should be used
- * and cfx_kd contents are invalid and should be zero
- * if (protocol == 1) cfx_kd should be used
- * and rfc1964_kd contents are invalid and should be zero
- */
- gss_krb5_rfc1964_keydata_t rfc1964_kd;
- gss_krb5_cfx_keydata_t cfx_kd;
-} gss_krb5_lucid_context_v1_t;
-
-/*
- * Mask for determining the returned structure version.
- * See example below for usage.
- */
-typedef struct gss_krb5_lucid_context_version {
- OM_uint32 version; /* Structure version number */
-} gss_krb5_lucid_context_version_t;
-
-
-
-
-/* Alias for Heimdal compat. */
-#define gsskrb5_register_acceptor_identity krb5_gss_register_acceptor_identity
-
-OM_uint32 KRB5_CALLCONV krb5_gss_register_acceptor_identity(const char *);
-
-OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache
- (OM_uint32 *minor_status,
- gss_cred_id_t cred_handle,
- krb5_ccache out_ccache);
-
-OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name
- (OM_uint32 *minor_status, const char *name,
- const char **out_name);
-
-/*
- * gss_krb5_set_allowable_enctypes
- *
- * This function may be called by a context initiator after calling
- * gss_acquire_cred(), but before calling gss_init_sec_context(),
- * to restrict the set of enctypes which will be negotiated during
- * context establishment to those in the provided array.
- *
- * 'cred' must be a valid credential handle obtained via
- * gss_acquire_cred(). It may not be GSS_C_NO_CREDENTIAL.
- * gss_acquire_cred() may have been called to get a handle to
- * the default credential.
- *
- * The purpose of this function is to limit the keys that may
- * be exported via gss_krb5_export_lucid_sec_context(); thus it
- * should limit the enctypes of all keys that will be needed
- * after the security context has been established.
- * (i.e. context establishment may use a session key with a
- * stronger enctype than in the provided array, however a
- * subkey must be established within the enctype limits
- * established by this function.)
- *
- */
-OM_uint32 KRB5_CALLCONV
-gss_krb5_set_allowable_enctypes(OM_uint32 *minor_status,
- gss_cred_id_t cred,
- OM_uint32 num_ktypes,
- krb5_enctype *ktypes);
-
-/*
- * Returns a non-opaque (lucid) version of the internal context
- * information.
- *
- * Note that context_handle must not be used again by the caller
- * after this call. The GSS implementation is free to release any
- * resources associated with the original context. It is up to the
- * GSS implementation whether it returns pointers to existing data,
- * or copies of the data. The caller should treat the returned
- * lucid context as read-only.
- *
- * The caller must call gss_krb5_free_lucid_context() to free
- * the context and allocated resources when it is finished with it.
- *
- * 'version' is an integer indicating the highest version of lucid
- * context understood by the caller. The highest version
- * understood by both the caller and the GSS implementation must
- * be returned. The caller can determine which version of the
- * structure was actually returned by examining the version field
- * of the returned structure. gss_krb5_lucid_context_version_t
- * may be used as a mask to examine the returned structure version.
- *
- * If there are no common versions, an error should be returned.
- * (XXX Need error definition(s))
- *
- * For example:
- * void *return_ctx;
- * gss_krb5_lucid_context_v1_t *ctx;
- * OM_uint32 min_stat, maj_stat;
- * OM_uint32 vers;
- * gss_ctx_id_t *ctx_handle;
- *
- * maj_stat = gss_krb5_export_lucid_sec_context(&min_stat,
- * ctx_handle, 1, &return_ctx);
- * // Verify success
- *
- * vers = ((gss_krb5_lucid_context_version_t *)return_ctx)->version;
- * switch (vers) {
- * case 1:
- * ctx = (gss_krb5_lucid_context_v1_t *) return_ctx;
- * break;
- * default:
- * // Error, unknown version returned
- * break;
- * }
- *
- */
-
-OM_uint32 KRB5_CALLCONV
-gss_krb5_export_lucid_sec_context(OM_uint32 *minor_status,
- gss_ctx_id_t *context_handle,
- OM_uint32 version,
- void **kctx);
-
-/*
- * Frees the allocated storage associated with an
- * exported struct gss_krb5_lucid_context.
- */
-OM_uint32 KRB5_CALLCONV
-gss_krb5_free_lucid_sec_context(OM_uint32 *minor_status,
- void *kctx);
-
-
-OM_uint32 KRB5_CALLCONV
-gsskrb5_extract_authz_data_from_sec_context(OM_uint32 *minor_status,
- const gss_ctx_id_t context_handle,
- int ad_type,
- gss_buffer_t ad_data);
-
-OM_uint32 KRB5_CALLCONV
-gss_krb5_set_cred_rcache(OM_uint32 *minor_status,
- gss_cred_id_t cred,
- krb5_rcache rcache);
-
-OM_uint32 KRB5_CALLCONV
-gsskrb5_extract_authtime_from_sec_context(OM_uint32 *, gss_ctx_id_t, krb5_timestamp *);
-
-/*
- * gss_krb5_import_cred contains bare minimum functionality to make Samba 4
- * work. It does not conform to API MIT Kerberos v5 1.9(+) specification.
- */
-OM_uint32 KRB5_CALLCONV
-gss_krb5_import_cred(OM_uint32 *minor_status,
- krb5_ccache id,
- krb5_principal keytab_principal,
- krb5_keytab keytab,
- gss_cred_id_t *cred);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _GSSAPI_KRB5_H_ */
--- a/components/samba/Solaris/krb5-config Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-#
-# This is the local copy of krb5-config to build the Samba4 in comp. dir.
-#
-# Copyright 2001, 2002, 2003 by the Massachusetts Institute of Technology.
-# All Rights Reserved.
-#
-# Export of this software from the United States of America may
-# require a specific license from the United States Government.
-# It is the responsibility of any person or organization contemplating
-# export to obtain such a license before exporting.
-#
-# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-# distribute this software and its documentation for any purpose and
-# without fee is hereby granted, provided that the above copyright
-# notice appear in all copies and that both that copyright notice and
-# this permission notice appear in supporting documentation, and that
-# the name of M.I.T. not be used in advertising or publicity pertaining
-# to distribution of the software without specific, written prior
-# permission. Furthermore if you modify this software you must label
-# your software as modified software and not distribute it in such a
-# fashion that it might be confused with the original M.I.T. software.
-# M.I.T. makes no representations about the suitability of
-# this software for any purpose. It is provided "as is" without express
-# or implied warranty.
-#
-
-# Configurable parameters set by autoconf
-version_string="Solaris Kerberos (based on MIT Kerberos 5 release 1.8.3) extended by gss_krb5_import_cred() partially to MIT Kerberos 5 release 1.9.0"
-
-prefix=/usr
-exec_prefix=${prefix}
-includedir=${prefix}/include/kerberosv5
-gssapiincludedir=${prefix}/include
-libdir=${exec_prefix}/lib
-CC_LINK='$(PURE) $(CC) $(CFLAGS) $(LDFLAGS)'
-#KRB4_LIB=-lkrb4
-#DES425_LIB=-ldes425
-KDB5_DB_LIB=
-LDFLAGS=''
-PTHREAD_CFLAGS=''
-
-#LIBS='-lresolv -lsocket -lnsl '
-GEN_LIB=
-
-# Defaults for program
-library=krb5
-
-# Some constants
-vendor_string="Oracle"
-
-# Process arguments
-# Yes, we are sloppy, library specifications can come before options
-while test $# != 0; do
- case $1 in
- --all)
- do_all=1
- ;;
- --cflags)
- do_cflags=1
- ;;
- --deps)
- do_deps=1
- ;;
- --exec-prefix)
- do_exec_prefix=1
- ;;
- --help)
- do_help=1
- ;;
- --libs)
- do_libs=1
- ;;
- --prefix)
- do_prefix=1
- ;;
- --vendor)
- do_vendor=1
- ;;
- --version)
- do_version=1
- ;;
- krb5)
- library=krb5
- ;;
- gssapi)
- library=gssapi
- ;;
- *)
- echo "$0: Unknown option \`$1' -- use \`--help' for usage"
- exit 1
- esac
- shift
-done
-
-# If required options - provide help
-if test -z "$do_all" -a -z "$do_version" -a -z "$do_vendor" -a -z "$do_prefix" -a -z "$do_vendor" -a -z "$do_exec_prefix" -a -z "$do_cflags" -a -z "$do_libs"; then
- do_help=1
-fi
-
-if test -n "$do_help"; then
- echo "Usage: $0 [OPTIONS] [LIBRARIES]"
- echo "Options:"
- echo " [--help] Help"
- echo " [--all] Display version, vendor, and various values"
- echo " [--version] Version information"
- echo " [--vendor] Vendor information"
- echo " [--prefix] Kerberos installed prefix"
- echo " [--exec-prefix] Kerberos installed exec_prefix"
- echo " [--cflags] Compile time CFLAGS"
- echo " [--libs] List libraries required to link [LIBRARIES]"
- echo "Libraries:"
- echo " krb5 Kerberos 5 application"
- echo " gssapi GSSAPI application"
-
- exit 0
-fi
-
-if test -n "$do_all"; then
- all_exit=
- do_version=1
- do_prefix=1
- do_exec_prefix=1
- do_vendor=1
- title_version="Version: "
- title_prefix="Prefix: "
- title_exec_prefix="Exec_prefix: "
- title_vendor="Vendor: "
-else
- all_exit="exit 0"
-fi
-
-if test -n "$do_version"; then
- echo "$title_version$version_string"
- $all_exit
-fi
-
-if test -n "$do_vendor"; then
- echo "$title_vendor$vendor_string"
- $all_exit
-fi
-
-if test -n "$do_prefix"; then
- echo "$title_prefix$prefix"
- $all_exit
-fi
-
-if test -n "$do_exec_prefix"; then
- echo "$title_exec_prefix$exec_prefix"
- $all_exit
-fi
-
-if test -n "$do_cflags"; then
- if test $library = 'gssapi'; then
- echo "-I${gssapiincludedir} -I_SAMBA_BUILD_PROTO_/usr/include"
- else
- echo "-I${includedir}"
- fi
-fi
-
-if test -n "$do_libs"; then
- # Ugly gross hack for our build tree
- lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
- -e 's/\$(PURE)//' \
- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-
- if test $library = 'gssapi'; then
- if test -n "$MACH64"; then
- lib_flags="-L_SAMBA_BUILD_PROTO_/usr/lib/samba/$MACH64 -R/usr/lib/samba/$MACH64 -R/usr/lib/gss/$MACH64 $lib_flags"
- else
- lib_flags="-L_SAMBA_BUILD_PROTO_/usr/lib/samba -R/usr/lib/samba -R/usr/lib/gss $lib_flags"
- fi
- lib_flags="$lib_flags -lgss -lgssapi_krb5"
- fi
-
- if test $library = 'krb5'; then
- lib_flags="$lib_flags -lkrb5 $LIBS $GEN_LIB"
- fi
-
- echo $lib_flags
-fi
-
-exit 0
--- a/components/samba/patches/0001-Use-R-linker-flag-instead-of-rpath-on-Solaris.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-Source: https://bugzilla.samba.org/show_bug.cgi?id=10112
-
-From ce4d161af8431fdb1f46a3d749d34afe968c1cee Mon Sep 17 00:00:00 2001
-From: Ralph Boehme <[email protected]>
-Date: Fri, 23 Aug 2013 19:43:21 +0200
-Subject: [PATCH] Use -R linker flag instead of -rpath on Solaris
-
----
- buildtools/wafadmin/Tools/gcc.py | 5 +++++
- buildtools/wafadmin/Tools/suncc.py | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/buildtools/wafadmin/Tools/gcc.py b/buildtools/wafadmin/Tools/gcc.py
-index 420b44f..c3b6b1b 100644
---- a/buildtools/wafadmin/Tools/gcc.py
-+++ b/buildtools/wafadmin/Tools/gcc.py
-@@ -114,6 +114,11 @@ def gcc_modifier_aix(conf):
- v['SHLIB_MARKER'] = ''
-
- @conftest
-+def gcc_modifier_sunos(conf):
-+ v = conf.env
-+ v['RPATH_ST']='-Wl,-R%s'
-+
-+@conftest
- def gcc_modifier_platform(conf):
- # * set configurations specific for a platform.
- # * the destination platform is detected automatically by looking at the macros the compiler predefines,
-diff --git a/buildtools/wafadmin/Tools/suncc.py b/buildtools/wafadmin/Tools/suncc.py
-index b1a2aad..45d4e69 100644
---- a/buildtools/wafadmin/Tools/suncc.py
-+++ b/buildtools/wafadmin/Tools/suncc.py
-@@ -48,6 +48,7 @@ def scc_common_flags(conf):
- v['STATICLIB_ST'] = '-l%s'
- v['STATICLIBPATH_ST'] = '-L%s'
- v['CCDEFINES_ST'] = '-D%s'
-+ v['RPATH_ST'] = '-R%s'
-
- v['SONAME_ST'] = '-Wl,-h -Wl,%s'
- v['SHLIB_MARKER'] = '-Bdynamic'
---
-1.8.3.4
-
--- a/components/samba/patches/GETGRENT.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=10487
-Common synopsis: Samba Winbind GETGRENT interface fails when any trusted domain is not available
-Bugs 16298670, 18191913
-
---- a/nsswitch/wb_common.c 2014-02-07 17:26:50.046234000 +0100
-+++ b/nsswitch/wb_common.c 2014-02-07 17:33:40.280002000 +0100
-@@ -462,7 +462,7 @@
-
- if (ret == 0) {
- /* Not ready for read yet... */
-- if (total_time >= 30) {
-+ if (total_time >= 1000) {
- /* Timeout */
- winbind_close_sock();
- return -1;
---- a/source3/winbindd/wb_next_grent.c 2014-02-07 17:27:14.079647000 +0100
-+++ b/source3/winbindd/wb_next_grent.c 2014-02-07 17:58:36.599520000 +0100
-@@ -103,18 +103,16 @@
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- /* Ignore errors here, just log it */
-- DEBUG(10, ("query_user_list for domain %s returned %s\n",
-+ DEBUG(3, ("query_user_list for domain %s returned: %s\n",
- state->gstate->domain->name,
- nt_errstr(status)));
-- return;
- }
- if (!NT_STATUS_IS_OK(result)) {
- /* Ignore errors here, just log it */
-- DEBUG(10, ("query_user_list for domain %s returned %s/%s\n",
-+ DEBUG(1, ("query_user_list for domain %s failed with: %s/%s\n",
- state->gstate->domain->name,
- nt_errstr(status), nt_errstr(result)));
-- tevent_req_nterror(req, result);
-- return;
-+ state->gstate->num_groups = 0;
- }
-
- state->gstate->num_groups = state->next_groups.num_principals;
--- a/components/samba/patches/MITkrb5-Solaris.patch Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/patches/MITkrb5-Solaris.patch Mon May 16 06:32:39 2016 -0700
@@ -1,10 +1,11 @@
-Source: Home brewed
-Fixes issues with differences of Solaris krb5 and MIT krb5
+Source: in-house
+Up-stream Acceptability: Patch only reflects customized paths to Krb5
+ in Solaris so it is not acceptable for community.
---- a/wscript_configure_system_mitkrb5 2013-06-13 09:21:03.000000000 +0000
-+++ samba-4.1.12/wscript_configure_system_mitkrb5 2015-01-09 00:06:46.004441833 +0000
-@@ -30,6 +30,8 @@
- krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI'])
+--- a/wscript_configure_system_mitkrb5 2016-03-30 03:20:20.000000000 -0700
++++ samba-4.4.1/wscript_configure_system_mitkrb5 2016-04-09 06:33:07.937842880 -0700
+@@ -34,6 +34,8 @@
+ krb5_define_syslib(conf, "com_err", conf.env['LIB_GSSAPI'])
if 'gssapi_krb5' in conf.env['LIB_GSSAPI']:
krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI'])
+ if 'gss' in conf.env['LIB_GSSAPI']:
@@ -12,29 +13,38 @@
vendor = conf.cmd_and_log("%(path)s --vendor" % dict(path=conf.env.KRB5_CONFIG), dict())
conf.env.KRB5_VENDOR = vendor.strip().lower()
-@@ -52,10 +53,10 @@
+@@ -56,18 +58,18 @@
- conf.check_cfg(args="--cflags --libs", package="com_err", uselib_store="com_err")
+ conf.CHECK_CFG(args="--cflags --libs", package="com_err", uselib_store="com_err")
conf.CHECK_FUNCS_IN('_et_list', 'com_err')
-conf.CHECK_HEADERS('com_err.h', lib='com_err')
+conf.CHECK_HEADERS('com_err.h', lib='com_err krb5')
conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
--conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h', lib='gssapi')
-+conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h', lib='gssapi krb5')
+ possible_gssapi_headers="gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapi/gssapi_oid.h"
+-conf.CHECK_HEADERS(possible_gssapi_headers, lib='gssapi')
++conf.CHECK_HEADERS(possible_gssapi_headers, lib='gssapi krb5')
conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto')
conf.CHECK_FUNCS_IN('des_set_key','crypto')
-@@ -80,7 +81,7 @@
+ conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
+ conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
+
+-conf.CHECK_HEADERS('profile.h')
++conf.CHECK_HEADERS('profile.h', lib='krb5')
+
+ if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5'):
+ have_gssapi=True
+@@ -87,7 +89,7 @@
gsskrb5_extract_authz_data_from_sec_context
gss_krb5_export_lucid_sec_context
gss_import_cred gss_export_cred
- ''', 'gssapi gssapi_krb5')
+ ''', 'gssapi gssapi_krb5 krb5')
+ conf.CHECK_VARIABLE('GSS_KRB5_CRED_NO_CI_FLAGS_X', headers=possible_gssapi_headers)
conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
conf.CHECK_FUNCS('''
- krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
-@@ -108,25 +109,25 @@
+@@ -122,27 +124,27 @@
conf.CHECK_DECLS('''krb5_get_credentials_for_user
krb5_auth_con_set_req_cksumtype''',
headers='krb5.h', always=True)
@@ -51,28 +61,31 @@
+conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h', lib='krb5')
+conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h', lib='krb5')
conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, headers='krb5.h')
--conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
-+conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h', lib='krb5',
- define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
--conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',
-+conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h', lib='krb5',
- define='HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK')
--conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h',
-+conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h', lib='krb5',
- define='HAVE_MAGIC_IN_KRB5_ADDRESS')
--conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h',
-+conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h', lib='krb5',
- define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS')
--conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
-+conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h', lib='krb5',
- define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
+ conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
+- define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
++ define='HAVE_KRB5_KEYTAB_ENTRY_KEY', lib='krb5')
+ conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',
+- define='HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK')
++ define='HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK', lib='krb5')
+ conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h',
+- define='HAVE_MAGIC_IN_KRB5_ADDRESS')
++ define='HAVE_MAGIC_IN_KRB5_ADDRESS', lib='krb5')
+ conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h',
+- define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS')
++ define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS', lib='krb5')
+ conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
+- define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
++ define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ', lib='krb5')
+ conf.CHECK_STRUCTURE_MEMBER('krb5_prompt', 'type', headers='krb5.h',
+- define='HAVE_KRB5_PROMPT_TYPE')
++ define='HAVE_KRB5_PROMPT_TYPE', lib='krb5')
-conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
+conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h', lib='krb5')
conf.CHECK_CODE('''
krb5_context ctx;
-@@ -134,7 +135,7 @@
+@@ -150,7 +152,7 @@
krb5_get_init_creds_opt_free(ctx, opt);
''',
'KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT',
@@ -81,7 +94,7 @@
msg="Checking whether krb5_get_init_creds_opt_free takes a context argument")
conf.CHECK_CODE('''
const krb5_data *pkdata;
-@@ -245,7 +246,7 @@
+@@ -261,7 +263,7 @@
conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
#include <krb5.h>''',
'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
--- a/components/samba/patches/addns-deps.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Source: Home brewed
-Fixes issues with differences of Solaris krb5 and MIT krb5
-
---- a/lib/addns/wscript_build 2013-06-13 09:21:02.000000000 +0000
-+++ samba-4.1.7/lib/addns/wscript_build 2014-06-10 11:09:25.474891447 +0000
-@@ -2,6 +2,6 @@
-
- bld.SAMBA_LIBRARY('addns',
- source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c dnsgss.c dnsmarshall.c error.c',
-- public_deps='dnshostsfile samba-util gssapi ndr resolv',
-+ public_deps='dnshostsfile samba-util gssapi krb5 ndr resolv',
- private_library=True,
- vars=locals())
--- a/components/samba/patches/auth_credentials.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Source: Home brewed
-Fixes issues with differences of Solaris krb5 and MIT krb5
-
---- a/auth/credentials/wscript_build 2013-06-13 09:21:02.000000000 +0000
-+++ samba-4.1.7/auth/credentials/wscript_build 2014-06-23 08:53:43.387234124 +0000
-@@ -5,7 +5,7 @@
- autoproto='credentials_proto.h',
- public_headers='credentials.h',
- pc_files='samba-credentials.pc',
-- deps='LIBCRYPTO errors events LIBCLI_AUTH samba-security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
-+ deps='LIBCRYPTO errors events LIBCLI_AUTH samba-security gssapi CREDENTIALS_SECRETS CREDENTIALS_KRB5',
- vnum='0.0.1'
- )
-
--- a/components/samba/patches/gse.c-gss_wrap_iov.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-Source: Home brewed
-Fixes issues with differences of Solaris krb5 and MIT krb5
-
---- a/source3/librpc/crypto/gse.c 2013-06-13 09:21:02.000000000 +0000
-+++ samba-4.1.7/source3/librpc/crypto/gse.c 2014-06-23 10:13:27.336923606 +0000
-@@ -543,6 +543,7 @@
- static size_t gse_get_signature_length(struct gse_context *gse_ctx,
- bool seal, size_t payload_size)
- {
-+#if defined(HAVE_GSS_WRAP_IOV)
- OM_uint32 gss_min, gss_maj;
- gss_iov_buffer_desc iov[2];
- int sealed;
-@@ -567,11 +568,15 @@
- }
-
- return iov[0].buffer.length;
-+#else
-+ return NT_STATUS_NOT_IMPLEMENTED;
-+#endif /* HAVE_GSS_WRAP_IOV */
- }
-
- static NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
- DATA_BLOB *data, DATA_BLOB *signature)
- {
-+#if defined(HAVE_GSS_WRAP_IOV)
- OM_uint32 gss_min, gss_maj;
- gss_iov_buffer_desc iov[2];
- int req_seal = 1; /* setting to 1 means we request sign+seal */
-@@ -619,11 +624,15 @@
-
- done:
- return status;
-+#else
-+ return NT_STATUS_NOT_IMPLEMENTED;
-+#endif /* HAVE_GSS_WRAP_IOV */
- }
-
- static NTSTATUS gse_unseal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
- DATA_BLOB *data, const DATA_BLOB *signature)
- {
-+#if defined(HAVE_GSS_WRAP_IOV)
- OM_uint32 gss_min, gss_maj;
- gss_iov_buffer_desc iov[2];
- int sealed;
-@@ -660,6 +669,9 @@
-
- done:
- return status;
-+#else
-+ return NT_STATUS_NOT_IMPLEMENTED;
-+#endif /* HAVE_GSS_WRAP_IOV */
- }
-
- static NTSTATUS gse_sign(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
--- a/components/samba/patches/ldap-libs.patch Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/patches/ldap-libs.patch Mon May 16 06:32:39 2016 -0700
@@ -1,12 +1,15 @@
-Source: Home brewed
-Fixes: OpenLDAP C-SDK library has other name than libldap.so hardwired in wscript's
+Source: in-house
+Up-stream Acceptability: Patch is fixing the names of "ldap" and "lber" libs
+ which are "hard-wired" to "libldap.so" and "liblber.so" in upstream.
+ Patch will be promoted to community.
---- a/source3/wscript 2013-12-05 01:16:48.000000000 -0800
-+++ b/source3/wscript 2014-05-21 06:47:12.420295640 -0700
-@@ -61,6 +65,15 @@
+--- a/source3/wscript 2016-03-22 02:00:33.000000000 -0700
++++ samba-4.4.0/source3/wscript 2016-03-23 12:43:02.236160369 -0700
+@@ -36,6 +36,16 @@
+ "--with-shared-modules"),
+ action="store", dest='shared_modules', default=None)
- opt.SAMBA3_ADD_OPTION('glusterfs', with_name="enable", without_name="disable", default=True)
-
++
+ opt.add_option('--with-libldap',
+ help=("Name of the libldap for -l<libname> format."),
+ action="store", dest='libldap_name', default='ldap')
@@ -16,10 +19,10 @@
+ help=("Name of the liblber for -l<libname> format."),
+ action="store", dest='liblber_name', default='lber')
+
-
- def configure(conf):
- from samba_utils import TO_LIST
-@@ -618,7 +631,7 @@
+ opt.SAMBA3_ADD_OPTION('winbind')
+ opt.SAMBA3_ADD_OPTION('ads')
+ opt.SAMBA3_ADD_OPTION('ldap')
+@@ -664,7 +673,7 @@
if Options.options.with_ldap:
conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h')
conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
@@ -28,7 +31,7 @@
conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
# if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out
-@@ -626,8 +639,8 @@
+@@ -672,8 +681,8 @@
conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN',
define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h')
@@ -39,29 +42,29 @@
# Check if ldap_set_rebind_proc() takes three arguments
if conf.CHECK_CODE('ldap_set_rebind_proc(0, 0, 0)',
-@@ -648,6 +661,25 @@
+@@ -694,6 +703,25 @@
if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
-+ # fix the conf.TARGET_TYPE and conf.LIB_... items
-+ if 'ldap' != Options.options.libldap_name:
-+ conf.SET_TARGET_TYPE('ldap', 'SYSLIB')
-+ #conf.SET_TARGET_TYPE(Options.options.libldap_name, 'EMPTY')
-+ conf.define('HAVE_LIBLDAP', 1)
-+ conf.undefine('HAVE_LIB%s' % Options.options.libldap_name.upper().replace('-','_'))
-+ conf.define('LIB_LDAP', Options.options.libldap_name)
-+ conf.undefine('LIB_%s' % Options.options.libldap_name.upper().replace('-','_'))
-+ #conf.define('LIB_ldap', [ Options.options.libldap_name ] )
-+ #conf.undefine('LIB_%s' % Options.options.libldap_name.replace('-','_'))
-+ if 'lber' != Options.options.liblber_name:
-+ conf.SET_TARGET_TYPE('lber', 'SYSLIB')
-+ #conf.SET_TARGET_TYPE(Options.options.liblber_name, 'EMPTY')
-+ conf.define('HAVE_LIBLBER', 1)
-+ conf.undefine('HAVE_LIB%s' % Options.options.liblber_name.upper().replace('-','_'))
-+ conf.define('LIB_LBER', Options.options.liblber_name)
-+ conf.undefine('LIB_%s' % Options.options.liblber_name.upper().replace('-','_'))
-+ #conf.define('LIB_lber', [ Options.options.liblber_name ] )
-+ #conf.undefine('LIB_%s' % Options.options.liblber_name.replace('-','_'))
- else:
- conf.SET_TARGET_TYPE('ldap', 'EMPTY')
- conf.SET_TARGET_TYPE('lber', 'EMPTY')
++ # fix the conf.TARGET_TYPE and conf.LIB_... items
++ if 'ldap' != Options.options.libldap_name:
++ conf.SET_TARGET_TYPE('ldap', 'SYSLIB')
++ #conf.SET_TARGET_TYPE(Options.options.libldap_name, 'EMPTY')
++ conf.define('HAVE_LIBLDAP', 1)
++ conf.undefine('HAVE_LIB%s' % Options.options.libldap_name.upper().replace('-','_'))
++ conf.define('LIB_LDAP', Options.options.libldap_name)
++ conf.undefine('LIB_%s' % Options.options.libldap_name.upper().replace('-','_'))
++ #conf.define('LIB_ldap', [ Options.options.libldap_name ] )
++ #conf.undefine('LIB_%s' % Options.options.libldap_name.replace('-','_'))
++ if 'lber' != Options.options.liblber_name:
++ conf.SET_TARGET_TYPE('lber', 'SYSLIB')
++ #conf.SET_TARGET_TYPE(Options.options.liblber_name, 'EMPTY')
++ conf.define('HAVE_LIBLBER', 1)
++ conf.undefine('HAVE_LIB%s' % Options.options.liblber_name.upper().replace('-','_'))
++ conf.define('LIB_LBER', Options.options.liblber_name)
++ conf.undefine('LIB_%s' % Options.options.liblber_name.upper().replace('-','_'))
++ #conf.define('LIB_lber', [ Options.options.liblber_name ] )
++ #conf.undefine('LIB_%s' % Options.options.liblber_name.replace('-','_'))
+ else:
+ conf.fatal("LDAP support not found. "
+ "Try installing libldap2-dev or openldap-devel. "
--- a/components/samba/patches/source3-krb5-build.patch Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/patches/source3-krb5-build.patch Mon May 16 06:32:39 2016 -0700
@@ -1,30 +1,40 @@
-Source: Home brewed
-Fixes issues with differences of Solaris krb5 and MIT krb5
+Source: in-house
+Up-stream Acceptability: Patch is fixing the Solaris build in consequences
+ of the "krb5" patch and is Solaris specific only.
+ It is heavily acceptable by community.
---- a/source3/wscript_build 2014-09-08 09:26:14.000000000 +0000
-+++ samba-4.1.12/source3/wscript_build 2014-10-21 18:40:58.045669267 +0000
-@@ -842,6 +842,7 @@
- param
- dbwrap
- samba3-util
-+ krb5
- errors3''',
- vars=locals())
-
-@@ -1098,7 +1099,7 @@
+--- a/source3/wscript_build 2016-03-30 03:20:20.000000000 -0700
++++ samba-4.4.1/source3/wscript_build 2016-04-09 17:34:50.562542184 -0700
+@@ -344,6 +344,7 @@
+ lib/util_ea.c
+ lib/background.c''',
+ deps='''
++ krb5
+ samba3util
+ LIBTSOCKET
+ NDR_MESSAGING
+@@ -774,7 +775,7 @@
bld.SAMBA3_LIBRARY('trusts_util',
source='libsmb/trusts_util.c',
-- deps='libcli_netlogon3 msrpc3 pdb',
-+ deps='libcli_netlogon3 msrpc3 pdb krb5',
- vars=locals(),
+- deps='libcli_netlogon3 msrpc3 samba-passdb',
++ deps='libcli_netlogon3 msrpc3 samba-passdb krb5',
private_library=True)
-@@ -1276,6 +1277,7 @@
- libsmb
- param
- KRBCLIENT
-+ krb5
- ndr-standard
+ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
+@@ -1350,6 +1351,7 @@
+ bld.SAMBA3_BINARY('smbcacls',
+ source='utils/smbcacls.c lib/util_sd.c',
+ deps='''
++ krb5
+ talloc
+ popt_samba3
msrpc3
- gpo
+@@ -1375,6 +1377,7 @@
+ bld.SAMBA3_BINARY('sharesec',
+ source='utils/sharesec.c lib/util_sd.c',
+ deps='''
++ krb5
+ talloc
+ msrpc3
+ libcli_lsa3
--- a/components/samba/patches/source3-winbind-krb5-build.patch Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/patches/source3-winbind-krb5-build.patch Mon May 16 06:32:39 2016 -0700
@@ -1,32 +1,50 @@
-Source: Home brewed
-Fixes issues with differences of Solaris krb5 and MIT krb5
+Source: in-house
+Up-stream Acceptability: Patch is fixing the Solaris build in consequences
+ of the "krb5" patch and is Solaris specific only.
+ It is heavily acceptable by community.
---- a/source3/winbindd/wscript_build 2013-12-05 09:16:48.000000000 +0000
-+++ samba-4.1.7/source3/winbindd/wscript_build 2014-06-11 17:27:43.899094852 +0000
-@@ -19,7 +19,7 @@
+--- a/source3/winbindd/wscript_build 2016-01-26 03:45:46.000000000 -0800
++++ samba-4.4.1/source3/winbindd/wscript_build 2016-04-09 17:03:33.350275673 -0700
+@@ -2,13 +2,13 @@
bld.SAMBA3_LIBRARY('idmap',
- source=IDMAP_SRC,
-- deps='samba-util',
-+ deps='samba-util krb5',
- vars=locals(),
+ source='idmap.c idmap_util.c',
+- deps='samba-util pdb',
++ deps='samba-util pdb krb5',
allow_undefined_symbols=True,
private_library=True)
-@@ -81,7 +81,7 @@
+
+ bld.SAMBA3_SUBSYSTEM('IDMAP_RW',
+ source='idmap_rw.c',
+- deps='samba-util')
++ deps='samba-util krb5')
+
+ bld.SAMBA3_SUBSYSTEM('IDMAP_TDB_COMMON',
+ source='idmap_tdb_common.c',
+@@ -53,7 +53,7 @@
+ bld.SAMBA3_MODULE('idmap_passdb',
+ subsystem='idmap',
+ source='idmap_passdb.c',
+- deps='samba-util samba-passdb',
++ deps='samba-util samba-passdb krb5',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
+@@ -70,7 +70,7 @@
bld.SAMBA3_MODULE('idmap_nss',
subsystem='idmap',
- source=IDMAP_NSS_SRC,
+ source='idmap_nss.c',
- deps='samba-util',
+ deps='samba-util krb5',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss'))
-@@ -89,7 +89,7 @@
+@@ -78,7 +78,7 @@
bld.SAMBA3_MODULE('idmap_tdb',
subsystem='idmap',
- source=IDMAP_TDB_SRC,
-- deps='samba-util tdb',
-+ deps='samba-util tdb krb5',
+ source='idmap_tdb.c',
+- deps='samba-util tdb IDMAP_TDB_COMMON',
++ deps='samba-util tdb krb5 IDMAP_TDB_COMMON',
init_function='',
+ allow_undefined_symbols=True,
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
--- a/components/samba/patches/sun-cc-build.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-gcc allows to build 'empty' shared libraries (with no sources):
-
-$ gcc -shared -o a.so -lz
-
-Sun CC does not have this ability. Samba guys tried to workaround it by
-http://git.samba.org/?p=anatoliy/anatoliy.git;a=commitdiff_plain;h=65743f932b511db009655847e77288c95c0aa525
-
-The workaround adds - to the end of the command line. That does not seem to
-work too. So Instead of that I am creating small C source file which will be
-used as a base of the 'empty' libraries.
-
-see: https://bugzilla.samba.org/show_bug.cgi?id=10630
-
---- samba-4.1.7/empty.c 2014-05-23 05:54:51.696077316 -0700
-+++ samba-4.1.7/empty.c 2014-05-23 04:35:47.190194034 -0700
-@@ -0,0 +1 @@
-+static int some_unused_variable_for_waf_build_with_sun_cc = 0;
---- samba-4.1.7/source4/librpc/wscript_build 2014-06-03 15:22:35.884858404 -0700
-+++ samba-4.1.7/source4/librpc/wscript_build 2014-06-03 15:01:45.303523288 -0700
-@@ -101,7 +101,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
-
-
- bld.SAMBA_LIBRARY('dcerpc-samr',
-- source='',
-+ source='../../empty.c',
- pc_files='dcerpc_samr.pc',
- vnum='0.0.1',
- public_deps='dcerpc ndr-standard RPC_NDR_SAMR',
-@@ -111,7 +111,7 @@ bld.SAMBA_LIBRARY('dcerpc-samr',
-
-
- bld.SAMBA_LIBRARY('dcerpc-atsvc',
-- source='',
-+ source='../../empty.c',
- pc_files='dcerpc_atsvc.pc',
- vnum='0.0.1',
- public_deps='dcerpc ndr-standard RPC_NDR_ATSVC',
--- a/components/samba/patches/svc-cifs-in-keytab.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Source: Home brewed
-...so called MS Extensions do not support "host" (service name) as a wildcard also for "cifs".
-Drop-in will fix this issue.
-
---- a/source3/libads/kerberos_keytab.c 2014-12-01 12:48:32.000000000 +0000
-+++ samba-4.1.14/source3/libads/kerberos_keytab.c 2015-01-16 08:25:27.237534267 +0000
-@@ -559,11 +559,11 @@
- }
- }
-
--#if 0 /* don't create the CIFS/... keytab entries since no one except smbd
-+#if 1 /* don't create the CIFS/... keytab entries since no one except smbd
- really needs them and we will fall back to verifying against
- secrets.tdb */
-
-- ret = ads_keytab_add_entry(ads, "cifs"));
-+ ret = ads_keytab_add_entry(ads, "cifs");
- if (ret != 0 ) {
- DEBUG(1, (__location__ ": ads_keytab_add_entry failed while "
- "adding 'cifs'.\n"));
--- a/components/samba/patches/talloc_dict_sigbus.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Based on patch sent me by Ralph Boehme <[email protected]> :
-
-https://lists.samba.org/archive/samba-technical/2015-November/110889.html
-
-...patch is assumed to be released in community.
-
---- a/source3/lib/talloc_dict.c 2013-06-13 02:21:02.000000000 -0700
-+++ b/source3/lib/talloc_dict.c 2015-11-27 15:11:39.212179014 -0800
-@@ -72,7 +72,11 @@
- TALLOC_FREE(rec);
- return false;
- }
-+#if defined(__SUNPRO_C) && (defined(__sparcv9) && defined(_LP64))
-+ memcpy(&old_data, value.dptr, sizeof(old_data));
-+#else /* Do not chase memcpy on archs where unaligned address do not throw SIGBUS */
- old_data = *(void **)(value.dptr);
-+#endif
- TALLOC_FREE(old_data);
- if (data == NULL) {
- status = dbwrap_record_delete(rec);
-@@ -138,6 +142,7 @@
- TDB_DATA value;
- struct talloc_dict_traverse_state *state =
- (struct talloc_dict_traverse_state *)private_data;
-+ void *p;
-
- key = dbwrap_record_get_key(rec);
- value = dbwrap_record_get_value(rec);
-@@ -145,8 +150,14 @@
- if (value.dsize != sizeof(void *)) {
- return -1;
- }
-+
-+#if defined(__SUNPRO_C) && (defined(__sparcv9) && defined(_LP64))
-+ memcpy(&p, value.dptr, sizeof(p));
-+#else /* Do not chase memcpy on archs where unaligned address do not throw SIGBUS */
-+ p = *(void **)(value.dptr);
-+#endif
- return state->fn(data_blob_const(key.dptr, key.dsize),
-- *(void **)value.dptr, state->private_data);
-+ p, state->private_data);
- }
-
- /*
--- a/components/samba/patches/usr-lib.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-Source: Home brewed
-Fixes: using of /usr/lib in default rpath.
-
---- a/buildtools/wafadmin/Tools/libtool.py 2013-06-13 09:21:02.000000000 +0000
-+++ samba-4.1.12/buildtools/wafadmin/Tools/libtool.py 2014-10-22 15:39:17.080027332 +0000
-@@ -141,7 +141,7 @@
- self.dlopen = None
- self.dlpreopen = None
- # Directory that this library needs to be installed in:
-- self.libdir = '/usr/lib'
-+ self.libdir = ''
- if not self.__parse():
- raise ValueError("file %s not found!!" %(la_filename))
-
---- a/buildtools/wafadmin/3rdparty/boost.py 2013-06-13 09:21:02.000000000 +0000
-+++ samba-4.1.12/buildtools/wafadmin/3rdparty/boost.py 2014-10-22 15:38:11.368315144 +0000
-@@ -41,7 +41,7 @@
- int main() { std::cout << BOOST_VERSION << std::endl; }
- '''
-
--boost_libpath = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib']
-+boost_libpath = ['/usr/local/lib', '/opt/local/lib', '/sw/lib']
- boost_cpppath = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include']
-
- STATIC_NOSTATIC = 'nostatic'
--- a/components/samba/patches/worm.patch Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-Samba.org patch source is referenced below.
-WiKi page is:
-https://wiki.samba.org/index.php/VFS/vfs_worm
-changes against the community version:
- - removed support of grace time on file
- - slightly modified to run on VFS rev.28
--- Jiri Sasek
-
-From 2004317c09d781a4ec1275aaa4a29289e798eff3 Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <[email protected]>
-Date: Wed, 20 Nov 2013 12:09:47 +0100
-Subject: [PATCH] s3-modules: add new vfs_worm module
-
-VFS module to disallow writes for older files.
-
-Signed-off-by: Volker Lendecke <[email protected]>
-Reviewed-by: Stefan Metzmacher <[email protected]>
-Reviewed-by: Jeremy Allison <[email protected]>
----
- source3/modules/vfs_worm.c | 97 ++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 97 insertions(+), 0 deletions(-)
- create mode 100644 source3/modules/vfs_worm.c
-
-diff --git a/source3/modules/vfs_worm.c b/source3/modules/vfs_worm.c
-new file mode 100644
-index 0000000..77a18ca
---- /dev/null
-+++ b/source3/modules/vfs_worm.c
-@@ -0,0 +1,93 @@
-+/*
-+ * VFS module to disallow writes for older files
-+ *
-+ * Copyright (C) 2013, Volker Lendecke
-+ *
-+ * 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 "smbd/smbd.h"
-+#include "system/filesys.h"
-+#include "libcli/security/security.h"
-+
-+static NTSTATUS vfs_worm_create_file(vfs_handle_struct *handle,
-+ struct smb_request *req,
-+ uint16_t root_dir_fid,
-+ struct smb_filename *smb_fname,
-+ uint32_t access_mask,
-+ uint32_t share_access,
-+ uint32_t create_disposition,
-+ uint32_t create_options,
-+ uint32_t file_attributes,
-+ uint32_t oplock_request,
-+ uint64_t allocation_size,
-+ uint32_t private_flags,
-+ struct security_descriptor *sd,
-+ struct ea_list *ea_list,
-+ files_struct **result,
-+ int *pinfo)
-+{
-+ bool readonly = false;
-+ const uint32_t write_access_flags =
-+ FILE_WRITE_DATA | FILE_APPEND_DATA |
-+ FILE_WRITE_ATTRIBUTES | DELETE_ACCESS |
-+ WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS;
-+ NTSTATUS status;
-+
-+ if (VALID_STAT(smb_fname->st)) {
-+ /* no grace_period supported */
-+ readonly = true;
-+ }
-+
-+ if (readonly && (access_mask & write_access_flags)) {
-+ return NT_STATUS_ACCESS_DENIED;
-+ }
-+
-+ status = SMB_VFS_NEXT_CREATE_FILE(
-+ handle, req, root_dir_fid, smb_fname, access_mask,
-+ share_access, create_disposition, create_options,
-+ file_attributes, oplock_request, allocation_size,
-+ private_flags, sd, ea_list, result, pinfo);
-+ if (!NT_STATUS_IS_OK(status)) {
-+ return status;
-+ }
-+
-+ /*
-+ * Access via MAXIMUM_ALLOWED_ACCESS?
-+ */
-+ if (readonly && ((*result)->access_mask & write_access_flags)) {
-+ close_file(req, *result, NORMAL_CLOSE);
-+ return NT_STATUS_ACCESS_DENIED;
-+ }
-+ return NT_STATUS_OK;
-+}
-+
-+static struct vfs_fn_pointers vfs_worm_fns = {
-+ .create_file = vfs_worm_create_file,
-+};
-+
-+NTSTATUS vfs_worm_init(void);
-+NTSTATUS vfs_worm_init(void)
-+{
-+ NTSTATUS ret;
-+
-+ ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "worm",
-+ &vfs_worm_fns);
-+ if (!NT_STATUS_IS_OK(ret)) {
-+ return ret;
-+ }
-+
-+ return ret;
-+}
---
-1.7.0.4
-
- Makefile.in and configure.in adds
-
--- a/components/samba/samba.p5m Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/samba.p5m Mon May 16 06:32:39 2016 -0700
@@ -18,10 +18,55 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
-<include samba.p5m.common>
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+# /etc/samba/private should not even be readable fo non-root users.
+<transform dir path=etc/samba/private -> default mode 500>
+
+# smbprofiles man
+<transform file path=usr/share/man/man1/profiles.1 -> drop>
+
+# General dirs generated in sample-manifest but with bad attribs.
+<transform dir path=etc$ -> drop>
+<transform dir file link path=opt.* -> drop>
+<transform dir path=usr.* -> drop>
+<transform dir file path=usr/include/gssapi.* -> drop>
+<transform dir path=var$ -> drop>
+<transform dir path=var/lib$ -> drop>
+
+# Unit test suite testtools is now the python package
+<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools.* -> drop>
+
+# Samba customized krb5-config
+<transform file path=usr/bin/krb5-config -> drop>
+
+# Remove the named files with strange deps breaking the pkglint
+<transform dir file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subunit.* -> drop>
+<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/subunitrun.* -> drop>
+<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/raw_protocol.* -> drop>
+
+# Oracle HSM (SAMFS) is not yet supported on 12.0
+#<transform file path=usr/lib/samba/vfs/samfs.so -> default pkg.depend.bypass-generate .*>
+#<transform file path=usr/lib/samba/vfs/samfs.so -> default pkg.linted.userland.action001.3 true>
+
+# mediated links macros to switch between Samba 4 and and possibly any forked release
+<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator samba >
+<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator-implementation 4 >
+<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator-priority vendor >
+
+<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator samba >
+<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator-implementation 4 >
+<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator-priority vendor >
+
+<transform link target=.*/samba/security/($(MACH64)/)?pam_.+\.so -> default mediator samba >
+<transform link target=.*/samba/security/($(MACH64)/)?pam_.+\.so -> default mediator-implementation 4 >
+<transform link target=.*/samba/security/($(MACH64)/)?pam_.+\.so -> default mediator-priority vendor >
+
+# SMF services import (for .xml manifests)
+<transform file path=lib/svc/manifest/.+\.xml -> default restart_fmri svc:/system/manifest-import:default >
# "samba.proto-objects"-file is created using the command:
# gmake sample-manifest METADATA_TEMPLATE=
@@ -107,7 +152,6 @@
link path=usr/bin/smbprofiles target=../lib/samba/bin/profiles
link path=usr/bin/smbspool target=../lib/samba/bin/smbspool
link path=usr/bin/smbstatus target=../lib/samba/bin/smbstatus
-link path=usr/bin/smbta-util target=../lib/samba/bin/smbta-util
link path=usr/bin/smbtar target=../lib/samba/bin/smbtar
link path=usr/bin/smbtorture target=../lib/samba/bin/smbtorture
link path=usr/bin/smbtree target=../lib/samba/bin/smbtree
@@ -126,18 +170,10 @@
#
# PAM-libs
-link path=usr/lib/security/$(MACH64)/pam_smbpass.so \
- target=../../samba/security/$(MACH64)/pam_smbpass.so
-link path=usr/lib/security/$(MACH64)/pam_smbpass.so.1 \
- target=../../samba/security/$(MACH64)/pam_smbpass.so
link path=usr/lib/security/$(MACH64)/pam_winbind.so \
target=../../samba/security/$(MACH64)/pam_winbind.so
link path=usr/lib/security/$(MACH64)/pam_winbind.so.1 \
target=../../samba/security/$(MACH64)/pam_winbind.so
-link path=usr/lib/security/pam_smbpass.so \
- target=../samba/security/pam_smbpass.so
-link path=usr/lib/security/pam_smbpass.so.1 \
- target=../samba/security/pam_smbpass.so
link path=usr/lib/security/pam_winbind.so \
target=../samba/security/pam_winbind.so
link path=usr/lib/security/pam_winbind.so.1 \
@@ -169,3 +205,6 @@
desc="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)" \
name="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)"
license samba.license license=GPLv3
+
+# Samba can be used in Asian multibyte language envs. so we need this
+depend type=require fmri=pkg:/system/library/iconv
--- a/components/samba/samba.p5m.common Wed Jun 01 14:21:11 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-
-# /etc/samba/private should not even be readable fo non-root users.
-<transform dir path=etc/samba/private -> default mode 500>
-
-# smbprofiles man
-<transform file path=usr/share/man/man1/profiles.1 -> drop>
-
-# General dirs generated in sample-manifest but with bad attribs.
-<transform dir path=etc$ -> drop>
-<transform dir file link path=opt.* -> drop>
-<transform dir path=usr.* -> drop>
-<transform file path=usr/include/gssapi.* -> drop>
-<transform dir path=var$ -> drop>
-<transform dir path=var/lib$ -> drop>
-
-# Samba customized krb5-config
-<transform file path=usr/bin/krb5-config -> drop>
-
-# Remove the named files with strange deps breaking the pkglint
-<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/run.py -> drop>
-<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/run.pyc -> drop>
-<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/sample-script.py -> drop>
-<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/sample-script.pyc -> drop>
-
-# Oracle HSM (SAMFS) is not yet supported on 12.0
-#<transform file path=usr/lib/samba/vfs/samfs.so -> default pkg.depend.bypass-generate .*>
-#<transform file path=usr/lib/samba/vfs/samfs.so -> default pkg.linted.userland.action001.3 true>
-
-# mediated links macros to switch between Samba 4 and and possibly any forked release
-<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator samba >
-<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator-implementation 4 >
-<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator-priority vendor >
-
-<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator samba >
-<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator-implementation 4 >
-<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator-priority vendor >
-
-<transform link target=.*/samba/security/($(MACH64)/)?pam_.+\.so -> default mediator samba >
-<transform link target=.*/samba/security/($(MACH64)/)?pam_.+\.so -> default mediator-implementation 4 >
-<transform link target=.*/samba/security/($(MACH64)/)?pam_.+\.so -> default mediator-priority vendor >
-
-# SMF services import (for .xml manifests)
-<transform file path=lib/svc/manifest/.+\.xml -> default restart_fmri svc:/system/manifest-import:default >
-
-# samba confdir
-dir path=etc/samba/private mode=500
-
-# dirs not created by install
-dir path=var/samba/com
-dir path=var/samba/locks
-dir path=var/samba/log
-dir path=var/spool/samba mode=1777
-
-# Samba can be used in Asian multibyte language envs. so we need this
-$(SOLARIS_12_ONLY)depend type=require fmri=pkg:/system/library/iconv
-$(SOLARIS_11_ONLY)depend type=require fmri=pkg:/system/library/iconv/extra
--- a/components/samba/samba.proto-objects Wed Jun 01 14:21:11 2016 +0100
+++ b/components/samba/samba.proto-objects Mon May 16 06:32:39 2016 -0700
@@ -1,18 +1,15 @@
dir path=etc/samba
dir path=etc/samba/private
-file path=usr/bin/krb5-config
-dir path=usr/include/gssapi
-file path=usr/include/gssapi/gssapi_krb5.h
dir path=usr/include/samba
file path=usr/include/samba/charset.h
dir path=usr/include/samba/core
file path=usr/include/samba/core/doserr.h
file path=usr/include/samba/core/error.h
+file path=usr/include/samba/core/hresult.h
file path=usr/include/samba/core/ntstatus.h
file path=usr/include/samba/core/werror.h
file path=usr/include/samba/credentials.h
file path=usr/include/samba/dcerpc.h
-file path=usr/include/samba/dlinklist.h
file path=usr/include/samba/domain_credentials.h
dir path=usr/include/samba/gen_ndr
file path=usr/include/samba/gen_ndr/atsvc.h
@@ -20,22 +17,15 @@
file path=usr/include/samba/gen_ndr/dcerpc.h
file path=usr/include/samba/gen_ndr/drsblobs.h
file path=usr/include/samba/gen_ndr/drsuapi.h
-file path=usr/include/samba/gen_ndr/epmapper.h
file path=usr/include/samba/gen_ndr/krb5pac.h
file path=usr/include/samba/gen_ndr/lsa.h
-file path=usr/include/samba/gen_ndr/mgmt.h
file path=usr/include/samba/gen_ndr/misc.h
file path=usr/include/samba/gen_ndr/nbt.h
file path=usr/include/samba/gen_ndr/ndr_atsvc.h
-file path=usr/include/samba/gen_ndr/ndr_atsvc_c.h
file path=usr/include/samba/gen_ndr/ndr_dcerpc.h
file path=usr/include/samba/gen_ndr/ndr_drsblobs.h
file path=usr/include/samba/gen_ndr/ndr_drsuapi.h
-file path=usr/include/samba/gen_ndr/ndr_epmapper.h
-file path=usr/include/samba/gen_ndr/ndr_epmapper_c.h
file path=usr/include/samba/gen_ndr/ndr_krb5pac.h
-file path=usr/include/samba/gen_ndr/ndr_mgmt.h
-file path=usr/include/samba/gen_ndr/ndr_mgmt_c.h
file path=usr/include/samba/gen_ndr/ndr_misc.h
file path=usr/include/samba/gen_ndr/ndr_nbt.h
file path=usr/include/samba/gen_ndr/ndr_samr.h
@@ -47,17 +37,13 @@
file path=usr/include/samba/gen_ndr/security.h
file path=usr/include/samba/gen_ndr/server_id.h
file path=usr/include/samba/gen_ndr/svcctl.h
-file path=usr/include/samba/gensec.h
-file path=usr/include/samba/ldap-util.h
-file path=usr/include/samba/ldap_errors.h
-file path=usr/include/samba/ldap_message.h
-file path=usr/include/samba/ldap_ndr.h
file path=usr/include/samba/ldb_wrap.h
file path=usr/include/samba/libsmbclient.h
file path=usr/include/samba/lookup_sid.h
file path=usr/include/samba/machine_sid.h
dir path=usr/include/samba/ndr
file path=usr/include/samba/ndr.h
+file path=usr/include/samba/ndr/ndr_dcerpc.h
file path=usr/include/samba/ndr/ndr_drsblobs.h
file path=usr/include/samba/ndr/ndr_drsuapi.h
file path=usr/include/samba/ndr/ndr_nbt.h
@@ -66,51 +52,33 @@
file path=usr/include/samba/param.h
file path=usr/include/samba/passdb.h
file path=usr/include/samba/policy.h
-file path=usr/include/samba/pytalloc.h
-file path=usr/include/samba/read_smb.h
-file path=usr/include/samba/registry.h
-file path=usr/include/samba/roles.h
file path=usr/include/samba/rpc_common.h
dir path=usr/include/samba/samba
file path=usr/include/samba/samba/session.h
file path=usr/include/samba/samba/version.h
-file path=usr/include/samba/samba_util.h
file path=usr/include/samba/share.h
-file path=usr/include/samba/smb2.h
-file path=usr/include/samba/smb2_constants.h
-file path=usr/include/samba/smb2_create_blob.h
-file path=usr/include/samba/smb2_lease.h
-file path=usr/include/samba/smb2_signing.h
-file path=usr/include/samba/smb_cli.h
-file path=usr/include/samba/smb_cliraw.h
-file path=usr/include/samba/smb_common.h
-file path=usr/include/samba/smb_composite.h
-file path=usr/include/samba/smb_constants.h
+file path=usr/include/samba/smb2_lease_struct.h
file path=usr/include/samba/smb_ldap.h
-file path=usr/include/samba/smb_raw.h
-file path=usr/include/samba/smb_raw_interfaces.h
-file path=usr/include/samba/smb_raw_signing.h
-file path=usr/include/samba/smb_raw_trans2.h
-file path=usr/include/samba/smb_request.h
-file path=usr/include/samba/smb_seal.h
-file path=usr/include/samba/smb_share_modes.h
-file path=usr/include/samba/smb_signing.h
-file path=usr/include/samba/smb_unix_ext.h
-file path=usr/include/samba/smb_util.h
file path=usr/include/samba/smbconf.h
file path=usr/include/samba/smbldap.h
file path=usr/include/samba/tdr.h
-file path=usr/include/samba/torture.h
file path=usr/include/samba/tsocket.h
file path=usr/include/samba/tsocket_internal.h
dir path=usr/include/samba/util
file path=usr/include/samba/util/attr.h
+file path=usr/include/samba/util/blocking.h
file path=usr/include/samba/util/byteorder.h
file path=usr/include/samba/util/data_blob.h
file path=usr/include/samba/util/debug.h
+file path=usr/include/samba/util/fault.h
+file path=usr/include/samba/util/genrand.h
+file path=usr/include/samba/util/idtree.h
+file path=usr/include/samba/util/idtree_random.h
file path=usr/include/samba/util/memory.h
file path=usr/include/samba/util/safe_string.h
+file path=usr/include/samba/util/signal.h
file path=usr/include/samba/util/string_wrappers.h
+file path=usr/include/samba/util/substitute.h
file path=usr/include/samba/util/talloc_stack.h
file path=usr/include/samba/util/tevent_ntstatus.h
file path=usr/include/samba/util/tevent_unix.h
@@ -123,9 +91,12 @@
dir path=usr/lib/python2.7/vendor-packages
dir path=usr/lib/python2.7/vendor-packages/64
dir path=usr/lib/python2.7/vendor-packages/64/samba
+file path=usr/lib/python2.7/vendor-packages/64/samba/_ldb_text.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/_ldb_text.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/_tdb_text.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/_tdb_text.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/_tevent.so
file path=usr/lib/python2.7/vendor-packages/64/samba/ldb.so
-file path=usr/lib/python2.7/vendor-packages/64/samba/ntdb.so
dir path=usr/lib/python2.7/vendor-packages/64/samba/samba
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/__init__.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/__init__.pyc
@@ -144,6 +115,7 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/atsvc.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/auth.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/base.so
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/dcerpc.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/dfs.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/dns.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dcerpc/dnsp.so
@@ -177,55 +149,7 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/drs_utils.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/drs_utils.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dsdb.so
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/__init__.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/chunked.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/chunked.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/details.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/details.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/filters.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/filters.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/iso8601.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/iso8601.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/progress_model.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/progress_model.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/run.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/run.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/test_results.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/test_results.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/TestUtil.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/TestUtil.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/sample-script.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/sample-script.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/sample-two-script.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/sample-two-script.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_chunked.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_chunked.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_details.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_details.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_progress_model.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_progress_model.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_run.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_run.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_subunit_filter.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_subunit_filter.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_subunit_stats.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_subunit_stats.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_subunit_tags.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_subunit_tags.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_tap2subunit.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_tap2subunit.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_protocol.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_protocol.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_results.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_results.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/dsdb_dns.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/gensec.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/getopt.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/getopt.pyc
@@ -235,8 +159,19 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/idmap.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/join.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/join.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc_utils.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc_utils.pyc
+dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/__init__.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/debug.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/debug.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/graph.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/graph.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/graph_utils.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/graph_utils.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/kcc_utils.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/kcc_utils.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/ldif_import_export.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/kcc/ldif_import_export.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/messaging.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/ms_display_specifiers.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/ms_display_specifiers.pyc
@@ -289,8 +224,6 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/netcmd/time.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/netcmd/user.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/netcmd/user.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/netcmd/vampire.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/netcmd/vampire.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/ntacls.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/ntacls.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/param.so
@@ -305,6 +238,8 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/provision/sambadns.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/provision/sambadns.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/registry.so
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/remove_dc.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/remove_dc.pyc
dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/samba3
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/samba3/__init__.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/samba3/__init__.pyc
@@ -322,6 +257,13 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/sites.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/sites.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/smb.so
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subnets.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subnets.pyc
+dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/subunit
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subunit/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subunit/__init__.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subunit/run.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/subunit/run.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tdb_util.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tdb_util.pyc
dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests
@@ -345,12 +287,18 @@
dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/__init__.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/__init__.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/array.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/array.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/bare.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/bare.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/dnsserver.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/dnsserver.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/integer.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/integer.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/misc.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/misc.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/raw_protocol.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/raw_protocol.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/registry.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/registry.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/rpc_talloc.py
@@ -377,6 +325,17 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/get_opt.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/hostconfig.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/hostconfig.pyc
+dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/__init__.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/graph.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/graph.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/graph_utils.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/graph_utils.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/kcc_utils.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/kcc_utils.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/ldif_import_export.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/kcc/ldif_import_export.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/libsmb_samba_internal.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/libsmb_samba_internal.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/messaging.py
@@ -412,6 +371,8 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/ntacl.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/processes.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/processes.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/sites.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/sites.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/timecmd.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/timecmd.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/samba_tool/user.py
@@ -424,6 +385,8 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/source.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/strings.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/strings.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/subunitrun.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/subunitrun.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/unicodenames.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/unicodenames.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/upgrade.py
@@ -434,6 +397,9 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/upgradeprovisionneeddc.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/xattr.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/xattr.pyc
+dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/third_party
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/third_party/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/third_party/__init__.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/upgrade.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/upgrade.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/upgradehelpers.py
@@ -458,6 +424,7 @@
file path=usr/lib/samba/$(MACH64)/idmap/ldap.so
file path=usr/lib/samba/$(MACH64)/idmap/rfc2307.so
file path=usr/lib/samba/$(MACH64)/idmap/rid.so
+file path=usr/lib/samba/$(MACH64)/idmap/script.so
file path=usr/lib/samba/$(MACH64)/idmap/tdb2.so
dir path=usr/lib/samba/$(MACH64)/ldb
file path=usr/lib/samba/$(MACH64)/ldb/asq.so
@@ -470,11 +437,6 @@
file path=usr/lib/samba/$(MACH64)/ldb/server_sort.so
file path=usr/lib/samba/$(MACH64)/ldb/skel.so
file path=usr/lib/samba/$(MACH64)/ldb/tdb.so
-link path=usr/lib/samba/$(MACH64)/libdcerpc-atsvc.so \
- target=libdcerpc-atsvc.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libdcerpc-atsvc.so.0 \
- target=libdcerpc-atsvc.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libdcerpc-atsvc.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libdcerpc-binding.so \
target=libdcerpc-binding.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libdcerpc-binding.so.0 \
@@ -488,10 +450,6 @@
link path=usr/lib/samba/$(MACH64)/libdcerpc.so target=libdcerpc.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libdcerpc.so.0 target=libdcerpc.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libdcerpc.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libgensec.so target=libgensec.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libgensec.so.0 target=libgensec.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libgensec.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libgssapi_krb5.so
link path=usr/lib/samba/$(MACH64)/libndr-krb5pac.so \
target=libndr-krb5pac.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libndr-krb5pac.so.0 \
@@ -505,26 +463,28 @@
link path=usr/lib/samba/$(MACH64)/libndr-standard.so.0 \
target=libndr-standard.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libndr-standard.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libndr.so target=libndr.so.0.0.2
-link path=usr/lib/samba/$(MACH64)/libndr.so.0 target=libndr.so.0.0.2
-file path=usr/lib/samba/$(MACH64)/libndr.so.0.0.2
+link path=usr/lib/samba/$(MACH64)/libndr.so target=libndr.so.0.0.5
+link path=usr/lib/samba/$(MACH64)/libndr.so.0 target=libndr.so.0.0.5
+file path=usr/lib/samba/$(MACH64)/libndr.so.0.0.5
link path=usr/lib/samba/$(MACH64)/libnetapi.so target=libnetapi.so.0
file path=usr/lib/samba/$(MACH64)/libnetapi.so.0
-link path=usr/lib/samba/$(MACH64)/libpdb.so target=libpdb.so.0
-file path=usr/lib/samba/$(MACH64)/libpdb.so.0
-link path=usr/lib/samba/$(MACH64)/libregistry.so target=libregistry.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libregistry.so.0 target=libregistry.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libregistry.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libsamba-credentials.so \
target=libsamba-credentials.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libsamba-credentials.so.0 \
target=libsamba-credentials.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libsamba-credentials.so.0.0.1
+link path=usr/lib/samba/$(MACH64)/libsamba-errors.so target=libsamba-errors.so.1
+file path=usr/lib/samba/$(MACH64)/libsamba-errors.so.1
link path=usr/lib/samba/$(MACH64)/libsamba-hostconfig.so \
target=libsamba-hostconfig.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libsamba-hostconfig.so.0 \
target=libsamba-hostconfig.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libsamba-hostconfig.so.0.0.1
+link path=usr/lib/samba/$(MACH64)/libsamba-passdb.so \
+ target=libsamba-passdb.so.0.25.0
+link path=usr/lib/samba/$(MACH64)/libsamba-passdb.so.0 \
+ target=libsamba-passdb.so.0.25.0
+file path=usr/lib/samba/$(MACH64)/libsamba-passdb.so.0.25.0
link path=usr/lib/samba/$(MACH64)/libsamba-policy.so \
target=libsamba-policy.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libsamba-policy.so.0 \
@@ -537,32 +497,26 @@
link path=usr/lib/samba/$(MACH64)/libsamdb.so target=libsamdb.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libsamdb.so.0 target=libsamdb.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libsamdb.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libsmbclient-raw.so \
- target=libsmbclient-raw.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libsmbclient-raw.so.0 \
- target=libsmbclient-raw.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libsmbclient-raw.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libsmbclient.so target=libsmbclient.so.0.2.1
-link path=usr/lib/samba/$(MACH64)/libsmbclient.so.0 target=libsmbclient.so.0.2.1
-file path=usr/lib/samba/$(MACH64)/libsmbclient.so.0.2.1
+link path=usr/lib/samba/$(MACH64)/libsmbclient.so target=libsmbclient.so.0.2.3
+link path=usr/lib/samba/$(MACH64)/libsmbclient.so.0 target=libsmbclient.so.0.2.3
+file path=usr/lib/samba/$(MACH64)/libsmbclient.so.0.2.3
link path=usr/lib/samba/$(MACH64)/libsmbconf.so target=libsmbconf.so.0
file path=usr/lib/samba/$(MACH64)/libsmbconf.so.0
link path=usr/lib/samba/$(MACH64)/libsmbldap.so target=libsmbldap.so.0
file path=usr/lib/samba/$(MACH64)/libsmbldap.so.0
-link path=usr/lib/samba/$(MACH64)/libsmbsharemodes.so \
- target=libsmbsharemodes.so.0
-file path=usr/lib/samba/$(MACH64)/libsmbsharemodes.so.0
+link path=usr/lib/samba/$(MACH64)/libtevent-unix-util.so \
+ target=libtevent-unix-util.so.0.0.1
+link path=usr/lib/samba/$(MACH64)/libtevent-unix-util.so.0 \
+ target=libtevent-unix-util.so.0.0.1
+file path=usr/lib/samba/$(MACH64)/libtevent-unix-util.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libtevent-util.so \
target=libtevent-util.so.0.0.1
link path=usr/lib/samba/$(MACH64)/libtevent-util.so.0 \
target=libtevent-util.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libtevent-util.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libtorture.so target=libtorture.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libtorture.so.0 target=libtorture.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libtorture.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libwbclient.so target=libwbclient.so.0.11
-link path=usr/lib/samba/$(MACH64)/libwbclient.so.0 target=libwbclient.so.0.11
-file path=usr/lib/samba/$(MACH64)/libwbclient.so.0.11
+link path=usr/lib/samba/$(MACH64)/libwbclient.so target=libwbclient.so.0.12
+link path=usr/lib/samba/$(MACH64)/libwbclient.so.0 target=libwbclient.so.0.12
+file path=usr/lib/samba/$(MACH64)/libwbclient.so.0.12
dir path=usr/lib/samba/$(MACH64)/nss_info
file path=usr/lib/samba/$(MACH64)/nss_info/hash.so
file path=usr/lib/samba/$(MACH64)/nss_info/rfc2307.so
@@ -571,30 +525,23 @@
file path=usr/lib/samba/$(MACH64)/nss_winbind.so.1
dir path=usr/lib/samba/$(MACH64)/pkgconfig
file path=usr/lib/samba/$(MACH64)/pkgconfig/dcerpc.pc
-file path=usr/lib/samba/$(MACH64)/pkgconfig/dcerpc_atsvc.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/dcerpc_samr.pc
-file path=usr/lib/samba/$(MACH64)/pkgconfig/gensec.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/ndr.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/ndr_krb5pac.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/ndr_nbt.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/ndr_standard.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/netapi.pc
-file path=usr/lib/samba/$(MACH64)/pkgconfig/registry.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/samba-credentials.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/samba-hostconfig.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/samba-policy.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/samba-util.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/samdb.pc
-file path=usr/lib/samba/$(MACH64)/pkgconfig/smbclient-raw.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/smbclient.pc
-file path=usr/lib/samba/$(MACH64)/pkgconfig/smbsharemodes.pc
-file path=usr/lib/samba/$(MACH64)/pkgconfig/torture.pc
file path=usr/lib/samba/$(MACH64)/pkgconfig/wbclient.pc
dir path=usr/lib/samba/$(MACH64)/vfs
file path=usr/lib/samba/$(MACH64)/vfs/acl_tdb.so
file path=usr/lib/samba/$(MACH64)/vfs/acl_xattr.so
file path=usr/lib/samba/$(MACH64)/vfs/aio_fork.so
-file path=usr/lib/samba/$(MACH64)/vfs/aio_posix.so
file path=usr/lib/samba/$(MACH64)/vfs/aio_pthread.so
file path=usr/lib/samba/$(MACH64)/vfs/audit.so
file path=usr/lib/samba/$(MACH64)/vfs/cacheprime.so
@@ -607,27 +554,30 @@
file path=usr/lib/samba/$(MACH64)/vfs/expand_msdfs.so
file path=usr/lib/samba/$(MACH64)/vfs/extd_audit.so
file path=usr/lib/samba/$(MACH64)/vfs/fake_perms.so
+file path=usr/lib/samba/$(MACH64)/vfs/fruit.so
file path=usr/lib/samba/$(MACH64)/vfs/full_audit.so
file path=usr/lib/samba/$(MACH64)/vfs/linux_xfs_sgid.so
file path=usr/lib/samba/$(MACH64)/vfs/media_harmony.so
file path=usr/lib/samba/$(MACH64)/vfs/netatalk.so
-file path=usr/lib/samba/$(MACH64)/vfs/notify_fam.so
+file path=usr/lib/samba/$(MACH64)/vfs/offline.so
file path=usr/lib/samba/$(MACH64)/vfs/prealloc.so
file path=usr/lib/samba/$(MACH64)/vfs/preopen.so
file path=usr/lib/samba/$(MACH64)/vfs/readahead.so
file path=usr/lib/samba/$(MACH64)/vfs/readonly.so
file path=usr/lib/samba/$(MACH64)/vfs/recycle.so
-file path=usr/lib/samba/$(MACH64)/vfs/scannedonly.so
file path=usr/lib/samba/$(MACH64)/vfs/shadow_copy.so
file path=usr/lib/samba/$(MACH64)/vfs/shadow_copy2.so
-file path=usr/lib/samba/$(MACH64)/vfs/smb_traffic_analyzer.so
-file path=usr/lib/samba/$(MACH64)/vfs/solarisacl.so
+file path=usr/lib/samba/$(MACH64)/vfs/shell_snap.so
+file path=usr/lib/samba/$(MACH64)/vfs/snapper.so
file path=usr/lib/samba/$(MACH64)/vfs/streams_depot.so
file path=usr/lib/samba/$(MACH64)/vfs/streams_xattr.so
file path=usr/lib/samba/$(MACH64)/vfs/syncops.so
file path=usr/lib/samba/$(MACH64)/vfs/time_audit.so
+file path=usr/lib/samba/$(MACH64)/vfs/unityed_media.so
+file path=usr/lib/samba/$(MACH64)/vfs/worm.so
file path=usr/lib/samba/$(MACH64)/vfs/xattr_tdb.so
file path=usr/lib/samba/$(MACH64)/vfs/zfsacl.so
+file path=usr/lib/samba/$(MACH64)/winbind_krb5_locator.so
dir path=usr/lib/samba/bin
file path=usr/lib/samba/bin/cifsdd
file path=usr/lib/samba/bin/dbwrap_tool
@@ -644,11 +594,6 @@
file path=usr/lib/samba/bin/ndrdump
file path=usr/lib/samba/bin/net
file path=usr/lib/samba/bin/nmblookup
-file path=usr/lib/samba/bin/nmblookup4
-file path=usr/lib/samba/bin/ntdbbackup
-file path=usr/lib/samba/bin/ntdbdump
-file path=usr/lib/samba/bin/ntdbrestore
-file path=usr/lib/samba/bin/ntdbtool
file path=usr/lib/samba/bin/ntlm_auth
file path=usr/lib/samba/bin/oLschema2ldif
file path=usr/lib/samba/bin/pdbedit
@@ -662,14 +607,12 @@
file path=usr/lib/samba/bin/sharesec
file path=usr/lib/samba/bin/smbcacls
file path=usr/lib/samba/bin/smbclient
-file path=usr/lib/samba/bin/smbclient4
file path=usr/lib/samba/bin/smbcontrol
file path=usr/lib/samba/bin/smbcquotas
file path=usr/lib/samba/bin/smbget
file path=usr/lib/samba/bin/smbpasswd
file path=usr/lib/samba/bin/smbspool
file path=usr/lib/samba/bin/smbstatus
-file path=usr/lib/samba/bin/smbta-util
file path=usr/lib/samba/bin/smbtar
file path=usr/lib/samba/bin/smbtorture
file path=usr/lib/samba/bin/smbtree
@@ -679,24 +622,6 @@
file path=usr/lib/samba/bin/tdbtool
file path=usr/lib/samba/bin/testparm
file path=usr/lib/samba/bin/wbinfo
-dir path=usr/lib/samba/codepages
-file path=usr/lib/samba/codepages/lowcase.dat
-file path=usr/lib/samba/codepages/upcase.dat
-file path=usr/lib/samba/codepages/valid.dat
-file path=usr/lib/samba/libgensec.so.0
-file path=usr/lib/samba/libgssapi_krb5.so
-file path=usr/lib/samba/libndr-krb5pac.so.0
-file path=usr/lib/samba/libndr-nbt.so.0
-file path=usr/lib/samba/libndr-standard.so.0
-file path=usr/lib/samba/libndr.so.0
-file path=usr/lib/samba/libpdb.so.0
-file path=usr/lib/samba/libsamba-credentials.so.0
-file path=usr/lib/samba/libsamba-hostconfig.so.0
-file path=usr/lib/samba/libsamba-util.so.0
-file path=usr/lib/samba/libsamdb.so.0
-file path=usr/lib/samba/libsmbconf.so.0
-file path=usr/lib/samba/libsmbldap.so.0
-file path=usr/lib/samba/libtevent-util.so.0
file path=usr/lib/samba/libwbclient.so.0
file path=usr/lib/samba/nss_winbind.so.1
dir path=usr/lib/samba/perl5
@@ -736,158 +661,125 @@
file path=usr/lib/samba/perl5/Parse/Yapp/Driver.pm
dir path=usr/lib/samba/private
dir path=usr/lib/samba/private/$(MACH64)
-file path=usr/lib/samba/private/$(MACH64)/libCHARSET3.so
-file path=usr/lib/samba/private/$(MACH64)/libLIBWBCLIENT_OLD.so
-file path=usr/lib/samba/private/$(MACH64)/libMESSAGING.so
-file path=usr/lib/samba/private/$(MACH64)/libaddns.so
-file path=usr/lib/samba/private/$(MACH64)/libads.so
-file path=usr/lib/samba/private/$(MACH64)/libasn1util.so
-file path=usr/lib/samba/private/$(MACH64)/libauth.so
-file path=usr/lib/samba/private/$(MACH64)/libauth4.so
-file path=usr/lib/samba/private/$(MACH64)/libauth_sam_reply.so
-file path=usr/lib/samba/private/$(MACH64)/libauth_unix_token.so
-file path=usr/lib/samba/private/$(MACH64)/libauthkrb5.so
-file path=usr/lib/samba/private/$(MACH64)/libccan.so
-file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-common.so
-file path=usr/lib/samba/private/$(MACH64)/libcli-ldap.so
-file path=usr/lib/samba/private/$(MACH64)/libcli-nbt.so
-file path=usr/lib/samba/private/$(MACH64)/libcli_cldap.so
-file path=usr/lib/samba/private/$(MACH64)/libcli_smb_common.so
-file path=usr/lib/samba/private/$(MACH64)/libcli_spoolss.so
-file path=usr/lib/samba/private/$(MACH64)/libcliauth.so
-file path=usr/lib/samba/private/$(MACH64)/libcluster.so
-file path=usr/lib/samba/private/$(MACH64)/libcmdline-credentials.so
-file path=usr/lib/samba/private/$(MACH64)/libdbwrap.so
-file path=usr/lib/samba/private/$(MACH64)/libdcerpc-samba.so
+file path=usr/lib/samba/private/$(MACH64)/libCHARSET3-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libLIBWBCLIENT-OLD-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libMESSAGING-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libaddns-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libads-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libasn1util-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauth-sam-reply-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauth-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauth-unix-token-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauth4-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauthkrb5-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcli-cldap-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-common-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcli-nbt-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcli-smb-common-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcli-spoolss-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcliauth-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcluster-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libcmdline-credentials-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libdbwrap-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libdcerpc-samba-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libdcerpc-samba4.so
-file path=usr/lib/samba/private/$(MACH64)/libdfs_server_ad.so
-file path=usr/lib/samba/private/$(MACH64)/libdnsserver_common.so
-file path=usr/lib/samba/private/$(MACH64)/libdsdb-module.so
-file path=usr/lib/samba/private/$(MACH64)/liberrors.so
-file path=usr/lib/samba/private/$(MACH64)/libevents.so
-file path=usr/lib/samba/private/$(MACH64)/libflag_mapping.so
-file path=usr/lib/samba/private/$(MACH64)/libgpo.so
-file path=usr/lib/samba/private/$(MACH64)/libgse.so
-file path=usr/lib/samba/private/$(MACH64)/libidmap.so
-file path=usr/lib/samba/private/$(MACH64)/libiniparser.so
-file path=usr/lib/samba/private/$(MACH64)/libinterfaces.so
-file path=usr/lib/samba/private/$(MACH64)/libkrb5samba.so
-file path=usr/lib/samba/private/$(MACH64)/libldb-cmdline.so
-link path=usr/lib/samba/private/$(MACH64)/libldb.so.1 target=libldb.so.1.1.17
-file path=usr/lib/samba/private/$(MACH64)/libldb.so.1.1.17
-file path=usr/lib/samba/private/$(MACH64)/libldbsamba.so
-file path=usr/lib/samba/private/$(MACH64)/liblibcli_lsa3.so
-file path=usr/lib/samba/private/$(MACH64)/liblibcli_netlogon3.so
-file path=usr/lib/samba/private/$(MACH64)/liblibsmb.so
-file path=usr/lib/samba/private/$(MACH64)/libmsrpc3.so
-file path=usr/lib/samba/private/$(MACH64)/libndr-samba.so
+file path=usr/lib/samba/private/$(MACH64)/libdsdb-module-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libevents-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libflag-mapping-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libgenrand-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libgensec-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libgpo-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libgse-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libhttp-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libidmap-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libinterfaces-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libiov-buf-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libkrb5samba-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libldb-cmdline-samba4.so
+link path=usr/lib/samba/private/$(MACH64)/libldb.so.1 target=libldb.so.1.1.26
+file path=usr/lib/samba/private/$(MACH64)/libldb.so.1.1.26
+file path=usr/lib/samba/private/$(MACH64)/libldbsamba-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/liblibcli-lsa3-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/liblibcli-netlogon3-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/liblibsmb-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libmessages-dgm-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libmessages-util-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libmsghdr-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libmsrpc3-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libndr-samba-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libndr-samba4.so
-file path=usr/lib/samba/private/$(MACH64)/libnet_keytab.so
-file path=usr/lib/samba/private/$(MACH64)/libnetif.so
-file path=usr/lib/samba/private/$(MACH64)/libnon_posix_acls.so
-file path=usr/lib/samba/private/$(MACH64)/libnpa_tstream.so
-file path=usr/lib/samba/private/$(MACH64)/libnss_info.so
-file path=usr/lib/samba/private/$(MACH64)/libnss_wrapper.so
-link path=usr/lib/samba/private/$(MACH64)/libntdb.so.0 target=libntdb.so.0.9
-file path=usr/lib/samba/private/$(MACH64)/libntdb.so.0.9
-file path=usr/lib/samba/private/$(MACH64)/libpopt.so
-file path=usr/lib/samba/private/$(MACH64)/libpopt_samba3.so
-file path=usr/lib/samba/private/$(MACH64)/libprinting_migrate.so
+file path=usr/lib/samba/private/$(MACH64)/libnet-keytab-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libnetif-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libnon-posix-acls-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libnpa-tstream-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libnss-info-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libpopt-samba3-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libpopt-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libprinting-migrate-samba4.so
link path=usr/lib/samba/private/$(MACH64)/libpyldb-util.so.1 \
- target=libpyldb-util.so.1.1.17
-file path=usr/lib/samba/private/$(MACH64)/libpyldb-util.so.1.1.17
+ target=libpyldb-util.so.1.1.26
+file path=usr/lib/samba/private/$(MACH64)/libpyldb-util.so.1.1.26
link path=usr/lib/samba/private/$(MACH64)/libpytalloc-util.so.2 \
- target=libpytalloc-util.so.2.1.2
-file path=usr/lib/samba/private/$(MACH64)/libpytalloc-util.so.2.1.2
-file path=usr/lib/samba/private/$(MACH64)/libreplace.so
-file path=usr/lib/samba/private/$(MACH64)/libsamba-modules.so
-file path=usr/lib/samba/private/$(MACH64)/libsamba-net.so
-file path=usr/lib/samba/private/$(MACH64)/libsamba-security.so
-file path=usr/lib/samba/private/$(MACH64)/libsamba-sockets.so
-file path=usr/lib/samba/private/$(MACH64)/libsamba3-util.so
-file path=usr/lib/samba/private/$(MACH64)/libsamba_python.so
-file path=usr/lib/samba/private/$(MACH64)/libsamdb-common.so
-file path=usr/lib/samba/private/$(MACH64)/libsecrets3.so
-file path=usr/lib/samba/private/$(MACH64)/libserver-role.so
-file path=usr/lib/samba/private/$(MACH64)/libshares.so
-file path=usr/lib/samba/private/$(MACH64)/libsmb_transport.so
-file path=usr/lib/samba/private/$(MACH64)/libsmbd_base.so
-file path=usr/lib/samba/private/$(MACH64)/libsmbd_conn.so
-file path=usr/lib/samba/private/$(MACH64)/libsmbd_shim.so
-file path=usr/lib/samba/private/$(MACH64)/libsmbldaphelper.so
-file path=usr/lib/samba/private/$(MACH64)/libsmbpasswdparser.so
-file path=usr/lib/samba/private/$(MACH64)/libsmbregistry.so
-file path=usr/lib/samba/private/$(MACH64)/libsubunit.so
+ target=libpytalloc-util.so.2.1.6
+file path=usr/lib/samba/private/$(MACH64)/libpytalloc-util.so.2.1.6
+file path=usr/lib/samba/private/$(MACH64)/libregistry-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libreplace-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-cluster-support-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-debug-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-modules-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-net-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-python-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-security-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba-sockets-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamba3-util-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsamdb-common-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsecrets3-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libserver-id-db-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libserver-role-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libshares-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmb-transport-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbclient-raw-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbd-base-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbd-conn-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbd-shim-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbldaphelper-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbpasswdparser-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsmbregistry-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsocket-blocking-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libsys-rw-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libtalloc-report-samba4.so
link path=usr/lib/samba/private/$(MACH64)/libtalloc.so.2 \
- target=libtalloc.so.2.1.2
-file path=usr/lib/samba/private/$(MACH64)/libtalloc.so.2.1.2
-file path=usr/lib/samba/private/$(MACH64)/libtdb-wrap.so
-link path=usr/lib/samba/private/$(MACH64)/libtdb.so.1 target=libtdb.so.1.2.12
-file path=usr/lib/samba/private/$(MACH64)/libtdb.so.1.2.12
-file path=usr/lib/samba/private/$(MACH64)/libtdb_compat.so
+ target=libtalloc.so.2.1.6
+file path=usr/lib/samba/private/$(MACH64)/libtalloc.so.2.1.6
+file path=usr/lib/samba/private/$(MACH64)/libtdb-wrap-samba4.so
+link path=usr/lib/samba/private/$(MACH64)/libtdb.so.1 target=libtdb.so.1.3.8
+file path=usr/lib/samba/private/$(MACH64)/libtdb.so.1.3.8
link path=usr/lib/samba/private/$(MACH64)/libtevent.so.0 \
- target=libtevent.so.0.9.18
-file path=usr/lib/samba/private/$(MACH64)/libtevent.so.0.9.18
-file path=usr/lib/samba/private/$(MACH64)/libtrusts_util.so
-file path=usr/lib/samba/private/$(MACH64)/libutil_cmdline.so
-file path=usr/lib/samba/private/$(MACH64)/libutil_ntdb.so
-file path=usr/lib/samba/private/$(MACH64)/libutil_reg.so
-file path=usr/lib/samba/private/$(MACH64)/libutil_setid.so
-file path=usr/lib/samba/private/$(MACH64)/libutil_tdb.so
-file path=usr/lib/samba/private/$(MACH64)/libwinbind-client.so
-file path=usr/lib/samba/private/$(MACH64)/libxattr_tdb.so
-file path=usr/lib/samba/private/libCHARSET3.so
-file path=usr/lib/samba/private/libasn1util.so
-file path=usr/lib/samba/private/libauth_sam_reply.so
-file path=usr/lib/samba/private/libauthkrb5.so
-file path=usr/lib/samba/private/libccan.so
-file path=usr/lib/samba/private/libcli-ldap-common.so
-file path=usr/lib/samba/private/libcli_smb_common.so
-file path=usr/lib/samba/private/libcliauth.so
-file path=usr/lib/samba/private/libdbwrap.so
-file path=usr/lib/samba/private/liberrors.so
-file path=usr/lib/samba/private/libevents.so
-file path=usr/lib/samba/private/libflag_mapping.so
-file path=usr/lib/samba/private/libiniparser.so
-file path=usr/lib/samba/private/libinterfaces.so
-file path=usr/lib/samba/private/libkrb5samba.so
-file path=usr/lib/samba/private/libldb.so.1
-file path=usr/lib/samba/private/libldbsamba.so
-file path=usr/lib/samba/private/libndr-samba.so
-file path=usr/lib/samba/private/libnss_wrapper.so
-file path=usr/lib/samba/private/libntdb.so.0
-file path=usr/lib/samba/private/libpyldb-util.so.1
-file path=usr/lib/samba/private/libreplace.so
-file path=usr/lib/samba/private/libsamba-modules.so
-file path=usr/lib/samba/private/libsamba-security.so
-file path=usr/lib/samba/private/libsamba-sockets.so
-file path=usr/lib/samba/private/libsamba3-util.so
-file path=usr/lib/samba/private/libsamdb-common.so
-file path=usr/lib/samba/private/libsecrets3.so
-file path=usr/lib/samba/private/libserver-role.so
-file path=usr/lib/samba/private/libsmb_transport.so
-file path=usr/lib/samba/private/libsmbd_shim.so
-file path=usr/lib/samba/private/libsmbldaphelper.so
-file path=usr/lib/samba/private/libsmbregistry.so
+ target=libtevent.so.0.9.28
+file path=usr/lib/samba/private/$(MACH64)/libtevent.so.0.9.28
+file path=usr/lib/samba/private/$(MACH64)/libtime-basic-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libtorture-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libtrusts-util-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libutil-cmdline-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libutil-reg-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libutil-setid-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libutil-tdb-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libwinbind-client-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libxattr-tdb-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libz-samba4.so
+file path=usr/lib/samba/private/libreplace-samba4.so
file path=usr/lib/samba/private/libtalloc.so.2
-file path=usr/lib/samba/private/libtdb-wrap.so
-file path=usr/lib/samba/private/libtdb.so.1
-file path=usr/lib/samba/private/libtdb_compat.so
-file path=usr/lib/samba/private/libtevent.so.0
-file path=usr/lib/samba/private/libutil_ntdb.so
-file path=usr/lib/samba/private/libutil_reg.so
-file path=usr/lib/samba/private/libutil_setid.so
-file path=usr/lib/samba/private/libutil_tdb.so
-file path=usr/lib/samba/private/libwinbind-client.so
+file path=usr/lib/samba/private/libwinbind-client-samba4.so
+dir path=usr/lib/samba/samba
+file path=usr/lib/samba/samba/smbspool_krb5_wrapper
dir path=usr/lib/samba/sbin
file path=usr/lib/samba/sbin/nmbd
file path=usr/lib/samba/sbin/smbd
file path=usr/lib/samba/sbin/winbindd
dir path=usr/lib/samba/security
dir path=usr/lib/samba/security/$(MACH64)
-file path=usr/lib/samba/security/$(MACH64)/pam_smbpass.so
file path=usr/lib/samba/security/$(MACH64)/pam_winbind.so
-file path=usr/lib/samba/security/pam_smbpass.so
file path=usr/lib/samba/security/pam_winbind.so
file path=usr/share/man/man1/dbwrap_tool.1
file path=usr/share/man/man1/findsmb.1
@@ -903,7 +795,6 @@
file path=usr/share/man/man1/masktest.1
file path=usr/share/man/man1/ndrdump.1
file path=usr/share/man/man1/nmblookup.1
-file path=usr/share/man/man1/nmblookup4.1
file path=usr/share/man/man1/ntlm_auth.1
file path=usr/share/man/man1/oLschema2ldif.1
file path=usr/share/man/man1/profiles.1
@@ -926,7 +817,6 @@
file path=usr/share/man/man1/vfstest.1
file path=usr/share/man/man1/wbinfo.1
file path=usr/share/man/man3/ldb.3
-file path=usr/share/man/man3/ntdb.3
file path=usr/share/man/man3/talloc.3
file path=usr/share/man/man5/lmhosts.5
file path=usr/share/man/man5/pam_winbind.conf.5
@@ -935,6 +825,8 @@
file path=usr/share/man/man5/smbpasswd.5
file path=usr/share/man/man7/libsmbclient.7
file path=usr/share/man/man7/samba.7
+file path=usr/share/man/man7/winbind_krb5_locator.7
+file path=usr/share/man/man8/cifsdd.8
file path=usr/share/man/man8/eventlogadm.8
file path=usr/share/man/man8/idmap_ad.8
file path=usr/share/man/man8/idmap_autorid.8
@@ -947,10 +839,6 @@
file path=usr/share/man/man8/idmap_tdb2.8
file path=usr/share/man/man8/net.8
file path=usr/share/man/man8/nmbd.8
-file path=usr/share/man/man8/ntdbbackup.8
-file path=usr/share/man/man8/ntdbdump.8
-file path=usr/share/man/man8/ntdbrestore.8
-file path=usr/share/man/man8/ntdbtool.8
file path=usr/share/man/man8/pam_winbind.8
file path=usr/share/man/man8/pdbedit.8
file path=usr/share/man/man8/samba-regedit.8
@@ -959,7 +847,7 @@
file path=usr/share/man/man8/smbd.8
file path=usr/share/man/man8/smbpasswd.8
file path=usr/share/man/man8/smbspool.8
-file path=usr/share/man/man8/smbta-util.8
+file path=usr/share/man/man8/smbspool_krb5_wrapper.8
file path=usr/share/man/man8/tdbbackup.8
file path=usr/share/man/man8/tdbdump.8
file path=usr/share/man/man8/tdbrestore.8
@@ -974,6 +862,7 @@
file path=usr/share/man/man8/vfs_cacheprime.8
file path=usr/share/man/man8/vfs_cap.8
file path=usr/share/man/man8/vfs_catia.8
+file path=usr/share/man/man8/vfs_ceph.8
file path=usr/share/man/man8/vfs_commit.8
file path=usr/share/man/man8/vfs_crossrename.8
file path=usr/share/man/man8/vfs_default_quota.8
@@ -981,27 +870,30 @@
file path=usr/share/man/man8/vfs_extd_audit.8
file path=usr/share/man/man8/vfs_fake_perms.8
file path=usr/share/man/man8/vfs_fileid.8
+file path=usr/share/man/man8/vfs_fruit.8
file path=usr/share/man/man8/vfs_full_audit.8
file path=usr/share/man/man8/vfs_glusterfs.8
file path=usr/share/man/man8/vfs_gpfs.8
file path=usr/share/man/man8/vfs_linux_xfs_sgid.8
file path=usr/share/man/man8/vfs_media_harmony.8
file path=usr/share/man/man8/vfs_netatalk.8
-file path=usr/share/man/man8/vfs_notify_fam.8
+file path=usr/share/man/man8/vfs_offline.8
file path=usr/share/man/man8/vfs_prealloc.8
file path=usr/share/man/man8/vfs_preopen.8
file path=usr/share/man/man8/vfs_readahead.8
file path=usr/share/man/man8/vfs_readonly.8
file path=usr/share/man/man8/vfs_recycle.8
-file path=usr/share/man/man8/vfs_scannedonly.8
file path=usr/share/man/man8/vfs_shadow_copy.8
file path=usr/share/man/man8/vfs_shadow_copy2.8
-file path=usr/share/man/man8/vfs_smb_traffic_analyzer.8
+file path=usr/share/man/man8/vfs_shell_snap.8
+file path=usr/share/man/man8/vfs_snapper.8
file path=usr/share/man/man8/vfs_streams_depot.8
file path=usr/share/man/man8/vfs_streams_xattr.8
file path=usr/share/man/man8/vfs_syncops.8
file path=usr/share/man/man8/vfs_time_audit.8
file path=usr/share/man/man8/vfs_tsmsm.8
+file path=usr/share/man/man8/vfs_unityed_media.8
+file path=usr/share/man/man8/vfs_worm.8
file path=usr/share/man/man8/vfs_xattr_tdb.8
file path=usr/share/man/man8/winbindd.8
dir path=var