[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  4ea40ed auth/credentials_krb5: fix memory leak in cli_credentials_failed_kerberos_login().
       via  94cd324 s4-torture: the new krb5 kdc tests are heimdal, not dc specific.
       via  350e403 idl: fix IDL for netr_WorkstationInformation().
      from  9ee5887 s4:rpc_server: add support for DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4ea40ed0c1e054b26488158ded8cc0b7eda1c302
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 28 17:24:09 2014 +0100

    auth/credentials_krb5: fix memory leak in cli_credentials_failed_kerberos_login().
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Jan 26 19:56:57 CET 2015 on sn-devel-104

commit 94cd324be9a24fcdcbf0b1c4a9dfc7a49d074b8a
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 23 13:01:27 2015 +0100

    s4-torture: the new krb5 kdc tests are heimdal, not dc specific.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 350e403df83eddd7171e3e9e16018188a571b7ac
Author: Günther Deschner <gd at samba.org>
Date:   Sat Sep 27 00:06:25 2014 +0200

    idl: fix IDL for netr_WorkstationInformation().
    
    This structure is used by the netr_LogonGetDomainInfo call as the input.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 auth/credentials/credentials_krb5.c | 2 ++
 librpc/idl/netlogon.idl             | 2 +-
 source4/torture/krb5/wscript_build  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index d968e20..77dbcd2 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -257,10 +257,12 @@ _PUBLIC_ bool cli_credentials_failed_kerberos_login(struct cli_credentials *cred
 	ret = krb5_cc_retrieve_cred(ccc->smb_krb5_context->krb5_context, ccc->ccache, KRB5_TC_MATCH_SRV_NAMEONLY, &creds, &creds2);
 	if (ret != 0) {
 		/* don't retry - we didn't find these credentials to remove */
+		krb5_free_cred_contents(ccc->smb_krb5_context->krb5_context, &creds);
 		return false;
 	}
 
 	ret = krb5_cc_remove_cred(ccc->smb_krb5_context->krb5_context, ccc->ccache, KRB5_TC_MATCH_SRV_NAMEONLY, &creds);
+	krb5_free_cred_contents(ccc->smb_krb5_context->krb5_context, &creds);
 	krb5_free_cred_contents(ccc->smb_krb5_context->krb5_context, &creds2);
 	if (ret != 0) {
 		/* don't retry - we didn't find these credentials to
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index f3dfc1b..f3bfc30 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -1336,7 +1336,7 @@ interface netlogon
 		lsa_String dummy_string3;
 		lsa_String dummy_string4;
 		netr_WorkstationFlags workstation_flags;
-		uint32 dummy_long2;
+		netr_SupportedEncTypes supported_enc_types;
 		uint32 dummy_long3;
 		uint32 dummy_long4;
 	} netr_WorkstationInformation;
diff --git a/source4/torture/krb5/wscript_build b/source4/torture/krb5/wscript_build
index 81a5b09..3d3a840 100644
--- a/source4/torture/krb5/wscript_build
+++ b/source4/torture/krb5/wscript_build
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+if bld.CONFIG_SET('SAMBA4_USES_HEIMDAL'):
       bld.SAMBA_MODULE('TORTURE_KRB5',
                        source='kdc.c kdc-canon.c',
                        autoproto='proto.h',


-- 
Samba Shared Repository