* Set server_is_local when using unix domain sockets

diff --git a/citadel/ipc.h b/citadel/ipc.h
index b0d8aa0e67b29193bf20f83d5ebecf8034d3a08c..92b8138338b624857fe19baaef9b409e0cfc0b66 100644 (file)
--- a/citadel/ipc.h
+++ b/citadel/ipc.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 void attach_to_server(int argc, char **argv);
-extern char server_is_local;
+extern int server_is_local;
 int getsockfd(void);
 char serv_getc(void);
 int is_connected(void);

diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c
index befb21afc47ca085baefd5562c7ce59acd894d43..009c69722c977e305fe7ed9376d8474e38df25a2 100644 (file)
--- a/citadel/ipc_c_tcp.c
+++ b/citadel/ipc_c_tcp.c
@@ -46,7 +46,7 @@
  * network session to the local machine) or 0 if the server is executing on
  * a remote computer.
  */
-char server_is_local = 0;
+int server_is_local = 0;
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
@@ -148,6 +148,7 @@ int uds_connectsock(char *sockpath)
                logoff(3);
        }
 
+       server_is_local = 1;
        return s;
 }
 
@@ -307,10 +308,8 @@ void attach_to_server(int argc, char **argv)
  */
        }
 
-       server_is_local = 0;
        if ((!strcmp(cithost, "localhost"))
-           || (!strcmp(cithost, "127.0.0.1"))
-           || (!strcmp(cithost, "uds")))
+           || (!strcmp(cithost, "127.0.0.1")))
                server_is_local = 1;
 
        /* If we're using a unix domain socket we can do a bunch of stuff */

diff --git a/citadel/network/mail.sysinfo b/citadel/network/mail.sysinfo
index 07aa686c7305c8fdebf0ebe3a69a25b233355324..0ce8a870ab5431f47b3a159d2ce2902ddc9284e3 100644 (file)
--- a/citadel/network/mail.sysinfo
+++ b/citadel/network/mail.sysinfo
@@ -1,72 +1,70 @@
-future
+ctestsys
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <catchat> to map
-gdom or system <catchat> to map
-humannode The Future BBS
-lastcontact 952138911 Fri Mar  3 22:01:51 2000
+phonenum US 612 470 9635
+gdom MN
+humannode C-86 Test System
+lastcontact 952673825 Fri Mar 10 02:37:05 2000
 
-catchat
+bccs
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <rundale> to map
-gdom or system <rundale> to map
-humannode 'Cat Chat
-lastcontact 952138915 Fri Mar  3 22:01:55 2000
+phonenum netproc[7145]: Adding non-neighbor system <internet> to map
+gdom or system <internet> to map
+humannode BCCS
+lastcontact 952648629 Thu Mar  9 19:37:09 2000
 
-rundale
-use uncnsrd
-phonenum US 609 854 9135
-gdom NJ
-humannode Rundale
-lastcontact 952138909 Fri Mar  3 22:01:49 2000
+internet
+uum %s
+humannode Internet Gateway
+lastcontact 952727824 Fri Mar 10 17:37:04 2000
 
-jacs
-use uncnsrd
-phonenum US6093461224
-gdom NJ
-humannode JACS
-lastcontact 952634224 Thu Mar  9 15:37:04 2000
+uncnsrd
+bin Mail
+phonenum US 914 244 3252
+humannode Uncensored
+lastcontact 952720625 Fri Mar 10 15:37:05 2000
 
-dogpound2
-use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <sbn> to map
-gdom or system <sbn> to map
-humannode Dog Pound BBS II
-lastcontact 952724225 Fri Mar 10 16:37:05 2000
+test
+bin Mail
 
-sbn
-use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <feathers> to map
-gdom or system <feathers> to map
-humannode Super BBS Network
-lastcontact 952138908 Fri Mar  3 22:01:48 2000
+tux
+bin Mail
+phonenum US 800 555 1212
+humannode My System
+lastcontact 951540103 Fri Feb 25 23:41:43 2000
 
-feathers
+tesseract
+bin Mail
+phonenum US 800 555 1212
+humannode Tesseract Project
+lastcontact 952727825 Fri Mar 10 17:37:05 2000
+
+pixel
 use uncnsrd
-phonenum CA (604) 589-8539
-gdom BC
-humannode Feathers & Furballs
-lastcontact 952138915 Fri Mar  3 22:01:55 2000
+phonenum netproc[4026]: Adding non-neighbor system <tesseract> to map
+gdom or system <tesseract> to map
+humannode PixelBBS
+lastcontact 952727824 Fri Mar 10 17:37:04 2000
 
-charis
+barbaria
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <gateway> to map
-gdom or system <gateway> to map
-humannode MascotSpeak
-lastcontact 952138904 Fri Mar  3 22:01:44 2000
+phonenum netproc[4026]: Adding non-neighbor system <pixel> to map
+gdom or system <pixel> to map
+humannode Barbaria
+lastcontact 952138915 Fri Mar  3 22:01:55 2000
 
-gateway
+haven
 use uncnsrd
-phonenum US (609) 931-3014
-gdom NJ
-humannode Gateway
-lastcontact 952138913 Fri Mar  3 22:01:53 2000
+phonenum netproc[4026]: Adding non-neighbor system <barbaria> to map
+gdom or system <barbaria> to map
+humannode Haven BBS
+lastcontact 952138910 Fri Mar  3 22:01:50 2000
 
-amigazon
+mnmensa
 use uncnsrd
-phonenum US (609) 953 8159
-gdom NJ
-humannode The Amiga Zone
-lastcontact 952720625 Fri Mar 10 15:37:05 2000
+phonenum US (612) 757-7307
+gdom MN
+humannode MN-Mensa
+lastcontact 952138905 Fri Mar  3 22:01:45 2000
 
 cbbs
 use uncnsrd
@@ -75,71 +73,73 @@ gdom Cinci
 humannode The CBBS
 lastcontact 952138903 Fri Mar  3 22:01:43 2000
 
-mnmensa
+amigazon
 use uncnsrd
-phonenum US (612) 757-7307
-gdom MN
-humannode MN-Mensa
-lastcontact 952138905 Fri Mar  3 22:01:45 2000
+phonenum US (609) 953 8159
+gdom NJ
+humannode The Amiga Zone
+lastcontact 952720625 Fri Mar 10 15:37:05 2000
 
-haven
+gateway
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <barbaria> to map
-gdom or system <barbaria> to map
-humannode Haven BBS
-lastcontact 952138910 Fri Mar  3 22:01:50 2000
+phonenum US (609) 931-3014
+gdom NJ
+humannode Gateway
+lastcontact 952138913 Fri Mar  3 22:01:53 2000
 
-barbaria
+charis
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <pixel> to map
-gdom or system <pixel> to map
-humannode Barbaria
-lastcontact 952138915 Fri Mar  3 22:01:55 2000
+phonenum netproc[4026]: Adding non-neighbor system <gateway> to map
+gdom or system <gateway> to map
+humannode MascotSpeak
+lastcontact 952138904 Fri Mar  3 22:01:44 2000
 
-pixel
+feathers
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <tesseract> to map
-gdom or system <tesseract> to map
-humannode PixelBBS
-lastcontact 952706223 Fri Mar 10 11:37:03 2000
-
-tesseract
-bin Mail
-phonenum US 800 555 1212
-humannode Tesseract Project
-lastcontact 952724226 Fri Mar 10 16:37:06 2000
+phonenum CA (604) 589-8539
+gdom BC
+humannode Feathers & Furballs
+lastcontact 952138915 Fri Mar  3 22:01:55 2000
 
-tux
-bin Mail
-phonenum US 800 555 1212
-humannode My System
-lastcontact 951540103 Fri Feb 25 23:41:43 2000
+sbn
+use uncnsrd
+phonenum netproc[4026]: Adding non-neighbor system <feathers> to map
+gdom or system <feathers> to map
+humannode Super BBS Network
+lastcontact 952138908 Fri Mar  3 22:01:48 2000
 
-test
-bin Mail
+dogpound2
+use uncnsrd
+phonenum netproc[4026]: Adding non-neighbor system <sbn> to map
+gdom or system <sbn> to map
+humannode Dog Pound BBS II
+lastcontact 952724225 Fri Mar 10 16:37:05 2000
 
-uncnsrd
-bin Mail
-phonenum US 914 244 3252
-humannode Uncensored
-lastcontact 952720625 Fri Mar 10 15:37:05 2000
+jacs
+use uncnsrd
+phonenum US6093461224
+gdom NJ
+humannode JACS
+lastcontact 952634224 Thu Mar  9 15:37:04 2000
 
-internet
-uum %s
-humannode Internet Gateway
-lastcontact 952724225 Fri Mar 10 16:37:05 2000
+rundale
+use uncnsrd
+phonenum US 609 854 9135
+gdom NJ
+humannode Rundale
+lastcontact 952138909 Fri Mar  3 22:01:49 2000
 
-bccs
+catchat
 use uncnsrd
-phonenum netproc[7145]: Adding non-neighbor system <internet> to map
-gdom or system <internet> to map
-humannode BCCS
-lastcontact 952648629 Thu Mar  9 19:37:09 2000
+phonenum netproc[4026]: Adding non-neighbor system <rundale> to map
+gdom or system <rundale> to map
+humannode 'Cat Chat
+lastcontact 952138915 Fri Mar  3 22:01:55 2000
 
-ctestsys
+future
 use uncnsrd
-phonenum US 612 470 9635
-gdom MN
-humannode C-86 Test System
-lastcontact 952673825 Fri Mar 10 02:37:05 2000
+phonenum netproc[4026]: Adding non-neighbor system <catchat> to map
+gdom or system <catchat> to map
+humannode The Future BBS
+lastcontact 952138911 Fri Mar  3 22:01:51 2000