mirror of
git://slackware.nl/current.git
synced 2025-01-15 15:41:54 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
28 lines
841 B
Diff
28 lines
841 B
Diff
|
|
# HG changeset patch
|
|
# User Matt Johnston <matt@ucc.asn.au>
|
|
# Date 1367250157 -28800
|
|
# Node ID 7bd88d546627ff31d0e2d91e6022b3e77a943efb
|
|
# Parent ea04e3eb03e2c3d59d82e361882711de844068a4
|
|
Avoid segfault for locked accounts (invalid salt to crypt())
|
|
|
|
diff -r ea04e3eb03e2 -r 7bd88d546627 svr-authpasswd.c
|
|
--- a/svr-authpasswd.c Thu Apr 18 23:15:17 2013 +0800
|
|
+++ b/svr-authpasswd.c Mon Apr 29 23:42:37 2013 +0800
|
|
@@ -66,6 +66,14 @@
|
|
m_burn(password, passwordlen);
|
|
m_free(password);
|
|
|
|
+ if (testcrypt == NULL) {
|
|
+ /* crypt() with an invalid salt like "!!" */
|
|
+ dropbear_log(LOG_WARNING, "User account '%s' is locked",
|
|
+ ses.authstate.pw_name);
|
|
+ send_msg_userauth_failure(0, 1);
|
|
+ return;
|
|
+ }
|
|
+
|
|
/* check for empty password */
|
|
if (passwdcrypt[0] == '\0') {
|
|
dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
|
|
|
|
|