Module Name: xsrc
Committed By: mrg
Date: Fri May 31 22:24:30 UTC 2013
Modified Files:
xsrc/external/mit/sessreg/dist: sessreg.h
Removed Files:
xsrc/external/mit/sessreg/dist: filenames.sed.c sessreg.man
Log Message:
merge sessreg 1.0.8
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/sessreg/dist/filenames.sed.c \
xsrc/external/mit/sessreg/dist/sessreg.man
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/sessreg/dist/sessreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/sessreg/dist/sessreg.h
diff -u xsrc/external/mit/sessreg/dist/sessreg.h:1.2 xsrc/external/mit/sessreg/dist/sessreg.h:1.3
--- xsrc/external/mit/sessreg/dist/sessreg.h:1.2 Thu Jun 17 04:32:46 2010
+++ xsrc/external/mit/sessreg/dist/sessreg.h Fri May 31 22:24:30 2013
@@ -6,10 +6,10 @@
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation.
- *
+ *
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -17,7 +17,7 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
* Except as contained in this notice, the name of The Open Group shall
* not be used in advertising or otherwise to promote the sale, use or
* other dealings in this Software without prior written authorization
@@ -25,7 +25,8 @@
*
*/
-/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+/*
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -66,26 +67,12 @@
# include <sys/param.h>
#endif
-#ifndef HAVE_LASTLOG_H
-# define NO_LASTLOG
-#endif
-
-#ifndef NO_LASTLOG
-# ifdef CSRG_BASED
-# if (BSD < 199103)
-# include <lastlog.h>
-# endif
-# else
-# include <lastlog.h>
+#if defined(HAVE_STRUCT_LASTLOG) && defined(HAVE_PWD_H)
+# ifdef HAVE_LASTLOG_H
+# include <lastlog.h>
# endif
-# include <pwd.h>
-#endif
-
-#ifdef CSRG_BASED
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
-/* *BSD doesn't like a ':0' type entry in utmp */
-#define NO_UTMP
-#endif
+# include <pwd.h>
+# define USE_LASTLOG
#endif
#ifndef WTMP_FILE
@@ -95,15 +82,6 @@
# define WTMP_FILE "/usr/adm/wtmp"
# endif
#endif
-
-#ifndef WTMPX_FILE
-# ifdef _PATH_WTMPX
-# define WTMPX_FILE _PATH_WTMPX
-# else
-# define WTMPX_FILE "/usr/adm/wtmpx"
-# endif
-#endif
-
#ifndef UTMP_FILE
# ifdef _PATH_UTMP
# define UTMP_FILE _PATH_UTMP
@@ -111,27 +89,20 @@
# define UTMP_FILE "/etc/utmp"
# endif
#endif
-
-#ifndef UTMPX_FILE
-# ifdef _PATH_UTMPX
-# define UTMPX_FILE _PATH_UTMPX
+#ifndef LLOG_FILE
+# ifdef _PATH_LASTLOG
+# define LLOG_FILE _PATH_LASTLOG
# else
-# define UTMPX_FILE "/etc/utmpx"
+# define LLOG_FILE "/usr/adm/lastlog"
# endif
#endif
+#ifndef TTYS_FILE
+# define TTYS_FILE "/etc/ttys"
+#endif
-#ifndef NO_LASTLOG
-# ifndef LLOG_FILE
-# ifdef _PATH_LASTLOG
-# define LLOG_FILE _PATH_LASTLOG
-# else
-# define LLOG_FILE "/usr/adm/lastlog"
-# endif
-# endif
+#ifndef WTMPX_FILE
+# define WTMPX_FILE _PATH_WTMPX
#endif
-#ifndef SYSV
-# ifndef TTYS_FILE
-# define TTYS_FILE "/etc/ttys"
-# endif
+#ifndef UTMPX_FILE
+# define UTMPX_FILE _PATH_UTMPX
#endif
-
