===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/Attic/cvsd.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/cvs/Attic/cvsd.c	2005/02/22 22:33:01	1.18
--- src/usr.bin/cvs/Attic/cvsd.c	2005/04/03 17:32:50	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: cvsd.c,v 1.18 2005/02/22 22:33:01 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cvsd.c,v 1.19 2005/04/03 17:32:50 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 210,220 ****
  
  	pwd = getpwnam(cvsd_user);
  	if (pwd == NULL)
! 		err(EX_NOUSER, "failed to get user `%s'", cvsd_user);
  
  	grp = getgrnam(cvsd_group);
  	if (grp == NULL)
! 		err(EX_NOUSER, "failed to get group `%s'", cvsd_group);
  
  	endpwent();
  	endgrent();
--- 210,220 ----
  
  	pwd = getpwnam(cvsd_user);
  	if (pwd == NULL)
! 		err(1, "failed to get user `%s'", cvsd_user);
  
  	grp = getgrnam(cvsd_group);
  	if (grp == NULL)
! 		err(1, "failed to get group `%s'", cvsd_group);
  
  	endpwent();
  	endgrent();
***************
*** 231,242 ****
  
  	if (!cvsd_fg && daemon(0, 0) == -1) {
  		cvs_log(LP_ERRNO, "failed to become a daemon");
! 		exit(EX_OSERR);
  	}
  
  	if ((cvsd_repo = cvs_repo_load(cvsd_root, repo_flags)) == NULL) {
  		cvs_log(LP_ERR, "failed to load repository");
! 		exit(EX_OSERR);
  	};
  
  	if (cvsd_sock_open() < 0) {
--- 231,242 ----
  
  	if (!cvsd_fg && daemon(0, 0) == -1) {
  		cvs_log(LP_ERRNO, "failed to become a daemon");
! 		exit(1);
  	}
  
  	if ((cvsd_repo = cvs_repo_load(cvsd_root, repo_flags)) == NULL) {
  		cvs_log(LP_ERR, "failed to load repository");
! 		exit(1);
  	};
  
  	if (cvsd_sock_open() < 0) {
***************
*** 245,255 ****
  
  	if (setegid(cvsd_gid) == -1) {
  		cvs_log(LP_ERRNO, "failed to drop group privileges");
! 		exit(EX_OSERR);
  	}
  	if (seteuid(cvsd_uid) == -1) {
  		cvs_log(LP_ERRNO, "failed to drop user privileges");
! 		exit(EX_OSERR);
  	}
  
  	signal(SIGINFO, cvsd_sighdlr);
--- 245,255 ----
  
  	if (setegid(cvsd_gid) == -1) {
  		cvs_log(LP_ERRNO, "failed to drop group privileges");
! 		exit(1);
  	}
  	if (seteuid(cvsd_uid) == -1) {
  		cvs_log(LP_ERRNO, "failed to drop user privileges");
! 		exit(1);
  	}
  
  	signal(SIGINFO, cvsd_sighdlr);
***************
*** 323,329 ****
  		 */
  		if (dup2(sock, CVSD_CHILD_SOCKFD) == -1) {
  			cvs_log(LP_ERRNO, "failed to dup child socket");
! 			exit(EX_OSERR);
  		}
  		(void)close(sock);
  
--- 323,329 ----
  		 */
  		if (dup2(sock, CVSD_CHILD_SOCKFD) == -1) {
  			cvs_log(LP_ERRNO, "failed to dup child socket");
! 			exit(1);
  		}
  		(void)close(sock);
  
***************
*** 345,351 ****
  
  		execv(CVSD_PATH_CHILD, argv);
  		err(1, "FUCK");
! 		exit(EX_OSERR);
  	}
  
  	cvs_log(LP_INFO, "spawning child %d", pid);
--- 345,351 ----
  
  		execv(CVSD_PATH_CHILD, argv);
  		err(1, "FUCK");
! 		exit(1);
  	}
  
  	cvs_log(LP_INFO, "spawning child %d", pid);