CASA.spec was corrected and pam scripts were moved to spec file instead of start up script.
This commit is contained in:
parent
145bb76e6c
commit
7d1f7c9ed7
Binary file not shown.
25
c_micasad/startup/casacfgpam
Executable file
25
c_micasad/startup/casacfgpam
Executable file
@ -0,0 +1,25 @@
|
|||||||
|
# Adding CASA pam entries to pam files.
|
||||||
|
for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
|
||||||
|
do
|
||||||
|
if [ -f $pam_file ]
|
||||||
|
then
|
||||||
|
MICASA_D=`grep -i pam_micasa $pam_file`
|
||||||
|
if [ -z "$MICASA_D" ]
|
||||||
|
then
|
||||||
|
awk '
|
||||||
|
/auth/ { authSeen++; }
|
||||||
|
/account/ {
|
||||||
|
if (!acctSeen && authSeen)
|
||||||
|
{
|
||||||
|
print "auth\trequired\tpam_micasa.so\n";}
|
||||||
|
acctSeen++;
|
||||||
|
}
|
||||||
|
/session/ { sesSeen++; }
|
||||||
|
// {print $0; }
|
||||||
|
END { if (sesSeen)
|
||||||
|
print "session\trequired\tpam_micasa.so\n"; }
|
||||||
|
' $pam_file > $pam_file.sav
|
||||||
|
mv $pam_file.sav $pam_file
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
9
c_micasad/startup/casaucfgpam
Normal file
9
c_micasad/startup/casaucfgpam
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# Remove the CASA pam entries from pam files.
|
||||||
|
for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
|
||||||
|
do
|
||||||
|
if [ -f $pam_file ]
|
||||||
|
then
|
||||||
|
sed -i '/pam_micasa/d' $pam_file
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
@ -31,50 +31,21 @@ rc_reset
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
echo -n "Starting miCASA daemon"
|
echo -n "Starting miCASA daemon"
|
||||||
for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
|
|
||||||
do
|
|
||||||
if [ -f $pam_file ]
|
|
||||||
then
|
|
||||||
MICASA_D=`grep -i micasad $pam_file`
|
|
||||||
if [ -z "$MICASA_D"]
|
|
||||||
then
|
|
||||||
awk '
|
|
||||||
/auth/ { authSeen++; }
|
|
||||||
/account/ {
|
|
||||||
if (!acctSeen && authSeen)
|
|
||||||
{
|
|
||||||
print "auth\trequired\tpam_micasa.so";}
|
|
||||||
acctSeen++;
|
|
||||||
}
|
|
||||||
/session/ { sesSeen++; }
|
|
||||||
// {print $0; }
|
|
||||||
END { if (sesSeen)
|
|
||||||
print "session\trequired\tpam_micasa.so"; }
|
|
||||||
' $pam_file > $pam_file.sav
|
|
||||||
mv $pam_file.sav $pam_file
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
startproc -f $MICASAD_BIN
|
startproc -f $MICASAD_BIN
|
||||||
# Remember status and be verbose
|
# Remember status and be verbose
|
||||||
rc_status -v
|
rc_status -v
|
||||||
;;
|
;;
|
||||||
|
|
||||||
stop)
|
stop)
|
||||||
echo -n "Shutting miCASA daemon down"
|
echo -n "Shutting miCASA daemon down"
|
||||||
#killproc -TERM $MICASAD_BIN
|
#killproc -TERM $MICASAD_BIN
|
||||||
pid=`cat /var/run/micasad.pid`
|
pid=`cat /var/run/micasad.pid`
|
||||||
kill -s TERM $pid
|
kill -s TERM $pid
|
||||||
|
|
||||||
for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
|
|
||||||
do
|
|
||||||
if [ -f $pam_file ]
|
|
||||||
then
|
|
||||||
sed -i '/pam_micasa/d' $pam_file
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# Remember status and be verbose
|
# Remember status and be verbose
|
||||||
rc_status -v
|
rc_status -v
|
||||||
;;
|
;;
|
||||||
|
|
||||||
restart)
|
restart)
|
||||||
## Stop the service and regardless of whether it was
|
## Stop the service and regardless of whether it was
|
||||||
## running or not, start it again.
|
## running or not, start it again.
|
||||||
|
@ -109,6 +109,8 @@ install -m 755 c_gui/images/* %{buildroot}%{prefix}/CASA/images
|
|||||||
install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
|
install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
|
||||||
install -m 755 c_micasad/startup/micasad %{buildroot}%{bin_prefix}/bin
|
install -m 755 c_micasad/startup/micasad %{buildroot}%{bin_prefix}/bin
|
||||||
install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/bin
|
install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/bin
|
||||||
|
install -m 755 c_micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/bin
|
||||||
|
install -m 755 c_micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/bin
|
||||||
|
|
||||||
install -m 755 %{_lib}/lux/ndbg/pam_micasa.so %{buildroot}/%{_lib}/security
|
install -m 755 %{_lib}/lux/ndbg/pam_micasa.so %{buildroot}/%{_lib}/security
|
||||||
|
|
||||||
@ -127,7 +129,6 @@ install -m 644 doc/License.txt %{buildroot}%{prefix}/CASA/doc
|
|||||||
install -m 644 doc/Readme.txt %{buildroot}%{prefix}/CASA/doc
|
install -m 644 doc/Readme.txt %{buildroot}%{prefix}/CASA/doc
|
||||||
install -m 644 include/micasa_mgmd.h %{buildroot}%{bin_prefix}/include
|
install -m 644 include/micasa_mgmd.h %{buildroot}%{bin_prefix}/include
|
||||||
install -m 644 include/micasa_types.h %{buildroot}%{bin_prefix}/include
|
install -m 644 include/micasa_types.h %{buildroot}%{bin_prefix}/include
|
||||||
install -m 644 include/micasa.h %{buildroot}%{bin_prefix}/include
|
|
||||||
|
|
||||||
ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so
|
ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so
|
||||||
ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so.1
|
ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so.1
|
||||||
@ -151,18 +152,30 @@ echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
|
|||||||
if [ $1 -eq 1 ]
|
if [ $1 -eq 1 ]
|
||||||
then
|
then
|
||||||
insserv /etc/init.d/micasad
|
insserv /etc/init.d/micasad
|
||||||
|
casacfgpam
|
||||||
|
/etc/init.d/micasad start
|
||||||
|
fi
|
||||||
|
if [ $1 -eq 2 ]
|
||||||
|
then
|
||||||
|
insserv /etc/init.d/micasad
|
||||||
|
casacfgpam
|
||||||
|
/etc/init.d/micasad restart
|
||||||
fi
|
fi
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%post gui
|
%post gui
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
%preun
|
%preun
|
||||||
|
|
||||||
|
|
||||||
%stop_on_removal micasad
|
%stop_on_removal micasad
|
||||||
|
if [ $1 -eq 0 ]
|
||||||
|
then
|
||||||
|
casaucfgpam
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%restart_on_update micasad
|
# %restart_on_update micasad *** This macro is not working ***
|
||||||
|
|
||||||
%insserv_cleanup
|
%insserv_cleanup
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
@ -186,17 +199,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
|
%dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
|
||||||
%dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
|
%dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
|
||||||
|
|
||||||
%dir %{bin_prefix}/%{_lib}/libmicasa.so
|
|
||||||
%dir %{bin_prefix}/%{_lib}/libmicasa.so.1
|
|
||||||
%dir %{bin_prefix}/%{_lib}/libjmicasa.so
|
|
||||||
%dir %{bin_prefix}/%{_lib}/libjmicasa.so.1
|
|
||||||
|
|
||||||
%dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
|
|
||||||
%dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
|
|
||||||
|
|
||||||
%dir %{bin_prefix}/bin
|
%dir %{bin_prefix}/bin
|
||||||
%{bin_prefix}/bin/micasad
|
%{bin_prefix}/bin/micasad
|
||||||
%{bin_prefix}/bin/micasad.sh
|
%{bin_prefix}/bin/micasad.sh
|
||||||
|
%{bin_prefix}/bin/casacfgpam
|
||||||
|
%{bin_prefix}/bin/casaucfgpam
|
||||||
%{bin_prefix}/bin/micasad.exe
|
%{bin_prefix}/bin/micasad.exe
|
||||||
|
|
||||||
%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
|
%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
|
||||||
|
Loading…
Reference in New Issue
Block a user