From 4d9ebfc1ae8788f66be711273d73bf4831a7cd4e Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sat, 11 Nov 2000 19:24:00 +0000
Subject: Ready to ship.

svn path=/trunk/; revision=2983
---
 fetchmail.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'fetchmail.c')

diff --git a/fetchmail.c b/fetchmail.c
index 617d4e80..e4035813 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -842,6 +842,7 @@ static void optmerge(struct query *h2, struct query *h1, int force)
     FLAG_MERGE(server.dns);
     FLAG_MERGE(server.checkalias);
     FLAG_MERGE(server.uidl);
+    FLAG_MERGE(server.principal);
 
 #if defined(linux) || defined(__FreeBSD__)
     FLAG_MERGE(server.interface);
@@ -1571,6 +1572,9 @@ static void dump_params (struct runctl *runp,
 	    printf(_("  Kerberos V5 preauthentication enabled.\n"));
 	else if (ctl->server.preauthenticate == A_SSH)
 	    printf(_("  End-to-end encryption assumed.\n"));
+	if (ctl->server.principal != (char *) NULL) {
+	    printf(_("  Mail service principal is: %s\n"), ctl->server.principal);
+	}
 #ifdef	SSL_ENABLE
 	if (ctl->use_ssl)
 	    printf("  SSL encrypted sessions enabled.\n");
-- 
cgit v1.2.3