Commit 7f1c69b2 authored by Niels Möller's avatar Niels Möller

* src/unix_user.c: Don't make use kerberos_check_pw conditional on

WITH_KERBEROS, as it really isn't very kerberos specific.
* src/lshd.c (main_options): Likewise.

Rev: src/lshd.c:1.98
Rev: src/unix_user.c:1.26
parent f8b35f4f
......@@ -299,14 +299,12 @@ main_options[] =
{ "no-root-login", OPT_NO_ROOT_LOGIN, NULL, 0,
"Don't allow root to login (default).", 0 },
#if WITH_KERBEROS
{ "kerberos-passwords", OPT_KERBEROS_PASSWD, "Program", OPTION_ARG_OPTIONAL,
"Recognize kerberos passwords. The optional argument is the path to the "
"helper program, by default \"" KERBEROS_HELPER "\". This option is "
"experimental.", 0 },
{ "no-kerberos-passwords", OPT_NO_KERBEROS_PASSWD, NULL, 0,
"Don't recognize kerberos passwords (default behaviour)." },
#endif
{ NULL, 0, NULL, 0, "Offered services:", 0 },
......
......@@ -243,7 +243,6 @@ make_process_resource(pid_t pid, int signal)
(shell string))) */
#if WITH_KERBEROS
static int
kerberos_check_pw(const char *helper, struct unix_user *user, struct lsh_string *pw)
{
......@@ -330,7 +329,6 @@ kerberos_check_pw(const char *helper, struct unix_user *user, struct lsh_string
}
}
}
#endif
/* NOTE: Calls functions using the *ugly* convention of returning
* pointers to static buffers. */
......@@ -342,7 +340,6 @@ do_verify_password(struct lsh_user *s,
CAST(unix_user, user, s);
char *salt;
#if WITH_KERBEROS
if (user->pw_helper && kerberos_check_pw(user->pw_helper, user, password))
{
if (free)
......@@ -350,7 +347,6 @@ do_verify_password(struct lsh_user *s,
return 1;
}
#endif /* WITH_KERBEROS */
/* NOTE: We don't allow login to accounts with empty passwords. */
if (!user->passwd || (user->passwd->length < 2) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment