text client: if the 'who am i' command is used to populate the host name, strip the...

diff --git a/citadel/config.mk b/citadel/config.mk
index 864c60f48007f2bb25b420a4e0b044a496516fa0..58e36c7039da3ca932cef55e03e72f83ec525515 100644 (file)
--- a/citadel/config.mk
+++ b/citadel/config.mk
@@ -1,4 +1,4 @@
 # config.mk is generated by configure
 CTDLDIR := /root/citadel/citadel
-CFLAGS := -ggdb -DHAVE_OPENSSL -DBUILD_ID=\"v957-38-g71c3e52b0\" -DCTDLDIR=\"/root/citadel/citadel\"
+CFLAGS := -ggdb -DHAVE_OPENSSL -DBUILD_ID=\"v957-74-g825c7f252\" -DCTDLDIR=\"/root/citadel/citadel\"
 LDFLAGS :=  -lssl -lcrypto -lz

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index e5788ad4c6b5152e25ca7f4b09d9c718b9cb6724..a2f583c6e909b77348eaf2af1de18ec8e7e2b880 100644 (file)
--- a/textclient/citadel_ipc.c
+++ b/textclient/citadel_ipc.c
@@ -1672,7 +1672,7 @@ int CtdlIPCIdentifySoftware(CtdlIPC * ipc, int developerid, int clientid,
                developerid = 8;
                clientid = 0;
                revision = CLIENT_VERSION - 600;
-               software_name = "Citadel (libcitadel)";
+               software_name = "Citadel text client";
        }
        if (!hostname)
                return -2;

diff --git a/textclient/config.mk b/textclient/config.mk
index da064d22e975f5b3bef05adedfb1a984f2464502..518496338f41e337499f780482d7ee18d9c57b7c 100644 (file)
--- a/textclient/config.mk
+++ b/textclient/config.mk
@@ -1,5 +1,5 @@
-CFLAGS := -Wformat-truncation=0 -ggdb -DHAVE_OPENSSL
-LDFLAGS :=  -lssl -lcrypto -lz
+CFLAGS := -Wformat-truncation=0 -ggdb
+LDFLAGS := 
 PREFIX := /usr/local
 BINDIR := /usr/local/bin
 CTDLDIR := /usr/local/citadel

diff --git a/textclient/routines.c b/textclient/routines.c
index 56b4fd3375ae8f246172c2a1366b1c6d390689b9..6ef2978663fb1d67b999288d791fcddf4f5063ee 100644 (file)
--- a/textclient/routines.c
+++ b/textclient/routines.c
@@ -490,6 +490,9 @@ void locate_host(CtdlIPC * ipc, char *hbuf) {
                return;
        }
        fgets(hbuf, SIZ, who);
+       if (hbuf[strlen(hbuf) - 1] == '\n') {
+               hbuf[strlen(hbuf) - 1] = 0;
+       }
        pclose(who);
        stripallbut(hbuf, '(', ')');
 }