cvs commit: apache/src mod_auth_anon.c mod_auth_dbm.c

[Brian Behlendorf <br...@hyperreal.com>]

brian       96/10/30 16:06:44

  Modified:    src       mod_auth_anon.c mod_auth_dbm.c
  Log:
  Cleaned up more -Wall warnings related to constification.
  
  Revision  Changes    Path
  1.9       +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.8
  retrieving revision 1.9
  diff -C3 -r1.8 -r1.9
  *** mod_auth_anon.c	1996/08/20 11:50:58	1.8
  --- mod_auth_anon.c	1996/10/31 00:06:42	1.9
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: mod_auth_anon.c,v 1.8 1996/08/20 11:50:58 paul Exp $ */
    
    /*
     * http_auth: authentication
  --- 50,56 ----
     *
     */
    
  ! /* $Id: mod_auth_anon.c,v 1.9 1996/10/31 00:06:42 brian Exp $ */
    
    /*
     * http_auth: authentication
  ***************
  *** 130,163 ****
        return sec;
    }
    
  ! char *anon_set_passwd_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_mustemail=arg;
        return NULL;
    }
    
  ! char *anon_set_userid_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_nouserid=arg;
        return NULL;
    }
  ! char *anon_set_logemail_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_logemail=arg;
        return NULL;
    }
  ! char *anon_set_verifyemail_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        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;
    }
    
  ! char *anon_set_string_slots (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, char *arg) {
      
        auth_anon 	* first;
  --- 130,163 ----
        return sec;
    }
    
  ! const char *anon_set_passwd_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_mustemail=arg;
        return NULL;
    }
    
  ! const char *anon_set_userid_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_nouserid=arg;
        return NULL;
    }
  ! const char *anon_set_logemail_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_logemail=arg;
        return NULL;
    }
  ! const char *anon_set_verifyemail_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_verifyemail=arg;
        return NULL;
    }
  ! const char *anon_set_authoritative_flag (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, int arg) {
        sec->auth_anon_authoritative=arg;
        return NULL;
    }
    
  ! const char *anon_set_string_slots (cmd_parms *cmd, 
    	anon_auth_config_rec *sec, char *arg) {
      
        auth_anon 	* first;
  
  
  
  1.8       +6 -4      apache/src/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_auth_dbm.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** mod_auth_dbm.c	1996/10/08 22:19:23	1.7
  --- mod_auth_dbm.c	1996/10/31 00:06:42	1.8
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: mod_auth_dbm.c,v 1.7 1996/10/08 22:19:23 brian Exp $ */
    
    /*
     * http_auth: authentication
  --- 50,56 ----
     *
     */
    
  ! /* $Id: mod_auth_dbm.c,v 1.8 1996/10/31 00:06:42 brian Exp $ */
    
    /*
     * http_auth: authentication
  ***************
  *** 79,85 ****
        return pcalloc (p, sizeof(dbm_auth_config_rec));
    }
    
  ! char *set_dbm_slot (cmd_parms *cmd, void *offset, char *f, char *t)
    {
        if (!t || strcmp(t, "dbm"))
    	return DECLINE_CMD;
  --- 79,85 ----
        return pcalloc (p, sizeof(dbm_auth_config_rec));
    }
    
  ! const char *set_dbm_slot (cmd_parms *cmd, void *offset, char *f, char *t)
    {
        if (!t || strcmp(t, "dbm"))
    	return DECLINE_CMD;
  ***************
  *** 204,210 ****
        require_line *reqs = reqs_arr ? (require_line *)reqs_arr->elts : NULL;
    
        register int x;
  !     char *t, *w;
    
        if (!sec->auth_dbmgrpfile) return DECLINED;
        if (!reqs_arr) return DECLINED;
  --- 204,211 ----
        require_line *reqs = reqs_arr ? (require_line *)reqs_arr->elts : NULL;
    
        register int x;
  !     const char *t;
  !     char *w;
    
        if (!sec->auth_dbmgrpfile) return DECLINED;
        if (!reqs_arr) return DECLINED;
  ***************
  *** 217,223 ****
            w = getword(r->pool, &t, ' ');
    	
            if(!strcmp(w,"group") && sec->auth_dbmgrpfile) {
  !            char *orig_groups,*groups,*v;
    
               if (!(groups = get_dbm_grp(r, user, sec->auth_dbmgrpfile))) {
                   sprintf(errstr,"user %s not in DBM group file %s",
  --- 218,225 ----
            w = getword(r->pool, &t, ' ');
    	
            if(!strcmp(w,"group") && sec->auth_dbmgrpfile) {
  !            const char *orig_groups,*groups;
  ! 	   char *v;
    
               if (!(groups = get_dbm_grp(r, user, sec->auth_dbmgrpfile))) {
                   sprintf(errstr,"user %s not in DBM group file %s",