← Back to branch summary

~matttbe/ubuntu/quantal/apache2/lp1013171

« back to all changes in this revision

Viewing changes to server/request.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-07-26 20:21:37 UTC
  • mfrom: (14.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100726202137-rctltspkiazb40z1
Tags: 2.2.16-1ubuntu1
https://launchpad.net/bugs/456381
* Merge from debian unstable.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.
  - debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/request.c
190
190
                if (((access_status = ap_run_check_user_id(r)) != 0)
191
191
                    || !ap_auth_type(r)) {
192
192
                    return decl_die(access_status, ap_auth_type(r)
193
 
                                  ? "check user.  No user file?"
 
193
                                  ? "check user.  Check your authn provider!"
194
194
                                  : "perform authentication. AuthType not set!",
195
195
                                  r);
196
196
                }
198
198
                if (((access_status = ap_run_auth_checker(r)) != 0)
199
199
                    || !ap_auth_type(r)) {
200
200
                    return decl_die(access_status, ap_auth_type(r)
201
 
                                  ? "check access.  No groups file?"
 
201
                                  ? "check access.  Check your 'Require' directive"
202
202
                                  : "perform authentication. AuthType not set!",
203
203
                                   r);
204
204
                }
214
214
                if (((access_status = ap_run_check_user_id(r)) != 0)
215
215
                    || !ap_auth_type(r)) {
216
216
                    return decl_die(access_status, ap_auth_type(r)
217
 
                                  ? "check user.  No user file?"
 
217
                                  ? "check user.  Check your authn provider!"
218
218
                                  : "perform authentication. AuthType not set!",
219
219
                                  r);
220
220
                }
222
222
                if (((access_status = ap_run_auth_checker(r)) != 0)
223
223
                    || !ap_auth_type(r)) {
224
224
                    return decl_die(access_status, ap_auth_type(r)
225
 
                                  ? "check access.  No groups file?"
 
225
                                  ? "check access.  Check your 'Require' directive"
226
226
                                  : "perform authentication. AuthType not set!",
227
227
                                  r);
228
228
                }