oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Don't use getlogin() to determine whether we are root.

Browse Source 
Patch by joda.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10808 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Jacques A. Vidrine
2002-01-09 19:43:19 +00:00
parent 1f3228f15e
commit a574aa640b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/su/ChangeLog
View File

@@ -1,3 +1,7 @@
2002-01-09 Jacques Vidrine <n@nectar.cc>
* su.c: Don't use getlogin() to determine whether we are root.
Patch by joda.
2001-06-12 Assar Westerlund <assar@sics.se> 2001-06-12 Assar Westerlund <assar@sics.se>
* su.c: check memory allocations. add some const * su.c: check memory allocations. add some const

13
appl/su/su.c
View File

@@ -152,7 +152,11 @@ krb5_verify(const struct passwd *login_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
@@ -161,9 +165,11 @@ krb5_verify(const struct passwd *login_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
@@ -282,7 +288,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;
@@ -325,10 +330,6 @@ main(int argc, char **argv)
if (su_info == NULL) if (su_info == NULL)
errx (1, "malloc: out of memory"); errx (1, "malloc: out of memory");
#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?");