[srvx-commits] CVS: services/src nickserv.c,1.239,1.240 nickserv.h,1.42,1.43

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19859/src

Modified Files:
	nickserv.c nickserv.h 
Log Message:
implement RFE [569311] - change "last authed host" to "last quit host"


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -C2 -r1.239 -r1.240
*** nickserv.c	7 Jul 2003 16:29:33 -0000	1.239
--- nickserv.c	8 Jul 2003 02:44:07 -0000	1.240
***************
*** 80,83 ****
--- 80,84 ----
  #define KEY_SCREEN_WIDTH "screen_width"
  #define KEY_LAST_AUTHED_HOST "last_authed_host"
+ #define KEY_LAST_QUIT_HOST "last_quit_host"
  #define KEY_EMAIL_ADDR "email_addr"
  #define KEY_COOKIE "cookie"
***************
*** 153,157 ****
  #define NSMSG_HANDLEINFO_FLAGS    "  Flags: %s"
  #define NSMSG_HANDLEINFO_EPITHET  "  Epithet: %s"
! #define NSMSG_HANDLEINFO_LAST_HOST "  Last authed hostmask: %s"
  #define NSMSG_HANDLEINFO_NICKS    "  Nickname(s): %s"
  #define NSMSG_HANDLEINFO_MASKS    "  Hostmask(s): %s"
--- 154,158 ----
  #define NSMSG_HANDLEINFO_FLAGS    "  Flags: %s"
  #define NSMSG_HANDLEINFO_EPITHET  "  Epithet: %s"
! #define NSMSG_HANDLEINFO_LAST_HOST "  Last quit hostmask: %s"
  #define NSMSG_HANDLEINFO_NICKS    "  Nickname(s): %s"
  #define NSMSG_HANDLEINFO_MASKS    "  Hostmask(s): %s"
***************
*** 798,801 ****
--- 799,804 ----
          /* record them as being last seen at this time */
  	user->handle_info->lastseen = now;
+         /* and record their hostmask */
+         snprintf(user->handle_info->last_quit_host, sizeof(user->handle_info->last_quit_host), "%s@%s", user->ident, user->hostname);
      }
      old_info = user->handle_info;
***************
*** 807,811 ****
  
          HANDLE_CLEAR_FLAG(hi, FROZEN);
-         snprintf(hi->last_authed_host, sizeof(hi->last_authed_host), "%s@%s", user->ident, user->hostname);
          if (nickserv_conf.warn_clone_auth) {
              struct userNode *other;
--- 810,813 ----
***************
*** 1211,1216 ****
      }
  
!     if (hi->last_authed_host[0]) {
!         nickserv_notice(user, NSMSG_HANDLEINFO_LAST_HOST, hi->last_authed_host);
      } else {
          nickserv_notice(user, NSMSG_HANDLEINFO_LAST_HOST, NSMSG_UNKNOWN);
--- 1213,1218 ----
      }
  
!     if (hi->last_quit_host[0]) {
!         nickserv_notice(user, NSMSG_HANDLEINFO_LAST_HOST, hi->last_quit_host);
      } else {
          nickserv_notice(user, NSMSG_HANDLEINFO_LAST_HOST, NSMSG_UNKNOWN);
***************
*** 2453,2457 ****
  #endif
          if (hi->infoline) saxdb_write_string(ctx, KEY_INFO, hi->infoline);
!         if (hi->last_authed_host[0]) saxdb_write_string(ctx, KEY_LAST_AUTHED_HOST, hi->last_authed_host);
          saxdb_write_int(ctx, KEY_LAST_SEEN, hi->lastseen);
          if (hi->masks->used) saxdb_write_string_list(ctx, KEY_MASKS, hi->masks);
--- 2455,2459 ----
  #endif
          if (hi->infoline) saxdb_write_string(ctx, KEY_INFO, hi->infoline);
!         if (hi->last_quit_host[0]) saxdb_write_string(ctx, KEY_LAST_QUIT_HOST, hi->last_quit_host);
          saxdb_write_int(ctx, KEY_LAST_SEEN, hi->lastseen);
          if (hi->masks->used) saxdb_write_string_list(ctx, KEY_MASKS, hi->masks);
***************
*** 2957,2962 ****
      str = database_get_data(obj, KEY_TABLE_WIDTH, RECDB_QSTRING);
      hi->table_width = str ? strtoul(str, NULL, 0) : 0;
!     str = database_get_data(obj, KEY_LAST_AUTHED_HOST, RECDB_QSTRING);
!     if (str) safestrncpy(hi->last_authed_host, str, sizeof(hi->last_authed_host));
      str = database_get_data(obj, KEY_EMAIL_ADDR, RECDB_QSTRING);
      if (str) nickserv_set_email_addr(hi, str);
--- 2959,2965 ----
      str = database_get_data(obj, KEY_TABLE_WIDTH, RECDB_QSTRING);
      hi->table_width = str ? strtoul(str, NULL, 0) : 0;
!     str = database_get_data(obj, KEY_LAST_QUIT_HOST, RECDB_QSTRING);
!     if (!str) str = database_get_data(obj, KEY_LAST_AUTHED_HOST, RECDB_QSTRING);
!     if (str) safestrncpy(hi->last_quit_host, str, sizeof(hi->last_quit_host));
      str = database_get_data(obj, KEY_EMAIL_ADDR, RECDB_QSTRING);
      if (str) nickserv_set_email_addr(hi, str);

Index: nickserv.h
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** nickserv.h	7 Jul 2003 16:29:33 -0000	1.42
--- nickserv.h	8 Jul 2003 02:44:07 -0000	1.43
***************
*** 91,95 ****
      char handle[NICKSERV_HANDLE_LEN+1];
      char passwd[MD5_CRYPT_LENGTH+1];
!     char last_authed_host[USERLEN+HOSTLEN+2];
      char userlist_style;
      char announcements;
--- 91,95 ----
      char handle[NICKSERV_HANDLE_LEN+1];
      char passwd[MD5_CRYPT_LENGTH+1];
!     char last_quit_host[USERLEN+HOSTLEN+2];
      char userlist_style;
      char announcements;