99 *
1010 *
1111 * IDENTIFICATION
12- * $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.14 2002/07/2920:45 :44 tgl Exp $
12+ * $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.15 2002/07/2923:44 :44 tgl Exp $
1313 *
1414 * DESCRIPTION
1515 * These routines take the parse tree and pick out the
4747#include "parser/parse_func.h"
4848#include "parser/parse_type.h"
4949#include "utils/acl.h"
50+ #include "utils/builtins.h"
5051#include "utils/fmgroids.h"
5152#include "utils/lsyscache.h"
5253#include "utils/syscache.h"
@@ -633,10 +634,14 @@ CreateCast(CreateCastStmt *stmt)
633634
634635if (stmt -> func != NULL )
635636{
636- funcid = LookupFuncNameTypeNames (stmt -> func -> funcname ,stmt -> func -> funcargs , false,"CreateCast" );
637+ funcid = LookupFuncNameTypeNames (stmt -> func -> funcname ,
638+ stmt -> func -> funcargs ,
639+ false,
640+ "CreateCast" );
637641
638- if (!pg_proc_ownercheck (funcid ,GetUserId ()))
639- elog (ERROR ,"permission denied" );
642+ if (!pg_proc_ownercheck (funcid ,GetUserId ()))
643+ aclcheck_error (ACLCHECK_NOT_OWNER ,
644+ NameListToString (stmt -> func -> funcname ));
640645
641646tuple = SearchSysCache (PROCOID ,ObjectIdGetDatum (funcid ),0 ,0 ,0 );
642647if (!HeapTupleIsValid (tuple ))
@@ -661,10 +666,13 @@ CreateCast(CreateCastStmt *stmt)
661666else
662667{
663668/* indicates binary compatibility */
664- if (!pg_type_ownercheck (sourcetypeid ,GetUserId ())
665- || !pg_type_ownercheck (targettypeid ,GetUserId ()))
666- elog (ERROR ,"permission denied" );
667- funcid = 0 ;
669+ if (!pg_type_ownercheck (sourcetypeid ,GetUserId ()))
670+ aclcheck_error (ACLCHECK_NOT_OWNER ,
671+ TypeNameToString (stmt -> sourcetype ));
672+ if (!pg_type_ownercheck (targettypeid ,GetUserId ()))
673+ aclcheck_error (ACLCHECK_NOT_OWNER ,
674+ TypeNameToString (stmt -> targettype ));
675+ funcid = InvalidOid ;
668676}
669677
670678/* ready to go */
@@ -754,14 +762,18 @@ DropCast(DropCastStmt *stmt)
754762caststruct = (Form_pg_cast )GETSTRUCT (tuple );
755763if (caststruct -> castfunc != InvalidOid )
756764{
757- if (!pg_proc_ownercheck (caststruct -> castfunc ,GetUserId ()))
758- elog (ERROR ,"permission denied" );
765+ if (!pg_proc_ownercheck (caststruct -> castfunc ,GetUserId ()))
766+ aclcheck_error (ACLCHECK_NOT_OWNER ,
767+ get_func_name (caststruct -> castfunc ));
759768}
760769else
761770{
762- if (!pg_type_ownercheck (sourcetypeid ,GetUserId ())
763- || !pg_type_ownercheck (targettypeid ,GetUserId ()))
764- elog (ERROR ,"permission denied" );
771+ if (!pg_type_ownercheck (sourcetypeid ,GetUserId ()))
772+ aclcheck_error (ACLCHECK_NOT_OWNER ,
773+ format_type_be (sourcetypeid ));
774+ if (!pg_type_ownercheck (targettypeid ,GetUserId ()))
775+ aclcheck_error (ACLCHECK_NOT_OWNER ,
776+ format_type_be (targettypeid ));
765777}
766778
767779/*