[srvx-commits] CVS: services/src nickserv.c,1.200,1.201

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

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv31570/src

Modified Files:
	nickserv.c 
Log Message:
clean some memory leaks, add some warnings about bogus account stamps


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -r1.200 -r1.201
*** nickserv.c	23 Aug 2002 04:49:39 -0000	1.200
--- nickserv.c	5 Sep 2002 14:51:46 -0000	1.201
***************
*** 262,265 ****
--- 262,266 ----
      unsigned int warn_nick_owned : 1;
      unsigned int enable_ghost : 1;
+     unsigned int default_hostmask : 1;
      unsigned long nicks_per_handle;
      unsigned long password_min_length;
***************
*** 277,282 ****
      unsigned long set_epithet_level;
      unsigned long handles_per_email;
!     char *default_hostmask;
!     char *network_name;
      regex_t valid_handle_regex;
      regex_t valid_nick_regex;
--- 278,282 ----
      unsigned long set_epithet_level;
      unsigned long handles_per_email;
!     const char *network_name;
      regex_t valid_handle_regex;
      regex_t valid_nick_regex;
***************
*** 2930,2934 ****
      nickserv_conf.disable_nicks = str ? strtoul(str, NULL, 0) : 0;
      str = database_get_data(conf_node, KEY_DEFAULT_HOSTMASK, RECDB_QSTRING);
!     nickserv_conf.default_hostmask = str ? strdup(str) : 0;
      str = database_get_data(conf_node, KEY_PASSWORD_MIN_LENGTH, RECDB_QSTRING);
      nickserv_conf.password_min_length = str ? strtoul(str, NULL, 0) : 0;
--- 2930,2934 ----
      nickserv_conf.disable_nicks = str ? strtoul(str, NULL, 0) : 0;
      str = database_get_data(conf_node, KEY_DEFAULT_HOSTMASK, RECDB_QSTRING);
!     nickserv_conf.default_hostmask = str ? !disabled_string(str) : 0;
      str = database_get_data(conf_node, KEY_PASSWORD_MIN_LENGTH, RECDB_QSTRING);
      nickserv_conf.password_min_length = str ? strtoul(str, NULL, 0) : 0;
***************
*** 3001,3005 ****
      nickserv_conf.handles_per_email = str ? strtoul(str, NULL, 0) : 1;
      str = conf_get_data("server/network", RECDB_QSTRING);
!     nickserv_conf.network_name = str ? strdup(str) : strdup("some IRC network");
      if (!nickserv_conf.auth_policer_params) {
          nickserv_conf.auth_policer_params = policer_params_new();
--- 3001,3005 ----
      nickserv_conf.handles_per_email = str ? strtoul(str, NULL, 0) : 1;
      str = conf_get_data("server/network", RECDB_QSTRING);
!     nickserv_conf.network_name = str ? str : "some IRC network";
      if (!nickserv_conf.auth_policer_params) {
          nickserv_conf.auth_policer_params = policer_params_new();
***************
*** 3040,3043 ****
--- 3040,3044 ----
             stamp, as it may be invalid. */
          if (hi->registered > user->timestamp) {
+             log(MAIN_LOG, LOG_OTHER, "Ignoring user stamp %s for %s since user's timestamp predates account %s ("FMT_TIME_T" < "FMT_TIME_T").\n", stamp, user, hi->handle, user->timestamp, hi->registered);
              return;
          }
***************
*** 3053,3056 ****
--- 3054,3059 ----
          }
          set_user_handle_info(user, hi, 0);
+     } else {
+         log(MAIN_LOG, LOG_WARNING, "%s had unknown account stamp %s\n", user->nick, stamp);
      }
  }
***************
*** 3119,3122 ****
--- 3122,3126 ----
      dict_delete(nickserv_allow_auth_dict);
      dict_delete(nickserv_email_dict);
+     dict_delete(nickserv_id_dict);
      dict_delete(nickserv_conf.weak_password_dict);
      if (auth_func_list) free(auth_func_list);