Changeset 1037 for trunk

Timestamp:

05/31/12 12:30:47 (12 years ago)

Author:

nanardon

Message:

Kill redondant and not generic _param function

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Ad.pm (modified) (1 diff)
• Heimdal.pm (modified) (6 diffs)
• Heimdal/User.pm (modified) (3 diffs)
• Ldap.pm (modified) (2 diffs)
• Ldap/Onlyaddress.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad.pm

@@ -79 +79 @@
         _password => $options{password},
         _ssl => $options{ssl},
-        _param => { %options },
     };
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Heimdal.pm

@@ -75 +75 @@
     my ($class, %options) = @_;
     
-    my $self = {
-        _param => { %options },
-    };
-
-    bless($self, $class);
-}
-
-sub _param {
-    my ($self, $var) = @_;
-    return $self->{_param}{$var}
+    bless({}, $class);
 }
 
@@ -93 +84 @@
     $self->{_heimdal} and return 1;
 
-    if (!$self->_param('realm')) {
-        if ($self->_param('domain')) {
-            $self->{_param}{realm} = $self->_domain2realm or do {
+    if (!$self->options('realm')) {
+        if ($self->options('domain')) {
+            $self->{_options}{realm} = $self->_domain2realm or do {
                 $self->log(LA_ERR,
                     'Cannot find kerberos TXT record for domain `%s\'',
-                    $self->_param('domain'),
+                    $self->options('domain'),
                 );
                 return;
             };
-            $self->log(LA_DEBUG, 'kerberos REALM is %s', $self->_param('realm'));
+            $self->log(LA_DEBUG, 'kerberos REALM is %s', $self->options('realm'));
         } else {
             # No way to find realm
@@ -108 +99 @@
         }
     }
-    my @servers = $self->_param('server')
-        ? ($self->_param('server'))
-        : $self->_param('domain')
+    my @servers = $self->options('server')
+        ? ($self->options('server'))
+        : $self->options('domain')
             ? $self->_domain2server
             : ();
@@ -127 +118 @@
             # Port   => '8899',
             # Required:
-            Principal => $self->_param('login'),
-            Realm  => $self->_param('realm'),
+            Principal => $self->options('login'),
+            Realm  => $self->options('realm'),
             # --- Either ---
-            Password => $self->_param('password'),
+            Password => $self->options('password'),
             # --- Or ---
-            # Keytab => $self->_param('keytab'),
+            # Keytab => $self->options('keytab'),
         );
 
@@ -159 +150 @@
 
     my $resolver = Net::DNS::Resolver->new;
-    my $query = $resolver->query("_kerberos-adm._tcp." . $self->_param('domain'),
+    my $query = $resolver->query("_kerberos-adm._tcp." . $self->options('domain'),
         "SRV") or return;
     foreach my $rr (
@@ -175 +166 @@
     my $resolver = Net::DNS::Resolver->new;
     my $query = $resolver->query(
-        "_kerberos." . $self->_param('domain'),
+        "_kerberos." . $self->options('domain'),
         "TXT") or return;
     foreach my $rr ($query->answer) {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Heimdal/User.pm

@@ -58 +58 @@
 
     $uid eq 'default' and return 1;
-    grep { $uid eq $_ } split(/ *, */, $base->_param('ignoredusers'))
+    grep { $uid eq $_ } split(/ *, */, $base->options('ignoredusers'))
         and return 1;
 
@@ -67 +67 @@
     my ($class, $base) = @_;
 
-    my $realm = $base->_param('realm');
+    my $realm = $base->options('realm');
     my @uids;
     foreach ($base->heimdal->getPrincipals('*@' . $realm)) {
@@ -90 +90 @@
     my $ba = $base || $self->base;
     $uid ||= $self->id;
-    return $uid . '@' . $ba->_param('realm');
+    return $uid . '@' . $ba->options('realm');
 }
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap.pm

@@ -77 +77 @@
         _password => $options{password},
         _ssl => $options{ssl},
-        _param => { %options },
     };
 
     bless($self, $class);
-}
-
-sub _param {
-    my ($self, $var) = @_;
-    return $self->{_param}{$var}
 }
 
@@ -97 +91 @@
     my ($self, $otype) = @_;
     return join(',',
-        ($self->_param($otype . '_container') || 'cn=Users'),
+        ($self->options($otype . '_container') || 'cn=Users'),
         $self->top_dn,
     );

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/Onlyaddress.pm

@@ -79 +79 @@
 sub is_supported {
     my ($class, $base) = @_;
-    return $base->_param('onlyaddress_container') ? 1 : 0;
+    return $base->options('onlyaddress_container') ? 1 : 0;
 }