From 2df5207518ea5d4de2510c19caa24687d8ac1077 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 28 Jan 2013 16:43:01 -0800
Subject: [PATCH] GuacamoleConfigurationPermission should take identifier as
 subject, not actual GuacamoleConfiguration.

---
 .../GuacamoleConfigurationPermission.java     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/GuacamoleConfigurationPermission.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/GuacamoleConfigurationPermission.java
index a7c96be76..6e2838aee 100644
--- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/GuacamoleConfigurationPermission.java
+++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/permission/GuacamoleConfigurationPermission.java
@@ -37,23 +37,23 @@ package net.sourceforge.guacamole.net.auth.permission;
  *
  * ***** END LICENSE BLOCK ***** */
 
-import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
-
 
 /**
  * A permission which controls operations that directly affect a specific
- * GuacamoleConfiguration.
+ * GuacamoleConfiguration. Note that this permission only refers to the
+ * GuacamoleConfiguration by its identifier. The actual GuacamoleConfiguration
+ * is not stored within.
  * 
  * @author Michael Jumper
  */
 public class GuacamoleConfigurationPermission
-    implements ObjectPermission<GuacamoleConfiguration> {
+    implements ObjectPermission<String> {
 
     /**
-     * The GuacamoleConfiguration associated with the operation affected by
-     * this permission.
+     * The identifier of the GuacamoleConfiguration associated with the
+     * operation affected by this permission.
      */
-    private GuacamoleConfiguration subject;
+    private String subject;
 
     /**
      * The type of operation affected by this permission.
@@ -65,11 +65,10 @@ public class GuacamoleConfigurationPermission
      * and subject.
      * 
      * @param type The type of operation affected by this permission.
-     * @param subject The GuacamoleConfiguration associated with the operation
-     *                affected by this permission.
+     * @param subject The identifier of the GuacamoleConfiguration associated
+     *                with the operation affected by this permission.
      */
-    public GuacamoleConfigurationPermission(Type type,
-            GuacamoleConfiguration subject) {
+    public GuacamoleConfigurationPermission(Type type, String subject) {
         
         this.subject = subject;
         this.type = type;
@@ -77,7 +76,7 @@ public class GuacamoleConfigurationPermission
     }
 
     @Override
-    public GuacamoleConfiguration getSubject() {
+    public String getSubject() {
         return subject;
     }