mango r137 - in trunk: . lib

[ovitters svn gnome org]

Author: ovitters
Date: Sat May 17 08:31:22 2008
New Revision: 137
URL: http://svn.gnome.org/viewvc/mango?rev=137&view=rev

Log:
	* lib/user.php: When adding new SSH keys: Only add
	pubkeyAuthenticationUser objectclass if that objectclass is missing
	instead of assuming it isn't there if there aren't any SSH keys.
	Allows adding of SSH keys for people who had their SSH key removed due
	to Debian/Ubuntu SSH security issue.



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

Modified: trunk/lib/user.php
==============================================================================
--- trunk/lib/user.php	(original)
+++ trunk/lib/user.php	Sat May 17 08:31:22 2008
@@ -283,7 +283,7 @@
             foreach($newkeys as $key) {
                 $keychanges['authorizedKey'][] = $key;
             }
-            if(count($olduser->authorizedKeys) == 0) {
+            if (!$olduser->pubkeyauthenticationuser) {
                 $keychanges['objectclass'][] = "pubkeyAuthenticationUser";
                 $changes[] = "pubkeyauthenabled";
             }