From 01ffde4e970a689e5c3455508ca9822e04686980 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: May 19 2015 20:42:06 +0000
Subject: Provide requested IP addresses to helpers


When invoking enrollment helpers, we tend to expose most of the naming
information from the enrollment request, but we didn't extend that to IP
addresses when we learned to request them.  Go back and fix that.

---

diff --git a/doc/submit.txt b/doc/submit.txt
index 3e800c5..dbf5319 100644
--- a/doc/submit.txt
+++ b/doc/submit.txt
@@ -11,6 +11,7 @@ An external CA helper has a few jobs:
   * $CERTMONGER_REQ_EMAIL     -> email address subjectAltName values
   * $CERTMONGER_REQ_HOSTNAME  -> DNS name subjectAltName values
   * $CERTMONGER_REQ_PRINCIPAL -> Kerberos principal name subjectAltName values
+  * $CERTMONGER_REQ_IP_ADDRESS-> IP address subjectAltName values (since 0.78)
   * $CERTMONGER_CA_PROFILE    -> requested enrollment profile/template/certtype
   * $CERTMONGER_CSR           -> certificate signing request
   * $CERTMONGER_CERTIFICATE   -> previously-issued certificate, if there is one
diff --git a/src/submit-e.c b/src/submit-e.c
index bb67323..15a3b2d 100644
--- a/src/submit-e.c
+++ b/src/submit-e.c
@@ -811,6 +811,12 @@ cm_submit_e_helper_main(int fd, struct cm_store_ca *ca,
 			       entry->cm_scep_gic_next, 1);
 		}
 	}
+	if (entry->cm_template_ipaddress != NULL) {
+		setenv(CM_SUBMIT_REQ_IP_ADDRESS_ENV,
+		       cm_submit_maybe_joinv(NULL, "\n",
+					     entry->cm_template_ipaddress),
+		       1);
+	}
 	if (dup2(fd, STDOUT_FILENO) == -1) {
 		u = errno;
 		cm_log(1, "Error redirecting standard out for "
diff --git a/src/submit-e.h b/src/submit-e.h
index 953121c..2e325cf 100644
--- a/src/submit-e.h
+++ b/src/submit-e.h
@@ -39,6 +39,7 @@ const char *cm_submit_e_status_text(enum cm_external_status status);
 #define CM_SUBMIT_REQ_HOSTNAME_ENV "CERTMONGER_REQ_HOSTNAME"
 #define CM_SUBMIT_REQ_PRINCIPAL_ENV "CERTMONGER_REQ_PRINCIPAL"
 #define CM_SUBMIT_REQ_EMAIL_ENV "CERTMONGER_REQ_EMAIL"
+#define CM_SUBMIT_REQ_IP_ADDRESS_ENV "CERTMONGER_REQ_IP_ADDRESS"
 #define CM_SUBMIT_OPERATION_ENV "CERTMONGER_OPERATION"
 #define CM_SUBMIT_CSR_ENV "CERTMONGER_CSR"
 #define CM_SUBMIT_SPKAC_ENV "CERTMONGER_SPKAC"