From fe3936e42bf04885f04343754b457172af3a39c3 Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Wed, 30 Oct 2013 17:34:43 +0100
Subject: [PATCH] Correct SPF + reload SSOwat conf at user modifications

---
 yunohost_domain.py | 2 +-
 yunohost_dyndns.py | 2 +-
 yunohost_user.py   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/yunohost_domain.py b/yunohost_domain.py
index fd125a74..a65a4220 100644
--- a/yunohost_domain.py
+++ b/yunohost_domain.py
@@ -127,7 +127,7 @@ def domain_add(domains, main=False):
                  domain +'.      IN   NS    ns.'+ domain +'.',
                  domain +'.      IN   A     '+ ip,
                  domain +'.      IN   MX    5 '+ domain +'.',
-                 domain +'.      IN   TXT   "v=spf1 a mx a:'+ domain +' ?all"',
+                 domain +'.      IN   TXT   "v=spf1 mx a -all"',
                  'ns.'+ domain +'.   IN   A     '+ ip,
                  '_xmpp-client._tcp.'+ domain +'.  IN   SRV   0  5   5222  '+ domain +'.',
                  '_xmpp-server._tcp.'+ domain +'.  IN   SRV   0  5   5269  '+ domain +'.',
diff --git a/yunohost_dyndns.py b/yunohost_dyndns.py
index bb5f0b3a..334a608d 100644
--- a/yunohost_dyndns.py
+++ b/yunohost_dyndns.py
@@ -114,7 +114,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
             'update delete _xmpp-server._tcp.'+ domain +'. SRV',
             'update add '+ domain +'. 1800 A '+ new_ip,
             'update add '+ domain +'. 14400 MX 5 '+ domain +'.',
-            'update add '+ domain +'. 14400 TXT "v=spf1 a mx a:'+ domain +'. ?all"',
+            'update add '+ domain +'. 14400 TXT "v=spf1 a mx -all"',
             'update add pubsub.'+ domain +'. 1800 A '+ new_ip,
             'update add muc.'+ domain +'. 1800 A '+ new_ip,
             'update add vjud.'+ domain +'. 1800 A '+ new_ip,
diff --git a/yunohost_user.py b/yunohost_user.py
index a27e180c..72e94496 100644
--- a/yunohost_user.py
+++ b/yunohost_user.py
@@ -115,6 +115,7 @@ def user_create(username, firstname, lastname, mail, password):
         pwd_changed = os.system('echo "'+ password +'\n'+ password +'" | smbldap-passwd '+ username)
 
         if user_added == pwd_changed == 0:
+            os.system('yunohost app ssowatconf > /dev/null 2>&1')
             #TODO: Send a welcome mail to user
             win_msg(_("User successfully created"))
             return { _("Fullname") : firstname +' '+ lastname, _("Username") : username, _("Mail") : mail }
@@ -139,7 +140,7 @@ def user_delete(users, purge=False):
 
         for user in users:
             delete_command = '/usr/sbin/smbldap-userdel'
-            if purge: 
+            if purge:
                 delete_command = delete_command +' -r '+ user
             else:
                 delete_command = delete_command +' '+ user
@@ -149,6 +150,7 @@ def user_delete(users, purge=False):
             else:
                 raise YunoHostError(169, _("An error occured during user deletion"))
 
+        os.system('yunohost app ssowatconf > /dev/null 2>&1')
         win_msg(_("User(s) successfully deleted"))
     return result