summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-08-15 19:17:43 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-08-15 19:17:43 +1000
commit794f97026e3cf46e80b7fe4df6ca68960f8b4667 (patch)
tree71820953fdd01b4c93efc682771e4637ea102369
parent69fe0e1398e95445f0e19fc560ab56595972acfe (diff)
- (dtucker) [openbsd-compat/bsd-cray.c] Remove debug from signal handler.
ok djm@
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/bsd-cray.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e55e862d..827fce51a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
7 - markus@cvs.openbsd.org 2007/08/15 08:16:49 7 - markus@cvs.openbsd.org 2007/08/15 08:16:49
8 [version.h] 8 [version.h]
9 openssh 4.7 9 openssh 4.7
10 - (dtucker) [openbsd-compat/bsd-cray.c] Remove debug from signal handler.
11 ok djm@
10 12
1120070813 1320070813
12 - (dtucker) [session.c] Bug #1339: ensure that pam_setcred() is always 14 - (dtucker) [session.c] Bug #1339: ensure that pam_setcred() is always
@@ -3162,4 +3164,4 @@
3162 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3164 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3163 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3165 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3164 3166
3165$Id: ChangeLog,v 1.4727 2007/08/15 09:14:52 dtucker Exp $ 3167$Id: ChangeLog,v 1.4728 2007/08/15 09:17:43 dtucker Exp $
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index 1532c991c..f1bbd7dec 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * $Id: bsd-cray.c,v 1.16 2006/09/01 05:38:41 djm Exp $ 2 * $Id: bsd-cray.c,v 1.17 2007/08/15 09:17:43 dtucker Exp $
3 * 3 *
4 * bsd-cray.c 4 * bsd-cray.c
5 * 5 *
@@ -751,8 +751,6 @@ cray_job_termination_handler(int sig)
751 char *login = NULL; 751 char *login = NULL;
752 struct jtab jtab; 752 struct jtab jtab;
753 753
754 debug("received signal %d",sig);
755
756 if ((jid = waitjob(&jtab)) == -1 || 754 if ((jid = waitjob(&jtab)) == -1 ||
757 (login = uid2nam(jtab.j_uid)) == NULL) 755 (login = uid2nam(jtab.j_uid)) == NULL)
758 return; 756 return;