PORTNAME=			${SAMBA4_BASENAME}413

PORTNAME=			${SAMBA4_BASENAME}413

PORTVERSION=			${SAMBA4_VERSION}

PORTVERSION=			${SAMBA4_VERSION}

CATEGORIES?=			net

CATEGORIES?=			net

MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc

MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc

DISTNAME=			${SAMBA4_DISTNAME}

DISTNAME=			${SAMBA4_DISTNAME}

SAMBA4_BASENAME=		samba

SAMBA4_BASENAME=		samba

SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4

SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4

SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}

SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}

WRKSRC?=			${WRKDIR}/${DISTNAME}

WRKSRC?=			${WRKDIR}/${DISTNAME}

# Readline(sponsored by Python)

# Readline(sponsored by Python)

# XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency

# XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency

LIB_DEPENDS+=			libreadline.so:devel/readline

LIB_DEPENDS+=			libreadline.so:devel/readline

# popt

# popt

LIB_DEPENDS+=			libpopt.so:devel/popt

LIB_DEPENDS+=			libpopt.so:devel/popt

# inotify

# inotify

CUPS_CONFIGURE_ENABLE=		cups iprint

CUPS_CONFIGURE_ENABLE=		cups iprint

CUPS_LIB_DEPENDS=		libcups.so:print/cups

CUPS_LIB_DEPENDS=		libcups.so:print/cups

# https://bugzilla.samba.org/show_bug.cgi?id=9545

# https://bugzilla.samba.org/show_bug.cgi?id=9545

FAM_USES=			fam

FAM_USES=			fam

FAM_CONFIGURE_WITH=		fam

FAM_CONFIGURE_WITH=		fam

         s3conf = s3param.get_context()

         s3conf = s3param.get_context()

         s3conf.load(lp.configfile)

         s3conf.load(lp.configfile)

                                         "Try the mounting the filesystem with the 'acl' option.")

                                         "Try the mounting the filesystem with the 'acl' option.")

             try:

             try:

                 smbd.chown(file.name, uid, gid, system_session_unix())

                 smbd.chown(file.name, uid, gid, system_session_unix())

         samdb.transaction_commit()

         samdb.transaction_commit()

     if serverrole == "active directory domain controller":

     if serverrole == "active directory domain controller":

         # Continue setting up sysvol for GPO. This appears to require being

         # Continue setting up sysvol for GPO. This appears to require being

         # outside a transaction.

         # outside a transaction.

         if not skip_sysvolacl:

         if not skip_sysvolacl:

             if not os.path.isdir(paths.netlogon):

             if not os.path.isdir(paths.netlogon):

                 os.makedirs(paths.netlogon, 0o755)

                 os.makedirs(paths.netlogon, 0o755)

         if adminpass is None:

         if adminpass is None:

             adminpass = samba.generate_random_password(12, 32)

             adminpass = samba.generate_random_password(12, 32)

@@ -38,6 +38,16 @@

@@ -38,6 +38,16 @@

 #include "modules/vfs_hpuxacl.h"

 #include "modules/vfs_hpuxacl.h"

 #endif

 #endif

 #undef  DBGC_CLASS

 #undef  DBGC_CLASS

 #define DBGC_CLASS DBGC_ACLS

 #define DBGC_CLASS DBGC_ACLS

 		} else {

 		} else {

 			if (lp_parm_const_string(-1, "xattr_tdb", "file", NULL)) {

 			if (lp_parm_const_string(-1, "xattr_tdb", "file", NULL)) {

 				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr xattr_tdb");

 				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr xattr_tdb");

 				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr");

 				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr");

 			}

 			}

 		}

 		}

 	return acl;

 	return acl;

 }

 }

 /*

 /*

   set a simple ACL on a file, as a test

   set a simple ACL on a file, as a test

  */

  */

 	Py_RETURN_NONE;

 	Py_RETURN_NONE;

 }

 }

   chown a file

   chown a file

  */

  */

 static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)

 static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)

 }

 }

 /*

 /*

  */

  */

 static PyObject *py_smbd_have_posix_acls(PyObject *self,

 static PyObject *py_smbd_have_posix_acls(PyObject *self,

 		PyObject *Py_UNUSED(ignored))

 		PyObject *Py_UNUSED(ignored))

 #endif

 #endif

 }

 }

   set the NT ACL on a file

   set the NT ACL on a file

  */

  */

 static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)

 static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)

 	{ "have_posix_acls",

 	{ "have_posix_acls",

 		(PyCFunction)py_smbd_have_posix_acls, METH_NOARGS,

 		(PyCFunction)py_smbd_have_posix_acls, METH_NOARGS,

 		NULL },

 		NULL },

 		METH_VARARGS|METH_KEYWORDS,

 		METH_VARARGS|METH_KEYWORDS,

 		NULL },

 		NULL },

 	{ "set_nt_acl",

 	{ "set_nt_acl",

 cat <<EOF

 cat <<EOF

 set height 0

 set height 0

 set width 0

 set width 0

 ) > $GDBSCRIPT

 ) > $GDBSCRIPT

 # forcing the terminal avoids a problem on Fedora12

 # forcing the terminal avoids a problem on Fedora12

+TERM=none %%GDB_CMD%% -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null | sed -e 's/:type =/:/g'

+TERM=none %%GDB_CMD%% -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null | sed -e 's/:type =/:/g'

 rm -f $GDBSCRIPT

 rm -f $GDBSCRIPT

 @conf

 @conf

     '''check if a set of libraries exist as system libraries

     '''check if a set of libraries exist as system libraries

     returns the sublist of libs that do exist as a syslib or []

     returns the sublist of libs that do exist as a syslib or []

             ret.append(lib)

             ret.append(lib)

             continue

             continue

         if not res:

         if not res:

             if mandatory:

             if mandatory:

         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)

         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)

         if (conf.env.undefined_ignore_ldflags == [] and

         if (conf.env.undefined_ignore_ldflags == [] and

                 inst_name    = bld.make_libname(t.target)

                 inst_name    = bld.make_libname(t.target)

         elif self.vnum:

         elif self.vnum:

             vnum_base    = self.vnum.split('.')[0]

             vnum_base    = self.vnum.split('.')[0]

+            install_name = bld.make_libname(target_name, version=vnum_base)

+            install_name = bld.make_libname(target_name, version=vnum_base)

             install_link = bld.make_libname(target_name, version=vnum_base)

             install_link = bld.make_libname(target_name, version=vnum_base)

             inst_name    = bld.make_libname(t.target)

             inst_name    = bld.make_libname(t.target)

     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'

     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'

     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'

     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'

     bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'

     bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'

                    help=("private library directory [PREFIX/lib/%s]" % Context.g_module.APPNAME),

                    help=("private library directory [PREFIX/lib/%s]" % Context.g_module.APPNAME),

                    action="store", dest='PRIVATELIBDIR', default=None)

                    action="store", dest='PRIVATELIBDIR', default=None)

     opt.add_option('--enable-ceph-reclock',

     opt.add_option('--enable-ceph-reclock',

                    help=("Enable Ceph CTDB recovery lock helper (default=no)"),

                    help=("Enable Ceph CTDB recovery lock helper (default=no)"),

                    action="store_true", dest='ctdb_ceph_reclock', default=False)

                    action="store_true", dest='ctdb_ceph_reclock', default=False)

     opt.add_option('--with-logdir',

     opt.add_option('--with-logdir',

                    help=("Path to log directory"),

                    help=("Path to log directory"),

     if Options.options.ctdb_ceph_reclock:

     if Options.options.ctdb_ceph_reclock:

         if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and

         if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and

             Logs.info('Building with Ceph librados recovery lock support')

             Logs.info('Building with Ceph librados recovery lock support')

             conf.define('HAVE_LIBRADOS', 1)

             conf.define('HAVE_LIBRADOS', 1)

         else:

         else:

                     conf.env.CTDB_VARDIR,

                     conf.env.CTDB_VARDIR,

                     conf.env.CTDB_RUNDIR))

                     conf.env.CTDB_RUNDIR))

     # Allow unified compilation and separate compilation of utilities

     # Allow unified compilation and separate compilation of utilities

     # to find includes

     # to find includes

     if not conf.env.standalone_ctdb:

     if not conf.env.standalone_ctdb:

     if bld.env.HAVE_LIBRADOS:

     if bld.env.HAVE_LIBRADOS:

         bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',

         bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',

                          source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',

                          source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',

     sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g'  % (bld.env.CTDB_VARDIR)

     sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g'  % (bld.env.CTDB_VARDIR)

     sed_expr2 = 's|/usr/local/etc/ctdb|%s|g'      % (bld.env.CTDB_ETCDIR)

     sed_expr2 = 's|/usr/local/etc/ctdb|%s|g'      % (bld.env.CTDB_ETCDIR)

     for d in ['volatile', 'persistent', 'state']:

     for d in ['volatile', 'persistent', 'state']:

         bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))

         bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))

@@ -28,6 +28,9 @@

@@ -28,6 +28,9 @@

 #include "lib/util/util_tdb.h"

 #include "lib/util/util_tdb.h"

 #include "lib/util/tevent_ntstatus.h"

 #include "lib/util/tevent_ntstatus.h"

 /*

 /*

  * Fall back using fetch if no genuine exists operation is provided

  * Fall back using fetch if no genuine exists operation is provided

  */

  */

@@ -23,6 +23,9 @@

@@ -23,6 +23,9 @@

 #include "dbwrap/dbwrap_tdb.h"

 #include "dbwrap/dbwrap_tdb.h"

 #include "tdb.h"

 #include "tdb.h"

 struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,

 struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,

 				     const char *name,

 				     const char *name,

 				     int hash_size, int tdb_flags,

 				     int hash_size, int tdb_flags,

@@ -24,6 +24,9 @@

@@ -24,6 +24,9 @@

 #include "../lib/util/rbtree.h"

 #include "../lib/util/rbtree.h"

 #include "../lib/util/dlinklist.h"

 #include "../lib/util/dlinklist.h"

 #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)

 #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)

 struct db_rbt_ctx {

 struct db_rbt_ctx {

 #include "lib/param/param.h"

 #include "lib/param/param.h"

 #include "libcli/util/error.h"

 #include "libcli/util/error.h"

 struct db_tdb_ctx {

 struct db_tdb_ctx {

 	struct tdb_wrap *wtdb;

 	struct tdb_wrap *wtdb;

@@ -26,6 +26,9 @@

@@ -26,6 +26,9 @@

 #include "dbwrap.h"

 #include "dbwrap.h"

 #include "lib/util/util_tdb.h"

 #include "lib/util/util_tdb.h"

 struct dbwrap_fetch_int32_state {

 struct dbwrap_fetch_int32_state {

 	NTSTATUS status;

 	NTSTATUS status;

 	int32_t result;

 	int32_t result;

@@ -38,6 +38,9 @@

@@ -38,6 +38,9 @@

 #include "lib/cluster_support.h"

 #include "lib/cluster_support.h"

 #include "lib/util/tevent_ntstatus.h"

 #include "lib/util/tevent_ntstatus.h"

 struct db_ctdb_transaction_handle {

 struct db_ctdb_transaction_handle {

 	struct db_ctdb_ctx *ctx;

 	struct db_ctdb_ctx *ctx;

 	/*

 	/*

@@ -31,6 +31,9 @@

@@ -31,6 +31,9 @@

 #include "ctdbd_conn.h"

 #include "ctdbd_conn.h"

 #include "messages.h"

 #include "messages.h"

 bool db_is_local(const char *name)

 bool db_is_local(const char *name)

 {

 {

 	const char *sockname = lp_ctdbd_socket();

 	const char *sockname = lp_ctdbd_socket();

@@ -28,6 +28,9 @@

@@ -28,6 +28,9 @@

 #include "server_id_watch.h"

 #include "server_id_watch.h"

 #include "lib/dbwrap/dbwrap_private.h"

 #include "lib/dbwrap/dbwrap_private.h"

     'PKGCONFIGDIR' : {

     'PKGCONFIGDIR' : {

          'STD-PATH':  '${LIBDIR}/pkgconfig',

          'STD-PATH':  '${LIBDIR}/pkgconfig',

          'FHS-PATH':  '${LIBDIR}/pkgconfig',

          'FHS-PATH':  '${LIBDIR}/pkgconfig',

     },

     },

     'CODEPAGEDIR' : {

     'CODEPAGEDIR' : {

          'STD-PATH':  '${DATADIR}/codepages',

          'STD-PATH':  '${DATADIR}/codepages',

          'DELAY':     True,

          'DELAY':     True,

     },

     },

     'CONFIGFILE' : {

     'CONFIGFILE' : {

          'DELAY':     True,

          'DELAY':     True,

     },

     },

     'LMHOSTSFILE' : {

     'LMHOSTSFILE' : {

         flavor = 'FHS-PATH'

         flavor = 'FHS-PATH'

     else:

     else:

         flavor = 'STD-PATH'

         flavor = 'STD-PATH'

 {

 {

 	const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1;

 	const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1;

 	const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2;

 	const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2;

     if bld.env.standalone_ldb:

     if bld.env.standalone_ldb:

         if not 'PACKAGE_VERSION' in bld.env:

         if not 'PACKAGE_VERSION' in bld.env:

             bld.env.PACKAGE_VERSION = VERSION

             bld.env.PACKAGE_VERSION = VERSION

         private_library = False

         private_library = False

     else:

     else:

         private_library = True

         private_library = True

                           pc_files='ldb.pc',

                           pc_files='ldb.pc',

                           vnum=VERSION,

                           vnum=VERSION,

                           private_library=private_library,

                           private_library=private_library,

                           abi_directory='ABI',

                           abi_directory='ABI',

                           abi_match = abi_match)

                           abi_match = abi_match)

         LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'

         LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'

         for t in LDB_TOOLS.split():

         for t in LDB_TOOLS.split():

                              manpages='man/%s.1' % t)

                              manpages='man/%s.1' % t)

         # ldbtest doesn't get installed

         # ldbtest doesn't get installed

         else:

         else:

             lmdb_deps = ''

             lmdb_deps = ''

         # ldbdump doesn't get installed

         # ldbdump doesn't get installed

         bld.SAMBA_LIBRARY('ldb-cmdline',

         bld.SAMBA_LIBRARY('ldb-cmdline',

                           source='tools/ldbutil.c tools/cmdline.c',

                           source='tools/ldbutil.c tools/cmdline.c',

                          deps='cmocka ldb',

                          deps='cmocka ldb',

                          install=False)

                          install=False)

         bld.SAMBA_BINARY('ldb_key_value_test',

         bld.SAMBA_BINARY('ldb_key_value_test',

                          source='tests/ldb_key_value_test.c',

                          source='tests/ldb_key_value_test.c',

                          deps='cmocka ldb ldb_tdb_err_map',

                          deps='cmocka ldb ldb_tdb_err_map',

                  'ldb_msg_test',

                  'ldb_msg_test',

                  'ldb_tdb_kv_ops_test',

                  'ldb_tdb_kv_ops_test',

                  'ldb_tdb_test',

                  'ldb_tdb_test',

     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')

     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')

     conf.CHECK_HEADERS('libgen.h')

     conf.CHECK_HEADERS('libgen.h')

 void talloc_lib_init(void)

 void talloc_lib_init(void)

 {

 {

 	uint32_t random_value;

 	uint32_t random_value;

 #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)

 #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)

 	uint8_t *p;

 	uint8_t *p;

 	/*

 	/*

 		 */

 		 */

 		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);

 		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);

 	}

 	}

     bld.SAMBA_LIBRARY('samba-modules',

     bld.SAMBA_LIBRARY('samba-modules',

                       source='modules.c',

                       source='modules.c',

 		exit(1);

 		exit(1);

 	}

 	}

 	if (ret == -1) {

 	if (ret == -1) {

 		perror("listen() failed");

 		perror("listen() failed");

 		exit(1);

 		exit(1);

 #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)

 #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)

 /* size of listen() backlog in smbd */

 /* size of listen() backlog in smbd */

 /* Number of microseconds to wait before a sharing violation. */

 /* Number of microseconds to wait before a sharing violation. */

 #define SHARING_VIOLATION_USEC_WAIT 950000

 #define SHARING_VIOLATION_USEC_WAIT 950000

 		status = map_nt_error_from_unix(errno);

 		status = map_nt_error_from_unix(errno);

 		goto fail;

 		goto fail;

 	}

 	}

 	if (rc < 0) {

 	if (rc < 0) {

 		status = map_nt_error_from_unix(errno);

 		status = map_nt_error_from_unix(errno);

 		goto fail;

 		goto fail;

 		goto out;

 		goto out;

 	}

 	}

-	rc = listen(state->fd, 5);

-	rc = listen(state->fd, 5);

+	rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG);

+	rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG);

 	if (rc < 0) {

 	if (rc < 0) {

 		goto out;

 		goto out;

 	}

 	}

-	rc = listen(state->fd, 5);

-	rc = listen(state->fd, 5);

+	rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG);

+	rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG);

 	if (rc < 0) {

 	if (rc < 0) {

 		exit(1);

 		exit(1);

 	}

 	}

 		d_printf("listen failed\n");

 		d_printf("listen failed\n");

 	}

 	}

 	if (pub_state->fd == -1) {

 	if (pub_state->fd == -1) {

 		goto failed;

 		goto failed;

 	}

 	}

 	if (rc < 0) {

 	if (rc < 0) {

 		goto failed;

 		goto failed;

 	}

 	}

 	if (priv_state->fd == -1) {

 	if (priv_state->fd == -1) {

 		goto failed;

 		goto failed;

 	}

 	}

  * the *bottom* of include files so as not to conflict. */

  * the *bottom* of include files so as not to conflict. */

 #ifdef ENABLE_DMALLOC

 #ifdef ENABLE_DMALLOC

 #  include <dmalloc.h>

 #  include <dmalloc.h>

 int timeval_to_msec(struct timeval t)

 int timeval_to_msec(struct timeval t)

 {

 {

 	struct gse_context *gse_ctx =

 	struct gse_context *gse_ctx =

 		talloc_get_type_abort(gensec_security->private_data,

 		talloc_get_type_abort(gensec_security->private_data,

 				      struct gse_context);

 				      struct gse_context);

Signed-off-by: Ralph Boehme <slow@samba.org>

Signed-off-by: Ralph Boehme <slow@samba.org>

 	return AFP_INFO_SIZE;

 	return AFP_INFO_SIZE;

 }

 }

 /**

 /**

  * Unpack a buffer into a AfpInfo structure

  * Unpack a buffer into a AfpInfo structure

  *

  *

 	ai->afpi_Version = RIVAL(data, 4);

 	ai->afpi_Version = RIVAL(data, 4);

 	ai->afpi_BackupTime = RIVAL(data, 12);

 	ai->afpi_BackupTime = RIVAL(data, 12);

 	memcpy(ai->afpi_FinderInfo, (const char *)data + 16,

 	memcpy(ai->afpi_FinderInfo, (const char *)data + 16,

 	}

 	}

 	return ai;

 	return ai;

 	ssize_t nread;

 	ssize_t nread;

 	int ret;

 	int ret;

+	char *p = (char *)data;

+	char *p = (char *)data;

 	nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);

 	nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);

-	if (nread == -1 || nread == n) {

-	if (nread == -1 || nread == n) {

+

+

+	if (nread == n) {

+	if (nread == n) {

+		if (offset == 0 && nread > 3 && p[0] == 0 && p[1] == 'F' && p[2] == 'P') {

+		if (offset == 0 && nread > 3 && p[0] == 0 && p[1] == 'F' && p[2] == 'P') {

+			DBG_NOTICE("Fixing AFP_Info of [%s]\n",

+			DBG_NOTICE("Fixing AFP_Info of [%s]\n",

+			p[0] = 'A';

+			p[0] = 'A';

+		}

+		}

 		return nread;

 		return nread;

@@ -1,10 +1,10 @@

@@ -1,10 +1,10 @@

 /*

 /*

  * Store streams in xattrs

  * Store streams in xattrs

  * Copyright (C) James Peach 2006-2007

  * Copyright (C) James Peach 2006-2007

  *

  *

  * This program is free software; you can redistribute it and/or modify

  * This program is free software; you can redistribute it and/or modify

 static ssize_t get_xattr_size(connection_struct *conn,

 static ssize_t get_xattr_size(connection_struct *conn,

-				const struct smb_filename *smb_fname,

-				const struct smb_filename *smb_fname,

 /**

 /**

  * Given a stream name, populate xattr_name with the xattr name to use for

  * Given a stream name, populate xattr_name with the xattr name to use for

  * accessing the stream.

  * accessing the stream.

 	SMB_VFS_HANDLE_GET_DATA(handle, config, struct streams_xattr_config,

 	SMB_VFS_HANDLE_GET_DATA(handle, config, struct streams_xattr_config,

 				return NT_STATUS_UNSUCCESSFUL);

 				return NT_STATUS_UNSUCCESSFUL);

 	sname = talloc_strdup(ctx, stream_name + 1);

 	sname = talloc_strdup(ctx, stream_name + 1);

 	if (sname == NULL) {

 	if (sname == NULL) {

 		return NT_STATUS_NO_MEMORY;

 		return NT_STATUS_NO_MEMORY;

 	 * characters from their on-the-wire Unicode Private Range

 	 * characters from their on-the-wire Unicode Private Range

 	 * encoding to their native ASCII representation.

 	 * encoding to their native ASCII representation.

 	 *

 	 *

 	 * vfs_streams_xattr) may contain a colon, so we have to use

 	 * vfs_streams_xattr) may contain a colon, so we have to use

 	 * strrchr_m() instead of strchr_m() for matching the stream

 	 * strrchr_m() instead of strchr_m() for matching the stream

 	 * type suffix.

 	 * type suffix.

 		return NT_STATUS_NO_MEMORY;

 		return NT_STATUS_NO_MEMORY;

 	}

 	}

 		   stream_name));

 		   stream_name));

 	talloc_free(sname);

 	talloc_free(sname);

 		return -1;

 		return -1;

 	}

 	}

 	if (sbuf->st_ex_size == -1) {

 	if (sbuf->st_ex_size == -1) {

 		TALLOC_FREE(smb_fname_base);

 		TALLOC_FREE(smb_fname_base);

 		SET_STAT_INVALID(*sbuf);

 		SET_STAT_INVALID(*sbuf);

 		goto fail;

 		goto fail;

 	}

 	}

 	if (!NT_STATUS_IS_OK(status)) {

 	if (!NT_STATUS_IS_OK(status)) {

 		if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {

 		if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {

 		/*

 		/*

 		 * The attribute does not exist or needs to be truncated

 		 * The attribute does not exist or needs to be truncated

 		 */

 		 */

 				       flags & O_EXCL ? XATTR_CREATE : 0);

 				       flags & O_EXCL ? XATTR_CREATE : 0);

 		if (ret != 0) {

 		if (ret != 0) {

 			goto fail;

 			goto fail;

 	}

 	}

 	/* read the old stream */

 	/* read the old stream */

 	if (!NT_STATUS_IS_OK(status)) {

 	if (!NT_STATUS_IS_OK(status)) {

 		errno = ENOENT;

 		errno = ENOENT;

 		goto fail;

 		goto fail;

 			continue;

 			continue;

 		}

 		}

 				names[i],

 				names[i],

 				smb_fname->base_name,

 				smb_fname->base_name,

 				nt_errstr(status)));

 				nt_errstr(status)));

 	NTSTATUS status;

 	NTSTATUS status;

 };

 };

 		state->status = NT_STATUS_NO_MEMORY;

 		state->status = NT_STATUS_NO_MEMORY;

 		return false;

 		return false;

 	}

 	}

 				    files_struct *fsp, const void *data,

 				    files_struct *fsp, const void *data,

 				    size_t n, off_t offset)

 				    size_t n, off_t offset)

 {

 {

 	if (sio == NULL) {

 	if (sio == NULL) {

 		return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);

 		return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);

 		return -1;

 		return -1;

 	}

 	}

 	/* Create an smb_filename with stream_name == NULL. */

 	/* Create an smb_filename with stream_name == NULL. */

 	smb_fname_base = synthetic_smb_fname(talloc_tos(),

 	smb_fname_base = synthetic_smb_fname(talloc_tos(),

 					sio->base,

 					sio->base,

 					fsp->fsp_name->flags);

 					fsp->fsp_name->flags);

 	if (smb_fname_base == NULL) {

 	if (smb_fname_base == NULL) {

+		TALLOC_FREE(frame);

+		TALLOC_FREE(frame);

-	status = get_ea_value(talloc_tos(), handle->conn, NULL,

-	status = get_ea_value(talloc_tos(), handle->conn, NULL,

-			      smb_fname_base, sio->xattr_name, &ea);

-			      smb_fname_base, sio->xattr_name, &ea);

+	status = get_xattr_value(talloc_tos(), handle->conn,

+	status = get_xattr_value(talloc_tos(), handle->conn,

+				 smb_fname_base, sio->xattr_name, &ea);

+				 smb_fname_base, sio->xattr_name, &ea);

+	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {

+	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {

+		/*

+		/*

+		 * This can happen if we sit behind vfs_fruit:

+		 * This can happen if we sit behind vfs_fruit:

+		 *

+		 *

+		 * This might be not the last word on this.

+		 * This might be not the last word on this.

+		 */

+		 */

+		ea = (struct ea_struct) {0};

+		ea = (struct ea_struct) {0};

+		ea.name = talloc_strdup(talloc_tos(), sio->xattr_name);

+		ea.name = talloc_strdup(talloc_tos(), sio->xattr_name);

+		if (ea.name == NULL) {

+		if (ea.name == NULL) {

+		}

+		}

+		status = NT_STATUS_OK;

+		status = NT_STATUS_OK;

+	}

+	}

+		TALLOC_FREE(frame);

+		TALLOC_FREE(frame);

+	// ? -1

+	// ? -1

+	if ((offset + n) > ea.value.length) {

+	if ((offset + n) > ea.value.length) {

+		if(!data_blob_realloc(talloc_tos(), &ea.value, offset + n)) {

+		if(!data_blob_realloc(talloc_tos(), &ea.value, offset + n)) {

+	}

+	}

+	memcpy(ea.value.data + offset, data, n);

+	memcpy(ea.value.data + offset, data, n);

 	ret = SMB_VFS_SETXATTR(fsp->conn,

 	ret = SMB_VFS_SETXATTR(fsp->conn,

 			       fsp->fsp_name,

 			       fsp->fsp_name,

 			       sio->xattr_name,

 			       sio->xattr_name,

 			       ea.value.data, ea.value.length, 0);

 			       ea.value.data, ea.value.length, 0);

-	TALLOC_FREE(ea.value.data);

-	TALLOC_FREE(ea.value.data);

+

+

 	if (ret == -1) {

 	if (ret == -1) {

 		return -1;

 		return -1;

 				   files_struct *fsp, void *data,

 				   files_struct *fsp, void *data,

 				   size_t n, off_t offset)

 				   size_t n, off_t offset)

 {

 {

 	if (sio == NULL) {

 	if (sio == NULL) {

 		return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);

 		return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);

 		return -1;

 		return -1;

 	}

 	}

 	/* Create an smb_filename with stream_name == NULL. */

 	/* Create an smb_filename with stream_name == NULL. */

 	smb_fname_base = synthetic_smb_fname(talloc_tos(),

 	smb_fname_base = synthetic_smb_fname(talloc_tos(),

 					sio->base,

 					sio->base,

 					fsp->fsp_name->flags);

 					fsp->fsp_name->flags);

 	if (smb_fname_base == NULL) {

 	if (smb_fname_base == NULL) {

+		TALLOC_FREE(frame);

+		TALLOC_FREE(frame);

 }

 }

 struct streams_xattr_pread_state {

 struct streams_xattr_pread_state {

 					struct files_struct *fsp,

 					struct files_struct *fsp,

 					off_t offset)

 					off_t offset)

 {

 {

+	NTSTATUS status;

+	NTSTATUS status;

+	size_t orig_length;

+	size_t orig_length;

+	int ret;

+	int ret;

+	DEBUG(10, ("streams_xattr_ftruncate: called for file '%s' with offset %lu\n",

+	DEBUG(10, ("streams_xattr_ftruncate: called for file '%s' with offset %lu\n",

+		   fsp_str_dbg(fsp), (unsigned long)offset));

+		   fsp_str_dbg(fsp), (unsigned long)offset));

 	if (sio == NULL) {

 	if (sio == NULL) {

 		return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);

 		return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);

 		return -1;

 		return -1;

 	}

 	}

 	/* Create an smb_filename with stream_name == NULL. */

 	/* Create an smb_filename with stream_name == NULL. */

 	smb_fname_base = synthetic_smb_fname(talloc_tos(),

 	smb_fname_base = synthetic_smb_fname(talloc_tos(),

 					sio->base,

 					sio->base,

 					fsp->fsp_name->flags);

 					fsp->fsp_name->flags);

 	if (smb_fname_base == NULL) {

 	if (smb_fname_base == NULL) {

+		TALLOC_FREE(frame);

+		TALLOC_FREE(frame);

 	if (ret == -1) {

 	if (ret == -1) {

 		return -1;

 		return -1;

         struct stream_io *sio =

         struct stream_io *sio =

 		(struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp);

 		(struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp);

 	struct virusfilter_io_handle *io_h,

 	struct virusfilter_io_handle *io_h,

+	const char *data_fmt, ...) PRINTF_ATTRIBUTE(2, 3);

+	const char *data_fmt, ...) PRINTF_ATTRIBUTE(2, 3);

+

+

 	const char *data_fmt, ...)

 	const char *data_fmt, ...)

 {

 {

 	va_list ap;

 	va_list ap;

 	struct virusfilter_io_handle *io_h,

 	struct virusfilter_io_handle *io_h,

+	const char *data_fmt, va_list ap) PRINTF_ATTRIBUTE(2, 0);

+	const char *data_fmt, va_list ap) PRINTF_ATTRIBUTE(2, 0);

+

+

 	const char *data_fmt, va_list ap)

 	const char *data_fmt, va_list ap)

 {

 {

 	char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE];

 	char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE];

+	const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);

+	const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);

+

+

+bool virusfilter_io_writefl_readl(

+bool virusfilter_io_writefl_readl(

 	const char *fmt, ...)

 	const char *fmt, ...)

 #include <errno.h>

 #include <errno.h>

 #include <stdlib.h>

 #include <stdlib.h>

 		lp_set_cmdline("netbios name", c->opt_requester_name);

 		lp_set_cmdline("netbios name", c->opt_requester_name);

 	}

 	}

 	if (!tm) {

 	if (!tm) {

 		return "unknown";

 		return "unknown";

 	}

 	}

     opt.samba_add_onoff_option('sendfile-support', default=None)

     opt.samba_add_onoff_option('sendfile-support', default=None)

     opt.samba_add_onoff_option('utmp')

     opt.samba_add_onoff_option('utmp')

     opt.samba_add_onoff_option('avahi', with_name="enable", without_name="disable")

     opt.samba_add_onoff_option('avahi', with_name="enable", without_name="disable")

     opt.samba_add_onoff_option('iconv')

     opt.samba_add_onoff_option('iconv')

     opt.samba_add_onoff_option('acl-support')

     opt.samba_add_onoff_option('acl-support')

     opt.samba_add_onoff_option('dnsupdate')

     opt.samba_add_onoff_option('dnsupdate')

     if Options.options.with_utmp:

     if Options.options.with_utmp:

         conf.env.with_utmp = True

         conf.env.with_utmp = True

                           define='SIZEOF_UTMP_UT_LINE', critical=False)

                           define='SIZEOF_UTMP_UT_LINE', critical=False)

         if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):

         if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):

             conf.env.with_utmp = False

             conf.env.with_utmp = False

         conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')

         conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')

         conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')

         conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')

+    if Options.options.with_dnssd:

+    if Options.options.with_dnssd:

+        conf.env.with_dnssd = True

+        conf.env.with_dnssd = True

+        if not conf.CHECK_HEADERS('dns_sd.h'):

+        if not conf.CHECK_HEADERS('dns_sd.h'):

+            conf.DEFINE('WITH_DNSSD_SUPPORT', 1)

+            conf.DEFINE('WITH_DNSSD_SUPPORT', 1)

+    else:

+    else:

+        conf.SET_TARGET_TYPE('dns_sd', 'EMPTY')

+        conf.SET_TARGET_TYPE('dns_sd', 'EMPTY')

     if Options.options.with_iconv:

     if Options.options.with_iconv:

         conf.env.with_iconv = True

         conf.env.with_iconv = True

                         talloc

                         talloc

                         replace

                         replace

                         util_reg

                         util_reg

                         ''')

                         ''')

 # Do not link against this use 'smbconf'

 # Do not link against this use 'smbconf'

 bld.SAMBA3_LIBRARY('smbldap',

 bld.SAMBA3_LIBRARY('smbldap',

                     source='lib/smbldap.c',

                     source='lib/smbldap.c',

                     enabled=bld.CONFIG_SET("HAVE_LDAP"),

                     enabled=bld.CONFIG_SET("HAVE_LDAP"),

                     private_library=False,

                     private_library=False,

                     abi_directory='lib/ABI',

                     abi_directory='lib/ABI',

                         param_service

                         param_service

                         AVAHI

                         AVAHI

+                        dns_sd

+                        dns_sd

                         PRINTBASE

                         PRINTBASE

                         PROFILE

                         PROFILE

                         LOCKING

                         LOCKING

                       msrpc3

                       msrpc3

                       RPC_NDR_SRVSVC

                       RPC_NDR_SRVSVC

                       cli_smb_common

                       cli_smb_common

                       archive

                       archive

                       ''')

                       ''')

                  enabled=bld.CONFIG_SET('HAVE_CUPS'))

                  enabled=bld.CONFIG_SET('HAVE_CUPS'))

 bld.SAMBA3_BINARY('smbspool_argv_wrapper',

 bld.SAMBA3_BINARY('smbspool_argv_wrapper',

 bld.SAMBA3_BINARY('locktest2',

 bld.SAMBA3_BINARY('locktest2',

                  source='torture/locktest2.c',

                  source='torture/locktest2.c',

                       smbconf

                       smbconf

                       SMBREADLINE

                       SMBREADLINE

                       ''',

                       ''',

                        'vfs_extd_audit',

                        'vfs_extd_audit',

                        'vfs_fake_perms',

                        'vfs_fake_perms',

                        'vfs_fileid',

                        'vfs_fileid',

                        'vfs_fruit',

                        'vfs_fruit',

                        'vfs_full_audit',

                        'vfs_full_audit',

                        'vfs_glusterfs',

                        'vfs_glusterfs',

+bld.SAMBA3_MODULE('vfs_freebsd',

+bld.SAMBA3_MODULE('vfs_freebsd',

+                 subsystem='vfs',

+                 subsystem='vfs',

+                 source='vfs_freebsd.c',

+                 source='vfs_freebsd.c',

+                 init_function='',

+                 init_function='',

+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'),

+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'),

+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd'))

+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd'))

@@ -0,0 +1,800 @@

@@ -0,0 +1,800 @@

+/*

+/*

+ * This module implements VFS calls specific to FreeBSD

+ * This module implements VFS calls specific to FreeBSD

+

+

+	return ret;

+	return ret;

+}

+}

@@ -0,0 +1,169 @@

@@ -0,0 +1,169 @@

+<?xml version="1.0" encoding="iso-8859-1"?>

+<?xml version="1.0" encoding="iso-8859-1"?>

+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">

+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">

bin/regshell

bin/regshell

bin/regtree

bin/regtree

bin/rpcclient

bin/rpcclient

bin/samba-regedit

bin/samba-regedit

%%AD_DC%%bin/samba-tool

%%AD_DC%%bin/samba-tool

bin/sharesec

bin/sharesec

bin/testparm

bin/testparm

bin/vfstest

bin/vfstest

bin/wbinfo

bin/wbinfo

include/samba4/charset.h

include/samba4/charset.h

include/samba4/core/doserr.h

include/samba4/core/doserr.h

include/samba4/core/error.h

include/samba4/core/error.h

include/samba4/core/hresult.h

include/samba4/core/hresult.h

include/samba4/core/ntstatus_gen.h

include/samba4/core/ntstatus_gen.h

include/samba4/core/werror_gen.h

include/samba4/core/werror_gen.h

include/samba4/credentials.h

include/samba4/credentials.h

include/samba4/dcerpc.h

include/samba4/dcerpc.h

include/samba4/dcesrv_core.h

include/samba4/dcesrv_core.h

include/samba4/domain_credentials.h

include/samba4/domain_credentials.h

include/samba4/gen_ndr/atsvc.h

include/samba4/gen_ndr/atsvc.h

include/samba4/gen_ndr/auth.h

include/samba4/gen_ndr/auth.h

include/samba4/gen_ndr/ndr_krb5pac.h

include/samba4/gen_ndr/ndr_krb5pac.h

include/samba4/gen_ndr/ndr_misc.h

include/samba4/gen_ndr/ndr_misc.h

include/samba4/gen_ndr/ndr_nbt.h

include/samba4/gen_ndr/ndr_nbt.h

include/samba4/gen_ndr/ndr_samr_c.h

include/samba4/gen_ndr/ndr_samr_c.h

include/samba4/gen_ndr/ndr_svcctl_c.h

include/samba4/gen_ndr/ndr_svcctl_c.h

include/samba4/gen_ndr/netlogon.h

include/samba4/gen_ndr/netlogon.h

include/samba4/gen_ndr/samr.h

include/samba4/gen_ndr/samr.h

include/samba4/gen_ndr/security.h

include/samba4/gen_ndr/security.h

include/samba4/samba/version.h

include/samba4/samba/version.h

include/samba4/share.h

include/samba4/share.h

include/samba4/smb2_lease_struct.h

include/samba4/smb2_lease_struct.h

include/samba4/smbconf.h

include/samba4/smbconf.h

include/samba4/tdr.h

include/samba4/tdr.h

include/samba4/tsocket_internal.h

include/samba4/tsocket_internal.h

include/samba4/util/attr.h

include/samba4/util/attr.h

include/samba4/util/blocking.h

include/samba4/util/blocking.h

include/samba4/util/data_blob.h

include/samba4/util/data_blob.h

include/samba4/util/discard.h

include/samba4/util/discard.h

include/samba4/util/fault.h

include/samba4/util/fault.h

include/samba4/util/genrand.h

include/samba4/util/genrand.h

include/samba4/util/idtree_random.h

include/samba4/util/idtree_random.h

include/samba4/util/signal.h

include/samba4/util/signal.h

include/samba4/util/string_wrappers.h

include/samba4/util/string_wrappers.h

include/samba4/util/substitute.h

include/samba4/util/substitute.h

include/samba4/util/tevent_werror.h

include/samba4/util/tevent_werror.h

include/samba4/util/tfork.h

include/samba4/util/tfork.h

include/samba4/util/time.h

include/samba4/util/time.h

include/samba4/wbclient.h

include/samba4/wbclient.h