From a20eccfecec7ffc28f68152ae0cfebed42347b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 12 Dec 2014 11:10:04 +0100 Subject: [PATCH] Revert "adds the domain name as possibility to the user (reverted from commit 7d0a33b459648a68182598fdc9c6416b690327e8)" This reverts commit 1ffb848a5d92b9758279747b0b573ca70078a1d9. --- .../external_storage_configuration.rst | 18 +++++++++++++++++- .../external_storage_configuration_gui.rst | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration/external_storage_configuration.rst b/admin_manual/configuration/external_storage_configuration.rst index f0997b48a..2881b2b75 100644 --- a/admin_manual/configuration/external_storage_configuration.rst +++ b/admin_manual/configuration/external_storage_configuration.rst @@ -190,7 +190,7 @@ storage support’ app, the class to be used is **\\OC\\Files\\Storage\\SMB**\ takes the following options: - **host**: the host name of the samba server -- **user**: the user name used to login on the samba server +- **user**: the username or domain/username to login on the samba server - **password**: the password to login on the samba server - **share**: the share on the samba server to mount - **root**: the folder inside the samba share to mount (optional, defaults @@ -200,6 +200,7 @@ takes the following options: Example ^^^^^^^ +With username only: .. code-block:: json @@ -213,6 +214,21 @@ Example }, "priority":100 } + +With domainname and username: + +.. code-block:: json + + { "class":"\\OC\\Files\\Storage\\SMB", + "options":{ + "host":"myhost.com", + "user":"domain\/johndoe", + "password":"secret", + "share":"\/test", + "root":"\/Pictures" + }, + "priority":100 + } WebDAV ~~~~~~ diff --git a/admin_manual/configuration/external_storage_configuration_gui.rst b/admin_manual/configuration/external_storage_configuration_gui.rst index 4f5b10566..0197442a2 100644 --- a/admin_manual/configuration/external_storage_configuration_gui.rst +++ b/admin_manual/configuration/external_storage_configuration_gui.rst @@ -265,7 +265,7 @@ You need the following information: * Folder name -- Whatever name you want for your local mountpoint. * Host -- The URL of the Samba server. -* Username -- The user name used to login to the Samba server. +* Username* -- The username or domain/username used to login to the Samba server. * Password -- The password to login to the Samba server. * Share -- The share on the Samba server to mount. * Root -- The folder inside the Samba share to mount (optional, defaults to