*** empty log message ***

8 files changed, 53 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index b26dd047..4d362bd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 30 13:54:47 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makeconf (top_srcdirinc): Don't define EWOULDBLOCK anymore.
+
 Sat Jul 20 15:42:43 1996  Michael I. Bushnell, p/BSG  <mib@gnu.ai.mit.edu>
 
 	* Makeconf (lndist): Find DISTFILES in $(srcdir).
diff --git a/Makeconf b/Makeconf
index 20a18256..036de787 100644
--- a/Makeconf
+++ b/Makeconf
@@ -66,7 +66,7 @@ else
 top_srcdirinc=-I$(top_srcdir)
 endif
 CPPFLAGS += -I. $(srcdirinc) -I.. $(top_srcdirinc) -I$(top_srcdir)/include -D_GNU_SOURCE
-CFLAGS += -Wall -g -O3 -DEWOULDBLOCK=EAGAIN
+CFLAGS += -Wall -g -O3
 
 
 # Local programs:
diff --git a/TODO b/TODO
index 895a5e6e..950bf7ae 100644
--- a/TODO
+++ b/TODO
@@ -47,6 +47,9 @@ See `tasks', the exported task list.
 ** libfsserver/libnetfs:
 *** convert libnetfs to libfsserver
 
+** libnetfs
+*** Support --readonly, --writable, and --update
+
 ** libpager:
 *** Put user-defined fns into a callback struct passed to pager_create.
 *** Make libpager paging interface able to read/write multiple pages at once.
@@ -85,6 +88,7 @@ See `tasks', the exported task list.
     (syslog, but takes special care when the root file system?).
 *** Some of diskfs_readonly_changed in ufs/ext2fs should be in generic 
     routines. 
+*** fsys_get_options should return the disk name.
 
 ** libfshelp
 *** Put functions here to deal with directory and file change notifications?
@@ -191,6 +195,8 @@ See `tasks', the exported task list.
     script by other than root (it doesn't now if the script specifies
     --retry="$0" because the exec server will use /dev/fd/N for name,
     and child_lookup() doesn't supply more than fds 0-2).
+** fsck should use (not-yet-added) fsys_get_options returned device instead 
+   of /etc/fstab.
 
 
 ** ps:
@@ -210,10 +216,11 @@ See `tasks', the exported task list.
 ** nfsd -- fix remaining bugs
 *** Add necessary support to filesystems
 
-** fsck -- zero-length directories and attachment into lost+found still 
+** fsck.ufs -- zero-length directories and attachment into lost+found still 
    don't work. 
 
 
+
 * Mach:
 ** Have some analogue of /dev/klog that syslogd can get kernel messages from
     (maybe there is already?); the boot file system, and other people deeming
@@ -227,8 +234,8 @@ See `tasks', the exported task list.
 ** Compile released libc.
 ** Compile released utilities.  (See SOURCES-0.0)
 ** Make serverboot source tar and build instructions.
-** Deal with crypt
-** Relink everything after version numbered libc is installed
+** Release inetutils 1.1 with autoconf crypt test.
+** Relink everything after when released libc is installed.
 ** ext2fs: shutdown doesn't sync properly?
     [Create a file, then (settrans -a) won't write it, but if you do sync
      first, everything's fine; the code doesn't look too different...]
diff --git a/release/ChangeLog b/release/ChangeLog
index b6ef7b83..e5fe90a2 100644
--- a/release/ChangeLog
+++ b/release/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 30 12:05:54 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* INSTALL-binary: Don't make stupid claims about avoiding use of
+	cylinder zero.
+
 Mon Jul 29 14:47:53 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* checklist: Add cc to the list of symlinks to check.
diff --git a/release/INSTALL-binary b/release/INSTALL-binary
index b124a98b..730e3656 100644
--- a/release/INSTALL-binary
+++ b/release/INSTALL-binary
@@ -42,8 +42,7 @@ understand how to boot from a Linux ext2fs filesystem, though this is
 expected to change very soon.
 
 Ideally, you should make a new disk, labelling it with the BSD
-`disklabel' command.  Make sure you leave cylinder 0 unused; the A
-partition should start at cylinder 1.
+`disklabel' command.  
 
 Make the A partition large enough to hold the entire Hurd binary
 image, and then some, and make a B partition for swap.  Use newfs to
@@ -401,47 +400,42 @@ C.  Proceed through the NetBSD automated installation script.
 D.  Tell the script that you want to use cylinders, not sectors,
     in specifying sizes.
 
-E.  VERY IMPORTANT: Make the size of your `NetBSD' portion one
-    cylinder less than the total amount listed.  If the script 
-    tells you that you have 3045 cylinders, then say you want the
-    NetBSD portion to be 3044 cylinders long.
+E.  Make the size of your `NetBSD' portion the total amount 
+    that the script has listed, starting at cylinder 0.
 
-F.  VERY IMPORTANT: Tell the script that your `NetBSD' portion
-    should start at cylinder 1.  Not 0.  1.
-
-G.  Then allocate however much disk you want to your root partition
+F.  Then allocate however much disk you want to your root partition
     and to your swap partition.  The root partition must be big
     enough to hold the entire Hurd binary snapshot; it is strongly
     recommended that you make it a fair bit bigger than that.  It is
     quite satisfactory to use only one filesystem partition in the
     Hurd. 
 
-H.  If you specify partitions beyond the root partition and swap,
+G.  If you specify partitions beyond the root partition and swap,
     the script will ask you for a `mount point'.  Type anything you
     like, it won't matter.
 
-I.  Affirm to the over-eagerly questioning script that you really do
+H.  Affirm to the over-eagerly questioning script that you really do
     want to smash your disk.  NetBSD will proceed to create
     filesystems on all the partitions you specified in I.G-H.
 
-J.  When the script says "populating ..." hit ^C.  You are now done
+I.  When the script says "populating ..." hit ^C.  You are now done
     with the script.
     
-K.  cd to /mnt.  For each mount point that was gratuitously created
+J.  cd to /mnt.  For each mount point that was gratuitously created
     in step I.H, say `umount NAME'.  Then say `rm -rf * .*'.  Make
     sure you are really in /mnt.  This will delete whatever NetBSD
     has put on your new partition.
 
-L.  Initialize the network with `ifconfig DEV MY-ADDR'.  DEV was
+K.  Initialize the network with `ifconfig DEV MY-ADDR'.  DEV was
     printed by the kernel when it booted; type `more /kern/msgbuf'
     if you want to see those messages again.  (Sometimes ifconfig
     says that something is "offline".  Ignore it.)
 
-M.  Mount the NFS server partition with the conveniente command
+L.  Mount the NFS server partition with the conveniente command
     `mount SERVER-ADDR:SERVER-DIR /mnt2'.
 
-N.  Copy the Hurd onto your disk with the command 
+M.  Copy the Hurd onto your disk with the command 
     (cd /mnt2; tar cf - .) | (cd mnt; tar xfpv -)
 
-O.  If you haven't done STEP II yet, then do it now; otherwise go on
+N.  If you haven't done STEP II yet, then do it now; otherwise go on
     to STEP III.
diff --git a/utils/ChangeLog b/utils/ChangeLog
index a20f8721..fe4436ff 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jul 30 14:49:48 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* login.c (main/verify_passwd): If government is broken, don't use
+	crypt.
+	* su.c (check_password): Likewise.
+
+	* login.c (main/verify_passwd): Provide correct prototype for
+	crypt. 
+	* su.c (check_password): Likewise.
+
 Mon Jul 29 03:22:07 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* vmstat.c (val_t): Make `long long'.
diff --git a/utils/login.c b/utils/login.c
index b93cbc4e..10762bc8 100644
--- a/utils/login.c
+++ b/utils/login.c
@@ -513,7 +513,7 @@ main(int argc, char *argv[])
   void verify_passwd (const char *name, const char *password,
 		      uid_t id, int is_group)
     {
-      extern char *crypt (const char salt[2], const char *string);
+      extern char *crypt (const char *string, const char salt[2]);
       char *prompt, *unencrypted, *encrypted;
 
       if (!password || !*password
@@ -531,9 +531,13 @@ main(int argc, char *argv[])
 	prompt = "Password:";
 
       unencrypted = getpass (prompt);
+#ifdef government_not_broken
       encrypted = crypt (unencrypted, password);
       /* Paranoia may destroya.  */
       memset (unencrypted, 0, strlen (unencrypted));
+#else
+      encrypted = unencrypted;
+#endif      
 
       if (name)
 	free (prompt);
diff --git a/utils/su.c b/utils/su.c
index 374696b5..6dfe2f59 100644
--- a/utils/su.c
+++ b/utils/su.c
@@ -1,5 +1,5 @@
 /* `su' for GNU Hurd.
-   Copyright (C) 1994, 1995 Free Software Foundation
+   Copyright (C) 1994, 1995, 1996 Free Software Foundation
    Written by Roland McGrath.
 
 This file is part of the GNU Hurd.
@@ -455,7 +455,7 @@ apply_auth_to_pgrp (struct auth *auth, pid_t pgrp)
 int
 check_password (const char *name, const char *password)
 {
-  extern char *crypt (const char salt[2], const char *string);
+  extern char *crypt (const char *string, const char salt[2]);
   char *unencrypted, *encrypted;
   static char *prompt = NULL;
 
@@ -464,8 +464,12 @@ check_password (const char *name, const char *password)
 
   asprintf (&prompt, "%s's Password:", name);
   unencrypted = getpass (prompt);
+#ifdef government_not_broken
   encrypted = crypt (unencrypted, password);
   memset (unencrypted, 0, strlen (unencrypted)); /* Paranoia may destroya.  */
+#else
+  encrypted = unencrypted;
+#endif  
 
   if (!strcmp (encrypted, password))
     return 1;