ud-useradd: Properly encode realname in subjects and to header lines regardless of...

[mirror/userdir-ldap.git] / templates / welcome-message-60000

diff --git a/templates/welcome-message-60000 b/templates/welcome-message-60000
index 5a0ab5d..e056189 100644 (file)
--- a/templates/welcome-message-60000
+++ b/templates/welcome-message-60000
@@ -1,8 +1,8 @@
-To: "__REALNAME__" <__EMAIL__>
+To: "__ENCODED_REALNAME__" <__EMAIL__>

 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

-Subject: Debian Guest Account for __REALNAME__
+Subject: Debian Guest Account for __ENCODED_REALNAME__

 Cc: debian-admin@lists.debian.org
 Reply-To: debian-admin@lists.debian.org
 Date: __DATE__
 Cc: debian-admin@lists.debian.org
 Reply-To: debian-admin@lists.debian.org
 Date: __DATE__


@@ -24,16 +24,18 @@ debian-admin@lists.debian.org.  Please note that not all software is
 available on all architectures.  The chroot environments can be
 entered with the 'dchroot' command.
 
 available on all architectures.  The chroot environments can be
 entered with the 'dchroot' command.
 

-You should use ssh to log into the machines instead of regular telnet
-or rlogin. Our LDAP directory is able to share ssh RSA keys among machines,
-please see <URL:http://db.debian.org/doc-mail.html> Otherwise when you
-first login a ~/.ssh directory will be created with the appropriate
-permissions. Please be aware of the security implications of using RSA
-authentication and ssh agents.
+You should use ssh to log into the machines. See the host details on
+db.debian.org for the ssh hostkey fingerprints for the servers you
+access.  Our LDAP directory is able to share ssh RSA keys among
+machines, please see <URL:http://db.debian.org/doc-mail.html>. Please be
+aware of the security implications of using RSA authentication and ssh
+agents.

 
 After a short while of inactivity this account will be expired. This account
 is only to be used to help porting/improving free software.
 
 
 After a short while of inactivity this account will be expired. This account
 is only to be used to help porting/improving free software.
 

+Please note while technically there is a __LOGIN__@debian.org address
+associated with this account we very much expect you to not use it.  Thanks.

 -- 
 Debian Administration
 
 -- 
 Debian Administration