--- resolver-myvocs.xml	2007-07-30 12:57:31.576618060 -0500
+++ resolver-myvocs.xml-new	2007-07-30 08:29:11.000000000 -0500
@@ -19,8 +19,7 @@
     </SimpleAttributeDefinition>
 
     <SimpleAttributeDefinition
-	id="urn:mace:dir:attribute-def:eduPersonPrincipalName"
-	smartScope="myvocs-box">
+	id="urn:mace:dir:attribute-def:eduPersonPrincipalName">
 	<DataConnectorDependency requires="echo"/>
     </SimpleAttributeDefinition>
 
@@ -41,7 +40,7 @@
                 from
 		   admin_table at, netidmap nim
                 where
-		   at.user_admin = nim.email and nim.netid = concat(?,"@myvocs-box")
+		   at.user_admin = nim.email and nim.netid = ?
 
                 union
 
@@ -52,7 +51,7 @@
                 from
 		   subscriber_table st, netidmap nim
                 where
-		   st.user_subscriber = nim.email and nim.netid = concat(?,"@myvocs-box")
+		   st.user_subscriber = nim.email and nim.netid = ?
 
                 union
 
@@ -63,7 +62,7 @@
 		from
 		   user_table ut, netidmap nim                 
 		where
-		   ut.email_user = nim.email and nim.netid = concat(?,"@myvocs-box")
+		   ut.email_user = nim.email and nim.netid = ?
 
          </Query>