From fd6d99f49e14785b3c84eaf12c9ae787ee93700d Mon Sep 17 00:00:00 2001
From: wpaul <wpaul@FreeBSD.org>
Date: Wed, 28 May 1997 04:38:30 +0000
Subject: Resolve conflicts.

---
 include/rpcsvc/rnusers.x | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'include/rpcsvc/rnusers.x')

diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index 72f558c..0ba5248 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$Id$";
+%static char rcsid[] = "$Id: rnusers.x,v 1.1 1994/08/04 19:01:50 wollman Exp $";
 %#endif /* not lint */
 #endif
 
@@ -59,6 +59,21 @@ typedef utmp utmparr<MAXUSERS>;
 
 typedef utmpidle utmpidlearr<MAXUSERS>;
 
+const RUSERS_MAXUSERLEN = 32;
+const RUSERS_MAXLINELEN = 32;
+const RUSERS_MAXHOSTLEN = 257;
+
+struct rusers_utmp {
+	string ut_user<RUSERS_MAXUSERLEN>;	/* aka ut_name */
+	string ut_line<RUSERS_MAXLINELEN>;	/* device */
+	string ut_host<RUSERS_MAXHOSTLEN>;	/* host user logged on from */
+	int ut_type;				/* type of entry */
+	int ut_time;				/* time entry was made */
+	unsigned int ut_idle;			/* minutes idle */
+};
+
+typedef rusers_utmp utmp_array<>;
+
 program RUSERSPROG {
 	/*
 	 * Old version does not include idle information
@@ -87,5 +102,21 @@ program RUSERSPROG {
 		utmpidlearr
 		RUSERSPROC_ALLNAMES(void) = 3;
 	} = 2;
+
+	/*
+	 * Version 3 rusers procedures (from Solaris).
+	 * (Thanks a lot Sun.)
+	 */
+	version RUSERSVERS_3 {
+		int
+		RUSERSPROC_NUM(void) = 1;
+
+		utmp_array
+		RUSERSPROC_NAMES(void) = 2;
+
+		utmp_array
+		RUSERSPROC_ALLNAMES(void) = 3;
+	} = 3;
+
 } = 100002;
-	
+
-- 
cgit v1.1