[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  5c1ed7f ctdbd_conn: use the right error code from ctdbd_connect for debug and return
       via  3320a56 ctdbd_conn: lower the debug level 0 for failing connection to ctdbd.
      from  bbb1887 Avoid segfault in durable_open tests

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


- Log -----------------------------------------------------------------
commit 5c1ed7f18f81faa3619ac47f3e0a1f4e343c94ce
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 26 13:17:01 2015 +0200

    ctdbd_conn: use the right error code from ctdbd_connect for debug and return
    
    ctdbd_connect() explicitly returns the errno.
    Using errno instead of ret misses some important
    manually set return values and might use the
    errno that is changed by close(fd).
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Fri Jun 26 17:21:26 CEST 2015 on sn-devel-104

commit 3320a565fb114372240504826618a811980f5e97
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 26 13:14:39 2015 +0200

    ctdbd_conn: lower the debug level 0 for failing connection to ctdbd.
    
    If e.g. samba fails to start because it can not open the
    connection to ctdbd, we want to see some indication in the
    logs about this.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/lib/ctdbd_conn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 7a95b79c..fae086a 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -458,8 +458,8 @@ static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
 
 	ret = ctdbd_connect(&conn->fd);
 	if (ret != 0) {
-		status = map_nt_error_from_unix(errno);
-		DEBUG(10, ("ctdbd_connect failed: %s\n", strerror(errno)));
+		status = map_nt_error_from_unix(ret);
+		DEBUG(1, ("ctdbd_connect failed: %s\n", strerror(ret)));
 		goto fail;
 	}
 	talloc_set_destructor(conn, ctdbd_connection_destructor);


-- 
Samba Shared Repository