X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_expire.c;h=f8f2366e182d96b36a96d42ec14c0159ffc780a6;hb=91b4061ec2f58e1a7e4691ea92ed405cad7755fb;hp=8b78baedbdcba0caae21b370531bfca781e08bc3;hpb=23ca1db62af9991bf443ad47922fdb7291d8eed0;p=citadel.git

diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index 8b78baedb..f8f2366e1 100644
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -499,17 +499,7 @@ void cmd_expi(char *argbuf) {
 	char cmd[256];
 	int retval;
 
-
-	if ((!(CC->logged_in))&&(!(CC->internal_pgm))) {
-		cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-		return;
-	}
-
-	if ((!is_room_aide()) && (!(CC->internal_pgm)) ) {
-		cprintf("%d Higher access required.\n",
-			ERROR+HIGHER_ACCESS_REQUIRED);
-		return;
-	}
+	if (CtdlAccessCheck(ac_aide)) return;
 
 	extract(cmd, argbuf, 0);
 	if (!strcasecmp(cmd, "users")) {
@@ -569,11 +559,7 @@ void cmd_fsck(char *argbuf) {
 	struct roomref *ptr;
 	int realcount;
 
-	if ( (!CC->logged_in) || (CC->usersupp.axlevel < 6) ) {
-		cprintf("%d Higher access required\n",
-			ERROR+HIGHER_ACCESS_REQUIRED);
-		return;
-	}
+	if (CtdlAccessCheck(ac_aide)) return;
 
 	/* Lame way of checking whether anyone else is doing this now */
 	if (rr != NULL) {