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

Some more cleanup.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1647 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-05-03 15:13:35 +00:00
parent 33a79e08f8
commit 69628fb3f4
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/auth/sia/sia.c
View File

@@ -58,14 +58,16 @@ static int
posix_getpwnam_r(const char *name, struct passwd *pwd, posix_getpwnam_r(const char *name, struct passwd *pwd,
char *buffer, int len, struct passwd **result) char *buffer, int len, struct passwd **result)
{ {
int save_errno = errno;
int ret = getpwnam_r(name, pwd, buffer, len); int ret = getpwnam_r(name, pwd, buffer, len);
if(ret < 0){ if(ret == 0)
ret = errno;
errno = save_errno;
*result = NULL;
}else{
*result = pwd; *result = pwd;
else{
*result = NULL;
ret = _Geterrno();
if(ret == 0){
ret = ERANGE;
_Seterrno(ret);
}
} }
return ret; return ret;
} }
@@ -76,14 +78,16 @@ static int
posix_getpwuid_r(uid_t uid, struct passwd *pwd, posix_getpwuid_r(uid_t uid, struct passwd *pwd,
char *buffer, int len, struct passwd **result) char *buffer, int len, struct passwd **result)
{ {
int save_errno = errno;
int ret = getpwuid_r(uid, pwd, buffer, len); int ret = getpwuid_r(uid, pwd, buffer, len);
if(ret < 0){ if(ret == 0)
ret = errno;
errno = save_errno;
*result = NULL;
}else{
*result = pwd; *result = pwd;
else{
*result = NULL;
ret = _Geterrno();
if(ret == 0){
ret = ERANGE;
_Seterrno(ret);
}
} }
return ret; return ret;
} }
@@ -156,6 +160,8 @@ common_auth(sia_collect_func_t *collect,
int pkgind) int pkgind)
{ {
prompt_t prompts[2], *pr; prompt_t prompts[2], *pr;
char *toname, *toinst;
if((siastat == SIADSUCCESS) && (geteuid() == 0)) if((siastat == SIADSUCCESS) && (geteuid() == 0))
return SIADSUCCESS; return SIADSUCCESS;
if(entity == NULL) if(entity == NULL)
@@ -196,23 +202,23 @@ common_auth(sia_collect_func_t *collect,
{ {
char realm[REALM_SZ]; char realm[REALM_SZ];
int ret; int ret;
struct passwd pw, *pwd, fpw, *fpwd; struct passwd pw, *pwd;
char *toname, *toinst; char pwbuf[1024];
char pwbuf[1024], fpwbuf[1024];
struct state *s = (struct state*)entity->mech[pkgind]; struct state *s = (struct state*)entity->mech[pkgind];
if(getpwnam_r(entity->name, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) if(getpwnam_r(entity->name, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0)
return SIADFAIL; return SIADFAIL;
if(getpwuid_r(getuid(), &fpw, fpwbuf, sizeof(fpwbuf), &fpwd) != 0)
return SIADFAIL;
snprintf(s->ticket, sizeof(s->ticket), snprintf(s->ticket, sizeof(s->ticket),
TKT_ROOT "%u_%u", (unsigned)pwd->pw_uid, (unsigned)getpid()); TKT_ROOT "%u_%u", (unsigned)pwd->pw_uid, (unsigned)getpid());
krb_get_lrealm(realm, 1); krb_get_lrealm(realm, 1);
toname = entity->name; toname = entity->name;
toinst = ""; toinst = "";
if(entity->authtype == SIA_A_SUAUTH){ if(entity->authtype == SIA_A_SUAUTH){
struct passwd fpw, *fpwd;
char fpwbuf[1024];
if(getpwuid_r(getuid(), &fpw, fpwbuf, sizeof(fpwbuf), &fpwd) != 0)
return SIADFAIL;
snprintf(s->ticket, sizeof(s->ticket), TKT_ROOT "_%s_to_%s_%d", snprintf(s->ticket, sizeof(s->ticket), TKT_ROOT "_%s_to_%s_%d",
fpwd->pw_name, pwd->pw_name, getpid()); fpwd->pw_name, pwd->pw_name, getpid());
if(strcmp(pwd->pw_name, "root") == 0){ if(strcmp(pwd->pw_name, "root") == 0){