diff options
| -rw-r--r-- | usr.sbin/httpd/httpd.h | 4 | ||||
| -rw-r--r-- | usr.sbin/httpd/server_fcgi.c | 4 | ||||
| -rw-r--r-- | usr.sbin/httpd/server_http.c | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index e0473cb50a6..9935c1c12c9 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.70 2015/01/19 19:37:50 reyk Exp $ */ +/* $OpenBSD: httpd.h,v 1.71 2015/01/19 20:00:07 florian Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -298,7 +298,7 @@ struct client { int clt_fcgi_type; int clt_fcgi_chunked; int clt_fcgi_end; - char *clt_fcgi_remote_user; + char *clt_remote_user; struct evbuffer *clt_srvevb; struct evbuffer *clt_log; diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c index 8ae1f2f6a9c..b2dae7c50c8 100644 --- a/usr.sbin/httpd/server_fcgi.c +++ b/usr.sbin/httpd/server_fcgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_fcgi.c,v 1.48 2015/01/19 19:37:50 reyk Exp $ */ +/* $OpenBSD: server_fcgi.c,v 1.49 2015/01/19 20:00:07 florian Exp $ */ /* * Copyright (c) 2014 Florian Obser <florian@openbsd.org> @@ -261,7 +261,7 @@ server_fcgi(struct httpd *env, struct client *clt) if (srv_conf->flags & SRVFLAG_AUTH) { if (fcgi_add_param(¶m, "REMOTE_USER", - clt->clt_fcgi_remote_user, clt) == -1) { + clt->clt_remote_user, clt) == -1) { errstr = "failed to encode param"; goto fail; } diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c index 99b6175d854..5fa36a549c6 100644 --- a/usr.sbin/httpd/server_http.c +++ b/usr.sbin/httpd/server_http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_http.c,v 1.66 2015/01/19 19:37:50 reyk Exp $ */ +/* $OpenBSD: server_http.c,v 1.67 2015/01/19 20:00:07 florian Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -190,8 +190,8 @@ server_http_authenticate(struct server_config *srv_conf, struct client *clt) if (crypt_checkpass(clt_pass, pass) == 0) { explicit_bzero(line, linelen); - clt->clt_fcgi_remote_user = strdup(clt_user); - if (clt->clt_fcgi_remote_user != NULL) + clt->clt_remote_user = strdup(clt_user); + if (clt->clt_remote_user != NULL) ret = 0; break; } @@ -631,8 +631,8 @@ server_reset_http(struct client *clt) clt->clt_line = 0; clt->clt_done = 0; clt->clt_chunk = 0; - free(clt->clt_fcgi_remote_user); - clt->clt_fcgi_remote_user = NULL; + free(clt->clt_remote_user); + clt->clt_remote_user = NULL; clt->clt_bev->readcb = server_read_http; clt->clt_srv_conf = &srv->srv_conf; @@ -853,8 +853,8 @@ server_close_http(struct client *clt) server_httpdesc_free(desc); free(desc); clt->clt_descresp = NULL; - free(clt->clt_fcgi_remote_user); - clt->clt_fcgi_remote_user = NULL; + free(clt->clt_remote_user); + clt->clt_remote_user = NULL; } int |