httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_auth_dbm.c
Date Mon, 30 Oct 2000 20:45:42 GMT
rbb         00/10/30 12:45:40

  Modified:    src/modules/standard mod_auth_dbm.c
  Log:
  Make mod_auth_dbm compile cleanly.
  
  Revision  Changes    Path
  1.20      +13 -12    apache-2.0/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_auth_dbm.c	2000/10/16 06:05:04	1.19
  +++ mod_auth_dbm.c	2000/10/30 20:45:38	1.20
  @@ -125,7 +125,7 @@
       return sec;
   }
   
  -static const char *set_dbm_slot(cmd_parms *cmd, void *offset, char *f, char *t)
  +static const char *set_dbm_slot(cmd_parms *cmd, void *offset, const char *f, const char
*t)
   {
       if (!t || strcmp(t, "dbm"))
   	return DECLINE_CMD;
  @@ -135,21 +135,21 @@
   
   static const command_rec dbm_auth_cmds[] =
   {
  -    {"AuthDBMUserFile", ap_set_file_slot,
  +    AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
        (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
  -     OR_AUTHCFG, TAKE1, NULL},
  -    {"AuthDBMGroupFile", ap_set_file_slot,
  +     OR_AUTHCFG, NULL),
  +    AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,
        (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
  -     OR_AUTHCFG, TAKE1, NULL},
  -    {"AuthUserFile", set_dbm_slot,
  +     OR_AUTHCFG, NULL),
  +    AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,
        (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmpwfile),
  -     OR_AUTHCFG, TAKE12, NULL},
  -    {"AuthGroupFile", set_dbm_slot,
  +     OR_AUTHCFG, NULL),
  +    AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,
        (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmgrpfile),
  -     OR_AUTHCFG, TAKE12, NULL},
  -    {"AuthDBMAuthoritative", ap_set_flag_slot,
  +     OR_AUTHCFG, NULL),
  +    AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
        (void *) XtOffsetOf(dbm_auth_config_rec, auth_dbmauthoritative),
  -     OR_AUTHCFG, FLAG, "Set to 'no' to allow access control to be passed along to lower
modules, if the UserID is not known in this module"},
  +     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}
   };
   
  @@ -160,8 +160,9 @@
       DBM *f;
       datum d, q;
       char *pw = NULL;
  +#ifdef WIN32 /* this is only used on Windows, so only define it on Windows */
       apr_status_t retval;
  -
  +#endif
       q.dptr = user;
   #ifndef NETSCAPE_DBM_COMPAT
       q.dsize = strlen(q.dptr);
  
  
  

Mime
View raw message