svn commit: r1796426 - /subversion/trunk/subversion/svnadmin/svnadmin.c

[da...@apache.org]

Author: danielsh
Date: Sat May 27 16:02:46 2017
New Revision: 1796426

URL: http://svn.apache.org/viewvc?rev=1796426&view=rev
Log:
Fix a would-be race condition.

* subversion/svnadmin/svnadmin.c
  (subcommand_rmlocks): Don't pass the lock token, since it may no longer
    be valid if another process has unlocked (and possibly re-locked),
    and in any case it is superfluous since FORCE is TRUE.

Modified:
    subversion/trunk/subversion/svnadmin/svnadmin.c

Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1796426&r1=1796425&r2=1796426&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Sat May 27 16:02:46 2017
@@ -2492,7 +2492,7 @@ subcommand_rmlocks(apr_getopt_t *os, voi
 
       /* Now forcibly destroy the lock. */
       err = svn_fs_unlock(fs, lock_path_utf8,
-                          lock->token, 1 /* force */, subpool);
+                          NULL, 1 /* force */, subpool);
       if (err)
         goto move_on;