Refactoring LDAP package
This commit is contained in:
parent
34c7a6b6f0
commit
a3bd738b0f
3 changed files with 195 additions and 266 deletions
|
@ -24,8 +24,9 @@ my %actions =
|
|||
"update" => \&group_update,
|
||||
);
|
||||
|
||||
sub group_new($$)
|
||||
sub group_new($$$)
|
||||
{
|
||||
my $ldap = shift;
|
||||
my $dn = shift;
|
||||
my $args = shift;
|
||||
|
||||
|
@ -38,8 +39,9 @@ sub group_new($$)
|
|||
}
|
||||
}
|
||||
|
||||
sub group_add($$)
|
||||
sub group_add($$$)
|
||||
{
|
||||
my $ldap = shift;
|
||||
my $dn = shift;
|
||||
my $args = shift;
|
||||
|
||||
|
@ -51,23 +53,25 @@ sub group_add($$)
|
|||
}
|
||||
}
|
||||
|
||||
sub group_delete($$)
|
||||
sub group_delete($$$)
|
||||
{
|
||||
return LDAP::delete_entry(shift);
|
||||
return LDAP::delete_entry($_[0], $_[1]);
|
||||
}
|
||||
|
||||
sub group_flush($$)
|
||||
{
|
||||
my $ldap = shift;
|
||||
my $dn = shift;
|
||||
my $args = shift;
|
||||
|
||||
my $cnt_type = group_get_type $args->{param};
|
||||
|
||||
return LDAP::flush_attribute($dn, $cnt_type);
|
||||
return LDAP::flush_attribute($ldap, $dn, $cnt_type);
|
||||
}
|
||||
|
||||
sub group_remove($$)
|
||||
{
|
||||
my $ldap = shift;
|
||||
my $dn = shift;
|
||||
my $args = shift;
|
||||
|
||||
|
@ -78,11 +82,12 @@ sub group_remove($$)
|
|||
push @data, $i;
|
||||
}
|
||||
|
||||
return LDAP::delete_attributes($dn, $cnt_type, \@data);
|
||||
return LDAP::delete_attributes($ldap, $dn, $cnt_type, @data);
|
||||
}
|
||||
|
||||
sub group_update($$)
|
||||
{
|
||||
my $ldap = shift;
|
||||
my $dn = shift;
|
||||
my $args = shift;
|
||||
|
||||
|
@ -93,7 +98,7 @@ sub group_update($$)
|
|||
push @data, $i;
|
||||
}
|
||||
|
||||
LDAP::update_attribute($dn, $cnt_type, \@data);
|
||||
LDAP::update_attribute($ldap, $dn, $cnt_type, @data);
|
||||
}
|
||||
|
||||
|
||||
|
@ -127,7 +132,11 @@ sub process
|
|||
return "Unknown command for update_group: ". $action;
|
||||
}
|
||||
|
||||
return $actions{$action}($dn, $args);
|
||||
my $ldap = LDAP::ldap_connect();
|
||||
|
||||
$actions{$action}($ldap, $dn, $args);
|
||||
|
||||
$ldap->unbind or print "couldn't disconnect correctly";
|
||||
}
|
||||
|
||||
Process::register("update_group", \&process);
|
||||
|
|
Reference in a new issue