From 1d2c882ba14c007d9cf966ac1c131fb3628bb810 Mon Sep 17 00:00:00 2001
From: "manu@netbsd.org" <manu@netbsd.org@a716ebb1-153a-0410-b759-cfb97c6a1b53>
Date: Mon, 15 Apr 2013 14:54:38 +0000
Subject: Add MellonSPentityId to control entityId in autogenerated metadata

git-svn-id: https://modmellon.googlecode.com/svn/trunk@205 a716ebb1-153a-0410-b759-cfb97c6a1b53
---
 auth_mellon_handler.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'auth_mellon_handler.c')

diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c
index d78beec..a24f59b 100644
--- a/auth_mellon_handler.c
+++ b/auth_mellon_handler.c
@@ -117,6 +117,9 @@ static char *am_generate_metadata(apr_pool_t *p, request_rec *r)
     am_dir_cfg_rec *cfg = am_get_dir_cfg(r);
     char *url = am_get_endpoint_url(r);
     char *cert = "";
+    const char *sp_entity_id;
+
+    sp_entity_id = cfg->sp_entity_id ? cfg->sp_entity_id : url;
 
     if (cfg->sp_cert_file) {
 	char *sp_cert_file;
@@ -171,7 +174,7 @@ static char *am_generate_metadata(apr_pool_t *p, request_rec *r)
     return apr_psprintf(p,
       "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n\
 <EntityDescriptor\n\
- entityID=\"%smetadata\"\n\
+ entityID=\"%s%s\"\n\
  xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\">\n\
  <SPSSODescriptor\n\
    AuthnRequestsSigned=\"true\"\n\
@@ -197,7 +200,8 @@ static char *am_generate_metadata(apr_pool_t *p, request_rec *r)
  </SPSSODescriptor>\n\
  %s\n\
 </EntityDescriptor>",
-      url, cert, url, url, url, url, am_optional_metadata(p, r));
+      sp_entity_id, cfg->sp_entity_id ? "" : "metadata", 
+      cert, url, url, url, url, am_optional_metadata(p, r));
 }
 #endif /* HAVE_lasso_server_new_from_buffers */
 
-- 
cgit