[Midnightbsd-cvs] src [11386] trunk/libexec/rpc.rusersd: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 20:56:49 EDT 2018
Revision: 11386
http://svnweb.midnightbsd.org/src/?rev=11386
Author: laffer1
Date: 2018-07-06 20:56:49 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/libexec/rpc.rusersd/Makefile
trunk/libexec/rpc.rusersd/rpc.rusersd.8
trunk/libexec/rpc.rusersd/rusers_proc.c
trunk/libexec/rpc.rusersd/rusersd.c
Added Paths:
-----------
trunk/libexec/rpc.rusersd/extern.h
Property Changed:
----------------
trunk/libexec/rpc.rusersd/rpc.rusersd.8
Modified: trunk/libexec/rpc.rusersd/Makefile
===================================================================
--- trunk/libexec/rpc.rusersd/Makefile 2018-07-07 00:23:06 UTC (rev 11385)
+++ trunk/libexec/rpc.rusersd/Makefile 2018-07-07 00:56:49 UTC (rev 11386)
@@ -1,8 +1,8 @@
# $MidnightBSD$
-# $FreeBSD: src/libexec/rpc.rusersd/Makefile,v 1.8 2001/03/26 14:22:07 ru Exp $
+# $FreeBSD: stable/10/libexec/rpc.rusersd/Makefile 241777 2012-10-20 10:33:15Z ed $
PROG = rpc.rusersd
-SRCS = rusersd.c rusers_proc.c
+SRCS = rusersd.c rusers_proc.c extern.h
MAN = rpc.rusersd.8
DPADD= ${LIBRPCSVC} ${LIBUTIL}
@@ -13,5 +13,4 @@
#LDADD+= -L/usr/X11R6/lib -lXext -lX11
#.endif
-
.include <bsd.prog.mk>
Added: trunk/libexec/rpc.rusersd/extern.h
===================================================================
--- trunk/libexec/rpc.rusersd/extern.h (rev 0)
+++ trunk/libexec/rpc.rusersd/extern.h 2018-07-07 00:56:49 UTC (rev 11386)
@@ -0,0 +1,35 @@
+/* $MidnightBSD$ */
+/*-
+ * Copyright (c) 1993, John Brezak
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: stable/10/libexec/rpc.rusersd/extern.h 262435 2014-02-24 08:21:49Z brueffer $
+ */
+
+extern int from_inetd;
+
+void rusers_service(struct svc_req *, SVCXPRT *);
Property changes on: trunk/libexec/rpc.rusersd/extern.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/libexec/rpc.rusersd/rpc.rusersd.8
===================================================================
--- trunk/libexec/rpc.rusersd/rpc.rusersd.8 2018-07-07 00:23:06 UTC (rev 11385)
+++ trunk/libexec/rpc.rusersd/rpc.rusersd.8 2018-07-07 00:56:49 UTC (rev 11386)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" -*- nroff -*-
.\"
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
@@ -11,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -31,8 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/libexec/rpc.rusersd/rpc.rusersd.8,v 1.9 2002/07/06 19:19:25 charnier Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/rpc.rusersd/rpc.rusersd.8 262435 2014-02-24 08:21:49Z brueffer $
.\"
.Dd June 7, 1993
.Dt RPC.RUSERSD 8
Property changes on: trunk/libexec/rpc.rusersd/rpc.rusersd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/rpc.rusersd/rusers_proc.c
===================================================================
--- trunk/libexec/rpc.rusersd/rusers_proc.c 2018-07-07 00:23:06 UTC (rev 11385)
+++ trunk/libexec/rpc.rusersd/rusers_proc.c 2018-07-07 00:56:49 UTC (rev 11386)
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -34,7 +30,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/libexec/rpc.rusersd/rusers_proc.c,v 1.13 2003/06/02 02:35:18 obrien Exp $";
+ "$FreeBSD: stable/10/libexec/rpc.rusersd/rusers_proc.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#ifdef DEBUG
@@ -54,6 +50,8 @@
#endif
#include <rpcsvc/rnusers.h>
+#include "extern.h"
+
#ifndef _PATH_DEV
#define _PATH_DEV "/dev"
#endif
@@ -62,10 +60,6 @@
static utmp old_utmp[MAXUSERS];
static struct utmpx utmp_list[MAXUSERS];
-extern int from_inetd;
-
-void rusers_service(struct svc_req *, SVCXPRT *);
-
#ifdef XIDLE
static Display *dpy;
@@ -130,7 +124,7 @@
idle = 0;
if (*tty == 'X') {
u_long kbd_idle, mouse_idle;
-#if !defined(__FreeBSD__) && !defined(__MidnightBSD__)
+#if !defined(__FreeBSD__)
kbd_idle = getidle("kbd", NULL);
#else
kbd_idle = getidle("vga", NULL);
Modified: trunk/libexec/rpc.rusersd/rusersd.c
===================================================================
--- trunk/libexec/rpc.rusersd/rusersd.c 2018-07-07 00:23:06 UTC (rev 11385)
+++ trunk/libexec/rpc.rusersd/rusersd.c 2018-07-07 00:56:49 UTC (rev 11386)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1993, John Brezak
* All rights reserved.
@@ -10,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +30,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD$";
+ "$FreeBSD: stable/10/libexec/rpc.rusersd/rusersd.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
#include <stdlib.h>
@@ -43,7 +40,7 @@
#include <syslog.h>
#include <rpcsvc/rnusers.h>
-extern void rusers_service(struct svc_req *, SVCXPRT *);
+#include "extern.h"
int from_inetd = 1;
More information about the Midnightbsd-cvs
mailing list