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

pym/cl_ldap.py

@@ -3019,7 +3019,7 @@ in Unix service ...") %str(primaryMail))
         else:
             self.printERROR(\
             _("Must be added one or more alternative addresses"))
-            self.printWARNING("cl-useradd -e gst guest mail")
+            self.printWARNING("cl-useradd -e gst@calculate.org guest mail")
             return False
         if self.searchMailUserToName(userName):
             self.printERROR(_("User exists in Mail service"))
@@ -5158,6 +5158,34 @@ class cl_ldap(shareLdap):
          'helpChapter':_("Mail service options"),
          'help':_("set alternate email addresses for the new mail group")
         },
+
+        {'progAccess':(0,),
+         'shortOption':"f",
+         'longOption':"force",
+         'helpChapter':_("Samba service options"),
+         'help':_("force exit with success status") + " " +\
+                 _("if the specified group already exists")
+        },
+        {'progAccess':(0,),
+         'shortOption':"g",
+         'longOption':"gid",
+         'optVal':"GID",
+         'helpChapter':_("Samba service options"),
+         'help':_("use GID for the new group")
+        },
+        {'progAccess':(0,),
+         'shortOption':"c",
+         'longOption':"comment",
+         'optVal':_("COMMENT"),
+         'helpChapter':_("Samba service options"),
+         'help':_("set the description field for the new group")
+        },
+        {'progAccess':(0,),
+         'shortOption':"p",
+         'helpChapter':_("Samba service options"),
+         'help':_("print the gidNumber to stdout")
+        },
+
         {'progAccess':(2,),
          'shortOption':"a",
          'longOption':"add",
@@ -5619,7 +5647,7 @@ preferences and data (for users with uid<1000)")
         'help':pcs("  unix", self.column_width,
                     "unix " + servName, self.consolewidth-self.column_width)
         },
-        {'progAccess':(3,4,5,6,7,),
+        {'progAccess':(0,1,2,3,4,5,6,7,),
         'helpChapter':_("Services"),
         'help':pcs("  samba", self.column_width,
                     "samba " + servName, self.consolewidth-self.column_width)

scripts/cl-groupadd

@@ -39,6 +39,12 @@ if __name__ == "__main__":
             if obj.addGroupUnixServer(optObj.params['group'],
                                               optObj.opt):
                 flagError = False
+        elif optObj.params['service'] == "samba":
+            obj = cl_ldap.servUnix()
+            # Добавляем группу
+            if obj.addGroupUnixServer(optObj.params['group'],
+                                              optObj.opt):
+                flagError = False
         elif optObj.params['service'] == "mail":
             obj = cl_ldap.servMail()
             # Добавляем группу для сервиса Mail

scripts/cl-groupdel

@@ -38,6 +38,12 @@ if __name__ == "__main__":
             if obj.delGroupUnixServer(optObj.params['group'],
                                               optObj.opt):
                 flagError = False
+        elif optObj.params['service'] == "samba":
+            obj = cl_ldap.servUnix()
+            # Добавляем группу
+            if obj.delGroupUnixServer(optObj.params['group'],
+                                              optObj.opt):
+                flagError = False
         elif optObj.params['service'] == "mail":
             obj = cl_ldap.servMail()
             # Добавляем группу

scripts/cl-groupmod

@@ -37,6 +37,12 @@ if __name__ == "__main__":
             if not obj.modGroupUnixServer(optObj.params['group'],
                                               optObj.opt):
                 flagError = True
+        elif optObj.params['service'] == "samba":
+            obj = cl_ldap.servUnix()
+            # Добавляем группу
+            if not obj.modGroupUnixServer(optObj.params['group'],
+                                              optObj.opt):
+                flagError = True
         elif optObj.params['service'] == "mail":
             obj = cl_ldap.servMail()
             # Добавляем группу