diff options
| author | Volker Lendecke <vl@samba.org> | 2015-09-01 17:13:36 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-09-01 20:47:50 +0200 |
| commit | b3f906f9323f2cfa7d6f16c417e5cca8103f8033 (patch) | |
| tree | 458bcf996f995827cc145f893aaa96d485b222d0 /source3/libads | |
| parent | 5aefea842528d053b86b50ff2ed9047db1ca4594 (diff) | |
| download | samba-b3f906f9323f2cfa7d6f16c417e5cca8103f8033.tar.gz | |
Revert "winbind: Fix 100% loop"
This reverts commit e551cdb37d3e8cfb155bc33f9b162761c8d60889.
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Sep 1 20:47:50 CEST 2015 on sn-devel-104
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/kerberos.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 7fe864bf96e..e4bad749286 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) { |