===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/ci.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** src/usr.bin/rcs/ci.c	2005/12/02 13:43:32	1.77
--- src/usr.bin/rcs/ci.c	2005/12/02 13:53:43	1.78
***************
*** 1,4 ****
! /*	$OpenBSD: ci.c,v 1.77 2005/12/02 13:43:32 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: ci.c,v 1.78 2005/12/02 13:53:43 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
   * All rights reserved.
***************
*** 452,462 ****
  		return (-1);
  	}
  
! 	if (checkin_checklock(pb) < 0) {
! 		cvs_log(LP_ERR, "%s: no lock set by %s",
! 		    pb->file->rf_path, pb->username);
  		return (-1);
- 	}
  
  	/* Load file contents */
  	if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
--- 452,459 ----
  		return (-1);
  	}
  
! 	if (checkin_checklock(pb) < 0)
  		return (-1);
  
  	/* Load file contents */
  	if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
***************
*** 715,721 ****
  	}
  
  	if ((found == 0) && (notlocked == 0)) {
! 		cvs_log(LP_ERR, "no locks set for '%s'", pb->username);
  		rcs_close(pb->file);
  		return (-1);
  	}
--- 712,719 ----
  	}
  
  	if ((found == 0) && (notlocked == 0)) {
! 		cvs_log(LP_ERR,
! 		    "%s: no lock by %s", pb->file->rf_path, pb->username);
  		rcs_close(pb->file);
  		return (-1);
  	}