mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
Don't use getlogin() to determine whether we are root.
(Import of vendor fix.)
This commit is contained in:
parent
adb0ddaeac
commit
5a83b025a9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/vendor-crypto/heimdal/dist/; revision=89402
|
@ -138,7 +138,11 @@ krb5_verify(struct passwd *login_info, struct passwd *su_info,
|
||||||
#ifdef KRB5
|
#ifdef KRB5
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
krb5_principal p;
|
krb5_principal p;
|
||||||
|
char *login_name = NULL;
|
||||||
|
|
||||||
|
#if defined(HAVE_GETLOGIN) && !defined(POSIX_GETLOGIN)
|
||||||
|
login_name = getlogin();
|
||||||
|
#endif
|
||||||
ret = krb5_init_context (&context);
|
ret = krb5_init_context (&context);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -147,9 +151,11 @@ krb5_verify(struct passwd *login_info, struct passwd *su_info,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (login_name == NULL || strcmp (login_name, "root") == 0)
|
||||||
|
login_name = login_info->pw_name;
|
||||||
if (strcmp (su_info->pw_name, "root") == 0)
|
if (strcmp (su_info->pw_name, "root") == 0)
|
||||||
ret = krb5_make_principal(context, &p, NULL,
|
ret = krb5_make_principal(context, &p, NULL,
|
||||||
login_info->pw_name,
|
login_name,
|
||||||
kerberos_instance,
|
kerberos_instance,
|
||||||
NULL);
|
NULL);
|
||||||
else
|
else
|
||||||
|
@ -268,7 +274,6 @@ main(int argc, char **argv)
|
||||||
int i, optind = 0;
|
int i, optind = 0;
|
||||||
char *su_user;
|
char *su_user;
|
||||||
struct passwd *su_info;
|
struct passwd *su_info;
|
||||||
char *login_user = NULL;
|
|
||||||
struct passwd *login_info;
|
struct passwd *login_info;
|
||||||
|
|
||||||
struct passwd *pwd;
|
struct passwd *pwd;
|
||||||
|
@ -309,10 +314,6 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
su_info = make_info(pwd);
|
su_info = make_info(pwd);
|
||||||
|
|
||||||
#if defined(HAVE_GETLOGIN) && !defined(POSIX_GETLOGIN)
|
|
||||||
login_user = getlogin();
|
|
||||||
#endif
|
|
||||||
if(login_user == NULL || (pwd = getpwnam(login_user)) == NULL)
|
|
||||||
pwd = getpwuid(getuid());
|
pwd = getpwuid(getuid());
|
||||||
if(pwd == NULL)
|
if(pwd == NULL)
|
||||||
errx(1, "who are you?");
|
errx(1, "who are you?");
|
||||||
|
|
Loading…
Reference in a new issue