From: Matthew Mondor <mmondor@pulsar-zone.net>
Date: Fri, 14 Jan 2005 05:45:06 +0000 (+0000)
Subject: Added NO_TILDE in include/config.h with corresponding conditional in code
X-Git-Tag: rubiks-ircd-1-0-6~36
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=6122476b912cfec883dbbabfc201500084361449;p=rubiks-ircd.git

Added NO_TILDE in include/config.h with corresponding conditional in code
to prevent prefixing tildes to usernames without idents
---

diff --git a/RUBIKS-CHANGES b/RUBIKS-CHANGES
index f3fcfcd..fc4daab 100644
--- a/RUBIKS-CHANGES
+++ b/RUBIKS-CHANGES
@@ -6,6 +6,11 @@ rubiks-ircd-0-0-2	Based on bahamut 1.8.3 release (BAHAMUT-1-8-3)
   - DCC Allow patch (DCCALLOW in include/config.h)
   - OpenSSL (--enable-openssl in configure script)
   - Colored Nicknames (COLORED_NICKS in include/config.h)
+  - Added NO_TILDE in include/config.h to prevent ~ from being prefixed
+    to usernames for which ident could not be retreived (useful when no ident
+    is wanted especially)
 
 - Added cleaning of zlib/Makefile and zlib/zconf.h which was missing
   in bahamut release
+
+- Changed some defaults to comply with wanted Rubiks network functionality
diff --git a/include/config.h b/include/config.h
index e52366c..090b37b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -18,7 +18,7 @@
  *
  */
 
-/* $Id: config.h,v 1.5 2005/01/13 10:35:43 mmondor Exp $ */
+/* $Id: config.h,v 1.6 2005/01/14 05:45:05 mmondor Exp $ */
 
 #ifndef	__config_include__
 #define	__config_include__
@@ -570,6 +570,11 @@
  */
 #define FAKEHOST
 
+/* NO_TILDE
+ * Prevent tildes to be prefixed to nicknames when identd could not be used
+ */
+#define NO_TILDE
+
 /* SSL
  * SSL support stolen from fqircd
  */
diff --git a/src/s_user.c b/src/s_user.c
index 364bc6d..10f5c46 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* $Id: s_user.c,v 1.4 2005/01/13 10:35:45 mmondor Exp $ */
+/* $Id: s_user.c,v 1.5 2005/01/14 05:45:06 mmondor Exp $ */
 
 #include "struct.h"
 #include "common.h"
@@ -578,13 +578,15 @@ register_user(aClient *cptr, aClient *sptr, char *nick, char *username)
 
         if (sptr->flags & FLAGS_DOID && !(sptr->flags & FLAGS_GOTID)) 
         {
+#ifndef NO_TILDE
             /* because username may point to user->username */
             char        temp[USERLEN + 1];
-            
+ 
             strncpyzt(temp, username, USERLEN + 1);
             *user->username = '~';
             (void) strncpy(&user->username[1], temp, USERLEN);
             user->username[USERLEN] = '\0';
+#endif
 #ifdef IDENTD_COMPLAIN
             /* tell them to install identd -Taner */
             sendto_one(sptr, ":%s NOTICE %s :*** Notice -- It seems that you "