X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=3bec05b1ed79418c23fe8c800dbfa9ebaf6aaa11;hb=c37006aac2a4cc8a31643883b2e8d128441a5069;hp=9570e30663030bcb6f513934fa3f3f3d84cd4109;hpb=8d702a17f284ebdc7875b911abe7eadc1cc3d96a;p=citadel.git

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 9570e3066..3bec05b1e 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -289,7 +289,7 @@ void cmd_info(char *cmdbuf) {
 	cprintf("%s\n", config.c_moreprompt);
 	cprintf("1\n");	/* 1 = yes, this system supports floors */
 	cprintf("1\n"); /* 1 = we support the extended paging options */
-	cprintf("%s\n", CC->cs_nonce);
+	cprintf("\n");	/* nonce no longer supported */
 	cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */
 
 #ifdef HAVE_LDAP
@@ -890,22 +890,6 @@ void cmd_asyn(char *argbuf)
 }
 
 
-/*
- * Generate a "nonce" for APOP-style authentication.
- *
- * RFC 1725 et al specify a PID to be placed in front of the nonce.
- * Quoth BTX: That would be stupid.
- */
-void generate_nonce(CitContext *con) {
-	struct timeval tv;
-
-	memset(con->cs_nonce, NONCE_SIZE, 0);
-	gettimeofday(&tv, NULL);
-	memset(con->cs_nonce, NONCE_SIZE, 0);
-	snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
-		rand(), (long)tv.tv_usec, config.c_fqdn);
-}
-
 
 /*
  * Back-end function for starting a session
@@ -933,7 +917,6 @@ void begin_session(CitContext *con)
 	*con->fake_hostname = '\0';
 	*con->fake_roomname = '\0';
 	*con->cs_clientinfo = '\0';
-	generate_nonce(con);
 	safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
 	safestrncpy(con->cs_addr, "", sizeof con->cs_addr);
 	con->cs_UDSclientUID = -1;