From 696f2ec67b049639abf04905255a7d6173dbb19e Mon Sep 17 00:00:00 2001 From: Jan Iven Date: Tue, 1 Sep 2020 14:51:25 +0200 Subject: [PATCH] ptserver: Remove duplicate ubik_SetLock in listSuperGroups It looks like a call to ubik_SetLock(.. LOCKREAD) was left in place in listSuperGroups after locking was moved to ReadPreamble in commit a6d64d70 (ptserver: Refactor per-call ubik initialisation) When compiled with 'supergroups', and once contacted by "pts mem -expandgroups ..", ptserver will therefore abort() with Ubik: Internal Error: attempted to take lock twice This patch removes the superfluous ubik_SetLock. FIXES 135147 Change-Id: I8779710a6d68e4126fc482123b576690d86e4225 Reviewed-on: https://gerrit.openafs.org/14338 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk --- src/ptserver/ptprocs.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index f663b221dc..5eb1ac7fec 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -1787,10 +1787,6 @@ listSuperGroups(struct rx_call *call, afs_int32 aid, prlist *alist, if (!pr_noAuth && restrict_anonymous && *cid == ANONYMOUSID) ABORT_WITH(tt, PRPERM); - code = ubik_SetLock(tt, 1, 1, LOCKREAD); - if (code) - ABORT_WITH(tt, code); - temp = FindByID(tt, aid); if (!temp) ABORT_WITH(tt, PRNOENT);