Changeset 1071 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Heimdal.pm

Timestamp:

07/24/12 22:56:06 (12 years ago)

Author:

nanardon

Message:

• rename options() to config() to clarify its role

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Heimdal.pm (modified) (7 diffs)

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

@@ -32 +32 @@
 =cut
 
-=head2 new(%options)
+=head2 new(%config)
 
 Create a new LATMOS::Ldap object for windows AD $domain.
 
-options:
+config:
 
 =over 4
@@ -73 +73 @@
 
 sub new {
-    my ($class, %options) = @_;
+    my ($class, %config) = @_;
     
     bless({}, $class);
@@ -84 +84 @@
     $self->{_heimdal} and return 1;
 
-    if (!$self->options('realm')) {
-        if ($self->options('domain')) {
-            $self->{_options}{realm} = $self->_domain2realm or do {
+    if (!$self->config('realm')) {
+        if ($self->config('domain')) {
+            $self->{_config}{realm} = $self->_domain2realm or do {
                 $self->log(LA_ERR,
                     'Cannot find kerberos TXT record for domain `%s\'',
-                    $self->options('domain'),
+                    $self->config('domain'),
                 );
                 return;
             };
-            $self->log(LA_DEBUG, 'kerberos REALM is %s', $self->options('realm'));
+            $self->log(LA_DEBUG, 'kerberos REALM is %s', $self->config('realm'));
         } else {
             # No way to find realm
@@ -99 +99 @@
         }
     }
-    my @servers = $self->options('server')
-        ? ($self->options('server'))
-        : $self->options('domain')
+    my @servers = $self->config('server')
+        ? ($self->config('server'))
+        : $self->config('domain')
             ? $self->_domain2server
             : ();
@@ -118 +118 @@
             # Port   => '8899',
             # Required:
-            Principal => $self->options('login'),
-            Realm  => $self->options('realm'),
+            Principal => $self->config('login'),
+            Realm  => $self->config('realm'),
             # --- Either ---
-            Password => $self->options('password'),
+            Password => $self->config('password'),
             # --- Or ---
-            # Keytab => $self->options('keytab'),
+            # Keytab => $self->config('keytab'),
         );
 
@@ -150 +150 @@
 
     my $resolver = Net::DNS::Resolver->new;
-    my $query = $resolver->query("_kerberos-adm._tcp." . $self->options('domain'),
+    my $query = $resolver->query("_kerberos-adm._tcp." . $self->config('domain'),
         "SRV") or return;
     foreach my $rr (
@@ -166 +166 @@
     my $resolver = Net::DNS::Resolver->new;
     my $query = $resolver->query(
-        "_kerberos." . $self->options('domain'),
+        "_kerberos." . $self->config('domain'),
         "TXT") or return;
     foreach my $rr ($query->answer) {