diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 20 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | bsd-mktemp.c | 2 | ||||
-rw-r--r-- | includes.h | 2 |
5 files changed, 14 insertions, 14 deletions
@@ -9,6 +9,8 @@ | |||
9 | - Calls to pam_setcred, patch from Nalin Dahyabhai | 9 | - Calls to pam_setcred, patch from Nalin Dahyabhai |
10 | <nalin@thermo.stat.ncsu.edu> | 10 | <nalin@thermo.stat.ncsu.edu> |
11 | - Detect missing size_t and typedef it. | 11 | - Detect missing size_t and typedef it. |
12 | - Rename helper.[ch] to (more appropriate) bsd-misc.[ch] | ||
13 | - Minor Makefile cleaning | ||
12 | 14 | ||
13 | 19991228 | 15 | 19991228 |
14 | - Replacement for getpagesize() for systems which lack it | 16 | - Replacement for getpagesize() for systems which lack it |
diff --git a/Makefile.in b/Makefile.in index 72ac0a81e..050032277 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -33,20 +33,19 @@ GNOME_LIBS=`gnome-config --libs gnome gnomeui` | |||
33 | 33 | ||
34 | OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \ | 34 | OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \ |
35 | auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \ | 35 | auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \ |
36 | bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o \ | 36 | bsd-login.o bsd-misc.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o \ |
37 | bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \ | 37 | bsd-strlcpy.o bufaux.o buffer.o canohost.o channels.o cipher.o \ |
38 | compress.o crc32.o deattack.o helper.o helper.o hostfile.o \ | 38 | clientloop.o compress.o crc32.o deattack.o hostfile.o \ |
39 | log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \ | 39 | log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \ |
40 | packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \ | 40 | packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \ |
41 | serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \ | 41 | serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \ |
42 | xmalloc.o | 42 | xmalloc.o |
43 | 43 | ||
44 | LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \ | 44 | LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-misc.o \ |
45 | bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \ | 45 | bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \ |
46 | buffer.o canohost.o channels.o cipher.o compat.o \ | 46 | buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o \ |
47 | compress.o crc32.o deattack.o fingerprint.o helper.o \ | 47 | deattack.o fingerprint.o hostfile.o log.o match.o mpaux.o nchan.o \ |
48 | hostfile.o log.o match.o mpaux.o nchan.o packet.o \ | 48 | packet.o radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \ |
49 | radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \ | ||
50 | xmalloc.o | 49 | xmalloc.o |
51 | 50 | ||
52 | all: $(OBJS) $(TARGETS) manpages | 51 | all: $(OBJS) $(TARGETS) manpages |
@@ -90,8 +89,7 @@ clean: | |||
90 | *.1 *.8 sshd_config ssh_config | 89 | *.1 *.8 sshd_config ssh_config |
91 | 90 | ||
92 | manpages: | 91 | manpages: |
93 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \ | 92 | $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.[18].in $(srcdir)/ssh*_config.in |
94 | $(srcdir)/ssh_config.in $(srcdir)/sshd_config.in | ||
95 | 93 | ||
96 | install: all | 94 | install: all |
97 | $(INSTALL) -d $(bindir) | 95 | $(INSTALL) -d $(bindir) |
@@ -57,7 +57,7 @@ This version of SSH is based upon code retrieved from the OpenBSD CVS | |||
57 | repository on 1999-11-09 which in turn was based on the last free | 57 | repository on 1999-11-09 which in turn was based on the last free |
58 | version of SSH released by Tatu Ylonen. | 58 | version of SSH released by Tatu Ylonen. |
59 | 59 | ||
60 | Code in helper.[ch] and gnome-ssh-askpass.c is Copyright 1999 | 60 | Code in bsd-misc.[ch] and gnome-ssh-askpass.c is Copyright 1999 |
61 | Internet Business Solutions and is released under a X11-style | 61 | Internet Business Solutions and is released under a X11-style |
62 | license (see source files for details). | 62 | license (see source files for details). |
63 | 63 | ||
diff --git a/bsd-mktemp.c b/bsd-mktemp.c index cdef62da2..7c02ea1a2 100644 --- a/bsd-mktemp.c +++ b/bsd-mktemp.c | |||
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: mktemp.c,v 1.13 1998/06/30 23:03:13 deraadt Exp | |||
51 | #include <ctype.h> | 51 | #include <ctype.h> |
52 | #include <unistd.h> | 52 | #include <unistd.h> |
53 | 53 | ||
54 | #include "helper.h" | 54 | #include "bsd-misc.h" |
55 | 55 | ||
56 | static int _gettemp(char *, int *, int, int); | 56 | static int _gettemp(char *, int *, int, int); |
57 | 57 | ||
diff --git a/includes.h b/includes.h index 7203d08c9..3fe76553b 100644 --- a/includes.h +++ b/includes.h | |||
@@ -81,7 +81,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #include "version.h" | 83 | #include "version.h" |
84 | #include "helper.h" | 84 | #include "bsd-misc.h" |
85 | #include "bsd-strlcpy.h" | 85 | #include "bsd-strlcpy.h" |
86 | #include "bsd-strlcat.h" | 86 | #include "bsd-strlcat.h" |
87 | #include "bsd-mktemp.h" | 87 | #include "bsd-mktemp.h" |