From df7e8957fd6f1db7b9cb64960b3837909977b1b7 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Thu, 8 Feb 2001 04:12:48 +0000
Subject: [PATCH] * setup2.sgml: Add docs about domain accounts.

---
 winsup/doc/ChangeLog   |  4 ++++
 winsup/doc/setup2.sgml | 28 +++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index cfdb36a9a..fa69921b0 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-07  Eric M. Monsler  <emonsler@beamreachnetworks.com>
+
+	* setup2.sgml: Add docs about domain accounts.
+
 Thu Dec 21 15:03:29 2000  Edward M. Lee <tailbert@yahoo.com>
 
 	* cygwinenv.sgml: Fix typo in <filename>. Add missing </para>.
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index d23044f3a..c3df06ec1 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -83,8 +83,7 @@ above.
 <para> Under Windows NT, if you want to create 
 <filename>/etc/passwd</filename> and <filename>/etc/group</filename> 
 (i.e. so that <command>whoami</command> works and 
-<command>ls -l</command> replaces the UID with a name) just
-do this:
+<command>ls -l</command> replaces the UID with a name) based on the accounts local to the machine, just do this:
 </para>
 
 <screen>
@@ -93,7 +92,30 @@ do this:
 <prompt>/etc$</prompt> <userinput>mkgroup -l > /etc/group</userinput>
 </screen>
 
-<para> Future changes to your NT registry will NOT be reflected in
+<para>If you are logging in based on an NT network domain, and want to
+also create entries in <filename>/etc/passwd</filename> and
+<filename>/etc/group</filename> based on all the accounts in the
+domain, then after creating local entries do this:
+</para>
+
+<screen>
+<prompt>/$</prompt> <userinput>cd /etc</userinput>
+<prompt>/etc$</prompt> <userinput>mkpasswd -d >> /etc/passwd</userinput>
+<prompt>/etc$</prompt> <userinput>mkgroup -d >> /etc/group</userinput>
+</screen>
+
+<para>Alternatively, to add only your account to the passwd file,
+assuming your NT name is "my_ntusername", instead of the above
+<command>mkpasswd</command> you should do:
+</para>
+ 
+<screen>
+<prompt>/$</prompt> <userinput>cd /etc</userinput>
+<prompt>/etc$</prompt> <userinput>mkpasswd -d | grep my_ntusername >> /etc/passwd</userinput>
+</screen>
+
+
+<para> Future changes to your NT registry or network domain will NOT be reflected in
 <filename>/etc/passwd</filename> or <filename>/etc/group </filename> after
 this so you may want to regenerate these files periodically.  Under Windows
 9x, you can create and edit these files with a text editor.  </para>