diff options
| author | Melanie | 2011-10-25 03:26:09 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:26:09 +0100 |
| commit | 4e9457ca0c8669a0d47341c651d5f439fda1eb8d (patch) | |
| tree | 002620738b62275e4dca20a56b701b5ac8b7642d /bin | |
| parent | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge (diff) | |
| parent | Add optional getauthinfo and setauthinfo authentication service calls. (diff) | |
| download | opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.zip opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.gz opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.bz2 opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.xz | |
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 8 | ||||
| -rw-r--r-- | bin/Robust.ini.example | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index aed1d33..a23063d 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -146,6 +146,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 146 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 146 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
| 147 | ; Realm = "useraccounts" | 147 | ; Realm = "useraccounts" |
| 148 | 148 | ||
| 149 | ;; Allow the service to process HTTP getauthinfo calls. | ||
| 150 | ;; Default is false. | ||
| 151 | ; AllowGetAuthInfo = false | ||
| 152 | |||
| 153 | ;; Allow the service to process HTTP setauthinfo calls. | ||
| 154 | ;; Default is false. | ||
| 155 | ; AllowSetAuthInfo = false | ||
| 156 | |||
| 149 | ;; Allow the service to process HTTP setpassword calls. | 157 | ;; Allow the service to process HTTP setpassword calls. |
| 150 | ;; Default is false. | 158 | ;; Default is false. |
| 151 | ; AllowSetPassword = false | 159 | ; AllowSetPassword = false |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 522cc56..897cfde 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -129,6 +129,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 129 | ; for the server connector | 129 | ; for the server connector |
| 130 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 130 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
| 131 | 131 | ||
| 132 | ;; Allow the service to process HTTP getauthinfo calls. | ||
| 133 | ;; Default is false. | ||
| 134 | ; AllowGetAuthInfo = false | ||
| 135 | |||
| 136 | ;; Allow the service to process HTTP setauthinfo calls. | ||
| 137 | ;; Default is false. | ||
| 138 | ; AllowSetAuthInfo = false | ||
| 139 | |||
| 132 | ;; Allow the service to process HTTP setpassword calls. | 140 | ;; Allow the service to process HTTP setpassword calls. |
| 133 | ;; Default is false. | 141 | ;; Default is false. |
| 134 | ; AllowSetPassword = false | 142 | ; AllowSetPassword = false |