Merge default.

[irc/quakenet/newserv.git] / trusts / trusts.h

diff --git a/trusts/trusts.h b/trusts/trusts.h
index c093b57890ce3aed9893c49e1316078ffec8ee4d..542bfc8f5acf0a029d2ac47f4a55eeafe8a2397c 100644 (file)
--- a/trusts/trusts.h
+++ b/trusts/trusts.h
@@ -37,11 +37,14 @@
 #define POLICY_FAILURE_IDENTD 3
 #define POLICY_FAILURE_IDENTCOUNT 4
 
+#define DEFAULT_TRUSTPORT 5776
+
 #define TRUST_ENFORCE_IDENT 1 /* This must be 1 for compatibility with O. */
 #define TRUST_NO_CLEANUP 2
 #define TRUST_PROTECTED 4
+#define TRUST_RELIABLE_USERNAME 8
 
-#define TRUST_MIN_UNPRIVILEGED_BITS_IPV4 (96 + 32)
+#define TRUST_MIN_UNPRIVILEGED_BITS_IPV4 (96 + 20)
 #define TRUST_MIN_UNPRIVILEGED_BITS_IPV6 32
 
 #define TRUST_MIN_UNPRIVILEGED_NODEBITS_IPV4 (96 + 24)
@@ -112,7 +115,6 @@ int trusts_fullyonline(void);
 
 /* formats.c */
 char *trusts_timetostr(time_t);
-char *trusts_cidr2str(struct irc_in_addr *ip, unsigned char);
 char *dumpth(trusthost *, int);
 char *dumptg(trustgroup *, int);
 int parseth(char *, trusthost *, unsigned int *, int);