bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dlload ConvertStringSidToSid, does not exist on NT

This commit is contained in:
Doug MacEachern 2005-10-02 21:13:26 +00:00
parent 90c453d4ac
commit 3974333f06
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/os/win32/sigar_os.h
View File

@ -204,6 +204,9 @@ typedef struct {
} MIB_UDPEXTABLE, *PMIB_UDPEXTABLE; } MIB_UDPEXTABLE, *PMIB_UDPEXTABLE;
/* end undocumented structures */ /* end undocumented structures */
typedef BOOL (CALLBACK *LPCONVERTSTRINGSID)(LPCSTR, PSID *);
typedef DWORD (CALLBACK *LPGETIPFORWARDTABLE)(PMIB_IPFORWARDTABLE, PULONG, BOOL); typedef DWORD (CALLBACK *LPGETIPFORWARDTABLE)(PMIB_IPFORWARDTABLE, PULONG, BOOL);
typedef DWORD (CALLBACK *LPGETIFTABLE)(PMIB_IFTABLE, PULONG, BOOL); typedef DWORD (CALLBACK *LPGETIFTABLE)(PMIB_IFTABLE, PULONG, BOOL);
@ -279,11 +282,13 @@ struct sigar_t {
HKEY handle; HKEY handle;
char *perfbuf; char *perfbuf;
DWORD perfbuf_size; DWORD perfbuf_size;
HINSTANCE adv_handle;
HINSTANCE ip_handle; HINSTANCE ip_handle;
HINSTANCE nt_handle; HINSTANCE nt_handle;
HINSTANCE ps_handle; HINSTANCE ps_handle;
HINSTANCE wts_handle; HINSTANCE wts_handle;
HINSTANCE sta_handle; HINSTANCE sta_handle;
LPCONVERTSTRINGSID convert_string_sid;
LPGETIFTABLE get_if_table; LPGETIFTABLE get_if_table;
LPGETIPFORWARDTABLE get_ipforward_table; LPGETIPFORWARDTABLE get_ipforward_table;
LPGETTCPTABLE get_tcp_table; LPGETTCPTABLE get_tcp_table;

20
src/os/win32/win32_sigar.c
View File

@ -258,6 +258,17 @@ int sigar_os_open(sigar_t **sigar)
(*sigar)->ip_handle = NULL; (*sigar)->ip_handle = NULL;
} }
if ((h = LoadLibrary("advapi32.dll"))) {
(*sigar)->convert_string_sid =
(LPCONVERTSTRINGSID)GetProcAddress(h,
"ConvertStringSidToSidA");
(*sigar)->adv_handle = h;
}
else {
(*sigar)->adv_handle = NULL;
(*sigar)->convert_string_sid = NULL;
}
if ((h = LoadLibrary("Ntdll.dll"))) { if ((h = LoadLibrary("Ntdll.dll"))) {
(*sigar)->get_ntsys_info = (*sigar)->get_ntsys_info =
(LPSYSINFO)GetProcAddress(h, "NtQuerySystemInformation"); (LPSYSINFO)GetProcAddress(h, "NtQuerySystemInformation");
@ -2212,15 +2223,16 @@ static int get_logon_info(HKEY users,
return SIGAR_OK; return SIGAR_OK;
} }
/*XXX dlload, not in NT */
BOOL WINAPI ConvertStringSidToSidA(LPCSTR, PSID *);
static int sigar_who_registry(sigar_t *sigar, static int sigar_who_registry(sigar_t *sigar,
sigar_who_list_t *wholist) sigar_who_list_t *wholist)
{ {
HKEY users; HKEY users;
DWORD index=0, status; DWORD index=0, status;
if (!sigar->convert_string_sid) {
return ENOENT;
}
status = RegOpenKey(HKEY_USERS, NULL, &users); status = RegOpenKey(HKEY_USERS, NULL, &users);
if (status != ERROR_SUCCESS) { if (status != ERROR_SUCCESS) {
return status; return status;
@ -2249,7 +2261,7 @@ static int sigar_who_registry(sigar_t *sigar,
continue; continue;
} }
if (!ConvertStringSidToSidA(subkey, &sid)) { if (!sigar->convert_string_sid(subkey, &sid)) {
continue; continue;
} }