[1643] in Moira
couple of server changes
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Sun Aug 13 02:34:23 2000
Message-Id: <200008130634.CAA11699@riff-raff.mit.edu>
To: moiradev@MIT.EDU
Date: Sun, 13 Aug 2000 02:34:20 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Change setup_dlis() to return MR_IN_USE if a list if the memacl
of another list, and change get_ace_use to return lists that the
argument is the memacl of.
Garry
Index: qsetup.pc
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/server/qsetup.pc,v
retrieving revision 2.38
diff -c -r2.38 qsetup.pc
*** qsetup.pc 2000/07/06 20:29:42 2.38
--- qsetup.pc 2000/08/13 05:57:01
***************
*** 409,414 ****
--- 409,419 ----
if (cnt > 0)
return MR_IN_USE;
+ EXEC SQL SELECT COUNT(name) INTO :cnt FROM list
+ WHERE memacl_id = :id AND memacl_type = 'LIST' AND list_id != :id;
+ if (cnt > 0)
+ return MR_IN_USE;
+
EXEC SQL SELECT COUNT(name) INTO :cnt FROM servers
WHERE acl_id = :id AND acl_type = 'LIST';
if (cnt > 0)
Index: qsupport.pc
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/server/qsupport.pc,v
retrieving revision 2.26
diff -c -r2.26 qsupport.pc
*** qsupport.pc 2000/08/10 02:23:50 2.26
--- qsupport.pc 2000/08/13 06:13:12
***************
*** 784,790 ****
rargv[0] = "LIST";
EXEC SQL DECLARE csr113 CURSOR FOR
SELECT name FROM list
! WHERE acl_type = :type AND acl_id = :id;
if (dbms_errno)
return mr_errcode;
EXEC SQL OPEN csr113;
--- 784,791 ----
rargv[0] = "LIST";
EXEC SQL DECLARE csr113 CURSOR FOR
SELECT name FROM list
! WHERE (acl_type = :type AND acl_id = :id)
! OR (memacl_type = :type AND memacl_id = :id);
if (dbms_errno)
return mr_errcode;
EXEC SQL OPEN csr113;
