removed all references to sprintf from several files (not all files yet)

[citadel.git] / citadel / serv_pas2.c

diff --git a/citadel/serv_pas2.c b/citadel/serv_pas2.c
index 7a38bf0ad1d49db0adb28201614de033f9ac0f1c..f1b1dbf1e8e3b57535c2b61ec14aae7ec41d00b3 100644 (file)
--- a/citadel/serv_pas2.c
+++ b/citadel/serv_pas2.c
@@ -6,7 +6,18 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
@@ -52,11 +63,11 @@ void cmd_pas2(char *argbuf)
        
        if (strlen(pw) != (MD5_HEXSTRING_SIZE-1))
        {
-               cprintf("%d Auth string of length %d is the wrong length (should be %d).\n", ERROR, strlen(pw), MD5_HEXSTRING_SIZE-1);
+               cprintf("%d Auth string of length %ld is the wrong length (should be %d).\n", ERROR, (long)strlen(pw), MD5_HEXSTRING_SIZE-1);
                return;
        }
        
-       make_apop_string(CC->usersupp.password, CC->cs_nonce, hexstring);
+       make_apop_string(CC->usersupp.password, CC->cs_nonce, hexstring, sizeof hexstring);
        
        if (!strcmp(hexstring, pw))
        {
@@ -77,5 +88,5 @@ void cmd_pas2(char *argbuf)
 char *Dynamic_Module_Init(void)
 {
         CtdlRegisterProtoHook(cmd_pas2, "PAS2", "APOP-based login");
-        return "$(RCSID)";
+        return "$Id$";
 }