[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Fri Jul 17 05:55:05 UTC 2020


The branch, master has been updated
       via  57badc4638a s3: libsmb: Namecache. Fix bug missed by me in previous cleanup.
      from  d67e9149a61 s3-libads: Pass timeout to open_socket_out in ms

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


- Log -----------------------------------------------------------------
commit 57badc4638a6f626d0a6821d0a82b27d036bdc47
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jul 16 15:47:04 2020 -0700

    s3: libsmb: Namecache. Fix bug missed by me in previous cleanup.
    
    In ipstr_list_make() we need to look at the correct array entry
    to determine the ss_family for the sockaddr_storage.
    
    Otherwise we are always storing the type of the first entry.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Jul 17 05:54:31 UTC 2020 on sn-devel-184

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

Summary of changes:
 source3/libsmb/namecache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index 7f534587263..fb4a4aac8c8 100644
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -58,7 +58,7 @@ static char *ipstr_list_make(TALLOC_CTX *ctx,
 			       sizeof(addr_buf),
 			       &ip_list[i].ss);
 
-		if (ip_list->ss.ss_family == AF_INET) {
+		if (ip_list[i].ss.ss_family == AF_INET) {
 			/* IPv4 */
 			new_str = talloc_asprintf(ctx,
 						  "%s:%d",


-- 
Samba Shared Repository



More information about the samba-cvs mailing list