[Javanetsim-cvs] IceScan/icesockets sock_types.h, 1.22, 1.23 sock_win.h, 1.8, 1.9

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/IceScan/icesockets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16803/icesockets

Modified Files:
	sock_types.h sock_win.h 
Log Message:


Index: sock_types.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_types.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** sock_types.h	17 Dec 2006 19:21:15 -0000	1.22
--- sock_types.h	17 Dec 2006 19:52:23 -0000	1.23
***************
*** 11,14 ****
--- 11,15 ----
  #include <string>
  #include <iostream> //for std
+ #include <algorithm> 
  
  #include <sys/types.h>

Index: sock_win.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_win.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sock_win.h	17 Dec 2006 15:51:54 -0000	1.8
--- sock_win.h	17 Dec 2006 19:52:23 -0000	1.9
***************
*** 30,33 ****
--- 30,34 ----
      #include <process.h>
      #include <Iphlpapi.h>
+ 	#include <lmcons.h>
  
      WSADATA start_sockets(){
***************
*** 50,56 ****
  	}
  
  	int getuid(){
! 		return 1; //UGLY, FIXIT!
  	}	
  #else
      
--- 51,170 ----
  	}
  
+ 	BOOL IsCurrentUserLocalAdministrator(void);
+ 
  	int getuid(){
! 		return (int)!(IsCurrentUserLocalAdministrator()); //UGLY, FIXIT!
  	}	
+ 
+ 	//from MS Q118626:
+ 	BOOL IsCurrentUserLocalAdministrator(void)
+ 	{
+ 	   BOOL   fReturn         = FALSE;
+ 	   DWORD  dwStatus;
+ 	   DWORD  dwAccessMask;
+ 	   DWORD  dwAccessDesired;
+ 	   DWORD  dwACLSize;
+ 	   DWORD  dwStructureSize = sizeof(PRIVILEGE_SET);
+ 	   PACL   pACL            = NULL;
+ 	   PSID   psidAdmin       = NULL;
+ 
+ 	   HANDLE hToken              = NULL;
+ 	   HANDLE hImpersonationToken = NULL;
+ 
+ 	   PRIVILEGE_SET   ps;
+ 	   GENERIC_MAPPING GenericMapping;
+ 
+ 	   PSECURITY_DESCRIPTOR     psdAdmin           = NULL;
+ 	   SID_IDENTIFIER_AUTHORITY SystemSidAuthority = SECURITY_NT_AUTHORITY;
+ 
+ 	   const DWORD ACCESS_READ  = 1;
+ 	   const DWORD ACCESS_WRITE = 2;
+ 
+ 
+ 	   __try
+ 	   {
+ 
+ 		  if (!OpenThreadToken(GetCurrentThread(), TOKEN_DUPLICATE|TOKEN_QUERY, TRUE, &hToken))
+ 		  {
+ 			 if (GetLastError() != ERROR_NO_TOKEN)
+ 				__leave;
+ 
+ 			 if (!OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &hToken))
+ 				__leave;
+ 		  }
+ 
+ 		  if (!DuplicateToken (hToken, SecurityImpersonation, &hImpersonationToken))
+ 			  __leave;
+ 
+ 
+ 		  if (!AllocateAndInitializeSid(&SystemSidAuthority, 2,
+ 										SECURITY_BUILTIN_DOMAIN_RID,
+ 										DOMAIN_ALIAS_RID_ADMINS,
+ 										0, 0, 0, 0, 0, 0, &psidAdmin))
+ 			 __leave;
+ 
+ 		  psdAdmin = LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
+ 		  if (psdAdmin == NULL)
+ 			 __leave;
+ 
+ 		  if (!InitializeSecurityDescriptor(psdAdmin, SECURITY_DESCRIPTOR_REVISION))
+ 			 __leave;
+ 
+ 		  dwACLSize = sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) +
+ 					  GetLengthSid(psidAdmin) - sizeof(DWORD);
+ 
+ 		  pACL = (PACL)LocalAlloc(LPTR, dwACLSize);
+ 		  if (pACL == NULL)
+ 			 __leave;
+ 
+ 		  if (!InitializeAcl(pACL, dwACLSize, ACL_REVISION2))
+ 			 __leave;
+ 
+ 		  dwAccessMask= ACCESS_READ | ACCESS_WRITE;
+ 
+ 		  if (!AddAccessAllowedAce(pACL, ACL_REVISION2, dwAccessMask, psidAdmin))
+ 			 __leave;
+ 
+ 		  if (!SetSecurityDescriptorDacl(psdAdmin, TRUE, pACL, FALSE))
+ 			 __leave;
+ 
+ 		  SetSecurityDescriptorGroup(psdAdmin, psidAdmin, FALSE);
+ 		  SetSecurityDescriptorOwner(psdAdmin, psidAdmin, FALSE);
+ 
+ 		  if (!IsValidSecurityDescriptor(psdAdmin))
+ 			 __leave;
+ 
+ 		  dwAccessDesired = ACCESS_READ;
+ 
+ 		  /*
+ 			 Initialize GenericMapping structure even though you
+ 			 do not use generic rights.
+ 		  */
+ 		  GenericMapping.GenericRead    = ACCESS_READ;
+ 		  GenericMapping.GenericWrite   = ACCESS_WRITE;
+ 		  GenericMapping.GenericExecute = 0;
+ 		  GenericMapping.GenericAll     = ACCESS_READ | ACCESS_WRITE;
+ 
+ 		  if (!AccessCheck(psdAdmin, hImpersonationToken, dwAccessDesired,
+ 						   &GenericMapping, &ps, &dwStructureSize, &dwStatus,
+ 						   &fReturn))
+ 		  {
+ 			 fReturn = FALSE;
+ 			 __leave;
+ 		  }
+ 	   }
+ 	   __finally
+ 	   {
+ 		  // Clean up.
+ 		  if (pACL) LocalFree(pACL);
+ 		  if (psdAdmin) LocalFree(psdAdmin);
+ 		  if (psidAdmin) FreeSid(psidAdmin);
+ 		  if (hImpersonationToken) CloseHandle (hImpersonationToken);
+ 		  if (hToken) CloseHandle (hToken);
+ 	   }
+ 
+ 	   return fReturn;
+ 	}
+ 
  #else