Skip to content
Permalink
Browse files

Fix setting an empty SuperUser password not creating an error

Mistakenly checked string for empty instead of null resulting
in a set but empty string not causing the correct error message.
Instead the request to set a password was ignored and the server
started normally. This patch resolves this issue. If the password
is set but empty an error is emitted and the server isn't started.

Fixes #1778
  • Loading branch information...
hacst committed Aug 6, 2015
1 parent 857e839 commit d39e773900963cbecb11cabc5d8fac7d3aeb176f
Showing with 3 additions and 2 deletions.
  1. +3 −2 src/murmur/main.cpp
@@ -405,9 +405,10 @@ int main(int argc, char **argv) {
}
#endif

if (! supw.isEmpty()) {
if (supw.isEmpty())
if (!supw.isNull()) {
if (supw.isEmpty()) {
qFatal("Superuser password can not be empty");
}
ServerDB::setSUPW(sunum, supw);
qFatal("Superuser password set on server %d", sunum);
}

0 comments on commit d39e773

Please sign in to comment.
You can’t perform that action at this time.