8927 sadb_x_kmc_t's KM cookie should be 64-bits (fix improper upstream)

*** 2600,2626 ****
                  cookie_label = kmc_lookup_by_cookie(kmc->sadb_x_kmc_cookie);
                  if (cookie_label == NULL)
                          cookie_label =
                              dgettext(TEXT_DOMAIN, "<Label not found.>");
                  (void) fprintf(file, dgettext(TEXT_DOMAIN,
!                     "%sProtocol %u, cookie=\"%s\" (%u)\n"), prefix,
                      kmc->sadb_x_kmc_proto, cookie_label,
                      kmc->sadb_x_kmc_cookie);
                  return;
          case SADB_X_KMP_MANUAL:
!                 cookie_label = dgettext(TEXT_DOMAIN, "Manual SA with cookie");
                  break;
          /* case SADB_X_KMP_IKEV2: */
          default:
                  cookie_label =
                      dgettext(TEXT_DOMAIN, "<unknown KM protocol>");
                  break;
          }
  
!         /* XXX KEBE ASKS... htonll() on generic kmc_cookie? */
          (void) fprintf(file, dgettext(TEXT_DOMAIN,
!             "%sProtocol %u, cookie=\"%s\" (0x%"PRIx64"/%"PRIu64")\n"),
              prefix, kmc->sadb_x_kmc_proto, cookie_label,
              kmc->sadb_x_kmc_cookie64, kmc->sadb_x_kmc_cookie64);
  }
  
  /*
--- 2600,2632 ----
                  cookie_label = kmc_lookup_by_cookie(kmc->sadb_x_kmc_cookie);
                  if (cookie_label == NULL)
                          cookie_label =
                              dgettext(TEXT_DOMAIN, "<Label not found.>");
                  (void) fprintf(file, dgettext(TEXT_DOMAIN,
!                     "%s Protocol %u, cookie=\"%s\" (%u)\n"), prefix,
                      kmc->sadb_x_kmc_proto, cookie_label,
                      kmc->sadb_x_kmc_cookie);
                  return;
+         case SADB_X_KMP_KINK:
+                 cookie_label = dgettext(TEXT_DOMAIN, "KINK:");
+                 break;
          case SADB_X_KMP_MANUAL:
!                 cookie_label = dgettext(TEXT_DOMAIN, "Manual SA with cookie:");
                  break;
          /* case SADB_X_KMP_IKEV2: */
          default:
                  cookie_label =
                      dgettext(TEXT_DOMAIN, "<unknown KM protocol>");
                  break;
          }
  
!         /*
!          * Assume native-byte-order printing for now.  Exceptions (like
!          * byte-swapping) should be handled in per-KM-protocol cases above.
!          */
          (void) fprintf(file, dgettext(TEXT_DOMAIN,
!             "%s Protocol %u, cookie=\"%s\" (0x%"PRIx64"/%"PRIu64")\n"),
              prefix, kmc->sadb_x_kmc_proto, cookie_label,
              kmc->sadb_x_kmc_cookie64, kmc->sadb_x_kmc_cookie64);
  }
  
  /*