dlink -> rb_dlink

[irc/rqf/shadowircd.git] / src / kdparse.c

diff --git a/src/kdparse.c b/src/kdparse.c
index 258b666f5e8666e0f949f07deca36ba15a2bc21f..3beac3da6ea1ff8f057ca42e2a50af757074d3ab 100644 (file)
--- a/src/kdparse.c
+++ b/src/kdparse.c
@@ -37,19 +37,27 @@
 
 /* conf_add_fields()
  * 
- * inputs       - pointer to config item, host/pass/user/operreason fields
+ * inputs       - pointer to config item, host/pass/user/operreason/date fields
  * output       - NONE
  * side effects - update respective fields with pointers
  */
 static void
 conf_add_fields(struct ConfItem *aconf,        const char *host_field,
                const char *pass_field, const char *user_field,
-               const char *operreason_field)
+               const char *operreason_field, const char *date_field)
 {
        if(host_field != NULL)
                DupString(aconf->host, host_field);
        if(pass_field != NULL)
-               DupString(aconf->passwd, pass_field);
+       {
+               if(!EmptyString(date_field))
+               {
+                       aconf->passwd = MyMalloc(strlen(pass_field) + strlen(date_field) + 4);
+                       rb_sprintf(aconf->passwd, "%s (%s)", pass_field, date_field);
+               }
+               else
+                       DupString(aconf->passwd, pass_field);
+       }
        if(user_field != NULL)
                DupString(aconf->user, user_field);
        if(operreason_field != NULL)
@@ -71,6 +79,7 @@ parse_k_file(FILE * file)
        char *reason_field = NULL;
        char *operreason_field = NULL;
        char *host_field = NULL;
+       char *date_field = NULL;
        char line[BUFSIZE];
        char *p;
 
@@ -95,11 +104,12 @@ parse_k_file(FILE * file)
                        continue;
 
                operreason_field = getfield(NULL);
+               date_field = getfield(NULL);
 
                aconf = make_conf();
                aconf->status = CONF_KILL;
                conf_add_fields(aconf, host_field, reason_field,
-                               user_field, operreason_field);
+                               user_field, operreason_field, date_field);
 
                if(aconf->host != NULL)
                        add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
@@ -120,6 +130,7 @@ parse_d_file(FILE * file)
        char *reason_field = NULL;
        char *host_field = NULL;
        char *operreason_field = NULL;
+       char *date_field = NULL;
        char line[BUFSIZE];
        char *p;
 
@@ -140,10 +151,11 @@ parse_d_file(FILE * file)
                        continue;
 
                operreason_field = getfield(NULL);
+               date_field = getfield(NULL);
 
                aconf = make_conf();
                aconf->status = CONF_DLINE;
-               conf_add_fields(aconf, host_field, reason_field, "", operreason_field);
+               conf_add_fields(aconf, host_field, reason_field, "", operreason_field, date_field);
                conf_add_d_conf(aconf);
        }
 }
@@ -177,7 +189,7 @@ parse_x_file(FILE * file)
                        continue;
 
                /* sanity checking */
-               if((find_xline(gecos_field, 0) != NULL) ||
+               if((find_xline_mask(gecos_field) != NULL) ||
                   (strchr(reason_field, ':') != NULL))
                        continue;
 
@@ -187,7 +199,7 @@ parse_x_file(FILE * file)
                DupString(aconf->name, gecos_field);
                DupString(aconf->passwd, reason_field);
 
-               dlinkAddAlloc(aconf, &xline_conf_list);
+               rb_dlinkAddAlloc(aconf, &xline_conf_list);
        }
 }
 
@@ -231,7 +243,7 @@ parse_resv_file(FILE * file)
                }
                else if(clean_resv_nick(host_field))
                {
-                       if(find_nick_resv(host_field))
+                       if(find_nick_resv_mask(host_field))
                                continue;
 
                        aconf = make_conf();
@@ -240,7 +252,7 @@ parse_resv_file(FILE * file)
 
                        DupString(aconf->name, host_field);
                        DupString(aconf->passwd, reason_field);
-                       dlinkAddAlloc(aconf, &resv_conf_list);
+                       rb_dlinkAddAlloc(aconf, &resv_conf_list);
                }
        }
 }