diff options
author | Sebastian Hahn <sebastian@torproject.org> | 2010-12-26 12:13:47 +0100 |
---|---|---|
committer | Sebastian Hahn <sebastian@torproject.org> | 2010-12-27 09:47:41 +0100 |
commit | 9ecf133686c8907baec2292ca612ee11aa18406e (patch) | |
tree | 58ab4df2a31b975f4eb7d18689cc66cb4b2a0d8e /src/or/ntmain.c | |
parent | e895919b171029df4d38285b0be4483376b4ad25 (diff) | |
download | tor-9ecf133686c8907baec2292ca612ee11aa18406e.tar.gz tor-9ecf133686c8907baec2292ca612ee11aa18406e.zip |
Fix compile wanrings revealed by gcc 4.5 on mingw
Diffstat (limited to 'src/or/ntmain.c')
-rw-r--r-- | src/or/ntmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/ntmain.c b/src/or/ntmain.c index 46e7afb78b..984acc7839 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -518,7 +518,7 @@ nt_service_install(int argc, char **argv) SERVICE_DESCRIPTIONA sdBuff; char *command; char *errmsg; - const char *user_acct = GENSRV_USERACCT; + const char *user_acct = NULL; const char *password = ""; int i; OSVERSIONINFOEX info; @@ -562,13 +562,12 @@ nt_service_install(int argc, char **argv) is_win2k_or_worse = 1; } - if (user_acct == GENSRV_USERACCT) { + if (!user_acct) { if (is_win2k_or_worse) { /* On Win2k, there is no LocalService account, so we actually need to * fall back on NULL (the system account). */ printf("Running on Win2K or earlier, so the LocalService account " "doesn't exist. Falling back to SYSTEM account.\n"); - user_acct = NULL; } else { /* Genericity is apparently _so_ last year in Redmond, where some * accounts are accounts that you can look up, and some accounts @@ -577,6 +576,7 @@ nt_service_install(int argc, char **argv) */ printf("Running on a Post-Win2K OS, so we'll assume that the " "LocalService account exists.\n"); + user_acct = GENSRV_USERACCT; } } else if (0 && service_fns.LookupAccountNameA_fn(NULL, // On this system user_acct, |