Skip to content

Commit 7ef57e2

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/branches/Release01x00@8824 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
1 parent 03cdbe2 commit 7ef57e2

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
@@ -61,15 +61,15 @@ SetHandler cgi-script
6161

6262
# Authentication type (htpasswd file) (comment out this if you configure htpasswd / LDAP support)
6363
AuthUserFile {DataDir}/.htpasswd
64-
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.'
64+
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.'
6565
AuthType Basic
6666

6767
#for htdigest password suport uncomment the following
6868
#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
6969
#AuthDigestFile {DataDir}/.htdigest
7070
# For "Digest" authentication to work properly, this string must match
7171
# the value of configuration variable $authRealm
72-
#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.'
72+
#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.'
7373
#AuthType Digest
7474

7575
#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
@@ -74,7 +74,7 @@ BrowserMatchNoCase ^$ blockAccess
7474

7575
# Password file for Foswiki users
7676
AuthUserFile /var/www/foswiki/data/.htpasswd
77-
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.'
77+
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.'
7878
AuthType Basic
7979

8080
# 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
@@ -435,7 +435,7 @@ $Foswiki::cfg{AuthScripts} = 'attach,edit,manage,rename,save,upload,viewauth,rdi
435435
# Authentication realm. This is
436436
# normally only used in md5 password encoding. You may need to change it
437437
# if you are sharing a password file with another application.
438-
$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.';
438+
$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.';
439439
440440
#---++ User Mapping
441441
# **SELECTCLASS Foswiki::Users::*UserMapping**

0 commit comments

Comments
 (0)