/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to initramfs-tools-hook

  • Committer: Teddy Hogeborn
  • Date: 2008-09-06 00:19:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906001953-5nk5uti6shzuyqdr
* plugins.d/password-prompt.c (main): If successful, output an extra
                                      newline to the console before
                                      exiting, to change to a new line
                                      away from the prompt.

* plugins.d/password-request.c (main): Bug fix: Moved calls to
                                       "init_gnutls_global()",
                                       "mkdtemp()", and "init_gpgme()"
                                       to *after* changing user &
                                       group.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
    exit 1
41
41
fi
42
42
 
43
 
for d in /etc/keys/mandos /etc/mandos/keys; do
 
43
for d in /etc/keys/mandos /usr/local/lib/mandos/keys; do
44
44
    if [ -d "$d" ]; then
45
45
        keydir="$d"
46
46
        break
51
51
    exit 1
52
52
fi
53
53
 
54
 
mandos_user="`{ getent passwd _mandos \
55
 
                || getent passwd mandos \
56
 
                || getent passwd nobody \
57
 
                || echo ::65534::::; } \
58
 
        | awk --field-separator=: '{ print $3 }'`" 
59
 
mandos_group="`{ getent group _mandos \
60
 
                || getent group mandos \
61
 
                || getent group nogroup \
62
 
                || echo ::65534:; } \
63
 
        | awk --field-separator=: '{ print $3 }'`"
 
54
mandos_user="`{ getent passwd mandos \
 
55
        || getent passwd nobody \
 
56
        || echo ::65534::::; } | awk -F: '{ print $3 }'`" 
 
57
mandos_group="`{ getent group mandos \
 
58
        || getent group nogroup \
 
59
        || echo ::65534:; } | awk -F: '{ print $3 }'`"
64
60
 
65
61
# The Mandos network client uses the network
66
62
auto_add_modules net
91
87
        continue
92
88
    fi
93
89
    case "$base" in
94
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
 
90
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
95
91
        "*") :;;
96
92
        *) copy_exec "$file" "${PLUGINDIR}";;
97
93
    esac
101
97
for file in /etc/mandos/plugins.d/*; do
102
98
    base="`basename \"$file\"`"
103
99
    case "$base" in
104
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert) : ;;
 
100
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
105
101
        "*") :;;
106
102
        *) copy_exec "$file" "${PLUGINDIR}";;
107
103
    esac
108
104
done
109
105
 
110
106
# GPGME needs /usr/bin/gpg
111
 
if [ ! -e "${DESTDIR}/usr/bin/gpg" \
112
 
    -a -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* \
113
 
                2>/dev/null`" ]; then
 
107
if ! [ -e "${DESTDIR}/usr/bin/gpg" ] \
 
108
    && [ -n "`ls \"${DESTDIR}\"/usr/lib/libgpgme.so* 2>/dev/null`" ]; then
114
109
    copy_exec /usr/bin/gpg
115
110
fi
116
111
 
122
117
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
123
118
done
124
119
 
125
 
if [ ${mandos_user} != 65534 ]; then
126
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
127
 
    echo "--userid=${mandos_user}" >> "$PLUGINRUNNERCONF"
128
 
fi
129
 
 
130
 
if [ ${mandos_group} != 65534 ]; then
131
 
    PLUGINRUNNERCONF="${DESTDIR}${CONFDIR}/plugin-runner.conf"
132
 
    echo "--groupid=${mandos_group}" >> "$PLUGINRUNNERCONF"
133
 
fi
134
 
 
135
120
# Key files 
136
121
for file in  "$keydir"/*; do
137
122
    if [ -d "$file" ]; then
169
154
    fi
170
155
done
171
156
for dir in /lib /usr/lib; do
172
 
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
157
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -o -print0 \
173
158
        | xargs --null --no-run-if-empty chmod a+rX
174
159
done