https://bz.apache.org/bugzilla/show_bug.cgi?id=58855 (905dfdb3) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

modules/aaa/mod_authnz_fcgi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -855,7 +855,7 @@ static int fcgi_check_authn(request_rec *r)
		const char *err;
		const char *user = ap_expr_str_exec(r, dconf->user_expr,
		&err);
		if (user && strlen(user)) {
		if (user && *user) {
		r->user = apr_pstrdup(r->pool, user);
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		APLOGNO(02519) "%s: Setting user to '%s'",

modules/aaa/mod_authnz_ldap.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -748,13 +748,13 @@ static authz_status ldapuser_check_authorization(request_rec *r,
		*/


		if (!strlen(r->user)) {
		if (!*r->user) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01699)
		"ldap authorize: Userid is blank, AuthType=%s",
		r->ap_auth_type);
		}

		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		if (req->dn == NULL \|\| !*req->dn) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01702)
		"auth_ldap authorize: require user: user's DN has not "
		"been defined; failing authorization");
		@@ -910,7 +910,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
		* and populated with the userid and DN of the account in LDAP
		*/

		if (!strlen(r->user)) {
		if (!*r->user) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01709)
		"ldap authorize: Userid is blank, AuthType=%s",
		r->ap_auth_type);
		@@ -920,7 +920,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
		ent = (struct mod_auth_ldap_groupattr_entry_t *) sec->groupattr->elts;

		if (sec->group_attrib_is_dn) {
		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		if (req->dn == NULL \|\| !*req->dn) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01712)
		"auth_ldap authorize: require group: user's DN has "
		"not been defined; failing authorization for user %s",
		@@ -929,7 +929,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
		}
		}
		else {
		if (req->user == NULL \|\| strlen(req->user) == 0) {
		if (req->user == NULL \|\| !*req->user) {
		/* We weren't called in the authentication phase, so we didn't have a
		* chance to set the user field. Do so now. */
		req->user = r->user;
		@@ -1063,7 +1063,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
		* and populated with the userid and DN of the account in LDAP
		*/

		if (!strlen(r->user)) {
		if (!*r->user) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01722)
		"ldap authorize: Userid is blank, AuthType=%s",
		r->ap_auth_type);
		@@ -1091,7 +1091,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,

		t = require;

		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		if (req->dn == NULL \|\| !*req->dn) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725)
		"auth_ldap authorize: require dn: user's DN has not "
		"been defined; failing authorization");
		@@ -1163,7 +1163,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
		* and populated with the userid and DN of the account in LDAP
		*/

		if (!strlen(r->user)) {
		if (!*r->user) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01730)
		"ldap authorize: Userid is blank, AuthType=%s",
		r->ap_auth_type);
		@@ -1181,7 +1181,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
		ldc = get_connection_for_authz(r, LDAP_COMPARE);
		}

		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		if (req->dn == NULL \|\| !*req->dn) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01733)
		"auth_ldap authorize: require ldap-attribute: user's DN "
		"has not been defined; failing authorization");
		@@ -1272,7 +1272,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
		* and populated with the userid and DN of the account in LDAP
		*/

		if (!strlen(r->user)) {
		if (!*r->user) {
		ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01739)
		"ldap authorize: Userid is blank, AuthType=%s",
		r->ap_auth_type);
		@@ -1290,7 +1290,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
		ldc = get_connection_for_authz(r, LDAP_SEARCH);
		}

		if (req->dn == NULL \|\| strlen(req->dn) == 0) {
		if (req->dn == NULL \|\| !*req->dn) {
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01742)
		"auth_ldap authorize: require ldap-filter: user's DN "
		"has not been defined; failing authorization");

modules/http2/h2_config.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ static const char h2_conf_set_stream_max_mem_size(cmd_parms parms,
		static const char h2_add_alt_svc(cmd_parms parms,
		void arg, const char value)
		{
		if (value && strlen(value)) {
		if (value && *value) {
		h2_config cfg = (h2_config )h2_config_sget(parms->server);
		h2_alt_svc *as = h2_alt_svc_parse(value, parms->pool);
		if (!as) {
		@@ -407,7 +407,7 @@ static const char h2_conf_add_push_priority(cmd_parms cmd, void *_cfg,
		h2_priority *priority;
		int weight;

		if (!strlen(ctype)) {
		if (!*ctype) {
		return "1st argument must be a mime-type, like 'text/css' or '*'";
		}

modules/ldap/util_ldap_cache_mgr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -674,7 +674,7 @@ char util_ald_cache_display(request_rec r, util_ldap_state_t *st)
		return NULL;
		}

		if (r->args && strlen(r->args)) {
		if (r->args && *r->args) {
		char cachetype[5], lint[2];
		unsigned int id, off;
		char date_str[APR_CTIME_LEN];

modules/loggers/mod_log_config.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -377,7 +377,7 @@ static const char log_remote_user(request_rec r, char *a)
		if (rvalue == NULL) {
		rvalue = "-";
		}
		else if (strlen(rvalue) == 0) {
		else if (!*rvalue) {
		rvalue = "\"\"";
		}
		else {