From 8756172b9b27196a4b986fa54d430321efaa5a64 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Thu, 18 Sep 2014 15:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver.conf                |  4 ++--
 webroot/AutoSa/AutoSa/views.py | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/jumpserver.conf b/jumpserver.conf
index 5ffe20a78..864efc99d 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -21,6 +21,6 @@ keygen_shell = /opt/jumpserver/genkey.sh
 chgpass_shell = /opt/jumpserver/chgpass.sh
 rsa_dir = /opt/jumpserver/keys
 ldap_host = ldap://127.0.0.1:389
-ldap_base_dn = "dc=yolu,dc=com"
-admin_cn = 'cn=admin,dc=yolu,dc=com'
+ldap_base_dn = dc=yolu,dc=com
+admin_cn = cn=admin,dc=yolu,dc=com
 admin_pass = VNLqNCjpNBIetEoCA2h3
\ No newline at end of file
diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index 5f6fbe603..b75652ff2 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -305,18 +305,18 @@ def addUser(request):
 
             user_dn = "uid=%s,ou=People,%s" % (username, ldap_base_dn)
             userPassword = gen_sha512(keygen(6), ldap_password)
-            user_attr  = {'uid': [username],
-                          'cn': [username],
-                          'objectClass': ['account', 'posixAccount', 'top', 'shadowAccount'],
-                          'userPassword': ['{crypt}%s' % userPassword],
-                          'shadowLastChange': ['16328'],
-                          'shadowMin': ['0'],
-                          'shadowMax': ['99999'],
-                          'shadowWarning': ['7'],
-                          'loginShell': ['/bin/bash'],
-                          'uidNumber': [u.id],
-                          'gidNumber': [u.id],
-                          'homeDirectory': ['/home/%s' % username]
+            user_attr = {'uid': [str(username)],
+                         'cn': [str(username)],
+                         'objectClass': ['account', 'posixAccount', 'top', 'shadowAccount'],
+                         'userPassword': ['{crypt}%s' % userPassword],
+                         'shadowLastChange': ['16328'],
+                         'shadowMin': ['0'],
+                         'shadowMax': ['99999'],
+                         'shadowWarning': ['7'],
+                         'loginShell': ['/bin/bash'],
+                         'uidNumber': [str(u.id)],
+                         'gidNumber': [str(u.id)],
+                         'homeDirectory': [str('/home/%s' % username)]
                           }
 
             group_dn = "cn=%s,out=Group,%s" % (username, ldap_base_dn)
@@ -324,20 +324,20 @@ def addUser(request):
                 'objectClass': ['posixGroup', 'top'],
                 'cn': [username],
                 'userPassword': ['{crypt}x'],
-                'gidNumber': [u.id]
+                'gidNumber': [str(u.id)]
             }
 
             try:
                 ldap_user = LDAPMgmt()
                 ldap_user.add(user_dn, user_attr)
                 ldap_user.add(group_dn, group_attr)
-            except ldap.LDAPError, e:
+            except Exception, e:
                 error = u'添加ladp用户失败' + unicode(e)
                 try:
-                    ldap_user.delete(user_dn)
-                    ldap_user.delete(group_dn)
                     bash('userdel -r %s' % username)
                     u.delete()
+                    ldap_user.delete(user_dn)
+                    ldap_user.delete(group_dn)
                 except:
                     pass
                 return render_to_response('addUser.html', {'user_menu': 'active', 'form': form, 'error': error},