[SCM] Samba Shared Repository - branch master updated

Martin Schwenke martins at samba.org
Tue Oct 20 07:23:02 UTC 2020


The branch, master has been updated
       via  a6ff80cdc1b s3:ctdbd_conn: Fix the build on FreeBSD
      from  930695b04d2 fuzz_dcerpc_parse_binding: don't leak

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


- Log -----------------------------------------------------------------
commit a6ff80cdc1b16f32716bc54c052e8fa8b149b4f9
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Oct 20 14:47:20 2020 +1100

    s3:ctdbd_conn: Fix the build on FreeBSD
    
    Commit 6b9564c1084d8dc7319857fac984808571ef0eb9 broke the build on
    FreeBSD:
    
    [2321/3909] Compiling source3/smbd/process.c
    ../../source3/smbd/process.c:2797:10: error: use of undeclared identifier 'EREMOTEIO'
                    return EREMOTEIO;
                           ^
    ../../source3/smbd/process.c:2833:14: error: use of undeclared identifier 'EREMOTEIO'
                    if (ret == EREMOTEIO) {
                               ^
    2 errors generated.
    
    Use one of the POSIX error codes instead.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Tue Oct 20 07:22:08 UTC 2020 on sn-devel-184

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 4cf53720067..9e861554fa7 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2794,7 +2794,7 @@ static int match_cluster_movable_ip(uint32_t total_ip_count,
 	};
 
 	if (is_movable_ip && sockaddr_equal(&pub_ip.u.sa, &srv_ip.u.sa)) {
-		return EREMOTEIO;
+		return EADDRNOTAVAIL;
 	}
 
 	return 0;
@@ -2830,7 +2830,7 @@ static NTSTATUS smbd_register_ips(struct smbXsrv_connection *xconn,
 		ret = ctdbd_public_ip_foreach(cconn,
 					      match_cluster_movable_ip,
 					      srv);
-		if (ret == EREMOTEIO) {
+		if (ret == EADDRNOTAVAIL) {
 			xconn->has_cluster_movable_ip = true;
 			DBG_DEBUG("cluster movable IP on %s\n",
 				  smbXsrv_connection_dbg(xconn));


-- 
Samba Shared Repository



More information about the samba-cvs mailing list