The branch, master has been updated
via 88a2ad2 s4/kdc - fix a warning regarding a changed parameter type
(kvno)
via 70eaa3f s3/s4:lsa.idl - QueryDomainInformationPolicy - the
"unknown6" field is called "reserved"
via d0b3932 s4:lsa RPC server - always initialise "info" structures
from aebc90f s4:lsa RPC server - "dcesrv_lsa_CreateSecret" - a bit of
rework
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 88a2ad28fe52cbe13d00b0115bf821e33f5791da
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Dec 3 23:06:53 2010 +0100
s4/kdc - fix a warning regarding a changed parameter type (kvno)
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Fri Dec 3 23:56:15 CET 2010 on sn-devel-104
commit 70eaa3fd0cc1622724852039d63121a2c5ee22d1
Author: Matthias Dieter Wallnöfer <[email protected]>
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
commit d0b39324471e5226613a86aad313557cd4a89a9a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Dec 3 22:47:21 2010 +0100
s4:lsa RPC server - always initialise "info" structures
This should help to fix bug #7769
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/lsa.idl | 4 ++--
source4/kdc/db-glue.c | 2 +-
source4/kdc/db-glue.h | 2 +-
source4/kdc/hdb-samba4.c | 2 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 5 +++--
5 files changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
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/kdc/db-glue.c b/source4/kdc/db-glue.c
index 215b230..4bb8e35 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1316,7 +1316,7 @@ krb5_error_code samba_kdc_fetch(krb5_context context,
struct samba_kdc_db_context *kdc_db_ctx,
krb5_const_principal principal,
unsigned flags,
- unsigned kvno,
+ krb5_kvno kvno,
hdb_entry_ex *entry_ex)
{
krb5_error_code ret = HDB_ERR_NOENTRY;
diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h
index 9738fbc..4f1e06f 100644
--- a/source4/kdc/db-glue.h
+++ b/source4/kdc/db-glue.h
@@ -25,7 +25,7 @@ krb5_error_code samba_kdc_fetch(krb5_context context,
struct samba_kdc_db_context *kdc_db_ctx,
krb5_const_principal principal,
unsigned flags,
- unsigned kvno,
+ krb5_kvno kvno,
hdb_entry_ex *entry_ex);
krb5_error_code samba_kdc_firstkey(krb5_context context,
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 771b2ed..313f419 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -85,7 +85,7 @@ static krb5_error_code hdb_samba4_remove(krb5_context
context, HDB *db, krb5_con
static krb5_error_code hdb_samba4_fetch_kvno(krb5_context context, HDB *db,
krb5_const_principal principal,
unsigned flags,
- unsigned kvno,
+ krb5_kvno kvno,
hdb_entry_ex *entry_ex)
{
struct samba_kdc_db_context *kdc_db_ctx;
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c
b/source4/rpc_server/lsa/dcesrv_lsa.c
index c1986b4..a3c8846 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -391,7 +391,7 @@ static WERROR
dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_cal
{
union dssetup_DsRoleInfo *info;
- info = talloc(mem_ctx, union dssetup_DsRoleInfo);
+ info = talloc_zero(mem_ctx, union dssetup_DsRoleInfo);
W_ERROR_HAVE_NO_MEMORY(info);
switch (r->in.level) {
@@ -3677,7 +3677,7 @@ static NTSTATUS
dcesrv_lsa_QueryDomainInformationPolicy(struct dcesrv_call_state
{
union lsa_DomainInformationPolicy *info;
- info = talloc(r->out.info, union lsa_DomainInformationPolicy);
+ info = talloc_zero(r->out.info, union lsa_DomainInformationPolicy);
if (!info) {
return NT_STATUS_NO_MEMORY;
}
@@ -3705,6 +3705,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
