diff -Naur qmailadmin-0.42/Makefile.am qmailadmin-0.42-nosysadmin/Makefile.am
--- qmailadmin-0.42/Makefile.am	Sun Dec 17 12:10:24 2000
+++ qmailadmin-0.42-nosysadmin/Makefile.am	Mon Feb 19 03:23:13 2001
@@ -14,7 +14,7 @@
 qmailadmin_DEPENDENCIES=$(COMMONDEPENDENCIES)
 
 COMMONSOURCES=qmailadmin.c alias.c autorespond.c forward.c mailinglist.c \
-	      sysadmin.c user.c util.c auth.c template.c \
+	      user.c util.c auth.c template.c \
 	      command.c show.c cgi.c limits.c dotqmail.c
 
 qmailadmin_SOURCES=$(COMMONSOURCES) 
diff -Naur qmailadmin-0.42/Makefile.in qmailadmin-0.42-nosysadmin/Makefile.in
--- qmailadmin-0.42/Makefile.in	Wed Jan 10 22:26:31 2001
+++ qmailadmin-0.42-nosysadmin/Makefile.in	Mon Feb 19 03:23:13 2001
@@ -81,7 +81,7 @@
 
 qmailadmin_DEPENDENCIES = $(COMMONDEPENDENCIES)
 
-COMMONSOURCES = qmailadmin.c alias.c autorespond.c forward.c mailinglist.c 	      sysadmin.c user.c util.c auth.c template.c 	      command.c show.c cgi.c limits.c dotqmail.c
+COMMONSOURCES = qmailadmin.c alias.c autorespond.c forward.c mailinglist.c 	      user.c util.c auth.c template.c 	      command.c show.c cgi.c limits.c dotqmail.c
 
 
 qmailadmin_SOURCES = $(COMMONSOURCES) 
@@ -98,7 +98,7 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 qmailadmin_OBJECTS =  qmailadmin.o alias.o autorespond.o forward.o \
-mailinglist.o sysadmin.o user.o util.o auth.o template.o command.o \
+mailinglist.o user.o util.o auth.o template.o command.o \
 show.o cgi.o limits.o dotqmail.o
 qmailadmin_LDFLAGS = 
 CFLAGS = @CFLAGS@
@@ -117,7 +117,7 @@
 GZIP_ENV = --best
 DEP_FILES =  .deps/alias.P .deps/auth.P .deps/autorespond.P .deps/cgi.P \
 .deps/command.P .deps/dotqmail.P .deps/forward.P .deps/limits.P \
-.deps/mailinglist.P .deps/qmailadmin.P .deps/show.P .deps/sysadmin.P \
+.deps/mailinglist.P .deps/qmailadmin.P .deps/show.P  \
 .deps/template.P .deps/user.P .deps/util.P
 SOURCES = $(qmailadmin_SOURCES)
 OBJECTS = $(qmailadmin_OBJECTS)
diff -Naur qmailadmin-0.42/alias.c qmailadmin-0.42-nosysadmin/alias.c
--- qmailadmin-0.42/alias.c	Wed Jan 10 22:06:08 2001
+++ qmailadmin-0.42-nosysadmin/alias.c	Mon Feb 19 03:23:13 2001
@@ -34,7 +34,7 @@
 
 show_aliases()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -58,7 +58,7 @@
  char *alias_name_from_command;
  int i,j,stop,k,startnumber;
 
-    if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+    if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
         exit(0);
     }
@@ -158,7 +158,7 @@
 	closedir(mydir);
 
 	fprintf(actout,"<tr><td colspan=5><center>\n");
-	if ( AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN ) {
+	if ( AdminType==DOMAIN_ADMIN ) {
 	 char *type;
 
 		if( strcmp(dottype,"forward") == 0 ){
@@ -194,7 +194,7 @@
  char *dot_file;
  int l,j;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -351,7 +351,7 @@
 
 moddotqmail()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -460,7 +460,7 @@
  struct passwd *pw;
  int err;
 
-	if (AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN && 
+	if (AdminType!=DOMAIN_ADMIN && 
 		!(AdminType==USER_ADMIN && strcmp(ActionUser, Username)==0)) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
@@ -522,7 +522,7 @@
 deldotqmail()
 {
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -541,7 +541,7 @@
 deldotqmailnow()
 {
 
-	if (AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN && 
+	if (AdminType!=DOMAIN_ADMIN && 
 		!(AdminType==USER_ADMIN && !strcmp(ActionUser, Username))) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		show_menu(Username, Domain, Mytime);
@@ -572,7 +572,7 @@
  char *dot_file;  
  int l;
 
-	if (AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN && 
+	if (AdminType!=DOMAIN_ADMIN && 
 	  !(AdminType==USER_ADMIN && !strcmp(ActionUser, Username))) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		show_menu(Username, Domain, Mytime);
diff -Naur qmailadmin-0.42/auth.c qmailadmin-0.42-nosysadmin/auth.c
--- qmailadmin-0.42/auth.c	Fri Dec 15 03:43:10 2000
+++ qmailadmin-0.42-nosysadmin/auth.c	Mon Feb 19 03:23:13 2001
@@ -124,7 +124,5 @@
 		} else {
 			AdminType = USER_ADMIN;
 		}
-	} else {
-		AdminType = SYSTEM_ADMIN;
 	}
 }
diff -Naur qmailadmin-0.42/autorespond.c qmailadmin-0.42-nosysadmin/autorespond.c
--- qmailadmin-0.42/autorespond.c	Sun Dec 17 12:14:53 2000
+++ qmailadmin-0.42-nosysadmin/autorespond.c	Mon Feb 19 03:23:13 2001
@@ -91,7 +91,7 @@
 addautorespond()
 {
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -114,7 +114,7 @@
  FILE *fs;
  int i;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -202,7 +202,7 @@
 
 delautorespond()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -214,7 +214,7 @@
  int i;
  int pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -241,7 +241,7 @@
 
 modautorespond()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -254,7 +254,7 @@
  FILE *fs;
  int i;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
diff -Naur qmailadmin-0.42/command.c qmailadmin-0.42-nosysadmin/command.c
--- qmailadmin-0.42/command.c	Wed Oct 18 21:17:30 2000
+++ qmailadmin-0.42-nosysadmin/command.c	Mon Feb 19 03:32:25 2001
@@ -186,12 +186,6 @@
 		show_login();
 	} else if ( strncmp(TmpBuf2,"showcounts", MAX_BUFF) == 0 ) {
 		show_counts();
-	} else if ( strncmp(TmpBuf2,"enterdomain", MAX_BUFF) == 0 ) {
-		show_menu(Username, Domain, Mytime);
-	} else if ( strncmp(TmpBuf2,"adddomain", MAX_BUFF) == 0 ) {
-		add_domain();
-	} else if ( strncmp(TmpBuf2,"deldomain", MAX_BUFF) == 0 ) {
-		del_domain();
 	}
 	exit(0);
 }
diff -Naur qmailadmin-0.42/forward.c qmailadmin-0.42-nosysadmin/forward.c
--- qmailadmin-0.42/forward.c	Tue Dec  5 20:05:53 2000
+++ qmailadmin-0.42-nosysadmin/forward.c	Mon Feb 19 03:23:13 2001
@@ -39,7 +39,7 @@
  char *dir;
 {
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
diff -Naur qmailadmin-0.42/mailinglist.c qmailadmin-0.42-nosysadmin/mailinglist.c
--- qmailadmin-0.42/mailinglist.c	Mon Dec 18 21:38:42 2000
+++ qmailadmin-0.42-nosysadmin/mailinglist.c	Mon Feb 19 03:23:13 2001
@@ -38,7 +38,7 @@
  time_t mytime;
  char *dir;
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -61,7 +61,7 @@
  char mailinglist_name[MAX_FILE_NAME];
  int i,j;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -154,7 +154,7 @@
  char mailinglist_name[MAX_FILE_NAME];
  int i,j, cnt = 0;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -215,7 +215,7 @@
 
 addmailinglist()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -238,7 +238,7 @@
 
 delmailinglist()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -252,7 +252,7 @@
  DIR *mydir;
  struct dirent *mydirent;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -311,7 +311,7 @@
 	int  loop;
 	int  num_choices;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -424,7 +424,7 @@
  FILE *fs;
  int i,handles[2],pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -469,7 +469,7 @@
  FILE *fs;
  int i,handles[2],pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -510,7 +510,7 @@
 
 addlistuser()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -519,7 +519,7 @@
 
 addlistmod()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -531,7 +531,7 @@
  int i, result;
  int pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -565,7 +565,7 @@
  int i, result;
  int pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -595,7 +595,7 @@
 
 dellistuser()
 {
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -630,7 +630,7 @@
 dellistmod()
 {
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -668,7 +668,7 @@
  int i;
  int pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -698,7 +698,7 @@
  int i;
  int pid;
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
diff -Naur qmailadmin-0.42/qmailadmin.c qmailadmin-0.42-nosysadmin/qmailadmin.c
--- qmailadmin-0.42/qmailadmin.c	Wed Jan 10 21:46:26 2001
+++ qmailadmin-0.42-nosysadmin/qmailadmin.c	Mon Feb 19 03:24:38 2001
@@ -167,11 +167,6 @@
 			if ( seteuid(Uid) != 0 ) perror("setuid");
 		}
 
-		if ( strncmp(TmpBuf2,"showfile", MAX_BUFF) == 0 ) {
-			GetValue(TmpCGI,Message, "manpage=",MAX_BIG_BUFF);
-			GetValue(TmpCGI,ActionUser, "dir=",MAX_BUFF);
-			show_file();
-		}
 		exit(0);
 	
 
diff -Naur qmailadmin-0.42/qmailadmin.h qmailadmin-0.42-nosysadmin/qmailadmin.h
--- qmailadmin-0.42/qmailadmin.h	Fri Jan 19 18:22:03 2001
+++ qmailadmin-0.42-nosysadmin/qmailadmin.h	Mon Feb 19 03:23:13 2001
@@ -36,7 +36,6 @@
 */
 
 #define NO_ADMIN		0
-#define SYSTEM_ADMIN	1
 #define DOMAIN_ADMIN	2
 #define USER_ADMIN		3
 
diff -Naur qmailadmin-0.42/show.c qmailadmin-0.42-nosysadmin/show.c
--- qmailadmin-0.42/show.c	Wed Oct 18 20:53:29 2000
+++ qmailadmin-0.42-nosysadmin/show.c	Mon Feb 19 03:23:13 2001
@@ -29,90 +29,6 @@
 #include "qmailadmin.h"
 #include "qmailadminx.h"
 
-show_locals()
-{
- FILE *fs;
- char tmpbuf[30];
-
-	sprintf(tmpbuf, "%s/control/locals", QMAILDIR);
-	fs = fopen(tmpbuf, "r");
-	if ( fs == NULL ) {
-		fprintf(actout, "%s/control/locals not found\n", QMAILDIR);
-		return(0);
-	}
-
-	fprintf(actout,"Locals<BR>\n");
-	fprintf(actout,"<TABLE>\n");
-	while( fgets(TmpBuf, MAX_BUFF, fs) != NULL ) {
-		fprintf(actout,"<TR><TD align=center>%s</TD></TR>\n", TmpBuf);
-	}
-	fprintf(actout,"</TABLE>\n");
-	fclose(fs);
-}
-show_rcpthosts()
-{
- FILE *fs;
- char tmpbuf[30];
-
-	sprintf(tmpbuf, "%s/control/rcpthosts", QMAILDIR);
-
-	fs = fopen(tmpbuf, "r");
-	if ( fs == NULL ) {
-		fprintf(actout, "%s/control/rcpthosts not found\n", QMAILDIR);
-		return(0);
-	}
-
-	fprintf(actout,"Rcpthosts<BR>\n");
-	fprintf(actout,"<TABLE>\n");
-	while( fgets(TmpBuf, MAX_BUFF, fs) != NULL ) {
-		fprintf(actout,"<TR><TD align=center>%s</TD></TR>\n", TmpBuf);
-	}
-	fprintf(actout,"</TABLE>\n");
-	fclose(fs);
-}
-show_virtualdomains()
-{
- FILE *fs;
- char tmpbuf[30];
-
-	sprintf(tmpbuf, "%s/control/virtualdomains", QMAILDIR);
-
-	fs = fopen(tmpbuf, "r");
-	if ( fs == NULL ) {
-		fprintf(actout, "%s/control/virtualdomains not found\n", QMAILDIR);
-		return(0);
-	}
-
-	fprintf(actout,"virtualdomains<BR>\n");
-	fprintf(actout,"<TABLE>\n");
-	while( fgets(TmpBuf, MAX_BUFF, fs) != NULL ) {
-		fprintf(actout,"<TR><TD align=center>%s</TD></TR>\n", TmpBuf);
-	}
-	fprintf(actout,"</TABLE>\n");
-	fclose(fs);
-}
-
-show_assign()
-{
- FILE *fs;
- char tmpbuf[30];
-
-	sprintf(tmpbuf, "%s/control/assign", QMAILDIR);
-
-	fs = fopen(tmpbuf, "r");
-	if ( fs == NULL ) {
-		fprintf(actout, "%s not found\n", tmpbuf);
-		return(0);
-	}
-
-	fprintf(actout,"assign<BR>\n");
-	fprintf(actout,"<TABLE>\n");
-	while( fgets(TmpBuf, MAX_BUFF, fs) != NULL ) {
-		fprintf(actout,"<TR><TD align=center>%s</TD></TR>\n", TmpBuf);
-	}
-	fprintf(actout,"</TABLE>\n");
-	fclose(fs);
-}
 
 show_menu(user, dom, mytime)
  char *user;
diff -Naur qmailadmin-0.42/template.c qmailadmin-0.42-nosysadmin/template.c
--- qmailadmin-0.42/template.c	Fri Jan 19 18:23:35 2001
+++ qmailadmin-0.42-nosysadmin/template.c	Mon Feb 19 03:23:13 2001
@@ -94,7 +94,7 @@
 					case 'v':
 						fprintf(actout,"<BR><FONT SIZE=2 COLOR=red><B>%s</B><BR>",
 							get_html_text("001"));
-						if (AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN){
+						if (AdminType==DOMAIN_ADMIN){
 							if (MaxPopAccounts !=0 ) {
 								fprintf(actout, "<A href=%s/com/showusers?user=%s&time=%i&dom=%s&>\
 <FONT SIZE=2 COLOR=BLACK><B>%s</B></a><BR>\n",
@@ -139,7 +139,7 @@
 								get_html_text("123"));
 						}
 
-						if (AdminType==SYSTEM_ADMIN||AdminType==DOMAIN_ADMIN){
+						if (AdminType==DOMAIN_ADMIN){
 							fprintf(actout,
 								"<BR><FONT SIZE=2 COLOR=red><B>%s</B><BR>\n",
 								get_html_text("124"));
@@ -218,32 +218,28 @@
 
 					/* show the aliases stuff */
 					case 'l':
-						if ( AdminType == SYSTEM_ADMIN || 
-							 AdminType == DOMAIN_ADMIN ) {
+						if ( AdminType == DOMAIN_ADMIN ) {
 							show_aliases(Username,Domain,Mytime,RealDir);
 						}
 						break;
 
 					/* show the forwards */
 					case 'f':
-						if ( AdminType == SYSTEM_ADMIN || 
-							 AdminType == DOMAIN_ADMIN ) {
+						if ( AdminType == DOMAIN_ADMIN ) {
 							show_forwards(Username,Domain,Mytime,RealDir);
 						}
 						break;
 
 					/* show the mailing lists */
 					case 'm':
-						if ( AdminType == SYSTEM_ADMIN || 
-							 AdminType == DOMAIN_ADMIN ) {
+						if ( AdminType == DOMAIN_ADMIN ) {
 							show_mailing_lists(Username,Domain,Mytime,RealDir);
 						}
 						break;
 
 					/* show the autoresponder stuff */
 					case 'r':
-						if ( AdminType == SYSTEM_ADMIN || 
-							 AdminType == DOMAIN_ADMIN ) {
+						if ( AdminType == DOMAIN_ADMIN ) {
 							show_autoresponders(Username,Domain,Mytime,RealDir);
 						}
 						break;
diff -Naur qmailadmin-0.42/user.c qmailadmin-0.42-nosysadmin/user.c
--- qmailadmin-0.42/user.c	Wed Jan 10 22:23:00 2001
+++ qmailadmin-0.42-nosysadmin/user.c	Mon Feb 19 03:23:13 2001
@@ -123,7 +123,7 @@
 	 * otherwise repeat previous page 
 	 */
 	pw = vauth_getall(dom,1,1);
-	if ( AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN ||
+	if ( AdminType==DOMAIN_ADMIN ||
 		(AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)){
 
 		for (k = 0; k < startnumber; ++k) { 
@@ -140,7 +140,7 @@
 		while( ( pw != NULL ) && ((k < MAXUSERSPERPAGE + startnumber) ||  
 		        ( AdminType!=DOMAIN_ADMIN || AdminType!=DOMAIN_ADMIN || 
 				(AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) {
-			if ( AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN || 
+			if ( AdminType==DOMAIN_ADMIN || 
 				(AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)){
 
 				fprintf(actout,"<TR><TD>%s</TD>", pw->pw_name);
@@ -151,7 +151,7 @@
 			
 				if ( strncmp( pw->pw_name, "postmaster", 11) == 0 ) {
 					fprintf(actout, "<TD align=center>-</td>");
-				} else if (AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN){
+				} else if (AdminType==DOMAIN_ADMIN){
 					fprintf(actout, "<TD align=center><a href=%s/com/deluser?user=%s&dom=%s&time=%d&deluser=%s>\
 <img src=\"/images/qmailadmin/delete.gif\" border=0></a></td>\n",
 						CGIPATH, user,dom,mytime,pw->pw_name);
@@ -162,7 +162,7 @@
 				if ( bounced==0 && strncmp(pw->pw_name,TmpBuf3,MAX_BUFF)==0 ) {
 					fprintf(actout,"<TD align=center>%s</td>",
 						get_html_text("132"));
-				} else if (AdminType==SYSTEM_ADMIN||AdminType==DOMAIN_ADMIN) {
+				} else if (AdminType==DOMAIN_ADMIN) {
 					fprintf(actout,"<TD align=center><a href=%s/com/setdefault?user=%s&dom=%s&time=%d&deluser=%s>\
 <img src=\"/images/qmailadmin/delete.gif\" border=0></a></td>\n",
 						CGIPATH, user,dom,mytime,pw->pw_name);
@@ -179,7 +179,7 @@
 		fprintf(actout,"<tr><td colspan=5><center>\n");
 	}
 
-		if ( AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN ) {
+		if ( AdminType==DOMAIN_ADMIN ) {
 			fprintf(actout, "<br><b>%s</b> ", get_html_text("133"));
 
 			for (k = 97; k < 123; k++) {
@@ -232,7 +232,7 @@
 	count_users();
 	load_limits();
 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -250,7 +250,7 @@
 
 moduser()
 {
-	if (!( AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN ||
+	if (!( AdminType==DOMAIN_ADMIN ||
 		  (AdminType==USER_ADMIN && strcmp(ActionUser,Username)==0))){
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
@@ -269,7 +269,7 @@
  int pid;
  int error;
  
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}
@@ -353,7 +353,7 @@
  int i;
  int ret_code;
 
-	if (!( AdminType==SYSTEM_ADMIN || AdminType==DOMAIN_ADMIN ||
+	if (!( AdminType==DOMAIN_ADMIN ||
 			(AdminType==USER_ADMIN && strcmp(ActionUser,Username)==0))){
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
@@ -485,7 +485,7 @@
 	int i;
 	struct passwd *pw;
 	 
-	if ( AdminType!=SYSTEM_ADMIN && AdminType!=DOMAIN_ADMIN ) {
+	if ( AdminType!=DOMAIN_ADMIN ) {
 		fprintf(actout,"<h2>%s</h2>", get_html_text("142"));
 		exit(0);
 	}