X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtextauth.c;h=c12e1a47398e3f509d64469f3003186d8f4ed899;hb=d8509ee5370742b5c32e0f7fdb1ae42d7e6cc2fc;hp=1fbea07f19ecd4600da0e3b9e7a6f560a9ecb557;hpb=fb9b10275276ae4110e76fda6c897a6f11b31b0d;p=ashd.git
diff --git a/src/htextauth.c b/src/htextauth.c
index 1fbea07..c12e1a4 100644
--- a/src/htextauth.c
+++ b/src/htextauth.c
@@ -82,6 +82,38 @@ static void reqauth(struct hthead *req, int fd)
buffree(buf);
}
+static void authinval(struct hthead *req, int fd, char *msg)
+{
+ struct charbuf buf;
+ FILE *out;
+ char *rn;
+
+ rn = realm;
+ if(rn == NULL)
+ rn = "auth";
+ bufinit(buf);
+ bufcatstr(buf, "\r\n");
+ bufcatstr(buf, "\r\n");
+ bufcatstr(buf, "\r\n");
+ bufcatstr(buf, "\r\n");
+ bprintf(&buf, "Invalid authentication\r\n");
+ bufcatstr(buf, "\r\n");
+ bufcatstr(buf, "\r\n");
+ bprintf(&buf, "Invalid authentication
\r\n");
+ bprintf(&buf, "%s
\r\n", htmlquote(msg));
+ bufcatstr(buf, "\r\n");
+ bufcatstr(buf, "\r\n");
+ out = fdopen(dup(fd), "w");
+ fprintf(out, "HTTP/1.1 401 Invalid authentication\n");
+ fprintf(out, "WWW-Authenticate: Basic realm=\"%s\"\n", rn);
+ fprintf(out, "Content-Type: text/html\n");
+ fprintf(out, "Content-Length: %zi\n", buf.d);
+ fprintf(out, "\n");
+ fwrite(buf.b, 1, buf.d, out);
+ fclose(out);
+ buffree(buf);
+}
+
static void cleancache(int complete)
{
struct cache *c, *n;
@@ -253,10 +285,12 @@ static int auth(struct hthead *req, int fd, char *user, char *pass)
buffree(ebuf);
return(0);
}
+ if(WCOREDUMP(status))
+ flog(LOG_WARNING, "htextauth: authenticator process dumped core");
if(WIFEXITED(status) && (WEXITSTATUS(status) == 0))
rv = 1;
else
- simpleerror(fd, 401, "Invalid authentication", msg);
+ authinval(req, fd, msg);
buffree(ebuf);
return(rv);
}