Merge http://git.defcon.no/hermes

diff --combined doc/api-nodes.txt
index 2d6e76acac149da1687f345c96919a87f66e3ce3,7ea2100d3f80396d4ade386d053f7a2fb23a24c6..2d6e76acac149da1687f345c96919a87f66e3ce3
--- 1/api-nodes.txt
--- 2/doc/api-nodes.txt
+++ b/doc/api-nodes.txt
@@@ -80,21 -80,14 +80,21 @@@ user/change_email?user=foo@bar.bz&email
  user/remove?username=foo&domain=bar
  user/remove?user=foo@bar.bz
        Removes user account from Kamailio, if present, and removes user from
 -      provisioning.  Will fail if user has associated hardphones, remove
 -      phones before removing user.
 +      provisioning.  
 +
 +      Will fail if user has associated hardphones, remove phones before
 +      removing user. 
 +
 +      TODO: Should fail if user has associated aliases. Remove aliases before
 +      removing user.
  
        Returns 'ok' on success.
  
  user/gen_pw
 -      Test-node, generates a random password on the same form as that used by
 -      user/add_local. May be used with the to-be-implemented change_pw node.
 +      Generates a random password on the same form as that used by
 +      user/add_local. 
 +
 +      Return is always a password in plain text, with no formatting.
  
  phone/get?mac=f00ba2ba5c00
  phone/get?user=foo@bar.bz
@@@ -224,21 -217,9 +224,21 @@@ alias/remove?alias=foo@bar.b
        Returns 'invalid' with 'cause' = 'address' if the given alias is not a
        valid SIP adress.
  
 +BUGS:
 +---------------------
 +
 +api/alias/list?destination=foo@bar.bz&e164=true
 +      should return an empty array, returns false
 +
  TODO list:
  ---------------------
  
 +Add a node to test a destination (pre-flight testing of user/add and alias/add)
 +
 +Read list of kamailio domains (domains/list ?) RW?
 +Default server-settings for domains (domains/server ? ) (registrar, proxy, ports...) RW.
 +Permissions! (user/permissions?user=...)
 +
  authentication-mechanism :)
  
  Add collision prevention for users, make sure that no user can be added when the user