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

diff --git a/citadel/citserver.h b/citadel/citserver.h
index 63d8708e2..1235a81d8 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -1,23 +1,17 @@
-/* $Id$
+/*
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- * Copyright (c) 1987-2009 by the citadel.org team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "serv_extensions.h"
+#include "context.h"
 
 /* Simple linked list structures ... used in a bunch of different places. */
 struct RoomProcList {
@@ -29,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;