mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aclitemout() shouldn't coredump when it finds an ACL item

Browse Source 
for a now-vanished group.  Instead, display the numeric group ID, same
as it does for vanished users.
This commit is contained in:
Tom Lane 2000-11-28 23:42:31 +00:00
parent c715fdea26
commit 175f52083b
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/catalog/aclchk.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.43 2000/11/16 22:30:17 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.44 2000/11/28 23:42:31 tgl Exp $
* *
* NOTES * NOTES
* See acl.h. * See acl.h.
@ -172,6 +172,9 @@ get_grosysid(char *groname)
return id; return id;
} }
/*
* Convert group ID to name, or return NULL if group can't be found
*/
char * char *
get_groname(AclId grosysid) get_groname(AclId grosysid)
{ {
@ -186,8 +189,6 @@ get_groname(AclId grosysid)
name = pstrdup(NameStr(((Form_pg_group) GETSTRUCT(tuple))->groname)); name = pstrdup(NameStr(((Form_pg_group) GETSTRUCT(tuple))->groname));
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
} }
else
elog(NOTICE, "get_groname: group %u not found", grosysid);
return name; return name;
} }

31
src/backend/utils/adt/acl.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.53 2000/11/16 22:30:31 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.54 2000/11/28 23:42:31 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -276,7 +276,14 @@ aclitemout(PG_FUNCTION_ARGS)
htup = SearchSysCache(SHADOWSYSID, htup = SearchSysCache(SHADOWSYSID,
ObjectIdGetDatum(aip->ai_id), ObjectIdGetDatum(aip->ai_id),
0, 0, 0); 0, 0, 0);
if (!HeapTupleIsValid(htup)) if (HeapTupleIsValid(htup))
{
strncat(p,
NameStr(((Form_pg_shadow) GETSTRUCT(htup))->usename),
NAMEDATALEN);
ReleaseSysCache(htup);
}
else
{ {
/* Generate numeric UID if we don't find an entry */ /* Generate numeric UID if we don't find an entry */
char *tmp; char *tmp;
@ -286,18 +293,22 @@ aclitemout(PG_FUNCTION_ARGS)
strcat(p, tmp); strcat(p, tmp);
pfree(tmp); pfree(tmp);
} }
else
{
strncat(p, (char *) &((Form_pg_shadow)
GETSTRUCT(htup))->usename,
sizeof(NameData));
ReleaseSysCache(htup);
}
break; break;
case ACL_IDTYPE_GID: case ACL_IDTYPE_GID:
strcat(p, "group "); strcat(p, "group ");
tmpname = get_groname(aip->ai_id); tmpname = get_groname(aip->ai_id);
strncat(p, tmpname, NAMEDATALEN); if (tmpname != NULL)
strncat(p, tmpname, NAMEDATALEN);
else
{
/* Generate numeric GID if we don't find an entry */
char *tmp;
tmp = DatumGetCString(DirectFunctionCall1(int4out,
Int32GetDatum((int32) aip->ai_id)));
strcat(p, tmp);
pfree(tmp);
}
break; break;
case ACL_IDTYPE_WORLD: case ACL_IDTYPE_WORLD:
break; break;