[asl-commit] ActiveSambaLdap r6:
null at cozmixng.org
null at cozmixng.org
Fri Aug 3 22:31:06 EDT 2007
retro 2007-08-04 11:31:00 +0900 (Sat, 04 Aug 2007)
New Revision: 6
Modified files:
trunk/bin/asl-groupadd
trunk/bin/asl-groupmod
trunk/bin/asl-useradd
trunk/bin/asl-usermod
trunk/lib/active_samba_ldap/account.rb
trunk/lib/active_samba_ldap/command.rb
trunk/lib/active_samba_ldap/default_config.rb
trunk/lib/active_samba_ldap/group.rb
trunk/lib/active_samba_ldap/populate.rb
trunk/test/asl_test_utils.rb
trunk/test/test_asl_groupdel.rb
trunk/test/test_asl_groupmod.rb
trunk/test/test_asl_passwd.rb
trunk/test/test_asl_useradd.rb
trunk/test/test_asl_userdel.rb
trunk/test/test_asl_usermod.rb
Log:
Modified: trunk/test/test_asl_groupmod.rb (+23 -23)
===================================================================
--- trunk/test/test_asl_groupmod.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/test_asl_groupmod.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -49,7 +49,7 @@
members = []
new_group = @group_class.find(new_cn)
- new_group.memberUid(true).each do |uid|
+ new_group.member_uid(true).each do |uid|
members.concat(@user_class.find(:all,
:attribute => "uid",
:value => uid))
@@ -81,8 +81,8 @@
assert(@group_class.exists?(new_cn))
new_group = @group_class.find(new_cn)
- assert_equal(new_group.gidNumber, user1.gidNumber)
- assert_equal(new_group.gidNumber, user2.gidNumber)
+ assert_equal(new_group.gid_number, user1.gid_number)
+ assert_equal(new_group.gid_number, user2.gid_number)
end
end
end
@@ -91,8 +91,8 @@
def test_gid_number
make_dummy_group do |group|
- old_gid_number = group.gidNumber
- old_samba_sid = group.sambaSID
+ old_gid_number = group.gid_number
+ old_samba_sid = group.samba_sid
new_gid_number = old_gid_number.succ
old_rid = (2 * Integer(old_gid_number) + 1001).to_s
@@ -103,18 +103,18 @@
assert_asl_groupmod_successfully(group.cn, *args)
new_group = @group_class.find(group.cn)
- assert_equal(new_gid_number, new_group.gidNumber)
- assert_equal(new_samba_sid, new_group.sambaSID)
+ assert_equal(new_gid_number, new_group.gid_number)
+ assert_equal(new_samba_sid, new_group.samba_sid)
end
end
def test_gid_number_non_unique
make_dummy_group do |group|
- old_gid_number = group.gidNumber
+ old_gid_number = group.gid_number
make_dummy_group do |group2|
- new_gid_number = group2.gidNumber
+ new_gid_number = group2.gid_number
- old_samba_sid = group.sambaSID
+ old_samba_sid = group.samba_sid
old_rid = (2 * Integer(old_gid_number) + 1001).to_s
new_rid = (2 * Integer(new_gid_number) + 1001).to_s
new_samba_sid = old_samba_sid.sub(/#{Regexp.escape(old_rid)}$/, new_rid)
@@ -124,19 +124,19 @@
assert_asl_groupmod_failed(group.cn, message, *args)
new_group = @group_class.find(group.cn)
- assert_equal(old_gid_number, new_group.gidNumber)
- assert_equal(old_samba_sid, new_group.sambaSID)
+ assert_equal(old_gid_number, new_group.gid_number)
+ assert_equal(old_samba_sid, new_group.samba_sid)
end
end
end
def test_gid_number_allow_non_unique
make_dummy_group do |group|
- old_gid_number = group.gidNumber
+ old_gid_number = group.gid_number
make_dummy_group do |group2|
- new_gid_number = group2.gidNumber
+ new_gid_number = group2.gid_number
- old_samba_sid = group.sambaSID
+ old_samba_sid = group.samba_sid
old_rid = (2 * Integer(old_gid_number) + 1001).to_s
new_rid = (2 * Integer(new_gid_number) + 1001).to_s
new_samba_sid = old_samba_sid.sub(/#{Regexp.escape(old_rid)}$/, new_rid)
@@ -145,8 +145,8 @@
assert_asl_groupmod_successfully(group.cn, *args)
new_group = @group_class.find(group.cn)
- assert_equal(new_gid_number, new_group.gidNumber)
- assert_equal(new_samba_sid, new_group.sambaSID)
+ assert_equal(new_gid_number, new_group.gid_number)
+ assert_equal(new_samba_sid, new_group.samba_sid)
end
end
end
@@ -156,14 +156,14 @@
make_dummy_user do |user1, password1|
make_dummy_user do |user2, password2|
make_dummy_user do |user3, password3|
- old_member_uids = group.memberUid(true)
+ old_member_uids = group.member_uid(true)
new_members = [user1.uid, user2.uid]
args = ["--add-members", new_members.join(",")]
assert_asl_groupmod_successfully(group.cn, *args)
new_group = @group_class.find(group.cn)
- new_member_uids = new_group.memberUid(true)
+ new_member_uids = new_group.member_uid(true)
assert_equal(new_members.sort,
(new_member_uids - old_member_uids).sort)
@@ -182,14 +182,14 @@
group.add_member(user2)
group.add_member(user3)
- old_member_uids = group.memberUid(true)
+ old_member_uids = group.member_uid(true)
members_to_delete = [user1.uid, user2.uid]
args = ["--delete-members", members_to_delete.join(",")]
assert_asl_groupmod_successfully(group.cn, *args)
new_group = @group_class.find(group.cn)
- new_member_uids = new_group.memberUid(true)
+ new_member_uids = new_group.member_uid(true)
assert_equal(members_to_delete.sort,
(old_member_uids - new_member_uids).sort)
@@ -206,7 +206,7 @@
make_dummy_user do |user3, password3|
group.add_member(user1)
- old_member_uids = group.memberUid(true)
+ old_member_uids = group.member_uid(true)
new_members = [user2.uid, user3.uid]
args = ["--add-members", new_members.join(","),
@@ -214,7 +214,7 @@
assert_asl_groupmod_successfully(group.cn, *args)
new_group = @group_class.find(group.cn)
- new_member_uids = new_group.memberUid(true)
+ new_member_uids = new_group.member_uid(true)
assert_equal(new_members.sort,
(new_member_uids - old_member_uids).sort)
Modified: trunk/test/asl_test_utils.rb (+1 -1)
===================================================================
--- trunk/test/asl_test_utils.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/asl_test_utils.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -99,7 +99,7 @@
assert(!@user_class.exists?(name))
user = @user_class.new(name)
user.init(uid_number, gid_number)
- user.homeDirectory = home_directory
+ user.home_directory = home_directory
user.change_password(password)
user.change_samba_password(password)
user.save!
Modified: trunk/test/test_asl_groupdel.rb (+8 -8)
===================================================================
--- trunk/test/test_asl_groupdel.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/test_asl_groupdel.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -35,7 +35,7 @@
def test_primary_group_of_user
make_dummy_group do |group|
- make_dummy_user(:gid_number => group.gidNumber) do |user, password|
+ make_dummy_user(:gid_number => group.gid_number) do |user, password|
message = "cannot destroy group '#{group.cn}' due to members "
message << "who belong to the group as primary group"
message << ": #{user.uid}\n"
@@ -46,7 +46,7 @@
def test_primary_group_of_user_with_force
make_dummy_group do |group|
- make_dummy_user(:gid_number => group.gidNumber) do |user, password|
+ make_dummy_user(:gid_number => group.gid_number) do |user, password|
message = "cannot change primary group from '#{group.cn}' "
message << "to other group due to no other belonged groups"
message << ": #{user.uid}\n"
@@ -57,13 +57,13 @@
def test_primary_group_of_user_with_force_with_other_group
make_dummy_group do |group|
- make_dummy_user(:gid_number => group.gidNumber) do |user, password|
+ make_dummy_user(:gid_number => group.gid_number) do |user, password|
make_dummy_group do |group2|
group2.add_member(user)
- assert_equal(group.gidNumber, user.gidNumber)
+ assert_equal(group.gid_number, user.gid_number)
assert_equal([true, ""], run_command(group.cn, "--force"))
user.reload
- assert_equal(group2.gidNumber, user.gidNumber)
+ assert_equal(group2.gid_number, user.gid_number)
end
end
end
@@ -71,16 +71,16 @@
def test_primary_group_of_user_with_other_group
make_dummy_group do |group|
- make_dummy_user(:gid_number => group.gidNumber) do |user, password|
+ make_dummy_user(:gid_number => group.gid_number) do |user, password|
make_dummy_group do |group2|
group2.add_member(user)
- assert_equal(group.gidNumber, user.gidNumber)
+ assert_equal(group.gid_number, user.gid_number)
message = "cannot destroy group '#{group.cn}' due to members "
message << "who belong to the group as primary group"
message << ": #{user.uid}\n"
assert_equal([false, message], run_command(group.cn))
user.reload
- assert_equal(group.gidNumber, user.gidNumber)
+ assert_equal(group.gid_number, user.gid_number)
end
end
end
Modified: trunk/bin/asl-groupadd (+1 -1)
===================================================================
--- trunk/bin/asl-groupadd 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/bin/asl-groupadd 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -54,7 +54,7 @@
group = Group.create(name, create_options)
if options.print_gid_number
- puts group.gidNumber(true)
+ puts group.gid_number
end
ActiveSambaLdap::Base.restart_nscd
Modified: trunk/bin/asl-groupmod (+1 -1)
===================================================================
--- trunk/bin/asl-groupmod 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/bin/asl-groupmod 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -104,7 +104,7 @@
end
new_group.save!
group.primary_members.each do |member|
- member.change_group(new_group.gidNumber)
+ member.change_group(new_group.gid_number)
end
group.destroy(:remove_members => true)
end
Modified: trunk/lib/active_samba_ldap/default_config.rb (+4 -8)
===================================================================
--- trunk/lib/active_samba_ldap/default_config.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/lib/active_samba_ldap/default_config.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -43,16 +43,12 @@
class << self
def read(path)
if File.exist?(path)
- mod = Module.new
- def mod._binding
- binding
- end
- _binding = mod._binding
- eval(File.read(path), _binding, path, 0)
- eval("local_variables", _binding).each do |name|
+ anonymous_binding = Module.new.__send__(:binding)
+ eval(File.read(path), anonymous_binding, path, 0)
+ eval("local_variables", anonymous_binding).each do |name|
setter = "#{name}="
if self.respond_to?(setter)
- self.__send__(setter, eval(name, _binding))
+ self.__send__(setter, eval(name, anonymous_binding))
end
end
end
Modified: trunk/lib/active_samba_ldap/account.rb (+40 -39)
===================================================================
--- trunk/lib/active_samba_ldap/account.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/lib/active_samba_ldap/account.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -85,7 +85,7 @@
end
def find_available_uid_number(pool)
- uid_number = (pool.uidNumber || start_uid).to_s
+ uid_number = (pool.uid_number || start_uid).to_s
100.times do |i|
if find(:first, :attribute => "uidNumber", :value => uid_number).nil?
@@ -102,24 +102,24 @@
self.cn = uid
self.sn = uid
self.gecos = uid
- self.homeDirectory = substituted_value(:user_home) {"/nonexistent"}
- self.loginShell = substituted_value(:user_login_shell) {"/bin/false"}
- self.sambaHomePath = substituted_value(:user_samba_home)
- self.sambaHomeDrive = substituted_value(:user_home_drive)
- self.sambaProfilePath = substituted_value(:user_profile)
- self.sambaLogonScript = substituted_value(:user_script)
- self.sambaLogonTime = "0"
- self.sambaLogoffTime = FAR_FUTURE_TIME
- self.sambaKickoffTime = FAR_FUTURE_TIME
- self.sambaAcctFlags = default_account_flags
+ self.home_directory = substituted_value(:user_home) {"/nonexistent"}
+ self.login_shell = substituted_value(:user_login_shell) {"/bin/false"}
+ self.samba_home_path = substituted_value(:user_samba_home)
+ self.samba_home_drive = substituted_value(:user_home_drive)
+ self.samba_profile_path = substituted_value(:user_profile)
+ self.samba_logon_script = substituted_value(:user_script)
+ self.samba_logon_time = "0"
+ self.samba_logoff_time = FAR_FUTURE_TIME
+ self.samba_kickoff_time = FAR_FUTURE_TIME
+ self.samba_acct_flags = default_account_flags
self.change_uid_number(uid_number)
group = self.change_group(gid_number)
- self.userPassword = "{crypt}x"
- self.sambaLMPassword = "XXX"
- self.sambaNTPassword = "XXX"
- self.sambaPwdLastSet = "0"
+ self.user_password = "{crypt}x"
+ self.samba_lm_password = "XXX"
+ self.samba_nt_password = "XXX"
+ self.samba_pwd_last_set = "0"
self.enable_password_change
self.disable_forcing_password_change
@@ -151,7 +151,7 @@
def change_uid_number(uid, allow_non_unique=false)
check_unique_uid_number(uid) unless allow_non_unique
rid = self.class.uid2rid(uid)
- self.uidNumber = Integer(uid).to_s
+ self.uid_number = Integer(uid).to_s
change_sid(rid, allow_non_unique)
end
@@ -162,11 +162,11 @@
def change_sid(rid, allow_non_unique=false)
sid = "#{ActiveSambaLdap::Config.sid}-#{rid}"
# check_unique_sid_number(sid) unless allow_non_unique
- self.sambaSID = sid
+ self.samba_sid = sid
end
def rid
- Integer(sambaSID.split(/-/).last)
+ Integer(samba_sid.split(/-/).last)
end
def change_group(gid)
@@ -191,60 +191,61 @@
end
def change_password(password)
- self.userPassword = ActiveLdap::UserPassword.ssha(password)
+ self.user_password = ActiveLdap::UserPassword.ssha(password)
end
def change_samba_password(password)
- self.sambaLMPassword = Samba::Encrypt.lm_hash(password)
- self.sambaNTPassword = Samba::Encrypt.ntlm_hash(password)
- self.sambaPwdLastSet = Time.now.to_i.to_s
+ self.samba_lm_password = Samba::Encrypt.lm_hash(password)
+ self.samba_nt_password = Samba::Encrypt.ntlm_hash(password)
+ self.samba_pwd_last_set = Time.now.to_i.to_s
end
def enable_password_change
- self.sambaPwdCanChange = "0"
+ self.samba_pwd_can_change = "0"
end
def disable_password_change
- self.sambaPwdCanChange = FAR_FUTURE_TIME
+ self.samba_pwd_can_change = FAR_FUTURE_TIME
end
def can_change_password?
- sambaPwdCanChange.nil? or Time.at(sambaPwdCanChange.to_i) <= Time.now
+ samba_pwd_can_change.nil? or
+ Time.at(samba_pwd_can_change.to_i) <= Time.now
end
def enable_forcing_password_change
- self.sambaPwdMustChange = "0"
- if /X/ =~ sambaAcctFlags.to_s
- self.sambaAcctFlags = sambaAcctFlags.sub(/X/, '')
+ self.samba_pwd_must_change = "0"
+ if /X/ =~ samba_acct_flags.to_s
+ self.samba_acct_flags = samba_acct_flags.sub(/X/, '')
end
- if sambaPwdLastSet.to_i.zero?
- self.sambaPwdLastSet = FAR_FUTURE_TIME
+ if samba_pwd_last_set.to_i.zero?
+ self.samba_pwd_last_set = FAR_FUTURE_TIME
end
end
def disable_forcing_password_change
- self.sambaPwdMustChange = FAR_FUTURE_TIME
+ self.samba_pwd_must_change = FAR_FUTURE_TIME
end
def must_change_password?
- !(/X/ =~ sambaAcctFlags.to_s or
- sambaPwdMustChange.nil? or
- Time.at(sambaPwdMustChange.to_i) > Time.now)
+ !(/X/ =~ samba_acct_flags.to_s or
+ samba_pwd_must_change.nil? or
+ Time.at(samba_pwd_must_change.to_i) > Time.now)
end
def enable
- if /D/ =~ sambaAcctFlags.to_s
- self.sambaAcctFlags = sambaAcctFlags.gsub(/D/, '')
+ if /D/ =~ samba_acct_flags.to_s
+ self.samba_acct_flags = samba_acct_flags.gsub(/D/, '')
end
end
def disable
flags = ""
- if ACCOUNT_FLAGS_RE =~ sambaAcctFlags.to_s
+ if ACCOUNT_FLAGS_RE =~ samba_acct_flags.to_s
flags = $1
return if /D/ =~ flags
end
- self.sambaAcctFlags = "[D#{flags}]"
+ self.samba_acct_flags = "[D#{flags}]"
end
def enabled?
@@ -252,7 +253,7 @@
end
def disabled?
- (/D/ =~ sambaAcctFlags.to_s) ? true : false
+ (/D/ =~ samba_acct_flags.to_s) ? true : false
end
private
Modified: trunk/bin/asl-useradd (+23 -23)
===================================================================
--- trunk/bin/asl-useradd 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/bin/asl-useradd 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -245,7 +245,7 @@
group = Group.new(name)
group.change_gid_number(gid_number)
group.change_type("domain")
- group.displayName = group.cn
+ group.display_name = group.cn
group.save!
end
else
@@ -279,7 +279,7 @@
end
home_directory = substitute_member(home_directory, member)
home_directory = home_directory.gsub(/\/{2,}/, "/")
-member.homeDirectory = home_directory
+member.home_directory = home_directory
login_shell = options.shell
@@ -289,13 +289,13 @@
ActiveSambaLdap::Config.required_variables :user_login_shell
login_shell ||= ActiveSambaLdap::Config.user_login_shell
end
-member.loginShell = login_shell
+member.login_shell = login_shell
if options.computer_account
member.description = "Computer"
end
-member.givenName = options.given_name || member.uid
+member.given_name = options.given_name || member.uid
member.sn = options.surname || member.uid
if options.canonical_name
member.cn = options.canonical_name
@@ -318,7 +318,7 @@
member.gecos = member.cn
end
-member.displayName = member.cn
+member.display_name = member.cn
flags = options.samba_account_flags
if flags.nil?
@@ -328,10 +328,10 @@
flags = "[U]"
end
end
-member.sambaAcctFlags = flags
+member.samba_acct_flags = flags
unless options.computer_account
- member.userPassword = "{crypt}x"
+ member.user_password = "{crypt}x"
if options.can_change_password
member.enable_password_change
@@ -345,42 +345,42 @@
member.disable_forcing_password_change
end
- member.sambaLogonTime = '0'
- member.sambaLogoffTime = ActiveSambaLdap::User::FAR_FUTURE_TIME
+ member.samba_logon_time = '0'
+ member.samba_logoff_time = ActiveSambaLdap::User::FAR_FUTURE_TIME
if options.expire_date
- member.sambaKickoffTime = options.expire_date.to_i.to_s
+ member.samba_kickoff_time = options.expire_date.to_i.to_s
else
- member.sambaKickoffTime = ActiveSambaLdap::User::FAR_FUTURE_TIME
+ member.samba_kickoff_time = ActiveSambaLdap::User::FAR_FUTURE_TIME
end
logon_script = get_value(options, :samba_logon_script, :user_script)
- member.sambaLogonScript = substitute_member(logon_script, member)
+ member.samba_logon_script = substitute_member(logon_script, member)
home_path = get_value(options, :samba_home_path, :user_samba_home)
- member.sambaHomePath = substitute_member(home_path, member)
+ member.samba_home_path = substitute_member(home_path, member)
home_drive = get_value(options, :samba_home_drive, :user_home_drive)
home_drive = substitute_member(home_drive, member)
- member.sambaHomeDrive = home_drive.sub(/([^:])$/, "\\1:")
+ member.samba_home_drive = home_drive.sub(/([^:])$/, "\\1:")
profile_path = get_value(options, :samba_profile_path, :user_profile)
- member.sambaProfilePath = substitute_member(profile_path, member)
+ member.samba_profile_path = substitute_member(profile_path, member)
- member.sambaLMPassword = "XXX"
- member.sambaNTPassword = "XXX"
- member.sambaPwdLastSet = Time.now.to_i.to_s
+ member.samba_lm_password = "XXX"
+ member.samba_nt_password = "XXX"
+ member.samba_pwd_last_set = Time.now.to_i.to_s
end
member.save!
if pool
- pool.uidNumber = Integer(member.uidNumber).succ unless options.uid
- pool.gidNumber = Integer(group.gidNumber).succ if group
+ pool.uid_number = Integer(member.uid_number).succ unless options.uid
+ pool.gid_number = Integer(group.gid_number).succ if group
pool.save!
end
if options.setup_home_directory
- dest = member.homeDirectory
+ dest = member.home_directory
if dest
begin
FileUtils.mkdir_p(dest)
@@ -389,7 +389,7 @@
Dir.glob(File.join(skel, "*")) -
[File.join(skel, "."), File.join(skel, "..")],
dest)
- FileUtils.chown_R(member.uidNumber, member.gidNumber, dest)
+ FileUtils.chown_R(member.uid_number, member.gid_number, dest)
rescue SystemCallerror
puts $!
exit 1
@@ -398,7 +398,7 @@
end
group_class = member_class.group_class
-[member.gidNumber, *options.supplementary_groups].each do |group|
+[member.gid_number, *options.supplementary_groups].each do |group|
group = group_class.find_by_name_or_gid_number(group)
group.add_member(member)
end
Modified: trunk/test/test_asl_usermod.rb (+54 -54)
===================================================================
--- trunk/test/test_asl_usermod.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/test_asl_usermod.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -23,31 +23,31 @@
new_user = @user_class.find(user.uid)
assert_equal(new_gecos, new_user.gecos)
assert_equal(new_gecos, new_user.description)
- assert_equal(new_gecos, new_user.displayName)
+ assert_equal(new_gecos, new_user.display_name)
end
end
def test_home_directory
make_dummy_user do |user, password|
- old_home_directory = user.homeDirectory
+ old_home_directory = user.home_directory
new_home_directory = "#{old_home_directory}.new"
args = ["--home-directory", new_home_directory]
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_home_directory, new_user.homeDirectory)
+ assert_equal(new_home_directory, new_user.home_directory)
end
end
def test_move_home_directory
make_dummy_user do |user, password|
begin
- old_home_directory = user.homeDirectory
+ old_home_directory = user.home_directory
new_home_directory = "#{old_home_directory}.new"
assert(!File.exist?(new_home_directory))
args = ["--home-directory", new_home_directory, "--move-home-directory"]
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_home_directory, new_user.homeDirectory)
+ assert_equal(new_home_directory, new_user.home_directory)
assert(File.exist?(new_home_directory))
ensure
FileUtils.rm_rf(new_home_directory)
@@ -78,8 +78,8 @@
def test_uid_number
make_dummy_user do |user, password|
- old_uid_number = user.uidNumber
- old_samba_sid = user.sambaSID
+ old_uid_number = user.uid_number
+ old_samba_sid = user.samba_sid
new_uid_number = old_uid_number.succ
old_rid = (2 * Integer(old_uid_number) + 1000).to_s
@@ -90,18 +90,18 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_uid_number, new_user.uidNumber)
- assert_equal(new_samba_sid, new_user.sambaSID)
+ assert_equal(new_uid_number, new_user.uid_number)
+ assert_equal(new_samba_sid, new_user.samba_sid)
end
end
def test_uid_number_non_unique
make_dummy_user do |user, password|
- old_uid_number = user.uidNumber
+ old_uid_number = user.uid_number
new_uid_number = old_uid_number.succ
make_dummy_user(:name => "#{user.uid}2",
:uid_number => new_uid_number) do |user2, password2|
- old_samba_sid = user.sambaSID
+ old_samba_sid = user.samba_sid
old_rid = (2 * Integer(old_uid_number) + 1000).to_s
new_rid = (2 * Integer(new_uid_number) + 1000).to_s
new_samba_sid = old_samba_sid.sub(/#{Regexp.escape(old_rid)}$/, new_rid)
@@ -111,19 +111,19 @@
assert_asl_usermod_failed(user.uid, password, message, *args)
new_user = @user_class.find(user.uid)
- assert_equal(old_uid_number, new_user.uidNumber)
- assert_equal(old_samba_sid, new_user.sambaSID)
+ assert_equal(old_uid_number, new_user.uid_number)
+ assert_equal(old_samba_sid, new_user.samba_sid)
end
end
end
def test_uid_number_allow_non_unique
make_dummy_user do |user, password|
- old_uid_number = user.uidNumber
+ old_uid_number = user.uid_number
new_uid_number = old_uid_number.succ
make_dummy_user(:name => "#{user.uid}2",
:uid_number => new_uid_number) do |user2, password2|
- old_samba_sid = user.sambaSID
+ old_samba_sid = user.samba_sid
old_rid = (2 * Integer(old_uid_number) + 1000).to_s
new_rid = (2 * Integer(new_uid_number) + 1000).to_s
new_samba_sid = old_samba_sid.sub(/#{Regexp.escape(old_rid)}$/, new_rid)
@@ -132,23 +132,23 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_uid_number, new_user.uidNumber)
- assert_equal(new_samba_sid, new_user.sambaSID)
+ assert_equal(new_uid_number, new_user.uid_number)
+ assert_equal(new_samba_sid, new_user.samba_sid)
end
end
end
def test_gid_number
make_dummy_group do |group|
- make_dummy_user(:gid_number => group.gidNumber) do |user, password|
+ make_dummy_user(:gid_number => group.gid_number) do |user, password|
make_dummy_group do |new_group|
- args = ["--gid", new_group.gidNumber]
+ args = ["--gid", new_group.gid_number]
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_group.gidNumber, new_user.gidNumber)
- assert_equal(new_group.sambaSID,
- new_user.sambaPrimaryGroupSID)
+ assert_equal(new_group.gid_number, new_user.gid_number)
+ assert_equal(new_group.samba_sid,
+ new_user.samba_primary_group_sid)
end
end
end
@@ -157,9 +157,9 @@
def test_gid_number_not_exist
make_dummy_user do |user, password|
make_dummy_group do |group|
- old_gid_number = user.gidNumber
- new_gid_number = group.gidNumber
- old_samba_primary_group_sid = user.sambaPrimaryGroupSID
+ old_gid_number = user.gid_number
+ new_gid_number = group.gid_number
+ old_samba_primary_group_sid = user.samba_primary_group_sid
group.destroy
args = ["--gid", new_gid_number]
@@ -167,9 +167,9 @@
assert_asl_usermod_failed(user.uid, password, message, *args)
new_user = @user_class.find(user.uid)
- assert_equal(old_gid_number, new_user.gidNumber)
+ assert_equal(old_gid_number, new_user.gid_number)
assert_equal(old_samba_primary_group_sid,
- new_user.sambaPrimaryGroupSID)
+ new_user.samba_primary_group_sid)
end
end
end
@@ -178,13 +178,13 @@
make_dummy_group do |group1|
make_dummy_group do |group2|
make_dummy_group do |group3|
- new_gid_number1 = group1.gidNumber
- new_gid_number2 = group2.gidNumber
- new_gid_number3 = group3.gidNumber
+ new_gid_number1 = group1.gid_number
+ new_gid_number2 = group2.gid_number
+ new_gid_number3 = group3.gid_number
new_gid_numbers = [new_gid_number1, new_gid_number2, new_gid_number3]
make_dummy_user do |user, password|
- old_gid_number = user.gidNumber
+ old_gid_number = user.gid_number
old_groups = @group_class.find(:all,
:attribute => "memberUid",
:value => user.uid)
@@ -212,12 +212,12 @@
make_dummy_group do |group1|
make_dummy_group do |group2|
make_dummy_group do |group3|
- new_gid_number1 = group1.gidNumber
- new_gid_number2 = group2.gidNumber
- new_gid_number3 = group3.gidNumber
+ new_gid_number1 = group1.gid_number
+ new_gid_number2 = group2.gid_number
+ new_gid_number3 = group3.gid_number
new_gid_numbers = [new_gid_number1, new_gid_number2, new_gid_number3]
make_dummy_user do |user, password|
- old_gid_number = user.gidNumber
+ old_gid_number = user.gid_number
old_groups = @group_class.find(:all,
:attribute => "memberUid",
:value => user.uid)
@@ -253,15 +253,15 @@
def test_groups_not_exist
make_dummy_group do |group1|
make_dummy_group do |group2|
- new_gid_number1 = group1.gidNumber
- new_gid_number2 = group2.gidNumber
+ new_gid_number1 = group1.gid_number
+ new_gid_number2 = group2.gid_number
new_gid_numbers = [new_gid_number1, new_gid_number2]
group1.destroy
group2.destroy
make_dummy_user do |user, password|
- old_gid_number = user.gidNumber
+ old_gid_number = user.gid_number
assert(!@group_class.exists?(group1.cn))
@@ -286,7 +286,7 @@
def test_shell
make_dummy_user do |user, password|
- old_shell = user.loginShell
+ old_shell = user.login_shell
new_shell = "/bin/zsh"
assert_not_equal(old_shell, new_shell)
@@ -295,7 +295,7 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_shell, new_user.loginShell)
+ assert_equal(new_shell, new_user.login_shell)
end
end
@@ -327,20 +327,20 @@
def test_given_name
make_dummy_user do |user, password|
- old_given_name = user.givenName
+ old_given_name = user.given_name
new_given_name = "new-#{old_given_name}"
args = ["--given-name", new_given_name]
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_given_name, new_user.givenName)
+ assert_equal(new_given_name, new_user.given_name)
end
end
def test_expire_date
make_dummy_user do |user, password|
- old_expire_date = user.sambaKickoffTime
+ old_expire_date = user.samba_kickoff_time
new_expire_date = Time.now + 60 * 24
unless old_expire_date.nil?
@@ -351,7 +351,7 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_expire_date.to_i.to_s, new_user.sambaKickoffTime)
+ assert_equal(new_expire_date.to_i.to_s, new_user.samba_kickoff_time)
end
end
@@ -399,7 +399,7 @@
def test_samba_home_path
make_dummy_user do |user, password|
- old_samba_home_path = user.sambaHomePath
+ old_samba_home_path = user.samba_home_path
new_samba_home_path = "//PDC/NEW-HOME"
assert_not_equal(old_samba_home_path, new_samba_home_path)
@@ -408,13 +408,13 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_samba_home_path, new_user.sambaHomePath)
+ assert_equal(new_samba_home_path, new_user.samba_home_path)
end
end
def test_samba_home_drive
make_dummy_user do |user, password|
- old_samba_home_drive = user.sambaHomeDrive
+ old_samba_home_drive = user.samba_home_drive
new_samba_home_drive = "X:"
assert_not_equal(old_samba_home_drive, new_samba_home_drive)
@@ -423,13 +423,13 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_samba_home_drive, new_user.sambaHomeDrive)
+ assert_equal(new_samba_home_drive, new_user.samba_home_drive)
end
end
def test_samba_logon_script
make_dummy_user do |user, password|
- old_samba_logon_script = user.sambaLogonScript
+ old_samba_logon_script = user.samba_logon_script
new_samba_logon_script = "\\\\PDC\\scripts\\logon-new.bat"
assert_not_equal(old_samba_logon_script, new_samba_logon_script)
@@ -438,13 +438,13 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_samba_logon_script, new_user.sambaLogonScript)
+ assert_equal(new_samba_logon_script, new_user.samba_logon_script)
end
end
def test_samba_profile_path
make_dummy_user do |user, password|
- old_samba_profile_path = user.sambaProfilePath
+ old_samba_profile_path = user.samba_profile_path
new_samba_profile_path = "\\\\PDC\\profiles\\new-profile"
assert_not_equal(old_samba_profile_path, new_samba_profile_path)
@@ -453,13 +453,13 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_samba_profile_path, new_user.sambaProfilePath)
+ assert_equal(new_samba_profile_path, new_user.samba_profile_path)
end
end
def test_samba_account_flags
make_dummy_user do |user, password|
- old_samba_account_flags = user.sambaAcctFlags
+ old_samba_account_flags = user.samba_acct_flags
new_samba_account_flags = "[UX]"
assert_not_equal(old_samba_account_flags, new_samba_account_flags)
@@ -468,7 +468,7 @@
assert_asl_usermod_successfully(user.uid, password, *args)
new_user = @user_class.find(user.uid)
- assert_equal(new_samba_account_flags, new_user.sambaAcctFlags)
+ assert_equal(new_samba_account_flags, new_user.samba_acct_flags)
end
end
Modified: trunk/lib/active_samba_ldap/populate.rb (+4 -4)
===================================================================
--- trunk/lib/active_samba_ldap/populate.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/lib/active_samba_ldap/populate.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -152,7 +152,7 @@
else
group = group_class.new(name)
group.change_type(type || "domain")
- group.displayName = name
+ group.display_name = name
group.description = name || description
group.change_gid_number(gid)
@@ -197,9 +197,9 @@
def populate_make_pool(options)
Config.required_variables :samba_domain, :sid
pool = options[:unix_id_pool_class].new(Config.samba_domain)
- pool.sambaSID = Config.sid
- pool.uidNumber = options[:start_uid]
- pool.gidNumber = options[:start_gid]
+ pool.samba_sid = Config.sid
+ pool.uid_number = options[:start_uid]
+ pool.gid_number = options[:start_gid]
pool.save!
[pool]
end
Modified: trunk/bin/asl-usermod (+11 -11)
===================================================================
--- trunk/bin/asl-usermod 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/bin/asl-usermod 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -185,20 +185,20 @@
end
if options.shell
- user.loginShell = options.shell
+ user.login_shell = options.shell
end
if options.gecos
user.gecos = options.gecos
user.description = options.gecos
- user.displayName = options.gecos
+ user.display_name = options.gecos
end
if options.home_directory
if options.move_home_directory and !File.exist?(options.home_directory)
- FileUtils.mv(user.homeDirectory, options.home_directory)
+ FileUtils.mv(user.home_directory, options.home_directory)
end
- user.homeDirectory = options.home_directory
+ user.home_directory = options.home_directory
end
if options.canonical_name
@@ -210,7 +210,7 @@
end
if options.given_name
- user.givenName = options.given_name
+ user.given_name = options.given_name
end
if options.mail_addresses
@@ -238,11 +238,11 @@
end
if options.expire_date
- user.sambaKickoffTime = options.expire_date.to_i.to_s
+ user.samba_kickoff_time = options.expire_date.to_i.to_s
end
if options.samba_account_flags
- user.sambaAcctFlags = options.samba_account_flags
+ user.samba_acct_flags = options.samba_account_flags
end
unless options.can_change_password.nil?
@@ -262,19 +262,19 @@
end
if options.samba_home_path
- user.sambaHomePath = options.samba_home_path
+ user.samba_home_path = options.samba_home_path
end
if options.samba_home_drive
- user.sambaHomeDrive = options.samba_home_drive.sub(/([^:])$/, "\\1:")
+ user.samba_home_drive = options.samba_home_drive.sub(/([^:])$/, "\\1:")
end
if options.samba_logon_script
- user.sambaLogonScript = options.samba_logon_script
+ user.samba_logon_script = options.samba_logon_script
end
if options.samba_profile_path
- user.sambaProfilePath = options.samba_profile_path
+ user.samba_profile_path = options.samba_profile_path
end
unless options.enable.nil?
Modified: trunk/test/test_asl_useradd.rb (+34 -34)
===================================================================
--- trunk/test/test_asl_useradd.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/test_asl_useradd.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -102,7 +102,7 @@
uid_number = Integer(next_uid_number) + 10
assert_asl_useradd_successfully(uid, "--uid", uid_number)
user = @user_class.find(uid)
- assert_equal(uid_number, user.uidNumber.to_i)
+ assert_equal(uid_number, user.uid_number.to_i)
end
ensure_delete_computer("test-computer$") do |uid,|
@@ -110,25 +110,25 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--uid", uid_number)
computer = @computer_class.find(uid)
- assert_equal(uid_number, computer.uidNumber.to_i)
+ assert_equal(uid_number, computer.uid_number.to_i)
end
end
def test_gid_number
make_dummy_group("test-group") do |group|
- gid_number = group.gidNumber
+ gid_number = group.gid_number
ensure_delete_user("test-user") do |uid,|
assert_asl_useradd_successfully(uid, "--gid", gid_number)
user = @user_class.find(uid)
- assert_equal(gid_number, user.gidNumber)
+ assert_equal(gid_number, user.gid_number)
end
ensure_delete_computer("test-computer") do |uid,|
assert_asl_useradd_successfully(uid, "--computer-account",
"--gid", gid_number)
computer = @computer_class.find(uid)
- assert_equal(gid_number, computer.gidNumber)
+ assert_equal(gid_number, computer.gid_number)
end
end
end
@@ -137,9 +137,9 @@
make_dummy_group do |group1|
make_dummy_group do |group2|
make_dummy_group do |group3|
- gid_numbers = [group1.gidNumber,
- group2.gidNumber,
- group3.gidNumber]
+ gid_numbers = [group1.gid_number,
+ group2.gid_number,
+ group3.gid_number]
ensure_delete_user("test-user") do |uid,|
args = ["--groups", gid_numbers.join(",")]
@@ -148,7 +148,7 @@
user = @user_class.find(uid)
primary_group = @group_class.find(:first,
:attribute => "gidNumber",
- :value => user.gidNumber)
+ :value => user.gid_number)
groups = @group_class.find(:all,
:attribute => "memberUid",
:value => uid)
@@ -166,7 +166,7 @@
computer = @computer_class.find(uid)
primary_group = @group_class.find(:first,
:attribute => "gidNumber",
- :value => computer.gidNumber)
+ :value => computer.gid_number)
groups = @group_class.find(:all,
:attribute => "memberUid",
:value => uid)
@@ -191,7 +191,7 @@
user = @user_class.find(uid)
group = @group_class.find(gid)
- assert_equal(group.gidNumber, user.gidNumber)
+ assert_equal(group.gid_number, user.gid_number)
end
end
end
@@ -207,7 +207,7 @@
computer = @computer_class.find(uid)
group = @group_class.find(gid)
- assert_equal(group.gidNumber, computer.gidNumber)
+ assert_equal(group.gid_number, computer.gid_number)
end
end
end
@@ -236,7 +236,7 @@
shell = "/bin/zsh"
assert_asl_useradd_successfully(uid, "--shell", shell)
user = @user_class.find(uid)
- assert_equal(shell, user.loginShell)
+ assert_equal(shell, user.login_shell)
end
end
@@ -246,7 +246,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--shell", shell)
computer = @computer_class.find(uid)
- assert_equal(shell, computer.loginShell)
+ assert_equal(shell, computer.login_shell)
end
end
@@ -255,7 +255,7 @@
cn = "John Kennedy"
assert_asl_useradd_successfully(uid, "--canonical-name", cn)
user = @user_class.find(uid)
- assert_equal(uid, user.givenName)
+ assert_equal(uid, user.given_name)
assert_equal(uid, user.surname)
assert_equal(cn, user.cn)
end
@@ -267,7 +267,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--canonical-name", cn)
computer = @computer_class.find(uid)
- assert_equal(uid, computer.givenName)
+ assert_equal(uid, computer.given_name)
assert_equal(uid, computer.surname)
assert_equal(cn, computer.cn)
end
@@ -278,7 +278,7 @@
given_name = "John"
assert_asl_useradd_successfully(uid, "--given-name", given_name)
user = @user_class.find(uid)
- assert_equal(given_name, user.givenName)
+ assert_equal(given_name, user.given_name)
assert_equal(uid, user.cn)
end
end
@@ -289,7 +289,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--given-name", given_name)
computer = @computer_class.find(uid)
- assert_equal(given_name, computer.givenName)
+ assert_equal(given_name, computer.given_name)
assert_equal(uid, computer.cn)
end
end
@@ -323,7 +323,7 @@
"--given-name", given_name,
"--surname", surname)
user = @user_class.find(uid)
- assert_equal(given_name, user.givenName)
+ assert_equal(given_name, user.given_name)
assert_equal(surname, user.surname)
assert_equal("#{given_name} #{surname}", user.cn)
end
@@ -338,7 +338,7 @@
"--given-name", given_name,
"--surname", surname)
computer = @computer_class.find(uid)
- assert_equal(given_name, computer.givenName)
+ assert_equal(given_name, computer.given_name)
assert_equal(surname, computer.surname)
assert_equal("#{given_name} #{surname}", computer.cn)
end
@@ -421,7 +421,7 @@
expire_date = Time.now + 60 * 24
assert_asl_useradd_successfully(uid, "--expire-date", expire_date.iso8601)
user = @user_class.find(uid)
- assert_equal(expire_date.to_i.to_s, user.sambaKickoffTime)
+ assert_equal(expire_date.to_i.to_s, user.samba_kickoff_time)
end
end
@@ -431,7 +431,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--expire-date", expire_date.iso8601)
computer = @computer_class.find(uid)
- assert_nil(computer.sambaKickoffTime)
+ assert_nil(computer.samba_kickoff_time)
end
end
@@ -528,7 +528,7 @@
home_path = "\\\\ANYWHERE\\here\\%U"
assert_asl_useradd_successfully(uid, "--samba-home-path", home_path)
user = @user_class.find(uid)
- assert_equal(home_path.gsub(/%U/, uid), user.sambaHomePath)
+ assert_equal(home_path.gsub(/%U/, uid), user.samba_home_path)
end
end
@@ -538,7 +538,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--samba-home-path", home_path)
computer = @computer_class.find(uid)
- assert_nil(computer.sambaHomePath)
+ assert_nil(computer.samba_home_path)
end
end
@@ -547,7 +547,7 @@
home_drive = "X:"
assert_asl_useradd_successfully(uid, "--samba-home-drive", home_drive)
user = @user_class.find(uid)
- assert_equal(home_drive, user.sambaHomeDrive)
+ assert_equal(home_drive, user.samba_home_drive)
end
end
@@ -557,7 +557,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--samba-home-drive", home_drive)
computer = @computer_class.find(uid)
- assert_nil(computer.sambaHomeDrive)
+ assert_nil(computer.samba_home_drive)
end
end
@@ -566,7 +566,7 @@
home_drive = "X"
assert_asl_useradd_successfully(uid, "--samba-home-drive", home_drive)
user = @user_class.find(uid)
- assert_equal("#{home_drive}:", user.sambaHomeDrive)
+ assert_equal("#{home_drive}:", user.samba_home_drive)
end
end
@@ -576,7 +576,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--samba-home-drive", home_drive)
computer = @computer_class.find(uid)
- assert_nil(computer.sambaHomeDrive)
+ assert_nil(computer.samba_home_drive)
end
end
@@ -585,7 +585,7 @@
script = "%U-logon.bat"
assert_asl_useradd_successfully(uid, "--samba-logon-script", script)
user = @user_class.find(uid)
- assert_equal(script.gsub(/%U/, uid), user.sambaLogonScript)
+ assert_equal(script.gsub(/%U/, uid), user.samba_logon_script)
end
end
@@ -595,7 +595,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--samba-logon-script", script)
computer = @computer_class.find(uid)
- assert_nil(computer.sambaLogonScript)
+ assert_nil(computer.samba_logon_script)
end
end
@@ -604,7 +604,7 @@
profile = "\\\\ANYWHERE\\profiles\\profile-%U"
assert_asl_useradd_successfully(uid, "--samba-profile-path", profile)
user = @user_class.find(uid)
- assert_equal(profile.gsub(/%U/, uid), user.sambaProfilePath)
+ assert_equal(profile.gsub(/%U/, uid), user.samba_profile_path)
end
end
@@ -614,7 +614,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--samba-profile-path", profile)
computer = @computer_class.find(uid)
- assert_nil(computer.sambaProfilePath)
+ assert_nil(computer.samba_profile_path)
end
end
@@ -623,7 +623,7 @@
flags = "[UX]"
assert_asl_useradd_successfully(uid, "--samba-account-flags", flags)
user = @user_class.find(uid)
- assert_equal(flags, user.sambaAcctFlags)
+ assert_equal(flags, user.samba_acct_flags)
end
end
@@ -633,7 +633,7 @@
assert_asl_useradd_successfully(uid, "--computer-account",
"--samba-account-flags", flags)
computer = @computer_class.find(uid)
- assert_equal(flags, computer.sambaAcctFlags)
+ assert_equal(flags, computer.samba_acct_flags)
end
end
Modified: trunk/lib/active_samba_ldap/command.rb (+3 -3)
===================================================================
--- trunk/lib/active_samba_ldap/command.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/lib/active_samba_ldap/command.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -31,13 +31,13 @@
[argv, opts, options]
end
- def read_password(prompt, input=STDIN, output=STDOUT)
+ def read_password(prompt, input=$stdin, output=$stdout)
output.print prompt
system "/bin/stty -echo" if input.tty?
- password = input.gets.chomp
+ input.gets.chomp
+ ensure
system "/bin/stty echo" if input.tty?
output.puts
- password
end
end
end
Modified: trunk/test/test_asl_userdel.rb (+7 -7)
===================================================================
--- trunk/test/test_asl_userdel.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/test_asl_userdel.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -20,28 +20,28 @@
def test_exist_user
make_dummy_user do |user, password|
- assert(File.exist?(user.homeDirectory))
+ assert(File.exist?(user.home_directory))
assert_equal([true, ""], run_command(user.uid))
- assert(File.exist?(user.homeDirectory))
+ assert(File.exist?(user.home_directory))
end
end
- def test_belong_to_group
+ def test_belongs_to_group
make_dummy_user do |user, password|
- assert(File.exist?(user.homeDirectory))
+ assert(File.exist?(user.home_directory))
make_dummy_group do |group|
group.add_member(user)
assert_equal([true, ""], run_command(user.uid))
end
- assert(File.exist?(user.homeDirectory))
+ assert(File.exist?(user.home_directory))
end
end
def test_remove_home_directory
make_dummy_user do |user, password|
- assert(File.exist?(user.homeDirectory))
+ assert(File.exist?(user.home_directory))
assert_equal([true, ""], run_command("-r", user.uid))
- assert(!File.exist?(user.homeDirectory))
+ assert(!File.exist?(user.home_directory))
end
end
end
Modified: trunk/lib/active_samba_ldap/group.rb (+6 -6)
===================================================================
--- trunk/lib/active_samba_ldap/group.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/lib/active_samba_ldap/group.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -75,9 +75,9 @@
group.change_gid_number(gid_number)
group.change_type(options[:group_type] || "domain")
group.description = options[:description] || name
- group.displayName = options[:display_name] || name
+ group.display_name = options[:display_name] || name
if group.save and pool
- pool.gidNumber = Integer(group.gidNumber).succ
+ pool.gid_number = Integer(group.gid_number).succ
pool.save!
end
group
@@ -206,7 +206,7 @@
def change_gid_number(gid, allow_non_unique=false)
check_unique_gid_number(gid) unless allow_non_unique
rid = self.class.gid2rid(gid)
- self.gidNumber = gid.to_s
+ self.gid_number = gid.to_s
change_sid(rid, allow_non_unique)
end
@@ -217,11 +217,11 @@
def change_sid(rid, allow_non_unique=false)
sid = "#{ActiveSambaLdap::Config.sid}-#{rid}"
# check_unique_sid_number(sid) unless allow_non_unique
- self.sambaSID = sid
+ self.samba_sid = sid
end
def rid
- Integer(sambaSID.split(/-/).last)
+ Integer(samba_sid.split(/-/).last)
end
def change_type(type)
@@ -233,7 +233,7 @@
else
raise ArgumentError, "invalid type: #{type}"
end
- self.sambaGroupType = type.to_s
+ self.samba_group_type = type.to_s
end
def remove_member(member_or_uid)
Modified: trunk/test/test_asl_passwd.rb (+2 -2)
===================================================================
--- trunk/test/test_asl_passwd.rb 2006-11-12 00:29:03 -15:00 (rev 5)
+++ trunk/test/test_asl_passwd.rb 2007-08-04 11:31:00 +09:00 (rev 6)
@@ -93,9 +93,9 @@
def assert_samba_password(user, password)
_wrap_assertion do
assert_equal(Samba::Encrypt.lm_hash(password),
- user.sambaLMPassword)
+ user.samba_lm_password)
assert_equal(Samba::Encrypt.ntlm_hash(password),
- user.sambaNTPassword)
+ user.samba_nt_password)
end
end
More information about the asl-commit
mailing list