From aed171fa798b6a09757f02560b6f10eb6ca3658f Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Jun 23 2008 18:28:50 +0000
Subject: Resolves: bug 452018

Bug Description: The default url for <other> is missing dc=com
Reviewed by: nkinder (Thanks!)
Fix Description: Several values in the config files needed to be quoted.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no

---

diff --git a/config/dsgw.tmpl.in b/config/dsgw.tmpl.in
index 7a6349b..90aba16 100644
--- a/config/dsgw.tmpl.in
+++ b/config/dsgw.tmpl.in
@@ -40,11 +40,11 @@ baseurl       "@ldapurl@/@suffix@"
 
 dirmgr        "@dirmgr@"
 
-location-suffix       @suffix@
+location-suffix       "@suffix@"
 
 securitypath  "@securitydir@"
 
-url-orgchart-base     @httpurl@@cgiuri@/org?context=dsgw&amp;data=
+url-orgchart-base     "@httpurl@@cgiuri@/org?context=dsgw&amp;data="
 
 # The attribute the orgchart uses to search for entries.
 # This value should correspond to the value of attrib-farleft-rdn
@@ -55,16 +55,16 @@ orgchart-attrib-farleft-rdn	uid
 enable-aim-presence	true
 
 # The htmldir directive tells the CGIs where to find the html files
-htmldir		@htmldir@
+htmldir		"@htmldir@"
 
 # The configdir directive tells the CGIs where to find the 
 # templates/configuration files
-configdir	@configdir@
+configdir	"@configdir@"
 
 # The gwnametrans directive tells the CGIs what url to output
 # for http redirection. It should be the same nameTrans set
 # in the webserver, if any is being is used.
-gwnametrans	@dsgwuri@/
+gwnametrans	"@dsgwuri@/"
 
 # The authlifetime directive specifies how long authentication credentials
 # are valid (in seconds).
diff --git a/pbconfig/pb.tmpl.in b/pbconfig/pb.tmpl.in
index 2ccdd90..22a8b55 100644
--- a/pbconfig/pb.tmpl.in
+++ b/pbconfig/pb.tmpl.in
@@ -40,11 +40,11 @@ baseurl       "@ldapurl@/@suffix@"
 
 dirmgr        "@dirmgr@"
 
-location-suffix       @suffix@
+location-suffix       "@suffix@"
 
 securitypath  "@securitydir@"
 
-url-orgchart-base     @httpurl@@cgiuri@/org?context=pb&amp;data=
+url-orgchart-base     "@httpurl@@cgiuri@/org?context=pb&amp;data="
 
 # The attribute the orgchart uses to search for entries.
 # This value should correspond to the value of attrib-farleft-rdn
@@ -55,16 +55,16 @@ orgchart-attrib-farleft-rdn	uid
 enable-aim-presence	true
 
 # The htmldir directive tells the CGIs where to find the html files
-htmldir		@pbhtmldir@
+htmldir		"@pbhtmldir@"
 
 # The configdir directive tells the CGIs where to find the 
 # templates/configuration files
-configdir	@pbconfigdir@
+configdir	"@pbconfigdir@"
 
 # The gwnametrans directive tells the CGIs what url to output
 # for http redirection. It should be the same nameTrans set
 # in the webserver, if any is being is used.
-gwnametrans     @pburi@/
+gwnametrans     "@pburi@/"
 
 # The authlifetime directive specifies how long authentication credentials
 # are valid (in seconds).