1 files changed, 31 insertions, 31 deletions

diff --git a/server/zserver.h b/server/zserver.h
index 874b11a..cb36749 100644
--- a/server/zserver.h
+++ b/server/zserver.h
@@ -64,6 +64,27 @@ typedef struct {
 } Sched;
 #endif
 
+enum _ZRealm_state {
+    REALM_UP,				/* ZRealm is up */
+    REALM_TARDY,			/* ZRealm due for a hello XXX */
+    REALM_DEAD,				/* ZRealm is considered dead */
+    REALM_STARTING			/* ZRealm is between dead and up */
+};
+
+enum _Server_state {
+    SERV_UP,				/* Server is up */
+    SERV_TARDY,				/* Server due for a hello */
+    SERV_DEAD,				/* Server is considered dead */
+    SERV_STARTING			/* Server is between dead and up */
+};
+
+enum _Sent_type {
+    NOT_SENT,				/* message was not xmitted */
+    SENT,				/* message was xmitted */
+    AUTH_FAILED,			/* authentication failed */
+    NOT_FOUND				/* user not found for uloc */
+};
+
 typedef struct _Destination Destination;
 typedef struct _Destlist Destlist;
 typedef struct _ZRealm ZRealm;
@@ -89,13 +110,6 @@ struct _Destlist {
     struct _Destlist	*next, **prev_p;
 };
 
-enum _ZRealm_state {
-    REALM_UP,				/* ZRealm is up */
-    REALM_TARDY,			/* ZRealm due for a hello XXX */
-    REALM_DEAD,				/* ZRealm is considered dead */
-    REALM_STARTING			/* ZRealm is between dead and up */
-};
-
 struct _ZRealm {
     char name[REALM_SZ];
     int count;
@@ -141,13 +155,6 @@ struct _Triplet {
     struct _Triplet	*next, **prev_p;
 };
 
-enum _Server_state {
-    SERV_UP,				/* Server is up */
-    SERV_TARDY,				/* Server due for a hello */
-    SERV_DEAD,				/* Server is considered dead */
-    SERV_STARTING			/* Server is between dead and up */
-};
-
 struct _Unacked {
     Timer		*timer;		/* timer for retransmit */
     Client		*client;	/* responsible client, or NULL */
@@ -188,13 +195,6 @@ struct _Server {
     char		addr_str[16];	/* text version of address */
 };
 
-enum _Sent_type {
-    NOT_SENT,				/* message was not xmitted */
-    SENT,				/* message was xmitted */
-    AUTH_FAILED,			/* authentication failed */
-    NOT_FOUND				/* user not found for uloc */
-};
-
 /* statistics gathering */
 struct _Statistic {
     int			val;
@@ -226,14 +226,14 @@ struct _Statistic {
 	if((elem)->next) (elem)->next->prev_p = (elem)->prev_p;	\
     }
 
-MAKE_LIST_INSERT(Destlist);
-MAKE_LIST_DELETE(Destlist);
-MAKE_LIST_INSERT(Client);
-MAKE_LIST_DELETE(Client);
-MAKE_LIST_INSERT(Triplet);
-MAKE_LIST_DELETE(Triplet);
-MAKE_LIST_INSERT(Unacked);
-MAKE_LIST_DELETE(Unacked);
+MAKE_LIST_INSERT(Destlist)
+MAKE_LIST_DELETE(Destlist)
+MAKE_LIST_INSERT(Client)
+MAKE_LIST_DELETE(Client)
+MAKE_LIST_INSERT(Triplet)
+MAKE_LIST_DELETE(Triplet)
+MAKE_LIST_INSERT(Unacked)
+MAKE_LIST_DELETE(Unacked)
 
 /* found in bdump.c */
 void bdump_get(ZNotice_t *notice, int auth, struct sockaddr_in *who,
@@ -339,6 +339,7 @@ void subscr_reset(void);
 Code_t subscr_def_subs(Client *who);
 Code_t subscr_realm(ZRealm *, ZNotice_t *);
 Code_t subscr_send_realm_subs(ZRealm *);
+Code_t subscr_realm_subs(ZRealm *);
 Code_t subscr_realm_cancel(struct sockaddr_in *, ZNotice_t *, ZRealm *);
 
 /* found in uloc.c */
@@ -411,7 +412,7 @@ extern char subs_file[];
 extern const char version[];
 extern u_long npackets;			/* num of packets processed */
 extern time_t uptime;			/* time we started */
-extern struct in_addr my_addr;
+extern struct in_addr my_addr;		/* my inet address */
 extern struct timeval t_local;		/* current time */
 
 /* found in bdump.c */
@@ -435,7 +436,6 @@ extern String *wildcard_instance;
 extern ZRealm *otherrealms;
 extern int nrealms;
 
-extern struct in_addr my_addr;	/* my inet address */
 
 #define class_is_control(classname) (classname == class_control)
 #define class_is_admin(classname) (classname == class_admin)