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