activesambaldap 0.0.7 → 0.0.8

data/lib/active_samba_ldap/samba_computer_account_entry.rb

@@ -0,0 +1,18 @@
+module ActiveSambaLdap
+  module SambaComputerAccountEntry
+    def self.included(base)
+      super
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def samba_object_classes
+        if samba4?
+          super + ["computer"]
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/active_samba_ldap/samba_entry.rb

@@ -1,23 +1,24 @@
 module ActiveSambaLdap
   module SambaEntry
     def samba_available?
-      classes.include?(samba_object_class)
+      (samba_object_classes - classes).empty?
     end
 
     def remove_samba_availability
-      remove_class(samba_object_class)
+      remove_class(*samba_object_classes)
     end
 
     def ensure_samba_available
-      add_class(samba_object_class)
+      add_class(*samba_object_classes)
     end
 
-    def samba_object_class
-      self.class.samba_object_class
+    def samba_object_classes
+      self.class.samba_object_classes
     end
 
     private
     def assert_samba_available
+      return if samba4?
       unless samba_available?
         raise NotSambaAavialableError.new(self)
       end

data/lib/active_samba_ldap/samba_group_entry.rb

@@ -58,8 +58,12 @@ module ActiveSambaLdap
     }
 
     module ClassMethods
-      def samba_object_class
-        "sambaGroupMapping"
+      def samba_object_classes
+        if samba4?
+          ["group"]
+        else
+          ["sambaGroupMapping"]
+        end
       end
 
       def gid2rid(gid)
@@ -83,11 +87,6 @@ module ActiveSambaLdap
       def start_rid
         gid2rid(start_gid)
       end
-
-      private
-      def default_recommended_classes
-        super + [samba_object_class]
-      end
     end
 
     def fill_default_values(options={})
@@ -130,14 +129,24 @@ module ActiveSambaLdap
     def change_type(type)
       assert_samba_available
       normalized_type = type.to_s.downcase
-      if TYPES.has_key?(normalized_type)
-        type = TYPES[normalized_type]
-      elsif TYPES.values.include?(type.to_i)
-        # pass
+      if samba4?
+        self.group_type = ActiveDirectory::GroupType.resolve(normalized_type)
       else
-        raise ArgumentError, _("invalid type: %s") % type
+        if TYPES.has_key?(normalized_type)
+          type = TYPES[normalized_type]
+        elsif TYPES.values.include?(type.to_i)
+          # pass
+        else
+          # TODO: add available values
+          raise ArgumentError, _("invalid type: %s") % type
+        end
+        self.samba_group_type = type.to_s
       end
-      self.samba_group_type = type.to_s
+    end
+
+    def set_object_category
+      _base = ActiveSambaLdap::Base.base
+      self.object_category = "cn=Group,cn=Schema,cn=Configuration,#{_base}"
     end
   end
 end

data/lib/active_samba_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveSambaLdap
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/po/active-samba-ldap.pot

@@ -0,0 +1,463 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ActiveSambaLdap 0.0.8\n"
+"POT-Creation-Date: 2009-09-22 14:42+0900\n"
+"PO-Revision-Date: 2007-09-08 11:51+0900\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: lib/active_samba_ldap/command.rb:19
+msgid "Common options:"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:22
+msgid "Specify configuration file"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:23
+msgid "Default configuration files:"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:28
+msgid "Show this message"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:33
+msgid "Show version"
+msgstr ""
+
+#: lib/active_samba_ldap/entry.rb:59
+msgid "%s must be only ou"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:15
+msgid "required variable is not set: %s"
+msgid_plural "required variables are not set: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/active_samba_ldap/base.rb:27
+msgid "uid number already exists: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:35 bin/asl-groupdel:46 bin/asl-groupshow:27
+#: bin/asl-samba-groupmod:48 bin/asl-groupmod:59 bin/asl-samba-groupdel:40
+msgid "group doesn't exist: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:43
+msgid "gid number already exists: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:51
+msgid "gid number doesn't exist: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:59
+msgid "sambaSID attribute doesn't exist for gid number '%s'"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:68
+msgid ""
+"cannot change primary group from '%s' to other group due to no other "
+"belonged groups: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:79
+msgid ""
+"cannot destroy group '%s' due to members who belong to the group as primary "
+"group: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:91
+msgid "found invalid configuration format at %s:%s: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:102
+msgid "the value of %s '%s' is invalid: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:111
+msgid "%s is not Samba available"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:119
+msgid "%s is not UNIX available"
+msgstr ""
+
+#: lib/active_samba_ldap/configuration.rb:338
+msgid "must be in %s"
+msgstr ""
+
+#: lib/active_samba_ldap/samba_group_entry.rb:141
+msgid "invalid type: %s"
+msgstr ""
+
+#: rails/init.rb:12
+msgid ""
+"You should run 'script/generator scaffold_active_samba_ldap' to make %s."
+msgstr ""
+
+#: bin/asl-samba-useradd:14 bin/asl-samba-computeradd:14 bin/asl-useradd:42
+msgid "add the user in the organizational unit OU"
+msgstr ""
+
+#: bin/asl-samba-useradd:15 bin/asl-samba-computeradd:15 bin/asl-useradd:43
+msgid "(relative to the user suffix)"
+msgstr ""
+
+#: bin/asl-samba-useradd:33 bin/asl-samba-userdel:21 bin/asl-userdel:42
+#: bin/asl-groupdel:27 bin/asl-samba-computeradd:33 bin/asl-useradd:144
+#: bin/asl-samba-groupmod:29 bin/asl-populate:60 bin/asl-groupmod:40
+#: bin/asl-samba-groupadd:21 bin/asl-purge:16 bin/asl-samba-groupdel:21
+#: bin/asl-groupadd:33
+msgid "need root authority."
+msgstr ""
+
+#: bin/asl-samba-useradd:57
+msgid "illegal user name: %s"
+msgstr ""
+
+#: bin/asl-samba-useradd:62
+msgid "user already exists: %s"
+msgstr ""
+
+#: bin/asl-samba-useradd:75 bin/asl-samba-computeradd:78 bin/asl-useradd:224
+msgid "UID already exists: %s"
+msgstr ""
+
+#: bin/asl-samba-userdel:40 bin/asl-passwd:52 bin/asl-usershow:27
+msgid "user doesn't exist: %s"
+msgstr ""
+
+#: bin/asl-userdel:16 bin/asl-useradd:51 bin/asl-samba-usermod:15
+#: bin/asl-usermod:44
+msgid "is a Windows Workstation"
+msgstr ""
+
+#: bin/asl-userdel:17 bin/asl-useradd:52 bin/asl-samba-usermod:16
+#: bin/asl-usermod:45
+msgid "(otherwise, Windows user)"
+msgstr ""
+
+#: bin/asl-userdel:21
+msgid "remove home directory"
+msgstr ""
+
+#: bin/asl-userdel:27
+msgid "do interactively"
+msgstr ""
+
+#: bin/asl-userdel:62 bin/asl-useradd:169 bin/asl-samba-usermod:48
+#: bin/asl-usermod:162
+msgid "computer"
+msgstr ""
+
+#: bin/asl-userdel:65 bin/asl-useradd:173 bin/asl-samba-usermod:51
+#: bin/asl-usermod:166
+msgid "user"
+msgstr ""
+
+#: bin/asl-userdel:73 bin/asl-samba-usermod:59 bin/asl-usermod:170
+msgid "%s doesn't exist: %s"
+msgstr ""
+
+#: bin/asl-groupdel:14
+msgid "force delete group"
+msgstr ""
+
+#: bin/asl-samba-computeradd:57
+msgid "illegal computer name: %s"
+msgstr ""
+
+#: bin/asl-samba-computeradd:62
+msgid "computer already exists: %s"
+msgstr ""
+
+#: bin/asl-passwd:17
+msgid "update samba password"
+msgstr ""
+
+#: bin/asl-passwd:23
+msgid "update UNIX password"
+msgstr ""
+
+#: bin/asl-passwd:41
+msgid "do nothing."
+msgstr ""
+
+#: bin/asl-passwd:58
+msgid "Enter your current password: "
+msgstr ""
+
+#: bin/asl-passwd:63 bin/asl-samba-usermod:70 bin/asl-usermod:181
+msgid "password doesn't match."
+msgstr ""
+
+#: bin/asl-passwd:68
+msgid "New password: "
+msgstr ""
+
+#: bin/asl-passwd:69
+msgid "Retype new password: "
+msgstr ""
+
+#: bin/asl-passwd:72
+msgid "New passwords don't match."
+msgstr ""
+
+#: bin/asl-useradd:54 bin/asl-usermod:60
+msgid "uid"
+msgstr ""
+
+#: bin/asl-useradd:55 bin/asl-samba-usermod:19
+msgid "gid"
+msgstr ""
+
+#: bin/asl-useradd:57 bin/asl-usermod:68
+msgid "supplementary groups (comma separated)"
+msgstr ""
+
+#: bin/asl-useradd:61
+msgid "create a group for the user"
+msgstr ""
+
+#: bin/asl-useradd:64
+msgid "set the GECOS field for the new user account"
+msgstr ""
+
+#: bin/asl-useradd:65 bin/asl-usermod:74
+msgid "shell"
+msgstr ""
+
+#: bin/asl-useradd:66 bin/asl-usermod:75
+msgid "given name"
+msgstr ""
+
+#: bin/asl-useradd:68 bin/asl-usermod:77
+msgid "common name"
+msgstr ""
+
+#: bin/asl-useradd:69 bin/asl-usermod:78
+msgid "surname"
+msgstr ""
+
+#: bin/asl-useradd:72 bin/asl-usermod:50
+msgid "home directory"
+msgstr ""
+
+#: bin/asl-useradd:74
+msgid "permission of home directory"
+msgstr ""
+
+#: bin/asl-useradd:76
+msgid "setup home directory"
+msgstr ""
+
+#: bin/asl-useradd:79
+msgid "skeleton directory"
+msgstr ""
+
+#: bin/asl-useradd:82
+msgid "wait TIME seconds before exiting"
+msgstr ""
+
+#: bin/asl-useradd:86 bin/asl-usermod:81
+msgid "For samba accounts:"
+msgstr ""
+
+#: bin/asl-useradd:88 bin/asl-usermod:83
+msgid "expire date"
+msgstr ""
+
+#: bin/asl-useradd:92 bin/asl-usermod:87
+msgid "can change password"
+msgstr ""
+
+#: bin/asl-useradd:96 bin/asl-usermod:91
+msgid "must change password"
+msgstr ""
+
+#: bin/asl-useradd:100 bin/asl-usermod:95
+msgid "sambaHomePath"
+msgstr ""
+
+#: bin/asl-useradd:101 bin/asl-usermod:96
+msgid "(SMB home share, like '\\\\PDC\\user'"
+msgstr ""
+
+#: bin/asl-useradd:105 bin/asl-usermod:100
+msgid "sambaHomeDrive"
+msgstr ""
+
+#: bin/asl-useradd:106 bin/asl-usermod:101
+msgid "(letter associated with home share, like 'H:')"
+msgstr ""
+
+#: bin/asl-useradd:110 bin/asl-usermod:105
+msgid "sambaLogonScript"
+msgstr ""
+
+#: bin/asl-useradd:111 bin/asl-usermod:106
+msgid "(DOS script to execute on login)"
+msgstr ""
+
+#: bin/asl-useradd:115 bin/asl-usermod:110
+msgid "sambaProfilePath"
+msgstr ""
+
+#: bin/asl-useradd:116 bin/asl-usermod:111
+msgid "(profile directory, like '\\\\PDC\\profiles\\user')"
+msgstr ""
+
+#: bin/asl-useradd:120 bin/asl-usermod:116
+msgid "sambaAcctFlags"
+msgstr ""
+
+#: bin/asl-useradd:121 bin/asl-usermod:117
+msgid "(samba account control bits, like '[NDHTUMWSLXI]')"
+msgstr ""
+
+#: bin/asl-useradd:177
+msgid "illegal %s name: %s"
+msgstr ""
+
+#: bin/asl-useradd:182 bin/asl-usermod:309
+msgid "%s already exists: %s"
+msgstr ""
+
+#: bin/asl-samba-groupmod:15 bin/asl-groupmod:26
+msgid "add members (comma delimited)"
+msgstr ""
+
+#: bin/asl-samba-groupmod:17 bin/asl-groupmod:28
+msgid "delete members (comma delimited)"
+msgstr ""
+
+#: bin/asl-samba-groupmod:56
+msgid "there are duplicated members in adding and deleting members: %s"
+msgstr ""
+
+#: bin/asl-samba-usermod:65 bin/asl-usermod:176
+msgid "Enter your password: "
+msgstr ""
+
+#: bin/asl-populate:30
+msgid "first uid number to allocate"
+msgstr ""
+
+#: bin/asl-populate:33
+msgid "first gid number to allocate"
+msgstr ""
+
+#: bin/asl-populate:36
+msgid "administrator login name"
+msgstr ""
+
+#: bin/asl-populate:39
+msgid "administrator's uid number"
+msgstr ""
+
+#: bin/asl-populate:42
+msgid "administrator's gid number"
+msgstr ""
+
+#: bin/asl-populate:45
+msgid "guest login name"
+msgstr ""
+
+#: bin/asl-populate:48
+msgid "guest's uid number"
+msgstr ""
+
+#: bin/asl-populate:51
+msgid "guest's gid number"
+msgstr ""
+
+#: bin/asl-populate:54
+msgid "export LDIF file"
+msgstr ""
+
+#: bin/asl-populate:76
+msgid "Password for %s: "
+msgstr ""
+
+#: bin/asl-populate:78
+msgid "Retype password for %s: "
+msgstr ""
+
+#: bin/asl-populate:81
+msgid "Passwords don't match."
+msgstr ""
+
+#: bin/asl-groupmod:17 bin/asl-groupadd:15
+msgid "GID number"
+msgstr ""
+
+#: bin/asl-groupmod:19
+msgid "gid can be non unique"
+msgstr ""
+
+#: bin/asl-groupmod:24
+msgid "new group name"
+msgstr ""
+
+#: bin/asl-groupmod:79
+msgid "there is duplicated member in adding and deleting members: %s"
+msgid_plural "there are duplicated members in adding and deleting members: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bin/asl-groupmod:117 bin/asl-samba-groupadd:36 bin/asl-groupadd:48
+msgid "group already exists: %s"
+msgstr ""
+
+#: bin/asl-usermod:48
+msgid "gecos"
+msgstr ""
+
+#: bin/asl-usermod:52
+msgid "move home directory"
+msgstr ""
+
+#: bin/asl-usermod:57
+msgid "new user name (cn and dn are updated)"
+msgstr ""
+
+#: bin/asl-usermod:62
+msgid "uid can be non unique "
+msgstr ""
+
+#: bin/asl-usermod:72
+msgid "replace supplementary groups "
+msgstr ""
+
+#: bin/asl-usermod:119
+msgid "disable this user"
+msgstr ""
+
+#: bin/asl-usermod:122
+msgid "enable this user"
+msgstr ""
+
+#: bin/asl-usermod:235 bin/asl-usermod:239
+msgid "not implemented."
+msgstr ""
+
+#: bin/asl-groupadd:17
+msgid "group type"
+msgstr ""
+
+#: bin/asl-groupadd:20
+msgid "print the gid number to stdout"
+msgstr ""