Skip to content

Commit

Permalink
Fix formatting with astyle.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Stone committed Oct 15, 2023
1 parent 1b44088 commit 4a88f78
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion common/os_calls.c
Original file line number Diff line number Diff line change
Expand Up @@ -3374,7 +3374,7 @@ g_clearenv(void)
environ = 0;
#endif
#endif
LOG_DEVEL(LOG_LEVEL_TRACE, "--g_clearenv()");
LOG_DEVEL(LOG_LEVEL_TRACE, "--g_clearenv()");
}

/*****************************************************************************/
Expand Down
50 changes: 25 additions & 25 deletions xrdp/xrdp_mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2605,35 +2605,35 @@ xrdp_mm_connect_sm(struct xrdp_mm *self)

gw_username = xrdp_mm_get_value(self, "pamusername");
gw_password = xrdp_mm_get_value(self, "pampassword");
if( gw_username != NULL )
{
if ( gw_username != NULL )
{
if (!g_strcmp(gw_username, "same"))
{
gw_username = xrdp_mm_get_value(self, "username");
}
if( !g_strncmp("ask", gw_username, 3))
{
gw_username = self->wm->session->client_info->username;
}
}

if (gw_password != NULL )
{
if( !g_strcmp(gw_password, "same"))
{
gw_password = xrdp_mm_get_value(self, "password");
}
if( !g_strncmp("ask", gw_password, 3))
{
gw_password = self->wm->session->client_info->password;
}
}
else
{
}

if ( !g_strncmp("ask", gw_username, 3))
{
gw_username = self->wm->session->client_info->username;
}
}

if (gw_password != NULL )
{
if ( !g_strcmp(gw_password, "same"))
{
gw_password = xrdp_mm_get_value(self, "password");
}

if ( !g_strncmp("ask", gw_password, 3))
{
gw_password = self->wm->session->client_info->password;
}
}
else
{
gw_password = xrdp_mm_get_value(self, "password");
}
}

if (gw_username == NULL || gw_password == NULL)
{
Expand Down

0 comments on commit 4a88f78

Please sign in to comment.