From 81199b8bf5677009fc0a13538c9e00707c24af5a Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 9 Nov 2011 18:55:28 +0000
Subject: [package] uhttpd: cope with DES crypted passwd entries by not relying
 on a leading dollar sign to indicate a cipher

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28886 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/uhttpd/Makefile           | 2 +-
 package/uhttpd/src/uhttpd-utils.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'package')

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index d8bd33c07..c333660d5 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=29
+PKG_RELEASE:=30
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_CONFIG_DEPENDS := \
diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/uhttpd/src/uhttpd-utils.c
index d48f6bcf1..a47f175ba 100644
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@@ -782,12 +782,9 @@ int uh_auth_check(
 			/* found a realm matching the username */
 			if( realm )
 			{
-				/* is a crypt passwd */
-				if( realm->pass[0] == '$' )
-					pass = crypt(pass, realm->pass);
-
 				/* check user pass */
-				if( !strcmp(pass, realm->pass) )
+				if (!strcmp(pass, realm->pass) ||
+				    !strcmp(crypt(pass, realm->pass), realm->pass))
 					return 1;
 			}
 		}
-- 
cgit v1.2.3