VERSION.sh | 2 +-
admserv/cfgstuff/start-ds-admin.in | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 491d551d577c8d85d1d28530a40b61c00b65823f
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Jan 20 16:03:26 2010 -0700
this is the 1.1.10 release
diff --git a/VERSION.sh b/VERSION.sh
index e1cac18..ed0472d 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -15,7 +15,7 @@ VERSION_MAINT=10
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a4
+#VERSION_PREREL=.rc1
# NOTES on VERSION_PREREL
# use aN for an alpha release e.g. a1, a2, etc.
# use rcN for a release candidate e.g. rc1, rc2, etc.
commit d86582ef5dc1fd56ce7fd442c446626a3c045b13
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Wed Jan 20 15:53:08 2010 -0700
389-admin-1.1.10-0.2.a2.el5 fails to start
https://bugzilla.redhat.com/show_bug.cgi?id=552419
Resolves: bug 552419
Bug Description: 389-admin-1.1.10-0.2.a2.el5 fails to start
Reviewed by: ???
Branch: HEAD
Fix Description: Check for @with_selinux@ - if not using selinux, use the old method
for running admin server with runcon -t unconfined_t
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
diff --git a/admserv/cfgstuff/start-ds-admin.in b/admserv/cfgstuff/start-ds-admin.in
index 6ed6db8..f95de9a 100644
--- a/admserv/cfgstuff/start-ds-admin.in
+++ b/admserv/cfgstuff/start-ds-admin.in
@@ -58,4 +58,10 @@ fi
# source env. for admin server
[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
-$HTTPD $OMIT_DEFLATE -k start -f @configdir(a)/httpd.conf "$@"
+if [ -z "@with_selinux@" ] ; then
+ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+ SELINUX_CMD="runcon -t unconfined_t --"
+ fi
+fi
+
+$SELINUX_CMD $HTTPD $OMIT_DEFLATE -k start -f @configdir(a)/httpd.conf "$@"