From 8bc49f8f86f125698f060c24ff697d6a4a350c6c Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sat, 9 Mar 1996 08:03:15 +0000
Subject: [PATCH] (mail-get-names): Understand "+username" format for
 /etc/passwd lines.

---
 lisp/mail/mailalias.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index e9890c9e721..ba884e75ab0 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -334,10 +334,14 @@ Consults `/etc/passwd' and a directory service if one is set up via
 	(insert-file-contents "/etc/passwd" nil nil nil t)
 	(setq mail-local-names)
 	(while (not (eobp))
-	  (setq mail-local-names
-		`((,(buffer-substring (point)
-				      (1- (search-forward ":"))))
-		  ,@mail-local-names))
+	  ;;Recognize lines like
+	  ;;  nobody:*:65534:65534::/:
+	  ;;  +demo::::::/bin/csh
+	  ;;  +ethanb
+	  ;;while skipping
+	  ;;  +@SOFTWARE
+	  (if (looking-at "\\+?\\([^:@\n+]+\\)")
+	      (add-to-list 'mail-local-names (list (match-string 1))))
 	  (beginning-of-line 2))
 	(kill-buffer (current-buffer))))
   (if (or (eq mail-names t)
-- 
2.39.2