Upgrade licence to GPLv3+.

[userv.git] / debug.c

diff --git a/debug.c b/debug.c
index 19713af4bcdf028b34ecfd488e63bfeb53de0fb2..2008fa8ddad577a0d9d940b267ca4d8ccee7fd8b 100644 (file)
--- a/debug.c
+++ b/debug.c
@@ -2,11 +2,14 @@
  * userv - ddebug.c
  * routines which are different for -DDEBUG
  *
- * Copyright (C)1996-1997 Ian Jackson
+ * userv is
+ * Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
+ * Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
+ * Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
@@ -15,8 +18,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with userv; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with userv; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdarg.h>
@@ -160,7 +162,7 @@ void debug_dumprequest(pid_t mypid) {
         "calling uid: %ld\n"
          "calling user shell: `%s'\n"
         "calling groups:",
-        logname, (long)request_mbuf.callinguid,
+        loginname, (long)request_mbuf.callinguid,
         callinguser_shell);
   groupsdump(request_mbuf.ngids,calling_gids,calling_groups);
   printf("\n"
@@ -176,6 +178,8 @@ void debug_dumprequest(pid_t mypid) {
   for (i=0; i<request_mbuf.nvars; i++)
     printf(" `%s'=`%s'",defvararray[i].key,defvararray[i].value);
   printf("\n");
+  if (overridedata) printf("override data: `%s'\n",overridedata);
+  else printf("not overridden\n");
   if (getenv("USERVD_SLEEP")) sleep(atoi(getenv("USERVD_SLEEP")));
 }