[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Jun 2 18:08:03 UTC 2016
The branch, master has been updated
via b929008 Improve help wording for samba-tool domain provision as per https://lists.samba.org/archive/samba-technical/2016-April/113740.html
via 0b4c741 build: Build less of Samba when building --without-ntvfs-fileserver
via 9066571 repl: Do not consider userPassword differences to matter in rpc.dssync
via b816ca3 torture: Only walk over objects actually converted in drs.dssync
via ea84001 samba-tool domain demote: Fix error handling and error messages
via be7b291 selftest: Mark LDAPNotificationTest.test_max_search flapping
via 2679bdc dsdb: Improve syntax clarity
via 5fe59f3 dsdb: Use DRSUAPI_ATTID_isDeleted constant in repl_meta_data
from 4aab5ba mit_samba: Allow to use SPNs for AS-REQ
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b929008dc6f3f8ffeb376d87d30d2101567f75e9
Author: Peter C. Kelly <peter+sambabugzilla at pck.co.nz>
Date: Wed May 4 20:13:37 2016 +1200
Improve help wording for samba-tool domain provision as per https://lists.samba.org/archive/samba-technical/2016-April/113740.html
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11894
Signed-off-by: Peter C. Kelly <peter+sambabugzilla at pck.co.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Jun 2 20:07:22 CEST 2016 on sn-devel-144
commit 0b4c741b9c03d147ee5f56d027bacda75c1b5282
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 11 05:33:17 2016 +1200
build: Build less of Samba when building --without-ntvfs-fileserver
We would build, but not use, many components of the NTVFS file server
even when we asked not to. They would then consume disk, but not be
of any use
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 90665713ab96b22cdd1ff344575b05253aa1afc2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 30 13:57:26 2016 +1200
repl: Do not consider userPassword differences to matter in rpc.dssync
userPassword is also not shown over LDAP
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit b816ca3e0faee84ede5189b0b6f48e55a381ea95
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 13 16:06:29 2016 +1200
torture: Only walk over objects actually converted in drs.dssync
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit ea840010ee037da0eab40b0a1c021659fdb95411
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Apr 21 08:16:19 2016 +1200
samba-tool domain demote: Fix error handling and error messages
Due to an error in a previous patch, e was undefined
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit be7b29135cfe27aa0be0e1c618d808cfdc1a4920
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Mar 23 16:56:17 2016 +1300
selftest: Mark LDAPNotificationTest.test_max_search flapping
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 2679bdc45b37f4a95bd43d88a5845d7b497e56dd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 15 15:09:14 2016 +1300
dsdb: Improve syntax clarity
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 5fe59f3e6377acdb164c4b0208b8b96f810eeca5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 13 11:39:19 2016 +1200
dsdb: Use DRSUAPI_ATTID_isDeleted constant in repl_meta_data
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/domain.py | 8 +-
selftest/flapping | 4 +
source4/dsdb/repl/replicated_objects.c | 3 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 4 +-
source4/ntvfs/posix/posix_eadb.c | 81 ++++++++--------
source4/ntvfs/posix/wscript_build | 61 ++++++------
source4/ntvfs/wscript_build | 120 ++++++++++++------------
source4/rpc_server/common/server_info.c | 1 -
source4/rpc_server/wkssvc/dcesrv_wkssvc.c | 1 -
source4/rpc_server/wscript_build | 18 ++--
source4/smb_server/service_smb.c | 4 +-
source4/smb_server/wscript_build | 2 +-
source4/smbd/server.c | 4 -
source4/torture/drs/rpc/dssync.c | 6 +-
14 files changed, 165 insertions(+), 152 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 68775ec..fd26d93 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -173,7 +173,7 @@ class cmd_domain_provision(Command):
takes_options = [
Option("--interactive", help="Ask for names", action="store_true"),
Option("--domain", type="string", metavar="DOMAIN",
- help="set domain"),
+ help="NetBIOS domain name to use"),
Option("--domain-guid", type="string", metavar="GUID",
help="set domainguid (otherwise random)"),
Option("--domain-sid", type="string", metavar="SID",
@@ -789,12 +789,12 @@ class cmd_domain_demote(Command):
pass
else:
self.errf.write(
- "Error while demoting, "
- "re-enabling inbound replication\n")
+ "Error while replicating out last local changes from '%s' for demotion, "
+ "re-enabling inbound replication\n" % part)
dsa_options ^= DS_NTDSDSA_OPT_DISABLE_INBOUND_REPL
nmsg["options"] = ldb.MessageElement(str(dsa_options), ldb.FLAG_MOD_REPLACE, "options")
samdb.modify(nmsg)
- raise CommandError("Error while sending a DsReplicaSync for partion %s" % str(part), e)
+ raise CommandError("Error while sending a DsReplicaSync for partition '%s'" % str(part), string)
try:
remote_samdb = SamDB(url="ldap://%s" % server,
session_info=system_session(),
diff --git a/selftest/flapping b/selftest/flapping
index d9713cf..d5716a5 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -31,3 +31,7 @@
^samba4.blackbox.dbcheck # flakey on sn-devel
^samba4.smb2.create.mkdir-dup\(ad_dc_ntvfs\) # This test (for bug 11486) involves a race, not always protected against in the NTVFS file server
^samba4.winbind.struct.domain_info.ad_member # flakey on sn-devel-104 and sn-devel-144
+#
+# This test just is not reliable in finding the max search limit
+#
+^samba4.ldap.notification.python\(.*\).__main__.LDAPNotificationTest.test_max_search
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index a112e18..0ac2b54 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -561,7 +561,8 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
instanceType = ldb_msg_find_attr_as_int(msg, "instanceType", 0);
- if (instanceType & INSTANCE_TYPE_IS_NC_HEAD && partition_dn) {
+ if ((instanceType & INSTANCE_TYPE_IS_NC_HEAD)
+ && partition_dn != NULL) {
int partition_dn_cmp = ldb_dn_compare(partition_dn, msg->dn);
if (partition_dn_cmp != 0) {
DEBUG(4, ("Remote server advised us of a new partition %s while processing %s, ignoring\n",
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index c0c8de5..abfe2c8 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1052,7 +1052,7 @@ static int replmd_add(struct ldb_module *module, struct ldb_request *req)
m->attid = dsdb_attribute_get_attid(sa, is_schema_nc);
m->version = 1;
- if (m->attid == 0x20030) {
+ if (m->attid == DRSUAPI_ATTID_isDeleted) {
const struct ldb_val *rdn_val = ldb_dn_get_rdn_val(msg->dn);
const char* rdn;
@@ -1340,7 +1340,7 @@ static int replmd_update_rpmd_element(struct ldb_context *ldb,
md1 = &omd->ctr.ctr1.array[i];
md1->version++;
md1->attid = attid;
- if (md1->attid == 0x20030) {
+ if (md1->attid == DRSUAPI_ATTID_isDeleted) {
const struct ldb_val *rdn_val = ldb_dn_get_rdn_val(msg->dn);
const char* rdn;
diff --git a/source4/ntvfs/posix/posix_eadb.c b/source4/ntvfs/posix/posix_eadb.c
index 31c565c..e08597c 100644
--- a/source4/ntvfs/posix/posix_eadb.c
+++ b/source4/ntvfs/posix/posix_eadb.c
@@ -21,7 +21,9 @@
#include "includes.h"
#include "lib/tdb_wrap/tdb_wrap.h"
+#ifdef WITH_NTVFS_FILESERVER
#include "vfs_posix.h"
+#endif
#include "posix_eadb.h"
#define XATTR_LIST_ATTR ".xattr_list"
@@ -143,17 +145,6 @@ NTSTATUS pull_xattr_blob_tdb_raw(struct tdb_wrap *ea_tdb,
return NT_STATUS_OK;
}
-NTSTATUS pull_xattr_blob_tdb(struct pvfs_state *pvfs_state,
- TALLOC_CTX *mem_ctx,
- const char *attr_name,
- const char *fname,
- int fd,
- size_t estimated_size,
- DATA_BLOB *blob)
-{
- return pull_xattr_blob_tdb_raw(pvfs_state->ea_db,mem_ctx,attr_name,fname,fd,estimated_size,blob);
-}
-
/*
push a xattr as a blob, using ea_tdb
*/
@@ -199,14 +190,6 @@ done:
talloc_free(mem_ctx);
return status;
}
-NTSTATUS push_xattr_blob_tdb(struct pvfs_state *pvfs_state,
- const char *attr_name,
- const char *fname,
- int fd,
- const DATA_BLOB *blob)
-{
- return push_xattr_blob_tdb_raw(pvfs_state->ea_db, attr_name, fname, fd, blob);
-}
/*
@@ -234,17 +217,6 @@ NTSTATUS delete_posix_eadb_raw(struct tdb_wrap *ea_tdb, const char *attr_name,
/*
- delete a xattr
-*/
-NTSTATUS delete_posix_eadb(struct pvfs_state *pvfs_state, const char *attr_name,
- const char *fname, int fd)
-{
- return delete_posix_eadb_raw(pvfs_state->ea_db,
- attr_name, fname, fd);
-}
-
-
-/*
delete all xattrs for a file
*/
NTSTATUS unlink_posix_eadb_raw(struct tdb_wrap *ea_tdb, const char *fname, int fd)
@@ -271,14 +243,6 @@ NTSTATUS unlink_posix_eadb_raw(struct tdb_wrap *ea_tdb, const char *fname, int f
}
/*
- delete all xattrs for a file
-*/
-NTSTATUS unlink_posix_eadb(struct pvfs_state *pvfs_state, const char *fname)
-{
- return unlink_posix_eadb_raw(pvfs_state->ea_db, fname, -1);
-}
-
-/*
list all xattrs for a file
*/
NTSTATUS list_posix_eadb_raw(struct tdb_wrap *ea_tdb, TALLOC_CTX *mem_ctx,
@@ -288,3 +252,44 @@ NTSTATUS list_posix_eadb_raw(struct tdb_wrap *ea_tdb, TALLOC_CTX *mem_ctx,
return pull_xattr_blob_tdb_raw(ea_tdb, mem_ctx, XATTR_LIST_ATTR,
fname, fd, 100, list);
}
+
+#ifdef WITH_NTVFS_FILESERVER
+NTSTATUS pull_xattr_blob_tdb(struct pvfs_state *pvfs_state,
+ TALLOC_CTX *mem_ctx,
+ const char *attr_name,
+ const char *fname,
+ int fd,
+ size_t estimated_size,
+ DATA_BLOB *blob)
+{
+ return pull_xattr_blob_tdb_raw(pvfs_state->ea_db,mem_ctx,attr_name,fname,fd,estimated_size,blob);
+}
+
+NTSTATUS push_xattr_blob_tdb(struct pvfs_state *pvfs_state,
+ const char *attr_name,
+ const char *fname,
+ int fd,
+ const DATA_BLOB *blob)
+{
+ return push_xattr_blob_tdb_raw(pvfs_state->ea_db, attr_name, fname, fd, blob);
+}
+
+/*
+ delete a xattr
+*/
+NTSTATUS delete_posix_eadb(struct pvfs_state *pvfs_state, const char *attr_name,
+ const char *fname, int fd)
+{
+ return delete_posix_eadb_raw(pvfs_state->ea_db,
+ attr_name, fname, fd);
+}
+
+/*
+ delete all xattrs for a file
+*/
+NTSTATUS unlink_posix_eadb(struct pvfs_state *pvfs_state, const char *fname)
+{
+ return unlink_posix_eadb_raw(pvfs_state->ea_db, fname, -1);
+}
+
+#endif
diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build
index 06fea0b..a07da33 100644
--- a/source4/ntvfs/posix/wscript_build
+++ b/source4/ntvfs/posix/wscript_build
@@ -1,43 +1,44 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('pvfs_acl',
- source='pvfs_acl.c',
- autoproto='vfs_acl_proto.h',
- deps='events samba-modules',
- )
+if bld.CONFIG_SET('WITH_NTVFS_FILESERVER'):
+ bld.SAMBA_SUBSYSTEM('pvfs_acl',
+ source='pvfs_acl.c',
+ autoproto='vfs_acl_proto.h',
+ deps='events samba-modules',
+ )
-bld.SAMBA_MODULE('pvfs_acl_xattr',
- source='pvfs_acl_xattr.c',
- subsystem='pvfs_acl',
- init_function='pvfs_acl_xattr_init',
- deps='NDR_XATTR events'
- )
+ bld.SAMBA_MODULE('pvfs_acl_xattr',
+ source='pvfs_acl_xattr.c',
+ subsystem='pvfs_acl',
+ init_function='pvfs_acl_xattr_init',
+ deps='NDR_XATTR events'
+ )
-bld.SAMBA_MODULE('pvfs_acl_nfs4',
- source='pvfs_acl_nfs4.c',
- subsystem='pvfs_acl',
- init_function='pvfs_acl_nfs4_init',
- deps='NDR_NFS4ACL samdb events'
- )
+ bld.SAMBA_MODULE('pvfs_acl_nfs4',
+ source='pvfs_acl_nfs4.c',
+ subsystem='pvfs_acl',
+ init_function='pvfs_acl_nfs4_init',
+ deps='NDR_NFS4ACL samdb events'
+ )
-bld.SAMBA_SUBSYSTEM('pvfs_aio',
- source='pvfs_aio.c',
- deps='tevent',
- enabled=False
- )
+ bld.SAMBA_SUBSYSTEM('pvfs_aio',
+ source='pvfs_aio.c',
+ deps='tevent',
+ enabled=False
+ )
-bld.SAMBA_MODULE('ntvfs_posix',
- source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c',
- autoproto='vfs_posix_proto.h',
- subsystem='ntvfs',
- init_function='ntvfs_posix_init',
- deps='NDR_XATTR attr ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio posix_eadb',
- internal_module=True
- )
+ bld.SAMBA_MODULE('ntvfs_posix',
+ source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c',
+ autoproto='vfs_posix_proto.h',
+ subsystem='ntvfs',
+ init_function='ntvfs_posix_init',
+ deps='NDR_XATTR attr ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio posix_eadb',
+ internal_module=True
+ )
bld.SAMBA_PYTHON('python_xattr_native',
diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
index 6e3ee6d..44cb78d 100644
--- a/source4/ntvfs/wscript_build
+++ b/source4/ntvfs/wscript_build
@@ -5,71 +5,71 @@ bld.SAMBA_LIBRARY('ntvfs',
autoproto='ntvfs_proto.h',
deps='tevent samba-modules',
private_library=True,
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER')
)
-if bld.AD_DC_BUILD_IS_ENABLED():
- bld.RECURSE('posix')
+bld.RECURSE('posix')
+if bld.CONFIG_SET('WITH_NTVFS_FILESERVER'):
bld.RECURSE('common')
bld.RECURSE('unixuid')
bld.RECURSE('sysdep')
-bld.SAMBA_MODULE('ntvfs_cifs',
- source='cifs/vfs_cifs.c',
- subsystem='ntvfs',
- init_function='ntvfs_cifs_init',
- deps='LIBCLI_SMB smbclient-raw param_options'
- )
-
-
-bld.SAMBA_MODULE('ntvfs_smb2',
- source='smb2/vfs_smb2.c',
- subsystem='ntvfs',
- init_function='ntvfs_smb2_init',
- deps='LIBCLI_SMB smbclient-raw param_options'
- )
-
-
-bld.SAMBA_MODULE('ntvfs_simple',
- source='simple/vfs_simple.c simple/svfs_util.c',
- autoproto='simple/proto.h',
- subsystem='ntvfs',
- init_function='ntvfs_simple_init',
- deps='talloc'
- )
-
-
-bld.SAMBA_MODULE('ntvfs_cifsposix',
- source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c',
- autoproto='cifs_posix_cli/proto.h',
- subsystem='ntvfs',
- init_function='ntvfs_cifs_posix_init',
- deps='talloc'
- )
-
-
-bld.SAMBA_MODULE('ntvfs_print',
- source='print/vfs_print.c',
- subsystem='ntvfs',
- init_function='ntvfs_print_init',
- deps='talloc'
- )
-
-
-bld.SAMBA_MODULE('ntvfs_ipc',
- source='ipc/vfs_ipc.c ipc/ipc_rap.c ipc/rap_server.c',
- autoproto='ipc/proto.h',
- subsystem='ntvfs',
- init_function='ntvfs_ipc_init',
- deps='NDR_NAMED_PIPE_AUTH npa_tstream gssapi samba-credentials DCERPC_SHARE'
- )
-
-
-bld.SAMBA_MODULE('ntvfs_nbench',
- source='nbench/vfs_nbench.c',
- subsystem='ntvfs',
- init_function='ntvfs_nbench_init',
- deps='talloc'
- )
+ bld.SAMBA_MODULE('ntvfs_cifs',
+ source='cifs/vfs_cifs.c',
+ subsystem='ntvfs',
+ init_function='ntvfs_cifs_init',
+ deps='LIBCLI_SMB smbclient-raw param_options'
+ )
+
+
+ bld.SAMBA_MODULE('ntvfs_smb2',
+ source='smb2/vfs_smb2.c',
+ subsystem='ntvfs',
+ init_function='ntvfs_smb2_init',
+ deps='LIBCLI_SMB smbclient-raw param_options'
+ )
+
+
+ bld.SAMBA_MODULE('ntvfs_simple',
+ source='simple/vfs_simple.c simple/svfs_util.c',
+ autoproto='simple/proto.h',
+ subsystem='ntvfs',
+ init_function='ntvfs_simple_init',
+ deps='talloc'
+ )
+
+
+ bld.SAMBA_MODULE('ntvfs_cifsposix',
+ source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c',
+ autoproto='cifs_posix_cli/proto.h',
+ subsystem='ntvfs',
+ init_function='ntvfs_cifs_posix_init',
+ deps='talloc'
+ )
+
+
+ bld.SAMBA_MODULE('ntvfs_print',
+ source='print/vfs_print.c',
+ subsystem='ntvfs',
+ init_function='ntvfs_print_init',
+ deps='talloc'
+ )
+
+
+ bld.SAMBA_MODULE('ntvfs_ipc',
+ source='ipc/vfs_ipc.c ipc/ipc_rap.c ipc/rap_server.c',
+ autoproto='ipc/proto.h',
+ subsystem='ntvfs',
+ init_function='ntvfs_ipc_init',
+ deps='NDR_NAMED_PIPE_AUTH npa_tstream gssapi samba-credentials DCERPC_SHARE'
+ )
+
+
+ bld.SAMBA_MODULE('ntvfs_nbench',
+ source='nbench/vfs_nbench.c',
+ subsystem='ntvfs',
+ init_function='ntvfs_nbench_init',
+ deps='talloc'
+ )
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index e23b108..39c75cc 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -26,7 +26,6 @@
#include "auth/auth.h"
#include "param/param.h"
#include "rpc_server/common/common.h"
-#include "rpc_server/common/share.h"
#include "libds/common/roles.h"
/*
diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
index 80a518c..baae0e3 100644
--- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
+++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
@@ -24,7 +24,6 @@
#include "librpc/gen_ndr/ndr_wkssvc.h"
#include "librpc/gen_ndr/ndr_srvsvc.h"
#include "rpc_server/common/common.h"
-#include "rpc_server/common/share.h"
#include "param/param.h"
/*
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index aaf3d26..b9de1fb 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -1,14 +1,14 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('DCERPC_SHARE',
- source='common/server_info.c common/share_info.c',
+ source='common/share_info.c',
autoproto='common/share.h',
deps='ldb',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER'),
)
bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
- source='common/forward.c common/reply.c dcesrv_auth.c common/loadparm.c',
+ source='common/server_info.c common/forward.c common/reply.c dcesrv_auth.c common/loadparm.c',
autoproto='common/proto.h',
deps='ldb DCERPC_SHARE samba_server_gensec',
enabled=bld.AD_DC_BUILD_IS_ENABLED()
@@ -54,7 +54,8 @@ bld.SAMBA_MODULE('dcerpc_srvsvc',
autoproto='srvsvc/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_srvsvc_init',
- deps='DCERPC_COMMON NDR_SRVSVC share ntvfs'
+ deps='DCERPC_COMMON NDR_SRVSVC share ntvfs',
+ enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER')
)
@@ -88,7 +89,8 @@ bld.SAMBA_MODULE('dcerpc_winreg',
subsystem='dcerpc_server',
init_function='dcerpc_server_winreg_init',
deps='registry ndr-standard',
- internal_module=True
+ internal_module=True,
+ enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER')
)
@@ -132,7 +134,8 @@ bld.SAMBA_MODULE('dcerpc_spoolss',
subsystem='dcerpc_server',
init_function='dcerpc_server_spoolss_init',
deps='DCERPC_COMMON NDR_SPOOLSS ntptr RPC_NDR_SPOOLSS',
- internal_module=True
+ internal_module=True,
+ enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER')
)
@@ -155,7 +158,8 @@ bld.SAMBA_MODULE('dcerpc_eventlog',
source='eventlog/dcesrv_eventlog6.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_eventlog6_init',
- deps='DCERPC_COMMON'
+ deps='DCERPC_COMMON',
+ enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER')
--
Samba Shared Repository
More information about the samba-cvs
mailing list