fix stupid bug with moduleauth system and debug text tidy ups

This commit is contained in:
Mark 2004-02-29 22:32:29 +00:00
parent e783a92c38
commit 9f8398d686
3 changed files with 16 additions and 6 deletions

15
Ircu.c
View file

@ -724,7 +724,7 @@ parse (char *line)
strlcpy (recbuf, line, BUFSIZE);
if (!(*line))
return;
nlog (LOG_DEBUG1, LOG_CORE, "================================================================");
nlog (LOG_DEBUG1, LOG_CORE, "--------------------------BEGIN PARSE---------------------------");
nlog (LOG_DEBUG1, LOG_CORE, "R: %s", line);
coreLine = strpbrk (line, " ");
if (coreLine) {
@ -732,9 +732,6 @@ parse (char *line)
while (isspace (*++coreLine));
} else
coreLine = line + strlen (line);
/* nlog (LOG_DEBUG1, LOG_CORE, "coreLine %s ", coreLine); */
/* nlog (LOG_DEBUG1, LOG_CORE, "line %s", line); */
/* nlog (LOG_DEBUG1, LOG_CORE, "================================================================"); */
if ((!ircstrcasecmp(line, "SERVER")) || (!ircstrcasecmp(line, "PASS"))) {
strlcpy(cmd, line, sizeof(cmd));
nlog (LOG_DEBUG1, LOG_CORE, "cmd : %s", cmd);
@ -769,7 +766,7 @@ parse (char *line)
}
process_ircd_cmd (cmdptr, cmd, origin, av, ac);
nlog (LOG_DEBUG1, LOG_CORE, "================================================================");
nlog (LOG_DEBUG1, LOG_CORE, "---------------------------END PARSE----------------------------");
if(av) free (av);
}
@ -786,6 +783,10 @@ ircu_m_private (char *origin, char **argv, int argc, int srv)
av0 = argv[0];
} else {
av0 = base64tonick(argv[0]);
/* In case a real nick came through*/
if(av0 == NULL) {
av0 = argv[0];
}
}
AddStringToList (&av, av0, &ac);
@ -808,6 +809,10 @@ ircu_m_notice (char *origin, char **argv, int argc, int srv)
av0 = argv[0];
} else {
av0 = base64tonick(argv[0]);
/* In case a real nick came through*/
if(av0 == NULL) {
av0 = argv[0];
}
}
AddStringToList (&av, av0, &ac);

2
dl.c
View file

@ -1458,7 +1458,7 @@ load_module (char *modfilename, User * u)
nlog (LOG_DEBUG1, LOG_CORE, "Assigned %d to Module %s for ModuleNum", i, mod_ptr->info->module_name);
/* Module side user authentication for SecureServ helpers */
mod_ptr->mod_auth_cb = ns_dlsym ((int *) dl_handle, "__ModInit");
mod_ptr->mod_auth_cb = ns_dlsym ((int *) dl_handle, "__ModuleAuth");
/* call __ModInit (replacement for library __init() call */
ModInit = ns_dlsym ((int *) dl_handle, "__ModInit");

5
ircd.c
View file

@ -677,6 +677,7 @@ parse (char *line)
strlcpy (recbuf, line, BUFSIZE);
if (!(*line))
return;
nlog (LOG_DEBUG1, LOG_CORE, "--------------------------BEGIN PARSE---------------------------");
nlog (LOG_DEBUG1, LOG_CORE, "R: %s", line);
if (*line == ':') {
coreLine = strpbrk (line, " ");
@ -701,8 +702,12 @@ parse (char *line)
coreLine = line + strlen (line);
}
strlcpy (cmd, line, sizeof (cmd));
nlog (LOG_DEBUG1, LOG_CORE, "origin: %s", origin);
nlog (LOG_DEBUG1, LOG_CORE, "cmd : %s", cmd);
nlog (LOG_DEBUG1, LOG_CORE, "args : %s", coreLine);
ac = splitbuf (coreLine, &av, 1);
process_ircd_cmd (cmdptr, cmd, origin, av, ac);
nlog (LOG_DEBUG1, LOG_CORE, "---------------------------END PARSE----------------------------");
free (av);
}
#endif