Corrections to spec file and scripts and update to the micasad.

CASA.changes

@@ -12,6 +12,11 @@ Fri Feb 17 21:31:10 IST 2006 - smanojna@novell.com
   - System > Configuration > Novell CASA Manager
   - Utilities > Security > Novell CASA Manager
   - Internet > Administration > Novell CASA Manager
+-------------------------------------------------------------------
+Thu Feb 16 16:45:27 MST 2006 - cmashayekhi@novell.com
+
+- Spec file was correct to eliminate the neededforbuild directive
+
 -------------------------------------------------------------------
 Thu Feb 16 11:43:36 MST 2006 - jnorman@novell.com
 

c_micasad/startup/casacfgpam

@@ -6,40 +6,17 @@ do
 		sed -i '/pam_micasa/d' $file
 		var=`grep pam_unix2.so $file`
 		entry=`echo -e "auth\t required\tpam_micasa.so"`
-		entry2=`echo -e "session\t required\tpam_micasa.so"`
-		cnt=0
 		if [ "$var" != "" ]
 		then
 		  sed -i "/^auth.*required.*pam_unix2.so/a$entry" $file
-		  sed -i "/^session.*required.*pam_unix2.so/a$entry2" $file
+		  continue
-
-		else
-		  let ' cnt = cnt + 1'
 		fi
 		var2=`grep common-auth $file`
 		if [ "$var2" != "" ]
 		then
 		  sed -i "/^auth.*include.*common-auth/a$entry" $file
-		  sed -i "/^session.*include.*common-session/a$entry2" $file     
+		  continue
-		else
-		  let ' cnt = cnt + 1'
-		fi 
-		if [ $cnt -eq 2 ]
-		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"; }
-				' $file > $file.sav
-				mv $file.sav $file
 		fi
+		sed -i "0,/^auth/s/^\(auth.*\)/\1\n$entry/" $file 
 	fi
 done

c_micasad/startup/micasad

@@ -31,7 +31,7 @@ rc_reset
 case "$1" in
     start)
 		echo "Starting miCASA daemon"
-		startproc -f  $MICASAD_BIN
+		/sbin/startproc -f  $MICASAD_BIN
 		# Remember status and be verbose
 		rc_status -v
 		;;
@@ -39,16 +39,15 @@ case "$1" in
     stop)
 		echo "Shutting miCASA daemon down"
 		#killproc -TERM $MICASAD_BIN
-        pid=`cat /var/run/micasad.pid` > /dev/null 2>&1
+        	pid=`cat /var/run/micasad.pid` >/dev/null 2>&1
-        kill -s TERM $pid > /dev/null 2>&1
+        	kill -s TERM $pid >/dev/null 2>&1
 
 		# Remember status and be verbose
 		rc_status -v
 		;;
 
     try-restart|condrestart)
-#		$0 status >/dev/null &&  $0 restart
+		$0 status >/dev/null &&  $0 restart
-		$0 restart
 		rc_status
 		;;
 
@@ -65,27 +64,29 @@ case "$1" in
 		
     status)
 		echo "Checking for service micasad ..."
-		checkproc micasad
+		/sbin/checkproc micasad
-		if [ $? == 0 ]
+		$res=$?
+		if [ $res == 0 ]
 		then
 			echo -n "0 - service up and running"
-		elif [ $? == 1 ]
+		elif [ $res == 1 ]
 		then
 			echo -n "1 - service dead, but /var/run/pid  file exists"
-		elif [ $? == 2 ]
+		elif [ $res == 2 ]
 		then
 			echo -n "2 - service dead, but /var/lock/lock file exists"
-		elif [ $? == 3 ]
+		elif [ $res == 3 ]
 		then
 			echo -n "3 - service not running (unused)"
-		elif [ $? == 4 ]
+		elif [ $res == 4 ]
 		then
 			echo -n "4 - service status unknown"
 		else
 			echo -n "5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)"
 		fi
 
-		rc_status -v
+		rc_status >/dev/null 2>&1
+
 		;;
 
     *)

doc/Readme.txt

@@ -104,6 +104,84 @@ Common Authentication Service Adapter (CASA)
        should not be installed on 64 bit architecture because
        it can cause runtime problems.
 
+     - Since CASA is tied to the Linux login process via PAM,
+       events that cause the system to become inconsistent or 
+       unstable may cause a user to be unable to login to the
+       workstation.  Some possible causes of inconsistency or
+       instability are:
+        
+         - Installing 32 bit CASA RPMs on a 64 bit OS
+	 - Performing a hard reset on the machine
+	
+       Following the steps below will restore the ability to 
+       login.
+         
+	 1) Reboot machine
+	 2) When boot loader menu appears, type "init=/bin/bash"
+	    (without quotes) on the options line and then Enter.
+	    This will cause the machine to boot into a command 
+	    shell with root privileges.
+	 3) At the command prompt type "chkconfig micasad off"
+	    (without quotes).  This will prevent the CASA daemon
+	    from being loaded during bootup.
+	 4) With a console based text editor (i.e. vi, emacs) 
+	    remove all lines referencing the pam_micasa module in
+	    the following pam configuration files (some files may 
+	    not exist depending on what desktop managers have 
+	    been installed:
+	    
+	    - /etc/pam.d/gdm
+	    - /etc/pam.d/xdm
+	    - /etc/pam.d/kdm
+	    - /etc/pam.d/sshd
+	    - /etc/pam.d/login
+	         
+	 5) At the command prompt type "init 5" (without quotes)
+	    to boot into runlevel 5.  This will provide you with a
+	    graphical login prompt.  You should be able to login
+	    at this point.
+	    
+       After you have restored login capabilities, you will need
+       to resolve the inconsistency that prevented login in the
+       first place.  If you had installed a 32 bit CASA package
+       on a 64 bit OS, you will need to uninstall the 32 bit
+       package and install a CASA package built for 64 bit
+       architectures.  If you are recovering from a hard reset
+       no further action should be needed.
+       
+       To make it so CASA will run at boot time, open a shell and
+       at the prompt type "chkconfig micasad 1235" (without 
+       quotes).  This will cause micasad to be run at runlevels
+       1, 2, 3, and 5.
+
+     - When logged in to a KDE session, the gnome-keyring-daemon
+       does not run by default.  Therefore, all apps that access
+       the daemon, including our CASAManager will not be able to
+       manage/access the gnome-keyring.
+         
+       You can manually start the daemon by running the following
+       command from a shell prompt:
+       
+       gnome-keyring-daemon 
+       
+       When the gnome-keyring-daemon starts, it prints the
+       GNOME_KEYRING_SOCKET environment variable and its value to
+       the terminal. In Gnome, the daemon is started and the 
+       environment variable is loaded into your X session 
+       environment by default, but in KDE, you will
+       have to manually load it.
+        
+       To load this environment variable, run a command similar to
+       the following command from a shell prompt (replacing the 
+       value of the environment variable with what the daemon
+       output to the screen when you started it):
+       
+       export GNOME_KEYRING_SOCKET=/tmp/keyring-oaTsPs/socket
+       
+       Then you can run CASAManager GUI (from the same terminal
+       you exported the variable from) and you will be able to
+       manage and use the gnome-keyring in KDE just like you
+       could if you were logged into Gnome.
        
 4.0  Legal Notices
 

shsrc/lshsrc/CASA.spec

@@ -21,7 +21,7 @@ License:       LGPL
 Group:         Productivity/Other
 Autoreqprov:   on
 %define	       bldno	1.1.1
-Version:       1.6.000
+Version:       1.6.311
 Release:       0
 Summary:       Novell Common Authentication Service Adapter (CASA)
 Source:        %{name}-%{version}.tar.bz2
@@ -153,11 +153,7 @@ echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
 
 %post
 %{fillup_and_insserv -y micasad}
-if [ $1 -eq 1 ]	|| [ $1 -eq 2 ]
+casacfgpam
-then
-        casacfgpam
-fi
-
 /sbin/ldconfig
 
 %post gui

shsrc/lshsrc/CASA_dbg.spec

@@ -153,11 +153,7 @@ echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
 
 %post
 %{fillup_and_insserv -y micasad}
-if [ $1 -eq 1 ]	|| [ $1 -eq 2 ]
+casacfgpam
-then
-        casacfgpam
-fi
-
 /sbin/ldconfig
 
 %post gui