d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mosquitto_passwd -U

Browse Source
This commit is contained in:
Roger A. Light 2020-12-06 16:01:46 +00:00
parent 9968e35981
commit bdfa5e714a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -2,6 +2,9 @@ Broker:
- Fix websockets connections on Windows blocking subsequent connections. - Fix websockets connections on Windows blocking subsequent connections.
Closes #1934. Closes #1934.
Apps:
- Fix `mosquitto_passwd -U`
Build: Build:
- Fix cjson include paths. - Fix cjson include paths.
- Fix build using WITH_TLS=no when the openssl headers aren't available. - Fix build using WITH_TLS=no when the openssl headers aren't available.

4
apps/mosquitto_passwd/mosquitto_passwd.c
View File

@ -273,7 +273,11 @@ int delete_pwuser(FILE *fptr, FILE *ftmp, const char *username)
* ====================================================================== */ * ====================================================================== */
static int update_file_cb(FILE *fptr, FILE *ftmp, const char *username, const char *password, const char *line, struct cb_helper *helper) static int update_file_cb(FILE *fptr, FILE *ftmp, const char *username, const char *password, const char *line, struct cb_helper *helper)
{ {
if(helper){
return output_new_password(ftmp, username, password, helper->iterations); return output_new_password(ftmp, username, password, helper->iterations);
}else{
return output_new_password(ftmp, username, password, PW_DEFAULT_ITERATIONS);
}
} }
int update_file(FILE *fptr, FILE *ftmp) int update_file(FILE *fptr, FILE *ftmp)