[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  7cb0f95 s4-auth: fixed infinite loop in krb5 auth
       via  6582d47 s4-auth: fixed crash in krb5 auth
      from  f198c90 s3/doc: add missing documentation for vfs_time_audit

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


- Log -----------------------------------------------------------------
commit 7cb0f95bf28c24c45955d6df52f505019341ef31
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Nov 14 14:26:06 2010 +1100

    s4-auth: fixed infinite loop in krb5 auth
    
    we were continually trying the first address returned, instead of
    moving to the next address
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Sun Nov 14 04:11:28 UTC 2010 on sn-devel-104

commit 6582d4739c25a879c58fc768290b3f97ecf795c7
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Nov 14 13:40:02 2010 +1100

    s4-auth: fixed crash in krb5 auth
    
    remote_addr was used after free

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

Summary of changes:
 source4/auth/kerberos/krb5_init_context.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 6727de0..78f3e1f 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -207,7 +207,6 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
 {
 	krb5_error_code ret;
 	NTSTATUS status;
-	struct socket_address *remote_addr;
 	const char *name;
 	struct addrinfo *ai, *a;
 	struct smb_krb5_socket *smb_krb5;
@@ -239,7 +238,8 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
 		return ret;
 	}
 
-	for (a = ai; a; a = ai->ai_next) {
+	for (a = ai; a; a = a->ai_next) {
+		struct socket_address *remote_addr;
 		smb_krb5 = talloc(tmp_ctx, struct smb_krb5_socket);
 		if (!smb_krb5) {
 			talloc_free(tmp_ctx);
@@ -291,7 +291,6 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
 			talloc_free(smb_krb5);
 			continue;
 		}
-		talloc_free(remote_addr);
 
 		/* Setup the FDE, start listening for read events
 		 * from the start (otherwise we may miss a socket


-- 
Samba Shared Repository