Update.

	* crypt/crypt.texi: Moved to...
	* crypt/examples/genpass.c: Moved to...
	* manual/examples/genpass.c: ...here.
	* crypt/examples/mygenpass.c: Moved to...
	* manual/examples/mygenpass.c: ...here.
	* crypt/examples/testpass.c: Moved to...
	* manual/examples/testpass.c: ...here.

	* manual/Makefile (chapters): Add crypt.
	* manual/conf.texi: Add usual header for not-last chapter.
	* manual/crypt.texi: Add special header for last chapter.

6 files changed, 89 insertions, 6 deletions

diff --git a/manual/Makefile b/manual/Makefile
index cc4e200c8a..51ada2c6af 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -55,7 +55,8 @@ chapters = $(addsuffix .texi, \
 		       intro errno memory ctype string charset locale	\
 		       message search pattern io stdio llio filesys	\
 		       pipe socket terminal math arith time setjmp	\
-		       signal startup process job nss users sysinfo conf)
+		       signal startup process job nss users sysinfo conf\
+		       crypt)
 add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
 appendices = lang.texi header.texi install.texi maint.texi contrib.texi
 
@@ -69,7 +70,7 @@ examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \
 			$(filter %.c.texi, $(texis)))
 
 # Kludge: implicit rule so Make knows the one command does it all.
-chapters.% top-menu.%: libc-texinfo.sh $(texis)
+chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile
 	AWK=$(AWK) $(SHELL) $< '$(chapters)' '$(add-chapters)' '$(appendices)'
 
 libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi libm-err.texi
diff --git a/manual/conf.texi b/manual/conf.texi
index bd866eccaa..a684a5b2e2 100644
--- a/manual/conf.texi
+++ b/manual/conf.texi
@@ -1,6 +1,4 @@
-@c This node must have no pointers.
-@node System Configuration
-@c @node System Configuration, , System Information, Top
+@node System Configuration, Cryptographic Functions, System Information, Top
 @c %MENU% Parameters describing operating system limits
 @chapter System Configuration Parameters
 
diff --git a/manual/crypt.texi b/manual/crypt.texi
index 1a4177a024..f17fab9b59 100644
--- a/manual/crypt.texi
+++ b/manual/crypt.texi
@@ -1,5 +1,6 @@
+@c This node must have no pointers.
 @node Cryptographic Functions
-@c @node Cryptographic Functions, , Top, Top
+@c @node Cryptographic Functions, , System Configuration, Top
 @chapter DES Encryption and Password Handling
 @c %MENU% DES encryption and password handling
 
diff --git a/manual/examples/genpass.c b/manual/examples/genpass.c
new file mode 100644
index 0000000000..a7626dbed5
--- /dev/null
+++ b/manual/examples/genpass.c
@@ -0,0 +1,32 @@
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include <crypt.h>
+
+int 
+main(void)
+{
+  unsigned long seed[2];
+  char salt[] = "$1$........";
+  const char *const seedchars = 
+    "./0123456789ABCDEFGHIJKLMNOPQRST"
+    "UVWXYZabcdefghijklmnopqrstuvwxyz";
+  char *password;
+  int i;
+  
+  /* Generate a (not very) random seed.  
+     You should do it better than this...  */
+  seed[0] = time(NULL);
+  seed[1] = getpid() ^ (seed[0] >> 14 & 0x30000);
+  
+  /* Turn it into printable characters from `seedchars'.  */
+  for (i = 0; i < 8; i++)
+    salt[3+i] = seedchars[(seed[i/5] >> (i%5)*6) & 0x3f];
+  
+  /* Read in the user's password and encrypt it.  */
+  password = crypt(getpass("Password:"), salt);
+  
+  /* Print the results.  */
+  puts(password);
+  return 0;
+}
diff --git a/manual/examples/mygetpass.c b/manual/examples/mygetpass.c
new file mode 100644
index 0000000000..6fe06f4637
--- /dev/null
+++ b/manual/examples/mygetpass.c
@@ -0,0 +1,25 @@
+#include <termios.h>
+#include <stdio.h>
+
+ssize_t
+my_getpass (char **lineptr, size_t *n, FILE *stream)
+{
+  struct termios old, new;
+  int nread;
+
+  /* Turn echoing off and fail if we can't.  */
+  if (tcgetattr (fileno (stream), &old) != 0)
+    return -1;
+  new = old;
+  new.c_lflag &= ~ECHO;
+  if (tcsetattr (fileno (stream), TCSAFLUSH, &new) != 0)
+    return -1;
+  
+  /* Read the password.  */
+  nread = getline (lineptr, n, stream);
+
+  /* Restore terminal.  */
+  (void) tcsetattr (fileno (stream), TCSAFLUSH, &old);
+  
+  return nread;
+}
diff --git a/manual/examples/testpass.c b/manual/examples/testpass.c
new file mode 100644
index 0000000000..5bd616d2a0
--- /dev/null
+++ b/manual/examples/testpass.c
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <crypt.h>
+
+int 
+main(void)
+{
+  /* Hashed form of "GNU libc manual".  */
+  const char *const pass = "$1$/iSaq7rB$EoUw5jJPPvAPECNaaWzMK/";
+
+  char *result;
+  int ok;
+  
+/*@group*/
+  /* Read in the user's password and encrypt it,
+     passing the expected password in as the salt.  */
+  result = crypt(getpass("Password:"), pass);
+/*@end group*/
+
+  /* Test the result.  */
+  ok = strcmp (result, pass) == 0;
+
+  puts(ok ? "Access granted." : "Access denied.");
+  return ok ? 0 : 1;
+}