The branch, master has been updated
via b3f906f Revert "winbind: Fix 100% loop"
from 5aefea8 python/tests: Add more assertions that we get back the
value we expect
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b3f906f9323f2cfa7d6f16c417e5cca8103f8033
Author: Volker Lendecke <v...@samba.org>
Date: Tue Sep 1 17:13:36 2015 +0200
Revert "winbind: Fix 100% loop"
This reverts commit e551cdb37d3e8cfb155bc33f9b162761c8d60889.
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Tue Sep 1 20:47:50 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/libads/kerberos.c | 16 ----------------
1 file changed, 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 7fe864b..e4bad74 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -48,22 +48,6 @@ kerb_prompter(krb5_context ctx, void *data,
{
if (num_prompts == 0) return 0;
- if ((num_prompts == 2) &&
- (prompts[0].type == KRB5_PROMPT_TYPE_NEW_PASSWORD) &&
- (prompts[1].type == KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN)) {
- /*
- * We don't want to change passwords here. We're
- * called from heimal when the KDC returns
- * KRB5KDC_ERR_KEY_EXPIRED, but at this point we don't
- * have the chance to ask the user for a new
- * password. If we return 0 (i.e. success), we will be
- * spinning in the endless for-loop in
- * change_password() in
- * source4/heimdal/lib/krb5/init_creds_pw.c:526ff
- */
- return KRB5KDC_ERR_KEY_EXPIRED;
- }
-
memset(prompts[0].reply->data, '\0', prompts[0].reply->length);
if (prompts[0].reply->length > 0) {
if (data) {
--
Samba Shared Repository
