Changeset 11514 for trunk

Timestamp:

10/20/08 07:23:30 (3 months ago)

Author:

javier.amor.garcia@…

Message:

EBox::MailUserLdap::getUserLdapValue does not longer assumme that the user exists

Location:

trunk/client/mail

Files:

• ChangeLog (modified) (1 diff)
• src/EBox/MailUserLdap.pm (modified) (3 diffs)

trunk/client/mail/ChangeLog

@@ -1 +1 @@
 0.12.100
-        + EBox::MailUserLdap::userAccount does not longer assumme that the user exists
+        + EBox::MailUserLdap::userAccount and  EBox::MailUserLdap::getUserLdapValue  dont longer assumme that the user exists
 0.12.99
         + Add support for reporting

trunk/client/mail/src/EBox/MailUserLdap.pm

@@ -234 +234 @@
 #               uid - uid of the user
 #               value - the atribute name
+#
+# Returns: 
+#    the value of the attribute. Undef if either the user ot the attribute
+#    does not exists
 sub getUserLdapValue   #uid, ldap value
 {
@@ -248 +252 @@
     my $result = $self->{ldap}->search(\%args);
     my $entry = $result->entry(0);
+    if (not defined $entry) {
+        EBox::warn("Inexistent user $uid asked for LDAP attribute $value");
+        return undef;
+    }
+
     
     return $entry->get_value($value);
 }
 
+
+# Method: existsUserLdapValue
+#
+#   checks whether a LDAP attribute exists on a given user
+#
+# Parameters:
+#
+#               uid - uid of the user
+#               value - the atribute name
+#  Returns:
+#       true if the user and the LDAP attribute exist.  Undef if either the user ot the attribute
+#    does not exists
 sub existsUserLdapValue  
 {
@@ -805 +826 @@
   my $result = $self->{ldap}->search(\%args);
   my $entry = $result->entry(0);
+  if (not defined $entry) {
+      EBox::warn("Inexistent user: $username");
+      return ();
+  }
 
   my $mdsize = $entry->get_value('userMaildirSize');