* Ported misc fixes to 1.2.9

* Ported [2419] to 1.2.9


svn: 2578

doc/UPDATES

@@ -15,6 +15,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed cmd_[un]stick not properly using numbers for channel masks. (#160)
 * Fixed binary spawning/updating to escape needed chars for shell. (#158)
 * Fixed a flaw in binary checksums.
+* Removed references to the old 'greet' features of eggdrop from help.
 
 1.2.8
 * Fixed [bot]* cmds depending on case of botnicks.

misc/help.txt

@@ -634,11 +634,10 @@ See also: chpass%{+n}, chsecpass%{-}
 ::chinfo
 ###  $bchinfo$b <user> [channel] [info-line/none]
    Sets the information line for a user. This line is shown via the /msg
-   commands $b'who'$b and $b'whois'$b. If you have set greet on, it is also
-   shown when the user joins the channel. If the info line begins with an '@',
-   then it is "locked", and that user may no longer change it. If the channel
-   name is omitted, the default info line is changed. If you specify 'none'
-   as the info-line, it will be erased.
+   commands $b'who'$b and $b'whois'$b. 
+   If the info line begins with an '@', then it is "locked", and that user 
+   may no longer change it. If the channel name is omitted, the default info 
+   line is changed. If you specify 'none' as the info-line, it will be erased.
  
 See also: info
 :hub:chnick
@@ -1060,9 +1059,8 @@ See also: +ignore, -ignore
 ::info
 ###  $binfo$b [channel] [info-line]
    Sets your info line. This line is shown via the /msg commands $b'who'$b and
-   $b'whois'$b. If you have set greet on, it is also shown when you join the
-   channel. If the info line begins with an '@', then it is "locked", and you
-   may no longer change it.
+   $b'whois'$b. If the info line begins with an '@', then it is "locked", and 
+   you may no longer change it.
  
 %{+m|m}See also: chinfo%{-}
 :leaf:invite

src/binary.c

@@ -439,7 +439,7 @@ static bool check_bin_initialized(const char *fname)
   size_t len = strlen(shell_escape(fname)) + 3 + 1;
   char *path = (char *) my_calloc(1, len);
 
-  simple_snprintf(path, len, "%s -q", shell_escape(fname));
+  simple_snprintf(path, len, "%s -p", shell_escape(fname));
 
   i = system(path);
   free(path);

src/net.c

@@ -252,6 +252,13 @@ in_addr_t getmyip() {
 /* see if it's necessary to set inaddr_any... because if we can't resolve, we die anyway */
 void cache_my_ip()
 {
+#ifdef no
+  cached_myip6_so.sin6.sin6_family = AF_INET6;
+  cached_myip6_so.sin6.sin6_addr = in6addr_any;
+  cached_myip4_so.sin.sin_family = AF_INET;
+  cached_myip4_so.sin.sin_addr.s_addr = INADDR_ANY;
+#endif
+
   int error = 0;
 
   debug0("cache_my_ip()");