===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/cvs/config.c	2008/02/04 19:08:32	1.14
--- src/usr.bin/cvs/config.c	2008/03/02 11:58:45	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: config.c,v 1.14 2008/02/04 19:08:32 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: config.c,v 1.15 2008/03/02 11:58:45 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 34,40 ****
  	cvs_read_config(CVS_PATH_CONFIG, config_parse_line);
  }
  
! void
  config_parse_line(char *line, int lineno)
  {
  	struct rlimit rl;
--- 34,40 ----
  	cvs_read_config(CVS_PATH_CONFIG, config_parse_line);
  }
  
! int
  config_parse_line(char *line, int lineno)
  {
  	struct rlimit rl;
***************
*** 73,82 ****
  	} else {
  		cvs_log(LP_ERR, "ignoring unknown option '%s'", opt);
  	}
  }
  
  void
! cvs_read_config(char *name, void (*cb)(char *, int))
  {
  	FILE *fp;
  	size_t len;
--- 73,84 ----
  	} else {
  		cvs_log(LP_ERR, "ignoring unknown option '%s'", opt);
  	}
+ 
+ 	return (0);
  }
  
  void
! cvs_read_config(char *name, int (*cb)(char *, int))
  {
  	FILE *fp;
  	size_t len;
***************
*** 109,115 ****
  		if (p[0] == '#' || p[0] == '\0')
  			continue;
  
! 		cb(p, lineno);
  	}
  
  	if (lbuf != NULL)
--- 111,118 ----
  		if (p[0] == '#' || p[0] == '\0')
  			continue;
  
! 		if (cb(p, lineno) < 0)
! 			break;
  	}
  
  	if (lbuf != NULL)