From 2a85f0cf33f303e091ce6f6bea7b7a072cd81c14 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 15 Jan 2003 22:29:27 +0000 Subject: syncing docs with HEAD (This used to be commit d8fe70c3b4be548244e9d7b7ea533e64232df001) --- docs/docbook/global.ent | 55 ++++++++++++++++++++++++++++++ docs/docbook/manpages/findsmb.1.sgml | 19 ++++++++--- docs/docbook/projdoc/Diagnosis.sgml | 2 +- docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml | 6 ++-- docs/docbook/projdoc/pdb_mysql.sgml | 8 +++++ docs/docbook/projdoc/samba-doc.sgml | 4 +-- 6 files changed, 83 insertions(+), 11 deletions(-) (limited to 'docs/docbook') diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent index d88c489a4a..46745c2773 100644 --- a/docs/docbook/global.ent +++ b/docs/docbook/global.ent @@ -31,3 +31,58 @@ + +-d|--debug=debuglevel + +debuglevel is an integer +from 0 to 10. The default value if this parameter is +not specified is zero. + +The higher this value, the more detail will be +logged to the log files about the activities of the +server. At level 0, only critical errors and serious +warnings will be logged. Level 1 is a reasonable level for +day to day running - it generates a small amount of +information about operations carried out. + +Levels above 1 will generate considerable +amounts of log data, and should only be used when +investigating a problem. Levels above 3 are designed for +use only by developers and generate HUGE amounts of log +data, most of which is extremely cryptic. + +Note that specifying this parameter here will +override the log +level parameter in the +smb.conf(5) file. + +'> + + +-h|--help +Print a summary of command line options. + +'> + + +-s <configuration file> +The file specified contains the +configuration details required by the server. The +information in this file includes server-specific +information such as what printcap file to use, as well +as descriptions of all the services that the server is +to provide. See +smb.conf(5) for more information. +The default configuration file name is determined at +compile time. +'> + + +-v +Prints the version number for +smbd. +'> diff --git a/docs/docbook/manpages/findsmb.1.sgml b/docs/docbook/manpages/findsmb.1.sgml index fb953b9f25..a246b162b1 100644 --- a/docs/docbook/manpages/findsmb.1.sgml +++ b/docs/docbook/manpages/findsmb.1.sgml @@ -39,6 +39,15 @@ OPTIONS + + -r + Controls whether findsmb takes + bugs in Windows95 into account when trying to find a Netbios name + registered of the remote machine. This option is disabled by default + because it is specific to Windows 95 and Windows 95 machines only. + If set, nmblookup + will be called with -B option. + subnet broadcast address Without this option, findsmb @@ -66,15 +75,17 @@ not show any information about the operating system or server version. - The command must be run on a system without The command with -r option + must be run on a system without nmbd running. If nmbd is running on the system, you will only get the IP address and the DNS name of the machine. To get proper responses from Windows 95 and Windows 98 machines, - the command must be run as root. + the command must be run as root and with -r + option on a machine without nmbd running. - For example, running findsmb on a machine - without nmbd running would yield output similar + For example, running findsmb without + -r option set would yield output similar to the following diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml index 8c407375ed..8c1b784433 100644 --- a/docs/docbook/projdoc/Diagnosis.sgml +++ b/docs/docbook/projdoc/Diagnosis.sgml @@ -14,7 +14,7 @@
jelmer@samba.org
- $Id: Diagnosis.sgml,v 1.1.2.3 2002/11/22 00:32:23 tpot Exp $ + Wed Jan 15 Diagnosing your samba server diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml index a66df0c767..f294ddd1ff 100644 --- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml +++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml @@ -2,12 +2,12 @@ - Gerald (Jerry)>Carter + Gerald (Jerry)Carter Samba Team
jerry@samba.org
 - Olivier (lem)>Lemaire + Olivier (lem)Lemaire IDEALX
olem@IDEALX.org
@@ -47,7 +47,7 @@ Two additional Samba resources which may prove to be helpful are - The Samba-PDC-LDAP-HOWTO + The Samba-PDC-LDAP-HOWTO maintained by Ignacio Coupeau. The NT migration scripts from IDEALX that are diff --git a/docs/docbook/projdoc/pdb_mysql.sgml b/docs/docbook/projdoc/pdb_mysql.sgml index 05262ebe10..59a134a15f 100644 --- a/docs/docbook/projdoc/pdb_mysql.sgml +++ b/docs/docbook/projdoc/pdb_mysql.sgml @@ -54,6 +54,14 @@ identifier:mysql port - defaults to 3306 identifier:table - Name of the table containing users + + +WARNING: since the password for the mysql user is stored in the +smb.conf file, you should make the the smb.conf file +readable only to the user that runs samba. This is considered a security +bug and will be fixed soon. + + Names of the columns in this table(I've added column types those columns should have first): diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml index 286749289c..79cf6b20d2 100644 --- a/docs/docbook/projdoc/samba-doc.sgml +++ b/docs/docbook/projdoc/samba-doc.sgml @@ -22,7 +22,6 @@ - @@ -43,7 +42,7 @@ Abstract -Last Update : $Date: 2002/11/22 00:32:23 $ +Last Update : $Date: 2003/01/15 22:29:21 $ @@ -80,7 +79,6 @@ PLEASE read this. &UNIX-INSTALL; &BROWSING; -&oplocks; &BROWSING-Quick; &ENCRYPTION; -- cgit