diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-03 22:05:05 +0000 |
| commit | 8862e1b27eb767c99a068d13bd15c77c2c9e1471 (patch) | |
| tree | 067f338a5f8e31a6b1fb6ca706562a044af80024 /tools | |
| parent | 87ff54c75266ffa37f716d1c7a542e956bbe54b3 (diff) | |
| parent | 5d9b9b6b30f06a3e3aa957279357dd42ae19ddf4 (diff) | |
| download | prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.tar.gz prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.zip | |
Merge 0.6.2/waqas with 0.6.2/MattJ
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 2 | ||||
| -rw-r--r-- | tools/ejabberdsql2prosody.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 7b19260d..d0c22df7 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -49,7 +49,7 @@ function vcard(node, host, stanza) end function password(node, host, password) local ret, err = dm.store(node, host, "accounts", {password = password}); - print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password); + print("["..(err or "success").."] accounts: "..node.."@"..host); end function roster(node, host, jid, item) local roster = dm.load(node, host, "roster") or {}; diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua index f652af5b..0e5dd0c4 100644 --- a/tools/ejabberdsql2prosody.lua +++ b/tools/ejabberdsql2prosody.lua @@ -254,7 +254,7 @@ end for i, row in ipairs(t["users"] or NULL) do local node, password = row.username, row.password; local ret, err = dm.store(node, host, "accounts", {password = password}); - print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password); + print("["..(err or "success").."] accounts: "..node.."@"..host); end function roster(node, host, jid, item) |