[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  8d5534d2369 lib/tsocket: Fix build on Freebsd
      from  d12cb47724c selftest: Update user_account_control tests to pass against Windows 2019

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


- Log -----------------------------------------------------------------
commit 8d5534d2369ea2654703c93697b3d5257da3cdb6
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Sep 15 14:29:28 2021 +1000

    lib/tsocket: Fix build on Freebsd
    
    This fixes the following build error on freebsd.
    
    [1567/3959] Compiling lib/tsocket/tsocket_bsd.c
    ../../lib/tsocket/tsocket_bsd.c:415:8: error: use of undeclared identifier 'EAI_ADDRFAMILY'
                    case EAI_ADDRFAMILY:
                         ^
    
    On FreeBSD EAI_ADDRFAMILY is obsoleted.  Here's the relevant excerpt
    from netdb.h on FreeBSD 13.
    
    -----------------------------------------------------------------
      /*
       * Error return codes from gai_strerror(3), see RFC 3493.
       */
      #if 0
      /* Obsoleted on RFC 2553bis-02 */
      #define EAI_ADDRFAMILY   1      /* address family for hostname not supported */
      #endif
    -----------------------------------------------------------------
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Sep 16 19:42:19 UTC 2021 on sn-devel-184

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

Summary of changes:
 lib/tsocket/tsocket_bsd.c | 2 ++
 1 file changed, 2 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 39a95e4c5ec..9485da7c8af 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -412,7 +412,9 @@ int _tsocket_address_inet_from_strings(TALLOC_CTX *mem_ctx,
 		switch (ret) {
 		case EAI_FAIL:
 		case EAI_NONAME:
+#ifdef EAI_ADDRFAMILY
 		case EAI_ADDRFAMILY:
+#endif
 			errno = EINVAL;
 			break;
 		}


-- 
Samba Shared Repository