From: hno <>
Date: Sun, 26 Sep 2004 03:12:15 +0000 (+0000)
Subject: Bug #1078: ncsa_auth is sensitive on line ending format
X-Git-Tag: SQUID_3_0_PRE4~1045
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07f9c91c59d255c05e206411eefec371ac6c1423;p=thirdparty%2Fsquid.git

Bug #1078: ncsa_auth is sensitive on line ending format
---

diff --git a/helpers/basic_auth/NCSA/ncsa_auth.c b/helpers/basic_auth/NCSA/ncsa_auth.c
index 25b71890c7..d07e52779a 100644
--- a/helpers/basic_auth/NCSA/ncsa_auth.c
+++ b/helpers/basic_auth/NCSA/ncsa_auth.c
@@ -89,8 +89,8 @@ read_passwd_file(const char *passwdfile)
 	if ((buf[0] == '#') || (buf[0] == ' ') || (buf[0] == '\t') ||
 	    (buf[0] == '\n'))
 	    continue;
-	user = strtok(buf, ":\n");
-	passwd = strtok(NULL, ":\n");
+	user = strtok(buf, ":\n\r");
+	passwd = strtok(NULL, ":\n\r");
 	if ((strlen(user) > 0) && passwd) {
 	    u = xmalloc(sizeof(*u));
 	    u->user = xstrdup(user);