More removal of $Id$ tags

[citadel.git] / citadel / textclient / citadel.c

diff --git a/citadel/textclient/citadel.c b/citadel/textclient/citadel.c
index 407b47ae9469bfeb27f5a9b56ea8264d2d84bac0..3ea33eea143ad49c93c2aa502a0ca36cf0d52d83 100644 (file)
--- a/citadel/textclient/citadel.c
+++ b/citadel/textclient/citadel.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Main source module for the client program.
  *
  * Copyright (c) 1987-2009 by the citadel.org team
@@ -1568,8 +1566,7 @@ int main(int argc, char **argv)
        newprompt("Connect to (return for local server): ", hostbuf, 64);
 #endif
 
-       sln_printf("Attaching to server... \r");
-       sln_flush();
+       sln_printf("Attaching to server...\n");
        ipc = CtdlIPC_new(argc, argv, hostbuf, portbuf);
        if (!ipc) {
                screen_delete();
@@ -1685,6 +1682,12 @@ int main(int argc, char **argv)
                mcmd = 29;
                goto TERMN8;
        }
+
+       /* FIXME this is a stupid way to do guest mode but it's a reasonable test harness FIXME */
+       if ( (ipc->ServInfo.guest_logins) && (!strcasecmp(fullname, "guest")) ) {
+               goto PWOK;
+       }
+
        /* sign on to the server */
        r = CtdlIPCTryLogin(ipc, fullname, aaa);
        if (r / 100 != 3)
@@ -2120,21 +2123,6 @@ NEWUSR:  if (IsEmptyStr(rc_password)) {
                                chatmode(ipc);
                                break;
 
-                       case 2:
-                               if (ipc->isLocal) {
-                                       screen_reset();
-                                       stty_ctdl(SB_RESTORE);
-                                       snprintf(aaa, sizeof aaa, "USERNAME=\042%s\042; export USERNAME;"
-                                                "exec ./subsystem %ld %d %d", fullname,
-                                                usernum, screenwidth, axlevel);
-                                       ka_system(aaa);
-                                       stty_ctdl(SB_NO_INTR);
-                                       screen_set();
-                               } else {
-                                       scr_printf("*** Can't run doors when server is not local.\n");
-                               }
-                               break;
-
                        case 17:
                                who_is_online(ipc, 0);
                                break;