Skip to content

Commit f2c7700

Browse files
SvenDowideitSvenDowideit
authored andcommitted
Item9593: realm settings in Foswiki.spec and example apache conf need to match - else digest auth is doomed to have hard to work out issues.
git-svn-id: http://svn.foswiki.org/trunk@8823 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
1 parent da4ec9f commit f2c7700

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

core/bin/.htaccess.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ SetHandler cgi-script
6868

6969
# Authentication type (htpasswd file) (comment out this if you configure htpasswd / LDAP support)
7070
AuthUserFile {DataDir}/.htpasswd
71-
AuthName 'Enter your WikiName: (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.'
71+
AuthName 'Enter your WikiName (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.'
7272
AuthType Basic
7373

7474
#for htdigest password suport uncomment the following
7575
#AuthDigestDomain {DefaultUrlHost}{ScriptUrlPath}/viewauth {DefaultUrlHost}{ScriptUrlPath}/edit {DefaultUrlHost}{ScriptUrlPath}/preview {DefaultUrlHost}{ScriptUrlPath}/save {DefaultUrlHost}{ScriptUrlPath}/attach {DefaultUrlHost}{ScriptUrlPath}/upload {DefaultUrlHost}{ScriptUrlPath}/rename {DefaultUrlHost}{ScriptUrlPath}/manage {DefaultUrlHost}{ScriptUrlPath}/installpasswd {DefaultUrlHost}{ScriptUrlPath}/passwd
7676
#AuthDigestFile {DataDir}/.htdigest
7777
# For "Digest" authentication to work properly, this string must match
7878
# the value of configuration variable $authRealm
79-
#AuthName 'Enter your WikiName. (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.'
79+
#AuthName 'Enter your WikiName (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.'
8080
#AuthType Digest
8181

8282
#for LDAP password support uncomment the following (and fix up the paths)

core/foswiki_httpd_conf.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ BrowserMatch "^gsa-crawler" NO_FOSWIKI_SESSION
8484

8585
# Password file for Foswiki users
8686
AuthUserFile /var/www/foswiki/data/.htpasswd
87-
AuthName 'Enter your WikiName: (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.'
87+
AuthName 'Enter your WikiName (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.'
8888
AuthType Basic
8989

9090
# File to return on access control error (e.g. wrong password)

core/lib/Foswiki.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ $Foswiki::cfg{UsersTopicName} = 'WikiUsers';
376376
# Authentication realm. This is
377377
# normally only used in md5 password encoding. You may need to change it
378378
# if you are sharing a password file with another application.
379-
$Foswiki::cfg{AuthRealm} = 'Enter your $Foswiki::cfg{SystemWebName}.LoginName. (Typically First name and last name, no space, no dots, capitalized, e.g. !JohnSmith, unless you chose otherwise). Visit $Foswiki::cfg{SystemWebName}.UserRegistration if you do not have one.';
379+
$Foswiki::cfg{AuthRealm} = 'Enter your WikiName (First name and last name, no space, no dots, capitalized, e.g. JohnSmith). Cancel to register if you do not have one.';
380380
381381
# **SELECTCLASS Foswiki::Users::*UserMapping**
382382
# The user mapping is used to equate login names, used with external

0 commit comments

Comments
 (0)