X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.h;h=1235a81d865ef40fbd01fb755816ab844b2737f6;hb=e94bdae14683fd1581f905365fe6eb3b94e90d21;hp=59586a44ba8a5d7354ce3912ac479a07474c8cf5;hpb=f95401b73d6f0c34dd00639be58fa8731e6959e9;p=citadel.git

diff --git a/citadel/citserver.h b/citadel/citserver.h
index 59586a44b..1235a81d8 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -1,6 +1,17 @@
-/* $Id$ */
+/*
+ * Copyright (c) 1987-2012 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.
+ */
 
 #include "serv_extensions.h"
+#include "context.h"
 
 /* Simple linked list structures ... used in a bunch of different places. */
 struct RoomProcList {
@@ -12,36 +23,24 @@ struct UserProcList {
 	char user[64];
 };
 
+#define CTDLUSERIP      (IsEmptyStr(CC->cs_addr) ?  CC->cs_clientinfo: CC->cs_addr)
+
 void cit_backtrace(void);
+void cit_oneline_backtrace(void);
 void cit_panic_backtrace(int SigNum);
 void master_startup (void);
 void master_cleanup (int exitcode);
-void RemoveContext (struct CitContext *);
 void set_wtmpsupp (char *newtext);
 void set_wtmpsupp_to_current_room(void);
 void do_command_loop(void);
 void do_async_loop(void);
 void begin_session(struct CitContext *con);
 void citproto_begin_session(void);
+void citproto_begin_admin_session(void);
 void GenerateRoomDisplay(char *real_room,
-                        struct CitContext *viewed,
-                        struct CitContext *viewer);
+                        CitContext *viewed,
+                        CitContext *viewer);
 extern int panic_fd;
 char CtdlCheckExpress(void);
-
-int CtdlAccessCheck(int);
-
-/* 'required access level' values which may be passed to CtdlAccessCheck()
- */
-enum {
-	ac_none,
-	ac_logged_in,
-	ac_room_aide,
-	ac_aide,
-	ac_internal
-};
-
-
-
 extern time_t server_startup_time;
-
+extern int openid_level_supported;