From d2426e1eb5d07664b5c26c4247fae3325282d60d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 25 Apr 2012 16:35:40 -0400
Subject: [PATCH] Merge jcrygier's LDAP injection defense and displayname/email retrieval
---
distrib/gitblit.properties | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 9ccd35d..da66212 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -233,6 +233,28 @@
# 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
#
--
Gitblit v1.9.1