From c10a9e7f9fd09bb220d2befc6b43e88aac62f6a1 Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Thu, 27 Aug 2015 12:51:21 +0800 Subject: [PATCH] Typo. --- en_US/howto/reset.user.password.md | 1 + en_US/migrations/password.hashes.md | 4 ++++ html/password.hashes.html | 10 +++++++--- html/reset.user.password.html | 3 ++- html/zh_CN/password.hashes.html | 9 ++++++--- html/zh_CN/reset.user.password.html | 3 ++- zh_CN/howto/reset.user.password.md | 1 + zh_CN/migrations/password.hashes.md | 3 +++ 8 files changed, 26 insertions(+), 8 deletions(-) diff --git a/en_US/howto/reset.user.password.md b/en_US/howto/reset.user.password.md index 89ab87df..e81e1209 100644 --- a/en_US/howto/reset.user.password.md +++ b/en_US/howto/reset.user.password.md @@ -30,6 +30,7 @@ or iRedAdmin-Pro (with self-service enabled) to reset password immediately. For example: ``` +sql> USE vmail; sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='user@domain.ltd'; ``` diff --git a/en_US/migrations/password.hashes.md b/en_US/migrations/password.hashes.md index 398a2bc5..642cda90 100644 --- a/en_US/migrations/password.hashes.md +++ b/en_US/migrations/password.hashes.md @@ -58,6 +58,8 @@ All mail users are stored in SQL table `vmail.mailbox`, user password is stored in SQL column `mailbox.password`. For example: ``` +sql> USE vmail; + sql> UPDATE mailbox SET password='$1$GfHYI7OE$vlXqMZSyJOSPXAmbXHq250' WHERE username='xx@xx'; sql> UPDATE mailbox SET password='{SSHA}OuCrqL2yWwQIu8a9uvyOQ5V/ZKfL7LJD' WHERE username='xx@xx'; sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJtuHWrx+wfqrs/lIH2Qxn2eA0jygXtBhMvRi7GNFmL++6aAZ0kXpcy1fxag=' WHERE username='xx@xx'; @@ -66,12 +68,14 @@ sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJtuHW * To store PLAIN-MD5, you have to prepend `{PLAIN-MD5}` in your password hash: ``` +sql> USE vmail; sql> UPDATE mailbox SET password='{PLAIN-MD5}0d2bf3c712402f428d48fed691850bfc' WHERE username='xx@xx'; ``` * To store plain password, you have to prepend `{PLAIN}`: ``` +sql> USE vmail; sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='xx@xx'; ``` diff --git a/html/password.hashes.html b/html/password.hashes.html index 4cd5a9ed..549b4e41 100644 --- a/html/password.hashes.html +++ b/html/password.hashes.html @@ -67,7 +67,9 @@ Apache basic auth doesn't.

For MySQL and PostgreSQL backends

All mail users are stored in SQL table vmail.mailbox, user password is stored in SQL column mailbox.password. For example:

-
sql> UPDATE mailbox SET password='$1$GfHYI7OE$vlXqMZSyJOSPXAmbXHq250' WHERE username='xx@xx';
+
sql> USE vmail;
+
+sql> UPDATE mailbox SET password='$1$GfHYI7OE$vlXqMZSyJOSPXAmbXHq250' WHERE username='xx@xx';
 sql> UPDATE mailbox SET password='{SSHA}OuCrqL2yWwQIu8a9uvyOQ5V/ZKfL7LJD' WHERE username='xx@xx';
 sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJtuHWrx+wfqrs/lIH2Qxn2eA0jygXtBhMvRi7GNFmL++6aAZ0kXpcy1fxag=' WHERE username='xx@xx';
 

@@ -75,13 +77,15 @@ sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJt
 
    
 
  • To store PLAIN-MD5, you have to prepend {PLAIN-MD5} in your password hash:
    • 
 

-
sql> UPDATE mailbox SET password='{PLAIN-MD5}0d2bf3c712402f428d48fed691850bfc' WHERE username='xx@xx';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='{PLAIN-MD5}0d2bf3c712402f428d48fed691850bfc' WHERE username='xx@xx';
 

 
 
    
 
  • To store plain password, you have to prepend {PLAIN}:
    • 
 

-
sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='xx@xx';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='xx@xx';
 

 
 
For OpenLDAP backend

diff --git a/html/reset.user.password.html b/html/reset.user.password.html
index 9376865b..f660f985 100644
--- a/html/reset.user.password.html
+++ b/html/reset.user.password.html
@@ -38,7 +38,8 @@ users against OpenLDAP.

 
It's ok to use plain password temporarily, then login to Roundcube webmail
 or iRedAdmin-Pro (with self-service enabled) to reset password immediately.
 For example:

-
sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='user@domain.ltd';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='user@domain.ltd';
 

 
 
See also

diff --git a/html/zh_CN/password.hashes.html b/html/zh_CN/password.hashes.html
index 623999f4..35d34a63 100644
--- a/html/zh_CN/password.hashes.html
+++ b/html/zh_CN/password.hashes.html
@@ -62,7 +62,8 @@
 
对于采用 MySQL 和 PostgreSQL 后端的用户

 
所有的邮箱用户账户存放于 SQL 表 vmail.mailbox 中，用户密码则存放于
 mailbox.password 字段中。例如：

-
sql> UPDATE mailbox SET password='$1$GfHYI7OE$vlXqMZSyJOSPXAmbXHq250' WHERE username='xx@xx';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='$1$GfHYI7OE$vlXqMZSyJOSPXAmbXHq250' WHERE username='xx@xx';
 sql> UPDATE mailbox SET password='{SSHA}OuCrqL2yWwQIu8a9uvyOQ5V/ZKfL7LJD' WHERE username='xx@xx';
 sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJtuHWrx+wfqrs/lIH2Qxn2eA0jygXtBhMvRi7GNFmL++6aAZ0kXpcy1fxag=' WHERE username='xx@xx';
 

@@ -70,13 +71,15 @@ sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJt
 
    
 
  • 要保存 PLAIN-MD5 ，需要加上 {PLAIN-MD5} 前缀：
    • 
 

-
sql> UPDATE mailbox SET password='{PLAIN-MD5}0d2bf3c712402f428d48fed691850bfc' WHERE username='xx@xx';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='{PLAIN-MD5}0d2bf3c712402f428d48fed691850bfc' WHERE username='xx@xx';
 

 
 
    
 
  • 要保存明文密码，需要加上 {PLAIN} 前缀：
    • 
 

-
sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='xx@xx';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='xx@xx';
 

 
 
对于采用 OpenLDAP 后端的用户

diff --git a/html/zh_CN/reset.user.password.html b/html/zh_CN/reset.user.password.html
index 072a8c12..a72ea355 100644
--- a/html/zh_CN/reset.user.password.html
+++ b/html/zh_CN/reset.user.password.html
@@ -37,7 +37,8 @@ SSHA512。

 
作为一种临时方案，可以重置为明文密码，然后立即登录 Roundcube webmail 或
 启用了自助服务 (self-service) 功能的 iRedAdmin-Pro 修改密码。
 例如：

-
sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='user@domain.ltd';
+
sql> USE vmail;
+sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='user@domain.ltd';
 

 
 
参考资料

diff --git a/zh_CN/howto/reset.user.password.md b/zh_CN/howto/reset.user.password.md
index 1980a466..1ea68697 100644
--- a/zh_CN/howto/reset.user.password.md
+++ b/zh_CN/howto/reset.user.password.md
@@ -29,6 +29,7 @@ SSHA512。
 例如：
 
 ```
+sql> USE vmail;
 sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='user@domain.ltd';
 ```
 
diff --git a/zh_CN/migrations/password.hashes.md b/zh_CN/migrations/password.hashes.md
index bbf8d4b2..df262477 100644
--- a/zh_CN/migrations/password.hashes.md
+++ b/zh_CN/migrations/password.hashes.md
@@ -53,6 +53,7 @@ __注意__:
 `mailbox.password` 字段中。例如：
 
 ```
+sql> USE vmail;
 sql> UPDATE mailbox SET password='$1$GfHYI7OE$vlXqMZSyJOSPXAmbXHq250' WHERE username='xx@xx';
 sql> UPDATE mailbox SET password='{SSHA}OuCrqL2yWwQIu8a9uvyOQ5V/ZKfL7LJD' WHERE username='xx@xx';
 sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJtuHWrx+wfqrs/lIH2Qxn2eA0jygXtBhMvRi7GNFmL++6aAZ0kXpcy1fxag=' WHERE username='xx@xx';
@@ -61,12 +62,14 @@ sql> UPDATE mailbox SET password='{SSHA512}FxgXDhBVYmTqoboW+ibyyzPv/wGG7y4VJtuHW
 * 要保存 PLAIN-MD5 ，需要加上 `{PLAIN-MD5}` 前缀：
 
 ```
+sql> USE vmail;
 sql> UPDATE mailbox SET password='{PLAIN-MD5}0d2bf3c712402f428d48fed691850bfc' WHERE username='xx@xx';
 ```
 
 * 要保存明文密码，需要加上 `{PLAIN}` 前缀：
 
 ```
+sql> USE vmail;
 sql> UPDATE mailbox SET password='{PLAIN}123456' WHERE username='xx@xx';
 ```