bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added logging during execute of mbuseradd

Browse Source
This commit is contained in:
Michiel Broek 2005-08-30 20:55:04 +00:00
parent 88d04f9289
commit eb92c60896
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -49,6 +49,7 @@ v0.71.5 18-Aug-2005
Changed syntax for calling mbpasswd.
If we can detect the users screenlength then we don't bother
asking the user.
Added logging during execute of mbuseradd.
mbsetup:
Added node setup switch to override node Hold or Down status.

61
mbsebbs/newuser.c
View File

@ -695,8 +695,9 @@ char *NameGen(char *FidoName)
*/
char *NameCreate(char *Name, char *Comment, char *Password)
{
char *progname, *args[16], *gidstr;
char *progname, *args[16], *gidstr, *stdlog, *errlog, buf[256];
int err;
FILE *lp;
progname = calloc(PATH_MAX, sizeof(char));
gidstr = calloc(10, sizeof(char));
@ -715,10 +716,39 @@ char *NameCreate(char *Name, char *Comment, char *Password)
args[4] = CFG.bbs_usersdir;
args[5] = NULL;
if ((err = execute(args, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null"))) {
stdlog = calloc(PATH_MAX, sizeof(char));
errlog = calloc(PATH_MAX, sizeof(char));
snprintf(stdlog, PATH_MAX, "%s/tmp/stdlog%d", getenv("MBSE_ROOT"), mypid);
snprintf(errlog, PATH_MAX, "%s/tmp/errlog%d", getenv("MBSE_ROOT"), mypid);
err = execute(args, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null");
if (file_size(stdlog)) {
if ((lp = fopen(stdlog, "r"))) {
while (fgets(buf, sizeof(buf) -1, lp)) {
Striplf(buf);
Syslog('+', "stdout: \"%s\"", printable(buf, 0));
}
fclose(lp);
}
}
if (file_size(errlog)) {
if ((lp = fopen(errlog, "r"))) {
while (fgets(buf, sizeof(buf) -1, lp)) {
Striplf(buf);
Syslog('+', "stderr: \"%s\"", printable(buf, 0));
}
fclose(lp);
}
}
unlink(stdlog);
unlink(errlog);
if (err) {
WriteError("Failed to create unix account");
free(progname);
free(gidstr);
free(stdlog);
free(errlog);
ExitClient(MBERR_GENERAL);
}
free(gidstr);
@ -730,7 +760,32 @@ char *NameCreate(char *Name, char *Comment, char *Password)
args[2] = Password;
args[3] = NULL;
if ((err = execute(args, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null"))) {
err = execute(args, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null");
if (file_size(stdlog)) {
if ((lp = fopen(stdlog, "r"))) {
while (fgets(buf, sizeof(buf) -1, lp)) {
Striplf(buf);
Syslog('+', "stdout: \"%s\"", printable(buf, 0));
}
fclose(lp);
}
}
if (file_size(errlog)) {
if ((lp = fopen(errlog, "r"))) {
while (fgets(buf, sizeof(buf) -1, lp)) {
Striplf(buf);
Syslog('+', "stderr: \"%s\"", printable(buf, 0));
}
fclose(lp);
}
}
unlink(stdlog);
unlink(errlog);
free(stdlog);
free(errlog);
if (err) {
WriteError("Failed to set unix password");
free(progname);
ExitClient(MBERR_GENERAL);