[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.71,1.15.2.72 qmailadmin.c,1.6.2.9,1.6.2.10

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6701

Modified Files:
      Tag: stable-1_2
	ChangeLog qmailadmin.c 
Log Message:
disable ability to delete postmaster account from Quick Links on main menu. [1255845] (and add error string to language file)

Index: qmailadmin.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -u -d -r1.6.2.9 -r1.6.2.10
--- qmailadmin.c	8 Aug 2005 20:53:03 -0000	1.6.2.9
+++ qmailadmin.c	10 Aug 2005 17:42:49 -0000	1.6.2.10
@@ -522,7 +522,14 @@
   } else if (vauth_getpw (username, Domain)) {
     /* POP/IMAP account */
     if (action == ACTION_MODIFY) moduser();
-    else if (action == ACTION_DELETE) deluser();
+    else if (action == ACTION_DELETE) {
+      // don't allow deletion of postmaster account
+      if (strcasecmp (username, "postmaster") == 0) {
+        snprinth (StatusMessage, sizeof(StatusMessage), "%s", html_text[317]);
+        show_menu(Username, Domain, Mytime);
+        vclose();
+      } else deluser();
+    }
   } else {
     /* check for mailing list on SQL backend (not in valias_select) */
     snprintf (dotqmailfn, sizeof(dotqmailfn), ".qmail-%s", username);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.71
retrieving revision 1.15.2.72
diff -u -d -r1.15.2.71 -r1.15.2.72
--- ChangeLog	8 Aug 2005 20:53:03 -0000	1.15.2.71
+++ ChangeLog	10 Aug 2005 17:42:49 -0000	1.15.2.72
@@ -9,6 +9,8 @@
 	Tom Collins
 	- qmailadmin.c: fix problem parsing language files that could
 	  result in SIGSEGV. [1242317]
+	- qmailadmin.c: disable ability to delete postmaster account
+	  from Quick Links on main menu. [1255845]
 
 1.2.8 - released 4-Jul-05