[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  9d91f01 s4-wbclient: Cope with winbind returning an error
      from  01de781 ctdb-daemon: Always update database priority cluster wide

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


- Log -----------------------------------------------------------------
commit 9d91f01b7be7c2bae9799d1d34fb75f8cdf23290
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Apr 7 14:06:21 2014 +1200

    s4-wbclient: Cope with winbind returning an error
    
    Change-Id: I8eaf858f9e9e55eec20aa2c585db5459fb73b887
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Apr  8 12:53:13 CEST 2014 on sn-devel-104

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

Summary of changes:
 source4/libcli/wbclient/wbclient.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c
index 165333a..b5183be 100644
--- a/source4/libcli/wbclient/wbclient.c
+++ b/source4/libcli/wbclient/wbclient.c
@@ -155,6 +155,10 @@ NTSTATUS wbc_sids_to_xids(struct tevent_context *ev, struct id_map *ids,
 
 	close(fd);
 
+	if (resp->result != WINBINDD_OK || p == NULL) {
+		return NT_STATUS_INTERNAL_ERROR;
+	}
+
 	p = resp->extra_data.data;
 
 	for (i=0; i<count; i++) {


-- 
Samba Shared Repository