From 001942381a23ac70139b6d0c864714eb961002bc Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 3 Aug 2010 03:10:22 +0200
Subject: [PATCH] Testsuite: fixed segfault problem.

---
 src/lib-sieve-tool/sieve-tool.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index 5198e8136..9dd728bbb 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -137,7 +137,8 @@ int sieve_tool_getopt(struct sieve_tool *tool)
 			tool->sieve_extensions = i_strdup(optarg);
 			break;
 		case 'u':
-			tool->username = i_strdup(optarg);
+			if ( tool->username == NULL )
+				tool->username = i_strdup(optarg);
 			break;
 		case 'P': 
 			/* Plugin */
@@ -383,6 +384,9 @@ void sieve_tool_set_setting_callback
 const char *sieve_tool_get_username
 (struct sieve_tool *tool)
 {
+	if ( tool->username == NULL )
+		return getenv("USER");
+
 	return tool->username;
 }
 
-- 
GitLab