[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  613ac16 s3/s4:lsa.idl - QueryDomainInformationPolicy - the "unknown6" field is called "reserved"
       via  e3de87b talloc: add ABI/talloc-2.0.4.sigs
      from  78688b2 s3-waf: add krb5 configure check for WRFILE_KEYTAB.

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


- Log -----------------------------------------------------------------
commit 613ac16d0ed054017d92a647a1cfadff8a318615
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Fri Dec 3 22:56:19 2010 +0100

    s3/s4:lsa.idl - QueryDomainInformationPolicy - the "unknown6" field is called "reserved"
    
    MS-LSAD 3.1.1.1 - http://msdn.microsoft.com/en-us/library/cc234319(v=PROT.13).aspx
    (cherry picked from commit 70eaa3fd0cc1622724852039d63121a2c5ee22d1)

commit e3de87b9351943b17c88558e0c2e575ef6365ad4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 3 10:40:33 2010 +0100

    talloc: add ABI/talloc-2.0.4.sigs
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Dec  3 11:35:45 CET 2010 on sn-devel-104
    (cherry picked from commit 88ff7e3c5ca69a331aa96e0db389cf3e14b1279c)

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

Summary of changes:
 .../ABI/{talloc-2.0.2.sigs => talloc-2.0.4.sigs}   |    0
 lib/talloc/configure.ac                            |    2 +-
 librpc/idl/lsa.idl                                 |    4 ++--
 source4/rpc_server/lsa/dcesrv_lsa.c                |    1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 copy lib/talloc/ABI/{talloc-2.0.2.sigs => talloc-2.0.4.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/ABI/talloc-2.0.2.sigs b/lib/talloc/ABI/talloc-2.0.4.sigs
similarity index 100%
copy from lib/talloc/ABI/talloc-2.0.2.sigs
copy to lib/talloc/ABI/talloc-2.0.4.sigs
diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index 258910e..406d29c 100644
--- a/lib/talloc/configure.ac
+++ b/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT(talloc, 2.0.3)
+AC_INIT(talloc, 2.0.4)
 AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
 AC_CONFIG_HEADER(config.h)
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index 343d21d..869a97a 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -1066,14 +1066,14 @@ import "misc.idl", "security.idl";
 	/* Function 0x35 */
 
 	/* w2k3 returns either 0x000bbbd000000000 or 0x000a48e800000000
-	   for unknown6 - gd */
+	   for reserved - gd */
 	typedef struct {
 		uint32 enforce_restrictions;
 		hyper service_tkt_lifetime;
 		hyper user_tkt_lifetime;
 		hyper user_tkt_renewaltime;
 		hyper clock_skew;
-		hyper unknown6;
+		hyper reserved;
 	} lsa_DomainInfoKerberos;
 
 	typedef struct {
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 4cb5da2..a913ef7 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -3691,6 +3691,7 @@ static NTSTATUS dcesrv_lsa_QueryDomainInformationPolicy(struct dcesrv_call_state
 		k->user_tkt_lifetime = 0;    /* Need to find somewhere to store this, and query in KDC too */
 		k->user_tkt_renewaltime = 0; /* Need to find somewhere to store this, and query in KDC too */
 		k->clock_skew = krb5_get_max_time_skew(smb_krb5_context->krb5_context);
+		k->reserved = 0;
 		talloc_free(smb_krb5_context);
 		*r->out.info = info;
 		return NT_STATUS_OK;


-- 
Samba Shared Repository