[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2616-g355fb81

[Günther Deschner]

The branch, v3-3-test has been updated
       via  355fb81e9e42e507717f33a11793258db9169199 (commit)
       via  b2cdf0f5d04c241791c1462d1b86c587156ac0c7 (commit)
       via  64815c08558c73bbffeb2fdfc0d5850c4ebf8405 (commit)
       via  017ad275e51ff2d9ddfb4390979f16868f3e6a3f (commit)
      from  28d197220038b9a47af177b88a8587f865e45de5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 355fb81e9e42e507717f33a11793258db9169199
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 27 11:40:50 2008 +0200

    dsgetdcname: use family (instead of sa_family).
    
    Guenther

commit b2cdf0f5d04c241791c1462d1b86c587156ac0c7
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 27 11:40:32 2008 +0200

    re-run make idl.
    
    Guenther

commit 64815c08558c73bbffeb2fdfc0d5850c4ebf8405
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 27 11:38:53 2008 +0200

    idl: avoid sa_family as it its a macro on IRIX.
    
    Guenther

commit 017ad275e51ff2d9ddfb4390979f16868f3e6a3f
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 26 14:19:28 2008 +0200

    doserr: add WERR_REVISION_MISMATCH.
    
    Guenther

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

Summary of changes:
 source/include/doserr.h         |    1 +
 source/librpc/gen_ndr/nbt.h     |    2 +-
 source/librpc/gen_ndr/ndr_nbt.c |    6 +++---
 source/librpc/idl/nbt.idl       |    2 +-
 source/libsmb/doserr.c          |    1 +
 source/libsmb/dsgetdcname.c     |    2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 44ce739..68dc0c1 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -206,6 +206,7 @@
 #define WERR_INVALID_COMPUTER_NAME W_ERROR(1210)
 #define WERR_INVALID_DOMAINNAME W_ERROR(1212)
 #define WERR_MACHINE_LOCKED W_ERROR(1271)
+#define WERR_REVISION_MISMATCH W_ERROR(1306)
 #define WERR_NO_LOGON_SERVERS W_ERROR(1311)
 #define WERR_NO_SUCH_LOGON_SESSION W_ERROR(1312)
 #define WERR_USER_ALREADY_EXISTS W_ERROR(1316)
diff --git a/source/librpc/gen_ndr/nbt.h b/source/librpc/gen_ndr/nbt.h
index b77b7c3..62ad524 100644
--- a/source/librpc/gen_ndr/nbt.h
+++ b/source/librpc/gen_ndr/nbt.h
@@ -469,7 +469,7 @@ struct nbt_netlogon_response_from_pdc {
 #define NBT_SERVER_FULL_SECRET_DOMAIN_6 ( 0x00001000 )
 
 struct nbt_dc_sock_addr {
-	uint32_t sa_family;
+	uint32_t family;
 	const char * pdc_ip;/* [flag(LIBNDR_FLAG_BIGENDIAN)] */
 	DATA_BLOB remaining;/* [flag(LIBNDR_FLAG_REMAINING)] */
 };
diff --git a/source/librpc/gen_ndr/ndr_nbt.c b/source/librpc/gen_ndr/ndr_nbt.c
index aa67d41..240b58e 100644
--- a/source/librpc/gen_ndr/ndr_nbt.c
+++ b/source/librpc/gen_ndr/ndr_nbt.c
@@ -1933,7 +1933,7 @@ static enum ndr_err_code ndr_push_nbt_dc_sock_addr(struct ndr_push *ndr, int ndr
 {
 	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->family));
 		{
 			uint32_t _flags_save_ipv4address = ndr->flags;
 			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN);
@@ -1956,7 +1956,7 @@ static enum ndr_err_code ndr_pull_nbt_dc_sock_addr(struct ndr_pull *ndr, int ndr
 {
 	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->family));
 		{
 			uint32_t _flags_save_ipv4address = ndr->flags;
 			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN);
@@ -1979,7 +1979,7 @@ _PUBLIC_ void ndr_print_nbt_dc_sock_addr(struct ndr_print *ndr, const char *name
 {
 	ndr_print_struct(ndr, name, "nbt_dc_sock_addr");
 	ndr->depth++;
-	ndr_print_uint32(ndr, "sa_family", r->sa_family);
+	ndr_print_uint32(ndr, "family", r->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 7e98aa7..9f5c4a9 100644
--- a/source/librpc/idl/nbt.idl
+++ b/source/librpc/idl/nbt.idl
@@ -412,7 +412,7 @@ interface nbt
 	} nbt_server_type;
 
 	typedef struct {
-		uint32			sa_family;
+		uint32			family;
 		[flag(NDR_BIG_ENDIAN)]	ipv4address pdc_ip;
 		[flag(NDR_REMAINING)]	DATA_BLOB remaining;
 	} nbt_dc_sock_addr;
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index 450d6ee..163656f 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -64,6 +64,7 @@ werror_code_struct dos_errs[] =
 	{ "WERR_DEST_NOT_FOUND", WERR_DEST_NOT_FOUND },
 	{ "WERR_NOT_LOCAL_DOMAIN", WERR_NOT_LOCAL_DOMAIN },
 	{ "WERR_USER_EXISTS", WERR_USER_EXISTS },
+	{ "WERR_REVISION_MISMATCH", WERR_REVISION_MISMATCH },
 	{ "WERR_NO_LOGON_SERVERS", WERR_NO_LOGON_SERVERS },
 	{ "WERR_NO_SUCH_LOGON_SESSION", WERR_NO_SUCH_LOGON_SESSION },
 	{ "WERR_USER_ALREADY_EXISTS", WERR_USER_ALREADY_EXISTS },
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index be38db1..8d75593 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -205,7 +205,7 @@ static NTSTATUS map_logon29_from_cldap_reply(TALLOC_CTX *mem_ctx,
 
 	/* FIXME */
 	p->dc_sock_addr_size = 0x10; /* the w32 winsock addr size */
-	p->dc_sock_addr.sa_family = 2; /* AF_INET */
+	p->dc_sock_addr.family = 2; /* AF_INET */
 	p->dc_sock_addr.pdc_ip = talloc_strdup(mem_ctx, addr);
 
 	switch (nt_version & 0x0000001f) {


-- 
Samba Shared Repository