/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

Change the default value of the "checker" option command to make the
checker command be run-time dependent on the "host" client attribute
instead of reading it only once on startup:

* clients.conf (checker): Changed default commented-out value to
                          "fping -q -- %%(host)s".
* mandos (main): Changed default value for the "checker" config option
                 to "fping -q -- %%(host)s".
* mandos-clients.conf.xml (OPTIONS): Document changed default value.
  (EXAMPLE): Changed value of "checker".

* plugins.d/password-prompt.c: Whitespace changes only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
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 -fPIE -pie
 
13
LINK_FORTIFY=-z relro -pie
15
14
#COVERAGE=--coverage
16
15
OPTIMIZE=-Os
17
16
LANGUAGE=-std=gnu99
18
17
htmldir=man
19
 
version=1.0.5
 
18
version=1.0.3
20
19
SED=sed
21
20
 
22
21
## Use these settings for a traditional /usr/local install
46
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
47
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
50
49
 
51
50
# Commands to format a DocBook <refentry> document into a manual page
52
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
77
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
78
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
81
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
81
        plugins.d/mandos-client.8mandos \
83
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
164
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
164
                $@
166
165
 
167
 
mandos-ctl: Makefile
 
166
mandos-list: Makefile
168
167
        $(SED) --in-place \
169
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
169
                $@
203
202
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
203
        ./plugin-runner --plugin-dir=plugins.d \
205
204
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
205
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
208
206
 
209
207
# Used by run-client
210
208
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
213
211
 
214
212
# Run the server with a local config
215
213
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
214
        ./mandos --debug --configdir=confdir
217
215
 
218
216
# Used by run-server
219
217
confdir/mandos.conf: mandos.conf