diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 8 | ||||
-rw-r--r-- | acconfig.h | 12 | ||||
-rw-r--r-- | auth-skey.c | 4 | ||||
-rw-r--r-- | configure.in | 37 |
5 files changed, 61 insertions, 5 deletions
@@ -1,6 +1,5 @@ | |||
1 | 19991119 | 1 | 19991119 |
2 | - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com> | 2 | - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com> |
3 | (off-by-one error - doesn't appear to be easily exploitable) | ||
4 | - Merged OpenBSD CVS changes | 3 | - Merged OpenBSD CVS changes |
5 | - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c] | 4 | - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c] |
6 | more %d vs. %s in fmt-strings | 5 | more %d vs. %s in fmt-strings |
@@ -11,6 +10,10 @@ | |||
11 | - Fix scp progress bar bug again. | 10 | - Fix scp progress bar bug again. |
12 | - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of | 11 | - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of |
13 | David Rankin <drankin@bohemians.lexington.ky.us> | 12 | David Rankin <drankin@bohemians.lexington.ky.us> |
13 | - Added autoconf option to enable Kerberos 4 support (untested) | ||
14 | - Added autoconf option to enable AFS support (untested) | ||
15 | - Added autoconf option to enable S/Key support (untested) | ||
16 | - Added autoconf option to enable TCP wrappers support (compiles OK) | ||
14 | 17 | ||
15 | 19991118 | 18 | 19991118 |
16 | - Merged OpenBSD CVS changes | 19 | - Merged OpenBSD CVS changes |
diff --git a/Makefile.in b/Makefile.in index 73c4db766..4daa810ec 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -22,10 +22,10 @@ GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` | |||
22 | GNOME_LIBS=`gnome-config --libs gnome gnomeui` | 22 | GNOME_LIBS=`gnome-config --libs gnome gnomeui` |
23 | 23 | ||
24 | OBJS= authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \ | 24 | OBJS= authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \ |
25 | auth-rsa.o bufaux.o buffer.o canohost.o channels.o cipher.o \ | 25 | auth-rsa.o auth-skey.o bufaux.o buffer.o canohost.o channels.o \ |
26 | clientloop.o compress.o crc32.o deattack.o helper.o hostfile.o \ | 26 | cipher.o clientloop.o compress.o crc32.o deattack.o helper.o \ |
27 | log-client.o login.o log-server.o match.o mpaux.o packet.o pty.o \ | 27 | hostfile.o log-client.o login.o log-server.o match.o mpaux.o \ |
28 | readconf.o readpass.o rsa.o servconf.o serverloop.o \ | 28 | packet.o pty.o readconf.o readpass.o rsa.o servconf.o serverloop.o \ |
29 | sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \ | 29 | sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \ |
30 | helper.o mktemp.o strlcpy.o rc4.o | 30 | helper.o mktemp.o strlcpy.o rc4.o |
31 | 31 | ||
diff --git a/acconfig.h b/acconfig.h index 05296f9ba..44c5c1a14 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -30,6 +30,18 @@ | |||
30 | /* Define if libc defines __progname */ | 30 | /* Define if libc defines __progname */ |
31 | #undef HAVE___PROGNAME | 31 | #undef HAVE___PROGNAME |
32 | 32 | ||
33 | /* Define if you want Kerberos 4 support */ | ||
34 | #undef KRB4 | ||
35 | |||
36 | /* Define if you want AFS support */ | ||
37 | #undef AFS | ||
38 | |||
39 | /* Define if you want S/Key support */ | ||
40 | #undef SKEY | ||
41 | |||
42 | /* Define if you want TCP Wrappers support */ | ||
43 | #undef LIBWRAP | ||
44 | |||
33 | @BOTTOM@ | 45 | @BOTTOM@ |
34 | 46 | ||
35 | /* ******************* Shouldn't need to edit below this line ************** */ | 47 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/auth-skey.c b/auth-skey.c index 9ec170494..66e09bb59 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -1,3 +1,5 @@ | |||
1 | #ifdef SKEY | ||
2 | |||
1 | #include "includes.h" | 3 | #include "includes.h" |
2 | RCSID("$Id: auth-skey.c,v 1.2 1999/10/16 20:57:52 deraadt Exp $"); | 4 | RCSID("$Id: auth-skey.c,v 1.2 1999/10/16 20:57:52 deraadt Exp $"); |
3 | 5 | ||
@@ -147,3 +149,5 @@ skey_fake_keyinfo(char *username) | |||
147 | } | 149 | } |
148 | return skeyprompt; | 150 | return skeyprompt; |
149 | } | 151 | } |
152 | |||
153 | #endif SKEY | ||
diff --git a/configure.in b/configure.in index 05a354d1a..0b54fd58a 100644 --- a/configure.in +++ b/configure.in | |||
@@ -166,4 +166,41 @@ AC_TRY_LINK([], | |||
166 | ] | 166 | ] |
167 | ) | 167 | ) |
168 | 168 | ||
169 | dnl Check whether user wants Kerberos support | ||
170 | AC_ARG_WITH(kerberos4, | ||
171 | [ --with-kerberos4 Enable Kerberos 4 support], | ||
172 | [ | ||
173 | AC_DEFINE(KRB4) | ||
174 | LIBS="$LIBS -lkrb" | ||
175 | CFLAGS="$CFLAGS -I/usr/include/kerberosIV" | ||
176 | ] | ||
177 | ) | ||
178 | |||
179 | dnl Check whether user wants AFS support | ||
180 | AC_ARG_WITH(kerberos4, | ||
181 | [ --with-afs Enable AFS support], | ||
182 | [ | ||
183 | AC_DEFINE(AFS) | ||
184 | LIBS="$LIBS -lkafs" | ||
185 | ] | ||
186 | ) | ||
187 | |||
188 | dnl Check whether user wants S/Key support | ||
189 | AC_ARG_WITH(skey, | ||
190 | [ --with-skey Enable S/Key support], | ||
191 | [ | ||
192 | AC_DEFINE(SKEY) | ||
193 | LIBS="$LIBS -lskey" | ||
194 | ] | ||
195 | ) | ||
196 | |||
197 | dnl Check whether user wants TCP wrappers support | ||
198 | AC_ARG_WITH(skey, | ||
199 | [ --with-tcp-wrappers Enable tcpwrappers support], | ||
200 | [ | ||
201 | AC_DEFINE(LIBWRAP) | ||
202 | LIBS="$LIBS -lwrap" | ||
203 | ] | ||
204 | ) | ||
205 | |||
169 | AC_OUTPUT(Makefile) | 206 | AC_OUTPUT(Makefile) |