Commit 4ec35f3f authored by Leigh B. Stoller's avatar Leigh B. Stoller

Kill MKACCT wrapper function. Not really clean anyway.

Remove sleep(1) after sendmail. Silly.
Move $TBAUTHTIMEOUT up above include line so I can redefine it locally
to be 10 years!
parent abe1386e
......@@ -14,6 +14,9 @@ $TBMAILADDR_APPROVAL = "@TBAPPROVALEMAIL_NOSLASH@";
$TBMAILADDR_LOGS = "@TBLOGSEMAIL_NOSLASH@";
$TBMAILADDR_AUDIT = "@TBAUDITEMAIL_NOSLASH@";
# Can override this in the -defs file.
$TBAUTHTIMEOUT = 21600;
# Overridden by the defs file!
$TBMAINSITE = 0;
......@@ -44,7 +47,6 @@ $TBNSSUBDIR = "nsdir";
$TBAUTHCOOKIE = "HashCookie" . $TBCOOKIESUFFIX;
$TBNAMECOOKIE = "MyUidCookie" . $TBCOOKIESUFFIX;
$TBAUTHTIMEOUT = 21600;
$HTTPTAG = "http://";
......@@ -105,9 +107,6 @@ function TBERROR ($message, $death, $xmp = 0) {
"Errors-To: $TBMAIL_WWW");
if ($death) {
# Allow sendmail to run.
sleep(1);
if ($xmp)
$message = "<XMP>$message</XMP>\n";
......@@ -195,23 +194,7 @@ function ADDPUBKEY($uid, $cmdandargs) {
if (! HASREALACCOUNT($uid)) {
$uid = "nobody";
}
return SUEXEC($uid, nobody, $cmdandargs, 0);
}
function MKACCT($uid, $cmdandargs) {
global $TBSUEXEC_PATH;
#
# Complication. User might not have an actual account if operating on
# his own personal info. webonly, unapproved, and unverified users
# can still muck with their personal info. But, no point in running
# mkacct since by definition there is no real accounts locally to
# mess with. Just silently do nothing.
#
if (! HASREALACCOUNT($uid)) {
return 0;
}
return SUEXEC($uid, nobody, $cmdandargs, 0);
return SUEXEC($uid, "nobody", $cmdandargs, 0);
}
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment