/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-08-16 03:29:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080816032908-ihw7c05r2mnyk389
Add feature to specify custom environment variables for plugins.

* plugin-runner.c (plugin): New members "environ" and "envc" to
                            contain possible custom environment.
  (getplugin): Return NULL on failure instead of doing exit(); all
               callers changed.
  (add_to_char_array): New helper function for "add_argument" and
                       "add_environment".
  (addargument): Renamed to "add_argument".  Return bool.  Call
                 "add_to_char_array" to actually do things.
  (add_environment): New; analogous to "add_argument".
  (addcustomargument): Renamed to "add_to_argv" to avoid confusion
                       with "add_argument".
  (main): New options "--global-envs" and "--envs-for" to specify
          custom environment for plugins.  Print environment for
          plugins in debug mode.  Use asprintf instead of strcpy and
          strcat.  Use execve() for plugins with custom environments.
          Free environment for plugin when freeing plugin list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code 
9
 
#DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
 
8
        -Wvolatile-register-var
 
9
DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
15
13
#COVERAGE=--coverage
16
14
OPTIMIZE=-Os
17
15
LANGUAGE=-std=gnu99
18
 
htmldir=man
19
 
version=1.0.5
20
 
SED=sed
21
 
 
22
 
## Use these settings for a traditional /usr/local install
23
 
# PREFIX=$(DESTDIR)/usr/local
24
 
# CONFDIR=$(DESTDIR)/etc/mandos
25
 
# KEYDIR=$(DESTDIR)/etc/mandos/keys
26
 
# MANDIR=$(PREFIX)/man
27
 
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
28
 
##
29
 
 
30
 
## These settings are for a package-type install
31
 
PREFIX=$(DESTDIR)/usr
32
 
CONFDIR=$(DESTDIR)/etc/mandos
33
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
34
 
MANDIR=$(PREFIX)/share/man
35
 
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
 
##
37
 
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
16
# PREFIX=/usr/local
 
17
PREFIX=/usr
 
18
# CONFDIR=/usr/local/lib/mandos
 
19
CONFDIR=/etc/mandos
 
20
# MANDIR=/usr/local/man
 
21
MANDIR=/usr/share/man
44
22
 
45
23
# Do not change these two
46
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
 
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
24
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
 
25
LDFLAGS=$(COVERAGE)
50
26
 
51
 
# Commands to format a DocBook <refentry> document into a manual page
52
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
27
DOCBOOKTOMAN=xsltproc --nonet \
53
28
        --param man.charmap.use.subset          0 \
54
29
        --param make.year.ranges                1 \
55
30
        --param make.single.year.ranges         1 \
56
31
        --param man.output.quietly              1 \
57
 
        --param man.authors.section.enabled     0 \
58
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
59
 
        $(notdir $<); \
60
 
        $(MANPOST) $(notdir $@)
61
 
# DocBook-to-man post-processing to fix a '\n' escape bug
62
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
63
 
 
64
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
65
 
        --param make.year.ranges                1 \
66
 
        --param make.single.year.ranges         1 \
67
 
        --param man.output.quietly              1 \
68
 
        --param man.authors.section.enabled     0 \
69
 
        --param citerefentry.link               1 \
70
 
        --output $@ \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
 
        $<; $(HTMLPOST) $@
73
 
# Fix citerefentry links
74
 
HTMLPOST=$(SED) --in-place \
75
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
76
 
 
77
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
 
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
32
        --param man.authors.section.enabled     0
 
33
 
 
34
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
35
PROGS=plugin-runner $(PLUGINS)
81
36
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
 
        plugins.d/mandos-client.8mandos \
 
37
        plugins.d/password-request.8mandos \
83
38
        plugins.d/password-prompt.8mandos mandos.conf.5 \
84
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
85
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
86
 
 
87
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
 
 
89
 
objects=$(addsuffix .o,$(CPROGS))
90
 
 
91
 
all: $(PROGS) mandos.lsm
 
39
        mandos-clients.conf.5
 
40
 
 
41
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
 
42
 
 
43
all: $(PROGS)
92
44
 
93
45
doc: $(DOCS)
94
46
 
95
 
html: $(htmldocs)
96
 
 
97
 
%.5: %.xml common.ent legalnotice.xml
98
 
        $(DOCBOOKTOMAN)
99
 
%.5.xhtml: %.xml common.ent legalnotice.xml
100
 
        $(DOCBOOKTOHTML)
101
 
 
102
 
%.8: %.xml common.ent legalnotice.xml
103
 
        $(DOCBOOKTOMAN)
104
 
%.8.xhtml: %.xml common.ent legalnotice.xml
105
 
        $(DOCBOOKTOHTML)
106
 
 
107
 
%.8mandos: %.xml common.ent legalnotice.xml
108
 
        $(DOCBOOKTOMAN)
109
 
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
110
 
        $(DOCBOOKTOHTML)
111
 
 
112
 
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
113
 
                legalnotice.xml
114
 
        $(DOCBOOKTOMAN)
115
 
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
116
 
                overview.xml legalnotice.xml
117
 
        $(DOCBOOKTOHTML)
118
 
 
119
 
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
120
 
                legalnotice.xml
121
 
        $(DOCBOOKTOMAN)
122
 
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
123
 
                 legalnotice.xml
124
 
        $(DOCBOOKTOHTML)
125
 
 
126
 
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
127
 
                legalnotice.xml
128
 
        $(DOCBOOKTOMAN)
129
 
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
130
 
                legalnotice.xml
131
 
        $(DOCBOOKTOHTML)
132
 
 
133
 
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
134
 
                legalnotice.xml
135
 
        $(DOCBOOKTOMAN)
136
 
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
137
 
                overview.xml legalnotice.xml
138
 
        $(DOCBOOKTOHTML)
139
 
 
140
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
141
 
                                        common.ent \
142
 
                                        mandos-options.xml \
143
 
                                        overview.xml legalnotice.xml
144
 
        $(DOCBOOKTOMAN)
145
 
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
146
 
                                        common.ent \
147
 
                                        mandos-options.xml \
148
 
                                        overview.xml legalnotice.xml
149
 
        $(DOCBOOKTOHTML)
150
 
 
151
 
# Update all these files with version number $(version)
152
 
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
156
 
 
157
 
mandos: Makefile
158
 
        $(SED) --in-place \
159
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
161
 
 
162
 
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
164
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
166
 
 
167
 
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
171
 
 
172
 
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
174
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
177
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
180
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
182
 
 
183
 
plugins.d/mandos-client: plugins.d/mandos-client.o
184
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
186
 
 
187
 
.PHONY : all doc html clean distclean run-client run-server install \
 
47
%.5: %.xml
 
48
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
 
49
 
 
50
%.8: %.xml
 
51
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
 
52
 
 
53
%.8mandos: %.xml
 
54
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
 
55
 
 
56
plugin-runner: plugin-runner.o
 
57
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
58
 
 
59
plugins.d/password-request: plugins.d/password-request.o
 
60
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
 
61
                $(LOADLIBES) $(LDLIBS) -o $@
 
62
 
 
63
plugins.d/password-prompt: plugins.d/password-prompt.o
 
64
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
65
 
 
66
.PHONY : all clean distclean run-client run-server install \
188
67
        install-server install-client uninstall uninstall-server \
189
68
        uninstall-client purge purge-server purge-client
190
69
 
191
70
clean:
192
 
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
71
        -rm --force $(PROGS) $(objects) $(DOCS) core
193
72
 
194
73
distclean: clean
195
74
mostlyclean: clean
196
75
maintainer-clean: clean
197
 
        -rm --force --recursive keydir confdir
 
76
        -rm --force --recursive keydir
198
77
 
199
 
check:  all
 
78
check:
200
79
        ./mandos --check
201
80
 
202
 
# Run the client with a local config and key
203
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
81
run-client: all
 
82
        -mkdir keydir
 
83
        -./mandos-keygen --dir keydir
204
84
        ./plugin-runner --plugin-dir=plugins.d \
205
 
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
208
 
 
209
 
# Used by run-client
210
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
211
 
        install --directory keydir
212
 
        ./mandos-keygen --dir keydir --force
213
 
 
214
 
# Run the server with a local config
215
 
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
217
 
 
218
 
# Used by run-server
219
 
confdir/mandos.conf: mandos.conf
220
 
        install --directory confdir
221
 
        install --mode=u=rw,go=r $^ $@
222
 
confdir/clients.conf: clients.conf keydir/seckey.txt
223
 
        install --directory confdir
224
 
        install --mode=u=rw $< $@
225
 
# Add a client password
226
 
        ./mandos-keygen --dir keydir --password >> $@
227
 
 
228
 
install: install-server install-client-nokey
229
 
 
230
 
install-html: html
231
 
        install --directory $(htmldir)
232
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
233
 
                $(htmldocs)
 
85
                --options-for=password-request:--keydir=keydir
 
86
 
 
87
run-server:
 
88
        ./mandos --debug --configdir=.
 
89
 
 
90
install: install-server install-client
234
91
 
235
92
install-server: doc
236
 
        install --directory $(CONFDIR)
237
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
238
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
239
 
                mandos.conf
240
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
93
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
 
94
                $(MANDIR)/man8
 
95
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
96
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
97
        install --mode=0640 --target-directory=$(CONFDIR) \
241
98
                clients.conf
242
 
        install --mode=u=rwx,go=rx init.d-mandos \
243
 
                $(DESTDIR)/etc/init.d/mandos
244
 
        install --mode=u=rw,go=r default-mandos \
245
 
                $(DESTDIR)/etc/default/mandos
246
 
        if [ -z $(DESTDIR) ]; then \
247
 
                update-rc.d mandos defaults 25 15;\
248
 
        fi
249
99
        gzip --best --to-stdout mandos.8 \
250
100
                > $(MANDIR)/man8/mandos.8.gz
251
101
        gzip --best --to-stdout mandos.conf.5 \
253
103
        gzip --best --to-stdout mandos-clients.conf.5 \
254
104
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
255
105
 
256
 
install-client-nokey: all doc
257
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
258
 
        install --directory --mode=u=rwx $(KEYDIR) \
259
 
                $(PREFIX)/lib/mandos/plugins.d
260
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
261
 
                install --mode=u=rwx \
262
 
                        --directory "$(CONFDIR)/plugins.d"; \
263
 
        fi
264
 
        install --mode=u=rwx,go=rx \
265
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
266
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
106
install-client: all doc /usr/share/initramfs-tools/hooks/.
 
107
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
 
108
                $(MANDIR)/man8
 
109
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
110
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
111
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
112
                plugin-runner
 
113
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
267
114
                mandos-keygen
268
 
        install --mode=u=rwx,go=rx \
 
115
        install --mode=0755 \
269
116
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
270
117
                plugins.d/password-prompt
271
 
        install --mode=u=rwxs,go=rx \
272
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
273
 
                plugins.d/mandos-client
274
 
        install --mode=u=rwxs,go=rx \
275
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
276
 
                plugins.d/usplash
277
 
        install --mode=u=rwxs,go=rx \
278
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
279
 
                plugins.d/splashy
280
 
        install --mode=u=rwxs,go=rx \
281
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
282
 
                plugins.d/askpass-fifo
 
118
        install --mode=4755 \
 
119
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
120
                plugins.d/password-request
283
121
        install initramfs-tools-hook \
284
 
                $(INITRAMFSTOOLS)/hooks/mandos
285
 
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
 
122
                /usr/share/initramfs-tools/hooks/mandos
 
123
        install initramfs-tools-hook-conf \
 
124
                /usr/share/initramfs-tools/conf-hooks.d/mandos
287
125
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
289
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 
126
                /usr/share/initramfs-tools/scripts/local-top/mandos
290
127
        gzip --best --to-stdout mandos-keygen.8 \
291
128
                > $(MANDIR)/man8/mandos-keygen.8.gz
292
129
        gzip --best --to-stdout plugin-runner.8mandos \
293
130
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
294
131
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
295
132
                > $(MANDIR)/man8/password-prompt.8mandos.gz
296
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
297
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
298
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
299
 
                > $(MANDIR)/man8/usplash.8mandos.gz
300
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
301
 
                > $(MANDIR)/man8/splashy.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
303
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
304
 
 
305
 
install-client: install-client-nokey
306
 
# Post-installation stuff
307
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
133
        gzip --best --to-stdout plugins.d/password-request.8mandos \
 
134
                > $(MANDIR)/man8/password-request.8mandos.gz
 
135
        -$(PREFIX)/sbin/mandos-keygen
308
136
        update-initramfs -k all -u
309
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
310
137
 
311
138
uninstall: uninstall-server uninstall-client
312
139
 
313
 
uninstall-server:
 
140
uninstall-server: $(PREFIX)/sbin/mandos
314
141
        -rm --force $(PREFIX)/sbin/mandos \
315
142
                $(MANDIR)/man8/mandos.8.gz \
316
143
                $(MANDIR)/man5/mandos.conf.5.gz \
317
144
                $(MANDIR)/man5/mandos-clients.conf.5.gz
318
 
        update-rc.d -f mandos remove
319
145
        -rmdir $(CONFDIR)
320
146
 
321
147
uninstall-client:
322
148
# Refuse to uninstall client if /etc/crypttab is explicitly configured
323
149
# to use it.
324
150
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
325
 
                $(DESTDIR)/etc/crypttab
 
151
                /etc/crypttab
326
152
        -rm --force $(PREFIX)/sbin/mandos-keygen \
327
153
                $(PREFIX)/lib/mandos/plugin-runner \
328
154
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
329
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
330
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
331
 
                $(PREFIX)/lib/mandos/plugins.d/splashy \
332
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
 
                $(INITRAMFSTOOLS)/hooks/mandos \
334
 
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
155
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
156
                /usr/share/initramfs-tools/hooks/mandos \
 
157
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
336
158
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
159
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
160
                $(MANDIR)/man8/password-prompt.8mandos.gz \
339
 
                $(MANDIR)/man8/usplash.8mandos.gz \
340
 
                $(MANDIR)/man8/splashy.8mandos.gz \
341
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
342
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
161
                $(MANDIR)/man8/password-request.8mandos.gz
343
162
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
344
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
163
                 $(PREFIX)/lib/mandos $(CONFDIR)
345
164
        update-initramfs -k all -u
346
165
 
347
166
purge: purge-server purge-client
348
167
 
349
168
purge-server: uninstall-server
350
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
351
 
                $(DESTDIR)/etc/default/mandos \
352
 
                $(DESTDIR)/etc/init.d/mandos \
353
 
                $(DESTDIR)/var/run/mandos.pid
 
169
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
354
170
        -rmdir $(CONFDIR)
355
171
 
356
172
purge-client: uninstall-client
357
 
        -shred --remove $(KEYDIR)/seckey.txt
358
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
359
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
360
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
173
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
174
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d