security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-08 23:37:47 +02:00
Code Activity

Fix bug#1146

Browse Source
This commit is contained in:
Werner Koch 2009-12-18 16:27:05 +00:00
parent 22e8b1a671
commit 9129fcd868
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ChangeLog
View File

@ -1,3 +1,7 @@
2009-12-18 Werner Koch <wk@g10code.com>
* applygnupgdefaults (errorfile): Use mktemp. Fixes bug#1146.
2009-12-07 Werner Koch <wk@g10code.com> 2009-12-07 Werner Koch <wk@g10code.com>
* no-libgcrypt.c (gcry_strdup): Actually copy the string. * no-libgcrypt.c (gcry_strdup): Actually copy the string.

11
tools/applygnupgdefaults
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Apply defaults from/etc/gnupg/gpg.conf to all users -*- sh -*- # Apply defaults from /etc/gnupg/gpg.conf to all users -*- sh -*-
# #
# Copyright 2007 Free Software Foundation, Inc. # Copyright 2007 Free Software Foundation, Inc.
# #
@ -16,7 +16,7 @@ errorfile=
error () { error () {
echo "$PGM: $*" >&2 echo "$PGM: $*" >&2
echo "$PGM: $*" >>$errorfile [ -n "$errorfile" ] && echo "$PGM: $*" >>$errorfile
} }
info () { info () {
@ -34,9 +34,8 @@ cleanup ()
[ -n "$errorfile" -a -f "$errorfile" ] && rm "$errorfile" [ -n "$errorfile" -a -f "$errorfile" ] && rm "$errorfile"
} }
trap cleanup EXIT SIGINT SIGHUP SIGPIPE trap cleanup EXIT SIGINT SIGHUP SIGPIPE
errorfile="/tmp/$PGM.$$.log" errorfile=$(mktemp "/tmp/$PGM.log.XXXXXX")
: >$errorfile [ -n "$errorfile" -a -f "$errorfile" ] || exit 2
# Check whether we can use getent # Check whether we can use getent
if getent --help </dev/null >/dev/null 2>&1 ; then if getent --help </dev/null >/dev/null 2>&1 ; then
@ -62,7 +61,7 @@ fi
${cat_passwd} \ ${cat_passwd} \
| while IFS=: read -r user dmy_a uid dmy_c dmy_d home shell dmy_rest; do | while IFS=: read -r user dmy_a uid dmy_c dmy_d home shell dmy_rest; do
# Process only entires with a valid login shell # Process only entries with a valid login shell
grep </etc/shells "^$shell" 2>/dev/null >/dev/null || continue grep </etc/shells "^$shell" 2>/dev/null >/dev/null || continue
# and with an existant gnupg home directory # and with an existant gnupg home directory
[ -d "$home/.gnupg" ] || continue [ -d "$home/.gnupg" ] || continue