rpms/keychain/devel keychain.csh, 1.1, 1.2 keychain.sh, 1.1, 1.2 keychain.spec, 1.1, 1.2
Alexander Dalloz (adalloz)
fedora-extras-commits at redhat.com
Tue Aug 16 20:55:13 UTC 2005
Author: adalloz
Update of /cvs/extras/rpms/keychain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1318/devel
Modified Files:
keychain.csh keychain.sh keychain.spec
Log Message:
added test functionality to keychain.{sh,csh} opt-in scripts
problem reported by Ville Skyttä for using `sudo -s'
Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain.csh 5 Aug 2005 02:55:43 -0000 1.1
+++ keychain.csh 16 Aug 2005 20:55:11 -0000 1.2
@@ -1,7 +1,8 @@
# /etc/profile.d/keychain.csh - calling keychain the Fedora way
# read in user's keychain settings or use defaults running keychain
-if (-f $HOME/.keychainrc) then
+set USERHOME = `getent passwd $USER | cut -d: -f6`
+if ($HOME == $USERHOME && -f $HOME/.keychainrc) then
eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`
Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain.sh 5 Aug 2005 02:55:43 -0000 1.1
+++ keychain.sh 16 Aug 2005 20:55:11 -0000 1.2
@@ -1,9 +1,10 @@
# /etc/profile.d/keychain.sh - calling keychain the Fedora way
# read in user's keychain settings or use defaults running keychain
-if [ -f $HOME/.keychainrc ]; then
+USERHOME=`getent passwd $USER | cut -d: -f6`
+if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then
- source $HOME/.keychainrc
+ . $HOME/.keychainrc
[ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
[ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \
Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain.spec 5 Aug 2005 02:55:43 -0000 1.1
+++ keychain.spec 16 Aug 2005 20:55:11 -0000 1.2
@@ -1,7 +1,7 @@
Name: keychain
Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
Version: 2.5.5
-Release: 1
+Release: 2
License: GPL
Group: Applications/Internet
URL: http://www.gentoo.org/proj/en/keychain/
@@ -49,6 +49,10 @@
%config(noreplace) %{_sysconfdir}/profile.d/keychain.csh
%changelog
+* Tue Aug 16 2005 Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.5-2
+- Added test for homedir mismatch in opt-in scripts, covering
+ `sudo -s' (reported by Ville Skyttä).
+
* Fri Aug 05 2005 Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.5-1
- Updated to new upstream version
- Removed keychain.pod from %%doc.
More information about the fedora-extras-commits
mailing list