[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  2717263 s4:heimdal_build: there's no need to define HAVE_KRB5_ADDRESSES twice
       via  96e471e krb5_wrap: ADDRTYPE_INET6 is available in all supported MIT versions
       via  7014684 krb5_wrap: KRB5_ADDRESS_INET6 is not a define in Heimdal
      from  015bdbd s3: spoolss: Extend publish_toggle test to check returned GUID string format

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


- Log -----------------------------------------------------------------
commit 2717263c144c5f5552c348665a7b4a23991027d9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 9 12:39:52 2017 +0200

    s4:heimdal_build: there's no need to define HAVE_KRB5_ADDRESSES twice
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bjacke at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Oct 11 12:33:42 CEST 2017 on sn-devel-144

commit 96e471eecce91e6cd9b92d854a3c6ca10e0634f3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 9 12:50:35 2017 +0200

    krb5_wrap: ADDRTYPE_INET6 is available in all supported MIT versions
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13079
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bjacke at samba.org>

commit 70146841272bc87c335bd24b736ba2c62efdfe06
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 9 12:50:35 2017 +0200

    krb5_wrap: KRB5_ADDRESS_INET6 is not a define in Heimdal
    
    All supported versions of Heimal already have KRB5_ADDRESS_INET6,
    so there's no need for an explicit check.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13079
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Jacke <bjacke at samba.org>

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

Summary of changes:
 lib/krb5_wrap/krb5_samba.c              | 4 ++--
 source4/heimdal_build/wscript_configure | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index fcde9f5..7c461e5 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -150,7 +150,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
 {
 	memset(pkaddr, '\0', sizeof(krb5_address));
-#if defined(HAVE_IPV6) && defined(KRB5_ADDRESS_INET6)
+#ifdef HAVE_IPV6
 	if (paddr->ss_family == AF_INET6) {
 		pkaddr->addr_type = KRB5_ADDRESS_INET6;
 		pkaddr->address.length = sizeof(((struct sockaddr_in6 *)paddr)->sin6_addr);
@@ -183,7 +183,7 @@ bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
 				krb5_address *pkaddr)
 {
 	memset(pkaddr, '\0', sizeof(krb5_address));
-#if defined(HAVE_IPV6) && defined(ADDRTYPE_INET6)
+#ifdef HAVE_IPV6
 	if (paddr->ss_family == AF_INET6) {
 		pkaddr->addrtype = ADDRTYPE_INET6;
 		pkaddr->length = sizeof(((struct sockaddr_in6 *)paddr)->sin6_addr);
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 354d44f..7bd499f 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -71,7 +71,6 @@ Logs.info("Using in-tree heimdal kerberos defines")
 conf.define('HAVE_GSSAPI_GSSAPI_H', 1)
 conf.define('HAVE_GSSAPI_GSSAPI_KRB5_H', 1)
 conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1)
-conf.define('HAVE_KRB5_ADDRESSES', 1)
 conf.define('HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK', 1)
 conf.define('HAVE_KRB5_SET_REAL_TIME', 1)
 conf.define('HAVE_COM_ERR_H', 1)


-- 
Samba Shared Repository