From 3f586951414b9b80834c5a8cc8a5b4cc0bfcb59f Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 4 Mar 2004 07:59:30 +0000 Subject: [PATCH] =?utf8?q?*=20modules/ssl/ssl=5Fengine=5Fvars=20(ssl=5Fvar?= =?utf8?q?=5Flookup):=20Fix=20potential=20segfaults=20if=20called=20with?= =?utf8?q?=20r=3DNULL,=20c!=3DNULL,=20spotted=20by=20Andr=EF=BF=BD?= =?utf8?q?=EF=BF=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102849 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_vars.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index 4d3ba48072..c33afc05bd 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -130,6 +130,10 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, result = apr_psprintf(p, "%u", ap_get_server_port(r)); else if (strcEQ(var, "SERVER_PROTOCOL")) result = r->protocol; + else if (strcEQ(var, "REMOTE_USER")) + result = r->user; + else if (strcEQ(var, "AUTH_TYPE")) + result = r->ap_auth_type; } /* @@ -139,10 +143,6 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, SSLConnRec *sslconn = myConnConfig(c); if (strcEQ(var, "REMOTE_ADDR")) result = c->remote_ip; - else if (strcEQ(var, "REMOTE_USER")) - result = r->user; - else if (strcEQ(var, "AUTH_TYPE")) - result = r->ap_auth_type; else if (strlen(var) > 4 && strcEQn(var, "SSL_", 4) && sslconn && sslconn->ssl) result = ssl_var_lookup_ssl(p, c, var+4); -- 2.50.1