struct ConfItem;
extern rb_dlink_list cluster_conf_list;
-extern rb_dlink_list shared_conf_list;
extern rb_dlink_list oper_conf_list;
-extern rb_dlink_list hubleaf_conf_list;
extern rb_dlink_list server_conf_list;
extern rb_dlink_list xline_conf_list;
extern rb_dlink_list resv_conf_list;
void add_tgchange(const char *host);
tgchange *find_tgchange(const char *host);
-/* shared/cluster/hub/leaf confs */
+/* cluster confs */
struct remote_conf
{
char *username;
SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV | SHARED_GRANT)
#define CLUSTER_ALL (SHARED_ALL | SHARED_LOCOPS)
-/* flags used in hub/leaf */
-#define CONF_HUB 0x0001
-#define CONF_LEAF 0x0002
-
struct oper_conf
{
char *name;
extern struct remote_conf *make_remote_conf(void);
extern void free_remote_conf(struct remote_conf *);
-extern bool find_shared_conf(const char *username, const char *host,
- const char *server, int flags);
extern void propagate_generic(struct Client *source_p, const char *command,
const char *target, int cap, const char *format, ...);
extern void cluster_generic(struct Client *, const char *, int cltype,
#define HasPrivilege(x, y) ((x)->user != NULL && (x)->user->privset != NULL && privilegeset_in_set((x)->user->privset, (y)))
#define MayHavePrivilege(x, y) (HasPrivilege((x), (y)) || (IsOper((x)) && (x)->user != NULL && (x)->user->privset == NULL))
-#define IsOperGlobalKill(x) (HasPrivilege((x), "oper:global_kill"))
-#define IsOperLocalKill(x) (HasPrivilege((x), "oper:local_kill"))
+#define IsOperKill(x) (HasPrivilege((x), "oper:kill"))
#define IsOperRemote(x) (HasPrivilege((x), "oper:routing"))
#define IsOperUnkline(x) (HasPrivilege((x), "oper:unkline"))
#define IsOperN(x) (HasPrivilege((x), "snomask:nick_changes"))
#define IsOperOperwall(x) (HasPrivilege((x), "oper:operwall"))
#define IsOperSpy(x) (HasPrivilege((x), "oper:spy"))
#define IsOperInvis(x) (HasPrivilege((x), "oper:hidden"))
-#define IsOperRemoteBan(x) (HasPrivilege((x), "oper:remoteban"))
-#define IsOperMassNotice(x) (HasPrivilege((x), "oper:mass_notice"))
-#define IsOperGeneral(x) (MayHavePrivilege((x), "oper:general"))
+#define IsOperRemoteBan(x) (HasPrivilege((x), "oper:remoteban"))
+#define IsOperMassNotice(x) (HasPrivilege((x), "oper:mass_notice"))
+#define IsOperGeneral(x) (MayHavePrivilege((x), "oper:general"))
#define SeesOper(target, source) (IsOper((target)) && ((!ConfigFileEntry.hide_opers && !HasPrivilege((target), "oper:hidden")) || HasPrivilege((source), "auspex:oper")))