From 7e0ce40e79a193426e8f7b6f22407422634dafe3 Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Wed, 25 Apr 2012 07:37:52 -0500
Subject: Add logic to get display name & email (Simply stored in user model
 for now). Add code / test to defend against LDAP injection attacks.

---
 distrib/gitblit.properties | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'distrib/gitblit.properties')

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 527b7268..62222d4e 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -221,6 +221,28 @@ realm.ldap.groupMemberPattern = (&(objectClass=group)(member=${dn}))
 # SINCE 1.0.0
 realm.ldap.admins= @Git_Admins
 
+# Attribute(s) on the USER record that indicate their display (or full) name. Leave blank
+# for no mapping available in LDAP
+#
+# This may be a single attribute, or a string of multiple attributes.  Examples:
+#  displayName - Uses the attribute 'displayName' on the user record
+#  ${personalTitle}. ${givenName} ${surname} - Will concatenate the 3 
+#       attributes together, with a '.' after personalTitle 
+#
+# SINCE 1.0.0
+realm.ldap.displayName= displayName
+
+# Attribute(s) on the USER record that indicate their email address.  Leave blank
+# for no mapping available in LDAP
+#
+# This may be a single attribute, or a string of multiple attributes.  Examples:
+#  email - Uses the attribute 'email' on the user record
+#  ${givenName}.${surname}@gitblit.com -Will concatenate the 2 attributes
+#       together with a '.' and '@' creating something like first.last@gitblit.com 
+#
+# SINCE 1.0.0
+realm.ldap.email = email
+
 #
 # Gitblit Web Settings
 #
-- 
cgit v1.2.3