Jacques Vidrine
ede6693b54
Re-add the FreeBSD RCS keyword for the benefit of mergemaster.
...
PR: conf/50040
Requested by: Dimitry Andric <dim@xs4all.nl>
2004-01-09 14:46:11 +00:00
Dag-Erling Smørgrav
2735d723cb
This commit was generated by cvs2svn to compensate for changes in r124287,
...
which included commits to RCS files with non-trunk default branches.
2004-01-09 12:57:36 +00:00
Dag-Erling Smørgrav
002696701b
Don't output the terminating '\0' (already fixed in OpenSSH CVS)
2004-01-09 12:57:36 +00:00
Dag-Erling Smørgrav
f0477b2653
Egg on my face: UsePAM was off by default.
...
Pointed out by: Sean McNeil <sean@mcneil.com>
2004-01-09 08:07:12 +00:00
Dag-Erling Smørgrav
a5ac46fb04
Regenerate config.h; I don't know why this didn't hit CVS yesterday.
2004-01-08 09:42:35 +00:00
Dag-Erling Smørgrav
8cf8104b8f
Remove obsolete files on the vendor branch.
2004-01-08 09:33:46 +00:00
Dag-Erling Smørgrav
e2fb0b2a6b
Update to reflect changes since the last version.
2004-01-07 11:51:18 +00:00
Dag-Erling Smørgrav
cf2b5f3b6d
Resolve conflicts and remove obsolete files.
...
Sponsored by: registrar.no
2004-01-07 11:16:27 +00:00
Dag-Erling Smørgrav
d95e11bf7e
Vendor import of OpenSSH 3.7.1p2.
2004-01-07 11:10:17 +00:00
Dag-Erling Smørgrav
fb7dd0a77c
This commit was generated by cvs2svn to compensate for changes in r124208,
...
which included commits to RCS files with non-trunk default branches.
2004-01-07 11:10:17 +00:00
Dag-Erling Smørgrav
221552e490
Merge OpenSSH 3.7.1p2.
2004-01-07 11:10:02 +00:00
Simon L. B. Nielsen
b0a159ccab
Add a missing word.
...
Submitted by: Michel Lavondes <fox@vader.aacc.cc.md.us>
Reviewed by: des
MFC after: 1 week
2003-10-31 21:49:47 +00:00
Dag-Erling Smørgrav
522a040d24
Plug a memory leak in the PAM child process. It is of no great consequence
...
as the process is short-lived, and the leak occurs very rarely and always
shortly before the process terminates.
MFC after: 3 days
2003-10-23 08:27:16 +00:00
Jacques Vidrine
8fc52f5387
This commit was generated by cvs2svn to compensate for changes in r120952,
...
which included commits to RCS files with non-trunk default branches.
2003-10-09 19:52:14 +00:00
Jacques Vidrine
855f569304
Correct badly-formed code (missing quote) within `#if 0' section.
...
Newer versions of GCC error in such situations.
Obtained from: Heimdal CVS
2003-10-09 19:52:14 +00:00
Jacques Vidrine
2d4851347d
Resolve conflicts after import of Heimdal 0.6.
2003-10-09 19:42:07 +00:00
Jacques Vidrine
bbd80c285e
Vendor import of Heimdal 0.6.
2003-10-09 19:36:20 +00:00
Jacques Vidrine
83dff030ab
This commit was generated by cvs2svn to compensate for changes in r120945,
...
which included commits to RCS files with non-trunk default branches.
2003-10-09 19:36:20 +00:00
Jacques Vidrine
6b1b07dfa1
Add list of files to remove from the Heimdal distribution prior to
...
each import.
2003-10-09 19:35:38 +00:00
Jacques Vidrine
52033a8dc8
Remove files no longer included with OpenSSL as of version 0.9.7c.
2003-10-01 12:38:27 +00:00
Jacques Vidrine
5fad2af4e3
Merge conflicts after import of OpenSSL 0.9.7c.
2003-10-01 12:37:51 +00:00
Jacques Vidrine
8ae0780c3a
This commit was generated by cvs2svn to compensate for changes in r120631,
...
which included commits to RCS files with non-trunk default branches.
2003-10-01 12:32:41 +00:00
Jacques Vidrine
50ef009353
Vendor import of OpenSSL 0.9.7c
2003-10-01 12:32:41 +00:00
Jacques Vidrine
402cb58a40
Update list of files to remove prior to import of OpenSSL 0.9.7c.
2003-10-01 12:21:16 +00:00
Josef Karthauser
dcf5581978
Additional corrections to OpenSSH buffer handling.
...
Obtained from: openssh.org
Originally committed to head by: nectar
2003-09-26 19:15:53 +00:00
Josef Karthauser
a7e41a41f9
This commit was generated by cvs2svn to compensate for changes in r120489,
...
which included commits to RCS files with non-trunk default branches.
2003-09-26 19:15:53 +00:00
Josef Karthauser
3533e7e58a
Additional corrections to OpenSSH buffer handling.
...
Obtained from: openssh.org
Originally committed to head by: nectar
2003-09-26 19:15:53 +00:00
Dag-Erling Smørgrav
44172b702c
Update version string.
2003-09-24 19:20:23 +00:00
Dag-Erling Smørgrav
b584000fa2
Remove bogus calls to xfree().
2003-09-24 19:11:52 +00:00
Dag-Erling Smørgrav
8cc2c63b43
resp is a pointer to an array of structs, not an array of pointers to structs.
2003-09-24 18:26:29 +00:00
Dag-Erling Smørgrav
7961e48467
Return the correct error value when a null query fails.
2003-09-24 18:24:27 +00:00
Dag-Erling Smørgrav
da26b3794a
Fix broken shell code.
2003-09-19 11:29:51 +00:00
Jacques Vidrine
454412956c
Correct more cases of allocation size bookkeeping being updated before
...
calling functions which can potentially fail and cause cleanups to be
invoked.
Submitted by: Solar Designer <solar@openwall.com>
2003-09-17 14:36:14 +00:00
Jacques Vidrine
78ad1843d4
This commit was generated by cvs2svn to compensate for changes in r120161,
...
which included commits to RCS files with non-trunk default branches.
2003-09-17 14:36:14 +00:00
Jacques Vidrine
b69cd7f2b0
Correct more cases of allocation size bookkeeping being updated before
...
calling functions which can potentially fail and cause cleanups to be
invoked.
Submitted by: Solar Designer <solar@openwall.com>
2003-09-17 14:36:14 +00:00
Jacques Vidrine
979af4e167
Update the OpenSSH addendum string for the buffer handling fix.
2003-09-16 14:33:04 +00:00
Jacques Vidrine
8947bcb756
Do not record expanded size before attempting to reallocate associated
...
memory.
Obtained from: OpenBSD
2003-09-16 06:11:58 +00:00
Jacques Vidrine
9267dca39a
This commit was generated by cvs2svn to compensate for changes in r120113,
...
which included commits to RCS files with non-trunk default branches.
2003-09-16 06:11:58 +00:00
Mark Murray
4afa371832
Very big makeover in the way telnet, telnetd and libtelnet are built.
...
Previously, there were two copies of telnet; a non-crypto version
that lived in the usual places, and a crypto version that lived in
crypto/telnet/. The latter was built in a broken manner somewhat akin
to other "contribified" sources. This meant that there were 4 telnets
competing with each other at build time - KerberosIV, Kerberos5,
plain-old-secure and base. KerberosIV is no longer in the running, but
the other three took it in turns to jump all over each other during a
"make buildworld".
As the crypto issue has been clarified, and crypto _calls_ are not
a problem, crypto/telnet has been repo-copied to contrib/telnet,
and with this commit, all telnets are now "contribified". The contrib
path was chosen to not destroy history in the repository, and differs
from other contrib/ entries in that it may be worked on as "normal"
BSD code. There is no dangerous crypto in these sources, only a
very weak system less strong than enigma(1).
Kerberos5 telnet and Secure telnet are now selected by using the usual
macros in /etc/make.conf, and the build process is unsurprising and
less treacherous.
2003-07-16 20:59:15 +00:00
Dag-Erling Smørgrav
af8524a91e
Add a "return" that was missing from 3.6.1p1. Since it's been fixed in
...
the OpenSSH-portable CVS repo, I'm committing this on the vendor branch.
2003-06-24 19:30:44 +00:00
Dag-Erling Smørgrav
07e57fee7d
This commit was generated by cvs2svn to compensate for changes in r116791,
...
which included commits to RCS files with non-trunk default branches.
2003-06-24 19:30:44 +00:00
Dag-Erling Smørgrav
da05574c54
Fix off-by-one and initialization errors which prevented sshd from
...
restarting when sent a SIGHUP.
Submitted by: tegge
Approved by: re (jhb)
2003-05-28 19:39:33 +00:00
Dag-Erling Smørgrav
fbafac351f
Revert unnecessary part of previous commit.
2003-05-13 10:18:49 +00:00
Dag-Erling Smørgrav
57f64f4e2f
Rename a few functions to avoid stealing common words (error, log, debug
...
etc.) from the application namespace for programs that use pam_ssh(8).
Use #defines to avoid changing the actual source code.
Approved by: re (rwatson)
2003-05-12 19:22:47 +00:00
Mark Murray
074e8e8ee9
Fix up external variables named "debug" that have a horrible habit
...
of conflicting with other, similarly named functions in static
libraries. This is done mostly by renaming the var if it is shared
amongst modules, or making it static otherwise.
OK'ed by: re(scottl)
2003-05-11 18:17:00 +00:00
David E. O'Brien
77b7cdf199
Use __FBSDID vs. rcsid[]. Also protect sccs[] and copyright[] from GCC 3.3.
2003-05-04 02:54:49 +00:00
Dag-Erling Smørgrav
d12c7b01da
Remove RCSID from files which have no other diffs to the vendor branch.
2003-05-01 15:05:43 +00:00
Dag-Erling Smørgrav
2d61bc6706
Nit.
2003-04-23 17:23:06 +00:00
Dag-Erling Smørgrav
ae48cf5798
Improvements to the proposed shell code.
2003-04-23 17:21:55 +00:00
Dag-Erling Smørgrav
07a3a2906c
Regenerate.
2003-04-23 17:21:27 +00:00