X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=imap-send.c;h=1ec131092109aa3fbed3cd20f10b56a864584a94;hb=2c47789d817aaf745a5ce5d5f79619c634cc8566;hp=10cce15a427646a1281afa5197f40def39151154;hpb=60e3cad92ed93120b9e77116163b267fdda44f91;p=git.git

diff --git a/imap-send.c b/imap-send.c
index 10cce15a4..1ec131092 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1247,7 +1247,7 @@ static imap_server_conf_t server =
 static char *imap_folder;
 
 static int
-git_imap_config(const char *key, const char *val)
+git_imap_config(const char *key, const char *val, void *cb)
 {
 	char imap_key[] = "imap.";
 
@@ -1296,12 +1296,19 @@ main(int argc, char **argv)
 	/* init the random number generator */
 	arc4_init();
 
-	git_config( git_imap_config );
+	git_config(git_imap_config, NULL);
 
 	if (!imap_folder) {
 		fprintf( stderr, "no imap store specified\n" );
 		return 1;
 	}
+	if (!server.host) {
+		if (!server.tunnel) {
+			fprintf( stderr, "no imap host specified\n" );
+			return 1;
+		}
+		server.host = "tunnel";
+	}
 
 	/* read the messages */
 	if (!read_message( stdin, &all_msgs )) {