fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index c13b8d830e31753fc7b080a450af491dda362b97..4ba90922c19d2528fade3063a2af1ab511688c74 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -10,7 +10,18 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.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 <limits.h>
 #include <errno.h>
 #include "citadel.h"
@@ -113,7 +124,7 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
        }
 
 NEWMSG:        /* By the way, we also check for the presence of new messages */
-       if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
+       if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
                retval = retval | UA_HASNEWMSGS;
        }
        return (retval);
@@ -698,7 +709,7 @@ void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
        if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
                if (msglist[a] > 0L) {
                        ++total_messages;
-                       if (msglist[a] > vbuf.v_lastseen) {
+                       if (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) {
                                ++new_messages;
                        }
                }
@@ -801,7 +812,8 @@ void cmd_goto(char *gargs)
                if (ok == 1) {
                        if ((QRscratch.QRflags & QR_PASSWORDED) &&
                            ((ra & UA_KNOWN) == 0) &&
-                           (strcasecmp(QRscratch.QRpasswd, password))
+                           (strcasecmp(QRscratch.QRpasswd, password)) &&
+                           (CC->usersupp.axlevel < 6)
                            ) {
                                cprintf("%d wrong or missing passwd\n",
                                        ERROR + PASSWORD_REQUIRED);
@@ -809,7 +821,9 @@ void cmd_goto(char *gargs)
                        } else if ((QRscratch.QRflags & QR_PRIVATE) &&
                                   ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
                                   ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
-                                  ((ra & UA_KNOWN) == 0)) {
+                                  ((ra & UA_KNOWN) == 0) &&
+                                  (CC->usersupp.axlevel < 6)
+                                  ) {
                                goto NOPE;
                        } else {
                                usergoto(towhere, 1, NULL, NULL);