Index: ldapdata.module
===================================================================
--- ldapdata.module	(revision 56)
+++ ldapdata.module	(working copy)
@@ -565,20 +565,24 @@
 function ldapdata_user_profile_load(&$user) {
   global $ldapdata_ldap;  
   $ldap_drupal_reverse_mappings = _ldapdata_reverse_mappings($user->ldap_config);
-  $ldap_drupal_mappings = array_flip($ldap_drupal_reverse_mappings);  
 
-  // Retrieve profile fields list
+  // Retrieve profile fields list.
   $profile_fields = _ldapdata_retrieve_profile_fields();
 
-  // compare against mapped fields list
+  // Compare against mapped fields list.
   $writeout = array();
   $entry = $ldapdata_ldap->retrieveAttributes($user->ldap_dn);
+
   foreach ($profile_fields as $key => $field ) {
-    if (in_array($key, $ldap_drupal_mappings)) {
-      $writeout[$field] = $entry[strtolower($ldap_drupal_reverse_mappings[$key])][0];
+    if (array_key_exists($key, $ldap_drupal_reverse_mappings)) {
+      $ldap_value = $entry[strtolower($ldap_drupal_reverse_mappings[$key])][0];
+      if ($user->$field != $ldap_value) {
+        $writeout[$field] = $ldap_value;
+      }
     }
   }
-  // Write coincidences to Drupal DB
+
+  // Write udpated fields to Drupal.
   foreach ($writeout as $field => $value) {
     $result = db_fetch_array(db_query("SELECT fid FROM {profile_fields} WHERE name = '%s'", $field));
     $fid = $result['fid'];
@@ -836,6 +840,12 @@
 
 function _ldapdata_retrieve_profile_fields() {
 
+  static $fields;
+
+  if (isset($fields)) {
+    return $fields;
+  }
+
   $sql = 'SELECT * FROM {profile_fields}';
   $result = db_query($sql);
   $fields = array();
