[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  227b35a s3: net: Return an error when no name servers were returned by the lookup so that we see an error in self test.
      from  42151f6 smbd: dfree - ignore quota if not enforced

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


- Log -----------------------------------------------------------------
commit 227b35ac96c6f78f52f885deb668fabaa40cf9d6
Author: Richard Sharpe <rsharpe at samba.org>
Date:   Sun May 15 10:28:04 2016 -0700

    s3: net: Return an error when no name servers were returned by the lookup so that we see an error in self test.
    
    Signed-off-by: Richard Sharpe <rsharpe at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat May 28 04:34:20 CEST 2016 on sn-devel-144

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

Summary of changes:
 source3/utils/net_ads.c | 3 +++
 1 file changed, 3 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 90af09e..d565df1 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1209,6 +1209,9 @@ static NTSTATUS net_update_dns_internal(struct net_context *c,
 		if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
 			DEBUG(3,("net_update_dns_internal: Failed to find name server for the %s "
 			 "realm\n", ads->config.realm));
+			if (ns_count == 0) {
+				status = NT_STATUS_UNSUCCESSFUL;
+			}
 			goto done;
 		}
 


-- 
Samba Shared Repository