changeset 25891:103846690fc2

8049046: Deprecated Function in hotspot/src/os/solaris/vm/attachListener_solaris.cpp Summary: replace door_cred with door_ucred call Reviewed-by: dholmes, sspitsyn
author dsamersoff
date Mon, 28 Jul 2014 07:31:17 -0700
parents 4d54044eecb5
children 96f35069b4f5 03808d9a48b2
files hotspot/src/os/solaris/vm/attachListener_solaris.cpp
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/os/solaris/vm/attachListener_solaris.cpp	Thu Jul 24 13:18:15 2014 -0700
+++ b/hotspot/src/os/solaris/vm/attachListener_solaris.cpp	Mon Jul 28 07:31:17 2014 -0700
@@ -199,23 +199,29 @@
 // Calls from the door function to check that the client credentials
 // match this process. Returns 0 if credentials okay, otherwise -1.
 static int check_credentials() {
-  door_cred_t cred_info;
+  ucred_t *cred_info = NULL;
+  int ret = -1; // deny by default
 
   // get client credentials
-  if (door_cred(&cred_info) == -1) {
-    return -1; // unable to get them
+  if (door_ucred(&cred_info) == -1) {
+    return -1; // unable to get them, deny
   }
 
   // get our euid/eguid (probably could cache these)
   uid_t euid = geteuid();
   gid_t egid = getegid();
 
-  // check that the effective uid/gid matches - discuss this with Jeff.
-  if (cred_info.dc_euid == euid && cred_info.dc_egid == egid) {
-    return 0;  // okay
-  } else {
-    return -1; // denied
+  // get euid/egid from ucred_free
+  uid_t ucred_euid = ucred_geteuid(cred_info);
+  gid_t ucred_egid = ucred_getegid(cred_info);
+
+  // check that the effective uid/gid matches
+  if (ucred_euid == euid && ucred_egid == egid) {
+    ret =  0;  // allow
   }
+
+  ucred_free(cred_info);
+  return ret;
 }