From ca71e365ec93613953e40038cbb65c441a0bc479 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Mon, 20 Dec 2021 18:35:27 -0600
Subject: [PATCH] asn1: Move decoration to krb5.opt file

---
 lib/asn1/Makefile.am | 2 --
 lib/asn1/NTMakefile  | 1 -
 lib/asn1/krb5.opt    | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index 94d24fc47..60cf0ba18 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -392,7 +392,6 @@ crmf_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1 $(srcdir)/cr
 krb5_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
 	$(ASN1_COMPILE) --one-code-file --template			\
 			--option-file=$(srcdir)/krb5.opt		\
-			--decorate='Principal:PrincipalNameAttrs:nameattrs?'	\
 			$(srcdir)/krb5.asn1 krb5_template_asn1 || (rm -f krb5_template_asn1_files ; exit 1)
 
 ocsp_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
@@ -434,7 +433,6 @@ crmf_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/crmf.asn1 $(srcdir)/crmf.opt
 krb5_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/krb5.asn1 $(srcdir)/krb5.opt
 	$(ASN1_COMPILE) --one-code-file $(TEMPLATE_OPTION)		\
 			--option-file=$(srcdir)/krb5.opt		\
-			--decorate='Principal:PrincipalNameAttrs:nameattrs?'	\
 			$(srcdir)/krb5.asn1 krb5_asn1 || (rm -f krb5_asn1_files ; exit 1)
 
 ocsp_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/ocsp.asn1
diff --git a/lib/asn1/NTMakefile b/lib/asn1/NTMakefile
index eca92bd38..8fb40ffb4 100644
--- a/lib/asn1/NTMakefile
+++ b/lib/asn1/NTMakefile
@@ -202,7 +202,6 @@ $(gen_files_krb5) $(OBJ)\krb5_asn1.hx: $(BINDIR)\asn1_compile.exe krb5.asn1 krb5
 	$(BINDIR)\asn1_compile.exe \
 		--template	\
 		--one-code-file	\
-		--decorate="Principal:PrincipalNameAttrs:nameattrs?" \
 		--option-file=$(SRCDIR)\krb5.opt \
 		$(SRCDIR)\krb5.asn1 krb5_asn1 \
 	|| ($(RM) $(OBJ)\krb5_asn1.h ; exit /b 1)
diff --git a/lib/asn1/krb5.opt b/lib/asn1/krb5.opt
index 5acc596d3..3078d7284 100644
--- a/lib/asn1/krb5.opt
+++ b/lib/asn1/krb5.opt
@@ -5,3 +5,4 @@
 --sequence=ETYPE-INFO
 --sequence=ETYPE-INFO2
 --preserve-binary=KDC-REQ-BODY
+--decorate=Principal:PrincipalNameAttrs:nameattrs?