[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc1-12-g19af55e

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  19af55e628b4debe66236d6fbf2617f00d33e6b3 (commit)
       via  7adeedaf4650f6249cd71bb0090b2589aff7c498 (commit)
      from  f70be5ab57e19e831a5cecd08f930b187cef5a72 (commit)

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


- Log -----------------------------------------------------------------
commit 19af55e628b4debe66236d6fbf2617f00d33e6b3
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 30 11:46:34 2008 +0200

    Fix security=server, bug 5502
    
    This has brown paper bag quality and is definitely needed for 3.2.0.
    
    Thanks to Orion Poplawski for reporting this!
    
    Volker
    (cherry picked from commit 779a3af0cd3ecbf82e3de16a4e0aec046c19d869)

commit 7adeedaf4650f6249cd71bb0090b2589aff7c498
Author: Marc VanHeyningen <marc.vanheyningen at isilon.com>
Date:   Thu May 29 10:00:46 2008 -0700

    Tiny memory leak
    (cherry picked from commit 8fce305e47aefdcad8e20d51851d8a3734508f00)

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

Summary of changes:
 source/auth/auth_server.c |    6 ++++--
 source/libads/util.c      |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index b07884c..31d1d37 100644
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -270,13 +270,15 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
 					 const auth_usersupplied_info *user_info, 
 					 auth_serversupplied_info **server_info)
 {
+	struct server_security_state *state = talloc_get_type_abort(
+		my_private_data, struct server_security_state);
 	struct cli_state *cli;
 	static bool tested_password_server = False;
 	static bool bad_password_server = False;
 	NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
 	bool locally_made_cli = False;
 
-	cli = (struct cli_state *)my_private_data;
+	cli = state->cli;
 	
 	if (cli) {
 	} else {
@@ -285,7 +287,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
 	}
 
 	if (!cli || !cli->initialised) {
-		DEBUG(1,("password server is not connected (cli not initilised)\n"));
+		DEBUG(1,("password server is not connected (cli not initialised)\n"));
 		return NT_STATUS_LOGON_FAILURE;
 	}  
 	
diff --git a/source/libads/util.c b/source/libads/util.c
index af96c3e..72f5dee 100644
--- a/source/libads/util.c
+++ b/source/libads/util.c
@@ -64,6 +64,8 @@ ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
 		server_realm = SMB_STRDUP(ads->server.realm);
 
 		if (!server || !server_realm) {
+			SAFE_FREE(server);
+			SAFE_FREE(server_realm);
 			return ADS_ERROR(LDAP_NO_MEMORY);
 		}
 


-- 
Samba Shared Repository