diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-02-17 17:09:35 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-02-17 17:09:35 +0000 |
| commit | 5f5f67e0abfe38d88c7235b4e0cc0d0b4fe7bbfb (patch) | |
| tree | 408e4465bf1c0235c300dcdc01880f1c0f2fcb9f /src/lib/krb5/os | |
| parent | 91fc077c96926dd60097a413ca37ebd3a70155c1 (diff) | |
| download | krb5-5f5f67e0abfe38d88c7235b4e0cc0d0b4fe7bbfb.tar.gz krb5-5f5f67e0abfe38d88c7235b4e0cc0d0b4fe7bbfb.tar.xz krb5-5f5f67e0abfe38d88c7235b4e0cc0d0b4fe7bbfb.zip | |
In krb5_kuserok, just try opening .k5login; don't check ahead of time
whether it looks accessible. Also rewrite the construction of the
.k5login filename to use snprintf instead of strnpy/strncat.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22010 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/os')
| -rw-r--r-- | src/lib/krb5/os/kuserok.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c index 719faaebee..489b24791e 100644 --- a/src/lib/krb5/os/kuserok.c +++ b/src/lib/krb5/os/kuserok.c @@ -79,22 +79,24 @@ krb5_kuserok(krb5_context context, krb5_principal principal, const char *luser) char linebuf[BUFSIZ]; char *newline; int gobble; - - /* no account => no access */ char pwbuf[BUFSIZ]; struct passwd pwx; + int result; + + /* no account => no access */ if (k5_getpwnam_r(luser, &pwx, pwbuf, sizeof(pwbuf), &pwd) != 0) return(FALSE); - (void) strncpy(pbuf, pwd->pw_dir, sizeof(pbuf) - 1); - pbuf[sizeof(pbuf) - 1] = '\0'; - (void) strncat(pbuf, "/.k5login", sizeof(pbuf) - 1 - strlen(pbuf)); + result = snprintf(pbuf, sizeof(pbuf), "%s/.k5login", pwd->pw_dir); + if (SNPRINTF_OVERFLOW(result, sizeof(pbuf))) + return(FALSE); - if (access(pbuf, F_OK)) { /* not accessible */ + fp = fopen(pbuf, "r"); + if (!fp) { /* - * if he's trying to log in as himself, and there is no .k5login file, - * let him. To find out, call + * If he's trying to log in as himself, and there is no + * readable .k5login file, let him. To find out, call * krb5_aname_to_localname to convert the principal to a name - * which we can string compare. + * which we can string compare. */ if (!(krb5_aname_to_localname(context, principal, sizeof(kuser), kuser)) |