[srvx-commits] CVS: services/src helpserv.c,1.38,1.39 nickserv.c,1.207,1.208

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

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

Modified Files:
	helpserv.c nickserv.c 
Log Message:
forward port fixes from 1.1 branch


Index: helpserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/helpserv.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** helpserv.c	30 Sep 2002 01:43:56 -0000	1.38
--- helpserv.c	11 Oct 2002 03:07:09 -0000	1.39
***************
*** 1450,1454 ****
  
      for (it=dict_first(hs->requests), line=0; it; it=iter_next(it)) {
!         char opentime[INTERVALLEN], reqid[12], username[NICKLEN+1];
  
          req = iter_data(it);
--- 1450,1454 ----
  
      for (it=dict_first(hs->requests), line=0; it; it=iter_next(it)) {
!         char opentime[INTERVALLEN], reqid[12], username[NICKLEN+2];
  
          req = iter_data(it);
***************
*** 2866,2881 ****
  
      str = database_get_data(rd->d.object, KEY_REQUEST_HANDLE, RECDB_QSTRING);
!     if (str) {
!         if (!(request->handle = get_handle_info(str))) {
!             log(HS_LOG, LOG_ERROR, "Request %s:%s has an invalid or nonexistant account.\n", hs->helpserv->nick, key);
!             free(request);
!             return 0;
!         }
!         if (!(request->parent_hand_list = dict_find(helpserv_reqs_byhand_dict, request->handle->handle, NULL))) {
!             request->parent_hand_list = helpserv_reqlist_alloc();
!             dict_insert(helpserv_reqs_byhand_dict, request->handle->handle, request->parent_hand_list);
!         }
!         helpserv_reqlist_append(request->parent_hand_list, request);
      }
      str = database_get_data(rd->d.object, KEY_REQUEST_OPENED, RECDB_QSTRING);
      if (!str) {
--- 2866,2880 ----
  
      str = database_get_data(rd->d.object, KEY_REQUEST_HANDLE, RECDB_QSTRING);
!     if (!str || !(request->handle = get_handle_info(str))) {
!         log(HS_LOG, LOG_ERROR, "Request %s:%s has an invalid or nonexistant account.\n", hs->helpserv->nick, key);
!         free(request);
!         return 0;
!     }
!     if (!(request->parent_hand_list = dict_find(helpserv_reqs_byhand_dict, request->handle->handle, NULL))) {
!         request->parent_hand_list = helpserv_reqlist_alloc();
!         dict_insert(helpserv_reqs_byhand_dict, request->handle->handle, request->parent_hand_list);
      }
+     helpserv_reqlist_append(request->parent_hand_list, request);
+ 
      str = database_get_data(rd->d.object, KEY_REQUEST_OPENED, RECDB_QSTRING);
      if (!str) {
***************
*** 2887,2894 ****
  
      str = database_get_data(rd->d.object, KEY_REQUEST_HELPER, RECDB_QSTRING);
!     if (str && !(request->helper = dict_find(hs->users, str, NULL))) {
!         log(HS_LOG, LOG_ERROR, "Request %s:%s has an invalid or nonexistant helper.\n", hs->helpserv->nick, key);
!         free(request);
!         return 0;
      } else {
          if (!hs->unhandled) {
--- 2886,2895 ----
  
      str = database_get_data(rd->d.object, KEY_REQUEST_HELPER, RECDB_QSTRING);
!     if (str) {
!         if (!(request->helper = dict_find(hs->users, str, NULL))) {
!             log(HS_LOG, LOG_ERROR, "Request %s:%s has an invalid or nonexistant helper.\n", hs->helpserv->nick, key);
!             free(request);
!             return 0;
!         }
      } else {
          if (!hs->unhandled) {

Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -r1.207 -r1.208
*** nickserv.c	18 Sep 2002 14:53:59 -0000	1.207
--- nickserv.c	11 Oct 2002 03:07:10 -0000	1.208
***************
*** 439,443 ****
      if (hi->infoline) free(hi->infoline);
      if (hi->epithet) free(hi->epithet);
!     if (hi->cookie) nickserv_free_cookie(hi->cookie);
      if (hi->email_addr) {
          struct handle_info_list *hil = dict_find(nickserv_email_dict, hi->email_addr, NULL);
--- 439,446 ----
      if (hi->infoline) free(hi->infoline);
      if (hi->epithet) free(hi->epithet);
!     if (hi->cookie) {
!         timeq_del(hi->cookie->expires, nickserv_free_cookie, hi->cookie, 0);
!         nickserv_free_cookie(hi->cookie);
!     }
      if (hi->email_addr) {
          struct handle_info_list *hil = dict_find(nickserv_email_dict, hi->email_addr, NULL);
***************
*** 3232,3236 ****
      nickserv_define_func("ACCOUNTINFO", cmd_handleinfo, -1, 0, 0);
      nickserv_define_func("USERINFO", cmd_userinfo, -1, 1, 0);
!     nickserv_define_func("RENAME", cmd_rename_handle, 0, 1, 0);
      nickserv_define_func("VACATION", cmd_vacation, -1, 1, 0);
      nickserv_define_func("MERGE", cmd_merge, 0, 1, 0);
--- 3235,3239 ----
      nickserv_define_func("ACCOUNTINFO", cmd_handleinfo, -1, 0, 0);
      nickserv_define_func("USERINFO", cmd_userinfo, -1, 1, 0);
!     nickserv_define_func("RENAME", cmd_rename_handle, -1, 1, 0);
      nickserv_define_func("VACATION", cmd_vacation, -1, 1, 0);
      nickserv_define_func("MERGE", cmd_merge, 0, 1, 0);