# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1487763000 -7200
# Node ID b4dd0868ecc033c7ddf7c756af57b5d3ab773335
# Parent  4ce2e5f4dafc6ea5c7f165842e067a5de0bf3d2d
global: Replace mail_storage_service_user_free() with _unref()

diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/doveadm/doveadm-auth-server.c
--- a/src/doveadm/doveadm-auth-server.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/doveadm/doveadm-auth-server.c	Wed Feb 22 13:30:00 2017 +0200
@@ -343,7 +343,7 @@
 	}
 
 	mail_user_unref(&user);
-	mail_storage_service_user_free(&service_user);
+	mail_storage_service_user_unref(&service_user);
 	pool_unref(&pool);
 	return 1;
 }
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/doveadm/doveadm-auth.c
--- a/src/doveadm/doveadm-auth.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/doveadm/doveadm-auth.c	Wed Feb 22 13:30:00 2017 +0200
@@ -586,7 +586,7 @@
 	}
 
 	mail_user_unref(&user);
-	mail_storage_service_user_free(&service_user);
+	mail_storage_service_user_unref(&service_user);
 	pool_unref(&pool);
 	return 1;
 }
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/doveadm/doveadm-mail-copymove.c
--- a/src/doveadm/doveadm-mail-copymove.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/doveadm/doveadm-mail-copymove.c	Wed Feb 22 13:30:00 2017 +0200
@@ -165,7 +165,7 @@
 	struct copy_cmd_context *ctx = (struct copy_cmd_context *)_ctx;
 
 	if (ctx->source_user != NULL) {
-		mail_storage_service_user_free(&ctx->source_service_user);
+		mail_storage_service_user_unref(&ctx->source_service_user);
 		mail_user_unref(&ctx->source_user);
 	}
 }
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/doveadm/doveadm-mail-import.c
--- a/src/doveadm/doveadm-mail-import.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/doveadm/doveadm-mail-import.c	Wed Feb 22 13:30:00 2017 +0200
@@ -177,7 +177,7 @@
 		i_fatal("Import namespace initialization failed: %s", error);
 
 	ctx->src_user = user;
-	mail_storage_service_user_free(&service_user);
+	mail_storage_service_user_unref(&service_user);
 }
 
 static int
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/doveadm/doveadm-mail.c
--- a/src/doveadm/doveadm-mail.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/doveadm/doveadm-mail.c	Wed Feb 22 13:30:00 2017 +0200
@@ -391,7 +391,7 @@
 
 	if (ctx->v.prerun != NULL) {
 		if (ctx->v.prerun(ctx, ctx->cur_service_user, error_r) < 0) {
-			mail_storage_service_user_free(&ctx->cur_service_user);
+			mail_storage_service_user_unref(&ctx->cur_service_user);
 			return -1;
 		}
 	}
@@ -401,7 +401,7 @@
 					&ctx->cur_mail_user);
 	if (ret < 0) {
 		*error_r = "User init failed";
-		mail_storage_service_user_free(&ctx->cur_service_user);
+		mail_storage_service_user_unref(&ctx->cur_service_user);
 		return ret;
 	}
 
@@ -409,7 +409,7 @@
 		i_assert(ctx->exit_code != 0);
 	}
 	mail_user_unref(&ctx->cur_mail_user);
-	mail_storage_service_user_free(&ctx->cur_service_user);
+	mail_storage_service_user_unref(&ctx->cur_service_user);
 	return 1;
 }
 
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/imap-urlauth/imap-urlauth-worker.c
--- a/src/imap-urlauth/imap-urlauth-worker.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/imap-urlauth/imap-urlauth-worker.c	Wed Feb 22 13:30:00 2017 +0200
@@ -260,7 +260,7 @@
 		net_disconnect(client->fd_ctrl);
 
 	if (client->service_user != NULL)
-		mail_storage_service_user_free(&client->service_user);
+		mail_storage_service_user_unref(&client->service_user);
 	i_free(client->access_user);
 	array_foreach_modifiable(&client->access_apps, app)
 		i_free(*app);
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/imap/imap-client.c
--- a/src/imap/imap-client.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/imap/imap-client.c	Wed Feb 22 13:30:00 2017 +0200
@@ -467,7 +467,7 @@
 	if (array_is_created(&client->search_updates))
 		array_free(&client->search_updates);
 	pool_unref(&client->command_pool);
-	mail_storage_service_user_free(&client->service_user);
+	mail_storage_service_user_unref(&client->service_user);
 
 	imap_client_count--;
 	DLLIST_REMOVE(&imap_clients, client);
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/imap/main.c
--- a/src/imap/main.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/imap/main.c	Wed Feb 22 13:30:00 2017 +0200
@@ -242,7 +242,7 @@
 	if (mail_error != MAIL_ERROR_NONE) {
 		*error_r = t_strdup(errstr);
 		mail_user_unref(&mail_user);
-		mail_storage_service_user_free(&user);
+		mail_storage_service_user_unref(&user);
 		return -1;
 	}
 
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/indexer/master-connection.c
--- a/src/indexer/master-connection.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/indexer/master-connection.c	Wed Feb 22 13:30:00 2017 +0200
@@ -229,7 +229,7 @@
 				    max_recent_msgs, args[4]);
 		indexer_worker_refresh_proctitle(NULL, NULL, 0, 0);
 		mail_user_unref(&user);
-		mail_storage_service_user_free(&service_user);
+		mail_storage_service_user_unref(&service_user);
 	}
 
 	str = ret < 0 ? "-1\n" : "100\n";
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/lda/main.c
--- a/src/lda/main.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/lda/main.c	Wed Feb 22 13:30:00 2017 +0200
@@ -491,7 +491,7 @@
 	mail_user_unref(&ctx.dest_user);
 	mail_deliver_session_deinit(&ctx.session);
 
-	mail_storage_service_user_free(&service_user);
+	mail_storage_service_user_unref(&service_user);
 	mail_storage_service_deinit(&storage_service);
 	master_service_deinit(&master_service);
         return EX_OK;
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/lmtp/client.c
--- a/src/lmtp/client.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/lmtp/client.c	Wed Feb 22 13:30:00 2017 +0200
@@ -366,7 +366,7 @@
 			if ((*rcptp)->anvil_query != NULL)
 				anvil_client_query_abort(anvil, &(*rcptp)->anvil_query);
 			client_rcpt_anvil_disconnect(*rcptp);
-			mail_storage_service_user_free(&(*rcptp)->service_user);
+			mail_storage_service_user_unref(&(*rcptp)->service_user);
 		}
 	}
 
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/lmtp/commands.c
--- a/src/lmtp/commands.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/lmtp/commands.c	Wed Feb 22 13:30:00 2017 +0200
@@ -604,7 +604,7 @@
 			client_send_line(client, ERRSTR_TEMP_MAILBOX_FAIL,
 					 rcpt->address);
 		}
-		mail_storage_service_user_free(&rcpt->service_user);
+		mail_storage_service_user_unref(&rcpt->service_user);
 		return FALSE;
 	}
 	array_append(&client->state.rcpt_to, &rcpt, 1);
@@ -630,7 +630,7 @@
 		client_send_line(client, ERRSTR_TEMP_USERDB_FAIL_PREFIX
 				 "Too many concurrent deliveries for user",
 				 rcpt->address);
-		mail_storage_service_user_free(&rcpt->service_user);
+		mail_storage_service_user_unref(&rcpt->service_user);
 	} else if (cmd_rcpt_finish(client, rcpt)) {
 		rcpt->anvil_connect_sent = TRUE;
 		input = mail_storage_service_user_get_input(rcpt->service_user);
@@ -728,7 +728,7 @@
 		client_send_line(client, "451 4.3.0 <%s> "
 			"Can't handle mixed proxy/non-proxy destinations",
 			address);
-		mail_storage_service_user_free(&rcpt->service_user);
+		mail_storage_service_user_unref(&rcpt->service_user);
 		return 0;
 	}
 
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/plugins/mail-crypt/doveadm-mail-crypt.c
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c	Wed Feb 22 13:30:00 2017 +0200
@@ -152,7 +152,7 @@
 	mail_storage_service_io_activate_user(dest_service_user);
 
 	mail_user_unref(&dest_user);
-	mail_storage_service_user_free(&dest_service_user);
+	mail_storage_service_user_unref(&dest_service_user);
 
 	if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
 		io_loop_context_deactivate(cur_ioloop_ctx);
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/plugins/mail-crypt/mail-crypt-acl-plugin.c
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c	Wed Feb 22 13:30:00 2017 +0200
@@ -304,7 +304,7 @@
 		mail_storage_service_io_activate_user(dest_service_user);
 
 		mail_user_unref(&dest_user);
-		mail_storage_service_user_free(&dest_service_user);
+		mail_storage_service_user_unref(&dest_service_user);
 
 		if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
 			io_loop_context_deactivate(cur_ioloop_ctx);
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/plugins/mail-crypt/test-mail-key.c
--- a/src/plugins/mail-crypt/test-mail-key.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/plugins/mail-crypt/test-mail-key.c	Wed Feb 22 13:30:00 2017 +0200
@@ -192,7 +192,7 @@
 void deinit_test_mail_user()
 {
 	mail_user_unref(&test_mail_user);
-	mail_storage_service_user_free(&test_service_user);
+	mail_storage_service_user_unref(&test_service_user);
 	mail_storage_service_deinit(&mail_storage_service);
 	if (unlink_directory(mail_home, UNLINK_DIRECTORY_FLAG_RMDIR) < 0)
 		i_error("unlink_directory(%s) failed", mail_home);
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/plugins/quota/quota-status.c
--- a/src/plugins/quota/quota-status.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/plugins/quota/quota-status.c	Wed Feb 22 13:30:00 2017 +0200
@@ -116,7 +116,7 @@
 		}
 		value = t_strdup(value); /* user's pool is being freed */
 		mail_user_unref(&user);
-		mail_storage_service_user_free(&service_user);
+		mail_storage_service_user_unref(&service_user);
 	}
 	if (ret < 0) {
 		/* temporary failure */
diff -r 4ce2e5f4dafc -r b4dd0868ecc0 src/pop3/pop3-client.c
--- a/src/pop3/pop3-client.c	Wed Feb 22 13:28:43 2017 +0200
+++ b/src/pop3/pop3-client.c	Wed Feb 22 13:30:00 2017 +0200
@@ -643,7 +643,7 @@
 	o_stream_destroy(&client->output);
 
 	fd_close_maybe_stdio(&client->fd_in, &client->fd_out);
-	mail_storage_service_user_free(&client->service_user);
+	mail_storage_service_user_unref(&client->service_user);
 
 	pop3_client_count--;
 	DLLIST_REMOVE(&pop3_clients, client);