cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more fatal bugs on htpasswd(1)

Browse Source 
Requested by:	"Jon Noack" <noackjr@compgeek.com>
Obtained from:	Apache Group CVS (rev 1.49-1.51)
This commit is contained in:
Hye-Shik Chang 2002-07-08 07:42:04 +00:00
parent 500fdc5990
commit 0360be38d5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=62635
8 changed files with 80 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/apache2/Makefile
View File

@ -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/ \

22
www/apache2/files/patch-support:htpasswd.c
View File

@ -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++;
}
}
}

2
www/apache20/Makefile
View File

@ -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/ \

22
www/apache20/files/patch-support:htpasswd.c
View File

@ -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++;
}
}
}

2
www/apache21/Makefile
View File

@ -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/ \

22
www/apache21/files/patch-support:htpasswd.c
View File

@ -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++;
}
}
}

2
www/apache22/Makefile
View File

@ -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/ \

22
www/apache22/files/patch-support:htpasswd.c
View File

@ -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++;
}
}
}