Merge branch 'master' of https://github.com/paulftw/pysaml2

2012-12-15 09:08:24 +01:00
parent 3a98c51566 8659ae2f12
commit 3f8af350e1
1 changed files with 5 additions and 0 deletions
--- a/src/saml2/config.py
+++ b/src/saml2/config.py
@@ -263,6 +263,11 @@ class Config(object):
        if "local" in metadata_conf:
            for mdfile in metadata_conf["local"]:
                metad.import_metadata(open(mdfile).read(), mdfile)
+        if "inline" in metadata_conf:
+            index = 1
+            for md in metadata_conf["inline"]:
+                metad.import_metadata(md, "inline_xml.%d" % index)
+                index += 1
        if "remote" in metadata_conf:
            for spec in metadata_conf["remote"]:
                try: