qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:46:16 +02:00
Code

[package] uhttpd: cope with DES crypted passwd entries by not relying on a leading dollar sign to indicate a cipher

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28886 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-11-09 18:55:28 +00:00
parent b0ee088651
commit 81199b8bf5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/uhttpd/Makefile
View File

@ -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 := \

7
package/uhttpd/src/uhttpd-utils.c
View File

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