aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2007-06-14 10:01:04 +0000
committerJuanma Barranquero <[email protected]>2007-06-14 10:01:04 +0000
commit10aabbf959dd7d654bded66e2a70d56b922e79c6 (patch)
tree95daabf6271b666d9a3175a7b63a833e27ce7ecf
parent94d9d20c6d48013a2d8d24b4038902412948668d (diff)
(init_user_info): Fix weird formatting not following GNU coding guidelines.
-rw-r--r--src/w32.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/src/w32.c b/src/w32.c
index 9ad82c7a23..6d4e968b3c 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -486,20 +486,16 @@ init_user_info ()
the user-sid as the user id value (same for group id using the
primary group sid from the process token). */
- char user_sid[256], name[256], domain[256];
- DWORD length = sizeof (name), dlength = sizeof (domain), trash;
- HANDLE token = NULL;
- SID_NAME_USE user_type;
-
- if (
- open_process_token (GetCurrentProcess (), TOKEN_QUERY, &token)
- && get_token_information (
- token, TokenUser,
- (PVOID) user_sid, sizeof (user_sid), &trash)
- && lookup_account_sid (
- NULL, *((PSID *) user_sid), name, &length,
- domain, &dlength, &user_type)
- )
+ char user_sid[256], name[256], domain[256];
+ DWORD length = sizeof (name), dlength = sizeof (domain), trash;
+ HANDLE token = NULL;
+ SID_NAME_USE user_type;
+
+ if (open_process_token (GetCurrentProcess (), TOKEN_QUERY, &token)
+ && get_token_information (token, TokenUser,
+ (PVOID) user_sid, sizeof (user_sid), &trash)
+ && lookup_account_sid (NULL, *((PSID *) user_sid), name, &length,
+ domain, &dlength, &user_type))
{
strcpy (the_passwd.pw_name, name);
/* Determine a reasonable uid value. */
@@ -524,7 +520,7 @@ init_user_info ()
/* Get group id */
if (get_token_information (token, TokenPrimaryGroup,
- (PVOID) user_sid, sizeof (user_sid), &trash))
+ (PVOID) user_sid, sizeof (user_sid), &trash))
{
SID_IDENTIFIER_AUTHORITY * pSIA;
@@ -541,7 +537,7 @@ init_user_info ()
}
}
/* If security calls are not supported (presumably because we
- are running under Windows 95), fallback to this. */
+ are running under Windows 95), fallback to this. */
else if (GetUserName (name, &length))
{
strcpy (the_passwd.pw_name, name);