Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6925
Modified Files:
Tag: stable-1_2
ChangeLog user.c
Log Message:
On Modify User page, add current domain to fowarding address if it doesn't already include a domain.
Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11.2.15
retrieving revision 1.11.2.16
diff -u -d -r1.11.2.15 -r1.11.2.16
--- user.c 9 Aug 2006 21:45:25 -0000 1.11.2.15
+++ user.c 29 Aug 2006 16:57:35 -0000 1.11.2.16
@@ -928,7 +928,11 @@
count=0;
while( tmpstr != NULL && count < MAX_FORWARD_PER_USER) {
if ((*tmpstr != '|') && (*tmpstr != '/')) {
- fprintf(fs, "&%s\n", tmpstr);
+ if (strchr (tmpstr, '@') == NULL) {
+ fprintf(fs, "&%s@%s\n", tmpstr, Domain);
+ } else {
+ fprintf(fs, "&%s\n", tmpstr);
+ }
emptydotqmail = 0;
++count;
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.92
retrieving revision 1.15.2.93
diff -u -d -r1.15.2.92 -r1.15.2.93
--- ChangeLog 9 Aug 2006 21:45:22 -0000 1.15.2.92
+++ ChangeLog 29 Aug 2006 16:57:35 -0000 1.15.2.93
@@ -27,6 +27,8 @@
Tom Collins
- Create autoresponder message before creating its .qmail file.
- Deliver copy before autoresponding to ensure delivery.
+ - On Modify User page, add current domain to fowarding address
+ if it doesn't already include a domain.
1.2.10 - released 20-Feb-06
|
