Attachment 193108 Details for Bug 298362

[patch] prepend a dot to the domain name

pkinit-nss-0.7.4-dot-domain.patch (text/plain), 1.86 KB, created by Jacob Berkman on 2008-02-04 20:39:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacob Berkman

Created: 2008-02-04 20:39:49 UTC

Size: 1.86 KB

patch

obsolete

>--- pkinit-nss-0.7.4-1/src/certs.c~	2008-02-04 23:32:04.000000000 -0500
>+++ pkinit-nss-0.7.4-1/src/certs.c	2008-02-04 23:41:59.000000000 -0500
>@@ -651,7 +651,7 @@ cert_san_matches_upn_check (struct modul
>         int rc;
>         PRBool ret;
>         char **realms;
>-        char ms_upn_host[1024];
>+        char *ms_upn_host;
>         int len;
> 
>         /* And it matches, then we're okay. */
>@@ -683,23 +683,30 @@ cert_san_matches_upn_check (struct modul
>         }
>         
>         len = ms_upn_name->len - ms_upn_tmp.len;
>-        if (len > 1023) {
>-            len = 1023;
>+        ms_upn_host = malloc (len + 2); /* dot and nil */
>+        if (!ms_upn_host) {
>+            pkinit_debug (mcontext, 2,
>+                          "Could not alloc upn_host: length was %d.\n",
>+                          len);
>+            return PR_FALSE;
>         }
> 
>         /* ms_upn_domain isn't NULL terminated, so we need to copy it
>          * out... */
>-        strncpy (ms_upn_host, (char *)ms_upn_domain, len);
>-        ms_upn_host[len] = '\0';
>+        ms_upn_host[0] = '.';
>+        strncpy (ms_upn_host + 1, (char *)ms_upn_domain, len);
>+        ms_upn_host[len + 1] = '\0';
>         rc = krb5_get_host_realm (kcontext, ms_upn_host, &realms);
>+        free (ms_upn_host);
>+        ms_upn_host = NULL;
>         if (rc != 0) {
>                 pkinit_debug (mcontext, 2, 
>-                              "Could not get host realm for %s: %d.\n",
>+                              "Could not get host realm for .%s: %d.\n",
>                               ms_upn_domain, rc);
>                 return PR_FALSE;
>         } else {
>                 pkinit_debug (mcontext, 2,
>-                              "Found domain \"%.*s\" mapped to realm \"%s\".\n",
>+                              "Found domain \".%.*s\" mapped to realm \"%s\".\n",
>                               len, ms_upn_domain, realms[0]);
>         }
>

Actions: View | Diff

Attachments on bug 298362: 193108