wok-undigest rev 548
busybox/httpd: fix pam failure case (again)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Nov 06 21:21:32 2011 +0100 (2011-11-06) |
| parents | b162a1ec67de |
| children | c4b222e32324 |
| files | busybox/stuff/busybox-1.19-httpd.u |
line diff
1.1 --- a/busybox/stuff/busybox-1.19-httpd.u Sun Nov 06 21:16:59 2011 +0100 1.2 +++ b/busybox/stuff/busybox-1.19-httpd.u Sun Nov 06 21:21:32 2011 +0100 1.3 @@ -123,7 +123,7 @@ 1.4 + if (cur->after_colon[0] != '*' && 1.5 + strncmp(username,cur->after_colon,user_len_p1 - 1) != 0) 1.6 + continue; 1.7 -+ r = pam_start("httpd", username, &conv_info, &pamh) != PAM_SUCCESS 1.8 ++ r = pam_start("httpd", username, &conv_info, &pamh) != PAM_SUCCESS; 1.9 + if (r == 0) { 1.10 + r = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK) != PAM_SUCCESS 1.11 + || pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK) != PAM_SUCCESS;