Fix bug 6124: Attempt to fix the build on IRIX

Under irix, "sa_family" is a #define to sa_union.sa_generic.sa_family2

diff --git a/source/librpc/gen_ndr/nbt.h b/source/librpc/gen_ndr/nbt.h
index 264b00b84fe44d5255eaae05131420b792c2de42..4b872d7936e82dbb46913423bda15f0e38980087 100644 (file)
--- a/source/librpc/gen_ndr/nbt.h
+++ b/source/librpc/gen_ndr/nbt.h
@@ -391,7 +391,7 @@ struct nbt_dgram_packet {
 }/* [public,flag(LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_BIGENDIAN|LIBNDR_PRINT_ARRAY_HEX)] */;
 
 struct nbt_sockaddr {
-       uint32_t sa_family;
+       uint32_t sockaddr_family;
        const char * pdc_ip;/* [flag(LIBNDR_FLAG_BIGENDIAN)] */
        DATA_BLOB remaining;/* [flag(LIBNDR_FLAG_REMAINING)] */
 }/* [gensize,public] */;

diff --git a/source/librpc/gen_ndr/ndr_nbt.c b/source/librpc/gen_ndr/ndr_nbt.c
index 84cfabda574a3a58e456081dda4c6f5a3edaa44d..c02b539da52708f310af440c33d581b82de5f25c 100644 (file)
--- a/source/librpc/gen_ndr/ndr_nbt.c
+++ b/source/librpc/gen_ndr/ndr_nbt.c
@@ -1531,7 +1531,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_nbt_sockaddr(struct ndr_push *ndr, int ndr_f
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sa_family));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sockaddr_family));
                {
                        uint32_t _flags_save_ipv4address = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN);
@@ -1554,7 +1554,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_sockaddr(struct ndr_pull *ndr, int ndr_f
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sa_family));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sockaddr_family));
                {
                        uint32_t _flags_save_ipv4address = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN);
@@ -1577,7 +1577,7 @@ _PUBLIC_ void ndr_print_nbt_sockaddr(struct ndr_print *ndr, const char *name, co
 {
        ndr_print_struct(ndr, name, "nbt_sockaddr");
        ndr->depth++;
-       ndr_print_uint32(ndr, "sa_family", r->sa_family);
+       ndr_print_uint32(ndr, "sockaddr_family", r->sockaddr_family);
        ndr_print_ipv4address(ndr, "pdc_ip", r->pdc_ip);
        ndr_print_DATA_BLOB(ndr, "remaining", r->remaining);
        ndr->depth--;

diff --git a/source/librpc/idl/nbt.idl b/source/librpc/idl/nbt.idl
index bd55b1161bff6c7caec85a3bbaaf79067e23815e..2ce8fa0fa1ec698d099ea122d3f56d41a073ed20 100644 (file)
--- a/source/librpc/idl/nbt.idl
+++ b/source/librpc/idl/nbt.idl
@@ -339,7 +339,7 @@ interface nbt
         */
 
        typedef [public,gensize] struct {
-               uint32                  sa_family;
+               uint32                  sockaddr_family;
                [flag(NDR_BIG_ENDIAN)]  ipv4address pdc_ip;
                [flag(NDR_REMAINING)]   DATA_BLOB remaining;
        } nbt_sockaddr;

diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 19c83600d24b976ecd9cef42ddd7f2bc66ceff6a..a33f684046b6e8fdf8aecd995adfc61dec73e045 100644 (file)
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -200,7 +200,7 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx,
 
        /* FIXME */
        r->sockaddr_size = 0x10; /* the w32 winsock addr size */
-       r->sockaddr.sa_family = 2; /* AF_INET */
+       r->sockaddr.sockaddr_family = 2; /* AF_INET */
        r->sockaddr.pdc_ip = talloc_strdup(mem_ctx, addr);
 
        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, r,