1
diff -ruN xdm-wdm/policy.c xdm-debian/policy.c
2
--- xdm-wdm/policy.c Sat Jan 18 01:02:22 1997
3
+++ xdm-debian/policy.c Fri Aug 14 11:17:36 1998
5
/* $XConsortium: policy.c,v 1.12 94/04/17 20:03:41 hersh Exp $ */
6
/* $XFree86: xc/programs/xdm/policy.c,v 3.1 1997/01/18 07:02:22 dawes Exp $ */
7
+/* Debian: added feature to display load average of available hosts if
11
Copyright (c) 1988 X Consortium
18
static ARRAY8 noAuthentication = { (CARD16) 0, (CARD8Ptr) 0 };
20
typedef struct _XdmAuth {
25
+/* Find out the system load, and fill in either:
26
+ "Available (load x.xx)"
29
+ if finding the load turns out to be impossible */
31
+avail_msg(char *statusBuf)
34
+ sprintf(statusBuf, "Willing to manage");
36
+#else /* __linux__ */
38
+ const char *err = "Willing to manage";
41
+ lavg = fopen("/proc/loadavg", "r");
44
+ sprintf(statusBuf, err);
48
+ if (fread(buf, sizeof(char), 4, lavg) != 4)
51
+ sprintf(statusBuf, err);
56
+ sprintf(statusBuf, "Available (load: %s)", buf);
59
+#endif /* __linux__ */
64
Willing (addr, connectionType, authenticationName, status, type)
67
sprintf (statusBuf, "Display not authorized to connect");
69
- sprintf (statusBuf, "Willing to manage");
70
+ avail_msg (statusBuf);
71
status->length = strlen (statusBuf);
72
status->data = (CARD8Ptr) malloc (status->length);
74
diff -ruN xdm-wdm/server.c xdm-debian/server.c
75
--- xdm-wdm/server.c Fri Jan 5 07:21:01 1996
76
+++ xdm-debian/server.c Fri Aug 14 11:17:37 1998
78
/* $XConsortium: server.c,v 1.20 94/10/17 18:29:34 converse Exp $ */
79
/* $XFree86: xc/programs/xdm/server.c,v 3.2 1996/01/05 13:21:01 dawes Exp $ */
80
+/* Debian: patch from Matthieu Herrb to close open chooser socket */
83
Copyright (c) 1988 X Consortium
84
diff -ruN xdm-wdm/session.c xdm-debian/session.c
85
--- xdm-wdm/session.c Mon Mar 2 05:56:36 1998
86
+++ xdm-debian/session.c Fri Aug 14 11:17:37 1998
88
/* $XConsortium: session.c /main/77 1996/11/24 17:32:33 rws $ */
89
/* $XFree86: xc/programs/xdm/session.c,v 3.11.2.1 1998/01/23 12:35:20 dawes Exp $ */
90
+/* Debian: patch from Matthieu Herrb to close open chooser socket */
93
Copyright (c) 1988 X Consortium
94
diff -ruN xdm-wdm/xdm.man xdm-debian/xdm.man
95
--- xdm-wdm/xdm.man Sat May 10 01:03:03 1997
96
+++ xdm-debian/xdm.man Fri Aug 14 11:17:37 1998
98
.\" $XConsortium: xdm.man /main/44 1996/12/09 17:08:44 kaleb $
99
.\" $XFree86: xc/programs/xdm/xdm.man,v 3.7.2.1 1997/05/10 07:03:03 hohndel Exp $
100
+.\" Debian: deleted repeated paragraph "When the user selects a host..."
101
.\" Copyright (c) 1988, 1994 X Consortium
103
.\" Permission is hereby granted, free of charge, to any person obtaining
105
\fIxdm\fP remembers the user's choice (for
106
\fBDisplayManager.choiceTimeout\fP seconds) and forwards the request
107
to the chosen host, which starts a session on that display.
109
-When the user selects a host, \fIchooser\fP prints the host chosen,
110
-which is read by the parent \fIxdm\fP, and exits.
111
-\fIxdm\fP closes its connection to the X server, and the server resets
112
-and sends another \fBIndirect\fP XDMCP request.
113
-\fIxdm\fP remembers the user's choice (for
114
-\fBDisplayManager.choiceTimeout\fP seconds) and forwards the request
115
-to the chosen host, which starts a session on that display.
118
.SH "LOCAL SERVER SPECIFICATION"