From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 15 Sep 2013 13:49:55 +0000 (+0200)
Subject: cleanup: remove unneeded includes.
X-Git-Tag: v9.01~249
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d3439d1bc968e5b5c99a4845a563ab8df8678bce

cleanup: remove unneeded includes.
---

diff --git a/citadel/auth.h b/citadel/auth.h
index a0799aac2..d3b0fb803 100644
--- a/citadel/auth.h
+++ b/citadel/auth.h
@@ -1 +1,2 @@
+
 int validate_password(uid_t uid, const char *pass);
diff --git a/citadel/citserver.c b/citadel/citserver.c
index d8eab8d2a..266adcdd8 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -369,99 +369,6 @@ int CtdlIsPublicClient(void)
 
 
 
-/*
- * Back-end function for starting a session
- */
-void begin_session(CitContext *con)
-{
-	/* 
-	 * Initialize some variables specific to our context.
-	 */
-	con->logged_in = 0;
-	con->internal_pgm = 0;
-	con->download_fp = NULL;
-	con->upload_fp = NULL;
-	con->cached_msglist = NULL;
-	con->cached_num_msgs = 0;
-	con->FirstExpressMessage = NULL;
-	time(&con->lastcmd);
-	time(&con->lastidle);
-	strcpy(con->lastcmdname, "    ");
-	strcpy(con->cs_clientname, "(unknown)");
-	strcpy(con->curr_user, NLI);
-	*con->net_node = '\0';
-	*con->fake_username = '\0';
-	*con->fake_hostname = '\0';
-	*con->fake_roomname = '\0';
-	*con->cs_clientinfo = '\0';
-	safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
-	safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
-	con->cs_UDSclientUID = -1;
-	con->cs_host[sizeof con->cs_host - 1] = 0;
-	if (!CC->is_local_socket) {
-		locate_host(con->cs_host, sizeof con->cs_host,
-			con->cs_addr, sizeof con->cs_addr,
-			con->client_socket
-		);
-	}
-	else {
-		con->cs_host[0] = 0;
-		con->cs_addr[0] = 0;
-#ifdef HAVE_STRUCT_UCRED
-		{
-			/* as http://www.wsinnovations.com/softeng/articles/uds.html told us... */
-			struct ucred credentials;
-			socklen_t ucred_length = sizeof(struct ucred);
-			
-			/*fill in the user data structure */
-			if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) {
-				syslog(LOG_NOTICE, "could obtain credentials from unix domain socket");
-				
-			}
-			else {		
-				/* the process ID of the process on the other side of the socket */
-				/* credentials.pid; */
-				
-				/* the effective UID of the process on the other side of the socket  */
-				con->cs_UDSclientUID = credentials.uid;
-				
-				/* the effective primary GID of the process on the other side of the socket */
-				/* credentials.gid; */
-				
-				/* To get supplemental groups, we will have to look them up in our account
-				   database, after a reverse lookup on the UID to get the account name.
-				   We can take this opportunity to check to see if this is a legit account.
-				*/
-				snprintf(con->cs_clientinfo, sizeof(con->cs_clientinfo),
-					 "PID: "F_PID_T"; UID: "F_UID_T"; GID: "F_XPID_T" ", 
-					 credentials.pid,
-					 credentials.uid,
-					 credentials.gid);
-			}
-		}
-#endif
-	}
-	con->cs_flags = 0;
-	con->upload_type = UPL_FILE;
-	con->dl_is_net = 0;
-
-	con->nologin = 0;
-	if (((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) || CtdlWantSingleUser()) {
-		con->nologin = 1;
-	}
-
-	if (!CC->is_local_socket) {
-		syslog(LOG_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr);
-	}
-	else {
-		syslog(LOG_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID);
-	}
-
-	/* Run any session startup routines registered by loadable modules */
-	PerformSessionHooks(EVT_START);
-}
-
-
 void citproto_begin_session() {
 	if (CC->nologin==1) {
 		cprintf("%d %s: Too many users are already online (maximum is %d)\n",
diff --git a/citadel/context.c b/citadel/context.c
index 86bf5c0d9..8c6c51a1c 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -535,6 +535,99 @@ CitContext *CtdlGetContextArray(int *count)
 
 
 
+/*
+ * Back-end function for starting a session
+ */
+void begin_session(CitContext *con)
+{
+	/* 
+	 * Initialize some variables specific to our context.
+	 */
+	con->logged_in = 0;
+	con->internal_pgm = 0;
+	con->download_fp = NULL;
+	con->upload_fp = NULL;
+	con->cached_msglist = NULL;
+	con->cached_num_msgs = 0;
+	con->FirstExpressMessage = NULL;
+	time(&con->lastcmd);
+	time(&con->lastidle);
+	strcpy(con->lastcmdname, "    ");
+	strcpy(con->cs_clientname, "(unknown)");
+	strcpy(con->curr_user, NLI);
+	*con->net_node = '\0';
+	*con->fake_username = '\0';
+	*con->fake_hostname = '\0';
+	*con->fake_roomname = '\0';
+	*con->cs_clientinfo = '\0';
+	safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
+	safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
+	con->cs_UDSclientUID = -1;
+	con->cs_host[sizeof con->cs_host - 1] = 0;
+	if (!CC->is_local_socket) {
+		locate_host(con->cs_host, sizeof con->cs_host,
+			con->cs_addr, sizeof con->cs_addr,
+			con->client_socket
+		);
+	}
+	else {
+		con->cs_host[0] = 0;
+		con->cs_addr[0] = 0;
+#ifdef HAVE_STRUCT_UCRED
+		{
+			/* as http://www.wsinnovations.com/softeng/articles/uds.html told us... */
+			struct ucred credentials;
+			socklen_t ucred_length = sizeof(struct ucred);
+			
+			/*fill in the user data structure */
+			if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) {
+				syslog(LOG_NOTICE, "could obtain credentials from unix domain socket");
+				
+			}
+			else {		
+				/* the process ID of the process on the other side of the socket */
+				/* credentials.pid; */
+				
+				/* the effective UID of the process on the other side of the socket  */
+				con->cs_UDSclientUID = credentials.uid;
+				
+				/* the effective primary GID of the process on the other side of the socket */
+				/* credentials.gid; */
+				
+				/* To get supplemental groups, we will have to look them up in our account
+				   database, after a reverse lookup on the UID to get the account name.
+				   We can take this opportunity to check to see if this is a legit account.
+				*/
+				snprintf(con->cs_clientinfo, sizeof(con->cs_clientinfo),
+					 "PID: "F_PID_T"; UID: "F_UID_T"; GID: "F_XPID_T" ", 
+					 credentials.pid,
+					 credentials.uid,
+					 credentials.gid);
+			}
+		}
+#endif
+	}
+	con->cs_flags = 0;
+	con->upload_type = UPL_FILE;
+	con->dl_is_net = 0;
+
+	con->nologin = 0;
+	if (((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) || CtdlWantSingleUser()) {
+		con->nologin = 1;
+	}
+
+	if (!CC->is_local_socket) {
+		syslog(LOG_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr);
+	}
+	else {
+		syslog(LOG_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID);
+	}
+
+	/* Run any session startup routines registered by loadable modules */
+	PerformSessionHooks(EVT_START);
+}
+
+
 /*
  * This function fills in a context and its user field correctly
  * Then creates/loads that user
diff --git a/citadel/control.h b/citadel/control.h
index c08f4f266..fa93bc03b 100644
--- a/citadel/control.h
+++ b/citadel/control.h
@@ -17,4 +17,3 @@ void check_control(void);
 long int get_new_message_number (void);
 long int get_new_user_number (void);
 long int get_new_room_number (void);
-void cmd_conf(char *argbuf);
diff --git a/citadel/euidindex.h b/citadel/euidindex.h
index 8622c6ad7..e30f79fd9 100644
--- a/citadel/euidindex.h
+++ b/citadel/euidindex.h
@@ -7,4 +7,3 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf);
 long locate_message_by_euid(char *euid, struct ctdlroom *qrbuf) __attribute__ ((deprecated));
 void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum);
 void rebuild_euid_index(void);
-void cmd_euid(char *cmdbuf);
diff --git a/citadel/modules/ctdlproto/serv_file.c b/citadel/modules/ctdlproto/serv_file.c
index 162c13c30..15e43b46d 100644
--- a/citadel/modules/ctdlproto/serv_file.c
+++ b/citadel/modules/ctdlproto/serv_file.c
@@ -2,47 +2,15 @@
  * Server functions which handle file transfers and room directories.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <dirent.h>
-#include <limits.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "config.h"
-#include "files.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "room_ops.h"
-#include "msgbase.h"
-#include "citserver.h"
-#include "threads.h"
+#include <dirent.h>
+
 #include "ctdl_module.h"
+#include "citserver.h"
+#include "support.h"
 #include "user_ops.h"
 
-
-
 /*
  * Server command to delete a file from a room's directory
  */
diff --git a/citadel/modules/ctdlproto/serv_messages.c b/citadel/modules/ctdlproto/serv_messages.c
index 9f08d880f..08aaf566f 100644
--- a/citadel/modules/ctdlproto/serv_messages.c
+++ b/citadel/modules/ctdlproto/serv_messages.c
@@ -12,58 +12,14 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <regex.h>
-
-#include "md5.h"
-
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "database.h"
-///#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
-#include "citserver.h"
-#include "room_ops.h"
-#include "user_ops.h"
-#include "files.h"
-#include "config.h"
-#include "control.h"
-#include "genstamp.h"
-#include "internet_addressing.h"
-#include "euidindex.h"
-#include "journaling.h"
-#include "citadel_dirs.h"
-#include "clientsocket.h"
-#include "threads.h"
 
+#include "citserver.h"
 #include "ctdl_module.h"
+#include "internet_addressing.h"
+#include "user_ops.h"
+#include "room_ops.h"
 
 extern char *msgkeys[];
 
diff --git a/citadel/modules/ctdlproto/serv_rooms.c b/citadel/modules/ctdlproto/serv_rooms.c
index cac7758f4..2755da816 100644
--- a/citadel/modules/ctdlproto/serv_rooms.c
+++ b/citadel/modules/ctdlproto/serv_rooms.c
@@ -12,44 +12,13 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <string.h>
 #include <dirent.h>	/* for cmd_rdir to read contents of the directory */
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <errno.h>
-#include "citadel.h"
 #include <libcitadel.h>
-#include "server.h"
-#include "database.h"
-#include "config.h"
-#include "room_ops.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "msgbase.h"
-#include "citserver.h"
-#include "control.h"
-#include "citadel_dirs.h"
-#include "threads.h"
 
+#include "citserver.h"
 #include "ctdl_module.h"
-#include "user_ops.h"
+#include "room_ops.h"
 
 /*
  * Back-back-end for all room listing commands
diff --git a/citadel/modules/ctdlproto/serv_session.c b/citadel/modules/ctdlproto/serv_session.c
index c829fca07..6c3914654 100644
--- a/citadel/modules/ctdlproto/serv_session.c
+++ b/citadel/modules/ctdlproto/serv_session.c
@@ -12,53 +12,11 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <syslog.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <string.h>
-#include <limits.h>
 #include <libcitadel.h>
-#include "auth.h"
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "room_ops.h"
-#include "svn_revision.h"
-#include "control.h"
-#include "msgbase.h"
-#include "config.h"
+
 #include "citserver.h"
-#include "citadel_dirs.h"
-#include "genstamp.h"
-#include "threads.h"
-#include "citadel_ldap.h"
-#include "context.h"
+#include "svn_revision.h"
 #include "ctdl_module.h"
 
 void cmd_noop(char *argbuf)
diff --git a/citadel/modules/ctdlproto/serv_syscmds.c b/citadel/modules/ctdlproto/serv_syscmds.c
index 7bf9acab8..3b21bc4fb 100644
--- a/citadel/modules/ctdlproto/serv_syscmds.c
+++ b/citadel/modules/ctdlproto/serv_syscmds.c
@@ -13,57 +13,10 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#if HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "sysdep_decls.h"
-#include "threads.h"
-#include "citserver.h"
-#include "config.h"
-#include "database.h"
-#include "housekeeping.h"
-#include "user_ops.h"
-#include "msgbase.h"
-#include "support.h"
-#include "locate_host.h"
-#include "room_ops.h"
-#include "control.h"
-#include "euidindex.h"
-#include "context.h"
-#include "svn_revision.h"
+
+#include "serv_extensions.h"
 #include "ctdl_module.h"
 
 void cmd_log_get(char *argbuf)
diff --git a/citadel/modules/ctdlproto/serv_user.c b/citadel/modules/ctdlproto/serv_user.c
index caff5efb0..eee6516b8 100644
--- a/citadel/modules/ctdlproto/serv_user.c
+++ b/citadel/modules/ctdlproto/serv_user.c
@@ -12,53 +12,12 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <syslog.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <string.h>
-#include <limits.h>
-#include <libcitadel.h>
-#include "auth.h"
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "sysdep_decls.h"
 #include "support.h"
-#include "room_ops.h"
 #include "control.h"
-#include "msgbase.h"
-#include "config.h"
-#include "citserver.h"
-#include "citadel_dirs.h"
-#include "genstamp.h"
-#include "threads.h"
-#include "citadel_ldap.h"
-#include "context.h"
 #include "ctdl_module.h"
+
+#include "citserver.h"
+
 #include "user_ops.h"
 #include "internet_addressing.h"
 
diff --git a/citadel/support.h b/citadel/support.h
index 0cfea7aac..50901df8a 100644
--- a/citadel/support.h
+++ b/citadel/support.h
@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 void strproc (char *string);
 int getstring (FILE *fp, char *string);
 void mesg_locate (char *targ, size_t n, const char *searchfor,
diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 23e8b2dd8..8ca2bc19b 100644
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -64,7 +64,6 @@ void sysdep_master_cleanup (void);
 void kill_session (int session_to_kill);
 void start_daemon (int do_close_stdio);
 void checkcrash(void);
-void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
 void init_master_fdset(void);
 void *worker_thread(void *);
diff --git a/citadel/user_ops.h b/citadel/user_ops.h
index 03133c2a3..8c72de018 100644
--- a/citadel/user_ops.h
+++ b/citadel/user_ops.h
@@ -3,6 +3,7 @@
 
 #include <ctype.h>
 #include <syslog.h>
+
 int hash (char *str);
 /* getuser is deprecated, use CtdlGetUser instead */
 int getuser (struct ctdluser *, char *) __attribute__ ((deprecated));
@@ -18,7 +19,6 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who);
 /* getuserbynumber is deprecated, use CtdlGetUserByNumber instead */
 int getuserbynumber (struct ctdluser *usbuf, long int number) __attribute__ ((deprecated));
 void rebuild_usersbynumber(void);
-void cmd_user (char *cmdbuf);
 void session_startup (void);
 void logged_in_response(void);
 int purge_user (char *pname);