(verify): move ret to where it's used
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11642 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -618,8 +618,6 @@ verify_krb5(const char *password)
|
|||||||
static int
|
static int
|
||||||
verify(char *password)
|
verify(char *password)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* First try with root password, if allowed.
|
* First try with root password, if allowed.
|
||||||
*/
|
*/
|
||||||
@@ -664,19 +662,22 @@ verify(char *password)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
/*
|
{
|
||||||
* Try to verify as user with kerberos 4.
|
int ret;
|
||||||
*/
|
/*
|
||||||
ret = krb_verify_user(name, inst, realm, password,
|
* Try to verify as user with kerberos 4.
|
||||||
KRB_VERIFY_NOT_SECURE, NULL);
|
*/
|
||||||
if (ret == KSUCCESS){
|
ret = krb_verify_user(name, inst, realm, password,
|
||||||
if (k_hasafs())
|
KRB_VERIFY_NOT_SECURE, NULL);
|
||||||
krb_afslog(NULL, NULL);
|
if (ret == KSUCCESS){
|
||||||
return 0;
|
if (k_hasafs())
|
||||||
|
krb_afslog(NULL, NULL);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (ret != INTK_BADPW)
|
||||||
|
warnx ("warning: %s",
|
||||||
|
(ret < 0) ? strerror(ret) : krb_get_err_text(ret));
|
||||||
}
|
}
|
||||||
if (ret != INTK_BADPW)
|
|
||||||
warnx ("warning: %s",
|
|
||||||
(ret < 0) ? strerror(ret) : krb_get_err_text(ret));
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
Reference in New Issue
Block a user