diff options
| author | Melanie | 2011-10-25 02:56:56 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:56:56 +0100 |
| commit | a71c60ee6d1430236de2a1f903e3f2393d40e717 (patch) | |
| tree | af5d43d2f71abeefb519b319c0eecb872080c684 /bin | |
| parent | Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge (diff) | |
| parent | Add option to allow remote http calls to setpassword in the AuthenticationSer... (diff) | |
| download | opensim-SC-a71c60ee6d1430236de2a1f903e3f2393d40e717.zip opensim-SC-a71c60ee6d1430236de2a1f903e3f2393d40e717.tar.gz opensim-SC-a71c60ee6d1430236de2a1f903e3f2393d40e717.tar.bz2 opensim-SC-a71c60ee6d1430236de2a1f903e3f2393d40e717.tar.xz | |
Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 8 | ||||
| -rw-r--r-- | bin/Robust.ini.example | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 5958fc1..aed1d33 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -146,6 +146,10 @@ 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 setpassword calls. | ||
| 150 | ;; Default is false. | ||
| 151 | ; AllowSetPassword = false | ||
| 152 | |||
| 149 | [OpenIdService] | 153 | [OpenIdService] |
| 150 | ; for the server connector | 154 | ; for the server connector |
| 151 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 155 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
| @@ -173,11 +177,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 173 | ;; Default is false | 177 | ;; Default is false |
| 174 | ; CreateDefaultAvatarEntries = false | 178 | ; CreateDefaultAvatarEntries = false |
| 175 | 179 | ||
| 176 | ;; Allow the service to process HTTP create user calls. | 180 | ;; Allow the service to process HTTP createuser calls. |
| 177 | ;; Default is false. | 181 | ;; Default is false. |
| 178 | ; AllowCreateUser = false | 182 | ; AllowCreateUser = false |
| 179 | 183 | ||
| 180 | ;; Allow the service to process HTTP set account calls. | 184 | ;; Allow the service to process HTTP setaccount calls. |
| 181 | ;; Default is false. | 185 | ;; Default is false. |
| 182 | ; AllowSetAccount = false | 186 | ; AllowSetAccount = false |
| 183 | 187 | ||
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 2c8770a..522cc56 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -129,6 +129,10 @@ 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 setpassword calls. | ||
| 133 | ;; Default is false. | ||
| 134 | ; AllowSetPassword = false | ||
| 135 | |||
| 132 | [OpenIdService] | 136 | [OpenIdService] |
| 133 | ; for the server connector | 137 | ; for the server connector |
| 134 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 138 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
| @@ -156,11 +160,11 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 156 | ;; Default is false | 160 | ;; Default is false |
| 157 | ; CreateDefaultAvatarEntries = false | 161 | ; CreateDefaultAvatarEntries = false |
| 158 | 162 | ||
| 159 | ;; Allow the service to process HTTP create user calls. | 163 | ;; Allow the service to process HTTP createuser calls. |
| 160 | ;; Default is false. | 164 | ;; Default is false. |
| 161 | ; AllowCreateUser = false | 165 | ; AllowCreateUser = false |
| 162 | 166 | ||
| 163 | ;; Allow the service to process HTTP set account calls. | 167 | ;; Allow the service to process HTTP setaccount calls. |
| 164 | ;; Default is false. | 168 | ;; Default is false. |
| 165 | ; AllowSetAccount = false | 169 | ; AllowSetAccount = false |
| 166 | 170 | ||