1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
From 1a2f2aafff0bef08c2da18ceeeafb06d73057225 Mon Sep 17 00:00:00 2001
From: Ben Kaduk <kaduk@mit.edu>
Date: Thu, 8 Nov 2012 18:40:57 -0500
Subject: [PATCH 2/3] Add configure option to not install kauth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Per http://www.openafs.org/pages/no-more-des.html the kaserver
suite of utilities is deprecated and is not supposed to be built
anymore in this post-1.6 world.
Not building them at all requires some effort, but not installing
them is pretty easy. Do the easy part for now, and leave the hard
parts for a follow-up commit.
Change-Id: I1c400a7398b8708e7c9dc6613cd183b9b67e7a7f
Reviewed-on: http://gerrit.openafs.org/8457
Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 5afe7a882b0bb90a515e505d9ffce4f644633f06)
---
acinclude.m4 | 15 +++++++
src/kauth/Makefile.in | 110 ++++++++++++++++++++++++++------------------------
2 files changed, 73 insertions(+), 52 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 4f8e2c0..b3e03a2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -159,6 +159,14 @@ AC_ARG_ENABLE([transarc-paths],
,
[enable_transarc_paths="no"])
+dnl Deprecated crypto
+AC_ARG_ENABLE([kauth],
+ [AS_HELP_STRING([--disable-kauth],
+ [do not install the deprecated kauth server and utilities (defaults to
+ enabled)])],
+ ,
+ [enable_kauth="yes"])
+
dnl Optimization and debugging flags.
AC_ARG_ENABLE([strip-binaries],
[AS_HELP_STRING([--disable-strip-binaries],
@@ -1477,6 +1485,13 @@ else
fi
AC_SUBST(BUILD_LOGIN)
+if test "$enable_kauth" = yes; then
+ INSTALL_KAUTH="yes"
+else
+ INSTALL_KAUTH="no"
+fi
+AC_SUBST(INSTALL_KAUTH)
+
AC_CHECK_FUNCS([ \
daemon \
flock \
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index dd1452e..ad24e66 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -12,6 +12,8 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_KAUTH = @INSTALL_KAUTH@
+
INCLS=${TOP_INCDIR}/ubik.h \
${TOP_INCDIR}/lwp.h \
${TOP_INCDIR}/lock.h \
@@ -266,62 +268,66 @@ rebuild: rebuild.o kautils.o $(LIBS)
install: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
kaport.h
- ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
- ${INSTALL} -d ${DESTDIR}${bindir}
- ${INSTALL} -d ${DESTDIR}${sbindir}
- ${INSTALL} -d ${DESTDIR}${afssrvbindir}
- ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
- ${INSTALL} -d ${DESTDIR}${libdir}/afs
- ${INSTALL} -d ${DESTDIR}${includedir}/afs
- ${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver
- ${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas
- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid
- ${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas
- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid
- ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog
- ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb
- ${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog
- ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb
- ${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs
- ${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd
- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid
- ${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a
- ${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a
- ${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check
- ${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb
- ${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder
- ${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h
- ${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h
- ${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h
+ if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \
+ ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}; \
+ ${INSTALL} -d ${DESTDIR}${bindir}; \
+ ${INSTALL} -d ${DESTDIR}${sbindir}; \
+ ${INSTALL} -d ${DESTDIR}${afssrvbindir}; \
+ ${INSTALL} -d ${DESTDIR}${afssrvsbindir}; \
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs; \
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs; \
+ ${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver; \
+ ${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas; \
+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid; \
+ ${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas; \
+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid; \
+ ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog; \
+ ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb; \
+ ${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog; \
+ ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb; \
+ ${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs; \
+ ${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd; \
+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid; \
+ ${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a; \
+ ${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a; \
+ ${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check; \
+ ${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb; \
+ ${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder; \
+ ${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h; \
+ ${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h; \
+ ${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h; \
+ fi
dest: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
kaport.h
- ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
- ${INSTALL} -d ${DEST}/etc
- ${INSTALL} -d ${DEST}/bin
- ${INSTALL} -d ${DEST}/lib/afs
- ${INSTALL} -d ${DEST}/include/afs
- ${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver
- ${INSTALL_PROGRAM} kas ${DEST}/etc/kas
- ${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid
- ${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas
- ${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid
- ${INSTALL_PROGRAM} klog ${DEST}/bin/klog
- ${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb
- ${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog
- ${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb
- ${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs
- ${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd
- ${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid
- ${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a
- ${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a
- ${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb
- ${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check
- ${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder
- ${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h
- ${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h
- ${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h
+ if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \
+ ${INSTALL} -d ${DEST}/root.server/usr/afs/bin; \
+ ${INSTALL} -d ${DEST}/etc; \
+ ${INSTALL} -d ${DEST}/bin; \
+ ${INSTALL} -d ${DEST}/lib/afs; \
+ ${INSTALL} -d ${DEST}/include/afs; \
+ ${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver; \
+ ${INSTALL_PROGRAM} kas ${DEST}/etc/kas; \
+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid; \
+ ${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas; \
+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid; \
+ ${INSTALL_PROGRAM} klog ${DEST}/bin/klog; \
+ ${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb; \
+ ${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog; \
+ ${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb; \
+ ${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs; \
+ ${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd; \
+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid; \
+ ${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a; \
+ ${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a; \
+ ${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb; \
+ ${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check; \
+ ${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder; \
+ ${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h; \
+ ${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h; \
+ ${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h; \
+ fi
#
# Misc. targets
--
2.8.2
|