Removed NEEDAUTH flag since it didn't do anything useful.

We represent a user who has never authed with lastauth=0. Expiry of never-authed users can be done based on creation time.
Updated the import script to behave accordingly.

diff --git a/chanserv/authcmds/login.c b/chanserv/authcmds/login.c
index e18d8841aaf5f12d1d7b6d73a64b4a274cb6406e..c40c94543216afdc8ebdefecbc83145cfe5b7366 100644 (file)
--- a/chanserv/authcmds/login.c
+++ b/chanserv/authcmds/login.c
@@ -115,8 +115,6 @@ int csa_auth(void *source, int cargc, char **cargv, CRAlgorithm alg) {
     rup->suspendreason=0;
   }
   
-  if (UIsNeedAuth(rup))
-    rup->flags&=~(QUFLAG_NEEDAUTH);
   csdb_updateuser(rup);
   
   if (UIsDelayedGline(rup)) {

diff --git a/chanserv/chanserv.c b/chanserv/chanserv.c
index fea8dfd0f6e87905d76454ffa053dacf7bf6732a..1a56dbdf68e6a8e7f283c509f2a7cfa97556ea90 100644 (file)
--- a/chanserv/chanserv.c
+++ b/chanserv/chanserv.c
@@ -60,7 +60,6 @@ const flag ruflags[] = {
   { 'G',  QUFLAG_DELAYEDGLINE },
   { 'h',  QUFLAG_HELPER },
   { 'i',  QUFLAG_INFO },
-  { 'l',  QUFLAG_NEEDAUTH },
   { 'L',  QUFLAG_NOAUTHLIMIT },
   { 'n',  QUFLAG_NOTICE },
   { 'o',  QUFLAG_OPER },

diff --git a/chanserv/chanserv.h b/chanserv/chanserv.h
index d14992fb5c1d89e1e755496ca8dda8ea9c7abc12..d970950df8f645caacc0390f11668b9bef48b25c 100644 (file)
--- a/chanserv/chanserv.h
+++ b/chanserv/chanserv.h
@@ -299,7 +299,7 @@
 
 
 /* User flags */
-#define   QUFLAG_NEEDAUTH      0x0001  /* +l */
+/* SPARE FLAG                  0x0001 */
 #define   QUFLAG_GLINE         0x0002  /* +g */
 #define   QUFLAG_NOTICE        0x0004  /* +n */
 #define   QUFLAG_RESTRICTED    0x0008  /* +r */
@@ -314,9 +314,8 @@
 #define   QUFLAG_NOAUTHLIMIT   0x1000  /* +L */
 #define   QUFLAG_CLEANUPEXEMPT 0x4000  /* +D */
 #define   QUFLAG_TRUST         0x8000  /* +T */
-#define   QUFLAG_ALL           0xdfff
+#define   QUFLAG_ALL           0xdffe
 
-#define UIsNeedAuth(x)      ((x)->flags & QUFLAG_NEEDAUTH)
 #define UIsGline(x)         ((x)->flags & QUFLAG_GLINE)
 #define UIsNotice(x)        ((x)->flags & QUFLAG_NOTICE)
 #define UIsRestricted(x)    ((x)->flags & QUFLAG_RESTRICTED)
@@ -331,13 +330,12 @@
 #define UIsNoAuthLimit(x)   ((x)->flags & QUFLAG_NOAUTHLIMIT)
 #define UIsCleanupExempt(x) ((x)->flags & QUFLAG_CLEANUPEXEMPT)
 
-#define UHasSuspension(x)   ((x)->flags & (QUFLAG_GLINE|QUFLAG_DELAYEDGLINE|QUFLAG_SUSPENDED|QUFLAG_NEEDAUTH))
+#define UHasSuspension(x)   ((x)->flags & (QUFLAG_GLINE|QUFLAG_DELAYEDGLINE|QUFLAG_SUSPENDED))
 
 #define UHasHelperPriv(x)   ((x)->flags & (QUFLAG_HELPER | QUFLAG_OPER | QUFLAG_ADMIN | QUFLAG_DEV))
 #define UHasOperPriv(x)     ((x)->flags & (QUFLAG_OPER | QUFLAG_ADMIN | QUFLAG_DEV))
 #define UHasAdminPriv(x)    ((x)->flags & (QUFLAG_ADMIN | QUFLAG_DEV))
 
-#define USetNeedAuth(x)      ((x)->flags |= QUFLAG_NEEDAUTH)
 #define USetGline(x)         ((x)->flags |= QUFLAG_GLINE)
 #define USetNotice(x)        ((x)->flags |= QUFLAG_NOTICE)
 #define USetRestricted(x)    ((x)->flags |= QUFLAG_RESTRICTED)
@@ -353,7 +351,6 @@
 #define USetCleanupExempt(x) ((x)->flags |= QUFLAG_CLEANUPEXEMPT)
 #define USetTrust(x)         ((x)->flags |= QUFLAG_TRUST)
 
-#define UClearNeedAuth(x)      ((x)->flags &= ~QUFLAG_NEEDAUTH)
 #define UClearGline(x)         ((x)->flags &= ~QUFLAG_GLINE)
 #define UClearNotice(x)        ((x)->flags &= ~QUFLAG_NOTICE)
 #define UClearRestricted(x)    ((x)->flags &= ~QUFLAG_RESTRICTED)

diff --git a/chanserv/chanservuser.c b/chanserv/chanservuser.c
index c0e52c00681ccaecbb1ffc498e824b0e53dea1d9..adff71ef15fa6114f2414804e172e25035ae6ddb 100644 (file)
--- a/chanserv/chanservuser.c
+++ b/chanserv/chanservuser.c
@@ -550,7 +550,7 @@ void cs_checknick(nick *np) {
         lastuserID=rup->ID;
       strncpy(rup->username,np->authname,NICKLEN); rup->username[NICKLEN]='\0';
       rup->created=time(NULL);
-      rup->lastauth=time(NULL); /* questionable */
+      rup->lastauth=0;
       rup->lastemailchange=0;
       rup->flags=QUFLAG_NOTICE;
       rup->languageid=0;

diff --git a/chanserv/usercmds/unsuspenduser.c b/chanserv/usercmds/unsuspenduser.c
index cb6dacc02d0ad3cb89d64717eef7bb365f46d2c5..787c1343d57f6f051f2587ac5a48f8ac0f136a63 100644 (file)
--- a/chanserv/usercmds/unsuspenduser.c
+++ b/chanserv/usercmds/unsuspenduser.c
@@ -69,15 +69,12 @@ int csu_dounsuspenduser(void *source, int cargc, char **cargv) {
   else if (UIsSuspended(vrup)) {
     strcpy(action, "unsuspended");
   }
-  else if (UIsNeedAuth(vrup)) {
-    strcpy(action, "enabled");
-  }
   else {
     chanservsendmessage(sender, "Unknown suspend type encountered.");
     return CMD_ERROR;
   }
   
-  vrup->flags&=(~(QUFLAG_GLINE|QUFLAG_DELAYEDGLINE|QUFLAG_SUSPENDED|QUFLAG_NEEDAUTH));
+  vrup->flags&=(~(QUFLAG_GLINE|QUFLAG_DELAYEDGLINE|QUFLAG_SUSPENDED));
   vrup->suspendby=0;
   vrup->suspendexp=0;
   freesstring(vrup->suspendreason);

diff --git a/chanserv/utils/conv4.pl b/chanserv/utils/conv4.pl
index edaae4ef048537befb53e8ebbe5c68e4f0f05c7d..466b6bca756d4dcdcb7bd2a329f517ee4bcac22b 100644 (file)
--- a/chanserv/utils/conv4.pl
+++ b/chanserv/utils/conv4.pl
@@ -279,6 +279,7 @@ sub loadusers {
   my $suspendtime=0;
   my $suspendexp=0;
   my $suspendreason="";
+  my $created=0;
 
   while (<USERLIST>) {
     chomp;
@@ -333,8 +334,10 @@ sub loadusers {
         }
         if (exists $suspends{$username}) {
           my $ar=$suspends{$username};
-          if ($$ar[0] == 7) { # never authed
-            $uflags |= 0x1;
+          $created=0; # Q doesn't have created time for auths so default it to 0
+          if ($$ar[0] == 7) { # never authed - copy the "last auth" time into "created time".
+            $created=$lastauth;
+            $lastauth=0; # new Q uses lastauth=0 to indicate an unused account
           } elsif ($$ar[0] == 5) { # delayed gline
             $uflags |= 0x0800;
           } elsif ($$ar[0] == 6) { # instant gline
@@ -354,8 +357,9 @@ sub loadusers {
           $suspendtime=0;
           $suspendexp=0;
           $suspendreason="";
+          $created=0;
         }  
-       print USERS "$userid,".doquote($username).",0,$lastauth,$lastemailrq,$uflags,0,$suspendwho,$suspendexp,$suspendtime,$lockuntil,".doquote($password).",".doquote($emailaddr).",".doquote($lastemail).",".doquote("${lastusername}\@${lasthostname}").",,,\n";
+       print USERS "$userid,".doquote($username).",$created,$lastauth,$lastemailrq,$uflags,0,$suspendwho,$suspendexp,$suspendtime,$lockuntil,".doquote($password).",".doquote($emailaddr).",".doquote($lastemail).",".doquote("${lastusername}\@${lasthostname}").",".$suspendreason.",,\n";
        $users{irc_lc($username)}=$userid;
        $state=-1;
        $usercount++;