rename the 'shar' process, "shibd"

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1477 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/selinux/shibshar.fc.in b/selinux/shibshar.fc.in
index 8c1b4d2..34d9bd2 100644 (file)
--- a/selinux/shibshar.fc.in
+++ b/selinux/shibshar.fc.in
@@ -1,4 +1,4 @@
 # Shibboleth SHAR
-@-SBINDIR-@/shar       --      system_u:object_r:shibshar_exec_t
+@-SBINDIR-@/shibd      --      system_u:object_r:shibshar_exec_t
 @-VARRUNDIR-@/shib-shar\.sock  -s      system_u:object_r:shibshar_var_run_t
 

diff --git a/shar/Makefile.am b/shar/Makefile.am
index f8ecf74..747b9c8 100644 (file)
--- a/shar/Makefile.am
+++ b/shar/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 bin_PROGRAMS = test-client
-sbin_PROGRAMS = shar
+sbin_PROGRAMS = shibd
 
 if USE_OUR_ONCRPC
 AM_CFLAGS = -I${top_srcdir}/oncrpc
@@ -13,14 +13,14 @@ endif
 
 test_client_SOURCES = test-client.cpp
 
-shar_SOURCES = shar.cpp shar-utils.cpp
+shibd_SOURCES = shar.cpp shar-utils.cpp
 noinst_HEADERS = shar-utils.h
 
 test_client_LDADD = \
   $(top_builddir)/shib-target/libshib-target.la \
   $(top_builddir)/shib/libshib.la
 
-shar_LDADD = \
+shibd_LDADD = \
   $(top_builddir)/shib-target/libshib-target.la \
   $(top_builddir)/shib/libshib.la \
   $(ONCRPC_LIBS)

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index afd2431..bed807a 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -99,7 +99,7 @@ cp -p %{_sysconfdir}/shibboleth/apache2.config \
     rm -f %{_sysconfdir}/httpd/conf.d/shibboleth.conf
 
 %triggerin selinux-targeted-policy -- %{name}
-restorecon %{_sbindir}/shar
+restorecon %{_sbindir}/shibd
 
 %triggerin selinux-targeted-policy -- selinux-targeted-policy-source
 cd %{_sysconfdir}/selinux/src/policy || exit 1
@@ -110,7 +110,7 @@ make -W load
 %doc _docs/CREDITS.txt _docs/InQueue.html _docs/NEWS.txt _docs/logo.jpg
 %doc _docs/DEPLOY-GUIDE-ORIGIN.html _docs/main.css _docs/README.txt
 %doc _docs/DEPLOY-GUIDE-TARGET.html _docs/LICENSE.txt _docs/mysql-4.0.12.diff
-%{_sbindir}/shar
+%{_sbindir}/shibd
 %{_bindir}/siterefresh
 %{_libdir}/libshib.so.*
 %{_libdir}/libshib-target.so.*