diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2001-06-29 15:38:33 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2001-06-29 15:38:33 +0000 |
| commit | 9c3c2fffc7bf2f4e9a674ce77945f12b6975607e (patch) | |
| tree | d3ead31136f2e0a21b31fce0b191208e2bb116ab /security/heimdal/files/patch-cj | |
| parent | Remove pdflib support. (diff) | |
Correct no-nos: one file per patch, please. Don't touch more than one
source file with each patch file, and don't touch the same source file
with more than one patch file.
Notes
Notes:
svn path=/head/; revision=44566
Diffstat (limited to 'security/heimdal/files/patch-cj')
| -rw-r--r-- | security/heimdal/files/patch-cj | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/security/heimdal/files/patch-cj b/security/heimdal/files/patch-cj index 1fe503ab37f4..1eab53ca54d7 100644 --- a/security/heimdal/files/patch-cj +++ b/security/heimdal/files/patch-cj @@ -1,5 +1,5 @@ ---- appl/ftp/ftpd/ftpd.c.orig Thu Aug 31 01:08:49 2000 -+++ appl/ftp/ftpd/ftpd.c Fri Nov 3 12:01:17 2000 +--- appl/ftp/ftpd/ftpd.c.ORIG Fri Jun 29 09:41:46 2001 ++++ appl/ftp/ftpd/ftpd.c Fri Jun 29 09:42:04 2001 @@ -68,6 +68,7 @@ int debug = 0; int ftpd_timeout = 900; /* timeout after 15 minutes of inactivity */ @@ -8,7 +8,7 @@ int logging; int guest; int dochroot; -@@ -215,6 +216,7 @@ +@@ -217,6 +218,7 @@ { NULL, 't', arg_integer, &ftpd_timeout, "initial timeout" }, { NULL, 'T', arg_integer, &maxtimeout, "max timeout" }, { NULL, 'u', arg_string, &umask_string, "umask for user logins" }, @@ -16,7 +16,7 @@ { NULL, 'd', arg_flag, &debug, "enable debugging" }, { NULL, 'v', arg_flag, &debug, "enable debugging" }, { "builtin-ls", 'B', arg_flag, &use_builtin_ls, "use built-in ls to list files" }, -@@ -1942,6 +1944,8 @@ +@@ -1951,6 +1953,8 @@ socket_set_address_and_port (pasv_addr, socket_get_address (ctrl_addr), 0); @@ -25,7 +25,7 @@ seteuid(0); if (bind(pdata, pasv_addr, socket_sockaddr_size (pasv_addr)) < 0) { seteuid(pw->pw_uid); -@@ -1984,6 +1988,8 @@ +@@ -1993,6 +1997,8 @@ socket_set_address_and_port (pasv_addr, socket_get_address (ctrl_addr), 0); @@ -34,3 +34,18 @@ seteuid(0); if (bind(pdata, pasv_addr, socket_sockaddr_size (pasv_addr)) < 0) { seteuid(pw->pw_uid); +@@ -2165,7 +2171,13 @@ + char buf[MaxPathLen]; + + if (strpbrk(whichf, "~{[*?") != NULL) { +- int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|GLOB_LIMIT; ++ int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE| ++#ifdef GLOB_MAXPATH ++ GLOB_MAXPATH ++#else ++ GLOB_LIMIT ++#endif ++ ; + + memset(&gl, 0, sizeof(gl)); + freeglob = 1; |