--- ldapgroups.inc	2009-08-25 08:53:20.000000000 -0500
+++ /Users/mjarrell/Sites/drupal/sites/all/modules/drupal-contrib/ldap_integration/ldapgroups.inc	2010-06-29 13:26:59.000000000 -0500
@@ -104,9 +104,9 @@ function _ldapgroups_detect_groups($user
   // Strategy 1: group extracted from user's DN.
   $dn_groups = array();
   if (_ldapgroups_ldap_info($user, 'ldapgroups_in_dn')) {
-    $pairs = explode(',', $user->ldap_dn);
+    $pairs = _ldapgroups_explode_escaped(',', $user->ldap_dn);
     foreach ($pairs as $p) {
-      $pair = explode('=', $p);
+      $pair = _ldapgroups_explode_escaped('=', $p);
       if (drupal_strtolower(trim($pair[0])) == drupal_strtolower(_ldapgroups_ldap_info($user, 'ldapgroups_dn_attribute')))
         $dn_groups[] = trim($pair[1]);
     }
@@ -317,3 +317,24 @@ function _ldapgroups_ldap_info($sid, $re
   }
 }
 
+function _ldapgroups_explode_escaped($delimiter, $string) {
+  $exploded = explode($delimiter, $string);
+  $fixed = array();
+  for ($k = 0, $l = count($exploded); $k < $l; ++$k) {
+    if ($exploded[$k][strlen($exploded[$k]) - 1] == '\\') {
+      if ($k + 1 >= $l) {
+        $fixed[] = trim($exploded[$k]);
+        break;
+      }
+      $exploded[$k][strlen($exploded[$k]) - 1] = $delimiter;
+      $exploded[$k] .= $exploded[$k + 1];
+      array_splice($exploded, $k + 1, 1);
+      --$l;
+      --$k;
+    }
+    else {
+      $fixed[] = trim($exploded[$k]);
+    }
+  }
+  return $fixed;
+}
\ No newline at end of file
