ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/branches/8.2.x/src/ircd.c

Comparing:
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 3321 by michael, Tue Apr 15 16:02:56 2014 UTC vs.
ircd-hybrid/branches/8.2.x/src/ircd.c (file contents), Revision 3906 by michael, Fri Jun 6 23:52:50 2014 UTC

#	Line 25 | Line 25
25		*/
26
27		#include "stdinc.h"
28	<	#include "s_user.h"
28	>	#include "user.h"
29		#include "list.h"
30		#include "ircd.h"
31		#include "channel.h"
#	Line 40 | Line 40
40		#include "conf.h"
41		#include "hostmask.h"
42		#include "parse.h"
43	<	#include "irc_res.h"
43	>	#include "res.h"
44		#include "restart.h"
45		#include "rng_mt.h"
46	<	#include "s_auth.h"
46	>	#include "auth.h"
47		#include "s_bsd.h"
48		#include "log.h"
49	<	#include "s_serv.h"      /* try_connections */
49	>	#include "server.h"      /* try_connections */
50		#include "send.h"
51		#include "whowas.h"
52		#include "modules.h"
#	Line 83 | Line 83 | int doremotd = 0;
83		/* Set to zero because it should be initialized later using
84		* initialize_server_capabs
85		*/
86	<	int default_server_capabs = 0;
86	>	unsigned int default_server_capabs;
87		unsigned int splitmode;
88		unsigned int splitchecking;
89		unsigned int split_users;
#	Line 296 | Line 296 | initialize_server_capabs(void)
296		add_capability("CLUSTER", CAP_CLUSTER, 1);
297		add_capability("SVS", CAP_SVS, 1);
298		add_capability("CHW", CAP_CHW, 1);
299	–	#ifdef HALFOPS
299		add_capability("HOPS", CAP_HOPS, 1);
301	–	#endif
300		}
301
302		/* write_pidfile()
#	Line 457 | Line 455 | main(int argc, char *argv[])
455		/* Check to see if the user is running us as root, which is a nono */
456		if (geteuid() == 0)
457		{
458	<	fprintf(stderr, "Don't run ircd as root!!!\n");
458	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
459		return -1;
460		}
461

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)