[PATCH app-xdm 3/4] man: provide info even when features are missing at configuration time

Gaetan Nadon memsize at videotron.ca
Sat Aug 21 16:31:56 PDT 2010


Some resources are not applicable if some features are not present
such as arc4random function and random data source.

There is no harm done in providing this information and stating when
it is applicable. One may read the man page from the web and the version
being seen may or may not contain all the information depending on which
computer the package has been configured on.

The affected resources are:
DisplayManager.randomFile  (erroneously included per original design)
DisplayManager.prngSocket
DisplayManager.prngPort
DisplayManager.randomDevice

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 xdm.man.cpp |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/xdm.man.cpp b/xdm.man.cpp
index 408f28f..9ba7379 100644
--- a/xdm.man.cpp
+++ b/xdm.man.cpp
@@ -346,15 +346,16 @@ to pass on to the \fIXsetup\fP,
 .IP \fBDisplayManager.randomFile\fP
 A file to checksum to generate the seed of authorization keys.
 This should be a file that changes frequently.
+This resource is valid only when the arc4random() function
+has been detected at installation.
 The default is \fI/dev/mem\fP.
-#ifdef DEV_RANDOM
 .IP \fBDisplayManager.randomDevice\fP
 A file to read 8 bytes from to generate the seed of authorization keys.
-The default is \fI DEV_RANDOM \fP. If this file cannot be read, or if a
+The default (if detected) is \fI DEV_RANDOM \fP. If this file cannot be read, or if a
 read blocks for more than 5 seconds, xdm falls back to using a checksum
 of \fBDisplayManager.randomFile\fP to generate the seed.
-#endif
-#if !defined(ARC4_RANDOM)
+This resource is valid only when a device providing a random data source
+has been detected at installation.
 .IP \fBDisplayManager.prngdSocket\fP
 .IP \fBDisplayManager.prngPort\fP
 A UNIX domain socket name or a TCP socket port number on local host on
@@ -363,11 +364,12 @@ which a Pseudo-Random Number Generator Daemon, like EGD
 autorization keys. Either a non null port or a valid socket name must
 be specified. The default is to use the Unix-domain socket
 \fI/tmp/entropy\fP.
+This resource is valid only when the arc4random() function
+has been detected at installation.
 .PP
 On systems that don't have such a daemon, a fall-back entropy
 gathering system, based on various log file contents hashed by the MD5
 algorithm is used instead.
-#endif
 .IP \fBDisplayManager.greeterLib\fP
 On systems that support a dynamically-loadable greeter library, the
 name of the library.  The default is
-- 
1.6.0.4


Patch #4 may not make it to the list due to size.


More information about the xorg-devel mailing list