Merge remote branch 'upstream/master'

[srvx.git] / src / proto-p10.c

diff --git a/src/proto-p10.c b/src/proto-p10.c
index f807401d86a96c9d463146f391f8adc18c864d6c..e4c96207161b52632542133572ef27e368a1ef35 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -126,7 +126,7 @@
 #define TOK_EOB_ACK             "EA"
 #define TOK_ERROR               "Y"
 #define TOK_FAKEHOST            "FA"
-#define TOK_FAKEHOST2           "FA2"
+#define TOK_FAKEHOST2           "NFH"
 #define TOK_GET                 "GET"
 #define TOK_GLINE               "GL"
 #define TOK_HASH                "HASH"
@@ -1489,7 +1489,7 @@ static CMD_FUNC(cmd_clearmode)
 static CMD_FUNC(cmd_topic)
 {
     struct chanNode *cn;
-    unsigned long chan_ts, topic_ts;
+    unsigned long topic_ts;
 
     if (argc < 3)
         return 0;
@@ -1499,10 +1499,8 @@ static CMD_FUNC(cmd_topic)
     }
     if (argc >= 5) {
         /* Looks like an Asuka style topic burst. */
-        chan_ts = atoi(argv[2]);
         topic_ts = atoi(argv[3]);
     } else {
-        chan_ts = cn->timestamp;
         topic_ts = now;
     }
     SetChannelTopic(cn, GetUserH(origin), argv[argc-1], 0);
@@ -1777,12 +1775,9 @@ static CMD_FUNC(cmd_relay)
              } else {
                 devnull[0] = 0;
              }
-             /* // currently disabled because of a ircu incompatibility
              if(!HANDLE_FLAGGED(hi, AUTOHIDE)) {
                 sprintf(tmp,"%s LA %s 0 %s\n",argv[3],hi->handle,devnull);
-             } else 
-             */
-             if(getfakehost(argv[4])) {
+             } else if(getfakehost(argv[4])) {
                 sprintf(tmp,"%s LA %s %s %s\n",argv[3],hi->handle,getfakehost(argv[4]),devnull);
              } else {
                 extern const char *hidden_host_suffix;
@@ -2243,7 +2238,6 @@ AddLocalUser(const char *nick, const char *ident, const char *hostname, const ch
 {
     char numeric[COMBO_NUMERIC_LEN+1];
     int local_num = get_local_numeric();
-    unsigned long timestamp = now;
     struct userNode *old_user = GetUserH(nick);
 
     if (!modes)
@@ -2251,7 +2245,6 @@ AddLocalUser(const char *nick, const char *ident, const char *hostname, const ch
     if (old_user) {
         if (IsLocal(old_user))
             return old_user;
-        timestamp = old_user->timestamp - 1;
     }
     if (local_num == -1) {
         log_module(MAIN_LOG, LOG_ERROR, "Unable to allocate numnick for service %s", nick);