merge strcpy_truncate branch
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5027 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -58,7 +58,7 @@ afs_verify(char *name,
|
||||
int quiet)
|
||||
{
|
||||
int ret = 1;
|
||||
char lrealm[REALM_SZ + 1];
|
||||
char lrealm[REALM_SZ];
|
||||
char tkt_string[MaxPathLen];
|
||||
struct passwd *pwd;
|
||||
|
||||
|
@@ -150,10 +150,10 @@ auth_su(pam_handle_t *pamh, int flags, char *user, struct pam_conv *conv)
|
||||
|
||||
pw = getpwuid(getuid());
|
||||
if(strcmp(user, "root") == 0){
|
||||
strcpy(pr.name, pw->pw_name);
|
||||
strcpy(pr.instance, "root");
|
||||
strcpy_truncate(pr.name, pw->pw_name, sizeof(pr.name));
|
||||
strcpy_truncate(pr.instance, "root", sizeof(pr.instance));
|
||||
}else{
|
||||
strcpy(pr.name, user);
|
||||
strcpy_truncate(pr.name, user, sizeof(pr.name));
|
||||
pr.instance[0] = 0;
|
||||
}
|
||||
pmsg = &msg;
|
||||
|
@@ -363,8 +363,12 @@ siad_ses_suauthent(sia_collect_func_t *collect,
|
||||
return SIADFAIL;
|
||||
if(entity->name == NULL)
|
||||
return SIADFAIL;
|
||||
if(entity->name[0] == 0)
|
||||
strcpy(entity->name, "root");
|
||||
if(entity->name[0] == 0) {
|
||||
free(entity->name);
|
||||
entity->name = strdup("root");
|
||||
if (entity->name == NULL)
|
||||
return SIADFAIL;
|
||||
}
|
||||
return common_auth(collect, entity, siastat, pkgind);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user