svn commit: samba r17591 - in branches/SAMBA_3_0/source/utils: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-08-17 14:38:59 +0000 (Thu, 17 Aug 2006)
New Revision: 17591

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17591

Log:
machine_account is unused, and ctx must be freed. Thanks Michael
Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c	2006-08-17 14:28:03 UTC (rev 17590)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2006-08-17 14:38:59 UTC (rev 17591)
@@ -1168,11 +1168,10 @@
 	ADS_STRUCT *ads = NULL;
 	ADS_STATUS status;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-	char *machine_account = NULL;
 	const char *short_domain_name = NULL;
 	char *tmp_password, *password;
 	struct cldap_netlogon_reply cldap_reply;
-	TALLOC_CTX *ctx;
+	TALLOC_CTX *ctx = NULL;
 	DOM_SID *domain_sid = NULL;
 	BOOL createupn = False;
 	const char *machineupn = NULL;
@@ -1342,7 +1341,6 @@
 
 	d_printf("Joined '%s' to realm '%s'\n", global_myname(), ads->config.realm);
 
-	SAFE_FREE(machine_account);
 	TALLOC_FREE( ctx );
 	ads_destroy(&ads);
 	
@@ -1353,6 +1351,7 @@
 	d_printf("Failed to join domain: %s\n", 
 	         get_friendly_nt_error_msg(nt_status));
 	ads_destroy(&ads);
+	TALLOC_FREE( ctx );
 	return -1;
 }