ben 96/08/19 14:18:31
Modified: src CHANGES mod_auth_anon.c mod_auth_msql.c
Log:
Fix misspellings of Authoritative.
Revision Changes Path
1.53 +3 -1 apache/src/CHANGES
1.7 +7 -7 apache/src/mod_auth_anon.c
Index: mod_auth_anon.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** mod_auth_anon.c 1996/07/08 18:58:59 1.6
--- mod_auth_anon.c 1996/08/19 21:18:27 1.7
***************
*** 108,114 ****
int auth_anon_logemail;
int auth_anon_verifyemail;
int auth_anon_mustemail;
! int auth_anon_authorative;
} anon_auth_config_rec;
--- 108,114 ----
int auth_anon_logemail;
int auth_anon_verifyemail;
int auth_anon_mustemail;
! int auth_anon_authoritative;
} anon_auth_config_rec;
***************
*** 126,132 ****
sec -> auth_anon_logemail =1;
sec -> auth_anon_verifyemail =0;
sec -> auth_anon_mustemail =1;
! sec -> auth_anon_authorative =0;
return sec;
}
--- 126,132 ----
sec -> auth_anon_logemail =1;
sec -> auth_anon_verifyemail =0;
sec -> auth_anon_mustemail =1;
! sec -> auth_anon_authoritative =0;
return sec;
}
***************
*** 151,159 ****
sec->auth_anon_verifyemail=arg;
return NULL;
}
! char *anon_set_authorative_flag (cmd_parms *cmd,
anon_auth_config_rec *sec, int arg) {
! sec->auth_anon_authorative=arg;
return NULL;
}
--- 151,159 ----
sec->auth_anon_verifyemail=arg;
return NULL;
}
! char *anon_set_authoritative_flag (cmd_parms *cmd,
anon_auth_config_rec *sec, int arg) {
! sec->auth_anon_authoritative=arg;
return NULL;
}
***************
*** 190,196 ****
"Limited to 'on' or 'off'" },
{ "Anonymous_LogEmail", anon_set_logemail_flag, NULL, OR_AUTHCFG, FLAG,
"Limited to 'on' or 'off'" },
! { "Anonymous_Authorative", anon_set_authorative_flag, NULL, OR_AUTHCFG,
FLAG,
"Limited to 'on' or 'off'" },
{ NULL }
--- 190,196 ----
"Limited to 'on' or 'off'" },
{ "Anonymous_LogEmail", anon_set_logemail_flag, NULL, OR_AUTHCFG, FLAG,
"Limited to 'on' or 'off'" },
! { "Anonymous_Authoritative", anon_set_authoritative_flag, NULL, OR_AUTHCFG,
FLAG,
"Limited to 'on' or 'off'" },
{ NULL }
***************
*** 247,254 ****
}
return OK;
} else {
! if (sec->auth_anon_authorative) {
! sprintf(errstr,"Anonymous: Authorative, Passwd <%s> not accepted",
send_pw ? send_pw : "\'none\'");
log_error(errstr,r->server);
return AUTH_REQUIRED;
--- 247,254 ----
}
return OK;
} else {
! if (sec->auth_anon_authoritative) {
! sprintf(errstr,"Anonymous: Authoritative, Passwd <%s> not accepted",
send_pw ? send_pw : "\'none\'");
log_error(errstr,r->server);
return AUTH_REQUIRED;
1.12 +21 -21 apache/src/mod_auth_msql.c
Index: mod_auth_msql.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C3 -r1.11 -r1.12
*** mod_auth_msql.c 1996/07/08 18:59:00 1.11
--- mod_auth_msql.c 1996/08/19 21:18:28 1.12
***************
*** 143,149 ****
* use a differt table with multiple entries.
*
* Auth_MSQL_nopasswd off
! * Auth_MSQL_Authorative on
* Auth_MSQL_EncryptedPasswords on
*
* These three optional fields (all set to the
sensible defaults,
--- 143,149 ----
* use a differt table with multiple entries.
*
* Auth_MSQL_nopasswd off
! * Auth_MSQL_Authoritative on
* Auth_MSQL_EncryptedPasswords on
*
* These three optional fields (all set to the
sensible defaults,
***************
*** 203,209 ****
* Normally this table is compulsory, but it is
* possible to use a fall-through to other methods
* and use the mSQL module for group control only;
! * see the Authorative directive below.
*
* Auth_MSQLgrp_table Contains at least the fields with the
* username and the groupname. A user which
--- 203,209 ----
* Normally this table is compulsory, but it is
* possible to use a fall-through to other methods
* and use the mSQL module for group control only;
! * see the Authoritative directive below.
*
* Auth_MSQLgrp_table Contains at least the fields with the
* username and the groupname. A user which
***************
*** 232,238 ****
* in the mSQL table does not allow people in by
* default with a random password.
*
! * Auth_MSQL_Authorative <on|off>
* default is 'on'. When set on, there is no
* fall through to other authorization methods. So if a
* user is not in the mSQL dbase table (and perhaps
--- 232,238 ----
* in the mSQL table does not allow people in by
* default with a random password.
*
! * Auth_MSQL_Authoritative <on|off>
* default is 'on'. When set on, there is no
* fall through to other authorization methods. So if a
* user is not in the mSQL dbase table (and perhaps
***************
*** 273,279 ****
* indicated above.
* 0.7 *host to host fixed. Credits go to Rob Stout,
* <[EMAIL PROTECTED]> for spotting this one.
! * 0.8 Authorative directive added. See above.
* 0.9 palloc return code check(s), should be backward compatible with
* 1.11 version of Vivek Khera <khera@kciLink.com> msql module,
* fixed broken err msg in group control, changed command table
--- 273,279 ----
* indicated above.
* 0.7 *host to host fixed. Credits go to Rob Stout,
* <[EMAIL PROTECTED]> for spotting this one.
! * 0.8 Authoritative directive added. See above.
* 0.9 palloc return code check(s), should be backward compatible with
* 1.11 version of Vivek Khera <khera@kciLink.com> msql module,
* fixed broken err msg in group control, changed command table
***************
*** 287,293 ****
* 1.1 no logging of empty password strings.
* 1.2 Problem with the Backward vitek which cause it to check
* even if msql_auth was not configured; Also more carefull
! * with the authorative stuff; caught by [EMAIL PROTECTED]
* 1.3 Even more changes to get it right; that BACKWARD thing was a bad
* idea.
*/
--- 287,293 ----
* 1.1 no logging of empty password strings.
* 1.2 Problem with the Backward vitek which cause it to check
* even if msql_auth was not configured; Also more carefull
! * with the authoritative stuff; caught by [EMAIL PROTECTED]
* 1.3 Even more changes to get it right; that BACKWARD thing was a bad
* idea.
*/
***************
*** 415,421 ****
char *auth_msql_grp_field;
int auth_msql_nopasswd;
! int auth_msql_authorative;
int auth_msql_encrypted;
} msql_auth_config_rec;
--- 415,421 ----
char *auth_msql_grp_field;
int auth_msql_nopasswd;
! int auth_msql_authoritative;
int auth_msql_encrypted;
} msql_auth_config_rec;
***************
*** 435,441 ****
sec->auth_msql_grp_field = NULL;
! sec->auth_msql_authorative = 1; /* set some defaults, just in case... */
sec->auth_msql_encrypted = 1;
sec->auth_msql_nopasswd = 0;
--- 435,441 ----
sec->auth_msql_grp_field = NULL;
! sec->auth_msql_authoritative = 1; /* set some defaults, just in case...
*/
sec->auth_msql_encrypted = 1;
sec->auth_msql_nopasswd = 0;
***************
*** 455,462 ****
return NULL;
}
! char *set_authorative_flag (cmd_parms *cmd, msql_auth_config_rec *sec, int
arg) {
! sec->auth_msql_authorative=arg;
return NULL;
}
--- 455,462 ----
return NULL;
}
! char *set_authoritative_flag (cmd_parms *cmd, msql_auth_config_rec *sec,
int arg) {
! sec->auth_msql_authoritative=arg;
return NULL;
}
***************
*** 505,512 ****
{ "Auth_MSQL_nopasswd", set_passwd_flag, NULL, OR_AUTHCFG, FLAG,
"Enable (on) or disable (off) empty password strings; in which case any
user password is accepted." },
! { "Auth_MSQL_Authorative", set_authorative_flag, NULL, OR_AUTHCFG, FLAG,
! "When 'on' the mSQL database is taken to be authorative and access
control is not passed along to other db or access modules." },
{ "Auth_MSQL_EncryptedPasswords", set_crypted_password_flag, NULL,
OR_AUTHCFG, FLAG,
"When 'on' the password in the password table are taken to be crypt()ed
using your machines crypt() function." },
--- 505,512 ----
{ "Auth_MSQL_nopasswd", set_passwd_flag, NULL, OR_AUTHCFG, FLAG,
"Enable (on) or disable (off) empty password strings; in which case any
user password is accepted." },
! { "Auth_MSQL_Authoritative", set_authoritative_flag, NULL, OR_AUTHCFG, FLAG,
! "When 'on' the mSQL database is taken to be authoritative and access
control is not passed along to other db or access modules." },
{ "Auth_MSQL_EncryptedPasswords", set_crypted_password_flag, NULL,
OR_AUTHCFG, FLAG,
"When 'on' the password in the password table are taken to be crypt()ed
using your machines crypt() function." },
***************
*** 793,799 ****
if ( msql_errstr[0] ) {
res = SERVER_ERROR;
} else {
! if (sec->auth_msql_authorative) {
/* insist that the user is in the database
*/
sprintf(msql_errstr,"mSQL: Password for user %s not found",
c->user);
--- 793,799 ----
if ( msql_errstr[0] ) {
res = SERVER_ERROR;
} else {
! if (sec->auth_msql_authoritative) {
/* insist that the user is in the database
*/
sprintf(msql_errstr,"mSQL: Password for user %s not found",
c->user);
***************
*** 803,809 ****
/* pass control on to the next authorization module.
*/
return DECLINED;
! }; /* if authorative */
}; /* if no error */
log_reason (msql_errstr, r->filename, r);
return res;
--- 803,809 ----
/* pass control on to the next authorization module.
*/
return DECLINED;
! }; /* if authoritative */
}; /* if no error */
log_reason (msql_errstr, r->filename, r);
return res;
***************
*** 873,880 ****
if (!sec->auth_msql_pwd_table) return DECLINED;
if (!reqs_arr) {
! if (sec->auth_msql_authorative) {
! sprintf(msql_errstr,"user %s denied, no access rules specified
(MSQL-Authorative) ",user);
log_reason (msql_errstr, r->uri, r);
note_basic_auth_failure(r);
return AUTH_REQUIRED;
--- 873,880 ----
if (!sec->auth_msql_pwd_table) return DECLINED;
if (!reqs_arr) {
! if (sec->auth_msql_authoritative) {
! sprintf(msql_errstr,"user %s denied, no access rules specified
(MSQL-Authoritative) ",user);
log_reason (msql_errstr, r->uri, r);
note_basic_auth_failure(r);
return AUTH_REQUIRED;
***************
*** 898,904 ****
break;
};
}
! if ((sec->auth_msql_authorative) && ( user_result != OK)) {
sprintf(msql_errstr,"User %s not found
(MSQL-Auhtorative)",user);
log_reason (msql_errstr, r->uri, r);
note_basic_auth_failure(r);
--- 898,904 ----
break;
};
}
! if ((sec->auth_msql_authoritative) && ( user_result != OK)) {
sprintf(msql_errstr,"User %s not found
(MSQL-Auhtorative)",user);
log_reason (msql_errstr, r->uri, r);
note_basic_auth_failure(r);
***************
*** 926,933 ****
return SERVER_ERROR;
};
! if ( (sec->auth_msql_authorative) && (group_result != OK) ) {
! sprintf(msql_errstr,"user %s not in right groups
(MSQL-Authorative) ",user);
log_reason (msql_errstr, r->uri, r);
note_basic_auth_failure(r);
return AUTH_REQUIRED;
--- 926,933 ----
return SERVER_ERROR;
};
! if ( (sec->auth_msql_authoritative) && (group_result != OK) ) {
! sprintf(msql_errstr,"user %s not in right groups
(MSQL-Authoritative) ",user);
log_reason (msql_errstr, r->uri, r);
note_basic_auth_failure(r);
return AUTH_REQUIRED;
***************
*** 939,950 ****
};
}
! /* Get serious if we are authorative, previous
* returns are only if msql yielded a correct result.
* This really is not needed.
*/
! if (((group_result == AUTH_REQUIRED) || (user_result == AUTH_REQUIRED))
&& (sec->auth_msql_authorative) ) {
! sprintf(msql_errstr,"mSQL-Authorative: Access denied on %s %s
rule(s) ",
(group_result == AUTH_REQUIRED) ? "USER" : "",
(user_result == AUTH_REQUIRED) ? "GROUP" : ""
);
--- 939,950 ----
};
}
! /* Get serious if we are authoritative, previous
* returns are only if msql yielded a correct result.
* This really is not needed.
*/
! if (((group_result == AUTH_REQUIRED) || (user_result == AUTH_REQUIRED))
&& (sec->auth_msql_authoritative) ) {
! sprintf(msql_errstr,"mSQL-Authoritative: Access denied on %s %s
rule(s) ",
(group_result == AUTH_REQUIRED) ? "USER" : "",
(user_result == AUTH_REQUIRED) ? "GROUP" : ""
);
