From: Nathan Bryant <loanshark@uncensored.citadel.org>
Date: Mon, 25 Mar 2002 00:01:51 +0000 (+0000)
Subject:  * compatibility with Berkeley DB < 3.3
X-Git-Tag: v7.86~6462
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=fc53f3605ec13f9d4cb6ce103badf346a553d74b

 * compatibility with Berkeley DB < 3.3
 * squished symbol clashes with the OK symbol from curses in certain *n[iu]x
distributions. this is kind of a pain in the ass, but I had to rename our
OK to CIT_OK :-(
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index fdd157609..82a1e37cd 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 590.161  2002/03/25 00:01:50  nbryant
+  * compatibility with Berkeley DB < 3.3
+  * squished symbol clashes with the OK symbol from curses in certain *n[iu]x
+ distributions. this is kind of a pain in the ass, but I had to rename our
+ OK to CIT_OK :-(
+
  Revision 590.160  2002/03/22 04:35:38  ajc
  * Handle vCard registration updates for users other than the one currently
    logged in.  (Allows administrative editing of contact information.)
@@ -3529,4 +3535,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import 
-
diff --git a/citadel/citserver.c b/citadel/citserver.c
index 46ca3ecae..f9161690e 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -360,7 +360,7 @@ void cmd_time(void)
    tv = time(NULL);
    localtime(&tv);
    
-   cprintf("%d %ld|%ld|%d\n", OK, (long)tv, timezone, daylight);
+   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, daylight);
 }
 
 /*
@@ -486,7 +486,7 @@ void cmd_iden(char *argbuf)
 		(rev_level % 100),
 		desc,
 		CC->cs_host);
-	cprintf("%d Ok\n",OK);
+	cprintf("%d Ok\n",CIT_OK);
 }
 
 
@@ -682,7 +682,7 @@ void cmd_term(char *cmdbuf)
 
 	if (found_it) {
 		if (allowed) {
-			cprintf("%d Session terminated.\n", OK);
+			cprintf("%d Session terminated.\n", CIT_OK);
 		}
 		else {
 			cprintf("%d You are not allowed to do that.\n",
@@ -702,7 +702,7 @@ void cmd_term(char *cmdbuf)
  * get the paginator prompt
  */
 void cmd_more(void) {
-	cprintf("%d %s\n",OK,config.c_moreprompt);
+	cprintf("%d %s\n",CIT_OK,config.c_moreprompt);
 	}
 
 /*
@@ -710,7 +710,7 @@ void cmd_more(void) {
  */
 void cmd_echo(char *etext)
 {
-	cprintf("%d %s\n",OK,etext);
+	cprintf("%d %s\n",CIT_OK,etext);
 	}
 
 
@@ -727,7 +727,7 @@ void cmd_ipgm(char *argbuf)
 		CC->internal_pgm = 1;
 		strcpy(CC->curr_user, "<internal program>");
 		CC->cs_flags = CC->cs_flags|CS_STEALTH;
-		cprintf("%d Authenticated as an internal program.\n",OK);
+		cprintf("%d Authenticated as an internal program.\n",CIT_OK);
 		}
 	else {
 		cprintf("%d Authentication failed.\n",ERROR);
@@ -743,7 +743,7 @@ void cmd_down(void) {
 
 	if (CtdlAccessCheck(ac_aide)) return;
 
-	cprintf("%d Shutting down server.  Goodbye.\n", OK);
+	cprintf("%d Shutting down server.  Goodbye.\n", CIT_OK);
 	time_to_die = 1;
 	}
 
@@ -760,7 +760,7 @@ void cmd_scdn(char *argbuf)
 	if ((new_state == 0) || (new_state == 1)) {
 		ScheduledShutdown = new_state;
 		}
-	cprintf("%d %d\n", OK, ScheduledShutdown);
+	cprintf("%d %d\n", CIT_OK, ScheduledShutdown);
 }
 
 
@@ -775,7 +775,7 @@ void cmd_asyn(char *argbuf)
 	if ((new_state == 0) || (new_state == 1)) {
 		CC->is_async = new_state;
 	}
-	cprintf("%d %d\n", OK, CC->is_async);
+	cprintf("%d %d\n", CIT_OK, CC->is_async);
 }
 
 
@@ -864,7 +864,7 @@ void citproto_begin_session() {
 		}
 	else {
 		cprintf("%d %s Citadel/UX server ready.\n",
-			OK, config.c_nodename);
+			CIT_OK, config.c_nodename);
 		}
 }
 
@@ -907,11 +907,11 @@ void do_command_loop(void) {
 	}
 		   
 	if (!strncasecmp(cmdbuf,"NOOP",4)) {
-		cprintf("%d%cok\n",OK,CtdlCheckExpress());
+		cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress());
 		}
 
 	else if (!strncasecmp(cmdbuf,"QUIT",4)) {
-		cprintf("%d Goodbye.\n",OK);
+		cprintf("%d Goodbye.\n",CIT_OK);
 		CC->kill_me = 1;
 		}
 
@@ -921,7 +921,7 @@ void do_command_loop(void) {
 
 	else if (!strncasecmp(cmdbuf,"LOUT",4)) {
 		if (CC->logged_in) logout(CC);
-		cprintf("%d logged out.\n",OK);
+		cprintf("%d logged out.\n",CIT_OK);
 		}
 
 	else if (!strncasecmp(cmdbuf,"USER",4)) {
diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index e93c653f2..9f9670217 100644
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -726,25 +726,69 @@ void cdb_trunc(int cdb)
 {
   DB_TXN *tid;
   int ret;
+#if DB_VERSION_MAJOR > 3 || DB_VERSION_MINOR > 2
   u_int32_t count;
+#endif
   
   if (MYTID != NULL)
     {
-      ret = dbp[cdb]->truncate(dbp[cdb],	/* db */
-			       MYTID,		/* transaction ID */
-			       &count,		/* #rows that were deleted */
-			       0);		/* flags */
-      if (ret)
-	{
-	  lprintf(1, "cdb_truncate(%d): %s\n", cdb,
-		  db_strerror(ret));
-	  abort();
-	}
+      lprintf(1, "cdb_trunc must not be called in a transaction.\n");
+      abort();
     }
   else
     {
       bailIfCursor(MYCURSORS, "attempt to write during r/o cursor");
       
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR < 3
+      for (;;)
+	{
+	  DBT key, data;
+
+	  /* Initialize the key/data pair so the flags aren't set. */
+	  memset(&key, 0, sizeof(key));
+	  memset(&data, 0, sizeof(data));
+
+	  txbegin(&tid);
+	  
+	  ret = dbp[cdb]->cursor(dbp[cdb], tid, &MYCURSORS[cdb], 0);
+	  if (ret)
+	    {
+	      lprintf(1, "cdb_trunc: db_cursor: %s\n", db_strerror(ret));
+	      abort();
+	    }
+
+	  ret = MYCURSORS[cdb]->c_get(MYCURSORS[cdb],
+				      &key, &data, DB_NEXT);
+	  if (ret)
+	    {
+	      cclose(MYCURSORS[cdb]);
+	      txabort(tid);
+	      if (ret == DB_LOCK_DEADLOCK)
+		continue;
+
+	      if (ret == DB_NOTFOUND)
+		break;
+
+	      lprintf(1, "cdb_trunc: c_get: %s\n", db_strerror(ret));
+	      abort();
+	    }
+
+	  ret = MYCURSORS[cdb]->c_del(MYCURSORS[cdb], 0);
+	  if (ret)
+	    {
+	      cclose(MYCURSORS[cdb]);
+	      txabort(tid);
+	      if (ret == DB_LOCK_DEADLOCK)
+		continue;
+
+	      lprintf(1, "cdb_trunc: c_del: %s\n", db_strerror(ret));
+	      abort();
+	    }
+
+	  cclose(MYCURSORS[cdb]);
+	  txcommit(tid);
+	}
+#else
     retry:
       txbegin(&tid);
       
@@ -769,5 +813,6 @@ void cdb_trunc(int cdb)
 	{
 	  txcommit(tid);
 	}
+#endif
     }
 }
diff --git a/citadel/file_ops.c b/citadel/file_ops.c
index f6b3c90fc..664a62ff3 100644
--- a/citadel/file_ops.c
+++ b/citadel/file_ops.c
@@ -139,7 +139,7 @@ void cmd_delf(char *filename)
 		 CC->quickroom.QRdirname, filename);
 	a = unlink(pathname);
 	if (a == 0) {
-		cprintf("%d File '%s' deleted.\n", OK, pathname);
+		cprintf("%d File '%s' deleted.\n", CIT_OK, pathname);
 	}
 	else {
 		cprintf("%d File '%s' not found.\n",
@@ -216,7 +216,7 @@ void cmd_movf(char *cmdbuf)
 		 "cat ./files/%s/filedir |grep %s >>./files/%s/filedir",
 		 CC->quickroom.QRdirname, filename, qrbuf.QRdirname);
 	system(buf);
-	cprintf("%d File '%s' has been moved.\n", OK, filename);
+	cprintf("%d File '%s' has been moved.\n", CIT_OK, filename);
 }
 
 
@@ -307,7 +307,7 @@ void cmd_netf(char *cmdbuf)
 	putc(0, ofp);
 	fclose(ofp);
 
-	cprintf("%d File '%s' has been sent to %s.\n", OK, filename,
+	cprintf("%d File '%s' has been sent to %s.\n", CIT_OK, filename,
 		destsys);
 	/* FIXME start a network run here. */
 	return;
@@ -331,7 +331,7 @@ void OpenCmdResult(char *filename, char *mime_type)
 	modtime = (time_t) statbuf.st_mtime;
 
 	cprintf("%d %ld|%ld|%s|%s\n",
-		OK, filesize, (long)modtime, filename, mime_type);
+		CIT_OK, filesize, (long)modtime, filename, mime_type);
 }
 
 
@@ -502,7 +502,7 @@ void cmd_uopn(char *cmdbuf)
 			ERROR, CC->upl_path, strerror(errno));
 		return;
 	}
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
 
 
@@ -567,7 +567,7 @@ void cmd_uimg(char *cmdbuf)
 	}
 
 	if (is_this_for_real == 0) {
-		cprintf("%d Ok to send image\n", OK);
+		cprintf("%d Ok to send image\n", CIT_OK);
 		return;
 	}
 
@@ -577,7 +577,7 @@ void cmd_uimg(char *cmdbuf)
 			ERROR, CC->upl_path, strerror(errno));
 		return;
 	}
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 	CC->upload_type = UPL_IMAGE;
 }
 
@@ -605,7 +605,7 @@ void cmd_clos(void)
 		unlink(buf);
 	}
 
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
 
 
@@ -641,7 +641,7 @@ void cmd_ucls(char *cmd)
 
 	if ((!strcasecmp(cmd, "1")) && (CC->upload_type != UPL_FILE)) {
 		CC->upload_type = UPL_FILE;
-		cprintf("%d Upload completed.\n", OK);
+		cprintf("%d Upload completed.\n", CIT_OK);
 
 		/* FIXME ... here we need to trigger a network run */
 
@@ -649,7 +649,7 @@ void cmd_ucls(char *cmd)
 	}
 
 	if (!strcasecmp(cmd, "1")) {
-		cprintf("%d File '%s' saved.\n", OK, CC->upl_path);
+		cprintf("%d File '%s' saved.\n", CIT_OK, CC->upl_path);
 		fp = fopen(CC->upl_filedir, "a");
 		if (fp == NULL) {
 			fp = fopen(CC->upl_filedir, "w");
@@ -668,7 +668,7 @@ void cmd_ucls(char *cmd)
 				upload_notice);
 	} else {
 		abort_upl(CC);
-		cprintf("%d File '%s' aborted.\n", OK, CC->upl_path);
+		cprintf("%d File '%s' aborted.\n", CIT_OK, CC->upl_path);
 	}
 }
 
@@ -780,7 +780,7 @@ void cmd_ndop(char *cmdbuf)
 	CC->dl_is_net = 1;
 
 	stat(pathname, &statbuf);
-	cprintf("%d %ld\n", OK, (long)statbuf.st_size);
+	cprintf("%d %ld\n", CIT_OK, (long)statbuf.st_size);
 }
 
 /*
@@ -823,5 +823,5 @@ void cmd_nuop(char *cmdbuf)
 	}
 
 	CC->upload_type = UPL_NET;
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h
index 60c22e632..5acea43a3 100644
--- a/citadel/ipcdef.h
+++ b/citadel/ipcdef.h
@@ -1,10 +1,6 @@
 /* $Id$ */
-#ifdef OK
-#undef OK
-#endif
-
 #define LISTING_FOLLOWS		100
-#define OK			200
+#define CIT_OK			200
 #define MORE_DATA		300
 #define SEND_LISTING		400
 #define ERROR			500
diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index e2735f1e0..307566162 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2428,7 +2428,7 @@ void cmd_ent0(char *entargs)
 		memset(CC->fake_postname, 0, sizeof(CC->fake_postname) );
 		safestrncpy(CC->fake_postname, newusername,
 			sizeof(CC->fake_postname) );
-		cprintf("%d ok\n", OK);
+		cprintf("%d ok\n", CIT_OK);
 		return;
 	}
 	CC->cs_flags |= CS_POSTING;
@@ -2490,7 +2490,7 @@ void cmd_ent0(char *entargs)
 	 * success without creating the message.
 	 */
 	if (post == 0) {
-		cprintf("%d %s\n", OK,
+		cprintf("%d %s\n", CIT_OK,
 			((valid != NULL) ? valid->display_recp : "") );
 		phree(valid);
 		return;
@@ -2653,7 +2653,7 @@ void cmd_dele(char *delstr)
 	num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, "");
 
 	if (num_deleted) {
-		cprintf("%d %d message%s deleted.\n", OK,
+		cprintf("%d %d message%s deleted.\n", CIT_OK,
 			num_deleted, ((num_deleted != 1) ? "s" : ""));
 	} else {
 		cprintf("%d Message %ld not found.\n", ERROR, delnum);
@@ -2727,7 +2727,7 @@ void cmd_move(char *args)
 		CtdlDeleteMessages(CC->quickroom.QRname, num, "");
 	}
 
-	cprintf("%d Message %s.\n", OK, (is_copy ? "copied" : "moved") );
+	cprintf("%d Message %s.\n", CIT_OK, (is_copy ? "copied" : "moved") );
 }
 
 
diff --git a/citadel/policy.c b/citadel/policy.c
index 41b833b90..d30160400 100644
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -89,7 +89,7 @@ void cmd_gpex(char *argbuf) {
 		return;
 	}
 
-	cprintf("%d %d|%d\n", OK, exp.expire_mode, exp.expire_value);
+	cprintf("%d %d|%d\n", CIT_OK, exp.expire_mode, exp.expire_value);
 }
 
 
@@ -120,7 +120,7 @@ void cmd_spex(char *argbuf) {
 		lgetroom(&CC->quickroom, CC->quickroom.QRname);
 		memcpy(&CC->quickroom.QRep, &exp, sizeof(struct ExpirePolicy));
 		lputroom(&CC->quickroom);
-		cprintf("%d Room expire policy set.\n", OK);
+		cprintf("%d Room expire policy set.\n", CIT_OK);
 		return;
 	}
 
@@ -134,7 +134,7 @@ void cmd_spex(char *argbuf) {
 		lgetfloor(&flbuf, CC->quickroom.QRfloor);
 		memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
 		lputfloor(&flbuf, CC->quickroom.QRfloor);
-		cprintf("%d Floor expire policy set.\n", OK);
+		cprintf("%d Floor expire policy set.\n", CIT_OK);
 		return;
 	}
 
@@ -146,7 +146,7 @@ void cmd_spex(char *argbuf) {
 		}
 		memcpy(&config.c_ep, &exp, sizeof(struct ExpirePolicy));
 		put_config();
-		cprintf("%d Site expire policy set.\n", OK);
+		cprintf("%d Site expire policy set.\n", CIT_OK);
 		return;
 	}
 
diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index af8f6c982..613c4dfad 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -769,7 +769,7 @@ void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
 
 	if (display_result)
 		cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
-			OK, CtdlCheckExpress(),
+			CIT_OK, CtdlCheckExpress(),
 			truncated_roomname,
 			new_messages, total_messages,
 			info, CC->quickroom.QRflags,
@@ -992,7 +992,7 @@ void cmd_getr(void)
 
 	getroom(&CC->quickroom, CC->quickroom.QRname);
 	cprintf("%d%c%s|%s|%s|%d|%d|%d\n",
-		OK, CtdlCheckExpress(),
+		CIT_OK, CtdlCheckExpress(),
 		CC->quickroom.QRname,
 		((CC->quickroom.QRflags & QR_PASSWORDED) ? CC->quickroom.QRpasswd : ""),
 		((CC->quickroom.QRflags & QR_DIRECTORY) ? CC->quickroom.QRdirname : ""),
@@ -1109,7 +1109,7 @@ void cmd_setr(char *args)
 	}
 	snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user);
 	aide_message(buf);
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
 
 
@@ -1128,9 +1128,9 @@ void cmd_geta(void)
 		return;
 	}
 	if (getuserbynumber(&usbuf, CC->quickroom.QRroomaide) == 0) {
-		cprintf("%d %s\n", OK, usbuf.fullname);
+		cprintf("%d %s\n", CIT_OK, usbuf.fullname);
 	} else {
-		cprintf("%d \n", OK);
+		cprintf("%d \n", CIT_OK);
 	}
 }
 
@@ -1170,7 +1170,7 @@ void cmd_seta(char *new_ra)
 			usbuf.fullname, CC->quickroom.QRname);
 		aide_message(buf);
 	}
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
 
 /*
@@ -1317,9 +1317,9 @@ void cmd_kill(char *argbuf)
 		snprintf(aaa, sizeof aaa, "%s> killed by %s\n",
 			 deleted_room_name, CC->curr_user);
 		aide_message(aaa);
-		cprintf("%d '%s' deleted.\n", OK, deleted_room_name);
+		cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
 	} else {
-		cprintf("%d ok to delete.\n", OK);
+		cprintf("%d ok to delete.\n", CIT_OK);
 	}
 }
 
@@ -1465,7 +1465,7 @@ void cmd_cre8(char *args)
 	}
 
 	if ((strlen(new_room_name) == 0) && (cre8_ok == 0)) {
-		cprintf("%d Ok to create rooms.\n", OK);
+		cprintf("%d Ok to create rooms.\n", CIT_OK);
 		return;
 	}
 
@@ -1484,7 +1484,7 @@ void cmd_cre8(char *args)
 	}
 
 	if (cre8_ok == 0) {
-		cprintf("%d OK to create '%s'\n", OK, new_room_name);
+		cprintf("%d OK to create '%s'\n", CIT_OK, new_room_name);
 		return;
 	}
 
@@ -1510,7 +1510,7 @@ void cmd_cre8(char *args)
 	strcat(aaa, "\n");
 	aide_message(aaa);
 
-	cprintf("%d '%s' has been created.\n", OK, new_room_name);
+	cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
 }
 
 
@@ -1524,7 +1524,7 @@ void cmd_einf(char *ok)
 	if (CtdlAccessCheck(ac_room_aide)) return;
 
 	if (atoi(ok) == 0) {
-		cprintf("%d Ok.\n", OK);
+		cprintf("%d Ok.\n", CIT_OK);
 		return;
 	}
 	assoc_file_name(infofilename, sizeof infofilename, &CC->quickroom, "info");
@@ -1619,7 +1619,7 @@ void cmd_cflr(char *argbuf)
 		return;
 	}
 	if (cflr_ok == 0) {
-		cprintf("%d ok to create...\n", OK);
+		cprintf("%d ok to create...\n", CIT_OK);
 		return;
 	}
 	lgetfloor(&flbuf, free_slot);
@@ -1627,7 +1627,7 @@ void cmd_cflr(char *argbuf)
 	flbuf.f_ref_count = 0;
 	safestrncpy(flbuf.f_name, new_floor_name, sizeof flbuf.f_name);
 	lputfloor(&flbuf, free_slot);
-	cprintf("%d %d\n", OK, free_slot);
+	cprintf("%d %d\n", CIT_OK, free_slot);
 }
 
 
@@ -1662,9 +1662,9 @@ void cmd_kflr(char *argbuf)
 			delete_ok = 0;
 		} else {
 			if (kflr_ok == 1) {
-				cprintf("%d Ok\n", OK);
+				cprintf("%d Ok\n", CIT_OK);
 			} else {
-				cprintf("%d Ok to delete...\n", OK);
+				cprintf("%d Ok to delete...\n", CIT_OK);
 			}
 
 		}
@@ -1705,5 +1705,5 @@ void cmd_eflr(char *argbuf)
 		extract(flbuf.f_name, argbuf, 1);
 	lputfloor(&flbuf, floor_num);
 
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index ceec50f6e..17d62ce4c 100644
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -677,9 +677,9 @@ void cmd_sexp(char *argbuf)
 
 		if (message_sent > 0) {
 			if (strlen(x_msg) > 0)
-				cprintf("%d Message sent", OK);
+				cprintf("%d Message sent", CIT_OK);
 			else
-				cprintf("%d Ok to send message", OK);
+				cprintf("%d Ok to send message", CIT_OK);
 			if (message_sent > 1)
 				cprintf(" to %d users", message_sent);
 			cprintf(".\n");
@@ -711,7 +711,7 @@ void cmd_dexp(char *argbuf)
 	if ((new_state == 0) || (new_state == 1)) {
 		CC->disable_exp = new_state;
 		}
-	cprintf("%d %d\n", OK, CC->disable_exp);
+	cprintf("%d %d\n", CIT_OK, CC->disable_exp);
 	}
 
 
@@ -747,7 +747,7 @@ void cmd_reqt(char *argbuf) {
 		}
 	}
 	end_critical_section(S_SESSION_TABLE);
-	cprintf("%d Sent termination request to %d sessions.\n", OK, sessions);
+	cprintf("%d Sent termination request to %d sessions.\n", CIT_OK, sessions);
 }
 
 
diff --git a/citadel/serv_crypto.c b/citadel/serv_crypto.c
index cda02a570..b082ca0b1 100644
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -253,7 +253,7 @@ void cmd_stls(char *params)
 				ERR_reason_error_string(ERR_get_error()));
 		return;
 	}
-	cprintf("%d \n", OK);
+	cprintf("%d \n", CIT_OK);
 	retval = SSL_accept(CC->ssl);
 	if (retval < 1) {
 		/*
@@ -292,7 +292,7 @@ void cmd_gtls(char *params)
 		return;
 	}
 	bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl), &alg_bits);
-	cprintf("%d %s|%s|%d|%d\n", OK,
+	cprintf("%d %s|%s|%d|%d\n", CIT_OK,
 		SSL_CIPHER_get_version(SSL_get_current_cipher(CC->ssl)),
 		SSL_CIPHER_get_name(SSL_get_current_cipher(CC->ssl)),
 		alg_bits, bits);
diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index 7c9965ad5..6a38c326e 100644
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -604,31 +604,31 @@ void cmd_expi(char *argbuf) {
 	extract(cmd, argbuf, 0);
 	if (!strcasecmp(cmd, "users")) {
 		retval = PurgeUsers();
-		cprintf("%d Purged %d users.\n", OK, retval);
+		cprintf("%d Purged %d users.\n", CIT_OK, retval);
 		return;
 	}
 	else if (!strcasecmp(cmd, "messages")) {
 		PurgeMessages();
-		cprintf("%d Expired %d messages.\n", OK, messages_purged);
+		cprintf("%d Expired %d messages.\n", CIT_OK, messages_purged);
 		return;
 	}
 	else if (!strcasecmp(cmd, "rooms")) {
 		retval = PurgeRooms();
-		cprintf("%d Expired %d rooms.\n", OK, retval);
+		cprintf("%d Expired %d rooms.\n", CIT_OK, retval);
 		return;
 	}
 	else if (!strcasecmp(cmd, "visits")) {
 		retval = PurgeVisits();
-		cprintf("%d Purged %d visits.\n", OK, retval);
+		cprintf("%d Purged %d visits.\n", CIT_OK, retval);
 	}
 	else if (!strcasecmp(cmd, "usetable")) {
 		retval = PurgeUseTable();
 		cprintf("%d Purged %d entries from the use table.\n",
-			OK, retval);
+			CIT_OK, retval);
 	}
 	else if (!strcasecmp(cmd, "defrag")) {
 		defrag_databases();
-		cprintf("%d Defragmented the databases.\n", OK);
+		cprintf("%d Defragmented the databases.\n", CIT_OK);
 	}
 	else {
 		cprintf("%d Invalid command.\n", ERROR+ILLEGAL_VALUE);
diff --git a/citadel/serv_ical.c b/citadel/serv_ical.c
index cc3c96ab2..d7e48856e 100644
--- a/citadel/serv_ical.c
+++ b/citadel/serv_ical.c
@@ -37,7 +37,7 @@ void cmd_ical(char *argbuf)
 		return;
 	}
 
-	cprintf("%d I support|ICAL\n", OK);
+	cprintf("%d I support|ICAL\n", CIT_OK);
 	return;
 }
 
diff --git a/citadel/serv_moderate.c b/citadel/serv_moderate.c
index 3e36e8412..7d730ebb6 100644
--- a/citadel/serv_moderate.c
+++ b/citadel/serv_moderate.c
@@ -79,7 +79,7 @@ void cmd_mmod(char *argbuf) {
 	smi.meta_mod = newlevel;
 	PutMetaData(&smi);
 
-	cprintf("%d Message %ld is moderated to %d\n", OK, msgnum, newlevel);
+	cprintf("%d Message %ld is moderated to %d\n", CIT_OK, msgnum, newlevel);
 }
 
 
diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 67baa62a2..f6f79e593 100644
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -1363,7 +1363,7 @@ void cmd_netp(char *cmdbuf)
 
 	safestrncpy(CC->net_node, node, sizeof CC->net_node);
 	network_talking_to(node, NTT_ADD);
-	cprintf("%d authenticated as network node '%s'\n", OK,
+	cprintf("%d authenticated as network node '%s'\n", CIT_OK,
 		CC->net_node);
 }
 
diff --git a/citadel/serv_rwho.c b/citadel/serv_rwho.c
index f7d0be3ab..bdfec24fd 100644
--- a/citadel/serv_rwho.c
+++ b/citadel/serv_rwho.c
@@ -172,7 +172,7 @@ void cmd_rchg(char *argbuf)
 	else {
 		strcpy(CC->fake_roomname, "");
 		}
-	cprintf("%d OK\n", OK);
+	cprintf("%d OK\n", CIT_OK);
 }
 
 /*
@@ -190,7 +190,7 @@ void cmd_hchg(char *argbuf)
 	else {
 		strcpy(CC->fake_hostname, "");
 		}
-	cprintf("%d OK\n", OK);
+	cprintf("%d OK\n", CIT_OK);
 }
 
 
@@ -218,7 +218,7 @@ void cmd_uchg(char *argbuf)
 		CC->fake_username[0] = '\0';
 		CC->cs_flags |= CS_STEALTH;
 	}
-	cprintf("%d\n",OK);
+	cprintf("%d\n",CIT_OK);
 }
 
 
@@ -245,7 +245,7 @@ void cmd_stel(char *cmdbuf)
 			CC->cs_flags = CC->cs_flags|CS_STEALTH;
 		}
 
-	cprintf("%d Ok\n",OK);
+	cprintf("%d Ok\n",CIT_OK);
 	}
 
 
diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 7334ca0fb..06f5c3678 100644
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -1333,7 +1333,7 @@ void cmd_smtp(char *argbuf) {
 
 	else if (!strcasecmp(cmd, "runqueue")) {
 		run_queue_now = 1;
-		cprintf("%d All outbound SMTP will be retried now.\n", OK);
+		cprintf("%d All outbound SMTP will be retried now.\n", CIT_OK);
 		return;
 	}
 
diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index 618b5a2db..823a2bb26 100644
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -215,14 +215,14 @@ void cmd_bmbx(char *argbuf) {
 	really_do_this = extract_int(argbuf, 0);
 
 	if (really_do_this != 1) {
-		cprintf("%d You didn't really want to do that.\n", OK);
+		cprintf("%d You didn't really want to do that.\n", CIT_OK);
 		return;
 	}
 
 	ForEachRoom(cmd_bmbx_backend, NULL);
 	cmd_bmbx_backend(NULL, NULL);
 
-	cprintf("%d Mailbox generation numbers bumped.\n", OK);
+	cprintf("%d Mailbox generation numbers bumped.\n", CIT_OK);
 	return;
 
 }
diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index dd9af7151..06fd0e7ac 100644
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -189,7 +189,7 @@ void cmd_igab(char *argbuf) {
 		NULL, vcard_add_to_directory, NULL);
 
         getroom(&CC->quickroom, hold_rm);	/* return to saved room */
-	cprintf("%d Directory has been rebuilt.\n", OK);
+	cprintf("%d Directory has been rebuilt.\n", CIT_OK);
 }
 
 
@@ -746,7 +746,7 @@ void cmd_qdir(char *argbuf) {
 		return;
 	}
 
-	cprintf("%d %s\n", OK, citadel_addr);
+	cprintf("%d %s\n", CIT_OK, citadel_addr);
 }
 
 
diff --git a/citadel/setup.c b/citadel/setup.c
index 41aa6ee0c..a83f7e1b2 100644
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -26,9 +26,6 @@
 #include "tools.h"
 
 #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
-#ifdef OK
-#undef OK
-#endif
 
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index cf7c9982b..0f05ceb6f 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -417,7 +417,7 @@ void session_startup(void)
 void logged_in_response(void)
 {
 	cprintf("%d %s|%d|%ld|%ld|%u|%ld|%ld\n",
-		OK, CC->usersupp.fullname, CC->usersupp.axlevel,
+		CIT_OK, CC->usersupp.fullname, CC->usersupp.axlevel,
 		CC->usersupp.timescalled, CC->usersupp.posted,
 		CC->usersupp.flags, CC->usersupp.usernum,
 		CC->usersupp.lastcall);
@@ -832,13 +832,13 @@ void cmd_setp(char *new_pw)
 	}
 	strproc(new_pw);
 	if (strlen(new_pw) == 0) {
-		cprintf("%d Password unchanged.\n", OK);
+		cprintf("%d Password unchanged.\n", CIT_OK);
 		return;
 	}
 	lgetuser(&CC->usersupp, CC->curr_user);
 	strcpy(CC->usersupp.password, new_pw);
 	lputuser(&CC->usersupp);
-	cprintf("%d Password changed.\n", OK);
+	cprintf("%d Password changed.\n", CIT_OK);
 	rec_log(CL_PWCHANGE, CC->curr_user);
 	PerformSessionHooks(EVT_SETPASS);
 }
@@ -868,7 +868,7 @@ void cmd_creu(char *cmdbuf)
 	a = create_user(username, 0);
 
 	if (a == 0) {
-		cprintf("%d ok\n", OK);
+		cprintf("%d ok\n", CIT_OK);
 		return;
 	} else if (a == ERROR + ALREADY_EXISTS) {
 		cprintf("%d '%s' already exists.\n",
@@ -893,7 +893,7 @@ void cmd_getu(void)
 
 	getuser(&CC->usersupp, CC->curr_user);
 	cprintf("%d %d|%d|%d|%d\n",
-		OK,
+		CIT_OK,
 		CC->usersupp.USscreenwidth,
 		CC->usersupp.USscreenheight,
 		(CC->usersupp.flags & US_USER_SET),
@@ -942,7 +942,7 @@ void cmd_setu(char *new_parms)
 		lprintf(9, "new_mod processed to %d\n", new_mod);
 	}
 	lputuser(&CC->usersupp);
-	cprintf("%d Ok\n", OK);
+	cprintf("%d Ok\n", CIT_OK);
 }
 
 /*
@@ -971,7 +971,7 @@ void cmd_slrp(char *new_ptr)
 	CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
 	lputuser(&CC->usersupp);
-	cprintf("%d %ld\n", OK, newlr);
+	cprintf("%d %ld\n", CIT_OK, newlr);
 }
 
 
@@ -992,7 +992,7 @@ void cmd_seen(char *argbuf) {
 	target_setting = extract_int(argbuf, 1);
 
 	CtdlSetSeen(target_msgnum, target_setting);
-	cprintf("%d OK\n", OK);
+	cprintf("%d OK\n", CIT_OK);
 }
 
 
@@ -1048,7 +1048,7 @@ void cmd_invt_kick(char *iuser, int op)
 	aide_message(bbb);
 
 	cprintf("%d %s %s %s.\n",
-		OK, iuser,
+		CIT_OK, iuser,
 		((op == 1) ? "invited to" : "kicked out of"),
 		CC->quickroom.QRname);
 	return;
@@ -1095,7 +1095,7 @@ void cmd_forg(void)
 	}
 
 	if (CtdlForgetThisRoom() == 0) {
-		cprintf("%d Ok\n", OK);
+		cprintf("%d Ok\n", CIT_OK);
 	}
 	else {
 		cprintf("%d You may not forget this room.\n", ERROR);
@@ -1115,7 +1115,7 @@ void cmd_gnur(void)
 	}
 
 	if ((CitControl.MMflags & MM_VALID) == 0) {
-		cprintf("%d There are no unvalidated users.\n", OK);
+		cprintf("%d There are no unvalidated users.\n", CIT_OK);
 		return;
 	}
 
@@ -1146,7 +1146,7 @@ void cmd_gnur(void)
 	CitControl.MMflags = CitControl.MMflags & (~MM_VALID);
 	put_control();
 	end_critical_section(S_CONTROL);
-	cprintf("%d *** End of registration.\n", OK);
+	cprintf("%d *** End of registration.\n", CIT_OK);
 
 
 }
@@ -1181,11 +1181,11 @@ void cmd_vali(char *v_args)
 	/* If the access level was set to zero, delete the user */
 	if (newax == 0) {
 		if (purge_user(user) == 0) {
-			cprintf("%d %s Deleted.\n", OK, userbuf.fullname);
+			cprintf("%d %s Deleted.\n", CIT_OK, userbuf.fullname);
 			return;
 		}
 	}
-	cprintf("%d User '%s' validated.\n", OK, userbuf.fullname);
+	cprintf("%d User '%s' validated.\n", CIT_OK, userbuf.fullname);
 }
 
 
@@ -1274,7 +1274,7 @@ void cmd_chek(void)
 	/* check for mail */
 	mail = NewMailCount();
 
-	cprintf("%d %d|%d|%d\n", OK, mail, regis, vali);
+	cprintf("%d %d|%d|%d\n", CIT_OK, mail, regis, vali);
 }
 
 
@@ -1286,7 +1286,7 @@ void cmd_qusr(char *who)
 	struct usersupp usbuf;
 
 	if (getuser(&usbuf, who) == 0) {
-		cprintf("%d %s\n", OK, usbuf.fullname);
+		cprintf("%d %s\n", CIT_OK, usbuf.fullname);
 	} else {
 		cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
 	}
@@ -1311,7 +1311,7 @@ void cmd_agup(char *cmdbuf)
 		return;
 	}
 	cprintf("%d %s|%s|%u|%ld|%ld|%d|%ld|%ld|%d\n",
-		OK,
+		CIT_OK,
 		usbuf.fullname,
 		usbuf.password,
 		usbuf.flags,
@@ -1371,7 +1371,7 @@ void cmd_asup(char *cmdbuf)
 			deleted = 1;
 		}
 	}
-	cprintf("%d Ok", OK);
+	cprintf("%d Ok", CIT_OK);
 	if (deleted)
 		cprintf(" (%s deleted)", requested_user);
 	cprintf("\n");