mango r150 - in trunk: . lib

[ovitters svn gnome org]

Author: ovitters
Date: Thu May 22 13:45:13 2008
New Revision: 150
URL: http://svn.gnome.org/viewvc/mango?rev=150&view=rev

Log:
	* lib/user.php: Only remove pubkeyAuthenticationUser if user currently
	has that object.



Modified:
   trunk/ChangeLog
   trunk/lib/user.php

Modified: trunk/lib/user.php
==============================================================================
--- trunk/lib/user.php	(original)
+++ trunk/lib/user.php	Thu May 22 13:45:13 2008
@@ -266,10 +266,13 @@
             foreach($removedkeys as $key) {
                 $keychanges['authorizedKey'][] = $key;
             }
-            if(count($this->authorizedKeys) == 0) {
+            if ($this->->pubkeyauthenticationuser
+                && count($this->authorizedKeys) == 0)
+            {
                 $keychanges['objectclass'][] = "pubkeyAuthenticationUser";
                 $changes[] = array('id'=>"pubkeyauthdisabled");
             }
+
             $result = ldap_mod_del($ldap, $dn, $keychanges);
             if(!$result) {
                 $pe = PEAR::raiseError("LDAP (user keys) delete failed: ".ldap_error($ldap));