Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
3ff5158b
Commit
3ff5158b
authored
Aug 02, 2011
by
Max-Wilhelm Bruker
Browse files
server crash fix
parent
4f4049fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
common/server.cpp
View file @
3ff5158b
...
@@ -56,9 +56,13 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
...
@@ -56,9 +56,13 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
if
(
authState
==
PasswordWrong
)
if
(
authState
==
PasswordWrong
)
return
authState
;
return
authState
;
ServerInfo_User
*
data
=
getUserData
(
name
);
name
=
data
->
getName
();
// Compensate for case indifference
if
(
authState
==
PasswordRight
)
{
if
(
authState
==
PasswordRight
)
{
if
(
users
.
contains
(
name
))
{
if
(
users
.
contains
(
name
))
{
qDebug
(
"Login denied: would overwrite old session"
);
qDebug
(
"Login denied: would overwrite old session"
);
delete
data
;
return
WouldOverwriteOldSession
;
return
WouldOverwriteOldSession
;
}
}
}
else
if
(
authState
==
UnknownUser
)
{
}
else
if
(
authState
==
UnknownUser
)
{
...
@@ -71,8 +75,6 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
...
@@ -71,8 +75,6 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
name
=
tempName
;
name
=
tempName
;
}
}
ServerInfo_User
*
data
=
getUserData
(
name
);
name
=
data
->
getName
();
// Compensate for case indifference
session
->
setUserInfo
(
data
);
session
->
setUserInfo
(
data
);
users
.
insert
(
name
,
session
);
users
.
insert
(
name
,
session
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment