git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@113 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -684,7 +684,7 @@ _("in the system") + ".\n"
         if 's' in options:
             # если установки параметрв не произошло
             if not datavars.flFromCmdParam(options['s']):
-                # вывод 
+                # вывод
                 print _("Bad enviroment parameters")
                 return False
         # если опция отображения параметров
@@ -841,7 +841,7 @@ Samba in backup directory")
         self.printOK(_("Samba service configured ..."))
         return True
 
-    def addUserLdapServer(self, options):
+    def addUserLdapServer(self, username, options):
         """Добавляет LDAP пользователя в LDAP-сервер"""
         clVars = cl_base.DataVars()
         clVars.flServer()
@@ -850,3 +850,23 @@ Samba in backup directory")
         # или были опция вывода на печать
         if not self.processOptionsForDatavars(options,clVars):
             return ""
+        clVars.Set("soft_ldap_user_login",username)
+        clVars.Set("soft_ldap_user_full_name","full name")
+        clVars.Set("soft_ldap_user_id","10000")
+        clVars.Set("soft_ldap_user_gid","65534")
+        clVars.Set("soft_ldap_user_home","/home/" + \
+            clVars.Get("soft_ldap_user_login"))
+        clVars.Set("soft_ldap_user_shell", "/bin/bash")
+        clVars.Set("soft_ldap_user_pw_hash","crypt{xxx}")
+        ldifFile = "/usr/lib/calculate/calculate-server/ldif/ldap_user.ldif"
+        userLdif = self.createLdif(ldifFile, clVars)
+        ldapParser = iniLdapParser()
+        adminDn = ldapParser.getVar("admin","DN")
+        adminPw = ldapParser.getVar("admin","PASS")
+        ldapObj = ldapFunction(adminDn, adminPw)
+        if not ldapObj.getError():
+            ldapObj.ldapAdd(userLdif)
+        if ldapObj.getError():
+            print _("LDAP Error") + ": " + ldapObj.getError()
+            return False
+        self.printOK(_("Add ldif file ..."))

scripts/cl-useradd

@@ -80,4 +80,4 @@ if __name__ == "__main__":
         optObj.params.has_key('user'):
         if optObj.params['service'] == "ldap":
             # Добавляем пользователя LDAP
-            ldapObj.addUserLdapServer(optObj.opt)
+            ldapObj.addUserLdapServer(optObj.params['user'], optObj.opt)