(current_lock_owner): Allow for @ sign in username.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 008234b559a..f3829dcfd55 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-23  Jason Rumney  <jasonr@gnu.org>
+
+        * filelock.c (current_lock_owner): Allow for @ sign in username.
+
 2007-07-20  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (clean): Don't delete *~.
diff --git a/src/filelock.c b/src/filelock.c
index 689a80a4209..d654964e0fa 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -468,8 +468,8 @@ current_lock_owner (owner, lfname)
     }
 
   /* Parse USER@HOST.PID:BOOT_TIME.  If can't parse, return -1.  */
-  /* The USER is everything before the first @.  */
-  at = index (lfinfo, '@');
+  /* The USER is everything before the last @.  */
+  at = rindex (lfinfo, '@');
   dot = rindex (lfinfo, '.');
   if (!at || !dot)
     {