r1222: Valgrind memory leak fixes. Still tracking down a strange one...

Can't fix the krb5 memory leaks inside that library :-(.
Jeremy.
(This used to be commit ad440213aaae58fb5bff6e8a6fcf811c5ba83669)

1 files changed, 123 insertions, 41 deletions

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 650f9922cb..b5706e919a 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -111,8 +111,8 @@ static int net_ads_info(int argc, const char **argv)
 	d_printf("LDAP port: %d\n", ads->ldap_port);
 	d_printf("Server time: %s\n", http_timestring(ads->config.current_time));
 
-       d_printf("KDC server: %s\n", ads->auth.kdc_server );
-       d_printf("Server time offset: %d\n", ads->auth.time_offset );
+	d_printf("KDC server: %s\n", ads->auth.kdc_server );
+	d_printf("Server time offset: %d\n", ads->auth.time_offset );
 
 	return 0;
 }
@@ -216,6 +216,7 @@ static int net_ads_workgroup(int argc, const char **argv)
 	if (!(ads = ads_startup())) return -1;
 
 	if (!(ctx = talloc_init("net_ads_workgroup"))) {
+		ads_destroy(&ads);
 		return -1;
 	}
 
@@ -223,13 +224,14 @@ static int net_ads_workgroup(int argc, const char **argv)
 		d_printf("Failed to find workgroup for realm '%s'\n", 
 			 ads->config.realm);
 		talloc_destroy(ctx);
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	d_printf("Workgroup: %s\n", workgroup);
 
 	talloc_destroy(ctx);
-
+	ads_destroy(&ads);
 	return 0;
 }
 
@@ -276,7 +278,9 @@ static int ads_user_add(int argc, const char **argv)
 
 	if (argc < 1) return net_ads_user_usage(argc, argv);
 	
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	status = ads_find_user_acct(ads, &res, argv[0]);
 
@@ -344,13 +348,18 @@ static int ads_user_info(int argc, const char **argv)
 	char **grouplist;
 	char *escaped_user = escape_ldap_string_alloc(argv[0]);
 
-	if (argc < 1) return net_ads_user_usage(argc, argv);
+	if (argc < 1) {
+		return net_ads_user_usage(argc, argv);
+	}
 	
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	if (!escaped_user) {
 		d_printf("ads_user_info: failed to escape user %s\n", argv[0]);
-		return -1;
+		ads_destroy(&ads);
+	 	return -1;
 	}
 
 	asprintf(&searchstring, "(sAMAccountName=%s)", escaped_user);
@@ -359,6 +368,7 @@ static int ads_user_info(int argc, const char **argv)
 
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_search: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}
 	
@@ -376,7 +386,6 @@ static int ads_user_info(int argc, const char **argv)
 	}
 	
 	ads_msgfree(ads, res);
-
 	ads_destroy(&ads);
 	return 0;
 }
@@ -388,13 +397,18 @@ static int ads_user_delete(int argc, const char **argv)
 	void *res;
 	char *userdn;
 
-	if (argc < 1) return net_ads_user_usage(argc, argv);
+	if (argc < 1) {
+		return net_ads_user_usage(argc, argv);
+	}
 	
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	rc = ads_find_user_acct(ads, &res, argv[0]);
 	if (!ADS_ERR_OK(rc)) {
 		DEBUG(0, ("User %s does not exist\n", argv[0]));
+		ads_destroy(&ads);
 		return -1;
 	}
 	userdn = ads_get_dn(ads, res);
@@ -403,10 +417,12 @@ static int ads_user_delete(int argc, const char **argv)
 	ads_memfree(ads, userdn);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("User %s deleted\n", argv[0]);
+		ads_destroy(&ads);
 		return 0;
 	}
 	d_printf("Error deleting user %s: %s\n", argv[0], 
 		 ads_errstr(rc));
+	ads_destroy(&ads);
 	return -1;
 }
 
@@ -425,7 +441,9 @@ int net_ads_user(int argc, const char **argv)
 	char *disp_fields[2] = {NULL, NULL};
 	
 	if (argc == 0) {
-		if (!(ads = ads_startup())) return -1;
+		if (!(ads = ads_startup())) {
+			return -1;
+		}
 
 		if (opt_long_list_entries)
 			d_printf("\nUser name             Comment"\
@@ -456,9 +474,13 @@ static int ads_group_add(int argc, const char **argv)
 	void *res=NULL;
 	int rc = -1;
 
-	if (argc < 1) return net_ads_group_usage(argc, argv);
+	if (argc < 1) {
+		return net_ads_group_usage(argc, argv);
+	}
 	
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	status = ads_find_user_acct(ads, &res, argv[0]);
 
@@ -497,13 +519,18 @@ static int ads_group_delete(int argc, const char **argv)
 	void *res;
 	char *groupdn;
 
-	if (argc < 1) return net_ads_group_usage(argc, argv);
+	if (argc < 1) {
+		return net_ads_group_usage(argc, argv);
+	}
 	
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	rc = ads_find_user_acct(ads, &res, argv[0]);
 	if (!ADS_ERR_OK(rc)) {
 		DEBUG(0, ("Group %s does not exist\n", argv[0]));
+		ads_destroy(&ads);
 		return -1;
 	}
 	groupdn = ads_get_dn(ads, res);
@@ -512,10 +539,12 @@ static int ads_group_delete(int argc, const char **argv)
 	ads_memfree(ads, groupdn);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("Group %s deleted\n", argv[0]);
+		ads_destroy(&ads);
 		return 0;
 	}
 	d_printf("Error deleting group %s: %s\n", argv[0], 
 		 ads_errstr(rc));
+	ads_destroy(&ads);
 	return -1;
 }
 
@@ -533,7 +562,9 @@ int net_ads_group(int argc, const char **argv)
 	char *disp_fields[2] = {NULL, NULL};
 
 	if (argc == 0) {
-		if (!(ads = ads_startup())) return -1;
+		if (!(ads = ads_startup())) {
+			return -1;
+		}
 
 		if (opt_long_list_entries)
 			d_printf("\nGroup name            Comment"\
@@ -557,21 +588,25 @@ static int net_ads_status(int argc, const char **argv)
 	ADS_STATUS rc;
 	void *res;
 
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	rc = ads_find_machine_acct(ads, &res, global_myname());
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_find_machine_acct: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (ads_count_replies(ads, res) == 0) {
 		d_printf("No machine account for '%s' found\n", global_myname());
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	ads_dump(ads, res);
-
+	ads_destroy(&ads);
 	return 0;
 }
 
@@ -595,13 +630,14 @@ static int net_ads_leave(int argc, const char **argv)
 
 	rc = ads_leave_realm(ads, global_myname());
 	if (!ADS_ERR_OK(rc)) {
-	    d_printf("Failed to delete host '%s' from the '%s' realm.\n", 
-		     global_myname(), ads->config.realm);
-	    return -1;
+		d_printf("Failed to delete host '%s' from the '%s' realm.\n", 
+			global_myname(), ads->config.realm);
+		ads_destroy(&ads);
+		return -1;
 	}
 
 	d_printf("Removed '%s' from realm '%s'\n", global_myname(), ads->config.realm);
-
+	ads_destroy(&ads);
 	return 0;
 }
 
@@ -661,7 +697,9 @@ int net_ads_join(int argc, const char **argv)
 	const char *short_domain_name = NULL;
 	TALLOC_CTX *ctx = NULL;
 
-	if (argc > 0) org_unit = argv[0];
+	if (argc > 0) {
+		org_unit = argv[0];
+	}
 
 	if (!secrets_init()) {
 		DEBUG(1,("Failed to initialise secrets database\n"));
@@ -671,15 +709,19 @@ int net_ads_join(int argc, const char **argv)
 	tmp_password = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
 	password = strdup(tmp_password);
 
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
 	if (!*lp_realm()) {
 		d_printf("realm must be set in in smb.conf for ADS join to succeed.\n");
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (strcmp(ads->config.realm, lp_realm()) != 0) {
 		d_printf("realm of remote server (%s) and realm in smb.conf (%s) DO NOT match.  Aborting join\n", ads->config.realm, lp_realm());
+		ads_destroy(&ads);
 		return -1;
 	}
 
@@ -693,35 +735,41 @@ int net_ads_join(int argc, const char **argv)
 	if (rc.error_type == ENUM_ADS_ERROR_LDAP && rc.err.rc == LDAP_NO_SUCH_OBJECT) {
 		d_printf("ads_join_realm: organizational unit %s does not exist (dn:%s)\n", 
 			 org_unit, dn);
+		ads_destroy(&ads);
 		return -1;
 	}
 	free(dn);
 
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_join_realm: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}	
 
 	rc = ads_join_realm(ads, global_myname(), account_type, org_unit);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_join_realm: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	rc = ads_domain_sid(ads, &dom_sid);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_domain_sid: %s\n", ads_errstr(rc));	
-	return -1;
+		ads_destroy(&ads);
+		return -1;
 	}
 
 	if (asprintf(&machine_account, "%s$", global_myname()) == -1) {
 		d_printf("asprintf failed\n");
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	rc = ads_set_machine_password(ads, machine_account, password);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_set_machine_password: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}
 	
@@ -729,6 +777,7 @@ int net_ads_join(int argc, const char **argv)
 	
 	if ( !(ctx = talloc_init("net ads join")) ) {
 		d_printf("talloc_init() failed!\n");
+		ads_destroy(&ads);
 		return -1;
 	}
 	
@@ -753,21 +802,25 @@ int net_ads_join(int argc, const char **argv)
 	    
 	if (!secrets_store_domain_sid(lp_workgroup(), &dom_sid)) {
 		DEBUG(1,("Failed to save domain sid\n"));
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (!secrets_store_machine_password(password, lp_workgroup(), sec_channel_type)) {
 		DEBUG(1,("Failed to save machine password\n"));
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (!secrets_store_domain_sid(short_domain_name, &dom_sid)) {
 		DEBUG(1,("Failed to save domain sid\n"));
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (!secrets_store_machine_password(password, short_domain_name, sec_channel_type)) {
 		DEBUG(1,("Failed to save machine password\n"));
+		ads_destroy(&ads);
 		return -1;
 	}
 	
@@ -783,6 +836,7 @@ int net_ads_join(int argc, const char **argv)
 	if ( ctx ) {
 		talloc_destroy(ctx);
 	}
+	ads_destroy(&ads);
 	return 0;
 }
 
@@ -809,26 +863,29 @@ static int net_ads_printer_search(int argc, const char **argv)
 	ADS_STATUS rc;
 	void *res = NULL;
 
-	if (!(ads = ads_startup())) 
+	if (!(ads = ads_startup())) {
 		return -1;
+	}
 
 	rc = ads_find_printers(ads, &res);
 
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_find_printer: %s\n", ads_errstr(rc));
 		ads_msgfree(ads, res);
-		return -1;
+		ads_destroy(&ads);
+	 	return -1;
 	}
 
 	if (ads_count_replies(ads, res) == 0) {
 		d_printf("No results found\n");
 		ads_msgfree(ads, res);
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	ads_dump(ads, res);
 	ads_msgfree(ads, res);
-
+	ads_destroy(&ads);
 	return 0;
 }
 
@@ -839,34 +896,41 @@ static int net_ads_printer_info(int argc, const char **argv)
 	const char *servername, *printername;
 	void *res = NULL;
 
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
-	if (argc > 0)
+	if (argc > 0) {
 		printername = argv[0];
-	else
+	} else {
 		printername = "*";
+	}
 
-	if (argc > 1)
+	if (argc > 1) {
 		servername =  argv[1];
-	else
+	} else {
 		servername = global_myname();
+	}
 
 	rc = ads_find_printer_on_server(ads, &res, printername, servername);
 
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_find_printer_on_server: %s\n", ads_errstr(rc));
 		ads_msgfree(ads, res);
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (ads_count_replies(ads, res) == 0) {
 		d_printf("Printer '%s' not found\n", printername);
 		ads_msgfree(ads, res);
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	ads_dump(ads, res);
 	ads_msgfree(ads, res);
+	ads_destroy(&ads);
 
 	return 0;
 }
@@ -889,17 +953,21 @@ static int net_ads_printer_publish(int argc, const char **argv)
 	char *prt_dn, *srv_dn, **srv_cn;
 	void *res = NULL;
 
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
-	if (argc < 1)
+	if (argc < 1) {
 		return net_ads_printer_usage(argc, argv);
+	}
 	
 	printername = argv[0];
 
-	if (argc == 2)
+	if (argc == 2) {
 		servername = argv[1];
-	else
+	} else {
 		servername = global_myname();
+	}
 		
 	/* Get printer data from SPOOLSS */
 
@@ -916,6 +984,7 @@ static int net_ads_printer_publish(int argc, const char **argv)
 	if (NT_STATUS_IS_ERR(nt_status)) {
 		d_printf("Unable to open a connnection to %s to obtain data "
 			 "for %s\n", servername, printername);
+		ads_destroy(&ads);
 		return -1;
 	}
 
@@ -926,6 +995,7 @@ static int net_ads_printer_publish(int argc, const char **argv)
 	if (ads_count_replies(ads, res) == 0) {
 		d_printf("Could not find machine account for server %s\n", 
 			 servername);
+		ads_destroy(&ads);
 		return -1;
 	}
 
@@ -940,10 +1010,12 @@ static int net_ads_printer_publish(int argc, const char **argv)
         rc = ads_add_printer_entry(ads, prt_dn, mem_ctx, &mods);
         if (!ADS_ERR_OK(rc)) {
                 d_printf("ads_publish_printer: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
                 return -1;
         }
  
         d_printf("published printer\n");
+	ads_destroy(&ads);
  
 	return 0;
 }
@@ -956,27 +1028,33 @@ static int net_ads_printer_remove(int argc, const char **argv)
 	char *prt_dn;
 	void *res = NULL;
 
-	if (!(ads = ads_startup())) return -1;
+	if (!(ads = ads_startup())) {
+		return -1;
+	}
 
-	if (argc < 1)
+	if (argc < 1) {
 		return net_ads_printer_usage(argc, argv);
+	}
 
-	if (argc > 1)
+	if (argc > 1) {
 		servername = argv[1];
-	else
+	} else {
 		servername = global_myname();
+	}
 
 	rc = ads_find_printer_on_server(ads, &res, argv[0], servername);
 
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_find_printer_on_server: %s\n", ads_errstr(rc));
 		ads_msgfree(ads, res);
+		ads_destroy(&ads);
 		return -1;
 	}
 
 	if (ads_count_replies(ads, res) == 0) {
 		d_printf("Printer '%s' not found\n", argv[1]);
 		ads_msgfree(ads, res);
+		ads_destroy(&ads);
 		return -1;
 	}
 
@@ -987,9 +1065,11 @@ static int net_ads_printer_remove(int argc, const char **argv)
 
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("ads_del_dn: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}
 
+	ads_destroy(&ads);
 	return 0;
 }
 
@@ -1172,6 +1252,7 @@ static int net_ads_search(int argc, const char **argv)
 			       ldap_exp, attrs, &res);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("search failed: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}	
 
@@ -1231,6 +1312,7 @@ static int net_ads_dn(int argc, const char **argv)
 			       "(objectclass=*)", attrs, &res);
 	if (!ADS_ERR_OK(rc)) {
 		d_printf("search failed: %s\n", ads_errstr(rc));
+		ads_destroy(&ads);
 		return -1;
 	}