Merge branch 'anopeng-config' of http://git.inspircd.org/git/anope/ into anopeng-config

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1449 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 3 insertions, 53 deletions

diff --git a/include/services.h b/include/services.h
index c8d9af8ac..5a6bcc8a2 100644
--- a/include/services.h
+++ b/include/services.h
@@ -227,9 +227,6 @@ typedef struct c_elist EList;
 typedef struct c_elist_entry Entry;
 typedef struct ModuleData_ ModuleData;			/* ModuleData struct */
 typedef struct memo_ Memo;
-typedef struct nickrequest_ NickRequest;
-typedef struct nickalias_ NickAlias;
-typedef struct nickcore_ NickCore;
 typedef struct chaninfo_ ChannelInfo;
 typedef struct badword_ BadWord;
 typedef struct bandata_ BanData;
@@ -462,59 +459,12 @@ typedef struct {
     Memo *memos;
 } MemoInfo;
 
-/*************************************************************************/
-
-/* NickServ nickname structures. */
-
-
-struct nickrequest_ {
-	NickRequest *next, *prev;
-	char *nick;
-	char *passcode;
-	char password[PASSMAX];
-	char *email;
-	time_t requested;
-	time_t lastmail;			/* Unsaved */
-};
 
-struct nickalias_ {
-	NickAlias *next, *prev;
-	char *nick;				/* Nickname */
-	char *last_quit;			/* Last quit message */
-	char *last_realname;			/* Last realname */
-	char *last_usermask;			/* Last usermask */
-        time_t time_registered;			/* When the nick was registered */
-        time_t last_seen;			/* When it was seen online for the last time */
-        uint16 status;				/* See NS_* below */
-        NickCore *nc;				/* I'm an alias of this */
-        /* Not saved */
-        ModuleData *moduleData; 		/* Module saved data attached to the nick alias */
-    	User *u;				/* Current online user that has me */
-};
 
-struct nickcore_ {
-	NickCore *next, *prev;
-
-	char *display;				/* How the nick is displayed */
-	char pass[PASSMAX];				/* Password of the nicks */
-	char *email;				/* E-mail associated to the nick */
-	char *greet;				/* Greet associated to the nick */
-	uint32 icq;				/* ICQ # associated to the nick */
-	char *url;				/* URL associated to the nick */
-	uint32 flags;				/* See NI_* below */
-	uint16 language;			/* Language selected by nickname owner (LANG_*) */
-        uint16 accesscount;			/* # of entries */
-        char **access;				/* Array of strings */
-        MemoInfo memos;
-        uint16 channelcount;			/* Number of channels currently registered */
-        uint16 channelmax;			/* Maximum number of channels allowed */
-
-        /* Unsaved data */
-        ModuleData *moduleData;	  	/* Module saved data attached to the NickCore */
-        time_t lastmail;			/* Last time this nick record got a mail */
-        SList aliases;				/* List of aliases */
-};
+/*************************************************************************/
 
+// For NickServ
+#include "account.h"
 
 /*************************************************************************/