From 73e192ff2e79d061ef0053239b3fa74c2469d071 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Sun, 13 Apr 2003 14:11:59 +0000 Subject: Oops - Add another module. --- docs/docbook/projdoc/samba-doc.sgml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml index 3c6028e61cd..d096cb8a5bb 100644 --- a/docs/docbook/projdoc/samba-doc.sgml +++ b/docs/docbook/projdoc/samba-doc.sgml @@ -48,6 +48,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt +&IntroSMB; &UNIX-INSTALL; &BROWSING-Quick; &Passdb; -- cgit From 791a711dd1b54bacba57aa9712654f037b5a6f00 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Apr 2003 14:22:47 +0000 Subject: add entity for Not-Implemented Messages --- docs/docbook/global.ent | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent index 5abcc606d77..c69b72d8a61 100644 --- a/docs/docbook/global.ent +++ b/docs/docbook/global.ent @@ -489,3 +489,5 @@ an Active Directory environment. + +Currently NOT implemented."> -- cgit From e3e2c1b27128f7b5a1f4bbc8093c75b0c12549b4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Apr 2003 15:18:21 +0000 Subject: Some small changes - typos, adding usage for some commands and removing -j because it was not used at all. --- source/utils/net.c | 4 +--- source/utils/net_rap.c | 4 +++- source/utils/net_rpc.c | 4 ++-- source/utils/net_rpc_join.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/utils/net.c b/source/utils/net.c index 3ab34e7aa9a..f8ed590d4b8 100644 --- a/source/utils/net.c +++ b/source/utils/net.c @@ -70,7 +70,6 @@ int opt_maxusers = -1; const char *opt_comment = ""; char *opt_container = "cn=Users"; int opt_flags = -1; -int opt_jobid = 0; int opt_timeout = 0; const char *opt_target_workgroup = NULL; static int opt_machine_pass = 0; @@ -452,7 +451,7 @@ static int net_maxrid(int argc, const char **argv) uint32 rid; if (argc != 0) { - DEBUG(0, ("usage: net initrid\n")); + DEBUG(0, ("usage: net maxrid\n")); return 1; } @@ -524,7 +523,6 @@ static struct functable net_func[] = { {"comment", 'C', POPT_ARG_STRING, &opt_comment}, {"maxusers", 'M', POPT_ARG_INT, &opt_maxusers}, {"flags", 'F', POPT_ARG_INT, &opt_flags}, - {"jobid", 'j', POPT_ARG_INT, &opt_jobid}, {"long", 'l', POPT_ARG_NONE, &opt_long_list_entries}, {"reboot", 'r', POPT_ARG_NONE, &opt_reboot}, {"force", 'f', POPT_ARG_NONE, &opt_force}, diff --git a/source/utils/net_rap.c b/source/utils/net_rap.c index f52eabf494e..6e691a1f60a 100644 --- a/source/utils/net_rap.c +++ b/source/utils/net_rap.c @@ -260,6 +260,9 @@ int net_rap_session_usage(int argc, const char **argv) "\tor"\ "\nnet rap session CLOSE [misc. options] [targets]"\ "\n\tDeletes (closes) a session from specified client to server\n"); + d_printf( + "\nnet rap session INFO "\ + "\n\tEnumerates all open files in specified session\n"); net_common_flags_usage(argc, argv); return -1; @@ -460,7 +463,6 @@ int net_rap_printq_usage(int argc, const char **argv) "\tprinter queue if no job number is specified\n"); net_common_flags_usage(argc, argv); - d_printf("\t-j or --jobid=\t\tjob id\n"); return -1; } diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c index 69cf28f9956..863d420ff3f 100644 --- a/source/utils/net_rpc.c +++ b/source/utils/net_rpc.c @@ -220,7 +220,7 @@ static int rpc_changetrustpw(int argc, const char **argv) * * This uses 'machinename' as the inital password, and changes it. * - * The password should be created with 'server manager' or eqiv first. + * The password should be created with 'server manager' or equiv first. * * All parameters are provided by the run_rpc_command function, except for * argc, argv which are passes through. @@ -332,7 +332,7 @@ int net_rpc_join(int argc, const char **argv) * display info about a rpc domain * * All parameters are provided by the run_rpc_command function, except for - * argc, argv which are passes through. + * argc, argv which are passed through. * * @param domain_sid The domain sid acquired from the remote server * @param cli A cli_state connected to the server. diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c index b0eb3359869..e2fd9aa4341 100644 --- a/source/utils/net_rpc_join.c +++ b/source/utils/net_rpc_join.c @@ -63,7 +63,7 @@ int net_rpc_join_ok(const char *domain) if (!secrets_fetch_trust_account_password(domain, stored_md4_trust_password, NULL)) { - DEBUG(0,("Could not reterive domain trust secret")); + DEBUG(0,("Could not retreive domain trust secret")); goto done; } -- cgit From 1e6e90ec67785add4b36b15291e315f38702f74b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Apr 2003 15:45:17 +0000 Subject: Finish documentation on net! --- docs/docbook/manpages/net.8.sgml | 833 +++++++++++++++++++++++++++++---------- 1 file changed, 633 insertions(+), 200 deletions(-) diff --git a/docs/docbook/manpages/net.8.sgml b/docs/docbook/manpages/net.8.sgml index 62cee8c1d72..f4f75d0c883 100644 --- a/docs/docbook/manpages/net.8.sgml +++ b/docs/docbook/manpages/net.8.sgml @@ -1,4 +1,40 @@ - + %globalentities; + + + +-F flags + +FIXME. Defaults to 0x21 + +'> + + + +-r + +Reboot after shutdown. + + + + +-f + +Force shutting down all applications. + + + + +-t timeout + +Timeout before system will be shut down. An interactive +user of the system can use this time to cancel the shutdown. + +'> +]> + @@ -10,7 +46,8 @@ net Tool for administration of Samba and remote - CIFS servers. + CIFS servers. + @@ -26,14 +63,7 @@ -n myname -s conffile -S server - -C comment - -M maxusers - -F flags - -j jobid -l - -r - -f - -t timeout -P -D debuglevel @@ -46,7 +76,13 @@ 7 suite. The samba net utility is meant to work just like the net utility - available for windows and DOS. + available for windows and DOS. The first argument should be used + to specify the protocol to use when executing a certain command. + ADS is used for ActiveDirectory, RAP is using for old (Win9x/NT3) + clients and RPC can be used for NT4 and Windows 2000. If this + argument is omitted, net will try to determine it automatically. + Not all commands are available on all protocols. + @@ -54,13 +90,7 @@ OPTIONS - - -h - - Display summary of all available options. - - - + &stdarg.help; -w target-workgroup @@ -88,30 +118,21 @@ -I ip-address IP address of target server to use. You have to - specify either this option or a target workgroup or a target server. + specify either this option or a target workgroup or + a target server. -p port - Port on the target server to connect to. + Port on the target server to connect to (usually 139 or 445). + Defaults to trying 445 first, then 139. - - -n myname - - Sets name of the client. - - - - - -s conffile - - Specify alternative configuration file that should be loaded. - - + &stdarg.netbios.name; + &stdarg.configfile; -S server @@ -121,59 +142,10 @@ - - -C comment - - FIXME - - - - - -M maxusers - - FIXME - - - - - -F flags - - FIXME - - - - - -j jobid - - FIXME - - - -l - FIXME - - - - - -r - - FIXME - - - - - -f - - FIXME - - - - - -t timeout - - FIXME + When listing data, give more information on each item. @@ -184,147 +156,610 @@ - - -D debuglevel - set the debuglevel. Debug level 0 is the lowest - and 100 being the highest. This should be set to 100 if you are - planning on submitting a bug report to the Samba team (see - BUGS.txt). - - + &stdarg.debug; - +COMMANDS + + TIME The NET TIME command allows you to view the time on a remote server or synchronise the time on the local server with the time on the remote server. - - - - - Without any options, the NET TIME command - displays the time on the remote server. - - + +TIME - - SYSTEM - - Displays the time on the remote server in a format ready for /bin/date - - +Without any options, the NET TIME command +displays the time on the remote server. + - - SET - - Tries to set the date and time of the local server to that on - the remote server using /bin/date. - - + - - ZONE - - Displays the timezone in hours from GMT on the remote computer. - - - - + +TIME SYSTEM - - RPC + Displays the time on the remote server in a format ready for /bin/date - The NET RPC command allows you to do various - NT4 operations. + - - - JOIN -U username[%password] [options] - - Join a domain with specified username and password. Password - will be prompted if none is specified. - - + +TIME SET +Tries to set the date and time of the local server to that on +the remote server using /bin/date. - - JOIN [options except -U] - - to join a domain created in server manager - - + - - USER [misc. options] [targets] - - List users - - + +TIME ZONE - - USER DELETE <name> [misc options] - - delete specified user - - +Displays the timezone in hours from GMT on the remote computer. - - USER INFO <name> [misc options] - - list the domain groups of the specified user - - + + - - USER ADD <name> [password] [-F user flags] [misc. options] - - Add specified user - - + +[RPC|ADS] JOIN [OLDSTYLE] [-U username[%password]] [options] - - GROUP [misc options] [targets] - - List user groups - - + +Join a domain with specified username and password. Password +will be prompted if none is specified. If no +user name is specified, a domain created in server manager +can be joined. + - - GROUP DELETE <name> [misc. options] [targets] - - Delete specified group - - +Specify [OLDSTYLE] to join the domain using the old +style of domain joining - you need to create a trust +account in server manager first. + + + +[RPC|ADS] USER - - GROUP ADD <name> [-C comment] - - Create specified group - - + +[RPC|ADS] USER DELETE <replaceable>target</replaceable> - - SHARE [misc. options] [targets] - - enumerates all exported resources (network shares) on target server - - +Delete specified user - - SHARE ADD <name=serverpath> [misc. options] [targets] - - Adds a share from a server (makes the export active) - - + + + +[RPC|ADS] USER LIST + +List all users + + + + +[RPC|ADS] USER INFO <replaceable>target</replaceable> + +List the domain groups of a the specified user. + + + + +[RPC|ADS] USER ADD <replaceable>name</replaceable> [password] [-F user flags] [-C comment] + +Add specified user. + + + + +[RPC|ADS] GROUP + + +[RPC|ADS] GROUP [misc options] [targets] +List user groups. + + + +[RPC|ADS] GROUP DELETE <replaceable>name</replaceable> [misc. options] + +Delete specified group. + + + + +[RPC|ADS] GROUP ADD <replaceable>name</replaceable> [-C comment] + +Create specified group. + + + + + +[RAP|RPC] SHARE + + +[RAP|RPC] SHARE [misc. options] [targets] + +Enumerates all exported resources (network shares) on target server. + + + + +[RAP|RPC] SHARE ADD <replaceable>name=serverpath</replaceable> [-C comment] [-M maxusers] [targets] + +Adds a share from a server (makes the export active). Maxusers +specifies the number of users that can be connected to the +share simultaneously. + + + + +SHARE DELETE <replaceable>sharenam</replaceable> + +Delete specified share. + + + + +[RPC|RAP] FILE + + +[RPC|RAP] FILE + +List all open files on remote server. + + + + +[RPC|RAP] FILE CLOSE <replaceable>fileid</replaceable> + +Close file with specified fileid on +remote server. + + + + +[RPC|RAP] FILE INFO <replaceable>fileid</replaceable> + + +Print information on specified fileid. +Currently listed are: file-id, username, locks, path, permissions. + + + + + +[RAP|RPC] FILE USER + +¬.implemented; + + + + + + +SESSION + + +RAP SESSION + +Without any other options, SESSION enumerates all active SMB/CIFS +sessions on the target server. + + + + +RAP SESSION DELETE|CLOSE <replaceable>CLIENT_NAME</replaceable> + +Close the specified sessions. + + + + +RAP SESSION INFO <replaceable>CLIENT_NAME</replaceable> + +Give a list with all the open files in specified session. + + + + + + +RAP SERVER <replaceable>DOMAIN</replaceable> + +List all servers in specified domain or workgroup. Defaults +to local domain. + + + + +RAP DOMAIN + +Lists all domains and workgroups visible on the +current network. + + + + +RAP PRINTQ + + +RAP PRINTQ LIST <replaceable>QUEUE_NAME</replaceable> + +Lists the specified print queue and print jobs on the server. +If the QUEUE_NAME is omitted, all +queues are listed. + + + + +RAP PRINTQ DELETE <replaceable>JOBID</replaceable> + +Delete job with specified id. + + + + + + +RAP VALIDATE <replaceable>user</replaceable> [<replaceable>password</replaceable>] + + +Validate whether the specified user can log in to the +remote server. If the password is not specified on the commandline, it +will be prompted. + + +¬.implemented; + + + + +RAP GROUPMEMBER + + +RAP GROUPMEMBER LIST <replaceable>GROUP</replaceable> + +List all members of the specified group. + + + + +RAP GROUPMEMBER DELETE <replaceable>GROUP</replaceable> <replaceable>USER</replaceable> + +Delete member from group. + + + + +RAP GROUPMEMBER ADD <replaceable>GROUP</replaceable> <replaceable>USER</replaceable> + +Add member to group. + + + + + + +RAP ADMIN <replaceable>command</replaceable> + +Execute the specified command on +the remote server. Only works with OS/2 servers. + + +¬.implemented; + + + + +RAP SERVICE + + +RAP SERVICE START <replaceable>NAME</replaceable> [arguments...] + +Start the specified service on the remote server. Not implemented yet. + +¬.implemented; + + + + +RAP SERVICE STOP + +Stop the specified service on the remote server. + +¬.implemented; + + + + + + +RAP PASSWORD <replaceable>USER</replaceable> <replaceable>OLDPASS</replaceable> <replaceable>NEWPASS</replaceable> + + +Change password of USER from OLDPASS to NEWPASS. + + + + + +LOOKUP + + +LOOKUP HOST <replaceable>HOSTNAME</replaceable> [<replaceable>TYPE</replaceable>] + + +Lookup the IP address of the given host with the specified type (netbios suffix). +The type defaults to 0x20 (workstation). + + + + + +LOOKUP LDAP [<replaceable>DOMAIN</replaceable> + +Give IP address of LDAP server of specified DOMAIN. Defaults to local domain. + + + + +LOOKUP KDC [<replaceable>REALM</replaceable>] + +Give IP address of KDC for the specified REALM. +Defaults to local realm. + + + + +LOOKUP DC [<replaceable>DOMAIN</replaceable>] + +Give IP's of Domain Controllers for specified +DOMAIN. Defaults to local domain. + + + + +LOOKUP MASTER <replaceable>DOMAIN</replaceable> + +Give IP of master browser for specified DOMAIN +or workgroup. Defaults to local domain. + + + + + + +CACHE + +Interface to samba's internal gencache functions. For debugging +purposes only. + + + + + + +GETLOCALSID [DOMAIN] + +Print the SID of the specified domain, or if the parameter is +omitted, the SID of the domain the local server is in. + + + + +SETLOCALSID S-1-5-21-x-y-z + +Sets domain sid for the local server to the specified SID. + + + + +MAXRID + +Prints out the highest RID currently in use on the local +server (by the active 'passdb backend'). + + + + + +RPC INFO + +Print information about the domain of the remote server, +such as domain name, domain sid and number of users and groups. + + + + + +[RPC|ADS] TESTJOIN + +Check whether participation in a domain is still valid. + + + + +[RPC|ADS] CHANGETRUSTPW + +Force change of domain trust password. + + + + +RPC TRUSTDOM + + +RPC TRUSTDOM ADD <replaceable>DOMAIN</replaceable> + +Add a interdomain trust account for +DOMAIN to the remote server. + + + + + +RPC TRUSTDOM DEL <replaceable>DOMAIM</replaceable> + +Remove interdomain trust account for +DOMAIN from the remote server. + + +¬.implemented; + + + + +RPC TRUSTDOM ESTABLISH <replaceable>DOMAIN</replaceable> + + +Establish a trust relationship to a trusting domain. +Interdomain account must already be created on the remote PDC. + + + + + +RPC TRUSTDOM REVOKE <replaceable>DOMAIN</replaceable> +Abandon relationship to trusted domain + + + + +RPC TRUSTDOM LIST + +List all current interdomain trust relationships. + + + + + + +RPC ABORTSHUTDOWN + +Abort the shutdown of a remote server. + + + + +SHUTDOWN [-t timeout] [-r] [-f] [-C message] + +Shut down the remote server. + + +&net.arg.shutdown; + +-C message +Display the specified message on the screen to +announce the shutdown. + + + + + + +SAMDUMP + +Print out sam database of remote server. You need +to run this on either a BDC. + + + +VAMPIRE + +Export users, aliases and groups from remote server to +local server. Can only be run an a BDC. + + + + + +GETSID + +Fetch domain SID and store it in the local secrets.tdb. + + + + +ADS LEAVE + +Make the remote host leave the domain it is part of. + + + + +ADS STATUS + +Print out status of machine account of the local machine in ADS. +Prints out quite some debug info. Aimed at developers, regular +users should use NET ADS TESTJOIN. + + + + +ADS PRINTER + + +ADS PRINTER INFO [<replaceable>PRINTER</replaceable>] [<replaceable>SERVER</replaceable>] + + +Lookup info for PRINTER on SERVER. The printer name defaults to "*", the +server name defaults to the local host. + + + + +ADS PRINTER PUBLISH <replaceable>PRINTER</replaceable> + +Publish specified printer using ADS. + + + + +ADS PRINTER REMOVE <replaceable>PRINTER</replaceable> + +Remove specified printer from ADS directory. + + + + + + +ADS SEARCH <replaceable>EXPRESSION</replaceable> <replaceable>ATTRIBUTES...</replaceable> + +Perform a raw LDAP search on a ADS server and dump the results. The +expression is a standard LDAP search expression, and the +attributes are a list of LDAP fields to show in the results. + +Example: net ads search '(objectCategory=group)' sAMAccountName + + + + + +ADS DN <replaceable>DN</replaceable> <replaceable>(attributes)</replaceable> + + +Perform a raw LDAP search on a ADS server and dump the results. The +DN standard LDAP DN, and the attributes are a list of LDAP fields +to show in the result. + + +Example: net ads dn 'CN=administrator,CN=Users,DC=my,DC=domain' SAMAccountName + + + + +WORKGROUP + +Print out workgroup name for specified kerberos realm. + + + + + +HELP [COMMAND] + +Gives usage information for the specified command. + + - - SHARE DELETE <sharenam - - - @@ -342,9 +777,7 @@ by the Samba Team as an Open Source project similar to the way the Linux kernel is developed. - The original Samba man pages were written by Karl Auer. - The current set of manpages and documentation is maintained - by the Samba Team in the same fashion as the Samba source code. + The net manpage was written by Jelmer Vernooij. -- cgit From ee482214efd06161726c2139008855cf046d7dd4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Apr 2003 16:27:10 +0000 Subject: update to list all current manpages --- docs/docbook/manpages/samba.7.sgml | 138 +++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/docs/docbook/manpages/samba.7.sgml b/docs/docbook/manpages/samba.7.sgml index a352a6a7c66..c5b5f13174f 100644 --- a/docs/docbook/manpages/samba.7.sgml +++ b/docs/docbook/manpages/samba.7.sgml @@ -118,6 +118,144 @@ + + smbcacls + 1 + The smbcacls command is + a tool to set ACL's on remote CIFS servers. + + + + + smbsh + 1 + The smbsh command is + a program that allows you to run a unix shell with + with an overloaded VFS. + + + + smbtree + 1 + The smbtree command + is a text-based network neighborhood tool. + + + + smbtar + 1 + The smbtar can make + backups of data on CIFS/SMB servers. + + + + smbspool + 8 + smbspool is a + helper utility for printing on printers connected + to CIFS servers. + + + + smbcontrol + 1 + smbcontrol is a utility + that can change the behaviour of running samba daemons. + + + + + rpcclient + 1 + rpcclient is a utility + that can be used to execute RPC commands on remote + CIFS servers. + + + + pdbedit + 8 + The pdbedit command + can be used to maintain the local user database on + a samba server. + + + findsmb + 1 + The findsmb command + can be used to find SMB servers on the local network. + + + + net + 8 + The net command + is supposed to work similar to the DOS/Windows + NET.EXE command. + + + + swat + 8 + swat is a web-based + interface to configuring smb.conf. + + + + + winbindd + 8 + winbindd is a daemon + that is used for integrating authentication and + the user database into unix. + + + + wbinfo + 1 + wbinfo is a utility + that retrieves and stores information related to winbind. + + + + + editreg + 1 + editreg is a command-line + utility that can edit windows registry files. + + + + + profiles + 1 + profiles is a command-line + utility that can be used to replace all occurences of + a certain SID with another SID. + + + + + vfstest + 1 + vfstest is a utility + that can be used to test vfs modules. + + + + ntlm_auth + 1 + ntlm_auth is a helper-utility + for external programs wanting to do NTLM-authentication. + + + + smbmount + 8, smbumount8, smbmount8 + smbmount,smbmnt and smbmnt are commands that can be used to + mount CIFS/SMB shares on Linux. + + -- cgit From c5905e34a1f00bacd06b8ecd8f9cb4b387abc260 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 13 Apr 2003 16:29:51 +0000 Subject: net and samba are documented now --- docs/docs-status | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/docs-status b/docs/docs-status index 282caab9cd9..706f06bbe82 100644 --- a/docs/docs-status +++ b/docs/docs-status @@ -3,12 +3,8 @@ If you'd like to work on any of these, please contact jerry@samba.org or jelmer@ Outdated docs: Manifest - this should be updated -docs/announce - out of date (announces 2.2.0) - should it go away? +docs/announce - out of date (announces 2.2.0) - this should be updated -docs/docbook/manpages/net.8.sgml - Still not finished - - this is in hand by Jelmer -docs/docbook/manpages/samba.7.sgml - Listing of samba programs is not complete - - this is in hand by Jelmer docs/docbook/manpages/smb.conf.5.sgml - 'restrict anonymous' isn't documented properly - this should be updated docs/docbook/projdoc/Integrating-with-Windows.sgml - Should slowly go a way. Contains a little bit information about wins, a little bit about domain membership, a little about winbind, etc @@ -31,8 +27,6 @@ docs/docbook/projdoc/upgrading-to-3.0.sgml - not finished yet - this should be updated docs/textdocs/CUPS-PrintingInfo.txt - needs to be converted to sgml - Kurt Pfeifle - this is in hand by Kurt/jht -docs/textdocs/README.jis - Seems to need updating - possibly obsoleted by a newer japanese howto? - - not yet reviewed - needs attention docs/docbook/manpages/ntlm_auth.1.sgml - Is very basic at the moment, parameters need better descriptions - abartlet - this is in hand by Andrew Bartlett -- cgit From e9beb6cc95b83958af4fe4fce292f831304ae8a4 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 00:41:44 +0000 Subject: Remove duplicate forward reference of smb_ldap_privates. --- source/include/includes.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/include/includes.h b/source/include/includes.h index 61aee975c0f..9f86f08c1e1 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -858,8 +858,6 @@ struct printjob; struct smb_ldap_privates; -struct smb_ldap_privates; - /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H #include "proto.h" -- cgit From 29c6d2f61cd3f7fb09913cf918b416aebecaf5ad Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 01:41:53 +0000 Subject: Multi-line string constants have been deprecated in newer versions of gcc. Found by Guenther Deschner. --- source/tdb/tdbtool.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/source/tdb/tdbtool.c b/source/tdb/tdbtool.c index f5e486be145..221ef4a5f2c 100644 --- a/source/tdb/tdbtool.c +++ b/source/tdb/tdbtool.c @@ -111,23 +111,23 @@ static void print_data(unsigned char *buf,int len) static void help(void) { - printf(" -tdbtool: - create dbname : create a database - open dbname : open an existing database - erase : erase the database - dump : dump the database as strings - insert key data : insert a record - store key data : store a record (replace) - show key : show a record by key - delete key : delete a record by key - list : print the database hash table and freelist - free : print the database freelist - 1 | first : print the first record - n | next : print the next record - q | quit : terminate - \\n : repeat 'next' command -"); + printf("\n" +"tdbtool: \n" +" create dbname : create a database\n" +" open dbname : open an existing database\n" +" erase : erase the database\n" +" dump : dump the database as strings\n" +" insert key data : insert a record\n" +" store key data : store a record (replace)\n" +" show key : show a record by key\n" +" delete key : delete a record by key\n" +" list : print the database hash table and freelist\n" +" free : print the database freelist\n" +" 1 | first : print the first record\n" +" n | next : print the next record\n" +" q | quit : terminate\n" +" \\n : repeat 'next' command\n" +"\n"); } static void terror(char *why) -- cgit From a0033cc83c837bc075dd689fdf7a69a6aa4ecd18 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 04:55:49 +0000 Subject: Doc. Add additional test case for a bug recently found in rsync by Paul Green. Appparently it was fixed here a while ago. --- source/lib/snprintf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source/lib/snprintf.c b/source/lib/snprintf.c index 1eae2f09b9b..81e4866cc5f 100644 --- a/source/lib/snprintf.c +++ b/source/lib/snprintf.c @@ -1,3 +1,7 @@ +/* + * NOTE: If you change this file, please merge it into rsync, samba, etc. + */ + /* * Copyright Patrick Powell 1995 * This code is based on code written by Patrick Powell (papowell@astart.com) @@ -61,6 +65,9 @@ #define NULL 0 #endif +/* TODO: Perhaps always include config.h, but strip out the macros for + * snprintf() etc when in test mode? */ + #ifdef TEST_SNPRINTF /* need math library headers for testing */ #include #endif @@ -866,8 +873,9 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) "-16.16f", NULL }; + /* XXX: What does "0203.9" even mean? An octal floating point number??? */ double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, - 0.9996, 1.996, 4.136, 5.030201, 0}; + 0.9996, 1.996, 4.136, 5.030201, 0, 0.00205}; char *int_fmt[] = { "%-1.5d", "%1.5d", -- cgit From a0d841a59ea745bf48b0d705ad6c81e4172552ea Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 05:00:00 +0000 Subject: Merge test cases from rsync. --- source/lib/snprintf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/lib/snprintf.c b/source/lib/snprintf.c index 81e4866cc5f..034e6466d63 100644 --- a/source/lib/snprintf.c +++ b/source/lib/snprintf.c @@ -873,9 +873,9 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) "-16.16f", NULL }; - /* XXX: What does "0203.9" even mean? An octal floating point number??? */ - double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, - 0.9996, 1.996, 4.136, 5.030201, 0, 0.00205}; + double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 203.9, 0.96, 0.996, + 0.9996, 1.996, 4.136, 5.030201, 0.00205, + /* END LIST */ 0}; char *int_fmt[] = { "%-1.5d", "%1.5d", -- cgit From 0f3c2bfbd2de0e759e3083afabee0538528d7a65 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 05:02:55 +0000 Subject: Add selected parts of the changelog to this file, to make merging into other projects easier. --- source/lib/snprintf.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/source/lib/snprintf.c b/source/lib/snprintf.c index 034e6466d63..8bdf014faae 100644 --- a/source/lib/snprintf.c +++ b/source/lib/snprintf.c @@ -57,6 +57,27 @@ * got rid of fcvt code (twas buggy and made testing harder) * added C99 semantics * + * date: 2002/12/19 19:56:31; author: herb; state: Exp; lines: +2 -0 + * actually print args for %g and %e + * + * date: 2002/06/03 13:37:52; author: jmcd; state: Exp; lines: +8 -0 + * Since includes.h isn't included here, VA_COPY has to be defined here. I don't + * see any include file that is guaranteed to be here, so I'm defining it + * locally. Fixes AIX and Solaris builds. + * + * date: 2002/06/03 03:07:24; author: tridge; state: Exp; lines: +5 -13 + * put the ifdef for HAVE_VA_COPY in one place rather than in lots of + * functions + * + * date: 2002/05/17 14:51:22; author: jmcd; state: Exp; lines: +21 -4 + * Fix usage of va_list passed as an arg. Use __va_copy before using it + * when it exists. + * + * date: 2002/04/16 22:38:04; author: idra; state: Exp; lines: +20 -14 + * Fix incorrect zpadlen handling in fmtfp. + * Thanks to Ollie Oldham for spotting it. + * few mods to make it easier to compile the tests. + * addedd the "Ollie" test to the floating point ones. **************************************************************/ #ifndef NO_CONFIG_H /* for some tests */ -- cgit From a4704754d912e1f704f574b733257bbcb3976141 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:12:53 +0000 Subject: Fixed incorrect argument to debug. --- source/rpc_client/cli_netlogon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c index ae76e46c6d7..61d4b597231 100644 --- a/source/rpc_client/cli_netlogon.c +++ b/source/rpc_client/cli_netlogon.c @@ -99,7 +99,7 @@ NTSTATUS cli_net_auth2(struct cli_state *cli, DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n", cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname(), - credstr(cli->clnt_cred.challenge.data), neg_flags)); + credstr(cli->clnt_cred.challenge.data), *neg_flags)); /* store the parameters */ init_q_auth_2(&q, cli->srv_name_slash, cli->mach_acct, -- cgit From 27a608d6a337e772dce114d73e45f6d0bf3148b4 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:13:15 +0000 Subject: Removed unused variables. --- source/rpc_client/cli_pipe.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c index c4a9b37127e..93c6b98bc36 100644 --- a/source/rpc_client/cli_pipe.c +++ b/source/rpc_client/cli_pipe.c @@ -1016,8 +1016,6 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num, static const uchar netsec_sig[8] = NETSEC_SIGNATURE; static const uchar nullbytes[8] = { 0,0,0,0,0,0,0,0 }; uchar sign[8]; - BOOL ret; - int i; prs_struct netsec_blob; memset(sign, 0, sizeof(sign)); -- cgit From dc95726cbe5e3408f843f8d51ee8536f0fd6c458 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:15:46 +0000 Subject: Add PAC_DATA as valid return type for make proto. --- source/script/mkproto.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/script/mkproto.awk b/source/script/mkproto.awk index 9acdf374f1f..919ae2aa7e6 100644 --- a/source/script/mkproto.awk +++ b/source/script/mkproto.awk @@ -142,7 +142,7 @@ END { gotstart = 1; } - if( $0 ~ /^SAM_ACCT_INFO_NODE|^SMB_ACL_T|^ADS_MODLIST|^PyObject|^SORTED_TREE|^REGISTRY_HOOK|^REGISTRY_VALUE|^DEVICEMODE/ ) { + if( $0 ~ /^SAM_ACCT_INFO_NODE|^SMB_ACL_T|^ADS_MODLIST|^PyObject|^SORTED_TREE|^REGISTRY_HOOK|^REGISTRY_VALUE|^DEVICEMODE|^PAC_DATA/ ) { gotstart = 1; } -- cgit From eeeae14fed62ad9d15f2c5a8fa9357da4bb7b3a1 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:16:14 +0000 Subject: decode_pac_data() needs a talloc ctx as an argument. --- source/libads/kerberos_verify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libads/kerberos_verify.c b/source/libads/kerberos_verify.c index 56ec33b0a6f..6a50137400f 100644 --- a/source/libads/kerberos_verify.c +++ b/source/libads/kerberos_verify.c @@ -150,7 +150,7 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket, { TALLOC_CTX *ctx = talloc_init("pac data"); - decode_pac_data(auth_data); + decode_pac_data(auth_data, ctx); talloc_destroy(ctx); } -- cgit From 95f4b5828862155407069fc4dc1b879b45588ded Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 05:16:47 +0000 Subject: Remove SAFE_FREE() definition, which is not needed in this file. In TEST_SNPRINTF mode, always compile all the functions in this file even if they're normally available on this system. Fix typo in comment. --- source/lib/snprintf.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/source/lib/snprintf.c b/source/lib/snprintf.c index 8bdf014faae..588e9cf6cb0 100644 --- a/source/lib/snprintf.c +++ b/source/lib/snprintf.c @@ -78,20 +78,30 @@ * Thanks to Ollie Oldham for spotting it. * few mods to make it easier to compile the tests. * addedd the "Ollie" test to the floating point ones. + * + * Martin Pool (mbp@samba.org) April 2003 + * Remove NO_CONFIG_H so that the test case can be built within a source + * tree with less trouble. + * Remove unnecessary SAFE_FREE() definition. **************************************************************/ -#ifndef NO_CONFIG_H /* for some tests */ +#ifndef NO_CONFIG_H #include "config.h" #else #define NULL 0 -#endif - -/* TODO: Perhaps always include config.h, but strip out the macros for - * snprintf() etc when in test mode? */ +#endif #ifdef TEST_SNPRINTF /* need math library headers for testing */ -#include -#endif + +/* In test mode, we pretend that this system doesn't have any snprintf + * functions, regardless of what config.h says. */ +# undef HAVE_SNPRINTF +# undef HAVE_VSNPRINTF +# undef HAVE_C99_VSNPRINTF +# undef HAVE_ASPRINTF +# undef HAVE_VASPRINTF +# include +#endif /* TEST_SNPRINTF */ #ifdef HAVE_STRING_H #include @@ -128,11 +138,6 @@ #define LLONG long #endif -/* free memory if the pointer is valid and zero the pointer */ -#ifndef SAFE_FREE -#define SAFE_FREE(x) do { if ((x) != NULL) {free((x)); (x)=NULL;} } while(0) -#endif - #ifndef VA_COPY #ifdef HAVE_VA_COPY #define VA_COPY(dest, src) __va_copy(dest, src) @@ -1004,4 +1009,4 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) return 0; } -#endif /* SNPRINTF_TEST */ +#endif /* TEST_SNPRINTF */ -- cgit From 117cc35dd0adc6fd5238a440e299d012bfd8e542 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:22:17 +0000 Subject: Removed unused variable. --- source/nsswitch/winbindd_idmap_ldap.c | 2 -- source/rpcclient/cmd_netlogon.c | 1 - 2 files changed, 3 deletions(-) diff --git a/source/nsswitch/winbindd_idmap_ldap.c b/source/nsswitch/winbindd_idmap_ldap.c index 7ffddf9ac46..eb10dd33e98 100644 --- a/source/nsswitch/winbindd_idmap_ldap.c +++ b/source/nsswitch/winbindd_idmap_ldap.c @@ -40,8 +40,6 @@ static const char *attr[] = { "uid", "rid", "domain", "uidNumber", static const char *pool_attr[] = {"uidNumber", "gidNumber", "cn", NULL}; -static const char *group_attr[] = {"gidNumber", "ntSid", NULL}; - static long ldap_allocate_id(BOOL is_user) { int rc, count; diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c index e6ec28beabb..7a77d125a6f 100644 --- a/source/rpcclient/cmd_netlogon.c +++ b/source/rpcclient/cmd_netlogon.c @@ -268,7 +268,6 @@ static NTSTATUS cmd_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { - unsigned char trust_passwd[16]; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; int logon_type = NET_LOGON_TYPE; const char *username, *password; -- cgit From 26901af91eaa119df0e1192be95b514ecf26c6a6 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:22:59 +0000 Subject: Remove unused variables. --- source/utils/net_rpc_samsync.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/utils/net_rpc_samsync.c b/source/utils/net_rpc_samsync.c index 0b78cd54ceb..b886119eef9 100644 --- a/source/utils/net_rpc_samsync.c +++ b/source/utils/net_rpc_samsync.c @@ -195,12 +195,9 @@ static void dump_database(struct cli_state *cli, unsigned db_type, DOM_CRED *ret /* dump sam database via samsync rpc calls */ int rpc_samdump(int argc, const char **argv) { - NTSTATUS result; struct cli_state *cli = NULL; uchar trust_password[16]; DOM_CRED ret_creds; - uint32 neg_flags = 0x000001ff; - ZERO_STRUCT(ret_creds); -- cgit From 7805641d6eafd00c8979e068b5820f6671f4de37 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 05:26:28 +0000 Subject: Add rules to build bin/t_snprintf, which exposes the snprintf test code. --- source/Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/Makefile.in b/source/Makefile.in index b7a2519ce72..f7c8d47862b 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1112,6 +1112,9 @@ bin/t_doschar@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_doschar.o bin/t_push_ucs2@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_push_ucs2.o $(CC) $(FLAGS) -o $@ $(LIBS) torture/t_push_ucs2.o -L ./bin -lbigballofmud +bin/t_snprintf@EXEEXT@: lib/snprintf.c + $(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm + install: installbin installman installscripts installdat installswat installmodules installclientlib # DESTDIR is used here to prevent packagers wasting their time -- cgit From 372b023cd2e73f77de34029230c11a15ccb7d178 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:38:28 +0000 Subject: Ignore check programs. --- source/bin/.cvsignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/bin/.cvsignore b/source/bin/.cvsignore index 86ae6b6e67d..5c61680e12d 100644 --- a/source/bin/.cvsignore +++ b/source/bin/.cvsignore @@ -24,6 +24,7 @@ smbcacls smbcacls smbclient smbcontrol +smbcquotas smbd smbfilter smbgroupedit @@ -37,6 +38,7 @@ smbtorture smbtree smbumount swat +t_push_ucs2 t_strcmp t_stringoverflow talloctort @@ -47,4 +49,3 @@ vfstest wbinfo winbindd wrepld -smbcquotas -- cgit From b8dc14d1f90564558e438694b35b073291d5ce9e Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 14 Apr 2003 05:38:48 +0000 Subject: Fix broken regexp in cvsignore for *.po{,32} files. --- source/groupdb/.cvsignore | 4 ++-- source/registry/.cvsignore | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/groupdb/.cvsignore b/source/groupdb/.cvsignore index 22beab949c5..5f2a5c4cf75 100644 --- a/source/groupdb/.cvsignore +++ b/source/groupdb/.cvsignore @@ -1,2 +1,2 @@ -.po -.po32 +*.po +*.po32 diff --git a/source/registry/.cvsignore b/source/registry/.cvsignore index 22beab949c5..5f2a5c4cf75 100644 --- a/source/registry/.cvsignore +++ b/source/registry/.cvsignore @@ -1,2 +1,2 @@ -.po -.po32 +*.po +*.po32 -- cgit From 95ff914d8263028711f36ccc2f6cd1127aaa7809 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 06:07:25 +0000 Subject: Build and run the lib/snprintf.c test cases from "make check". --- source/Makefile.in | 2 +- source/bin/.cvsignore | 1 + source/stf/sambalib.py | 41 +++++++++++++++++++++++++++++++++++++++++ source/stf/standardcheck.py | 4 ++-- 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 source/stf/sambalib.py diff --git a/source/Makefile.in b/source/Makefile.in index f7c8d47862b..fd640a19a58 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1369,4 +1369,4 @@ check: check-programs # These are called by the test suite and need to be built before # running it. For the time being we don't build all of BIN_PROGS, # because they're not all needed. -check-programs: bin/t_strcmp bin/t_push_ucs2 bin/smbcontrol +check-programs: bin/t_strcmp bin/t_push_ucs2 bin/smbcontrol bin/t_snprintf diff --git a/source/bin/.cvsignore b/source/bin/.cvsignore index 5c61680e12d..770100fd312 100644 --- a/source/bin/.cvsignore +++ b/source/bin/.cvsignore @@ -39,6 +39,7 @@ smbtree smbumount swat t_push_ucs2 +t_snprintf t_strcmp t_stringoverflow talloctort diff --git a/source/stf/sambalib.py b/source/stf/sambalib.py new file mode 100644 index 00000000000..13d38e2a281 --- /dev/null +++ b/source/stf/sambalib.py @@ -0,0 +1,41 @@ +#! /usr/bin/python + +# Comfychair test cases for Samba string functions. + +# Copyright (C) 2003 by Martin Pool +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +"""Tests for Samba library functions.""" + +import sys, re, comfychair +from unicodenames import * + +class snprintf_Test(comfychair.TestCase): + def runtest(self): + # Everything is built in to the test + out, err = self.runcmd('t_snprintf') + +# Define the tests exported by this module +tests = [snprintf_Test] + +# Handle execution of this file as a main program +if __name__ == '__main__': + comfychair.main(tests) + +# Local variables: +# coding: utf-8 +# End: diff --git a/source/stf/standardcheck.py b/source/stf/standardcheck.py index bec21b8ec5f..e3292353e8b 100644 --- a/source/stf/standardcheck.py +++ b/source/stf/standardcheck.py @@ -22,13 +22,13 @@ """These tests are run by Samba's "make check".""" import strings, comfychair -import smbcontrol +import smbcontrol, sambalib # There should not be any actual tests in here: this file just serves # to define the ones run by default. They're imported from other # modules. -tests = strings.tests + smbcontrol.tests +tests = strings.tests + smbcontrol.tests + sambalib.tests if __name__ == '__main__': comfychair.main(tests) -- cgit From 8fbe456ee34af163dddb1e6e4816ff7be4ca48f1 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 14 Apr 2003 07:48:44 +0000 Subject: Make a libbigballofmud.so.0 link, so that the linker can find the library to build the test cases. Previously the link had to be created by hand. Doing this manually is incredibly kludgy and not very portable, but I don't know a better way without introducing l*bt**l. --- source/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/Makefile.in b/source/Makefile.in index fd640a19a58..7509edef787 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -907,10 +907,12 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) @echo Linking libsmbclient non-shared library $@ @-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS) +# This is probably wrong for anything other than the GNU linker. bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS) @echo Linking bigballofmud shared library $@ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \ @SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(PASSDBLIBS) $(ADSLIBS) + ln -snf libbigballofmud.so bin/libbigballofmud.so.0 # It would be nice to build a static bigballofmud too, but when I try # I get linker errors about dl_open and similar things. I'm not sure -- cgit From d1cd95e6b7d2c0e73595d8f19b994da43ca4217d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 09:18:36 +0000 Subject: Document NET CACHE --- docs/docbook/manpages/net.8.sgml | 60 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/docs/docbook/manpages/net.8.sgml b/docs/docbook/manpages/net.8.sgml index f4f75d0c883..45bb3bcbcdb 100644 --- a/docs/docbook/manpages/net.8.sgml +++ b/docs/docbook/manpages/net.8.sgml @@ -527,10 +527,64 @@ or workgroup. Defaults to local domain. CACHE -Interface to samba's internal gencache functions. For debugging -purposes only. +Samba uses a general caching interface called 'gencache'. It +can be controlled using 'NET CACHE'. - +All the timeout parameters support the suffixes: + + +s - Seconds +m - Minutes +h - Hours +d - Days +w - Weeks + + + + + +CACHE ADD <replaceable>key</replaceable> <replaceable>data</replaceable> <replaceable>time-out</replaceable> + +Add specified key+data to the cache with the given timeout. + + + + +CACHE DEL <replaceable>key</replaceable> + +Delete key from the cache. + + + + +CACHE SET <replaceable>key</replaceable> <replaceable>data</replaceable> <replaceable>time-out</replaceable> + +Update data of existing cache entry. + + + + +CACHE SEARCH <replaceable>PATTERN</replaceable> + +Search for the specified pattern in the cache data. + + + + +CACHE LIST + + +List all current items in the cache. + + + + + +CACHE FLUSH + +Remove all the current items from the cache. + + -- cgit From c95a4a5aeb53cc401a7b43633f2a8cc006b1fd00 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 10:05:33 +0000 Subject: Get rid of 'sam backend' and --with-sam --- source/configure.in | 20 +------------------- source/param/loadparm.c | 2 -- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/source/configure.in b/source/configure.in index d1ca1e494b1..555cc06fc3f 100644 --- a/source/configure.in +++ b/source/configure.in @@ -2079,7 +2079,7 @@ ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="" LIBS="" - + ################################################# # check for krb5-config from recent MIT and Heimdal kerberos 5 AC_PATH_PROG(KRB5_CONFIG, krb5-config) @@ -2433,24 +2433,6 @@ if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then fi fi -# New experimental SAM system - -AC_MSG_CHECKING([whether to build the new (experimental) SAM database]) -AC_ARG_WITH(sam, -[ --with-sam Build new (experimental) SAM database (default=no)], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_SAM,1,[Whether to build the new (experimental) SAM database]) - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(no) -) - - ######################################################################################## ## ## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 1b85ebe1522..6db3e30b849 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -766,7 +766,6 @@ static struct parm_struct parm_table[] = { {"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"private dir", P_STRING, P_GLOBAL, &Globals.szPrivateDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"passdb backend", P_LIST, P_GLOBAL, &Globals.szPassdbBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - {"sam backend", P_LIST, P_GLOBAL, &Globals.szSamBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"non unix account range", P_STRING, P_GLOBAL, &Globals.szNonUnixAccountRange, handle_non_unix_account_range, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"algorithmic rid base", P_INTEGER, P_GLOBAL, &Globals.AlgorithmicRidBase, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -1629,7 +1628,6 @@ FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName) static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion) FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases) FN_GLOBAL_LIST(lp_passdb_backend, &Globals.szPassdbBackend) -FN_GLOBAL_LIST(lp_sam_backend, &Globals.szSamBackend) FN_GLOBAL_LIST(lp_preload_modules, &Globals.szPreloadModules) FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction) FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript) -- cgit From 17d27db5c9d3511444fc2770d4452647284e8014 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 10:14:40 +0000 Subject: Change ADS CHOSTPASS to ADS CHANGETRUSTPW and add a general CHANGETRUSTPW that calls ADS CHANGETRUSTPW or RPC CHANGETRUSTPW depending on what we have. --- source/utils/net.c | 9 +++++++++ source/utils/net_ads.c | 13 +++++++++---- source/utils/net_rpc.c | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/source/utils/net.c b/source/utils/net.c index f8ed590d4b8..9d8441e649a 100644 --- a/source/utils/net.c +++ b/source/utils/net.c @@ -305,6 +305,14 @@ static int net_join(int argc, const char **argv) return net_rpc_join(argc, argv); } +static int net_changetrustpw(int argc, const char **argv) +{ + if (net_ads_check() == 0) + return net_ads_changetrustpw(argc, argv); + + return net_rpc_changetrustpw(argc, argv); +} + static int net_share(int argc, const char **argv) { if (net_rpc_check(0)) @@ -485,6 +493,7 @@ static struct functable net_func[] = { {"ADMIN", net_rap_admin}, {"SERVICE", net_rap_service}, {"PASSWORD", net_rap_password}, + {"CHANGETRUSTPW", net_changetrustpw}, {"TIME", net_time}, {"LOOKUP", net_lookup}, {"JOIN", net_join}, diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c index 0f2d673b4bf..5a8265f0b9e 100644 --- a/source/utils/net_ads.c +++ b/source/utils/net_ads.c @@ -47,7 +47,7 @@ int net_ads_usage(int argc, const char **argv) "\nnet ads password -Uadmin_username@realm%%admin_pass"\ "\n\tchange a user's password using an admin account"\ "\n\t(note: use realm in UPPERCASE)\n"\ -"\nnet ads chostpass"\ +"\nnet ads changetrustpw"\ "\n\tchange the trust account password of this machine in the AD tree\n"\ "\nnet ads printer [info | publish | remove] "\ "\n\t lookup, add, or remove directory entry for a printer\n"\ @@ -940,7 +940,7 @@ static int net_ads_password(int argc, const char **argv) } -static int net_ads_change_localhost_pass(int argc, const char **argv) +int net_ads_changetrustpw(int argc, const char **argv) { ADS_STRUCT *ads; char *host_principal; @@ -1117,7 +1117,7 @@ int net_ads_help(int argc, const char **argv) {"LEAVE", net_ads_leave}, {"STATUS", net_ads_status}, {"PASSWORD", net_ads_password}, - {"CHOSTPASS", net_ads_change_localhost_pass}, + {"CHANGETRUSTPW", net_ads_changetrustpw}, #endif {NULL, NULL} }; @@ -1136,7 +1136,7 @@ int net_ads(int argc, const char **argv) {"USER", net_ads_user}, {"GROUP", net_ads_group}, {"PASSWORD", net_ads_password}, - {"CHOSTPASS", net_ads_change_localhost_pass}, + {"CHANGETRUSTPW", net_ads_changetrustpw}, {"PRINTER", net_ads_printer}, {"SEARCH", net_ads_search}, {"DN", net_ads_dn}, @@ -1167,6 +1167,11 @@ int net_ads_help(int argc, const char **argv) return net_ads_noads(); } +int net_ads_changetrustpw(int argc, const char **argv) +{ + return net_ads_noads(); +} + int net_ads_join(int argc, const char **argv) { return net_ads_noads(); diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c index 863d420ff3f..a35cdd0b5bb 100644 --- a/source/utils/net_rpc.c +++ b/source/utils/net_rpc.c @@ -205,7 +205,7 @@ static NTSTATUS rpc_changetrustpw_internals(const DOM_SID *domain_sid, struct cl * @return A shell status integer (0 for success) **/ -static int rpc_changetrustpw(int argc, const char **argv) +int net_rpc_changetrustpw(int argc, const char **argv) { return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, rpc_changetrustpw_internals, argc, argv); @@ -2250,7 +2250,7 @@ int net_rpc(int argc, const char **argv) {"group", net_rpc_group}, {"share", net_rpc_share}, {"file", net_rpc_file}, - {"changetrustpw", rpc_changetrustpw}, + {"changetrustpw", net_rpc_changetrustpw}, {"trustdom", rpc_trustdom}, {"abortshutdown", rpc_shutdown_abort}, {"shutdown", rpc_shutdown}, -- cgit From 7cb060e821691abf5d58d273cb523ee310656185 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 14 Apr 2003 10:35:50 +0000 Subject: Fix _smb_setlen to be non {} safe. Jeremy. --- source/include/smb_macros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h index 999850b8eb7..477940445c0 100644 --- a/source/include/smb_macros.h +++ b/source/include/smb_macros.h @@ -179,8 +179,8 @@ #define smb_offset(p,buf) (PTR_DIFF(p,buf+4) + chain_size) #define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|((PVAL(buf,1)&1)<<16)) -#define _smb_setlen(buf,len) buf[0] = 0; buf[1] = (len&0x10000)>>16; \ - buf[2] = (len&0xFF00)>>8; buf[3] = len&0xFF; +#define _smb_setlen(buf,len) do { buf[0] = 0; buf[1] = (len&0x10000)>>16; \ + buf[2] = (len&0xFF00)>>8; buf[3] = len&0xFF; } while (0) /******************************************************************* find the difference in milliseconds between two struct timeval -- cgit From 77bdd68b65d6d485a484ca1b3475ffbb772f8661 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Mon, 14 Apr 2003 12:19:54 +0000 Subject: Partial review of changes by mimir. Work in progress. --- docs/docbook/projdoc/InterdomainTrusts.sgml | 52 +++++++++++++++-------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/docs/docbook/projdoc/InterdomainTrusts.sgml b/docs/docbook/projdoc/InterdomainTrusts.sgml index 7ad546bb7bf..56b0dcc7102 100644 --- a/docs/docbook/projdoc/InterdomainTrusts.sgml +++ b/docs/docbook/projdoc/InterdomainTrusts.sgml @@ -19,7 +19,7 @@ possible for Samba3 to NT4 trust (and vica versa), as well as Samba3 to Samba3 t Trust Relationship Background -MS Windows NT3.x/4.0 type security domains employ a non-hierchical security structure. +MS Windows NT3.x/4.0 type security domains employ a non-hierarchical security structure. The limitations of this architecture as it affects the scalability of MS Windows networking in large organisations is well known. Additionally, the flat-name space that results from this design significantly impacts the delegation of administrative responsibilities in @@ -36,13 +36,13 @@ desire to go through a disruptive change to adopt ADS. Microsoft introduced with MS Windows NT the ability to allow differing security domains -to affect a mechanism so that users from one domain may be given access rights and privilidges +to affect a mechanism so that users from one domain may be given access rights and privileges in another domain. The language that describes this capability is couched in terms of Trusts. Specifically, one domain will trust the users from another domain. The domain from which users are available to another security domain is -said to be a trusted domain. The domain in which those users have assigned rights and privilidges +said to be a trusted domain. The domain in which those users have assigned rights and privileges is the trusting domain. With NT3.x/4.0 all trust relationships are always in one direction only, -thus if users in both domains are to have privilidges and rights in each others' domain, then it is +thus if users in both domains are to have privileges and rights in each others' domain, then it is necessary to establish two (2) relationships, one in each direction. @@ -64,14 +64,14 @@ an inherent feature of ADS domains. -MS Windows NT4 Trust Configuration +Native MS Windows NT4 Trusts Configuration -There are two steps to creating an inter-domain trust relationship. +There are two steps to creating an interdomain trust relationship. -NT4 as the Trusting Domain +NT4 as the Trusting Domain (ie. creating the trusted account) For MS Windows NT4, all domain trust relationships are configured using the Domain User Manager. @@ -81,13 +81,14 @@ User Manager Policies entry on the menu bar. From the Policy menu, select Trust next to the lower box that is labelled "Permitted to Trust this Domain" are two buttons, "Add" and "Remove". The "Add" button will open a panel in which needs to be entered the remote domain that will be able to assign user rights to your domain. In addition it is necessary to enter a password -that is specific to this trust relationship. The password is added twice. +that is specific to this trust relationship. The password needs to be +typed twice (for standard confirmation). -NT4 as the Trusted Domain +NT4 as the Trusted Domain (ie. creating trusted account's password) A trust relationship will work only when the other (trusting) domain makes the appropriate connections @@ -101,32 +102,31 @@ which must be entered the name of the remote domain as well as the password assi -Configuring Samba Domain Trusts +Configuring Samba NT-style Domain Trusts This descitpion is meant to be a fairly short introduction about how to set up a Samba server so that it could participate in interdomain trust relationships. Trust relationship support in Samba -is in its early stage, so lot of things don't work yet. Paricularly, the contents of this document -applies to NT4-style trusts. +is in its early stage, so lot of things doesn't work yet. Each of the procedures described below is treated as they were performed with Windows NT4 Server on -one end. The other end could just as well be another Samba3 domain. It can be clearly seen, after +one end. The remote end could just as well be another Samba-3 domain. It can be clearly seen, after reading this document, that combining Samba-specific parts of what's written below leads to trust between domains in purely Samba environment. -Samba3 as the Trusting Domain +Samba-3 as the Trusting Domain In order to set Samba PDC to be trusted party of the relationship first you need to create special account for domain that will be the trusting party. To do that, you can use 'smbpasswd' utility. Creating the trusted domain account is very -similiar to creating the connection to the trusting machine's account. Suppose, -your domain is called SAMBA, and the remote domain is called RUMBA. Your first -step will be to issue this command from your favourite shell: +similiar to creating trusted machine account. Suppose, your domain is +called SAMBA, and the remote domain is called RUMBA. The first step +will be to issue this command from your favourite shell: @@ -137,7 +137,9 @@ step will be to issue this command from your favourite shell: Added user rumba$ -where -a means to add a new account into the passdb database and -i means create this account with the Inter-Domain trust flag. +where -a means to add a new account into the +passdb database and -i means: ''create this +account with the InterDomain trust flag'' @@ -145,7 +147,7 @@ The account name will be 'rumba$' (the name of the remote domain) -fter issuing this command you'll be asked for typing account's +After issuing this command you'll be asked for typing account's password. You can use any password you want, but be aware that Windows NT will not change this password until 7 days have passed since account creating. After command returns successfully, you can look at your new account's entry @@ -156,16 +158,16 @@ the trust by establishing it from Windows NT Server. Open 'User Manager for Domains' and from menu 'Policies' select 'Trust Relationships...'. -Right beside 'Trusted domains' list press 'Add...' button. You'll be prompted for +Right beside 'Trusted domains' list box press 'Add...' button. You'll be prompted for trusted domain name and the relationship's password. Type in SAMBA, as this is -your domain name and the password you've just used during account creation. -Press OK and if everything went fine, you will see 'Trusted domain relationship +your domain name, and the password you've just used for account creation. +Press OK and, if everything went fine, you will see 'Trusted domain relationship successfully established' message. Well done. -Samba3 as the Trusted Domain +Samba-3 as the Trusted Domain This time activities are somewhat reversed. Again, we'll assume that your domain @@ -179,11 +181,11 @@ The very first thing is to add account for SAMBA domain on RUMBA's PDC. Launch the Domain User Manager, then from the menu select 'Policies', 'Trust Relationships'. Now, next to 'Trusted Domains' box press the 'Add' button, and type in the name of the trusted -domein (SAMBA) and password securing the relationship. +domain (SAMBA) and password securing the relationship. -Password can be arbitrarily chosen the more, because it's easy to change it +Password can be arbitrarily chosen, the more because it's easy to change it from Samba server whenever you want. After confirming password your account is ready and waiting. Now it's Samba's turn. -- cgit From fe2d109a106aafd5e9f5e58f3fbc5dccec730961 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Mon, 14 Apr 2003 12:50:23 +0000 Subject: Fix typo. --- docs/docbook/projdoc/InterdomainTrusts.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docbook/projdoc/InterdomainTrusts.sgml b/docs/docbook/projdoc/InterdomainTrusts.sgml index 56b0dcc7102..bd96ef85d2d 100644 --- a/docs/docbook/projdoc/InterdomainTrusts.sgml +++ b/docs/docbook/projdoc/InterdomainTrusts.sgml @@ -105,7 +105,7 @@ which must be entered the name of the remote domain as well as the password assi Configuring Samba NT-style Domain Trusts -This descitpion is meant to be a fairly short introduction about how to set up a Samba server so +This description is meant to be a fairly short introduction about how to set up a Samba server so that it could participate in interdomain trust relationships. Trust relationship support in Samba is in its early stage, so lot of things doesn't work yet. -- cgit From 57682f32b1bb186ab356494fcc4fdabd1d1721e6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 14 Apr 2003 13:19:51 +0000 Subject: Try and create a file with different vuid, same cnum. Not yet sure if this should succeed, so just print result until we test against Win2003. Jeremy. --- source/torture/torture.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source/torture/torture.c b/source/torture/torture.c index 00d5b86ff88..94ee4dc7914 100644 --- a/source/torture/torture.c +++ b/source/torture/torture.c @@ -1959,7 +1959,9 @@ static BOOL run_fdsesstest(int dummy) uint16 new_cnum; uint16 saved_cnum; const char *fname = "\\fdsess.tst"; + const char *fname1 = "\\fdsess1.tst"; int fnum1; + int fnum2; pstring buf; BOOL ret = True; @@ -1979,6 +1981,7 @@ static BOOL run_fdsesstest(int dummy) printf("starting fdsesstest\n"); cli_unlink(cli, fname); + cli_unlink(cli, fname1); fnum1 = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum1 == -1) { @@ -1999,6 +2002,16 @@ static BOOL run_fdsesstest(int dummy) buf); ret = False; } + /* Try to open a file with different vuid, samba cnum. */ + fnum2 = cli_open(cli, fname1, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + if (fnum2 != -1) { + printf("create with different vuid, same cnum succeeded.\n"); + cli_close(cli, fnum2); + cli_unlink(cli, fname1); + } else { + printf("create with different vuid, same cnum failed.\n"); + } + cli->vuid = saved_vuid; /* Try with same vuid, different cnum. */ -- cgit From bd69cbce93054548b6d1e3bac89032ff4f693423 Mon Sep 17 00:00:00 2001 From: Paul Green Date: Mon, 14 Apr 2003 19:48:56 +0000 Subject: Rebalance parentheses in cliquota.c when LARGE_SMB_OFF_T is false. --- source/libsmb/cliquota.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/libsmb/cliquota.c b/source/libsmb/cliquota.c index a56a6bd674b..ed808aa1f5c 100644 --- a/source/libsmb/cliquota.c +++ b/source/libsmb/cliquota.c @@ -85,7 +85,7 @@ static BOOL parse_user_quota_record(const char *rdata, unsigned int rdata_count, #else /* LARGE_SMB_OFF_T */ if ((IVAL(rdata,20) != 0)&& ((qt.usedspace != 0xFFFFFFFF)|| - (IVAL(rdata,20)!=0xFFFFFFFF)))) { + (IVAL(rdata,20)!=0xFFFFFFFF))) { /* more than 32 bits? */ return False; } @@ -98,7 +98,7 @@ static BOOL parse_user_quota_record(const char *rdata, unsigned int rdata_count, #else /* LARGE_SMB_OFF_T */ if ((IVAL(rdata,28) != 0)&& ((qt.softlim != 0xFFFFFFFF)|| - (IVAL(rdata,28)!=0xFFFFFFFF)))) { + (IVAL(rdata,28)!=0xFFFFFFFF))) { /* more than 32 bits? */ return False; } @@ -111,7 +111,7 @@ static BOOL parse_user_quota_record(const char *rdata, unsigned int rdata_count, #else /* LARGE_SMB_OFF_T */ if ((IVAL(rdata,36) != 0)&& ((qt.hardlim != 0xFFFFFFFF)|| - (IVAL(rdata,36)!=0xFFFFFFFF)))) { + (IVAL(rdata,36)!=0xFFFFFFFF))) { /* more than 32 bits? */ return False; } @@ -459,7 +459,7 @@ BOOL cli_get_fs_quota_info(struct cli_state *cli, int quota_fnum, SMB_NTQUOTA_ST #else /* LARGE_SMB_OFF_T */ if ((IVAL(rdata,28) != 0)&& ((qt.softlim != 0xFFFFFFFF)|| - (IVAL(rdata,28)!=0xFFFFFFFF)))) { + (IVAL(rdata,28)!=0xFFFFFFFF))) { /* more than 32 bits? */ goto cleanup; } @@ -472,7 +472,7 @@ BOOL cli_get_fs_quota_info(struct cli_state *cli, int quota_fnum, SMB_NTQUOTA_ST #else /* LARGE_SMB_OFF_T */ if ((IVAL(rdata,36) != 0)&& ((qt.hardlim != 0xFFFFFFFF)|| - (IVAL(rdata,36)!=0xFFFFFFFF)))) { + (IVAL(rdata,36)!=0xFFFFFFFF))) { /* more than 32 bits? */ goto cleanup; } -- cgit From 7bd80376cc6aa70996a61882e1376cb6a0679836 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 20:35:46 +0000 Subject: Fix typos --- source/rpc_server/srv_spoolss_nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index 4432b06fc73..45522748c9f 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/rpc_server/srv_spoolss_nt.c @@ -1255,7 +1255,7 @@ static BOOL srv_spoolss_drv_upgrade_printer(char* drivername) /********************************************************************** callback to receive a MSG_PRINTER_DRVUPGRADE message and interate - over all printers, upgrading ones as neessary + over all printers, upgrading ones as necessary **********************************************************************/ void do_drv_upgrade_printer(int msg_type, pid_t src, void *buf, size_t len) @@ -1303,7 +1303,7 @@ void do_drv_upgrade_printer(int msg_type, pid_t src, void *buf, size_t len) } /******************************************************************** - Update the cahce for all printq's with a registered client + Update the cache for all printq's with a registered client connection ********************************************************************/ -- cgit From 540bb996766fc11fe0f26b708d49c2e46d2abbdd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 20:44:47 +0000 Subject: Also remove variable associated with lp_sam_backend() - it's dead --- source/param/loadparm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 6db3e30b849..4394c4df1a4 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -119,7 +119,6 @@ typedef struct char *szSMBPasswdFile; char *szPrivateDir; char **szPassdbBackend; - char **szSamBackend; char **szPreloadModules; char *szPasswordServer; char *szSocketOptions; -- cgit From 1093c11fd47e5f4a76ce88ac77be2c3e9b1bc694 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 14 Apr 2003 22:59:57 +0000 Subject: Convert a part of Misc section. More to come after a sleep --- docs/docbook/smbdotconf/misc/addsharecommand.xml | 90 ++++++++++++---------- docs/docbook/smbdotconf/misc/autoservices.xml | 15 ++-- .../docbook/smbdotconf/misc/changesharecommand.xml | 88 ++++++++++++--------- docs/docbook/smbdotconf/misc/configfile.xml | 37 +++++---- docs/docbook/smbdotconf/misc/defaultservice.xml | 48 ++++++------ .../docbook/smbdotconf/misc/deletesharecommand.xml | 79 ++++++++++--------- docs/docbook/smbdotconf/misc/lockdir.xml | 14 ++-- docs/docbook/smbdotconf/misc/lockdirectory.xml | 24 +++--- docs/docbook/smbdotconf/misc/piddirectory.xml | 20 +++-- docs/docbook/smbdotconf/misc/preload.xml | 29 +++---- docs/docbook/smbdotconf/misc/utmp.xml | 39 +++++----- docs/docbook/smbdotconf/misc/utmpdirectory.xml | 34 ++++---- docs/docbook/smbdotconf/misc/wtmpdirectory.xml | 40 +++++----- 13 files changed, 311 insertions(+), 246 deletions(-) diff --git a/docs/docbook/smbdotconf/misc/addsharecommand.xml b/docs/docbook/smbdotconf/misc/addsharecommand.xml index 233d3e7dc41..bd5f2101db4 100644 --- a/docs/docbook/smbdotconf/misc/addsharecommand.xml +++ b/docs/docbook/smbdotconf/misc/addsharecommand.xml @@ -1,51 +1,63 @@ - - add share command (G) - Samba 2.2.0 introduced the ability to dynamically - add and delete shares via the Windows NT 4.0 Server Manager. The - add share command is used to define an - external program or script which will add a new service definition - to smb.conf. In order to successfully - execute the add share command, smbd - requires that the administrator be connected using a root account (i.e. - uid == 0). - + + + Samba 2.2.0 introduced the ability to dynamically + add and delete shares via the Windows NT 4.0 Server Manager. The + add share command is used to define an + external program or script which will add a new service definition + to smb.conf. In order to successfully + execute the add share command, smbd + requires that the administrator be connected using a root account (i.e. + uid == 0). + - - When executed, smbd will automatically invoke the - add share command with four parameters. - + + When executed, smbd will automatically invoke the + add share command with four parameters. + - - configFile - the location + + + configFile - the location of the global smb.conf file. - + + - shareName - the name of the new + + shareName - the name of the new share. - + + - pathName - path to an **existing** + + pathName - path to an **existing** directory on disk. - + + - comment - comment string to associate + + comment - comment string to associate with the new share. - - + + + - - This parameter is only used for add file shares. To add printer shares, - see the addprinter - command. - + + This parameter is only used for add file shares. To add printer shares, + see the addprinter + command. + - - See also change share - command, delete share - command. - + + See also change share + command, delete share + command. + - Default: none - Example: add share command = /usr/local/bin/addshare - - + Default: none + + Example: add share command = /usr/local/bin/addshare + + diff --git a/docs/docbook/smbdotconf/misc/autoservices.xml b/docs/docbook/smbdotconf/misc/autoservices.xml index d137f650f83..d94997a6ce2 100644 --- a/docs/docbook/smbdotconf/misc/autoservices.xml +++ b/docs/docbook/smbdotconf/misc/autoservices.xml @@ -1,6 +1,9 @@ - - auto services (G) - This is a synonym for the - preload. - - + + + This is a synonym for the + preload. + + diff --git a/docs/docbook/smbdotconf/misc/changesharecommand.xml b/docs/docbook/smbdotconf/misc/changesharecommand.xml index 3fb494c5131..d0116594c0a 100644 --- a/docs/docbook/smbdotconf/misc/changesharecommand.xml +++ b/docs/docbook/smbdotconf/misc/changesharecommand.xml @@ -1,50 +1,62 @@ - - change share command (G) - Samba 2.2.0 introduced the ability to dynamically - add and delete shares via the Windows NT 4.0 Server Manager. The - change share command is used to define an - external program or script which will modify an existing service definition - in smb.conf. In order to successfully - execute the change share command, smbd - requires that the administrator be connected using a root account (i.e. - uid == 0). - + + + Samba 2.2.0 introduced the ability to dynamically + add and delete shares via the Windows NT 4.0 Server Manager. The + change share command is used to define an + external program or script which will modify an existing service definition + in smb.conf. In order to successfully + execute the change share command, smbd + requires that the administrator be connected using a root account (i.e. + uid == 0). + - - When executed, smbd will automatically invoke the - change share command with four parameters. - + + When executed, smbd will automatically invoke the + change share command with four parameters. + - - configFile - the location + + + configFile - the location of the global smb.conf file. - + + - shareName - the name of the new + + shareName - the name of the new share. - + + - pathName - path to an **existing** + + pathName - path to an **existing** directory on disk. - + + - comment - comment string to associate + + comment - comment string to associate with the new share. - - + + + - - This parameter is only used modify existing file shares definitions. To modify - printer shares, use the "Printers..." folder as seen when browsing the Samba host. - + + This parameter is only used modify existing file shares definitions. To modify + printer shares, use the "Printers..." folder as seen when browsing the Samba host. + - - See also add share - command, delete - share command. - + + See also add share + command, delete + share command. + - Default: none - Example: change share command = /usr/local/bin/addshare - - + Default: none + + Example: change share command = /usr/local/bin/addshare + + diff --git a/docs/docbook/smbdotconf/misc/configfile.xml b/docs/docbook/smbdotconf/misc/configfile.xml index 3edf611b55d..855b6460fe2 100644 --- a/docs/docbook/smbdotconf/misc/configfile.xml +++ b/docs/docbook/smbdotconf/misc/configfile.xml @@ -1,21 +1,24 @@ - - config file (G) - This allows you to override the config file - to use, instead of the default (usually smb.conf). - There is a chicken and egg problem here as this option is set - in the config file! + + + This allows you to override the config file + to use, instead of the default (usually smb.conf). + There is a chicken and egg problem here as this option is set + in the config file! - For this reason, if the name of the config file has changed - when the parameters are loaded then it will reload them from - the new config file. + For this reason, if the name of the config file has changed + when the parameters are loaded then it will reload them from + the new config file. - This option takes the usual substitutions, which can - be very useful. + This option takes the usual substitutions, which can + be very useful. - If the config file doesn't exist then it won't be loaded - (allowing you to special case the config files of just a few - clients). + If the config file doesn't exist then it won't be loaded + (allowing you to special case the config files of just a few + clients). - Example: config file = /usr/local/samba/lib/smb.conf.%m - - + Example: config file = /usr/local/samba/lib/smb.conf.%m + + diff --git a/docs/docbook/smbdotconf/misc/defaultservice.xml b/docs/docbook/smbdotconf/misc/defaultservice.xml index 7aeedb177aa..39e467b1d10 100644 --- a/docs/docbook/smbdotconf/misc/defaultservice.xml +++ b/docs/docbook/smbdotconf/misc/defaultservice.xml @@ -1,29 +1,31 @@ - - default service (G) - This parameter specifies the name of a service - which will be connected to if the service actually requested cannot - be found. Note that the square brackets are NOT - given in the parameter value (see example below). + + + This parameter specifies the name of a service + which will be connected to if the service actually requested cannot + be found. Note that the square brackets are NOT + given in the parameter value (see example below). - There is no default value for this parameter. If this - parameter is not given, attempting to connect to a nonexistent - service results in an error. + There is no default value for this parameter. If this + parameter is not given, attempting to connect to a nonexistent + service results in an error. - Typically the default service would be a - guest ok, - read-only service. + Typically the default service would be a + guest ok, + read-only service. - Also note that the apparent service name will be changed - to equal that of the requested service, this is very useful as it - allows you to use macros like %S to make - a wildcard service. + Also note that the apparent service name will be changed + to equal that of the requested service, this is very useful as it + allows you to use macros like %S to make + a wildcard service. - Note also that any "_" characters in the name of the service - used in the default service will get mapped to a "/". This allows for - interesting things. + Note also that any "_" characters in the name of the service + used in the default service will get mapped to a "/". This allows for + interesting things. - - Example: + Example: [global] @@ -32,5 +34,5 @@ [pub] path = /%S - - + + diff --git a/docs/docbook/smbdotconf/misc/deletesharecommand.xml b/docs/docbook/smbdotconf/misc/deletesharecommand.xml index c3481c86ec2..cf60b27752c 100644 --- a/docs/docbook/smbdotconf/misc/deletesharecommand.xml +++ b/docs/docbook/smbdotconf/misc/deletesharecommand.xml @@ -1,44 +1,51 @@ - - delete share command (G) - Samba 2.2.0 introduced the ability to dynamically - add and delete shares via the Windows NT 4.0 Server Manager. The - delete share command is used to define an - external program or script which will remove an existing service - definition from smb.conf. In order to successfully - execute the delete share command, smbd - requires that the administrator be connected using a root account (i.e. - uid == 0). - + + + Samba 2.2.0 introduced the ability to dynamically + add and delete shares via the Windows NT 4.0 Server Manager. The + delete share command is used to define an + external program or script which will remove an existing service + definition from smb.conf. In order to successfully + execute the delete share command, smbd + requires that the administrator be connected using a root account (i.e. + uid == 0). + - - When executed, smbd will automatically invoke the - delete share command with two parameters. - + + When executed, smbd will automatically invoke the + delete share command with two parameters. + - - configFile - the location + + + configFile - the location of the global smb.conf file. - + + - shareName - the name of + + shareName - the name of the existing service. - - - - - This parameter is only used to remove file shares. To delete printer shares, - see the deleteprinter - command. - + + + - - See also add share - command, change - share command. - + + This parameter is only used to remove file shares. To delete printer shares, + see the deleteprinter + command. + - Default: none - Example: delete share command = /usr/local/bin/delshare + + See also add share + command, change + share command. + - - + Default: none + + Example: delete share command = /usr/local/bin/delshare + + diff --git a/docs/docbook/smbdotconf/misc/lockdir.xml b/docs/docbook/smbdotconf/misc/lockdir.xml index 2c29b9b61c4..4e5f6bce85a 100644 --- a/docs/docbook/smbdotconf/misc/lockdir.xml +++ b/docs/docbook/smbdotconf/misc/lockdir.xml @@ -1,5 +1,9 @@ - - lock dir (G) - Synonym for - lock directory. - + + + Synonym for + lock directory. + + diff --git a/docs/docbook/smbdotconf/misc/lockdirectory.xml b/docs/docbook/smbdotconf/misc/lockdirectory.xml index 7945f198646..c877566b31d 100644 --- a/docs/docbook/smbdotconf/misc/lockdirectory.xml +++ b/docs/docbook/smbdotconf/misc/lockdirectory.xml @@ -1,11 +1,15 @@ - - lock directory (G) - This option specifies the directory where lock - files will be placed. The lock files are used to implement the - max connections - option. + + + This option specifies the directory where lock + files will be placed. The lock files are used to implement the + max connections + option. - Default: lock directory = ${prefix}/var/locks - Example: lock directory = /var/run/samba/locks - - + Default: lock directory = ${prefix}/var/locks + + Example: lock directory = /var/run/samba/locks + + diff --git a/docs/docbook/smbdotconf/misc/piddirectory.xml b/docs/docbook/smbdotconf/misc/piddirectory.xml index 81c1b13e753..b526a802219 100644 --- a/docs/docbook/smbdotconf/misc/piddirectory.xml +++ b/docs/docbook/smbdotconf/misc/piddirectory.xml @@ -1,9 +1,13 @@ - - pid directory (G) - This option specifies the directory where pid - files will be placed. + + + This option specifies the directory where pid + files will be placed. - Default: pid directory = ${prefix}/var/locks - Example: pid directory = /var/run/ - - + Default: pid directory = ${prefix}/var/locks + + Example: pid directory = /var/run/ + + diff --git a/docs/docbook/smbdotconf/misc/preload.xml b/docs/docbook/smbdotconf/misc/preload.xml index 574ed1a369a..96b59e3a43e 100644 --- a/docs/docbook/smbdotconf/misc/preload.xml +++ b/docs/docbook/smbdotconf/misc/preload.xml @@ -1,16 +1,19 @@ - - preload (G) - This is a list of services that you want to be - automatically added to the browse lists. This is most useful - for homes and printers services that would otherwise not be - visible. + + + This is a list of services that you want to be + automatically added to the browse lists. This is most useful + for homes and printers services that would otherwise not be + visible. - Note that if you just want all printers in your - printcap file loaded then the - load printers option is easier. + Note that if you just want all printers in your + printcap file loaded then the + load printers option is easier. - Default: no preloaded services + Default: no preloaded services - Example: preload = fred lp colorlp - - + Example: preload = fred lp colorlp + + diff --git a/docs/docbook/smbdotconf/misc/utmp.xml b/docs/docbook/smbdotconf/misc/utmp.xml index 014b85d6bc6..3dfa7caa5d4 100644 --- a/docs/docbook/smbdotconf/misc/utmp.xml +++ b/docs/docbook/smbdotconf/misc/utmp.xml @@ -1,21 +1,24 @@ - - utmp (G) - This boolean parameter is only available if - Samba has been configured and compiled with the option - --with-utmp. If set to yes then Samba will attempt - to add utmp or utmpx records (depending on the UNIX system) whenever a - connection is made to a Samba server. Sites may use this to record the - user connecting to a Samba share. + + + This boolean parameter is only available if + Samba has been configured and compiled with the option + --with-utmp. If set to yes then Samba will attempt + to add utmp or utmpx records (depending on the UNIX system) whenever a + connection is made to a Samba server. Sites may use this to record the + user connecting to a Samba share. - Due to the requirements of the utmp record, we - are required to create a unique identifier for the - incoming user. Enabling this option creates an n^2 - algorithm to find this number. This may impede - performance on large installations. + Due to the requirements of the utmp record, we + are required to create a unique identifier for the + incoming user. Enabling this option creates an n^2 + algorithm to find this number. This may impede + performance on large installations. - See also the - utmp directory parameter. + See also the + utmp directory parameter. - Default: utmp = no - - + Default: utmp = no + + diff --git a/docs/docbook/smbdotconf/misc/utmpdirectory.xml b/docs/docbook/smbdotconf/misc/utmpdirectory.xml index 9e5574fb395..3b50c3db29a 100644 --- a/docs/docbook/smbdotconf/misc/utmpdirectory.xml +++ b/docs/docbook/smbdotconf/misc/utmpdirectory.xml @@ -1,16 +1,20 @@ - - utmp directory(G) - This parameter is only available if Samba has - been configured and compiled with the option - --with-utmp. It specifies a directory pathname that is - used to store the utmp or utmpx files (depending on the UNIX system) that - record user connections to a Samba server. See also the - utmp parameter. By default this is - not set, meaning the system will use whatever utmp file the - native system is set to use (usually - /var/run/utmp on Linux). + + + This parameter is only available if Samba has + been configured and compiled with the option + --with-utmp. It specifies a directory pathname that is + used to store the utmp or utmpx files (depending on the UNIX system) that + record user connections to a Samba server. See also the + utmp parameter. By default this is + not set, meaning the system will use whatever utmp file the + native system is set to use (usually + /var/run/utmp on Linux). - Default: no utmp directory - Example: utmp directory = /var/run/utmp - - + Default: no utmp directory + + Example: utmp directory = /var/run/utmp + + diff --git a/docs/docbook/smbdotconf/misc/wtmpdirectory.xml b/docs/docbook/smbdotconf/misc/wtmpdirectory.xml index bb144473ff3..2448edfadbb 100644 --- a/docs/docbook/smbdotconf/misc/wtmpdirectory.xml +++ b/docs/docbook/smbdotconf/misc/wtmpdirectory.xml @@ -1,20 +1,24 @@ - - wtmp directory(G) - This parameter is only available if Samba has - been configured and compiled with the option - --with-utmp. It specifies a directory pathname that is - used to store the wtmp or wtmpx files (depending on the UNIX system) that - record user connections to a Samba server. The difference with - the utmp directory is the fact that user info is kept after a user - has logged out. + + + This parameter is only available if Samba has + been configured and compiled with the option + --with-utmp. It specifies a directory pathname that is + used to store the wtmp or wtmpx files (depending on the UNIX system) that + record user connections to a Samba server. The difference with + the utmp directory is the fact that user info is kept after a user + has logged out. - See also the - utmp parameter. By default this is - not set, meaning the system will use whatever utmp file the - native system is set to use (usually - /var/run/wtmp on Linux). + See also the + utmp parameter. By default this is + not set, meaning the system will use whatever utmp file the + native system is set to use (usually + /var/run/wtmp on Linux). - Default: no wtmp directory - Example: wtmp directory = /var/log/wtmp - - + Default: no wtmp directory + + Example: wtmp directory = /var/log/wtmp + + -- cgit From b278a05998d8edbed411c58f3f9041232da07c0b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 23:20:44 +0000 Subject: *** empty log message *** --- docs/docbook/Makefile.in | 2 +- docs/docbook/manpages/manuals.sgml | 49 +++++++++++++++++++++++++++++++++++++ docs/docbook/manpages/samba.7.sgml | 8 ++++++ docs/docbook/projdoc/samba-doc.sgml | 3 ++- 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 docs/docbook/manpages/manuals.sgml diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index 14617f74133..d594764c2c9 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -23,7 +23,7 @@ MANPAGES_NAMES=findsmb.1 smbclient.1 \ smbcacls.1 smbsh.1 winbindd.8 \ smbgroupedit.8 vfstest.1 \ profiles.1 smbtree.1 ntlm_auth.1 \ - editreg.1 + editreg.1 smbcquotas.1 ## This part contains only rules. You shouldn't need to change it ## if you are adding docs diff --git a/docs/docbook/manpages/manuals.sgml b/docs/docbook/manpages/manuals.sgml new file mode 100644 index 00000000000..45a8bfb7de9 --- /dev/null +++ b/docs/docbook/manpages/manuals.sgml @@ -0,0 +1,49 @@ + + +Manpages + + +Commands +&MAN-FINDSMB; +&MAN-NMBLOOKUP; +&MAN-RPCCLIENT; +&MAN-SMBCACLS; +&MAN-SMBCLIENT; +&MAN-SMBCONTROL; +&MAN-SMBSH; +&MAN-SMBSTATUS; +&MAN-SMBTAR; +&MAN-TESTPARM; +&MAN-TESTPRNS; +&MAN-VFSTEST; +&MAN-WBINFO; + + + +File formats and conventions +&MAN-LMHOSTS; +&MAN-SMBCONF; +&MAN-SMBPASSWDCONF; + + + +Macro packages and conventions +&MAN-SAMBA; + + + +System management commands +&MAN-NET; +&MAN-NMBD; +&MAN-PDBEDIT; +&MAN-SMBD; +&MAN-SMBGROUPEDIT; +&MAN-SMBMNT; +&MAN-SMBMOUNT; +&MAN-SMBPASSWD; +&MAN-SMBSPOOL; +&MAN-SMBUMOUNT; +&MAN-SWAT; +&MAN-WINBINDD; + + diff --git a/docs/docbook/manpages/samba.7.sgml b/docs/docbook/manpages/samba.7.sgml index c5b5f13174f..a5d486259f4 100644 --- a/docs/docbook/manpages/samba.7.sgml +++ b/docs/docbook/manpages/samba.7.sgml @@ -256,6 +256,14 @@ mount CIFS/SMB shares on Linux. + + + smbcquotas + 1 + smbcquotas is a tool that + can set remote QUOTA's on server with NTFS 5. + + diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml index d096cb8a5bb..c56255d13aa 100644 --- a/docs/docbook/projdoc/samba-doc.sgml +++ b/docs/docbook/projdoc/samba-doc.sgml @@ -10,8 +10,8 @@ SAMBA Team
samba@samba.org
 - &person.jht; &person.jelmer; + &person.jht; &person.jerry; Sunday 6 April @@ -106,5 +106,6 @@ for various environments. &Diagnosis; &problems; &BUGS; +&MANUALPAGES; -- cgit From 0594b43d00abe76fb37d8fe5f66c3b427344f4b1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 23:21:44 +0000 Subject: Got in a local document by mistake. Sorry, I need to get some sleep. --- docs/docbook/manpages/manuals.sgml | 49 -------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 docs/docbook/manpages/manuals.sgml diff --git a/docs/docbook/manpages/manuals.sgml b/docs/docbook/manpages/manuals.sgml deleted file mode 100644 index 45a8bfb7de9..00000000000 --- a/docs/docbook/manpages/manuals.sgml +++ /dev/null @@ -1,49 +0,0 @@ - - -Manpages - - -Commands -&MAN-FINDSMB; -&MAN-NMBLOOKUP; -&MAN-RPCCLIENT; -&MAN-SMBCACLS; -&MAN-SMBCLIENT; -&MAN-SMBCONTROL; -&MAN-SMBSH; -&MAN-SMBSTATUS; -&MAN-SMBTAR; -&MAN-TESTPARM; -&MAN-TESTPRNS; -&MAN-VFSTEST; -&MAN-WBINFO; - - - -File formats and conventions -&MAN-LMHOSTS; -&MAN-SMBCONF; -&MAN-SMBPASSWDCONF; - - - -Macro packages and conventions -&MAN-SAMBA; - - - -System management commands -&MAN-NET; -&MAN-NMBD; -&MAN-PDBEDIT; -&MAN-SMBD; -&MAN-SMBGROUPEDIT; -&MAN-SMBMNT; -&MAN-SMBMOUNT; -&MAN-SMBPASSWD; -&MAN-SMBSPOOL; -&MAN-SMBUMOUNT; -&MAN-SWAT; -&MAN-WINBINDD; - - -- cgit From 4eb67c0fd89896e8f419e56d75230ac797f61735 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2003 23:22:21 +0000 Subject: Add smbcquotas manpage written by Metze --- docs/docbook/manpages/smbcquotas.1.sgml | 179 ++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 docs/docbook/manpages/smbcquotas.1.sgml diff --git a/docs/docbook/manpages/smbcquotas.1.sgml b/docs/docbook/manpages/smbcquotas.1.sgml new file mode 100644 index 00000000000..a69312f9d7a --- /dev/null +++ b/docs/docbook/manpages/smbcquotas.1.sgml @@ -0,0 +1,179 @@ + %globalentities; +]> + + + + smbcquotas + 1 + + + + + smbcquotas + Set or get QUOTAs of NTFS 5 shares + + + + + smbcquotas + //server/share + -u user + -L + -F + -S QUOTA_SET_COMMAND + -n + -t + -v + + -d debuglevel + -s configfile + -l logfilebase + -V + + -U username + -N + -k + -A + + + + + + + DESCRIPTION + + This tool is part of the Samba + 7 suite. + + The smbcquotas program manipulates NT Quotas on SMB file shares. + + + + + OPTIONS + + The following options are available to the smbcquotas program. + + + + + -u user + Specifies the user of whom the quotas are get or set. + By default the current user's username will be used. + + + + + + -L + Lists all quota records of the share. + + + + + + -F + Show the share quota status and default limits. + + + + + + -S QUOTA_SET_COMMAND + This command set/modify quotas for a user or on the share, + depending on the QUOTA_SET_COMMAND parameter witch is described later + + + + + -n + This option displays all QUOTA information in numeric + format. The default is to convert SIDs to names and QUOTA limits + to a readable string format. + + + + -t + + Don't actually do anything, only validate the correctness of + the arguments. + + + + + -v + + Be verbose. + + + + &stdarg.help; + &popt.common.samba; + &popt.common.credentials; + + + + + + QUOTA_SET_COMAND + + The format of an ACL is one or more ACL entries separated by + either commas or newlines. An ACL entry is one of the following: + + + for user setting quotas for the specified by -u or the current username: + + + + UQLIM:<username><softlimit><hardlimit> + + + + for setting the share quota defaults limits: + + + + FSQLIM:<softlimit><hardlimit> + + + + for changing the share quota settings: + + + + FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT + + + + EXIT STATUS + + The smbcquotas program sets the exit status + depending on the success or otherwise of the operations performed. + The exit status may be one of the following values. + + If the operation succeeded, smbcquotas returns an exit + status of 0. If smbcquotas couldn't connect to the specified server, + or when there was an error getting or setting the quota(s), an exit status + of 1 is returned. If there was an error parsing any command line + arguments, an exit status of 2 is returned. + + + + VERSION + + This man page is correct for version 3.0 of the Samba suite. + + + + AUTHOR + + The original Samba software and related utilities + were created by Andrew Tridgell. Samba is now developed + by the Samba Team as an Open Source project similar + to the way the Linux kernel is developed. + + smbcacls was written by Stefan Metzmacher. + + + -- cgit From b92d57f784fb43e420cf65b9392d175ad4483f28 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 15 Apr 2003 02:47:01 +0000 Subject: A struct must contain at least one declaration according to C99, but gcc allows it to be empty. Should fix miscellaneous breakage on the compile farm. --- source/include/rpc_echo.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/include/rpc_echo.h b/source/include/rpc_echo.h index 8fa389cf569..6b4ea6abfba 100644 --- a/source/include/rpc_echo.h +++ b/source/include/rpc_echo.h @@ -69,6 +69,7 @@ typedef struct echo_q_sink_data typedef struct echo_r_sink_data { + int dummy; /* unused */ } ECHO_R_SINK_DATA; #endif -- cgit From 53dcaf2271ad1b845ace9730d6c68db80bf9704e Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 15 Apr 2003 03:43:24 +0000 Subject: Use picobjs when building python extensions. Spotted by Steve Langasek. --- source/Makefile.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index 7509edef787..c08302e4b43 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1166,19 +1166,25 @@ PYTHON_OBJS = $(PARAM_OBJ) $(LIB_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) \ $(UBIQX_OBJ) $(LIBMSRPC_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ $(SECRETS_OBJ) $(KRBCLIENT_OBJ) -python_ext: $(PYTHON_OBJS) +PYTHON_PICOBJS = $(PYTHON_OBJS:.o=.po) + +python_ext: $(PYTHON_PICOBJS) @if test -z "$(PYTHON)"; then \ echo Use the option --with-python to configure python; \ - exit 1; fi - PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \ + exit 1; \ + fi + PYTHON_OBJS="$(PYTHON_PICOBJS)" \ + PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \ LIBS="$(LIBS) $(PASSDBLIBS) $(KRB5LIBS)" \ $(PYTHON) python/setup.py build -python_install: $(PYTHON_OBJS) +python_install: $(PYTHON_PICOBJS) @if test -z "$(PYTHON)"; then \ echo Use the option --with-python to configure python; \ - exit 1; fi - PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \ + exit 1; \ + fi + PYTHON_OBJS="$(PYTHON_PICOBJS)" \ + PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \ LIBS="$(LIBS)" \ $(PYTHON) python/setup.py install -- cgit From 38efab087c86cab805c6b94c7455befaa9e94c5e Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 15 Apr 2003 03:54:07 +0000 Subject: Add string message for WERR_SERVER_UNAVAILABLE. --- source/libsmb/doserr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c index c9de4cf3199..c6348568cf9 100644 --- a/source/libsmb/doserr.c +++ b/source/libsmb/doserr.c @@ -67,6 +67,7 @@ werror_code_struct dos_errs[] = { "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT }, { "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR }, { "WERR_INVALID_OWNER", WERR_INVALID_OWNER }, + { "WERR_SERVER_UNAVAILABLE", WERR_SERVER_UNAVAILABLE }, { NULL, W_ERROR(0) } }; -- cgit From 0a87d668a07b840c2e0ac9f6caad04e542422d40 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 15 Apr 2003 04:08:59 +0000 Subject: Typo in comment. --- source/rpc_server/srv_spoolss_nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index 45522748c9f..026484d96d3 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/rpc_server/srv_spoolss_nt.c @@ -2623,7 +2623,7 @@ static BOOL srv_spoolss_replyopenprinter(int snum, const char *printer, /* * If it's the first connection, contact the client - * and connect to the IPC$ share anonumously + * and connect to the IPC$ share anonymously */ if (smb_connections==0) { fstring unix_printer; -- cgit From a690ff1f8a068e66ffcbfdaf0be215f887a02b9c Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 15 Apr 2003 07:47:02 +0000 Subject: Convert another group of options in Misc section --- docs/docbook/smbdotconf/misc/copy.xml | 31 +++--- docs/docbook/smbdotconf/misc/default.xml | 14 ++- docs/docbook/smbdotconf/misc/dfreecommand.xml | 66 ++++++------ docs/docbook/smbdotconf/misc/exec.xml | 14 ++- docs/docbook/smbdotconf/misc/homedirmap.xml | 50 ++++----- docs/docbook/smbdotconf/misc/include.xml | 28 ++--- docs/docbook/smbdotconf/misc/messagecommand.xml | 118 ++++++++++++---------- docs/docbook/smbdotconf/misc/nishomedir.xml | 55 +++++----- docs/docbook/smbdotconf/misc/preexec.xml | 38 +++---- docs/docbook/smbdotconf/misc/remoteannounce.xml | 53 +++++----- docs/docbook/smbdotconf/misc/remotebrowsesync.xml | 56 +++++----- docs/docbook/smbdotconf/misc/socketaddress.xml | 26 ++--- docs/docbook/smbdotconf/misc/timeoffset.xml | 24 +++-- 13 files changed, 310 insertions(+), 263 deletions(-) diff --git a/docs/docbook/smbdotconf/misc/copy.xml b/docs/docbook/smbdotconf/misc/copy.xml index a7945af8ae1..c3152956b04 100644 --- a/docs/docbook/smbdotconf/misc/copy.xml +++ b/docs/docbook/smbdotconf/misc/copy.xml @@ -1,15 +1,20 @@ - - copy (S) - This parameter allows you to "clone" service - entries. The specified service is simply duplicated under the - current service's name. Any parameters specified in the current - section will override those in the section being copied. + + + This parameter allows you to "clone" service + entries. The specified service is simply duplicated under the + current service's name. Any parameters specified in the current + section will override those in the section being copied. - This feature lets you set up a 'template' service and - create similar services easily. Note that the service being - copied must occur earlier in the configuration file than the - service doing the copying. + This feature lets you set up a 'template' service and + create similar services easily. Note that the service being + copied must occur earlier in the configuration file than the + service doing the copying. - Default: no value - Example: copy = otherservice - + Default: no value + + Example: copy = otherservice + + diff --git a/docs/docbook/smbdotconf/misc/default.xml b/docs/docbook/smbdotconf/misc/default.xml index c396d1947b6..7afaba640ba 100644 --- a/docs/docbook/smbdotconf/misc/default.xml +++ b/docs/docbook/smbdotconf/misc/default.xml @@ -1,5 +1,9 @@ - - default (G) - A synonym for - default service. - + + + A synonym for + default service. + + diff --git a/docs/docbook/smbdotconf/misc/dfreecommand.xml b/docs/docbook/smbdotconf/misc/dfreecommand.xml index c71ec8e00bd..1e839a5242e 100644 --- a/docs/docbook/smbdotconf/misc/dfreecommand.xml +++ b/docs/docbook/smbdotconf/misc/dfreecommand.xml @@ -1,50 +1,52 @@ - - dfree command (G) - The dfree command setting should - only be used on systems where a problem occurs with the internal - disk space calculations. This has been known to happen with Ultrix, - but may occur with other operating systems. The symptom that was - seen was an error of "Abort Retry Ignore" at the end of each - directory listing. + + + + The dfree command setting + should only be used on systems where a problem occurs with the + internal disk space calculations. This has been known to happen + with Ultrix, but may occur with other operating systems. The + symptom that was seen was an error of "Abort Retry + Ignore" at the end of each directory listing. - This setting allows the replacement of the internal routines to - calculate the total disk space and amount available with an external - routine. The example below gives a possible script that might fulfill - this function. + This setting allows the replacement of the internal routines to + calculate the total disk space and amount available with an external + routine. The example below gives a possible script that might fulfill + this function. - The external program will be passed a single parameter indicating - a directory in the filesystem being queried. This will typically consist - of the string ./. The script should return two - integers in ASCII. The first should be the total disk space in blocks, - and the second should be the number of available blocks. An optional - third return value can give the block size in bytes. The default - blocksize is 1024 bytes. + The external program will be passed a single parameter indicating + a directory in the filesystem being queried. This will typically consist + of the string ./. The script should return two + integers in ASCII. The first should be the total disk space in blocks, + and the second should be the number of available blocks. An optional + third return value can give the block size in bytes. The default + blocksize is 1024 bytes. - Note: Your script should NOT be setuid or - setgid and should be owned by (and writeable only by) root! + Note: Your script should NOT be setuid or + setgid and should be owned by (and writeable only by) root! - Default: By default internal routines for - determining the disk capacity and remaining space will be used. - + Default: By default internal routines for + determining the disk capacity and remaining space will be used. + - Example: dfree command = /usr/local/samba/bin/dfree - + Example: dfree command = /usr/local/samba/bin/dfree - Where the script dfree (which must be made executable) could be: + Where the script dfree (which must be made executable) could be: #!/bin/sh df $1 | tail -1 | awk '{print $2" "$4}' - or perhaps (on Sys V based systems): + or perhaps (on Sys V based systems): #!/bin/sh /usr/bin/df -k $1 | tail -1 | awk '{print $3" "$5}' - Note that you may have to replace the command names - with full path names on some systems. - - + Note that you may have to replace the command names with full path names on some systems. + + diff --git a/docs/docbook/smbdotconf/misc/exec.xml b/docs/docbook/smbdotconf/misc/exec.xml index 34963c90b21..0d44d81bffc 100644 --- a/docs/docbook/smbdotconf/misc/exec.xml +++ b/docs/docbook/smbdotconf/misc/exec.xml @@ -1,5 +1,9 @@ - - exec (S) - This is a synonym for - preexec. - + + + This is a synonym for + preexec. + + diff --git a/docs/docbook/smbdotconf/misc/homedirmap.xml b/docs/docbook/smbdotconf/misc/homedirmap.xml index 41e6ca5ea17..d4f09c7f50c 100644 --- a/docs/docbook/smbdotconf/misc/homedirmap.xml +++ b/docs/docbook/smbdotconf/misc/homedirmap.xml @@ -1,28 +1,32 @@ - - homedir map (G) - Ifnis homedir - is yes, and smbd - 8 is also acting - as a Win95/98 logon server then this parameter - specifies the NIS (or YP) map from which the server for the user's - home directory should be extracted. At present, only the Sun - auto.home map format is understood. The form of the map is: + + + Ifnis homedir + is yes, and smbd + 8 is also acting + as a Win95/98 logon server then this parameter + specifies the NIS (or YP) map from which the server for the user's + home directory should be extracted. At present, only the Sun + auto.home map format is understood. The form of the map is: - username server:/some/file/system + username server:/some/file/system - and the program will extract the servername from before - the first ':'. There should probably be a better parsing system - that copes with different map formats and also Amd (another - automounter) maps. + and the program will extract the servername from before + the first ':'. There should probably be a better parsing system + that copes with different map formats and also Amd (another + automounter) maps. - A working NIS client is required on - the system for this option to work. + A working NIS client is required on + the system for this option to work. - See also nis homedir - , domain logons - . + See also nis homedir + , domain logons + . - Default: homedir map = <empty string> - Example: homedir map = amd.homedir - - + Default: homedir map = <empty string> + + Example: homedir map = amd.homedir + + diff --git a/docs/docbook/smbdotconf/misc/include.xml b/docs/docbook/smbdotconf/misc/include.xml index 81230d43574..dcc32968e72 100644 --- a/docs/docbook/smbdotconf/misc/include.xml +++ b/docs/docbook/smbdotconf/misc/include.xml @@ -1,14 +1,18 @@ - - include (G) - This allows you to include one config file - inside another. The file is included literally, as though typed - in place. + + + This allows you to include one config file + inside another. The file is included literally, as though typed + in place. - It takes the standard substitutions, except %u - , %P and %S. - + It takes the standard substitutions, except %u + , %P and %S. + - Default: no file included - Example: include = /usr/local/samba/lib/admin_smb.conf - - + Default: no file included + + Example: include = /usr/local/samba/lib/admin_smb.conf + + diff --git a/docs/docbook/smbdotconf/misc/messagecommand.xml b/docs/docbook/smbdotconf/misc/messagecommand.xml index 199fab56106..6df2a02bb79 100644 --- a/docs/docbook/smbdotconf/misc/messagecommand.xml +++ b/docs/docbook/smbdotconf/misc/messagecommand.xml @@ -1,65 +1,73 @@ - - message command (G) - This specifies what command to run when the - server receives a WinPopup style message. - - This would normally be a command that would - deliver the message somehow. How this is to be done is - up to your imagination. - - An example is: - - message command = csh -c 'xedit %s;rm %s' & - - - This delivers the message using xedit, then - removes it afterwards. NOTE THAT IT IS VERY IMPORTANT - THAT THIS COMMAND RETURN IMMEDIATELY. That's why I - have the '&' on the end. If it doesn't return immediately then - your PCs may freeze when sending messages (they should recover - after 30 seconds, hopefully). - - All messages are delivered as the global guest user. - The command takes the standard substitutions, although - %u won't work (%U may be better - in this case). - - Apart from the standard substitutions, some additional - ones apply. In particular: - - - %s = the filename containing - the message. + + + This specifies what command to run when the + server receives a WinPopup style message. + + This would normally be a command that would + deliver the message somehow. How this is to be done is + up to your imagination. + + An example is: + + message command = csh -c 'xedit %s;rm %s' & + + + This delivers the message using xedit, then + removes it afterwards. NOTE THAT IT IS VERY IMPORTANT + THAT THIS COMMAND RETURN IMMEDIATELY. That's why I + have the '&' on the end. If it doesn't return immediately then + your PCs may freeze when sending messages (they should recover + after 30 seconds, hopefully). + + All messages are delivered as the global guest user. + The command takes the standard substitutions, although + %u won't work (%U may be better + in this case). + + Apart from the standard substitutions, some additional + ones apply. In particular: + + + + %s = the filename containing + the message. + - %t = the destination that - the message was sent to (probably the server name). + + %t = the destination that + the message was sent to (probably the server name). + - %f = who the message - is from. - + + %f = who the message + is from. + + - You could make this command send mail, or whatever else - takes your fancy. Please let us know of any really interesting - ideas you have. + You could make this command send mail, or whatever else + takes your fancy. Please let us know of any really interesting + ideas you have. + Here's a way of sending the messages as mail to root: - Here's a way of sending the messages as mail to root: + message command = /bin/mail -s 'message from %f on + %m' root < %s; rm %s - message command = /bin/mail -s 'message from %f on - %m' root < %s; rm %s + If you don't have a message command then the message + won't be delivered and Samba will tell the sender there was + an error. Unfortunately WfWg totally ignores the error code + and carries on regardless, saying that the message was delivered. + - If you don't have a message command then the message - won't be delivered and Samba will tell the sender there was - an error. Unfortunately WfWg totally ignores the error code - and carries on regardless, saying that the message was delivered. - + If you want to silently delete it then try: - If you want to silently delete it then try: + message command = rm %s - message command = rm %s + Default: no message command - Default: no message command - Example: message command = csh -c 'xedit %s; - rm %s' & - - + Example: message command = csh -c 'xedit %s; rm %s' & + + diff --git a/docs/docbook/smbdotconf/misc/nishomedir.xml b/docs/docbook/smbdotconf/misc/nishomedir.xml index 5a2980d4fd2..734dcf8de50 100644 --- a/docs/docbook/smbdotconf/misc/nishomedir.xml +++ b/docs/docbook/smbdotconf/misc/nishomedir.xml @@ -1,30 +1,33 @@ - - nis homedir (G) - Get the home share server from a NIS map. For - UNIX systems that use an automounter, the user's home directory - will often be mounted on a workstation on demand from a remote - server. + + + Get the home share server from a NIS map. For + UNIX systems that use an automounter, the user's home directory + will often be mounted on a workstation on demand from a remote + server. - When the Samba logon server is not the actual home directory - server, but is mounting the home directories via NFS then two - network hops would be required to access the users home directory - if the logon server told the client to use itself as the SMB server - for home directories (one over SMB and one over NFS). This can - be very slow. + When the Samba logon server is not the actual home directory + server, but is mounting the home directories via NFS then two + network hops would be required to access the users home directory + if the logon server told the client to use itself as the SMB server + for home directories (one over SMB and one over NFS). This can + be very slow. - This option allows Samba to return the home share as - being on a different server to the logon server and as - long as a Samba daemon is running on the home directory server, - it will be mounted on the Samba client directly from the directory - server. When Samba is returning the home share to the client, it - will consult the NIS map specified in - homedir map and return the server - listed there. + This option allows Samba to return the home share as + being on a different server to the logon server and as + long as a Samba daemon is running on the home directory server, + it will be mounted on the Samba client directly from the directory + server. When Samba is returning the home share to the client, it + will consult the NIS map specified in + homedir map and return the server + listed there. - Note that for this option to work there must be a working - NIS system and the Samba server with this option must also - be a logon server. + Note that for this option to work there must be a working + NIS system and the Samba server with this option must also + be a logon server. - Default: nis homedir = no - - + Default: nis homedir = no + + diff --git a/docs/docbook/smbdotconf/misc/preexec.xml b/docs/docbook/smbdotconf/misc/preexec.xml index fc047e008de..18c3345c6ca 100644 --- a/docs/docbook/smbdotconf/misc/preexec.xml +++ b/docs/docbook/smbdotconf/misc/preexec.xml @@ -1,23 +1,25 @@ - - preexec (S) - This option specifies a command to be run whenever - the service is connected to. It takes the usual substitutions. + + + This option specifies a command to be run whenever + the service is connected to. It takes the usual substitutions. - An interesting example is to send the users a welcome - message every time they log in. Maybe a message of the day? Here - is an example: + An interesting example is to send the users a welcome + message every time they log in. Maybe a message of the day? Here + is an example: - preexec = csh -c 'echo \"Welcome to %S!\" | - /usr/local/samba/bin/smbclient -M %m -I %I' & + preexec = csh -c 'echo \"Welcome to %S!\" | /usr/local/samba/bin/smbclient -M %m -I %I' & - Of course, this could get annoying after a while :-) + Of course, this could get annoying after a while :-) - See also preexec close - and postexec - . + See also preexec close and postexec + . - Default: none (no command executed) - Example: preexec = echo \"%u connected to %S from %m - (%I)\" >> /tmp/log - - + Default: none (no command executed) + + Example: preexec = echo \"%u connected to %S from %m (%I)\" >> /tmp/log + + diff --git a/docs/docbook/smbdotconf/misc/remoteannounce.xml b/docs/docbook/smbdotconf/misc/remoteannounce.xml index e6de4bdcaf1..019cc306a7b 100644 --- a/docs/docbook/smbdotconf/misc/remoteannounce.xml +++ b/docs/docbook/smbdotconf/misc/remoteannounce.xml @@ -1,32 +1,35 @@ - - remote announce (G) - This option allows you to setup nmbd(8) to periodically announce itself - to arbitrary IP addresses with an arbitrary workgroup name. + + + This option allows you to setup nmbd + 8to periodically announce itself + to arbitrary IP addresses with an arbitrary workgroup name. - This is useful if you want your Samba server to appear - in a remote workgroup for which the normal browse propagation - rules don't work. The remote workgroup can be anywhere that you - can send IP packets to. + This is useful if you want your Samba server to appear + in a remote workgroup for which the normal browse propagation + rules don't work. The remote workgroup can be anywhere that you + can send IP packets to. - For example: + For example: - remote announce = 192.168.2.255/SERVERS - 192.168.4.255/STAFF + remote announce = 192.168.2.255/SERVERS + 192.168.4.255/STAFF - the above line would cause nmbd to announce itself - to the two given IP addresses using the given workgroup names. - If you leave out the workgroup name then the one given in - the workgroup - parameter is used instead. + the above line would cause nmbd to announce itself + to the two given IP addresses using the given workgroup names. + If you leave out the workgroup name then the one given in + the workgroup + parameter is used instead. - The IP addresses you choose would normally be the broadcast - addresses of the remote networks, but can also be the IP addresses - of known browse masters if your network config is that stable. + The IP addresses you choose would normally be the broadcast + addresses of the remote networks, but can also be the IP addresses + of known browse masters if your network config is that stable. - See the documentation file BROWSING - in the docs/ directory. + See the documentation file BROWSING + in the docs/ directory. - Default: remote announce = <empty string> - - - + Default: remote announce = <empty string> + + diff --git a/docs/docbook/smbdotconf/misc/remotebrowsesync.xml b/docs/docbook/smbdotconf/misc/remotebrowsesync.xml index 8b0d863ed7c..06069581e65 100644 --- a/docs/docbook/smbdotconf/misc/remotebrowsesync.xml +++ b/docs/docbook/smbdotconf/misc/remotebrowsesync.xml @@ -1,33 +1,35 @@ - - remote browse sync (G) - This option allows you to setup nmbd(8) to periodically request - synchronization of browse lists with the master browser of a Samba - server that is on a remote segment. This option will allow you to - gain browse lists for multiple workgroups across routed networks. This - is done in a manner that does not work with any non-Samba servers. + + + This option allows you to setup nmbd + 8 to periodically request + synchronization of browse lists with the master browser of a Samba + server that is on a remote segment. This option will allow you to + gain browse lists for multiple workgroups across routed networks. This + is done in a manner that does not work with any non-Samba servers. - This is useful if you want your Samba server and all local - clients to appear in a remote workgroup for which the normal browse - propagation rules don't work. The remote workgroup can be anywhere - that you can send IP packets to. + This is useful if you want your Samba server and all local + clients to appear in a remote workgroup for which the normal browse + propagation rules don't work. The remote workgroup can be anywhere + that you can send IP packets to. - For example: + For example: - remote browse sync = 192.168.2.255 192.168.4.255 - + remote browse sync = 192.168.2.255 192.168.4.255 - the above line would cause nmbd to request - the master browser on the specified subnets or addresses to - synchronize their browse lists with the local server. + the above line would cause nmbd to request + the master browser on the specified subnets or addresses to + synchronize their browse lists with the local server. - The IP addresses you choose would normally be the broadcast - addresses of the remote networks, but can also be the IP addresses - of known browse masters if your network config is that stable. If - a machine IP address is given Samba makes NO attempt to validate - that the remote machine is available, is listening, nor that it - is in fact the browse master on its segment. + The IP addresses you choose would normally be the broadcast + addresses of the remote networks, but can also be the IP addresses + of known browse masters if your network config is that stable. If + a machine IP address is given Samba makes NO attempt to validate + that the remote machine is available, is listening, nor that it + is in fact the browse master on its segment. - Default: remote browse sync = <empty string> - - - + Default: remote browse sync = <empty string> + + diff --git a/docs/docbook/smbdotconf/misc/socketaddress.xml b/docs/docbook/smbdotconf/misc/socketaddress.xml index e77737f18b5..4d2299acda3 100644 --- a/docs/docbook/smbdotconf/misc/socketaddress.xml +++ b/docs/docbook/smbdotconf/misc/socketaddress.xml @@ -1,14 +1,16 @@ - - socket address (G) - This option allows you to control what - address Samba will listen for connections on. This is used to - support multiple virtual interfaces on the one server, each - with a different configuration. + + + This option allows you to control what + address Samba will listen for connections on. This is used to + support multiple virtual interfaces on the one server, each + with a different configuration. - By default Samba will accept connections on any - address. + By default Samba will accept connections on any + address. - Example: socket address = 192.168.2.20 - - - + Example: socket address = 192.168.2.20 + + diff --git a/docs/docbook/smbdotconf/misc/timeoffset.xml b/docs/docbook/smbdotconf/misc/timeoffset.xml index 0c973234c39..4cd12b6d361 100644 --- a/docs/docbook/smbdotconf/misc/timeoffset.xml +++ b/docs/docbook/smbdotconf/misc/timeoffset.xml @@ -1,11 +1,15 @@ - - time offset (G) - This parameter is a setting in minutes to add - to the normal GMT to local time conversion. This is useful if - you are serving a lot of PCs that have incorrect daylight - saving time handling. + + + This parameter is a setting in minutes to add + to the normal GMT to local time conversion. This is useful if + you are serving a lot of PCs that have incorrect daylight + saving time handling. - Default: time offset = 0 - Example: time offset = 60 - - + Default: time offset = 0 + + Example: time offset = 60 + + -- cgit From 43f8ae46137ed653c5694a839a5e6757e4a89974 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 15 Apr 2003 08:09:55 +0000 Subject: Convert another group of options in Misc section --- docs/docbook/smbdotconf/misc/available.xml | 22 ++++++------ docs/docbook/smbdotconf/misc/dontdescend.xml | 35 +++++++++--------- docs/docbook/smbdotconf/misc/followsymlinks.xml | 35 +++++++++--------- docs/docbook/smbdotconf/misc/fstype.xml | 30 +++++++++------- docs/docbook/smbdotconf/misc/postexec.xml | 34 +++++++++--------- docs/docbook/smbdotconf/misc/preexecclose.xml | 19 +++++----- docs/docbook/smbdotconf/misc/rootpostexec.xml | 26 +++++++------- docs/docbook/smbdotconf/misc/rootpreexec.xml | 28 ++++++++------- docs/docbook/smbdotconf/misc/rootpreexecclose.xml | 23 ++++++------ docs/docbook/smbdotconf/misc/setdirectory.xml | 24 +++++++------ docs/docbook/smbdotconf/misc/sourceenvironment.xml | 42 ++++++++++++---------- docs/docbook/smbdotconf/misc/volume.xml | 18 +++++----- docs/docbook/smbdotconf/misc/widelinks.xml | 28 ++++++++------- 13 files changed, 198 insertions(+), 166 deletions(-) diff --git a/docs/docbook/smbdotconf/misc/available.xml b/docs/docbook/smbdotconf/misc/available.xml index 025c1c06fbb..20931b3063b 100644 --- a/docs/docbook/smbdotconf/misc/available.xml +++ b/docs/docbook/smbdotconf/misc/available.xml @@ -1,11 +1,13 @@ - - available (S) - This parameter lets you "turn off" a service. If - available = no, then ALL - attempts to connect to the service will fail. Such failures are - logged. + + + This parameter lets you "turn off" a service. If + available = no, then ALL + attempts to connect to the service will fail. Such failures are + logged. - Default: available = yes - - - + Default: available = yes + + diff --git a/docs/docbook/smbdotconf/misc/dontdescend.xml b/docs/docbook/smbdotconf/misc/dontdescend.xml index 8136f293df3..d3e9fb2d5c8 100644 --- a/docs/docbook/smbdotconf/misc/dontdescend.xml +++ b/docs/docbook/smbdotconf/misc/dontdescend.xml @@ -1,18 +1,21 @@ - - dont descend (S) - There are certain directories on some systems - (e.g., the /proc tree under Linux) that are either not - of interest to clients or are infinitely deep (recursive). This - parameter allows you to specify a comma-delimited list of directories - that the server should always show as empty. + + + There are certain directories on some systems + (e.g., the /proc tree under Linux) that are either not + of interest to clients or are infinitely deep (recursive). This + parameter allows you to specify a comma-delimited list of directories + that the server should always show as empty. - Note that Samba can be very fussy about the exact format - of the "dont descend" entries. For example you may need - ./proc instead of just /proc. - Experimentation is the best policy :-) + Note that Samba can be very fussy about the exact format + of the "dont descend" entries. For example you may need + ./proc instead of just /proc. + Experimentation is the best policy :-) - Default: none (i.e., all directories are OK - to descend) - Example: dont descend = /proc,/dev - - + Default: none (i.e., all directories are OK + to descend) + + Example: dont descend = /proc,/dev + + diff --git a/docs/docbook/smbdotconf/misc/followsymlinks.xml b/docs/docbook/smbdotconf/misc/followsymlinks.xml index 88526da3203..1b22eb9e646 100644 --- a/docs/docbook/smbdotconf/misc/followsymlinks.xml +++ b/docs/docbook/smbdotconf/misc/followsymlinks.xml @@ -1,18 +1,21 @@ - - follow symlinks (S) - This parameter allows the Samba administrator - to stop smbd - 8 from following symbolic - links in a particular share. Setting this - parameter to no prevents any file or directory - that is a symbolic link from being followed (the user will get an - error). This option is very useful to stop users from adding a - symbolic link to /etc/passwd in their home - directory for instance. However it will slow filename lookups - down slightly. + + + This parameter allows the Samba administrator + to stop smbd + 8 from following symbolic + links in a particular share. Setting this + parameter to no prevents any file or directory + that is a symbolic link from being followed (the user will get an + error). This option is very useful to stop users from adding a + symbolic link to /etc/passwd in their home + directory for instance. However it will slow filename lookups + down slightly. - This option is enabled (i.e. smbd will - follow symbolic links) by default. + This option is enabled (i.e. smbd will + follow symbolic links) by default. - Default: follow symlinks = yes - + Default: follow symlinks = yes + + diff --git a/docs/docbook/smbdotconf/misc/fstype.xml b/docs/docbook/smbdotconf/misc/fstype.xml index 566bccb4659..4b9c67b2020 100644 --- a/docs/docbook/smbdotconf/misc/fstype.xml +++ b/docs/docbook/smbdotconf/misc/fstype.xml @@ -1,14 +1,18 @@ - - fstype (S) - This parameter allows the administrator to - configure the string that specifies the type of filesystem a share - is using that is reported by smbd - 8 when a client queries the filesystem type - for a share. The default type is NTFS for - compatibility with Windows NT but this can be changed to other - strings such as Samba or FAT - if required. + + + This parameter allows the administrator to + configure the string that specifies the type of filesystem a share + is using that is reported by smbd + 8 when a client queries the filesystem type + for a share. The default type is NTFS for + compatibility with Windows NT but this can be changed to other + strings such as Samba or FAT + if required. - Default: fstype = NTFS - Example: fstype = Samba - + Default: fstype = NTFS + + Example: fstype = Samba + + diff --git a/docs/docbook/smbdotconf/misc/postexec.xml b/docs/docbook/smbdotconf/misc/postexec.xml index 017177be3d1..a6b65515ad2 100644 --- a/docs/docbook/smbdotconf/misc/postexec.xml +++ b/docs/docbook/smbdotconf/misc/postexec.xml @@ -1,22 +1,22 @@ - - postexec (S) - This option specifies a command to be run - whenever the service is disconnected. It takes the usual - substitutions. The command may be run as the root on some - systems. + + + This option specifies a command to be run + whenever the service is disconnected. It takes the usual + substitutions. The command may be run as the root on some + systems. - An interesting example may be to unmount server - resources: + An interesting example may be to unmount server + resources: - postexec = /etc/umount /cdrom + postexec = /etc/umount /cdrom - See also preexec - . + See also preexec. - Default: none (no command executed) - + Default: none (no command executed) - Example: postexec = echo \"%u disconnected from %S - from %m (%I)\" >> /tmp/log - - + Example: postexec = echo \"%u disconnected from %S from %m (%I)\" >> /tmp/log + + diff --git a/docs/docbook/smbdotconf/misc/preexecclose.xml b/docs/docbook/smbdotconf/misc/preexecclose.xml index c617a7f7faa..346d21dbd80 100644 --- a/docs/docbook/smbdotconf/misc/preexecclose.xml +++ b/docs/docbook/smbdotconf/misc/preexecclose.xml @@ -1,9 +1,12 @@ - - preexec close (S) - This boolean option controls whether a non-zero - return code from preexec - should close the service being connected to. + + + This boolean option controls whether a non-zero + return code from preexec + should close the service being connected to. - Default: preexec close = no - - + Default: preexec close = no + + diff --git a/docs/docbook/smbdotconf/misc/rootpostexec.xml b/docs/docbook/smbdotconf/misc/rootpostexec.xml index ed606466778..baed0043272 100644 --- a/docs/docbook/smbdotconf/misc/rootpostexec.xml +++ b/docs/docbook/smbdotconf/misc/rootpostexec.xml @@ -1,14 +1,16 @@ - - root postexec (S) - This is the same as the postexec - parameter except that the command is run as root. This - is useful for unmounting filesystems - (such as CDROMs) after a connection is closed. + + + This is the same as the postexec + parameter except that the command is run as root. This + is useful for unmounting filesystems + (such as CDROMs) after a connection is closed. - See also - postexec. + See also + postexec. - Default: root postexec = <empty string> - - - + Default: root postexec = <empty string> + + diff --git a/docs/docbook/smbdotconf/misc/rootpreexec.xml b/docs/docbook/smbdotconf/misc/rootpreexec.xml index 29802b6d631..4939d1ee480 100644 --- a/docs/docbook/smbdotconf/misc/rootpreexec.xml +++ b/docs/docbook/smbdotconf/misc/rootpreexec.xml @@ -1,15 +1,17 @@ - - root preexec (S) - This is the same as the preexec - parameter except that the command is run as root. This - is useful for mounting filesystems (such as CDROMs) when a - connection is opened. + + + This is the same as the preexec + parameter except that the command is run as root. This + is useful for mounting filesystems (such as CDROMs) when a + connection is opened. - See also - preexec and - preexec close. + See also + preexec and + preexec close. - Default: root preexec = <empty string> - - - + Default: root preexec = <empty string> + + diff --git a/docs/docbook/smbdotconf/misc/rootpreexecclose.xml b/docs/docbook/smbdotconf/misc/rootpreexecclose.xml index d21b0dd7b55..b333cffe902 100644 --- a/docs/docbook/smbdotconf/misc/rootpreexecclose.xml +++ b/docs/docbook/smbdotconf/misc/rootpreexecclose.xml @@ -1,12 +1,15 @@ - - root preexec close (S) - This is the same as the preexec close - parameter except that the command is run as root. + + + This is the same as the preexec close + parameter except that the command is run as root. - See also - preexec and - preexec close. + See also + preexec and + preexec close. - Default: root preexec close = no - - + Default: root preexec close = no + + diff --git a/docs/docbook/smbdotconf/misc/setdirectory.xml b/docs/docbook/smbdotconf/misc/setdirectory.xml index 860632cdaf0..b4ff72d4d0a 100644 --- a/docs/docbook/smbdotconf/misc/setdirectory.xml +++ b/docs/docbook/smbdotconf/misc/setdirectory.xml @@ -1,13 +1,15 @@ - - set directory (S) - If set directory = no, then - users of the service may not use the setdir command to change - directory. + + + If set directory = no, then + users of the service may not use the setdir command to change + directory. - The setdir command is only implemented - in the Digital Pathworks client. See the Pathworks documentation - for details. + The setdir command is only implemented + in the Digital Pathworks client. See the Pathworks documentation + for details. - Default: set directory = no - - + Default: set directory = no + + diff --git a/docs/docbook/smbdotconf/misc/sourceenvironment.xml b/docs/docbook/smbdotconf/misc/sourceenvironment.xml index 07a8abce4d6..c6b4ce368ff 100644 --- a/docs/docbook/smbdotconf/misc/sourceenvironment.xml +++ b/docs/docbook/smbdotconf/misc/sourceenvironment.xml @@ -1,23 +1,27 @@ - - source environment (G) - This parameter causes Samba to set environment - variables as per the content of the file named. + + + This parameter causes Samba to set environment + variables as per the content of the file named. - If the value of this parameter starts with a "|" character - then Samba will treat that value as a pipe command to open and - will set the environment variables from the output of the pipe. + If the value of this parameter starts with a "|" character + then Samba will treat that value as a pipe command to open and + will set the environment variables from the output of the pipe. - The contents of the file or the output of the pipe should - be formatted as the output of the standard Unix env(1) - command. This is of the form : - Example environment entry: - SAMBA_NETBIOS_NAME = myhostname + The contents of the file or the output of the pipe should + be formatted as the output of the standard Unix env(1) command. This is of the form: - Default: No default value - Examples: source environment = |/etc/smb.conf.sh - + Example environment entry: - Example: source environment = - /usr/local/smb_env_vars - - + SAMBA_NETBIOS_NAME = myhostname + + Default: No default value + + Examples: source environment = |/etc/smb.conf.sh + + Example: source environment = + /usr/local/smb_env_vars + + diff --git a/docs/docbook/smbdotconf/misc/volume.xml b/docs/docbook/smbdotconf/misc/volume.xml index f0a82c6f0c4..0ab5edb5224 100644 --- a/docs/docbook/smbdotconf/misc/volume.xml +++ b/docs/docbook/smbdotconf/misc/volume.xml @@ -1,9 +1,11 @@ - - volume (S) - This allows you to override the volume label - returned for a share. Useful for CDROMs with installation programs - that insist on a particular volume label. + + + This allows you to override the volume label + returned for a share. Useful for CDROMs with installation programs + that insist on a particular volume label. - Default: the name of the share - - + Default: the name of the share + + diff --git a/docs/docbook/smbdotconf/misc/widelinks.xml b/docs/docbook/smbdotconf/misc/widelinks.xml index b3474ce26c2..ead3569fd9a 100644 --- a/docs/docbook/smbdotconf/misc/widelinks.xml +++ b/docs/docbook/smbdotconf/misc/widelinks.xml @@ -1,15 +1,17 @@ - - wide links (S) - This parameter controls whether or not links - in the UNIX file system may be followed by the server. Links - that point to areas within the directory tree exported by the - server are always allowed; this parameter controls access only - to areas that are outside the directory tree being exported. + + + This parameter controls whether or not links + in the UNIX file system may be followed by the server. Links + that point to areas within the directory tree exported by the + server are always allowed; this parameter controls access only + to areas that are outside the directory tree being exported. - Note that setting this parameter can have a negative - effect on your server performance due to the extra system calls - that Samba has to do in order to perform the link checks. + Note that setting this parameter can have a negative + effect on your server performance due to the extra system calls + that Samba has to do in order to perform the link checks. - Default: wide links = yes - - + Default: wide links = yes + + -- cgit From b4cf8a641d63481717c62044d2548e4b0301d806 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 15 Apr 2003 08:42:05 +0000 Subject: Fix some minor typos --- docs/docbook/smbdotconf/generate-context.xsl | 3 +-- docs/docbook/smbdotconf/misc/default.xml | 2 +- docs/docbook/smbdotconf/misc/preexec.xml | 2 +- docs/docbook/smbdotconf/printing/printcapname.xml | 2 +- docs/docbook/smbdotconf/security/createmask.xml | 2 +- docs/docbook/smbdotconf/security/minpasswordlength.xml | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/docbook/smbdotconf/generate-context.xsl b/docs/docbook/smbdotconf/generate-context.xsl index c9ca31085cd..13fb2167008 100644 --- a/docs/docbook/smbdotconf/generate-context.xsl +++ b/docs/docbook/smbdotconf/generate-context.xsl @@ -48,8 +48,7 @@ - - + diff --git a/docs/docbook/smbdotconf/misc/default.xml b/docs/docbook/smbdotconf/misc/default.xml index 7afaba640ba..fce58dc40ba 100644 --- a/docs/docbook/smbdotconf/misc/default.xml +++ b/docs/docbook/smbdotconf/misc/default.xml @@ -1,4 +1,4 @@ - diff --git a/docs/docbook/smbdotconf/misc/preexec.xml b/docs/docbook/smbdotconf/misc/preexec.xml index 18c3345c6ca..49c73d94915 100644 --- a/docs/docbook/smbdotconf/misc/preexec.xml +++ b/docs/docbook/smbdotconf/misc/preexec.xml @@ -1,4 +1,4 @@ - diff --git a/docs/docbook/smbdotconf/printing/printcapname.xml b/docs/docbook/smbdotconf/printing/printcapname.xml index 5f5b5c86a94..e7aa9e938d1 100644 --- a/docs/docbook/smbdotconf/printing/printcapname.xml +++ b/docs/docbook/smbdotconf/printing/printcapname.xml @@ -1,4 +1,4 @@ - diff --git a/docs/docbook/smbdotconf/security/createmask.xml b/docs/docbook/smbdotconf/security/createmask.xml index 67657028789..4a581d3a195 100644 --- a/docs/docbook/smbdotconf/security/createmask.xml +++ b/docs/docbook/smbdotconf/security/createmask.xml @@ -1,4 +1,4 @@ - diff --git a/docs/docbook/smbdotconf/security/minpasswordlength.xml b/docs/docbook/smbdotconf/security/minpasswordlength.xml index 69a1701ea23..6f73d9b52f0 100644 --- a/docs/docbook/smbdotconf/security/minpasswordlength.xml +++ b/docs/docbook/smbdotconf/security/minpasswordlength.xml @@ -1,4 +1,4 @@ - -- cgit From 3cd0b160e12964c6f3e32e6cea2dc690f775ba71 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Tue, 15 Apr 2003 10:11:43 +0000 Subject: Applying updates from Rafal (mimir) and from DAvid Lechnyr. --- docs/docbook/projdoc/InterdomainTrusts.sgml | 59 ++++--- docs/docbook/projdoc/IntroSMB.sgml | 264 +++++++++++++++++++++++----- 2 files changed, 253 insertions(+), 70 deletions(-) diff --git a/docs/docbook/projdoc/InterdomainTrusts.sgml b/docs/docbook/projdoc/InterdomainTrusts.sgml index bd96ef85d2d..dc34e7eca7f 100644 --- a/docs/docbook/projdoc/InterdomainTrusts.sgml +++ b/docs/docbook/projdoc/InterdomainTrusts.sgml @@ -12,7 +12,7 @@ Samba-3 supports NT4 style domain trust relationships. This is feature that many will want to use if they migrate to Samba-3 from and NT4 style domain and do NOT want to adopt Active Directory or an LDAP based authentication back end. This section explains some background information regarding trust relationships and how to create them. It is now -possible for Samba3 to NT4 trust (and vica versa), as well as Samba3 to Samba3 trusts. +possible for Samba-3 to NT4 trust (and vice versa), as well as Samba3 to Samba3 trusts. @@ -58,7 +58,9 @@ transitive. New to MS Windows 2000 ADS security contexts is the fact that trust relationships are two-way by default. Also, all inter-ADS domain trusts are transitive. In the case of the RED, WHITE and BLUE domains above, with Windows 2000 and ADS the RED and BLUE domains CAN trust each other. This is -an inherent feature of ADS domains. +an inherent feature of ADS domains. Samba-3 implements MS Windows NT4 +style Interdomain trusts and interoperates with MS Windows 200x ADS +security domains in similar manner to MS Windows NT4 style domains. @@ -107,7 +109,7 @@ which must be entered the name of the remote domain as well as the password assi This description is meant to be a fairly short introduction about how to set up a Samba server so that it could participate in interdomain trust relationships. Trust relationship support in Samba -is in its early stage, so lot of things doesn't work yet. +is in its early stage, so lot of things don't work yet. @@ -122,9 +124,9 @@ between domains in purely Samba environment. In order to set Samba PDC to be trusted party of the relationship first you need -to create special account for domain that will be the trusting party. To do that, -you can use 'smbpasswd' utility. Creating the trusted domain account is very -similiar to creating trusted machine account. Suppose, your domain is +to create special account for the domain that will be the trusting party. To do that, +you can use the 'smbpasswd' utility. Creating the trusted domain account is very +similiar to creating a trusted machine account. Suppose, your domain is called SAMBA, and the remote domain is called RUMBA. The first step will be to issue this command from your favourite shell: @@ -147,10 +149,10 @@ The account name will be 'rumba$' (the name of the remote domain) -After issuing this command you'll be asked for typing account's -password. You can use any password you want, but be aware that Windows NT will -not change this password until 7 days have passed since account creating. -After command returns successfully, you can look at your new account's entry +After issuing this command you'll be asked to enter the password for +the account. You can use any password you want, but be aware that Windows NT will +not change this password until 7 days following account creation. +After the command returns successfully, you can look at the entry for new account (in the way depending on your configuration) and see that account's name is really RUMBA$ and it has 'I' flag in the flags field. Now you're ready to confirm the trust by establishing it from Windows NT Server. @@ -158,11 +160,11 @@ the trust by establishing it from Windows NT Server. Open 'User Manager for Domains' and from menu 'Policies' select 'Trust Relationships...'. -Right beside 'Trusted domains' list box press 'Add...' button. You'll be prompted for -trusted domain name and the relationship's password. Type in SAMBA, as this is -your domain name, and the password you've just used for account creation. -Press OK and, if everything went fine, you will see 'Trusted domain relationship -successfully established' message. Well done. +Right beside 'Trusted domains' list box press 'Add...' button. You will be prompted for +the trusted domain name and the relationship password. Type in SAMBA, as this is +your domain name, and the password used at the time of account creation. +Press OK and, if everything went without incident, you will see 'Trusted domain relationship +successfully established' message. @@ -171,11 +173,11 @@ successfully established' message. Well done. This time activities are somewhat reversed. Again, we'll assume that your domain -controlled by Samba PDC is called SAMBA and NT-controlled domain is called RUMBA. +controlled by the Samba PDC is called SAMBA and NT-controlled domain is called RUMBA. -The very first thing is to add account for SAMBA domain on RUMBA's PDC. +The very first thing requirement is to add an account for the SAMBA domain on RUMBA's PDC. @@ -185,13 +187,13 @@ domain (SAMBA) and password securing the relationship. -Password can be arbitrarily chosen, the more because it's easy to change it -from Samba server whenever you want. After confirming password your account is -ready and waiting. Now it's Samba's turn. +The password can be arbitrarily chosen. It is easy to change it the password +from Samba server whenever you want. After confirming the password your account is +ready for use. Now it's Samba's turn. -Using your favourite shell while being logged on as root, issue this command: +Using your favourite shell while being logged in as root, issue this command: @@ -199,18 +201,19 @@ Using your favourite shell while being logged on as root, issue this command: -You'll be prompted for password you've just typed on your Windows NT4 Server box. -Don't worry if you will see the error message with returned code of +You will be prompted for the password you just typed on your Windows NT4 Server box. +Don not worry if you see an error message that mentions a returned code of NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT. It means the -password you gave is correct and the NT4 Server says the account is ready for trusting your domain -and not for ordinary connection. After that, be patient it can take a while (especially -in large networks), you should see 'Success' message. Contgratulations! Your trust +password you gave is correct and the NT4 Server says the account is +ready for interdomain connection and not for ordinary +connection. After that, be patient it can take a while (especially +in large networks), you should see the 'Success' message. Congratulations! Your trust relationship has just been established. -Note that you have to run this command as root, since you need write access to -your secrets.tdb file. +Note that you have to run this command as root because you must have write access to +the secrets.tdb file. diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.sgml index e81155a36fd..d810a59010e 100644 --- a/docs/docbook/projdoc/IntroSMB.sgml +++ b/docs/docbook/projdoc/IntroSMB.sgml @@ -1,37 +1,43 @@ &author.dlechnyr; - April 13, 2003 + April 14, 2003 Introduction to Samba + +"If you understand what you're doing, you're not learning anything." +-- Anonymous + + -Samba provides MS Windows file and print services over TCP/IP and provides compatible support for -all SMB/CIFS enabled clients. Samba can be used to provide seemless interoperability between unix -/ Linux systems and MS Windows clients and servers. A global team of about 30 active programmers -is responsible for the development of Samba, a marvelous tool that was originally developed by -Andrew Tridgell. That team of developers is known as the Samba-Team. +Samba is a file and print server for Windows-based clients using TCP/IP as the underlying +transport protocol. In fact, it can support any SMB/CIFS-enabled client. One of Samba's big +strengths is that you can use it to blend your mix of Windows and Linux machines together +without requiring a separate Windows NT/2000/2003 Server. Samba is actively being developed +by a global team of about 30 active programmers and was originally developed by Andrew Tridgell. Background -Once long ago, there was a buzzword referred to as DCE/RPC. This stood for Distributed Computing -Environment/Remote Procedure Calls and conceptually was a good idea. It was originally developed -by Apollo/HP as NCA 1.0 (Network Computing Architecture) and only ran over UDP. When there was -a need to run it over TCP so that it would be compatible with DECnet 3.0, it was redesigned, -submitted to The Open Group, and officially became known as DCE/RPC. Microsoft came along and -decided, rather than pay $20 per seat to license this technology, to reimplement DCE/RPC -themselves as MSRPC. From this, the concept continued in the form of SMB (Server Message Block, -or the "what") using the NetBIOS (Network Basic Input/Output System, or the "how") compatibility -layer. You can run SMB (i.e., transport) over several different protocols; many different -implementations arose as a result, including NBIPX (NetBIOS over IPX, NwLnkNb, or NWNBLink) and -NBT (NetBIOS over TCP/IP, or NetBT). As the years passed, NBT became the most common form of -implementation until the advance of "Direct-Hosted TCP" -- the Microsoft marketing term for -eliminating NetBIOS entirely and running SMB by itself across TCP port 445 only. As of yet, -direct-hosted TCP has yet to catch on. And so the story goes. +Once long ago, there was a buzzword referred to as DCE/RPC. This stood for Distributed +Computing Environment/Remote Procedure Calls and conceptually was a good idea. It was +originally developed by Apollo/HP as NCA 1.0 (Network Computing Architecture) and only +ran over UDP. When there was a need to run it over TCP so that it would be compatible +with DECnet 3.0, it was redesigned, submitted to The Open Group, and officially became +known as DCE/RPC. Microsoft came along and decided, rather than pay $20 per seat to +license this technology, to reimplement DCE/RPC themselves as MSRPC. From this, the +concept continued in the form of SMB (Server Message Block, or the "what") using the +NetBIOS (Network Basic Input/Output System, or the "how") compatibility layer. You can +run SMB (i.e., transport) over several different protocols; many different implementations +arose as a result, including NBIPX (NetBIOS over IPX, NwLnkNb, or NWNBLink) and NBT +(NetBIOS over TCP/IP, or NetBT). As the years passed, NBT became the most common form +of implementation until the advance of "Direct-Hosted TCP" -- the Microsoft marketing +term for eliminating NetBIOS entirely and running SMB by itself across TCP port 445 +only. As of yet, direct-hosted TCP has yet to catch on. @@ -48,28 +54,29 @@ littered with occurrences of clapping hand to forehead and muttering 'crikey, wh thinking? - + + + Terminology - SMB: Acronym for "Server Message Block". This is a Microsoft's file and printer - sharing protocol. + SMB: Acronym for "Server Message Block". This is Microsoft's file and printer sharing protocol. - CIFS: Acronym for the "Common Internet File System". Around 1996, Microsoft apparently + CIFS: Acronym for "Common Internet File System". Around 1996, Microsoft apparently decided that SMB needed the word "Internet" in it, so they changed it to CIFS. Direct-Hosted: A method of providing file/printer sharing services over port 445/tcp - only, using DNS for name resolution instead of WINS. + only using DNS for name resolution instead of WINS. - IPC: Acronym for "Inter-process Communication". A method to communicate specific + IPC: Acronym for "Inter-Process Communication". A method to communicate specific information between programs. @@ -83,8 +90,8 @@ thinking? NetBIOS: Acronym for "Network Basic Input/Output System". This is not a protocol; it is a method of communication across an existing protocol. This is a standard which was originally developed for IBM by Sytek in 1983. To exaggerate the analogy a bit, - it can help to think of this in comparison your computer's BIOS -- it controlls the - essential functions of your input/output hardware -- whereas NetBIOS controlls the + it can help to think of this in comparison your computer's BIOS -- it controls the + essential functions of your input/output hardware -- whereas NetBIOS controls the essential functions of your input/output traffic via the network. Again, this is a bit of an exaggeration but it should help that paradigm shift. What is important to realize is that NetBIOS is a transport standard, not a protocol. Unfortunately, even technically @@ -104,8 +111,8 @@ thinking? NBT: Acronym for "NetBIOS over TCP"; also known as "NetBT". Allows the continued use - of NetBIOS traffic proxied over TCP/IP. As a result, NetBIOS names are made equivilant - to IP addresses and NetBIOS name types are conceptually equivilant to TCP/IP ports. + of NetBIOS traffic proxied over TCP/IP. As a result, NetBIOS names are made + to IP addresses and NetBIOS name types are conceptually equivalent to TCP/IP ports. This is how file and printer sharing are accomplished in Windows 95/98/ME. They traditionally rely on three ports: NetBIOS Name Service (nbname) via UDP port 137, NetBIOS Datagram Service (nbdatagram) via UDP port 138, and NetBIOS Session Service @@ -124,10 +131,14 @@ thinking? - +If you plan on getting help, make sure to subscribe to the Samba Mailing List (available at +http://www.samba.org). Optionally, you could just search mailing.unix.samba at http://groups.google.com + - -Related Projects> +</sect1> + +<sect1> +<title>Related Projects Currently, there are two projects that are directly related to Samba: SMBFS and CIFS network @@ -138,20 +149,18 @@ client file systems for Linux, both available in the Linux kernel itself. SMBFS (Server Message Block File System) allows you to mount SMB shares (the protocol - Windows 95/98/ME, Windows NT/2000/XP and OS/2 Lan Manager use to share files and printers + that Microsoft Windows and OS/2 Lan Manager use to share files and printers over local networks) and access them just like any other Unix directory. This is useful if you just want to mount such filesystems without being a SMBFS server. CIFS (Common Internet File System) is the successor to SMB, and is actively being worked - on in the upcoming version of the Linux kernel (2.5/2.6). The intent of this module is to + on in the upcoming version of the Linux kernel. The intent of this module is to provide advanced network file system functionality including support for dfs (heirarchical name space), secure per-user session establishment, safe distributed caching (oplock), optional packet signing, Unicode and other internationalization improvements, and optional - Winbind (nsswitch) integration. If you enable CONFIG_CIFS in the Linux kernel, be aware - that it is currently in an early development stage and may not be as stable as the existing - CONFIG_SMB_FS option. + Winbind (nsswitch) integration. @@ -161,15 +170,186 @@ Again, it's important to note that these are implementations for client filesyst nothing to do with acting as a file and print server for SMB/CIFS clients. - + + + + +SMB Methodology + + +Traditionally, SMB uses UDP port 137 (NetBIOS name service, or netbios-ns), +UDP port 138 (NetBIOS datagram service, or netbios-dgm), and TCP port 139 (NetBIOS +session service, or netbios-ssn). Anyone looking at their network with a good +packet sniffer will be amazed at the amount of traffic generated by just opening +up a single file. In general, SMB sessions are established in the following order: + + + + + "TCP Connection" - establish 3-way handshake (connection) to port 139/tcp + or 445/tcp. + + + + "NetBIOS Session Request" - using the following "Calling Names": The local + machine's NetBIOS name plus the 16th character 0x00; The server's NetBIOS + name plus the 16th character 0x20 + + + + "SMB Negotiate Protocol" - determine the protocol dialect to use, which will + be one of the following: PC Network Program 1.0 (Core) - share level security + mode only; Microsoft Networks 1.03 (Core Plus) - share level security + mode only; Lanman1.0 (LAN Manager 1.0) - uses Challenge/Response + Authentication; Lanman2.1 (LAN Manager 2.1) - uses Challenge/Response + Authentication; NT LM 0.12 (NT LM 0.12) - uses Challenge/Response + Authentication + + + + SMB Session Startup. Passwords are encrypted (or not) according to one of + the following methods: Null (no encryption); Cleartext (no encryption); LM + and NTLM; NTLM; NTLMv2 + + + + SMB Tree Connect: Connect to a share name (e.g., \\servername\share); Connect + to a service type (e.g., IPC$ named pipe) + + + + + +A good way to examine this process in depth is to try out SecurityFriday's SWB program +at http://www.securityfriday.com/ToolDownload/SWB/swb_doc.html. It allows you to +walk through the establishment of a SMB/CIFS session step by step. + + + + + +Additional Resources + + + + + CIFS: Common Insecurities Fail Scrutiny by "Hobbit", + http://hr.uoregon.edu/davidrl/cifs.txt + + + + Doing the Samba on Windows by Financial Review, + http://afr.com/it/2002/10/01/FFXDF43AP6D.html + + + + Implementing CIFS by Christopher R. Hertel, + http://ubiqx.org/cifs/ + + + + Just What Is SMB? by Richard Sharpe, + http://samba.anu.edu.au/cifs/docs/what-is-smb.html + + + + Opening Windows Everywhere by Mike Warfield, + http://www.linux-mag.com/1999-05/samba_01.html + + + + SMB HOWTO by David Wood, + http://www.tldp.org/HOWTO/SMB-HOWTO.html + + + + SMB/CIFS by The Root by "ledin", + http://www.phrack.org/phrack/60/p60-0x0b.txt + + + + The Story of Samba by Christopher R. Hertel, + http://www.linux-mag.com/1999-09/samba_01.html + + + + The Unofficial Samba HOWTO by David Lechnyr, + http://hr.uoregon.edu/davidrl/samba/ + + + + Understanding the Network Neighborhood by Christopher R. Hertel, + http://www.linux-mag.com/2001-05/smb_01.html + + + + Using Samba as a PDC by Andrew Bartlett, + http://www.linux-mag.com/2002-02/samba_01.html + + + + + + + +Epilogue + + +"What's fundamentally wrong is that nobody ever had any taste when they +did it. Microsoft has been very much into making the user interface look good, +but internally it's just a complete mess. And even people who program for Microsoft +and who have had years of experience, just don't know how it works internally. +Worse, nobody dares change it. Nobody dares to fix bugs because it's such a +mess that fixing one bug might just break a hundred programs that depend on +that bug. And Microsoft isn't interested in anyone fixing bugs -- they're interested +in making money. They don't have anybody who takes pride in Windows 95 as an +operating system. + + + +People inside Microsoft know it's a bad operating system and they still +continue obviously working on it because they want to get the next version out +because they want to have all these new features to sell more copies of the +system. + + + +The problem with that is that over time, when you have this kind of approach, +and because nobody understands it, because nobody REALLY fixes bugs (other than +when they're really obvious), the end result is really messy. You can't trust +it because under certain circumstances it just spontaneously reboots or just +halts in the middle of something that shouldn't be strange. Normally it works +fine and then once in a blue moon for some completely unknown reason, it's dead, +and nobody knows why. Not Microsoft, not the experienced user and certainly +not the completely clueless user who probably sits there shivering thinking +"What did I do wrong?" when they didn't do anything wrong at all. + + + +That's what's really irritating to me." + + + +-- Linus Torvalds, from an interview with BOOT Magazine, Sept 1998 +(http://hr.uoregon.edu/davidrl/boot.txt) + + + - + Miscellaneous -This chapter is Copyright © 2003 David Lechnyr. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation. A copy of the license is available at http://www.gnu.org/licenses/fdl.txt. +This chapter was lovingly handcrafted on a Dell Latitude C400 laptop running Slackware Linux 9.0, +in case anyone asks. + + + +This chapter is Copyright © 2003 David Lechnyr (david at lechnyr dot com). +Permission is granted to copy, distribute and/or modify this document under the terms +of the GNU Free Documentation License, Version 1.2 or any later version published by the Free +Software Foundation. A copy of the license is available at http://www.gnu.org/licenses/fdl.txt. - -- cgit From fac3d67f71057d880e51cf8e103edf0c9b71cae9 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 15 Apr 2003 11:46:16 +0000 Subject: Final bits of smb.conf(5) are converted! --- docs/docbook/smbdotconf/misc/deletereadonly.xml | 21 ++++---- docs/docbook/smbdotconf/misc/dosfilemode.xml | 32 ++++++------ .../smbdotconf/misc/dosfiletimeresolution.xml | 44 ++++++++-------- docs/docbook/smbdotconf/misc/dosfiletimes.xml | 29 ++++++----- .../smbdotconf/misc/fakedirectorycreatetimes.xml | 58 +++++++++++----------- docs/docbook/smbdotconf/misc/hidelocalusers.xml | 16 +++--- docs/docbook/smbdotconf/misc/magicoutput.xml | 29 +++++------ docs/docbook/smbdotconf/misc/magicscript.xml | 49 +++++++++--------- docs/docbook/smbdotconf/misc/panicaction.xml | 26 ++++++---- 9 files changed, 164 insertions(+), 140 deletions(-) diff --git a/docs/docbook/smbdotconf/misc/deletereadonly.xml b/docs/docbook/smbdotconf/misc/deletereadonly.xml index 8e86b5b00b8..cfffceedcbb 100644 --- a/docs/docbook/smbdotconf/misc/deletereadonly.xml +++ b/docs/docbook/smbdotconf/misc/deletereadonly.xml @@ -1,11 +1,14 @@ - - delete readonly (S) - This parameter allows readonly files to be deleted. - This is not normal DOS semantics, but is allowed by UNIX. + + + This parameter allows readonly files to be deleted. + This is not normal DOS semantics, but is allowed by UNIX. - This option may be useful for running applications such - as rcs, where UNIX file ownership prevents changing file - permissions, and DOS semantics prevent deletion of a read only file. + This option may be useful for running applications such + as rcs, where UNIX file ownership prevents changing file + permissions, and DOS semantics prevent deletion of a read only file. - Default: delete readonly = no - + Default: delete readonly = no + + diff --git a/docs/docbook/smbdotconf/misc/dosfilemode.xml b/docs/docbook/smbdotconf/misc/dosfilemode.xml index e8aec3b78d7..2628dc45b0d 100644 --- a/docs/docbook/smbdotconf/misc/dosfilemode.xml +++ b/docs/docbook/smbdotconf/misc/dosfilemode.xml @@ -1,16 +1,18 @@ - - dos filemode (S) - The default behavior in Samba is to provide - UNIX-like behavior where only the owner of a file/directory is - able to change the permissions on it. However, this behavior - is often confusing to DOS/Windows users. Enabling this parameter - allows a user who has write access to the file (by whatever - means) to modify the permissions on it. Note that a user - belonging to the group owning the file will not be allowed to - change permissions if the group is only granted read access. - Ownership of the file/directory is not changed, only the permissions - are modified. + + + The default behavior in Samba is to provide + UNIX-like behavior where only the owner of a file/directory is + able to change the permissions on it. However, this behavior + is often confusing to DOS/Windows users. Enabling this parameter + allows a user who has write access to the file (by whatever + means) to modify the permissions on it. Note that a user + belonging to the group owning the file will not be allowed to + change permissions if the group is only granted read access. + Ownership of the file/directory is not changed, only the permissions + are modified. - Default: dos filemode = no - - + Default: dos filemode = no + + diff --git a/docs/docbook/smbdotconf/misc/dosfiletimeresolution.xml b/docs/docbook/smbdotconf/misc/dosfiletimeresolution.xml index bc82582c87b..600294d4428 100644 --- a/docs/docbook/smbdotconf/misc/dosfiletimeresolution.xml +++ b/docs/docbook/smbdotconf/misc/dosfiletimeresolution.xml @@ -1,23 +1,25 @@ - - dos filetime resolution (S) - Under the DOS and Windows FAT filesystem, the finest - granularity on time resolution is two seconds. Setting this parameter - for a share causes Samba to round the reported time down to the - nearest two second boundary when a query call that requires one second - resolution is made to smbd - 8. + + + Under the DOS and Windows FAT filesystem, the finest + granularity on time resolution is two seconds. Setting this parameter + for a share causes Samba to round the reported time down to the + nearest two second boundary when a query call that requires one second + resolution is made to smbd + 8. - This option is mainly used as a compatibility option for Visual - C++ when used against Samba shares. If oplocks are enabled on a - share, Visual C++ uses two different time reading calls to check if a - file has changed since it was last read. One of these calls uses a - one-second granularity, the other uses a two second granularity. As - the two second call rounds any odd second down, then if the file has a - timestamp of an odd number of seconds then the two timestamps will not - match and Visual C++ will keep reporting the file has changed. Setting - this option causes the two timestamps to match, and Visual C++ is - happy. + This option is mainly used as a compatibility option for Visual + C++ when used against Samba shares. If oplocks are enabled on a + share, Visual C++ uses two different time reading calls to check if a + file has changed since it was last read. One of these calls uses a + one-second granularity, the other uses a two second granularity. As + the two second call rounds any odd second down, then if the file has a + timestamp of an odd number of seconds then the two timestamps will not + match and Visual C++ will keep reporting the file has changed. Setting + this option causes the two timestamps to match, and Visual C++ is + happy. - Default: dos filetime resolution = no - - + Default: dos filetime resolution = no + + diff --git a/docs/docbook/smbdotconf/misc/dosfiletimes.xml b/docs/docbook/smbdotconf/misc/dosfiletimes.xml index d9b9f3b08b8..a201d2d8322 100644 --- a/docs/docbook/smbdotconf/misc/dosfiletimes.xml +++ b/docs/docbook/smbdotconf/misc/dosfiletimes.xml @@ -1,14 +1,17 @@ - - dos filetimes (S) - Under DOS and Windows, if a user can write to a - file they can change the timestamp on it. Under POSIX semantics, - only the owner of the file or root may change the timestamp. By - default, Samba runs with POSIX semantics and refuses to change the - timestamp on a file if the user smbd is acting - on behalf of is not the file owner. Setting this option to - yes allows DOS semantics and smbd - 8 will change the file - timestamp as DOS requires. + + + Under DOS and Windows, if a user can write to a + file they can change the timestamp on it. Under POSIX semantics, + only the owner of the file or root may change the timestamp. By + default, Samba runs with POSIX semantics and refuses to change the + timestamp on a file if the user smbd is acting + on behalf of is not the file owner. Setting this option to + yes allows DOS semantics and smbd + 8 will change the file + timestamp as DOS requires. - Default: dos filetimes = no - + Default: dos filetimes = no + + diff --git a/docs/docbook/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs/docbook/smbdotconf/misc/fakedirectorycreatetimes.xml index 81773606ee0..f0a0d392307 100644 --- a/docs/docbook/smbdotconf/misc/fakedirectorycreatetimes.xml +++ b/docs/docbook/smbdotconf/misc/fakedirectorycreatetimes.xml @@ -1,31 +1,33 @@ - - fake directory create times (S) - NTFS and Windows VFAT file systems keep a create - time for all files and directories. This is not the same as the - ctime - status change time - that Unix keeps, so Samba by default - reports the earliest of the various times Unix does keep. Setting - this parameter for a share causes Samba to always report midnight - 1-1-1980 as the create time for directories. + + + NTFS and Windows VFAT file systems keep a create + time for all files and directories. This is not the same as the + ctime - status change time - that Unix keeps, so Samba by default + reports the earliest of the various times Unix does keep. Setting + this parameter for a share causes Samba to always report midnight + 1-1-1980 as the create time for directories. - This option is mainly used as a compatibility option for - Visual C++ when used against Samba shares. Visual C++ generated - makefiles have the object directory as a dependency for each object - file, and a make rule to create the directory. Also, when NMAKE - compares timestamps it uses the creation time when examining a - directory. Thus the object directory will be created if it does not - exist, but once it does exist it will always have an earlier - timestamp than the object files it contains. + This option is mainly used as a compatibility option for + Visual C++ when used against Samba shares. Visual C++ generated + makefiles have the object directory as a dependency for each object + file, and a make rule to create the directory. Also, when NMAKE + compares timestamps it uses the creation time when examining a + directory. Thus the object directory will be created if it does not + exist, but once it does exist it will always have an earlier + timestamp than the object files it contains. - However, Unix time semantics mean that the create time - reported by Samba will be updated whenever a file is created or - or deleted in the directory. NMAKE finds all object files in - the object directory. The timestamp of the last one built is then - compared to the timestamp of the object directory. If the - directory's timestamp if newer, then all object files - will be rebuilt. Enabling this option - ensures directories always predate their contents and an NMAKE build - will proceed as expected. + However, Unix time semantics mean that the create time + reported by Samba will be updated whenever a file is created or + or deleted in the directory. NMAKE finds all object files in + the object directory. The timestamp of the last one built is then + compared to the timestamp of the object directory. If the + directory's timestamp if newer, then all object files + will be rebuilt. Enabling this option + ensures directories always predate their contents and an NMAKE build + will proceed as expected. - Default: fake directory create times = no - - + Default: fake directory create times = no + + diff --git a/docs/docbook/smbdotconf/misc/hidelocalusers.xml b/docs/docbook/smbdotconf/misc/hidelocalusers.xml index d0468ead6b7..18a1c817c16 100644 --- a/docs/docbook/smbdotconf/misc/hidelocalusers.xml +++ b/docs/docbook/smbdotconf/misc/hidelocalusers.xml @@ -1,7 +1,11 @@ - - hide local users(G) - This parameter toggles the hiding of local UNIX - users (root, wheel, floppy, etc) from remote clients. + + + This parameter toggles the hiding of local UNIX + users (root, wheel, floppy, etc) from remote clients. - Default: hide local users = no - + Default: hide local users = no + + diff --git a/docs/docbook/smbdotconf/misc/magicoutput.xml b/docs/docbook/smbdotconf/misc/magicoutput.xml index 8208d5bd4c6..c321f12b99c 100644 --- a/docs/docbook/smbdotconf/misc/magicoutput.xml +++ b/docs/docbook/smbdotconf/misc/magicoutput.xml @@ -1,17 +1,18 @@ - - magic output (S) - This parameter specifies the name of a file - which will contain output created by a magic script (see the - magic script - parameter below). + + + This parameter specifies the name of a file + which will contain output created by a magic script (see the + magic script + parameter below). - Warning: If two clients use the same magic script - in the same directory the output file content - is undefined. + Warning: If two clients use the same magic script + in the same directory the output file content + is undefined. - Default: magic output = <magic script name>.out - + Default: magic output = <magic script name>.out - Example: magic output = myfile.txt - - + Example: magic output = myfile.txt + + diff --git a/docs/docbook/smbdotconf/misc/magicscript.xml b/docs/docbook/smbdotconf/misc/magicscript.xml index 73abb50fc52..67f39d918e8 100644 --- a/docs/docbook/smbdotconf/misc/magicscript.xml +++ b/docs/docbook/smbdotconf/misc/magicscript.xml @@ -1,28 +1,31 @@ - - magic script (S) - This parameter specifies the name of a file which, - if opened, will be executed by the server when the file is closed. - This allows a UNIX script to be sent to the Samba host and - executed on behalf of the connected user. + + + This parameter specifies the name of a file which, + if opened, will be executed by the server when the file is closed. + This allows a UNIX script to be sent to the Samba host and + executed on behalf of the connected user. - Scripts executed in this way will be deleted upon - completion assuming that the user has the appropriate level - of privilege and the file permissions allow the deletion. + Scripts executed in this way will be deleted upon + completion assuming that the user has the appropriate level + of privilege and the file permissions allow the deletion. - If the script generates output, output will be sent to - the file specified by the - magic output parameter (see above). + If the script generates output, output will be sent to + the file specified by the + magic output parameter (see above). - Note that some shells are unable to interpret scripts - containing CR/LF instead of CR as - the end-of-line marker. Magic scripts must be executable - as is on the host, which for some hosts and - some shells will require filtering at the DOS end. + Note that some shells are unable to interpret scripts + containing CR/LF instead of CR as + the end-of-line marker. Magic scripts must be executable + as is on the host, which for some hosts and + some shells will require filtering at the DOS end. - Magic scripts are EXPERIMENTAL and - should NOT be relied upon. + Magic scripts are EXPERIMENTAL and + should NOT be relied upon. - Default: None. Magic scripts disabled. - Example: magic script = user.csh - - + Default: None. Magic scripts disabled. + + Example: magic script = user.csh + + diff --git a/docs/docbook/smbdotconf/misc/panicaction.xml b/docs/docbook/smbdotconf/misc/panicaction.xml index 6de37c2c175..04b7aab8c8c 100644 --- a/docs/docbook/smbdotconf/misc/panicaction.xml +++ b/docs/docbook/smbdotconf/misc/panicaction.xml @@ -1,12 +1,16 @@ - - panic action (G) - This is a Samba developer option that allows a - system command to be called when either smbd - 8 or smbd - 8 crashes. This is usually used to - draw attention to the fact that a problem occurred. + + + This is a Samba developer option that allows a + system command to be called when either smbd + 8 or smbd + 8 crashes. This is usually used to + draw attention to the fact that a problem occurred. - Default: panic action = <empty string> - Example: panic action = "/bin/sleep 90000" - - + Default: panic action = <empty string> + + Example: panic action = "/bin/sleep 90000" + + -- cgit From ef005d1a94d99c6a23aff9a12d5820cb4dfbe626 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 15 Apr 2003 11:54:15 +0000 Subject: Final touch: 1. Move preloadmodules.xml to Security section 2. Fix lpqcachetime.xml from Printing section --- docs/docbook/smbdotconf/misc/preloadmodules.xml | 15 -------- docs/docbook/smbdotconf/printing/lpqcachetime.xml | 45 ++++++++++++---------- .../docbook/smbdotconf/security/preloadmodules.xml | 18 +++++++++ 3 files changed, 42 insertions(+), 36 deletions(-) delete mode 100644 docs/docbook/smbdotconf/misc/preloadmodules.xml create mode 100644 docs/docbook/smbdotconf/security/preloadmodules.xml diff --git a/docs/docbook/smbdotconf/misc/preloadmodules.xml b/docs/docbook/smbdotconf/misc/preloadmodules.xml deleted file mode 100644 index 52b8c412e6e..00000000000 --- a/docs/docbook/smbdotconf/misc/preloadmodules.xml +++ /dev/null @@ -1,15 +0,0 @@ - - preload modules (S) - This is a list of paths to modules that should - be loaded into smbd before a client connects. This improves - the speed of smbd when reacting to new connections somewhat. - - It is recommended to only use this option on heavy-performance - servers. - - Default: preload modules = - - Example: preload modules = /usr/lib/samba/passdb/mysql.so+++ - - - diff --git a/docs/docbook/smbdotconf/printing/lpqcachetime.xml b/docs/docbook/smbdotconf/printing/lpqcachetime.xml index 6f351fdaf9a..df48a5fd01f 100644 --- a/docs/docbook/smbdotconf/printing/lpqcachetime.xml +++ b/docs/docbook/smbdotconf/printing/lpqcachetime.xml @@ -1,26 +1,29 @@ - - lpq cache time (G) - This controls how long lpq info will be cached - for to prevent the lpq command being called too - often. A separate cache is kept for each variation of the - lpq command used by the system, so if you use different - lpq commands for different users then they won't - share cache information. + + + This controls how long lpq info will be cached + for to prevent the lpq command being called too + often. A separate cache is kept for each variation of the + lpq command used by the system, so if you use different + lpq commands for different users then they won't + share cache information. - The cache files are stored in /tmp/lpq.xxxx - where xxxx is a hash of the lpq command in use. + The cache files are stored in /tmp/lpq.xxxx + where xxxx is a hash of the lpq command in use. - The default is 10 seconds, meaning that the cached results - of a previous identical lpq command will be used - if the cached data is less than 10 seconds old. A large value may - be advisable if your lpq command is very slow. + The default is 10 seconds, meaning that the cached results + of a previous identical lpq command will be used + if the cached data is less than 10 seconds old. A large value may + be advisable if your lpq command is very slow. - A value of 0 will disable caching completely. + A value of 0 will disable caching completely. - See also the printing - parameter. + See also the printing parameter. - Default: lpq cache time = 10 - Example: lpq cache time = 30 - - + Default: lpq cache time = 10 + + Example: lpq cache time = 30 + + diff --git a/docs/docbook/smbdotconf/security/preloadmodules.xml b/docs/docbook/smbdotconf/security/preloadmodules.xml new file mode 100644 index 00000000000..7b4e57cff18 --- /dev/null +++ b/docs/docbook/smbdotconf/security/preloadmodules.xml @@ -0,0 +1,18 @@ + + + This is a list of paths to modules that should + be loaded into smbd before a client connects. This improves + the speed of smbd when reacting to new connections somewhat. + + It is recommended to only use this option on heavy-performance + servers. + + Default: preload modules = + + Example: preload modules = /usr/lib/samba/passdb/mysql.so+++ + + + -- cgit From 8df9ab2fcfc9f22fa6842e1128952e855fea6a7a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 15 Apr 2003 12:04:48 +0000 Subject: Fix build of VFS modules statically (we used Makefile variables before setting them) --- source/Makefile.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index c08302e4b43..2896277feb4 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -305,6 +305,12 @@ OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o NOTIFY_OBJ = smbd/notify.o smbd/notify_hash.o smbd/notify_kernel.o +VFS_AUDIT_OBJ = modules/vfs_audit.o +VFS_EXTD_AUDIT_OBJ = modules/vfs_extd_audit.o +VFS_RECYCLE_OBJ = modules/vfs_recycle.o +VFS_NETATALK_OBJ = modules/vfs_netatalk.o +VFS_FAKE_PERMS_OBJ = modules/vfs_fake_perms.o + PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o UNIGRP_OBJ = libsmb/netlogon_unigrp.o @@ -519,12 +525,6 @@ NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) -VFS_AUDIT_OBJ = modules/vfs_audit.o -VFS_EXTD_AUDIT_OBJ = modules/vfs_extd_audit.o -VFS_RECYCLE_OBJ = modules/vfs_recycle.o -VFS_NETATALK_OBJ = modules/vfs_netatalk.o -VFS_FAKE_PERMS_OBJ = modules/vfs_fake_perms.o - LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \ $(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) -- cgit From 297ffdb21aeb816eb07ea650fac514c2747493cb Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 15 Apr 2003 12:35:52 +0000 Subject: Fix smb.conf.5.xml and friends: addressable IDs should be specified at section level, not in titles or it does not work with both HTML and PDF generation (for former one link is created but target does not). --- docs/docbook/smbdotconf/filename/vetofiles.xml | 3 ++- docs/docbook/smbdotconf/printing/useclientdriver.xml | 3 ++- docs/docbook/smbdotconf/smb.conf.5.xml | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/docbook/smbdotconf/filename/vetofiles.xml b/docs/docbook/smbdotconf/filename/vetofiles.xml index 073645c6113..567286580dc 100644 --- a/docs/docbook/smbdotconf/filename/vetofiles.xml +++ b/docs/docbook/smbdotconf/filename/vetofiles.xml @@ -34,7 +34,8 @@ Default: No files or directories are vetoed. -Examples: + Examples: + ; Veto any files containing the word Security, ; any ending in .tmp, and any directory containing the ; word root. diff --git a/docs/docbook/smbdotconf/printing/useclientdriver.xml b/docs/docbook/smbdotconf/printing/useclientdriver.xml index bc4162333bb..67c8cbf8d07 100644 --- a/docs/docbook/smbdotconf/printing/useclientdriver.xml +++ b/docs/docbook/smbdotconf/printing/useclientdriver.xml @@ -32,7 +32,8 @@ on a print share which has valid print driver installed on the Samba server. - See also disable spoolss + See also disable spoolss Default: use client driver = no diff --git a/docs/docbook/smbdotconf/smb.conf.5.xml b/docs/docbook/smbdotconf/smb.conf.5.xml index edb94573dfb..2a5d190f69c 100644 --- a/docs/docbook/smbdotconf/smb.conf.5.xml +++ b/docs/docbook/smbdotconf/smb.conf.5.xml @@ -28,8 +28,8 @@ description of the file format and possible parameters held within are here for reference purposes. - - FILE FORMAT + + FILE FORMAT The file consists of sections and parameters. A section begins with the name of the section in square brackets and continues @@ -147,8 +147,8 @@ under PARAMETERS for more information. - - The [homes] section + + The [homes] section If a section called homes is included in the configuration file, services connecting clients to their @@ -218,8 +218,8 @@ any auto home directories visible. - - The [printers] section + + The [printers] section This section works like [homes], but for printers. @@ -479,8 +479,8 @@ alias|alias|alias|alias... with these substitutions and other smb.conf options. - - NAME MANGLING + + NAME MANGLING Samba supports "name mangling" so that DOS and Windows clients can use files that don't conform to the 8.3 format. @@ -542,8 +542,8 @@ alias|alias|alias|alias... - - NOTE ABOUT USERNAME/PASSWORD VALIDATION + + NOTE ABOUT USERNAME/PASSWORD VALIDATION There are a number of ways in which a user can connect to a service. The server uses the following steps in determining -- cgit