diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2002-07-08 07:42:04 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2002-07-08 07:42:04 +0000 |
| commit | 0360be38d574b7347c65887704ca3468159fa3ff (patch) | |
| tree | 8f143ba9c681a6fffe05d213d334c0e3fadc4a31 /www/apache2 | |
| parent | - Update to version 1.18 (diff) | |
Fix more fatal bugs on htpasswd(1)
Requested by: "Jon Noack" <noackjr@compgeek.com>
Obtained from: Apache Group CVS (rev 1.49-1.51)
Notes
Notes:
svn path=/head/; revision=62635
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 2 | ||||
| -rw-r--r-- | www/apache2/files/patch-support:htpasswd.c | 22 |
2 files changed, 20 insertions, 4 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 69dd84b0d092..95824f5133a3 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.39 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache2/files/patch-support:htpasswd.c b/www/apache2/files/patch-support:htpasswd.c index 3267c08e9c31..f836f157fa1b 100644 --- a/www/apache2/files/patch-support:htpasswd.c +++ b/www/apache2/files/patch-support:htpasswd.c @@ -1,6 +1,14 @@ ---- support/htpasswd.c 2002/06/18 02:58:36 1.48 -+++ support/htpasswd.c 2002/06/19 17:31:19 1.49 -@@ -375,7 +375,7 @@ +--- support/htpasswd.c.orig Tue Jun 18 11:58:36 2002 ++++ support/htpasswd.c Mon Jul 8 16:30:14 2002 +@@ -236,6 +236,7 @@ + strcpy(record, user); + strcat(record, ":"); + strcat(record, cpw); ++ strcat(record, "\n"); + return 0; + } + +@@ -375,7 +376,7 @@ } } @@ -9,3 +17,11 @@ apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]); exit(ERR_SYNTAX); } +@@ -592,6 +593,7 @@ + */ + apr_file_printf(errfile, "Updating "); + putline(ftemp, record); ++ found++; + } + } + } |