--- xnu/xnu-792.22.5/iokit/Kernel/RootDomainUserClient.cpp
+++ xnu/xnu-517/iokit/Kernel/RootDomainUserClient.cpp
@@ -1,19 +1,16 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -23,7 +20,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
@@ -32,7 +29,6 @@
 
 #include <IOKit/assert.h>
 #include <IOKit/IOLib.h>
-#include <IOKit/IOKitKeys.h>
 #include <IOKit/IOBufferMemoryDescriptor.h>
 #include "RootDomainUserClient.h"
 #include <IOKit/pwr_mgt/IOPMLibDefs.h>
@@ -45,21 +41,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-bool RootDomainUserClient::initWithTask(task_t owningTask, void *security_id, 
-					UInt32 type, OSDictionary * properties)
-{
-    if (properties)
-	properties->setObject(kIOUserClientCrossEndianCompatibleKey, kOSBooleanTrue);
-
-    if (!super::initWithTask(owningTask, security_id, type, properties))
-	return false;
-
-    fOwningTask = owningTask;
-    task_reference (fOwningTask);    
-    return true;
-}
-
-
 bool RootDomainUserClient::start( IOService * provider )
 {
     assert(OSDynamicCast(IOPMrootDomain, provider));
@@ -71,63 +52,10 @@
     return true;
 }
 
-IOReturn RootDomainUserClient::secureSleepSystem( int *return_code )
-{
-    int             local_priv = 0;
-    int             admin_priv = 0;
-    IOReturn        ret = kIOReturnNotPrivileged;
-
-    ret = clientHasPrivilege(fOwningTask, kIOClientPrivilegeLocalUser);
-    local_priv = (kIOReturnSuccess == ret);
-    
-    ret = clientHasPrivilege(fOwningTask, kIOClientPrivilegeAdministrator);
-    admin_priv = (kIOReturnSuccess == ret);
-
-    if((local_priv || admin_priv) && fOwner) {
-        *return_code = fOwner->sleepSystem();
-        return kIOReturnSuccess;
-    } else {
-        *return_code = kIOReturnNotPrivileged;
-        return kIOReturnSuccess;
-    }
-
-}
-
-IOReturn RootDomainUserClient::secureSetAggressiveness( 
-    unsigned long   type,
-    unsigned long   newLevel,
-    int             *return_code )
-{
-    int             local_priv = 0;
-    int             admin_priv = 0;
-    IOReturn        ret = kIOReturnNotPrivileged;
-
-    ret = clientHasPrivilege(fOwningTask, kIOClientPrivilegeLocalUser);
-    local_priv = (kIOReturnSuccess == ret);
-    
-    ret = clientHasPrivilege(fOwningTask, kIOClientPrivilegeAdministrator);
-    admin_priv = (kIOReturnSuccess == ret);
-
-    if((local_priv || admin_priv) && fOwner) {
-        *return_code = fOwner->setAggressiveness(type, newLevel);
-        return kIOReturnSuccess;
-    } else {
-        *return_code = kIOReturnNotPrivileged;
-        return kIOReturnSuccess;
-    }
-
-}
-
 
 IOReturn RootDomainUserClient::clientClose( void )
 {
     detach(fOwner);
-    
-    if(fOwningTask) {
-        task_deallocate(fOwningTask);
-        fOwningTask = 0;
-    }   
-    
     return kIOReturnSuccess;
 }
 
@@ -136,13 +64,13 @@
 {
     static IOExternalMethod sMethods[] = {
         { // kPMSetAggressiveness, 0
-            (IOService *)1, (IOMethod)&RootDomainUserClient::secureSetAggressiveness, kIOUCScalarIScalarO, 2, 1
+            0, (IOMethod)&IOPMrootDomain::setAggressiveness, kIOUCScalarIScalarO, 2, 0
         },
         { // kPMGetAggressiveness, 1
             0, (IOMethod)&IOPMrootDomain::getAggressiveness, kIOUCScalarIScalarO, 1, 1
         },
         { // kPMSleepSystem, 2
-            (IOService *)1, (IOMethod)&RootDomainUserClient::secureSleepSystem, kIOUCScalarIScalarO, 0, 1
+            0, (IOMethod)&IOPMrootDomain::sleepSystem, kIOUCScalarIScalarO, 0, 0
         },
         { // kPMAllowPowerChange, 3
             0, (IOMethod)&IOPMrootDomain::allowPowerChange, kIOUCScalarIScalarO, 1, 0
@@ -157,10 +85,10 @@
             0, (IOMethod)&IOPMrootDomain::restartSystem, kIOUCScalarIScalarO, 0, 0
         },
         { // kPMSetPreventative, 7
-            (IOService *)1, (IOMethod)&RootDomainUserClient::setPreventative, kIOUCScalarIScalarO, 2, 0
+            1, (IOMethod) &RootDomainUserClient::setPreventative, kIOUCScalarIScalarO, 2, 0
         },
     };
-    
+
     if(index >= kNumPMMethods)
     	return NULL;
     else {