Changeset 222 for branches/samba-3.3.x/source/librpc

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

Location:

branches/samba-3.3.x/source/librpc

Files:

• gen_ndr/nbt.h (modified) (1 diff)
• gen_ndr/ndr_nbt.c (modified) (3 diffs)
• idl/nbt.idl (modified) (1 diff)
• ndr/ndr.c (modified) (1 diff)

branches/samba-3.3.x/source/librpc/gen_ndr/nbt.h

@@ -392 +392 @@
 
 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)] */

branches/samba-3.3.x/source/librpc/gen_ndr/ndr_nbt.c

@@ -1532 +1532 @@
         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;
@@ -1555 +1555 @@
         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;
@@ -1578 +1578 @@
         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);

branches/samba-3.3.x/source/librpc/idl/nbt.idl

@@ -340 +340 @@
 
         typedef [public,gensize] struct {
-                uint32                  sa_family;
+                uint32                  sockaddr_family;
                 [flag(NDR_BIG_ENDIAN)]  ipv4address pdc_ip;
                 [flag(NDR_REMAINING)]   DATA_BLOB remaining;

branches/samba-3.3.x/source/librpc/ndr/ndr.c

@@ -188 +188 @@
 
         for (i=0;i<ndr->depth;i++) {
-                DEBUGADD(0,("    "));
-        }
-
-        DEBUGADD(0,("%s\n", s));
+                DEBUGADD(1,("    "));
+        }
+
+        DEBUGADD(1,("%s\n", s));
         free(s);
 }