<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta http-equiv=Content-Type content="text/html; charset=us-ascii"><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
span.E-MailFormatvorlage17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=DE link="#0563C1" vlink="#954F72"><div class=WordSection1><p class=MsoNormal>Hi,<o:p></o:p></p><p class=MsoNormal><o:p> </o:p></p><p class=MsoNormal><span lang=EN-US>I am trying to setup a client connection to a watchguard, among other issues, I realized that the watchguard doesn’t like ID_FQDN. I had to sent to ID as ID_USER_FQDN. The following patch allow to specify an ID as @@<id> to force ID_USER_FQDN. I think that might be useful for other situations as well.<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US>Regards<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US>Gerald<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US><o:p> </o:p></span></p><p class=MsoNormal><span lang=EN-US>diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>index 06ec533..6d26475 100644<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>--- a/src/libstrongswan/utils/identification.c<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+++ b/src/libstrongswan/utils/identification.c<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>@@ -1008,6 +1008,17 @@ identification_t *identification_create_from_string(char *string)<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> chunk_create(string, strlen(string)), NULL);<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> return &this->public;<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US> }<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ else if (*(string + 1) == '@')<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ {<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ this = identification_create(ID_USER_FQDN);<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ string += 2;<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ this->encoded.len = strlen(string);<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ if (this->encoded.len)<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ { /* if we only got an @@ */<o:p></o:p></span></p><p class=MsoNormal><span lang=EN-US>+ this->encoded.ptr = strdup(string);<o:p></o:p></span></p><p class=MsoNormal>+ }<o:p></o:p></p><p class=MsoNormal>+ return &this->public;<o:p></o:p></p><p class=MsoNormal>+ }<o:p></o:p></p><p class=MsoNormal> else<o:p></o:p></p><p class=MsoNormal> {<o:p></o:p></p><p class=MsoNormal><span lang=EN-US> this = identification_create(ID_FQDN);<o:p></o:p></span></p></div></body></html>