[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Tue Jun 30 09:25:04 MDT 2015


The branch, master has been updated
       via  36272ac selftest: skip the ntvfs based base.defer_open tests
       via  3bc8d52 net:conf:import: print error message when importing fails.
       via  7372f17 selftest: use server_maxtime = 10800 by default
      from  4974322 wafsamba: Cache final_libs for each target

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


- Log -----------------------------------------------------------------
commit 36272ac1983da95912c32ab249d1ecb2dd1041d7
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 30 13:49:38 2015 +0200

    selftest: skip the ntvfs based base.defer_open tests
    
    They have timing issues and the ntvfs is not the focus
    of development.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Jun 30 17:24:37 CEST 2015 on sn-devel-104

commit 3bc8d520e9446b3ddbfca8594ddbbed1bee23712
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 26 13:54:57 2015 +0200

    net:conf:import: print error message when importing fails.
    
    If there is a mis-spelled option in a share definition,
    'net conf import' will currently silently drop it
    (but exit with code != 0). We want to be notified
    of what went wrong.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

commit 7372f17cb108099590fc753974b0a33426dff232
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 29 08:49:39 2015 +0200

    selftest: use server_maxtime = 10800 by default
    
    With something like this:
    
    samba.stdout:
    [1855(18118)/1864 at 2h37m4s] samba4.krb5.kdc with account ALLOWED permission to replicate to an RODC(fl2008r2dc)
    [1856(18378)/1864 at 2h37m57s] samba4.blackbox.dbcheck(ad_dc_ntvfs)
    ERROR: Testsuite[samba4.blackbox.dbcheck(ad_dc_ntvfs)]
    REASON: unable to set up environment ad_dc_ntvfs:local - exiting
    
    samba.stderr:
    samba: maximum runtime exceeded - terminating at 1435553350, current ts: 1435553350
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 selftest/selftest.pl     | 2 +-
 selftest/skip            | 1 +
 source3/utils/net_conf.c | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index bbd81d6..d71d158 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -415,7 +415,7 @@ my $testenv_default = "none";
 # must terminate in this time, and testenv will only stay alive this
 # long
 
-my $server_maxtime = 9000;
+my $server_maxtime = 10800;
 if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
     $server_maxtime = $ENV{SMBD_MAXTIME};
 }
diff --git a/selftest/skip b/selftest/skip
index 7790594..94d0a88 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -103,6 +103,7 @@ bench # don't run benchmarks in our selftest
 ^samba4.*.base.delaywrite # This is randomly failing, depending on timing and filesystem features
 ^samba4.*.base.winattr
 ^samba4.*.base.birthtime
+^samba4.*base.defer_open
 ^samba4.smb2.acls # new test which doesn't pass yet
 # ktutil might not be installed or from mit...
 # we should build a samba4ktutil and use that instead
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index e8481b4..8d9f1e6 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -339,6 +339,8 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 
 		err = import_process_service(c, conf_ctx, service);
 		if (!SBC_ERROR_IS_OK(err)) {
+			d_printf(_("error importing service %s: %s\n"),
+				 servicename, sbcErrorString(err));
 			goto cancel;
 		}
 	} else {
@@ -376,6 +378,9 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 			err = import_process_service(c, conf_ctx,
 						     services[sidx]);
 			if (!SBC_ERROR_IS_OK(err)) {
+				d_printf(_("error importing service %s: %s\n"),
+					 services[sidx]->name,
+					 sbcErrorString(err));
 				goto cancel;
 			}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list