[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Jun 26 05:32:06 UTC 2019
The branch, master has been updated
via e28365c5157 selftest: schema version check in provision test
via cb16395ab38 schema: changing default base schema to 2012_R2
via fc9845da69c selftest: specifying 2008_R2 base schema for tests that need it
via 295bf73e9b2 dsdb: Handle DB corner-case where PSO container doesn't exist
via 5df815cfd21 pidl: Remove the need to always specify --client with --python
via 46bf62dd0c6 librpc: No longer generate or build unused client bindings for frsrpc
via 88bb8fe43ad librpc: Do not generate extra unused client or python bindings with PIDL
via 6f9176e6496 librpc: Remove frsblobs.idl
via 9c7e8f3a356 librpc: Remove unused RPC_NDR_MDSSVC
via ba222585ca4 librpc: Remove unused RPC_NDR_KEYSVC
via 2555692f480 librpc: Remove unused RPC_NDR_TRKWKS
via 634b44c25e1 librpc: Remove unused RPC_NDR_SCERPC
via bee87eecb87 librpc: Remove unused RPC_NDR_WZCSVC
via a162d68f585 librpc: Remove unused RPC_NDR_MSGSVC
via 21eec4cf3c1 librpc: Remove unused RPC_NDR_SERVER_ID
via 34206deb350 librpc: Remove unused RPC_NDR_NBT
via 57ed8db7a26 librpc: Remove unused RPC_NDR_DSBACKUP
via f4f0db0c8e8 librpc: Remove unused RPC_NDR_WINSIF
via c6f9ff9cce0 librpc: Remove unused RPC_NDR_POLICYAGENT
via 05318934511 librpc: Remove unused RPC_NDR_EFS
via 4bfd001d79c librpc: Remove unused RPC_NDR_AUDIOSRV
via 48f65c851af librpc: Remove unused RPC_NDR_SMB_ACL
via 0af3a6139d3 librpc: Remove unused RPC_NDR_IDMAP
via 8e83667fe4a librpc: Remove unused RPC_NDR_XATTR
via 27ad784bfb2 librpc: Remove unused RPC_NDR_DRSBLOBS
via 518227b674e librpc: Remove unused RPC_NDR_NTLMSSP
via dbff6cac314 librpc: Do not generate client code for dbgidl.idl
via ecd5fa294c8 s4-torture: Remove unused #include of librpc/gen_ndr/ndr_dcerpc_c.h
via 69361a43adf lib/tls: Remove unused header definitions from source4/lib/tls/tls.h (tls socket wrapper)
via 6f81fe151ae ntvfs: Remove now unused functions
from 039558fea8a packaging: Update READMEs to reflect current status.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e28365c515733bab10e93ba40c6123a57bef737f
Author: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Date: Thu Apr 11 17:44:48 2019 +1200
selftest: schema version check in provision test
Modifying blackbox provision test to check schema version.
Signed-off-by: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Wed Jun 26 05:31:03 UTC 2019 on sn-devel-184
commit cb16395ab3809379c6af4ff9a97fae191ba30375
Author: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Date: Tue Jan 15 11:19:54 2019 +1300
schema: changing default base schema to 2012_R2
Changing default base schema from 2008_R2 to 2012_R2
Signed-off-by: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit fc9845da69cabcc1bf046d7899b2c4aeae743170
Author: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Date: Tue Jan 15 16:30:51 2019 +1300
selftest: specifying 2008_R2 base schema for tests that need it
We're going to change the default base schema so this patch changes all
tests and testenvs requiring the current default (2008_R2) to specify it
in all provision commands using --base-schema.
Signed-off-by: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 295bf73e9b24b1f2b4594320a6501dc7410d4b43
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue Jun 25 10:10:17 2019 +1200
dsdb: Handle DB corner-case where PSO container doesn't exist
A 2003 AD DB with functional level set to >= 2008 was non-functional
due to the PSO checks.
We already check the functional level is >= 2008 before checking for the
PSO container. However, users could change their functional level
without ensuring their DB conforms to the corresponding base schema.
The objectclass DSDB module should prevent the PSO container from ever
being deleted. So the only way we should be able to hit this case is
through upgrading the functional level (but not the underlying schema
objects). If so, log a low-priority message and continue without errors.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14008
RN: Previously, AD operations such as user authentication could fail
completely with the message 'Error 32 determining PSOs in system' logged
on the samba server. This problem would only affect a domain that was
created using a pre-2008 AD base schema and then had its functional
level manually raised to 2008 or greater. This issue has now been
resolved.
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 5df815cfd21c33eaa0e38196490066f214356bd3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:41:40 2019 +1200
pidl: Remove the need to always specify --client with --python
This allows us to avoid generating client code for NDR-only protocols that do
not go over DCE/RPC
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 46bf62dd0c67e90dcbefe7f7a106f1b5927b08f6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 26 16:09:30 2019 +1200
librpc: No longer generate or build unused client bindings for frsrpc
We retain the IDL and NDR parsers for ndrdump.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 88bb8fe43ad30247a78d088fad9c840a7a63bd97
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 26 10:01:16 2019 +1200
librpc: Do not generate extra unused client or python bindings with PIDL
This sorts out the idl list into the parts that actually need --python and --client specified
and so speeds up the compile and clarifies the code behaviour.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 6f9176e649661c458d82226e8fcef550ff870291
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 12:51:50 2019 +1200
librpc: Remove frsblobs.idl
We can now dump public structures using ndrdump, so helper dump functions
are not required any more.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 9c7e8f3a356184ab64c7efc1db62ceb8487bffe1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:29:31 2019 +1200
librpc: Remove unused RPC_NDR_MDSSVC
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit ba222585ca4fcd5437f1294b84020e96ba862d98
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:29:15 2019 +1200
librpc: Remove unused RPC_NDR_KEYSVC
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 2555692f480724b422ebfd8288a0ffcf447274d2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:28:53 2019 +1200
librpc: Remove unused RPC_NDR_TRKWKS
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 634b44c25e122b10bcc85beb3f71a8ad35924252
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:00:49 2019 +1200
librpc: Remove unused RPC_NDR_SCERPC
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit bee87eecb87053b5c08733a0aa8aaf7a8b4c9a90
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:00:35 2019 +1200
librpc: Remove unused RPC_NDR_WZCSVC
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit a162d68f585853fdd8f3083b338bb1b236af54d1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 15:00:07 2019 +1200
librpc: Remove unused RPC_NDR_MSGSVC
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 21eec4cf3c1c462d9910c3d85f3ee333aa541b8d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 14:59:28 2019 +1200
librpc: Remove unused RPC_NDR_SERVER_ID
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 34206deb35067e7253c99ab9e5c2320784ccf541
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 14:58:42 2019 +1200
librpc: Remove unused RPC_NDR_NBT
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 57ed8db7a26ec3bf14c6a609f430467dd5eaa862
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 14:57:52 2019 +1200
librpc: Remove unused RPC_NDR_DSBACKUP
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit f4f0db0c8e83a55d7c3c960e34c266dd8057a07b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 13:30:08 2019 +1200
librpc: Remove unused RPC_NDR_WINSIF
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit c6f9ff9cce05c5c24ef6925d31759921a1c80f80
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 13:13:53 2019 +1200
librpc: Remove unused RPC_NDR_POLICYAGENT
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 05318934511e2ea2f1b03c423f4ccbcad1556a9a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 13:03:48 2019 +1200
librpc: Remove unused RPC_NDR_EFS
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 4bfd001d79c64a18c17de691994fea1efbf2f2e7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 12:58:10 2019 +1200
librpc: Remove unused RPC_NDR_AUDIOSRV
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 48f65c851af110f26dd2f0390127dc9668fd8c11
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 26 10:02:46 2019 +1200
librpc: Remove unused RPC_NDR_SMB_ACL
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 0af3a6139d344625e1c4d5e7c71a2b9f3b59a747
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 26 10:02:36 2019 +1200
librpc: Remove unused RPC_NDR_IDMAP
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 8e83667fe4a93aa5d4295816b1444d165c95afcf
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 12:43:44 2019 +1200
librpc: Remove unused RPC_NDR_XATTR
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 27ad784bfb2e19e1f98b22052fbe10d27465823a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jun 26 10:01:01 2019 +1200
librpc: Remove unused RPC_NDR_DRSBLOBS
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 518227b674e89f128e33a27617c2fffe9df904a0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 12:22:59 2019 +1200
librpc: Remove unused RPC_NDR_NTLMSSP
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit dbff6cac3141fd40db90d9cfdd3b10286535cf5d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 12:12:35 2019 +1200
librpc: Do not generate client code for dbgidl.idl
We only want to record the GUID and function table names, we do not need
to generate uncalled stubs.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit ecd5fa294c8ef01ba945e27e65d2cf6338988d41
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 16:00:59 2019 +1200
s4-torture: Remove unused #include of librpc/gen_ndr/ndr_dcerpc_c.h
We only need librpc/rpc/rpc_common.h
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 69361a43adf369cdbb4ed2044ddb8d720e8db792
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 11:48:37 2019 +1200
lib/tls: Remove unused header definitions from source4/lib/tls/tls.h (tls socket wrapper)
These were removed in eb15acdd35600878aba3319e070199200d9a1357 but the
header declarations were not removed.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 6f81fe151ae519490c528d7e1371288003a045f4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jun 25 11:57:16 2019 +1200
ntvfs: Remove now unused functions
These likely became unused once other untested parts of the NTVFS file server were
removed in 2017e291a2da3d63741df82b480f32ee57f6a165,
ee8b48df0f995611e0c8f8d6766e4882c5f4f4cd,
679227d6063074aabb986d78fab42b856db265e3,
31de52ed2efe598e7fab72d90a742d4f9e03c97e
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 6 ++
librpc/idl/frsblobs.idl | 31 -------
librpc/idl/wscript_build | 101 ++++++++++++++++-------
librpc/wscript_build | 100 ----------------------
pidl/lib/Parse/Pidl/Samba4/Python.pm | 6 +-
pidl/pidl | 5 +-
python/samba/netcmd/domain.py | 4 +-
python/samba/provision/__init__.py | 2 +-
python/samba/schema.py | 2 +-
selftest/target/Samba4.pm | 27 ++++--
source4/dsdb/samdb/ldb_modules/operational.c | 12 +++
source4/lib/tls/tls.h | 27 ------
source4/librpc/idl/wscript_build | 9 +-
source4/librpc/wscript_build | 18 ++--
source4/ntvfs/ntvfs_interface.c | 11 ---
source4/ntvfs/ntvfs_util.c | 5 --
source4/setup/tests/blackbox_provision.sh | 38 +++++++++
source4/setup/tests/blackbox_upgradeprovision.sh | 6 +-
source4/torture/local/verif_trailer.c | 2 +-
19 files changed, 174 insertions(+), 238 deletions(-)
delete mode 100644 librpc/idl/frsblobs.idl
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c10c1d4ad1e..3a5d978d6ee 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -82,7 +82,13 @@ Log lines are of the form:
durations are in microseconds.
+Default schema updated to 2012_R2
+-------------------------
+Default AD schema changed from 2008_R2 to 2012_R2. 2012_R2 functional level
+is not yet available. Older schemas can be used by provisioning with the
+'--base-schema' argument. Existing installations can be updated with the
+samba-tool command "domain schemaupgrade".
REMOVED FEATURES
diff --git a/librpc/idl/frsblobs.idl b/librpc/idl/frsblobs.idl
deleted file mode 100644
index e5f0f936ef0..00000000000
--- a/librpc/idl/frsblobs.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "idl_types.h"
-
-import "misc.idl";
-import "security.idl";
-import "frsrpc.idl";
-import "bkupblobs.idl";
-import "fscc.idl";
-/* frs related blobs decoding. Used for debug/dump of FRS related structures */
-
-[
- pointer_default(unique),
- helpstring("bkup blobs"),
- uuid("12345777-1234-abcd-0001-00000004")
-]
-
-interface frsblobs
-{
-
- void decode_nt_backup_file(
- [in] bkup_NTBackupFile file
- );
-
- void decode_frsrpc_StageHeader(
- [in] frsrpc_StageHeader header,
- [in] bkup_NTBackupFile data
- );
-
- void decode_FileNetworkOpenInformation(
- [in] fscc_FileNetworkOpenInformation data
- );
-}
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index aa058e87133..ed7fca57c6f 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -1,20 +1,17 @@
#!/usr/bin/env python
bld.SAMBA_PIDL_LIST('PIDL',
- '''atsvc.idl auth.idl drsuapi.idl epmapper.idl initshutdown.idl
- misc.idl ntlmssp.idl negoex.idl schannel.idl trkwks.idl
- audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl file_id.idl keysvc.idl
- msgsvc.idl ntsvcs.idl remact.idl security.idl smb_acl.idl unixinfo.idl wzcsvc.idl
- browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
- named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl
- dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
- oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
- drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
- notify.idl
- smb2_lease_struct.idl
- policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
- fsrvp.idl bkupblobs.idl fscc.idl frsblobs.idl witness.idl clusapi.idl
- mdssvc.idl winspool.idl''',
+ '''atsvc.idl drsuapi.idl epmapper.idl initshutdown.idl
+ eventlog.idl
+ ntsvcs.idl remact.idl unixinfo.idl
+ browser.idl dfs.idl dssetup.idl frsapi.idl
+ rot.idl spoolss.idl w32time.idl
+ dnsserver.idl echo.idl lsa.idl
+ oxidresolver.idl samr.idl srvsvc.idl winreg.idl
+ mgmt.idl netlogon.idl
+ svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
+ fsrvp.idl witness.idl clusapi.idl
+ winspool.idl''',
options='--header --ndr-parser --samba3-ndr-server --server --client --python',
output_dir='../gen_ndr')
@@ -23,33 +20,79 @@ bld.SAMBA_PIDL_LIST('PIDL',
options='--header --ndr-parser --server --client --dcom-proxy --com-header',
output_dir='../gen_ndr')
-bld.SAMBA_PIDL_LIST('PIDL',
- 'idmap.idl messaging.idl xattr.idl',
- options='--header --ndr-parser --client --python',
- output_dir='../gen_ndr')
+# DCE/RPC protocols which Samba does not implement a client or server
+# for
bld.SAMBA_PIDL_LIST('PIDL',
- 'preg.idl',
- options='--header --ndr-parser --client --python',
+ '''
+ audiosrv.idl
+ dsbackup.idl
+ efs.idl
+ frstrans.idl
+ frsrpc.idl
+ keysvc.idl
+ mdssvc.idl
+ msgsvc.idl
+ orpc.idl
+ policyagent.idl
+ scerpc.idl
+ trkwks.idl
+ wzcsvc.idl
+ ''',
+ options='--header --ndr-parser',
output_dir='../gen_ndr')
+# Non-DCE/RPC protocols encoded in IDL for Samba or helper IDLs for
+# DCE/RPC protocols (eg defining constands or structures but not
+# functions)
bld.SAMBA_PIDL_LIST('PIDL',
'''
- rap.idl
- ntprinting.idl
- ioctl.idl
- printcap.idl
- fsrvp_state.idl
+ bkupblobs.idl
cab.idl
+ dbgidl.idl
+ file_id.idl
+ fscc.idl
+ fsrvp_state.idl
+ ioctl.idl
+ named_pipe_auth.idl
+ negoex.idl
nfs4acl.idl
+ notify.idl
+ ntprinting.idl
+ printcap.idl
quota.idl
+ rap.idl
+ schannel.idl
+ smb2_lease_struct.idl
''',
options='--header --ndr-parser',
output_dir='../gen_ndr')
+# Non-DCE/RPC protocls with Python bindings
+# (for structures or constants)
+
bld.SAMBA_PIDL_LIST('PIDL',
- 'dnsp.idl',
- options='--header --ndr-parser --client --python',
+ '''
+ auth.idl
+ dcerpc.idl
+ dfsblobs.idl
+ dns.idl
+ dnsp.idl
+ drsblobs.idl
+ idmap.idl
+ krb5pac.idl
+ messaging.idl
+ misc.idl
+ nbt.idl
+ ntlmssp.idl
+ preg.idl
+ security.idl
+ server_id.idl
+ smb_acl.idl
+ windows_event_ids.idl
+ xattr.idl
+ ''',
+ options='--header --ndr-parser --python',
output_dir='../gen_ndr')
bld.SAMBA_PIDL_LIST('PIDL',
@@ -57,7 +100,3 @@ bld.SAMBA_PIDL_LIST('PIDL',
options='--header --ndr-parser --samba3-ndr-server --client --python',
output_dir='../gen_ndr')
-bld.SAMBA_PIDL_LIST('PIDL',
- source='windows_event_ids.idl',
- options='--header --python --ndr-parser --client',
- output_dir='../gen_ndr')
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 8e113c422b2..70fe8c2f7fe 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -65,11 +65,6 @@ bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSRPC',
- source='gen_ndr/ndr_frsrpc_c.c',
- public_deps='NDR_FRSRPC'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
source='gen_ndr/ndr_frsapi.c',
public_deps='ndr'
@@ -95,11 +90,6 @@ bld.SAMBA_SUBSYSTEM('NDR_FSCC',
public_deps='ndr'
)
-bld.SAMBA_SUBSYSTEM('NDR_FRSBLOBS',
- source='gen_ndr/ndr_frsblobs.c',
- public_deps='ndr'
- )
-
bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
source='gen_ndr/ndr_policyagent.c',
public_deps='ndr'
@@ -445,21 +435,6 @@ bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
public_deps='ndr NDR_SERVER_ID'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
- source='gen_ndr/ndr_xattr_c.c',
- public_deps='NDR_XATTR dcerpc-binding'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_IDMAP',
- source='gen_ndr/ndr_idmap_c.c',
- public_deps='NDR_IDMAP dcerpc-binding'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SMB_ACL',
- source='gen_ndr/ndr_smb_acl_c.c',
- public_deps='NDR_SMB_ACL dcerpc-binding'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
source='gen_ndr/ndr_rot_c.c',
public_deps='NDR_ROT dcerpc-binding'
@@ -470,26 +445,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
public_deps='dcerpc-binding NDR_ATSVC'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
- source='gen_ndr/ndr_audiosrv_c.c',
- public_deps='NDR_AUDIOSRV dcerpc-binding'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
source='gen_ndr/ndr_echo_c.c',
public_deps='dcerpc-binding NDR_ECHO'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
- source='gen_ndr/ndr_dsbackup_c.c',
- public_deps='dcerpc-binding NDR_DSBACKUP'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
- source='gen_ndr/ndr_efs_c.c',
- public_deps='dcerpc-binding NDR_EFS'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
source='gen_ndr/ndr_lsa_c.c',
public_deps='dcerpc-binding ndr-standard'
@@ -515,21 +475,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
public_deps='dcerpc-binding NDR_DRSUAPI'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
- source='gen_ndr/ndr_drsblobs_c.c',
- public_deps='dcerpc-binding NDR_DRSBLOBS'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_NTLMSSP',
- source='gen_ndr/ndr_ntlmssp_c.c',
- public_deps='dcerpc-binding NDR_NTLMSSP'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
- source='gen_ndr/ndr_policyagent_c.c',
- public_deps='dcerpc-binding NDR_POLICYAGENT'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
source='gen_ndr/ndr_unixinfo_c.c',
public_deps='dcerpc-binding NDR_UNIXINFO'
@@ -550,11 +495,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSPOOL',
public_deps='dcerpc-binding NDR_WINSPOOL'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
- source='gen_ndr/ndr_nbt_c.c',
- public_deps='dcerpc-binding ndr_nbt'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
source='gen_ndr/ndr_wkssvc_c.c',
public_deps='dcerpc-binding ndr-standard'
@@ -582,21 +522,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
public_deps='tevent NDR_EPMAPPER'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
- source='gen_ndr/ndr_dbgidl_c.c',
- public_deps='dcerpc-binding NDR_DBGIDL'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
source='gen_ndr/ndr_dssetup_c.c',
public_deps='dcerpc-binding NDR_DSSETUP'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
- source='gen_ndr/ndr_msgsvc_c.c',
- public_deps='dcerpc-binding NDR_MSGSVC'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
source='gen_ndr/ndr_winreg_c.c',
public_deps='dcerpc-binding ndr-standard'
@@ -622,26 +552,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
public_deps='dcerpc-binding NDR_REMACT'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
- source='gen_ndr/ndr_wzcsvc_c.c',
- public_deps='dcerpc-binding NDR_WZCSVC'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
source='gen_ndr/ndr_w32time_c.c',
public_deps='dcerpc-binding NDR_W32TIME'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
- source='gen_ndr/ndr_scerpc_c.c',
- public_deps='dcerpc-binding NDR_SCERPC'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SERVER_ID',
- source='gen_ndr/ndr_server_id_c.c',
- public_deps='dcerpc-binding NDR_SERVER_ID'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
source='gen_ndr/ndr_ntsvcs_c.c',
public_deps='dcerpc-binding ndr-standard'
@@ -652,16 +567,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
public_deps='ndr-standard tevent'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
- source='gen_ndr/ndr_trkwks_c.c',
- public_deps='dcerpc-binding NDR_TRKWKS'
- )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
- source='gen_ndr/ndr_keysvc_c.c',
- public_deps='dcerpc-binding NDR_KEYSVC'
- )
-
bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
source='gen_ndr/ndr_backupkey_c.c',
public_deps='dcerpc-binding NDR_BACKUPKEY'
@@ -692,11 +597,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_CLUSAPI',
public_deps='dcerpc-binding NDR_CLUSAPI'
)
-bld.SAMBA_SUBSYSTEM('RPC_NDR_MDSSVC',
- source='gen_ndr/ndr_mdssvc_c.c',
- public_deps='dcerpc-binding NDR_MDSSVC'
- )
-
# a grouping library for NDR subsystems that may be used by more than one target
bld.SAMBA_LIBRARY('ndr-samba',
source=[],
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index e50c9378862..97c417adf35 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -2267,6 +2267,10 @@ sub Parse($$$$$)
$self->{BASENAME} = $basename;
+ my $ndr_hdr_include = "";
+ if (defined($ndr_hdr)) {
+ $ndr_hdr_include = "#include \"$ndr_hdr\"";
+ }
$self->pidl_hdr("
/* Python wrapper functions auto-generated by pidl */
#define PY_SSIZE_T_CLEAN 1 /* We use Py_ssize_t for PyArg_ParseTupleAndKeywords */
@@ -2278,7 +2282,7 @@ sub Parse($$$$$)
#include \"librpc/rpc/pyrpc.h\"
#include \"librpc/rpc/pyrpc_util.h\"
#include \"$hdr\"
-#include \"$ndr_hdr\"
+$ndr_hdr_include
/*
* These functions are here to ensure they can be optimized out by
diff --git a/pidl/pidl b/pidl/pidl
index 78834144781..06b0f78a485 100755
--- a/pidl/pidl
+++ b/pidl/pidl
@@ -712,8 +712,11 @@ sub process_file($)
if (defined($opt_python)) {
require Parse::Pidl::Samba4::Python;
my $generator = new Parse::Pidl::Samba4::Python();
+ if (!defined($opt_client)) {
+ $c_header = undef;
+ }
my ($prsr) = $generator->Parse($basename, $ndr,
- "$outputdir/ndr_$basename\_c.h", $h_filename);
+ $c_header, $h_filename);
FileSave("$outputdir/py_$basename.c", $prsr);
}
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index b616dba3438..1835de74230 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -277,8 +277,8 @@ class cmd_domain_provision(Command):
default="2008_R2"),
Option("--base-schema", type="choice", metavar="BASE-SCHEMA",
choices=["2008_R2", "2008_R2_old", "2012", "2012_R2"],
- help="The base schema files to use. Default is (Windows) 2008_R2.",
- default="2008_R2"),
+ help="The base schema files to use. Default is (Windows) 2012_R2.",
+ default="2012_R2"),
Option("--next-rid", type="int", metavar="NEXTRID", default=1000,
help="The initial nextRid value (only needed for upgrades). Default is 1000."),
Option("--partitions-only",
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 14ab41be670..3d7e23cf077 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -2138,7 +2138,7 @@ def provision(logger, session_info, smbconf=None,
useeadb=False, am_rodc=False, lp=None, use_ntvfs=False,
use_rfc2307=False, maxuid=None, maxgid=None, skip_sysvolacl=True,
ldap_backend_forced_uri=None, nosync=False, ldap_dryrun_mode=False,
- ldap_backend_extra_port=None, base_schema=None,
+ ldap_backend_extra_port=None, base_schema="2012_R2",
plaintext_secrets=False, backend_store=None):
"""Provision samba4
diff --git a/python/samba/schema.py b/python/samba/schema.py
index b6c37bbd2df..aedee82bb8f 100644
--- a/python/samba/schema.py
+++ b/python/samba/schema.py
@@ -147,7 +147,7 @@ class Schema(object):
@staticmethod
def default_base_schema():
"""Returns the default base schema to use"""
- return "2008_R2"
+ return "2012_R2"
@staticmethod
def get_version(base_schema):
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index c661a109e64..59ea6f38e18 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1611,9 +1611,9 @@ sub provision_subdom_dc($$$)
return $ret;
}
-sub provision_ad_dc_ntvfs($$)
+sub provision_ad_dc_ntvfs($$$)
{
- my ($self, $prefix) = @_;
+ my ($self, $prefix, $extra_provision_options) = @_;
# We keep the old 'winbind' name here in server services to
# ensure upgrades which used that name still work with the now
@@ -1633,7 +1633,7 @@ sub provision_ad_dc_ntvfs($$)
dsdb group change notification = true
server schannel = auto
";
- my $extra_provision_options = ["--use-ntvfs"];
+ push (@{$extra_provision_options}, "--use-ntvfs");
my $ret = $self->provision($prefix,
"domain controller",
"localdc",
@@ -1669,7 +1669,7 @@ sub provision_fl2000dc($$)
spnego:simulate_w2k=yes
ntlmssp_server:force_old_spnego=yes
";
- my $extra_provision_options = ["--use-ntvfs"];
+ my $extra_provision_options = ["--use-ntvfs", "--base-schema=2008_R2"];
# This environment uses plain text secrets
# i.e. secret attributes are not encrypted on disk.
# This allows testing of the --plaintext-secrets option for
@@ -1711,7 +1711,7 @@ sub provision_fl2003dc($$$)
dcesrv:header signing = no
dcesrv:max auth states = 0
--
Samba Shared Repository
More information about the samba-cvs
mailing list