From dc443c284e9d0fc79559b8ebae9ceda89270882d Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Fri, 3 Apr 2015 18:04:52 +0200
Subject: [PATCH] add_new_user only creates kerberos and radius user

---
 neuf_userinfo/utils.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/neuf_userinfo/utils.py b/neuf_userinfo/utils.py
index 4cc3359..abfabcf 100644
--- a/neuf_userinfo/utils.py
+++ b/neuf_userinfo/utils.py
@@ -1,34 +1,37 @@
 # coding: utf-8
 from __future__ import unicode_literals
 import base64
-from neuf_kerberos.utils import add_kerberos_principal
+import logging
 
+from neuf_kerberos.utils import add_kerberos_principal
 from neuf_ldap.utils import create_ldap_user, create_ldap_automount
 from neuf_radius.utils import create_radius_user
 from neuf_userinfo.ssh import create_home_dir
 import rijndael
-import logging
 
 logger = logging.getLogger(__name__)
 
 
 def add_new_user_sync(user):
     """
+        Currently does the following:
+        - Create kerberos principal and set password
+        - Create/set RADIUS user and password
+
+        Previously (before 2015-04-03) did the following:
         - Create new user in LDAP (username, first_name, last_name, email)
         - Add to groups (usergroup, dns-alle), it not exists, create
         - Set LDAP password
         - Create homedir on fileserver
         - Create automount entry
-        - Create kerberos principal and set password
-        - Set RADIUS password
+        Note: Now handled by userinfo command sync_active_to_internal_systems
     """
-    # FIXME: Remove after sync_active_to_internal_systems is enabled
-    if not create_ldap_user(user):
-        logger.debug('Could not create user \'{}\'.'.format(user['username']))
-        return
-
-    create_home_dir(user['username'])  # FIXME: Remove after sync_active_to_internal_systems is enabled
-    create_ldap_automount(user['username'])  # FIXME: Remove after sync_active_to_internal_systems is enabled
+    # if not create_ldap_user(user):
+    #     logger.debug('Could not create user \'{}\'.'.format(user['username']))
+    #     return
+    #
+    # create_home_dir(user['username'])
+    # create_ldap_automount(user['username'])
 
     # Requires raw password
     add_kerberos_principal(user['username'], user['password'])