===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/Attic/cvsd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/cvs/Attic/cvsd.c	2004/11/25 18:30:12	1.11
--- src/usr.bin/cvs/Attic/cvsd.c	2004/11/28 15:12:17	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: cvsd.c,v 1.11 2004/11/25 18:30:12 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
--- 1,4 ----
! /*	$OpenBSD: cvsd.c,v 1.12 2004/11/28 15:12:17 pat Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
***************
*** 860,865 ****
--- 860,866 ----
  cvsd_set(int what, ...)
  {
  	char *str;
+ 	int error = 0;
  	va_list vap;
  
  	str = NULL;
***************
*** 872,877 ****
--- 873,879 ----
  		str = strdup(va_arg(vap, char *));
  		if (str == NULL) {
  			cvs_log(LP_ERRNO, "failed to set string");
+ 			va_end(vap);
  			return (-1);
  		}
  	}
***************
*** 886,893 ****
  		if (cvsd_sock_path != NULL)
  			free(cvsd_sock_path);
  		cvsd_sock_path = str;
! 		if (cvsd_sock_open() < 0)
! 			return (-1);
  		break;
  	case CVSD_SET_USER:
  		if (cvsd_user != NULL)
--- 888,894 ----
  		if (cvsd_sock_path != NULL)
  			free(cvsd_sock_path);
  		cvsd_sock_path = str;
! 		error = cvsd_sock_open();
  		break;
  	case CVSD_SET_USER:
  		if (cvsd_user != NULL)
***************
*** 917,928 ****
  		break;
  	default:
  		cvs_log(LP_ERR, "invalid field to set");
! 		return (-1);
  	}
  
  	va_end(vap);
  
! 	return (0);
  }
  
  
--- 918,930 ----
  		break;
  	default:
  		cvs_log(LP_ERR, "invalid field to set");
! 		error = -1;
! 		break;
  	}
  
  	va_end(vap);
  
! 	return (error);
  }