X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver.h;h=6aedb546393124cce3a72d7e6259eea3740404c5;hb=4db4fc48793f3680c5defd28ea32c97044a2b569;hp=45e0d74983a4839b22b35bafc47d1b7c87050f19;hpb=e8123a34d5c13c89443de540f8d3ef10f53225a6;p=citadel.git

diff --git a/citadel/server.h b/citadel/server.h
index 45e0d7498..6aedb5463 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -1,17 +1,3 @@
-/* 
- * Main declarations file for the Citadel server
- *
- * Copyright (c) 1987-2015 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
 #ifndef SERVER_H
 #define SERVER_H
 
@@ -80,7 +66,6 @@ typedef struct __recptypes {
 #define CTDLEXIT_DB		105	/* Unable to initialize database */
 #define CTDLEXIT_LIBCITADEL	106	/* Incorrect version of libcitadel */
 #define CTDL_EXIT_UNSUP_AUTH	107	/* Unsupported auth mode configured */
-#define CTDLEXIT_UNUSER		108	/* Could not determine uid to run as */
 
 /*
  * Reasons why a session would be terminated (set CC->kill_me to these values)
@@ -124,15 +109,14 @@ struct CitControl {
 	unsigned MMflags;		/* Global system flags              */
 	long MMnextuser;		/* highest user number on system    */
 	long MMnextroom;		/* highest room number on system    */
-	int MM_hosted_upgrade_level;	/* Server-hosted upgrade level      */
-	int MM_fulltext_wordbreaker;	/* ID of wordbreaker in use         */
+	int version;			/* Server-hosted upgrade level      */
+	int fulltext_wordbreaker;	/* ID of wordbreaker in use         */
 	long MMfulltext;		/* highest message number indexed   */
 	int MMdbversion;		/* Version of Berkeley DB used on previous server run */
 };
 
 extern int ScheduledShutdown;
 extern struct CitControl CitControl;
-extern uid_t ctdluid;
 
 struct ExpressMessage {
 	struct ExpressMessage *next;