v. 2023.08.27
Combined patch for qmailadmin-1.2.16 by Roberto Puzzanghera
more info at https://notes.sagredo.eu/en/qmail-notes-185/qmailadmin-23.html
=================================================================================================
= This patch puts together
* Roberto Puzzanghera's qmailadmin-skin patch
Provides a new responsive skin to the control panel.
It modifies everything under the html dir and many .c files in order to adjust the
html that the original author embedded into the source files.
Added a stylesheet style.css in the images folder and a couple of png files for the qmail logo.
https://notes.sagredo.eu/files/qmail/patches/qmailadmin/skin/
* catchall patch by Luca Franceschini
Restore the catch all account functiinality
https://notes.sagredo.eu/files/qmail/patches/qmailadmin/qmailadmin-catchall.patch
* qmail-log (unknown author)
Gets the program to log authentication failures. This makes possibile to ban malicious
IPs via fail2ban. It is required to create the log file /var/log/qma-auth.log
initially and assign write priviledges to apache.
https://notes.sagredo.eu/files/qmail/patches/qmailadmin/qmailadmin-1.2.16-log.patch
* mailinglist.c.ezmlm7 patch (unknown author)
Provides compatibility with ezmlm v. 7
https://notes.sagredo.eu/files/qmail/patches/qmailadmin/mailinglist.c.ezmlm7.patch
* cracklib patch by Inter7. Improved by Roberto Puzzanghera
Check for the password strenght. Requires the cracklib library and a configure rebuild.
https://notes.sagredo.eu/files/qmail//patches//qmailadmin//cracklib/qmailadmin-cracklib.patch
== Changelog
* 2023.08.27
Cosmetic adjustment to the skin patch on alias.c
* 2023.04.26
Bug fix in qmailadmin/passwd: it was changing the password also in case of cracklib alert
tx Alexandre Fonseca https://notes.sagredo.eu/en/qmail-notes-185/qmailadmin-23.html#comment3079
* 2022.08.08
Minor modifications to the "skin patch"
-user.c: cosmetics adjustments to the html output
-lang/it: minor corrections to the translations
* 2022.04.01
-qmailadmin now logs to stderr when qma-auth.log can't be opened in write mode. It was returning a white
screen without any error message nor on screen, nor on stderr.
* 2021.03.12
-patch cleanup
* 2020.09.02
-mod_user.html: cleaned the html as it was printing unneeded strings
* 2020.08.10
-mod_user.html: added value attribute to the name/gecos input tag (tx Pablo Murillo)
* 2020.05.22
-mod_user.html: removed "required" attribute on password field, to allow modification
with no password change
* 2020.05.05
First release of the patch
==================================================================================================
diff -ruN ../qmailadmin-1.2.16-original/Makefile.am qmailadmin-1.2.16/Makefile.am
--- ../qmailadmin-1.2.16-original/Makefile.am 2011-02-22 15:45:48.000000000 +0100
+++ qmailadmin-1.2.16/Makefile.am 2023-04-25 21:24:22.989104609 +0200
@@ -79,4 +79,4 @@
chmod 644 $(DESTDIR)@htmllibdir@/lang/*
$(mkinstalldirs) $(DESTDIR)@imagedir@
cp $(srcdir)/images/*.png $(DESTDIR)@imagedir@
-
+ cp $(srcdir)/images/*.css $(DESTDIR)@imagedir@
diff -ruN ../qmailadmin-1.2.16-original/alias.c qmailadmin-1.2.16/alias.c
--- ../qmailadmin-1.2.16-original/alias.c 2011-02-22 15:45:47.000000000 +0100
+++ qmailadmin-1.2.16/alias.c 2023-08-27 15:24:40.386436778 +0200
@@ -305,11 +305,11 @@
*/
printf ("%s", HTML_ALIAS_ROW_START);
- qmail_button (this_alias, "deldotqmail", user, dom, mytime, "trash.png");
+ qmail_button (this_alias, "deldotqmail", user, dom, mytime, "delete_forever");
if (*curalias->alias_command == '#')
printf ("%s", HTML_EMPTY_TD); /* don't allow modify on blackhole */
else
- qmail_button (this_alias, "moddotqmail", user, dom, mytime, "modify.png");
+ qmail_button (this_alias, "moddotqmail", user, dom, mytime, "create");
printh (HTML_ALIAS_NAME, this_alias);
printf (HTML_ALIAS_DEST_START);
@@ -511,7 +511,8 @@
if (strcmp(Action,"delentry")==0) {
if (onevalidonly(ActionUser) ) {
snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[149]);
- } else if (dotqmail_del_line(ActionUser,LineData) ) {
+ }
+ else if (dotqmail_del_line(ActionUser,LineData) ) {
snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", html_text[150], 1);
} else {
snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[151] );
@@ -591,7 +592,8 @@
return(-1);
/* check to see if we already have a user with this name (only for create) */
- } else if (create != 0 && check_local_user(forwardname)) {
+ }
+ else if (create != 0 && check_local_user(forwardname)) {
snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", html_text[175], forwardname);
return(-1);
}
@@ -715,7 +717,7 @@
*s = '\0';
if ((s = strrchr(user, '/')) == NULL) return NULL;
- if (b != NULL) { snprinth (user, sizeof(user), "%H (%H)", s+1, b); }
+ if (b != NULL) { snprinth (user, sizeof(user), "%H (%H)", s+1, b); }
else { snprinth (user, sizeof(user), "%H", s+1); }
return (user);
@@ -739,7 +741,7 @@
/* back up to pipe or first slash to remove path */
while (line[len] != '/' && line[len] != '|') len--;
len++; /* len is now first char of program name */
- snprinth (command, sizeof(command), "%H", &line[len]);
+ snprinth (command, sizeof(command), "%H", &line[len]);
return(command);
} else {
diff -ruN ../qmailadmin-1.2.16-original/autorespond.c qmailadmin-1.2.16/autorespond.c
--- ../qmailadmin-1.2.16-original/autorespond.c 2011-02-22 15:45:47.000000000 +0100
+++ qmailadmin-1.2.16/autorespond.c 2023-04-25 21:24:22.989104609 +0200
@@ -77,17 +77,17 @@
for (i = 0; (addr = sort_get_entry(i)); ++i) {
printf ("
![](\"%s/trash.png\")
", IMAGEURL);
+ printf ("");
printf ("![](\"%s/modify.png\")
", IMAGEURL);
+ printf ("");
printf ("