From 961f543a27ce552aab3ffe68c3dd69251d2cb576 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 11 Nov 2016 17:44:32 -0600
Subject: [PATCH] Set princ type to NT-SMTP-NAME when parsing

In krb5_parse_name_flags(), if the principal name is not an enterprise
name, is one component in length and contains an '@', set the principal
type to NT-SMTP-NAME as specified by RFC 4120.
---
 lib/krb5/principal.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index 24e7cc7a0..81348d607 100644
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -73,6 +73,8 @@ set_default_princ_type(krb5_principal p, NAME_TYPE defnt)
     else if (princ_num_comp(p) == 2 &&
              strcmp(princ_ncomp(p, 0), KRB5_WELLKNOWN_NAME) == 0)
         princ_type(p) = KRB5_NT_WELLKNOWN;
+    else if (princ_num_comp(p) == 1 && strchr(princ_ncomp(p, 0), '@') != NULL)
+        princ_type(p) = KRB5_NT_SMTP_NAME;
     else
         princ_type(p) = defnt;
     return 0;