* Removed some protocol commands and writeups that are no longer necessary

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 3d83bfe8c4544254731704879c318f865137aab2..0845f9201bc243b15cd45848b38e1cbae9f8ce1b 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -353,7 +353,7 @@ void cmd_time(void)
    
    tv = time(NULL);
    
-   cprintf("%d %ld\n", OK, tv);
+   cprintf("%d %ld\n", OK, (long)tv);
 }
 
 /*
@@ -460,7 +460,7 @@ void cmd_iden(char *argbuf)
                }
                else {
                        safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
-                       CC->cs_host[24] = 0;
+                       CC->cs_host[sizeof CC->cs_host - 1] = 0;
                }
        }
 
@@ -785,7 +785,7 @@ void generate_nonce(struct CitContext *con) {
        gettimeofday(&tv, NULL);
        memset(con->cs_nonce, NONCE_SIZE, 0);
        snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
-               rand(), tv.tv_usec, config.c_fqdn);
+               rand(), (long)tv.tv_usec, config.c_fqdn);
 }
 
 
@@ -1033,10 +1033,6 @@ void do_command_loop(void) {
                cmd_ent0(&cmdbuf[5]);
                }
 
-       else if (!strncasecmp(cmdbuf,"ENT3",4)) {
-               cmd_ent3(&cmdbuf[5]);
-               }
-
        else if (!strncasecmp(cmdbuf,"RINF",4)) {
                cmd_rinf();
                }
@@ -1185,10 +1181,6 @@ void do_command_loop(void) {
                cmd_scdn(&cmdbuf[5]);
                }
 
-       else if (!strncasecmp(cmdbuf, "NSET", 4)) {
-               cmd_nset(&cmdbuf[5]);
-               }
-
        else if (!strncasecmp(cmdbuf, "UIMG", 4)) {
                cmd_uimg(&cmdbuf[5]);
                }