===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/calendar/calendar.c	1997/09/08 23:49:57	1.9
+++ src/usr.bin/calendar/calendar.c	1997/09/15 07:12:03	1.10
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.c,v 1.9 1997/09/08 23:49:57 millert Exp $	*/
+/*	$OpenBSD: calendar.c,v 1.10 1997/09/15 07:12:03 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: calendar.c,v 1.9 1997/09/08 23:49:57 millert Exp $";
+static char rcsid[] = "$OpenBSD: calendar.c,v 1.10 1997/09/15 07:12:03 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -117,16 +117,16 @@
 
 	settime(f_time);
 
-	if (doall)
+	if (doall) {
 		while ((pw = getpwent()) != NULL) {
 			(void)setegid(pw->pw_gid);
 			(void)initgroups(pw->pw_name, pw->pw_gid);
-			(void)setlogin(pw->pw_name);
 			(void)seteuid(pw->pw_uid);
 			if (!chdir(pw->pw_dir))
 				cal();
 			(void)seteuid(0);
 		}
+	}
 	else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
 		if(!chdir(caldir))
 			cal();