===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/anoncvs.shar,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** www/anoncvs.shar	2016/03/03 02:12:43	1.26
--- www/anoncvs.shar	2016/03/11 19:29:52	1.27
***************
*** 112,124 ****
  X    cd /open/anoncvs
  X    touch .hushlogin
  X    touch .profile
- X
- XPut a message like the following in .plan:
- X    To use anonymous CVS install the latest version of CVS on your local
- X    machine.
- X    Then set your CVSROOT environment variable to the following value:
- X            anoncvs@anoncvs.openbsd.org:/cvs
- X
  X    mkdir bin dev tmp usr var etc
  X    cp /bin/{cat,pwd,rm,sh} bin/
  X
--- 112,117 ----
***************
*** 452,463 ****
  X */
  X/* #define ANONCVS_USER USERNAME */
  X
- X/*
- X * If you want to be able to run an alternate OpenCVS binary on your
- X * anoncvs server, define OPENCVS_USER as the user who will invoke it.
- X */
- X#define OPENCVS_USER "opencvs"
- X
  Xint main __P((int, char *[]));
  X
  Xchar * const env[] = {
--- 445,450 ----
***************
*** 478,486 ****
  X#ifdef DEBUG
  X	int i;
  X#endif /* DEBUG */
- X#if defined(OPENCVS_USER)
- X	int opencvs;
- X#endif
  X
  X	pw = getpwuid(getuid());
  X	if (pw == NULL) {
--- 465,470 ----
***************
*** 520,532 ****
  X	chdir("/");
  X	setuid(pw->pw_uid);
  X
- X#if defined(OPENCVS_USER)
- X	if (!strcmp(pw->pw_name, OPENCVS_USER))
- X		opencvs = 1;
- X	else
- X		opencvs = 0;
- X#endif
- X
  X	/*
  X	 * program now "safe"
  X	 */
--- 504,509 ----
***************
*** 539,552 ****
  X		struct sockaddr_in my_sa, peer_sa;
  X		char *us, *them;
  X
- X#if defined(OPENCVS_USER)
- X		if (opencvs == 1) {
- X			fprintf(stderr, "OpenCVS does not support pserver\n");
- X			sleep(10);
- X			exit(1);
- X		}
- X#endif
- X
  X		slen = sizeof(my_sa);
  X		if (getsockname(0, (struct sockaddr *) &my_sa, &slen)
  X		    != 0) {
--- 516,521 ----
***************
*** 592,601 ****
  X		fprintf(stderr,"version of CVS on your local machine.\n");
  X		fprintf(stderr,"Then set your CVSROOT environment variable ");
  X		fprintf(stderr,"to the following value:\n");
- X#if defined(OPENCVS_USER)
- X		fprintf(stderr, "\t%s@%s:%s for OpenCVS\n", OPENCVS_USER,
- X		    HOSTNAME, LOCALROOT);
- X#endif
  X		fprintf(stderr,"\t%s\n\n", CVSROOT);
  X#ifdef DEBUG
  X		fprintf(stderr, "argc = %d\n", argc);
--- 561,566 ----
***************
*** 606,621 ****
  X		exit(0);
  X	}
  X
- X#if defined(OPENCVS_USER)
- X	if (opencvs == 1) {
- X		execle("/usr/bin/opencvs", "opencvs",
- X		    "server", (char *)NULL, env);
- X	} else {
- X#endif
  X		execle("/usr/bin/cvs", "cvs", "server", (char *)NULL, env);
- X#if defined(OPENCVS_USER)
- X	}
- X#endif
  X
  X	perror("execle: cvs");
  X	fprintf(stderr, "unable to exec CVS server!\n");
--- 571,577 ----