[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  8ec92e5 smbspool: Add string representation of nt_status
       via  c3aaf64 waf: Only build the backupkey rpc test with AD DC enabled
      from  f69b6dd tests: Only execute heimdal tests if we build with heimdal

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8ec92e50736053a5f4104888e3ad54cdb3e3f54b
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Tue Jan 12 15:16:43 2016 +0100

    smbspool: Add string representation of nt_status
    
    Signed-off-by: Andreas Schneider <asn at cryptomilk.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Jan 22 20:59:36 CET 2016 on sn-devel-144

commit c3aaf6492f40319db84124617002362fd6d0f890
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Fri Jan 22 13:27:27 2016 +0100

    waf: Only build the backupkey rpc test with AD DC enabled
    
    Signed-off-by: Andreas Schneider <asn at cryptomilk.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/client/smbspool.c     |  4 ++--
 source4/torture/rpc/rpc.c     |  2 ++
 source4/torture/wscript_build | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 7161e86..e381822 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -346,8 +346,8 @@ get_exit_code(struct cli_state * cli,
 	};
 
 
-	fprintf(stderr, "DEBUG: get_exit_code(cli=%p, nt_status=%x)\n",
-		cli, NT_STATUS_V(nt_status));
+	fprintf(stderr, "DEBUG: get_exit_code(cli=%p, nt_status=%s [%x])\n",
+		cli, nt_errstr(nt_status), NT_STATUS_V(nt_status));
 
 	for (i = 0; i < ARRAY_SIZE(auth_errors); i++) {
 		if (!NT_STATUS_EQUAL(nt_status, auth_errors[i])) {
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index aa16242..46a9e56 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -540,7 +540,9 @@ NTSTATUS torture_rpc_init(void)
 	torture_suite_add_simple_test(suite, "asyncbind", torture_async_bind);
 	torture_suite_add_suite(suite, torture_rpc_ntsvcs(suite));
 	torture_suite_add_suite(suite, torture_rpc_bind(suite));
+#ifdef AD_DC_BUILD_IS_ENABLED
 	torture_suite_add_suite(suite, torture_rpc_backupkey(suite));
+#endif
 	torture_suite_add_suite(suite, torture_rpc_fsrvp(suite));
 	torture_suite_add_suite(suite, torture_rpc_clusapi(suite));
 	torture_suite_add_suite(suite, torture_rpc_witness(suite));
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 6cf255b..8966026 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -66,10 +66,12 @@ bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
 	deps='torture'
 	)
 
-if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'):
-    torture_rpc_backupkey = 'rpc/backupkey.c'
-else:
-    torture_rpc_backupkey = 'rpc/backupkey_heimdal.c'
+torture_rpc_backupkey = ''
+if bld.AD_DC_BUILD_IS_ENABLED():
+    if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'):
+        torture_rpc_backupkey = 'rpc/backupkey.c'
+    else:
+        torture_rpc_backupkey = 'rpc/backupkey_heimdal.c'
 
 bld.SAMBA_MODULE('torture_rpc',
                  source='''


-- 
Samba Shared Repository