cvs commit: BLFS/BOOK/server/other/samba samba-config-exp.xml samba-config.xml

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Fri Jan 31 17:04:55 PST 2003


bdubbs      03/01/31 20:04:55

  Modified:    BOOK     index.xml
               BOOK/basicnet/netprogs/tcpwrappers tcpwrappers-config.xml
               BOOK/general/prog/gcc gcc-exp.xml
               BOOK/general/prog/gnat gnat-desc.xml
               BOOK/general/prog/jdk j2sdk-desc.xml
               BOOK/general/prog/librep librep-desc.xml
               BOOK/general/prog/python python-intro.xml
               BOOK/general/sysutils/infozip unzip-desc.xml unzip-exp.xml
                        zip-desc.xml zip-exp.xml
               BOOK/general/sysutils/pkgconfig pkgconfig-desc.xml
               BOOK/gnome/add/docs gnome2-user-docs-desc.xml
               BOOK/gnome/add/utils gnome-utils-desc.xml
                        gnome-utils-intro.xml
               BOOK/introduction/welcome changelog.xml
               BOOK/kde kde.ent
               BOOK/kde/inst kde-libs.xml
               BOOK/multimedia/libdriv arts.xml
               BOOK/multimedia/libdriv/arts arts.ent
               BOOK/server server.ent
               BOOK/server/other other.xml
               BOOK/server/other/samba samba-config-exp.xml
                        samba-config.xml
  Added:       BOOK/server/other openldap.xml
  Log:
  Added openldap and fixed numereous typos
  
  Revision  Changes    Path
  1.144     +1 -1      BLFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/index.xml,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- index.xml	31 Jan 2003 17:36:22 -0000	1.143
  +++ index.xml	1 Feb 2003 01:04:54 -0000	1.144
  @@ -3,7 +3,7 @@
   			"/usr/share/docbook/docbookx.dtd" [
   
   <!ENTITY version "20030131">
  -<!ENTITY releasedate "January 31th, 2003">
  +<!ENTITY releasedate "January 31st, 2003">
   
   <!ENTITY % book SYSTEM "book/book.ent">
   <!ENTITY % preface SYSTEM "preface/preface.ent">
  
  
  
  1.2       +1 -1      BLFS/BOOK/basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml
  
  Index: tcpwrappers-config.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tcpwrappers-config.xml	9 Sep 2002 00:14:30 -0000	1.1
  +++ tcpwrappers-config.xml	1 Feb 2003 01:04:54 -0000	1.2
  @@ -21,7 +21,7 @@
   finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd
   </userinput></screen></para>
   <note><para>The finger server is used as an example here.</para></note>
  -<para>Similar changes must be made if xinted is used, with the
  +<para>Similar changes must be made if xinetd is used, with the
   emphasis being on calling /usr/sbin/tcpd instead of calling the
   service daemon directly, and passing the name of the service daemon to
   tcpd.</para>
  
  
  
  1.5       +1 -1      BLFS/BOOK/general/prog/gcc/gcc-exp.xml
  
  Index: gcc-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/prog/gcc/gcc-exp.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gcc-exp.xml	19 Dec 2002 22:18:08 -0000	1.4
  +++ gcc-exp.xml	1 Feb 2003 01:04:54 -0000	1.5
  @@ -17,7 +17,7 @@
   java.  You can modify this command to remove unwanted languages. If you
   are removing Ada, use the separate installation instructions below.</para>
   
  -<para><userinput>-- enable shared --enable-threads=posix
  +<para><userinput>--enable-shared --enable-threads=posix
   --enable-__cxa_atexit</userinput> : These commands are required to build
   the C++ libraries to published standards.</para>
   
  
  
  
  1.2       +1 -1      BLFS/BOOK/general/prog/gnat/gnat-desc.xml
  
  Index: gnat-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/prog/gnat/gnat-desc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gnat-desc.xml	16 Aug 2002 15:43:44 -0000	1.1
  +++ gnat-desc.xml	1 Feb 2003 01:04:54 -0000	1.2
  @@ -19,7 +19,7 @@
   
   <sect3><title>add2line</title>
   <para>add2line converts the ASCII form of the 2-line orbital elements in
  -a file to binary form and append them to the orbdata files. </para></sect3>
  +a file to binary form and appends them to the orbdata files. </para></sect3>
   
   <sect3><title>gcov</title>
   <para>gcov is a test coverage program.</para></sect3>
  
  
  
  1.2       +2 -2      BLFS/BOOK/general/prog/jdk/j2sdk-desc.xml
  
  Index: j2sdk-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/prog/jdk/j2sdk-desc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- j2sdk-desc.xml	10 Aug 2002 02:42:58 -0000	1.1
  +++ j2sdk-desc.xml	1 Feb 2003 01:04:54 -0000	1.2
  @@ -33,7 +33,7 @@
   <para>jar combines multiple files into a single JAR archive file.</para></sect3>
   
   <sect3><title>jarsigner</title>
  -<para>jarsigner signs JAR (Java ARchive) files and verifys the
  +<para>jarsigner signs JAR (Java ARchive) files and verifies the
   signatures and integrity of a signed JAR.</para></sect3>
   
   <sect3><title>java</title>
  @@ -46,7 +46,7 @@
   programming language, and compiles them into bytecode class files.</para></sect3>
   
   <sect3><title>javadoc</title>
  -<para>javadoc parses the declarations anddocumentation comments in a set
  +<para>javadoc parses the declarations and documentation comments in a set
   of Java source files and produces a corresponding set of HTML pages
   describing the classes, interfaces, constructors, methods, and fields.</para></sect3>
   
  
  
  
  1.3       +1 -1      BLFS/BOOK/general/prog/librep/librep-desc.xml
  
  Index: librep-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/prog/librep/librep-desc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- librep-desc.xml	19 Aug 2002 23:59:31 -0000	1.2
  +++ librep-desc.xml	1 Feb 2003 01:04:54 -0000	1.3
  @@ -12,7 +12,7 @@
   <para>rep is the Lisp interpreter.</para></sect3>
   
   <sect3><title>librep libraries</title>
  -<para>librep libraries contains the functions necessary for the Lisp
  +<para>librep libraries contain the functions necessary for the Lisp
   interpreter.</para></sect3>
   
   </sect2>
  
  
  
  1.4       +1 -1      BLFS/BOOK/general/prog/python/python-intro.xml
  
  Index: python-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/prog/python/python-intro.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- python-intro.xml	2 Oct 2002 23:11:52 -0000	1.3
  +++ python-intro.xml	1 Feb 2003 01:04:55 -0000	1.4
  @@ -7,7 +7,7 @@
   Package size:                   &Python-size;
   Estimated Disk space required:  &Python-buildsize;</screen>
   
  -<para>The Python package contains the python development enviroment.
  +<para>The Python package contains the python development environment.
   This is useful for object-oriented programming, writing scripts,
   prototyping large programs or developing them entirely.</para>
   
  
  
  
  1.3       +1 -1      BLFS/BOOK/general/sysutils/infozip/unzip-desc.xml
  
  Index: unzip-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/sysutils/infozip/unzip-desc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- unzip-desc.xml	21 Jul 2002 15:50:51 -0000	1.2
  +++ unzip-desc.xml	1 Feb 2003 01:04:55 -0000	1.3
  @@ -19,7 +19,7 @@
   
   <sect3><title>unzipfsx</title>
   <para>unzipfsx is the self-extracting stub that can be prepended to a
  -ZIP archive.  Files in this format allow the receipient to decompress
  +ZIP archive.  Files in this format allow the recipient to decompress
   the archive without installing unzip.</para></sect3>
   
   <sect3><title>zipgrep</title>
  
  
  
  1.2       +2 -2      BLFS/BOOK/general/sysutils/infozip/unzip-exp.xml
  
  Index: unzip-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/sysutils/infozip/unzip-exp.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- unzip-exp.xml	7 Jul 2002 20:28:52 -0000	1.1
  +++ unzip-exp.xml	1 Feb 2003 01:04:55 -0000	1.2
  @@ -2,8 +2,8 @@
   <title>Command explanations</title>
   
   <para><userinput>make prefix=/usr linux:</userinput> This command
  -overrides the prefix varible that is set to /usr/local in the Makefile
  -and builds the executibles for a linux system.  The alternatives to
  +overrides the prefix variable that is set to /usr/local in the Makefile
  +and builds the executables for a linux system.  The alternatives to
   'linux' can be seen with a 'make list' command.</para>
   
   </sect2>
  
  
  
  1.2       +1 -1      BLFS/BOOK/general/sysutils/infozip/zip-desc.xml
  
  Index: zip-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/sysutils/infozip/zip-desc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- zip-desc.xml	21 Jul 2002 17:14:58 -0000	1.1
  +++ zip-desc.xml	1 Feb 2003 01:04:55 -0000	1.2
  @@ -16,7 +16,7 @@
   message about how to support encryption by recompiling with zcrypt27.zip.</para></sect3>
   
   <sect3><title>zipnote</title>
  -<para>zipnote read or writes comments stored in a zipfile .</para></sect3>
  +<para>zipnote reads or writes comments stored in a zipfile .</para></sect3>
   
   <sect3><title>zipsplit</title>
   <para>zipsplit is a utility to split zip files into smaller files.</para></sect3>
  
  
  
  1.2       +2 -2      BLFS/BOOK/general/sysutils/infozip/zip-exp.xml
  
  Index: zip-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/sysutils/infozip/zip-exp.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- zip-exp.xml	21 Jul 2002 17:14:58 -0000	1.1
  +++ zip-exp.xml	1 Feb 2003 01:04:55 -0000	1.2
  @@ -2,8 +2,8 @@
   <title>Command explanations</title>
   
   <para><userinput>make prefix=/usr generic_gcc:</userinput> This command
  -overrides the prefix varible that is set to /usr/local in the Makefile
  -and builds the executibles for a linux system.  The alternatives to
  +overrides the prefix variable that is set to /usr/local in the Makefile
  +and builds the executables for a linux system.  The alternatives to
   'generic_gcc' can be seen with a 'make list' command.</para>
   
   </sect2>
  
  
  
  1.3       +1 -1      BLFS/BOOK/general/sysutils/pkgconfig/pkgconfig-desc.xml
  
  Index: pkgconfig-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/general/sysutils/pkgconfig/pkgconfig-desc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pkgconfig-desc.xml	30 Aug 2002 02:10:09 -0000	1.2
  +++ pkgconfig-desc.xml	1 Feb 2003 01:04:55 -0000	1.3
  @@ -8,7 +8,7 @@
   <sect2><title>Description</title>
   
   <sect3><title>pkg-config</title>
  -<para>pkg-config is a function that returns metainformation for the
  +<para>pkg-config is a function that returns meta information for the
   specified library.</para></sect3>
   
   </sect2>
  
  
  
  1.2       +2 -1      BLFS/BOOK/gnome/add/docs/gnome2-user-docs-desc.xml
  
  Index: gnome2-user-docs-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/add/docs/gnome2-user-docs-desc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gnome2-user-docs-desc.xml	20 Sep 2002 03:24:53 -0000	1.1
  +++ gnome2-user-docs-desc.xml	1 Feb 2003 01:04:55 -0000	1.2
  @@ -8,7 +8,8 @@
   <sect2><title>Description</title>
   
   <sect3><title>OMF files</title>
  -<para>OMF files contain user docmumentation.  These include introductions and help on the core packages.</para></sect3>
  +<para>OMF files contain user documentation.  These include introductions and 
  +help on the core packages.</para></sect3>
   
   </sect2>
   
  
  
  
  1.3       +1 -1      BLFS/BOOK/gnome/add/utils/gnome-utils-desc.xml
  
  Index: gnome-utils-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/add/utils/gnome-utils-desc.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gnome-utils-desc.xml	5 Sep 2002 15:57:09 -0000	1.2
  +++ gnome-utils-desc.xml	1 Feb 2003 01:04:55 -0000	1.3
  @@ -18,7 +18,7 @@
   <para>gnome-system-log allows you to monitor and view system log files.</para></sect3>
   
   <sect3><title>gnome-character-map</title>
  -<para>gnome-character-map allows you to select chatacters from a table
  +<para>gnome-character-map allows you to select characters from a table
   and insert them into your applications.</para></sect3>
   
   <sect3><title>gnome-calculator</title>
  
  
  
  1.2       +1 -1      BLFS/BOOK/gnome/add/utils/gnome-utils-intro.xml
  
  Index: gnome-utils-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/add/utils/gnome-utils-intro.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gnome-utils-intro.xml	4 Sep 2002 18:43:06 -0000	1.1
  +++ gnome-utils-intro.xml	1 Feb 2003 01:04:55 -0000	1.2
  @@ -8,7 +8,7 @@
   Estimated Disk space required:  &gnome-utils-buildsize;</screen>
   
   <para>The gnome-utils package contains a collection of small
  -applications designed to make you life a little easier.</para>
  +applications designed to make your life a little easier.</para>
   
   <screen>gnome-utils depends on:
   <xref linkend="libgnomeui"/></screen>
  
  
  
  1.376     +4 -1      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.375
  retrieving revision 1.376
  diff -u -r1.375 -r1.376
  --- changelog.xml	31 Jan 2003 22:19:23 -0000	1.375
  +++ changelog.xml	1 Feb 2003 01:04:55 -0000	1.376
  @@ -10,7 +10,10 @@
   
   <itemizedlist>
   
  -<listitem><para>January 31th, 2003 [tushar]: Add gcc2-2.95.3 libs.
  +<listitem><para>January 31st, 2003 [bdubbs]: Add Openldap.
  +</para></listitem>
  +
  +<listitem><para>January 31th, 2003 [bdubbs]: Fix various types.
   </para></listitem>
   
   <listitem><para>January 30th, 2003 [bdubbs]: removed zlib.
  
  
  
  1.5       +1 -1      BLFS/BOOK/kde/kde.ent
  
  Index: kde.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/kde/kde.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- kde.ent	26 Jan 2003 21:22:35 -0000	1.4
  +++ kde.ent	1 Feb 2003 01:04:55 -0000	1.5
  @@ -42,7 +42,7 @@
   <!ENTITY kdevelop SYSTEM "inst/kdevelop.xml">
   <!ENTITY kdm SYSTEM "inst/kdm.xml">
   
  -<!ENTITY kde-version "3.0.5a">
  +<!ENTITY kde-version "3.1">
   <!ENTITY kde-download "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src">
   <!ENTITY kde-dir "/opt/kde-&kde-version;">
   
  
  
  
  1.5       +15 -6     BLFS/BOOK/kde/inst/kde-libs.xml
  
  Index: kde-libs.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/kde/inst/kde-libs.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- kde-libs.xml	15 Oct 2002 20:38:22 -0000	1.4
  +++ kde-libs.xml	1 Feb 2003 01:04:55 -0000	1.5
  @@ -7,13 +7,22 @@
   Package size:                &kde-libs-size;
   Estimated build time:        62 min (667 MHz)</screen></para>
   
  -<para>kdelibs can use many optional libraries and programs.  The following are 
  -recommended:
  -<screen><xref linkend="openssl"/>, <xref linkend="alsa"/>, <xref linkend="pcre"/>, <xref linkend="libxml2"/>,
  -<xref linkend="libxslt"/>, and cups.</screen></para>
   
  -<para>Other programs and libraries that can be used by kdelibs are:
  -<screen><xref linkend="libfam"/> and <xref linkend="libtiff"/></screen></para>
  +<warning><para>The KDE instructions are being revised.  The instructions should
  +work as described in the following sections, but not all KDE packages
  +have been validated.</para></warning>
  +
  +
  +
  +<para>The following package is required to install kdelibs:
  +<screen><xref linkend="arts"/></screen></para>
  +
  +<para>kdelibs can use many libraries and programs.  The following are recommended:
  +<screen><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref linkend="libxml2"/>,
  +<xref linkend="libxslt"/>, <xref linkend="libfam"/>, and <xref linkend="libart_lgpl"/>.</screen></para>
  +
  +<para>Other optional programs and libraries that can be used by kdelibs are:
  +<screen><xref linkend="cups"/>, <xref linkend="sane"/>, and <xref linkend="openldap"/>.</screen></para>
   
   <para>Install kdelibs with:
   <screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
  
  
  
  1.4       +9 -6      BLFS/BOOK/multimedia/libdriv/arts.xml
  
  Index: arts.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/multimedia/libdriv/arts.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- arts.xml	20 Sep 2002 05:19:15 -0000	1.3
  +++ arts.xml	1 Feb 2003 01:04:55 -0000	1.4
  @@ -13,14 +13,18 @@
   It provides necessary libraries for kdelibs.  The following package is required to install aRts:
   <screen><xref linkend="qt"/></screen></para>
   
  -<para>It will use the following optional packages, if installed:
  +<para>It will use the following recommended packages, if installed:
   <screen><xref linkend="alsa"/>, <xref linkend="audiofile"/>, and <xref linkend="libvorbis"/>.</screen></para>
   
  +<para>Before starting the build, ensure you have the QTDIR environment variable set
  +<screen><userinput>export QTDIR=/opt/qt</userinput></screen></para>
  +
  +
   <para><screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
        --disable-dependency-tracking &&
   make &&
   make install &&
  -ln -sf &kde-dir; /opt/kde</userinput></screen></para>
  +ln -sfn &kde-dir; /opt/kde</userinput></screen></para>
   
   <note><para>Another configure option is <userinput>--enable-final</userinput>. 
   This option can speed up the build process, but requires a lot of memory.  If
  @@ -37,13 +41,12 @@
   </para>
   
   <para><userinput>--disable-dependency-tracking:</userinput> This option speeds
  -up one time builds.
  -</para>
  +up one time builds.</para>
   
  -<para><userinput>ln -s &kde-dir; /opt/kde:</userinput> This command creates
  +<para><userinput>ln -sfn &kde-dir; /opt/kde:</userinput> This command creates
   a link for access to KDE.  If a newer version of KDE is released, the new
   system can be built by changing the <userinput>--prefix</userinput> location
  -and then set up by just changing the link.
  +and then set up by changing the link as this command does.
   </para>
   
   </sect2>
  
  
  
  1.4       +5 -5      BLFS/BOOK/multimedia/libdriv/arts/arts.ent
  
  Index: arts.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/multimedia/libdriv/arts/arts.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- arts.ent	26 Sep 2002 19:59:25 -0000	1.3
  +++ arts.ent	1 Feb 2003 01:04:55 -0000	1.4
  @@ -1,8 +1,8 @@
  -<!ENTITY arts SYSTEM        "../arts.xml">
  -<!ENTITY arts-version       "1.0.3">
  -<!ENTITY arts-download-size " 1   MB">
  -<!ENTITY arts-build-size    "35   MB">
  -<!ENTITY arts-install-size  " 5.7 MB">
  +<!ENTITY arts SYSTEM         "../arts.xml">
  +<!ENTITY arts-version        "1.1">
  +<!ENTITY arts-download-size  "947   KB">
  +<!ENTITY arts-build-size     " 35   MB">
  +<!ENTITY arts-install-size   "  5.7 MB">
   <!ENTITY arts-download-ftp "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src/arts-&arts-version;.tar.bz2">
   <!ENTITY arts-build-time    "11 min (667 MHz)">
   
  
  
  
  1.3       +20 -18    BLFS/BOOK/server/server.ent
  
  Index: server.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/server/server.ent,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- server.ent	26 Aug 2002 03:04:15 -0000	1.2
  +++ server.ent	1 Feb 2003 01:04:55 -0000	1.3
  @@ -2,33 +2,35 @@
   
   <!-- Mail server software -->
   <!ENTITY server-mail SYSTEM "mail/mail.xml">
  -<!ENTITY % postfix SYSTEM "mail/postfix/postfix.ent">
  -<!ENTITY % qmail SYSTEM "mail/qmail/qmail.ent">
  -<!ENTITY % sendmail SYSTEM "mail/sendmail/sendmail.ent">
  -<!ENTITY % exim SYSTEM "mail/exim/exim.ent">
  -<!ENTITY % qpopper SYSTEM "mail/qpopper/qpopper.ent">
  -<!ENTITY % courier SYSTEM "mail/courier/courier.ent">
  +<!ENTITY % postfix   SYSTEM "mail/postfix/postfix.ent">
  +<!ENTITY % qmail     SYSTEM "mail/qmail/qmail.ent">
  +<!ENTITY % sendmail  SYSTEM "mail/sendmail/sendmail.ent">
  +<!ENTITY % exim      SYSTEM "mail/exim/exim.ent">
  +<!ENTITY % qpopper   SYSTEM "mail/qpopper/qpopper.ent">
  +<!ENTITY % courier   SYSTEM "mail/courier/courier.ent">
  +%exim;
   %postfix;
   %qmail;
  -%sendmail;
  -%exim;
   %qpopper;
  +%sendmail;
   %courier;
   
   <!-- Other server software -->
   <!ENTITY server-other SYSTEM "other/other.xml">
  -<!ENTITY % cvsserver SYSTEM "other/cvsserver/cvsserver.ent">
  -<!ENTITY % openssh SYSTEM "other/openssh/openssh.ent">
  -<!ENTITY % bind SYSTEM "other/bind/bind.ent">
  -<!ENTITY % dhcp SYSTEM "other/dhcp/dhcp.ent">
  -<!ENTITY % xinetd SYSTEM "other/xinetd/xinetd.ent">
  -<!ENTITY % leafnode SYSTEM "other/leafnode/leafnode.ent">
  -<!ENTITY % samba SYSTEM "other/samba/samba.ent">
  +<!ENTITY % cvsserver  SYSTEM "other/cvsserver/cvsserver.ent">
  +<!ENTITY % openssh    SYSTEM "other/openssh/openssh.ent">
  +<!ENTITY % bind       SYSTEM "other/bind/bind.ent">
  +<!ENTITY % dhcp       SYSTEM "other/dhcp/dhcp.ent">
  +<!ENTITY % xinetd     SYSTEM "other/xinetd/xinetd.ent">
  +<!ENTITY % leafnode   SYSTEM "other/leafnode/leafnode.ent">
  +<!ENTITY % samba      SYSTEM "other/samba/samba.ent">
  +<!ENTITY % openldap   SYSTEM "other/openldap/openldap.ent">
   
  -%openssh;
  -%cvsserver;
   %bind;
  +%cvsserver;
   %dhcp;
  -%xinetd;
   %leafnode;
  +%openldap;
  +%openssh;
   %samba;
  +%xinetd;
  
  
  
  1.3       +4 -3      BLFS/BOOK/server/other/other.xml
  
  Index: other.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/server/other/other.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- other.xml	26 Aug 2002 03:04:15 -0000	1.2
  +++ other.xml	1 Feb 2003 01:04:55 -0000	1.3
  @@ -2,12 +2,13 @@
   <?dbhtml filename="other.html" dir="server"?>
   <title>Other Server Software</title>
   
  -&openssh;
  -&cvsserver;
   &bind;
  +&cvsserver;
   &dhcp;
  -&xinetd;
   &leafnode;
  +&openssh;
  +&openldap;
   &samba;
  +&xinetd;
   
   </chapter>
  
  
  
  1.1                  BLFS/BOOK/server/other/openldap.xml
  
  Index: openldap.xml
  ===================================================================
  <sect1 id="openldap" xreflabel="openldap-&openldap-version;">
  <?dbhtml filename="openldap.html" dir="server"?>
  <title>openldap-&openldap-version;</title>
  
  &openldap-intro;
  &openldap-inst;
  &openldap-exp;
  &openldap-config;
  &openldap-desc;
  
  </sect1>
  
  
  
  
  1.5       +6 -12     BLFS/BOOK/server/other/samba/samba-config-exp.xml
  
  Index: samba-config-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/server/other/samba/samba-config-exp.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- samba-config-exp.xml	2 Dec 2002 22:58:55 -0000	1.4
  +++ samba-config-exp.xml	1 Feb 2003 01:04:55 -0000	1.5
  @@ -1,7 +1,6 @@
   <sect2>
   <title>Configuration command explanations</title>
  -<para><userinput>
  -cat > /etc/samba/smb.conf << "EOF" :</userinput>
  +<para><userinput>cat > /etc/samba/smb.conf << "EOF" :</userinput>
   Create a default Samba configuration file.  This configuration will
   allow Samba to act as a Primary Domain Controller for a Microsoft
   Windows based network.  If this is not desired, a simpler default
  @@ -12,15 +11,12 @@
   for PDC configuration will be given here.</para>
   
   
  -<para><userinput>
  -cat > /etc/rc.d/init.d/samba << "EOF" :</userinput>
  +<para><userinput>cat > /etc/rc.d/init.d/samba << "EOF" :</userinput>
   Create the Samba boot script, used to start and stop Samba
   automatically on machine startup and shutdown.</para>
   
  -<para><screen><userinput>
  -/usr/sbin/useradd -g 100 -d /dev/null -c \
  -    "Win2k Server" -s /bin/false win2kbox$ :
  -</userinput></screen>
  +<para><screen><userinput>/usr/sbin/useradd -g 100 -d /dev/null -c \
  +    "Win2k Server" -s /bin/false win2kbox$ :</userinput></screen>
   This command creates a machine trust account, necessary only for
   Windows 2000/NT servers to authenticate to our new PDC.  Machine trust
   accounts are not necessary for Win95/98 clients.</para>
  @@ -29,14 +25,12 @@
   <userinput>echo "swat 901/tcp" >> /etc/services :</userinput>
   Register the swat service to run on port 901.</para> 
   
  -<para><userinput>
  -echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" >>
  +<para><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" >>
   /etc/inetd.conf :</userinput> Instruct inetd where to find and how to
   run swat.</para> 
   
   <para>
  -<userinput>
  -ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba, etc. :</userinput>
  +<userinput>ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba, etc. :</userinput>
   Create the Samba boot scripts, used to start and stop Samba
   automatically on machine startup and shutdown.</para>
   </sect2>
  
  
  
  1.8       +19 -42    BLFS/BOOK/server/other/samba/samba-config.xml
  
  Index: samba-config.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/server/other/samba/samba-config.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- samba-config.xml	2 Dec 2002 22:58:55 -0000	1.7
  +++ samba-config.xml	1 Feb 2003 01:04:55 -0000	1.8
  @@ -8,26 +8,20 @@
   Windows 95/98/XP clients can be found in the newly installed
   documentation by pointing a web browser to:</para>
   
  -<para><screen><userinput>
  -file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770
  -.</userinput></screen></para>
  +<para><screen><userinput>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</userinput></screen></para>
   
   <sect3><title>Config files</title>
  -<para><userinput>
  -/etc/samba/smb.conf, /etc/rc.d/init.d/samba </userinput></para>
  +<para><userinput>/etc/samba/smb.conf, /etc/rc.d/init.d/samba </userinput></para>
   
   <para>First we set up some directories needed by Samba:</para>
  -<para><screen><userinput>
  -mkdir /var/lib/samba &&
  +<para><screen><userinput>mkdir /var/lib/samba &&
   mkdir /var/lib/samba/netlogon &&
   mkdir /var/lib/samba/ntprofile &&
   mkdir /var/lib/samba/profiles &&
  -chmod -R 1777 /var/lib/samba
  -</userinput></screen></para>
  +chmod -R 1777 /var/lib/samba</userinput></screen></para>
   
   <para>And the Samba configuration file: </para>
  -<para><screen><userinput>
  -cat > /etc/samba/smb.conf << "EOF"
  +<para><screen><userinput>cat > /etc/samba/smb.conf << "EOF"
   [global]
       netbios name = SAMBABOX
       workgroup = DOMAIN01
  @@ -64,8 +58,7 @@
           path = /home
           read only = no
           public = no
  -EOF
  -</userinput></screen></para>
  +EOF </userinput></screen></para>
   
   <para>Now add the machine trust account for WIN2KBOX:</para>
   <para><screen><userinput>
  @@ -76,8 +69,7 @@
   </userinput></screen></para>
   
   <para>Create the Samba boot script:</para>
  -<para><screen><userinput>
  -cat > /etc/rc.d/init.d/samba << "EOF"
  +<para><screen><userinput>cat > /etc/rc.d/init.d/samba << "EOF"
   #!/bin/bash
   # Begin $rc_base/init.d/samba
   # Based on sysklogd script from LFS-3.1 and earlier.
  @@ -140,9 +132,7 @@
   <para>We have to add the SAMBABOX root account to the Samba user list
   first in order to join WIN2KBOX to the DOMAIN01 domain: </para>
   
  -<para><screen><userinput>
  -smbpasswd -a root
  -</userinput></screen></para>
  +<para><screen><userinput>smbpasswd -a root</userinput></screen></para>
   
   <para>After starting Samba and adding root to the Samba user list, the
   first machine we'll join to DOMAIN01 will be WIN2KBOX, the Windows
  @@ -162,45 +152,35 @@
       dialog box welcoming you to the DOMAIN01 domain.
   9.  Click OK in the reboot reminder dialog box.
   10. Click OK to close the System Properties window.
  -11. Click Yes to reboot WIN2KBOX.
  -</userinput></screen></para></sect3>
  +11. Click Yes to reboot WIN2KBOX.  </userinput></screen></para></sect3>
   
   <sect3><title>Add a new user to the DOMAIN01 domain.</title>
   <para>Before logging on to WIN2KBOX, we will create a new user with
       the following commands:</para>
  -<para><screen><userinput>
  -useradd -m win2kuser01 &&
  +<para><screen><userinput>useradd -m win2kuser01 &&
   passwd win2kuser01 &&
  -smbpasswd -a win2kuser01 
  -</userinput></screen></para></sect3>
  +smbpasswd -a win2kuser01</userinput></screen></para></sect3>
   
   <sect3><title>Logging on to DOMAIN01.</title>
   <para>Now we will log on the the domain as our newly created user as
       follows:</para> 
  -<para><screen><userinput>
  -1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
  +<para><screen><userinput>1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
   2. Enter the win2kuser01 name and password.
  -3. Select DOMAIN01 from the Log on to: combination box and click OK.
  -</userinput></screen></para>
  +3. Select DOMAIN01 from the Log on to: combination box and click OK.</userinput></screen></para>
   
   <para>Add the swat entry to <filename>/etc/services</filename>with the
   following command: </para>
   
  -<para><screen><userinput>
  -echo "swat            901/tcp" >> /etc/services
  -</userinput></screen></para>
  +<para><screen><userinput>echo "swat            901/tcp" >> /etc/services</userinput></screen></para>
   
   <para>If inetd is used, the following command will add the swat entry
   to <filename>/etc/inetd.conf</filename>: </para>
  -<para><screen><userinput>
  -echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
  -    >> /etc/inetd.conf
  -</userinput></screen></para>
  +<para><screen><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
  +    >> /etc/inetd.conf</userinput></screen></para>
   
   <para>If xinetd is used, the following command will add the swat entry
   to <filename>/etc/xinetd.conf</filename>: </para>
  -<para><screen><userinput>
  -cat >> /etc/xinetd.conf << "EOF"
  +<para><screen><userinput>cat >> /etc/xinetd.conf << "EOF"
   service swat
   {
       port            = 901
  @@ -211,14 +191,11 @@
       server          = /usr/sbin/swat
       log_on_failure  += USERID
   }
  -EOF
  -</userinput></screen></para>
  +EOF</userinput></screen></para>
   
   <para>The Samba Web Administration Tool, swat, can be launched with the
   following command on SAMBABOX: </para>
  -<para><screen><userinput>
  -lynx http://localhost:901
  -</userinput></screen></para>
  +<para><screen><userinput>lynx http://localhost:901 </userinput></screen></para>
   <note><para>Be sure inetd is running, and issue a killall -HUP inetd
   before starting swat.</para></note>
   <para>The lynx browser is used in this demonstration, but is not
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe blfs-book' in the subject header of the message



More information about the blfs-book mailing list