diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-02-05 21:15:52 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-02-05 21:15:52 +0000 |
| commit | 8b238404de08ebbef65b578c86d1ae1adff3ee31 (patch) | |
| tree | b7b48951a0cbfe8fbb6ff2e577e31408eb3d97ab /src/or | |
| parent | 337fdb7eb6b78f78449d496f1b5ab6a4eb67cd1e (diff) | |
| download | tor-8b238404de08ebbef65b578c86d1ae1adff3ee31.tar tor-8b238404de08ebbef65b578c86d1ae1adff3ee31.tar.gz | |
r11646@catbus: nickm | 2007-02-05 16:15:48 -0500
Make default NT service user be LocalService. Again, I have no idea if this compiles, let alone if it works.
svn:r9487
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index 61f49c569..a1b145bf7 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -77,7 +77,7 @@ int has_completed_circuit=0; #define GENSRV_DISPLAYNAME TEXT("Tor Win32 Service") #define GENSRV_DESCRIPTION \ TEXT("Provides an anonymous Internet communication system") -#define GENSRV_USERACCT TEXT("NT AUTHORITY\\NetworkService") +#define GENSRV_USERACCT TEXT("NT AUTHORITY\\LocalService") // Cheating: using the pre-defined error codes, tricks Windows into displaying // a semi-related human-readable error message if startup fails as @@ -1766,9 +1766,18 @@ struct service_fns { DWORD dwNumServiceArgs, LPCTSTR* lpServiceArgVectors); + BOOL (WINAPI *LookupAccountNameA_fn)( + LPCTSTR lpSystemName, + LPCTSTR lpAccountName, + PSID Sid, + LPDWORD cbSid, + LPTSTR ReferencedDomainName, + LPDWORD cchReferencedDomainName, + PSID_NAME_USE peUse); } service_fns = { 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL }; + NULL, NULL, NULL, NULL, NULL, NULL, + NULL}; /** Loads functions used by NT services. Returns 0 on success, or -1 on * error. */ @@ -1811,6 +1820,7 @@ nt_service_loadlibrary(void) LOAD(SetServiceStatus); LOAD(StartServiceCtrlDispatcherA); LOAD(StartServiceA); + LOAD(LookupAccountNameA); service_fns.loaded = 1; @@ -2145,7 +2155,8 @@ nt_service_install(int argc, char **argv) char *command; char *errmsg; const char *user_acct = GENSRV_USERACCT; - int i; + int i,r; + SID_NAMED_USE sidUse; if (nt_service_loadlibrary()<0) return -1; @@ -2166,6 +2177,20 @@ nt_service_install(int argc, char **argv) } } + if (service_fns.LookupAccountNameA_fn(NULL, // On this system + user_acct, + NULL, 0, // Don't care about the SID + NULL, 0, // Don't care about the domain + &sidUse) == 0) { + printf("User \"%s\" doesn't seem to exist.\n", user_acct); + if (user_acct != GENSRV_USERACCT) + return -1; + /* On Win2k, there is no LocalService account, so we actually need to + * check for it. Yay win2k. */ + printf("Falling back to SYSTEM account.\n"); + user_acct = NULL; + } + /* Create the Tor service, set to auto-start on boot */ if ((hService = service_fns.CreateServiceA_fn(hSCManager, GENSRV_SERVICENAME, GENSRV_DISPLAYNAME, |