Commit 9d2dcd68 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Update the Apache code to account for the XtOffset change in APR. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90356 13f79535-47bb-0310-9956-ffa450edef68
parent 05a9e44d

modules/aaa/mod_auth.c

+3 −3
Original line number Diff line number Diff line
@@ -110,13 +110,13 @@ static const char *set_auth_slot(cmd_parms *cmd, void *offset, const char *f, 
static const command_rec auth_cmds[] =

{

    AP_INIT_TAKE12("AuthUserFile", set_auth_slot,

                   (void *) XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG,

                   (void *) APR_XtOffsetOf(auth_config_rec, auth_pwfile), OR_AUTHCFG,

                   "text file containing user IDs and passwords"),

    AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,

                   (void *) XtOffsetOf(auth_config_rec, auth_grpfile), OR_AUTHCFG,

                   (void *) APR_XtOffsetOf(auth_config_rec, auth_grpfile), OR_AUTHCFG,

                   "text file containing group names and member user IDs"),

    AP_INIT_FLAG("AuthAuthoritative", ap_set_flag_slot,

                 (void *) XtOffsetOf(auth_config_rec, auth_authoritative),

                 (void *) APR_XtOffsetOf(auth_config_rec, auth_authoritative),

                 OR_AUTHCFG,

                 "Set to 'no' to allow access control to be passed along to lower "

                 "modules if the UserID is not known to this module"),

modules/aaa/mod_auth_db.c

+5 −5
Original line number Diff line number Diff line
@@ -146,19 +146,19 @@ static const char *set_db_slot(cmd_parms *cmd, void *offset, const char *f, cons 
static const command_rec db_auth_cmds[] =

{

    AP_INIT_TAKE1("AuthDBUserFile", ap_set_file_slot,

     (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),

     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbpwfile),

     OR_AUTHCFG, "db database file containing user IDs and passwords"),

    AP_INIT_TAKE1("AuthDBGroupFile", ap_set_file_slot,

     (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),

     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),

     OR_AUTHCFG, "db database file containing group names and member user IDs"),

    AP_INIT_TAKE12("AuthUserFile", set_db_slot,

     (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),

     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbpwfile),

     OR_AUTHCFG, NULL),

    AP_INIT_TAKE12("AuthGroupFile", set_db_slot,

     (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),

     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),

     OR_AUTHCFG, NULL),

    AP_INIT_FLAG("AuthDBAuthoritative", ap_set_flag_slot,

     (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),

     (void *) APR_XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),

     OR_AUTHCFG,

     "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"),

    {NULL}

modules/aaa/mod_auth_dbm.c

+5 −5
Original line number Diff line number Diff line
@@ -142,19 +142,19 @@ static const char *set_dbm_slot(cmd_parms *cmd, void *offset, 
static const command_rec dbm_auth_cmds[] =

{

    AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,

     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),

     OR_AUTHCFG, "dbm database file containing user IDs and passwords"),

    AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,

     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),

     OR_AUTHCFG, "dbm database file containing group names and member user IDs"),

    AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,

     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),

     OR_AUTHCFG, NULL),

    AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,

     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),

     OR_AUTHCFG, NULL),

    AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,

     (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),

     (void *) APR_XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),

     OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"),

    {NULL}

};

modules/aaa/mod_auth_ldap.c

+9 −9
Original line number Diff line number Diff line
@@ -754,26 +754,26 @@ command_rec mod_auth_ldap_cmds[] = { 
                  "search on the branch <b>ou=People, o=Airius</b>."),



    AP_INIT_TAKE1("AuthLDAPBindDN", ap_set_string_slot,

                  (void *)XtOffsetOf(mod_auth_ldap_config_t, binddn), OR_AUTHCFG,

                  (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, binddn), OR_AUTHCFG,

                  "DN to use to bind to LDAP server. If not provided, will do an anonymous bind."),



    AP_INIT_TAKE1("AuthLDAPBindPassword", ap_set_string_slot,

                  (void *)XtOffsetOf(mod_auth_ldap_config_t, bindpw), OR_AUTHCFG,

                  (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, bindpw), OR_AUTHCFG,

                  "Password to use to bind to LDAP server. If not provided, will do an anonymous bind."),



    AP_INIT_FLAG("AuthLDAPRemoteUserIsDN", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, user_is_dn), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, user_is_dn), OR_AUTHCFG,

                 "Set to 'on' to set the REMOTE_USER environment variable to be the full "

                 "DN of the remote user. By default, this is set to off, meaning that "

                 "the REMOTE_USER variable will contain whatever value the remote user sent."),



    AP_INIT_FLAG("AuthLDAPAuthoritative", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, auth_authoritative), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, auth_authoritative), OR_AUTHCFG,

                 "Set to 'off' to allow access control to be passed along to lower modules if "

                 "the UserID and/or group is not known to this module"),



    AP_INIT_FLAG("AuthLDAPCompareDNOnServer", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, compare_dn_on_server), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, compare_dn_on_server), OR_AUTHCFG,

                 "Set to 'on' to force auth_ldap to do DN compares (for the \"require dn\" "

                 "directive) using the server, and set it 'off' to do the compares locally "

                 "(at the expense of possible false matches). See the documentation for "
@@ -784,7 +784,7 @@ command_rec mod_auth_ldap_cmds[] = { 
                    "member and uniquemember"),



    AP_INIT_FLAG("AuthLDAPGroupAttributeIsDN", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, group_attrib_is_dn), OR_AUTHCFG,

                 "If set to 'on', auth_ldap uses the DN that is retrieved from the server for"

                 "subsequent group comparisons. If set to 'off', auth_ldap uses the string"

                 "provided by the client directly. Defaults to 'on'."),
@@ -795,16 +795,16 @@ command_rec mod_auth_ldap_cmds[] = { 
                  "Defaults to always."),



    AP_INIT_FLAG("AuthLDAPEnabled", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, enabled), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, enabled), OR_AUTHCFG,

                 "Set to off to disable auth_ldap, even if it's been enabled in a higher tree"),

 

    AP_INIT_FLAG("AuthLDAPFrontPageHack", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, frontpage_hack), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, frontpage_hack), OR_AUTHCFG,

                 "Set to 'on' to support Microsoft FrontPage"),



#ifdef APU_HAS_LDAP_STARTTLS

    AP_INIT_FLAG("AuthLDAPStartTLS", ap_set_flag_slot,

                 (void *)XtOffsetOf(mod_auth_ldap_config_t, starttls), OR_AUTHCFG,

                 (void *)APR_XtOffsetOf(mod_auth_ldap_config_t, starttls), OR_AUTHCFG,

                 "Set to 'on' to start TLS after connecting to the LDAP server."),

#endif /* APU_HAS_LDAP_STARTTLS */

modules/generators/mod_autoindex.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static const command_rec autoindex_cmds[] = 
    AP_INIT_RAW_ARGS("FancyIndexing", ap_set_deprecated, NULL, OR_ALL,

                 "The FancyIndexing directive is no longer supported.  Use IndexOptions FancyIndexing."),

    AP_INIT_TAKE1("DefaultIcon", ap_set_string_slot,

                  (void *) XtOffsetOf(autoindex_config_rec, default_icon),

                  (void *) APR_XtOffsetOf(autoindex_config_rec, default_icon),

                  DIR_CMD_PERMS, "an icon URL"),

    {NULL}

};