summaryrefslogtreecommitdiffstats
path: root/src/main/distrib/data
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2015-10-05 08:12:43 -0400
committerJames Moger <james.moger@gitblit.com>2015-10-05 08:12:43 -0400
commit4e54686d9346dc33a1cffd4a06c5c4ff9945f25e (patch)
tree15345c9c555471fcacbe228fc26bac3e1c756a9e /src/main/distrib/data
parent1c261bd5fbe8f4750f17678f85f98cf101439b71 (diff)
parentbe49ef9b1b2ab0ee251085efd5930b6f99bbced9 (diff)
downloadgitblit-4e54686d9346dc33a1cffd4a06c5c4ff9945f25e.tar.gz
gitblit-4e54686d9346dc33a1cffd4a06c5c4ff9945f25e.zip
Merge branch 'topic/pr-934' into develop
Diffstat (limited to 'src/main/distrib/data')
-rw-r--r--src/main/distrib/data/defaults.properties6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index f88407f4..4606f5fc 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -154,6 +154,12 @@ git.sshKrb5Keytab =
# SINCE 1.7.0
git.sshKrb5ServicePrincipalName =
+# Strip the domain suffix from a kerberos username.
+# e.g. james@bigbox would be "james"
+#
+# SINCE 1.7.0
+git.sshKrb5StripDomain = true
+
# SSH backend NIO2|MINA.
#
# The Apache Mina project recommends using the NIO2 backend.