1 diff -uNr samba-2.2.3.orig/docs/manpages/nmbd.8 samba-2.2.3/docs/manpages/nmbd.8
2 --- samba-2.2.3.orig/docs/manpages/nmbd.8 Sun Feb 3 01:45:38 2002
3 +++ samba-2.2.3/docs/manpages/nmbd.8 Sun Feb 3 13:18:53 2002
6 The default path to this file is compiled into
7 Samba as part of the build process. Common defaults
8 -are \fI/usr/local/samba/lib/lmhosts\fR,
9 +are \fI/etc/samba/lmhosts\fR,
10 \fI/usr/samba/lib/lmhosts\fR or
11 \fI/etc/lmhosts\fR. See the \fIlmhosts(5)\fRman page for details on the
12 contents of this file.
16 The default log directory is compiled into Samba
17 -as part of the build process. Common defaults are \fI /usr/local/samba/var/log.nmb\fR, \fI /usr/samba/var/log.nmb\fR or
18 +as part of the build process. Common defaults are \fI /var/log/samba/log.nmb\fR, \fI /usr/samba/var/log.nmb\fR or
19 \fI/var/log/log.nmb\fR.
21 \fB-n <primary NetBIOS name>\fR
24 \fB-s <configuration file>\fR
25 The default configuration file name
26 -is set at build time, typically as \fI /usr/local/samba/lib/smb.conf\fR, but
27 +is set at build time, typically as \fI /etc/samba/smb.conf\fR, but
28 this may be changed when Samba is autoconfigured.
30 The file specified contains the configuration details
32 See the UNIX_INSTALL.html
35 -\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
36 +\fB\fI/etc/samba/smb.conf\fB\fR
37 This is the default location of the
39 server configuration file. Other common places that systems
42 \fBnmbd\fR will accept SIGHUP, which will cause
43 it to dump out its namelists into the file \fInamelist.debug
44 -\fRin the \fI/usr/local/samba/var/locks\fR
45 +\fRin the \fI/var/lock/samba\fR
46 directory (or the \fIvar/locks\fR directory configured
47 under wherever Samba was configured to install itself). This will also
48 cause \fBnmbd\fR to dump out its server database in
49 diff -uNr samba-2.2.3.orig/docs/manpages/smb.conf.5 samba-2.2.3/docs/manpages/smb.conf.5
50 --- samba-2.2.3.orig/docs/manpages/smb.conf.5 Sun Feb 3 01:45:38 2002
51 +++ samba-2.2.3/docs/manpages/smb.conf.5 Sun Feb 3 13:24:14 2002
56 -Example: \fBadd share command = /usr/local/bin/addshare\fR
57 +Example: \fBadd share command = /usr/bin/addshare\fR
60 \fBadd machine script (G)\fR
63 Default: \fBadd user script = <empty string>
65 -Example: \fBadd user script = /usr/local/samba/bin/add_user
66 +Example: \fBadd user script = /usr/bin/add_user
74 -Example: \fBchange share command = /usr/local/bin/addshare\fR
75 +Example: \fBchange share command = /usr/bin/addshare\fR
78 \fBcharacter set (G)\fR
80 (allowing you to special case the config files of just a few
83 -Example: \fBconfig file = /usr/local/samba/lib/smb.conf.%m
84 +Example: \fBconfig file = /etc/samba/smb.conf.%m
87 This parameter allows you to "clone" service
92 -Example: \fBdelete share command = /usr/local/bin/delshare\fR
93 +Example: \fBdelete share command = /usr/bin/delshare\fR
96 \fBdelete user script (G)\fR
99 Default: \fBdelete user script = <empty string>
101 -Example: \fBdelete user script = /usr/local/samba/bin/del_user
102 +Example: \fBdelete user script = /usr/bin/del_user
105 \fBdelete veto files (S)\fR
106 @@ -2423,7 +2423,7 @@
107 Default: \fBBy default internal routines for
108 determining the disk capacity and remaining space will be used.
110 -Example: \fBdfree command = /usr/local/samba/bin/dfree
111 +Example: \fBdfree command = /usr/bin/dfree
113 Where the script dfree (which must be made executable) could be:
115 @@ -3248,7 +3248,7 @@
117 Default: \fBno file included\fR
119 -Example: \fBinclude = /usr/local/samba/lib/admin_smb.conf
120 +Example: \fBinclude = /etc/samba/admin_smb.conf
122 \fBinherit permissions (S)\fR
123 The permissions on new files and directories
124 @@ -3647,7 +3647,7 @@
125 This option takes the standard substitutions, allowing
126 you to have separate log files for each user or machine.
128 -Example: \fBlog file = /usr/local/samba/var/log.%m
129 +Example: \fBlog file = /var/log/samba/log.%m
132 The value of the parameter (an integer) allows
133 @@ -3760,11 +3760,11 @@
136 The script must be a relative path to the [netlogon]
137 -service. If the [netlogon] service specifies a \fIpath\fR of \fI/usr/local/samba/netlogon
138 +service. If the [netlogon] service specifies a \fIpath\fR of \fI/etc/samba/netlogon
139 \fR, and \fBlogon script = STARTUP.BAT\fR, then
140 the file that will be downloaded is:
142 -\fI/usr/local/samba/netlogon/STARTUP.BAT\fR
143 +\fI/etc/samba/netlogon/STARTUP.BAT\fR
145 The contents of the batch file are entirely your choice. A
146 suggested command would be to add \fBNET TIME \\\\SERVER /SET
147 @@ -5126,7 +5126,7 @@
150 \fBpreexec = csh -c 'echo \\"Welcome to %S!\\" |
151 -/usr/local/samba/bin/smbclient -M %m -I %I' & \fR
152 +/usr/bin/smbclient -M %m -I %I' & \fR
154 Of course, this could get annoying after a while :-)
156 @@ -5257,7 +5257,7 @@
158 \fBprint command = lp -d%p -s %s; rm %s\fR
160 -Example: \fBprint command = /usr/local/samba/bin/myprintscript
161 +Example: \fBprint command = /usr/bin/myprintscript
165 @@ -5380,7 +5380,7 @@
166 Default: \fBNone (set in compile).\fR
168 Example: \fBprinter driver file =
169 -/usr/local/samba/printers/drivers.def\fR
170 +/etc/samba/drivers.def\fR
172 \fBprinter driver location (S)\fR
173 \fBNote :\fRThis is a deprecated
174 @@ -6075,7 +6075,7 @@
178 -Example: \fBabort shutdown script = /usr/local/samba/sbin/shutdown %m %t %r %f\fR
179 +Example: \fBabort shutdown script = /usr/sbin/shutdown %m %t %r %f\fR
181 Shutdown script example:
183 @@ -6233,7 +6233,7 @@
184 Examples: \fBsource environment = |/etc/smb.conf.sh
186 Example: \fBsource environment =
187 -/usr/local/smb_env_vars\fR
188 +/etc/samba/smb_env_vars\fR
191 This variable is part of SSL-enabled Samba. This
192 @@ -6263,7 +6263,7 @@
193 directory that don't fit into this naming scheme are ignored. You
194 don't need this variable if you don't verify client certificates.
196 -Default: \fBssl CA certDir = /usr/local/ssl/certs
197 +Default: \fBssl CA certDir = /etc/samba/ssl/certs
199 \fBssl CA certFile (G)\fR
200 This variable is part of SSL-enabled Samba. This
201 @@ -6280,7 +6280,7 @@
202 simple (you won't need to create the hashed file names). You
203 don't need this variable if you don't verify client certificates.
205 -Default: \fBssl CA certFile = /usr/local/ssl/certs/trustedCAs.pem
206 +Default: \fBssl CA certFile = /etc/samba/ssl/certs/trustedCAs.pem
208 \fBssl ciphers (G)\fR
209 This variable is part of SSL-enabled Samba. This
210 @@ -6301,7 +6301,7 @@
211 The certificate in this file is used by \fBsmbclient(1)\fRif it exists. It's needed
212 if the server requires a client certificate.
214 -Default: \fBssl client cert = /usr/local/ssl/certs/smbclient.pem
215 +Default: \fBssl client cert = /etc/samba/ssl/certs/smbclient.pem
217 \fBssl client key (G)\fR
218 This variable is part of SSL-enabled Samba. This
219 @@ -6312,7 +6312,7 @@
220 This is the private key for \fBsmbclient(1)\fR. It's only needed if the
221 client should have a certificate.
223 -Default: \fBssl client key = /usr/local/ssl/private/smbclient.pem
224 +Default: \fBssl client key = /etc/samba/ssl/private/smbclient.pem
226 \fBssl compatibility (G)\fR
227 This variable is part of SSL-enabled Samba. This
228 @@ -6931,7 +6931,7 @@
230 Default: \fBno username map\fR
232 -Example: \fBusername map = /usr/local/samba/lib/users.map
233 +Example: \fBusername map = /etc/samba/users.map
236 This boolean parameter is only available if
237 diff -uNr samba-2.2.3.orig/docs/manpages/smbclient.1 samba-2.2.3/docs/manpages/smbclient.1
238 --- samba-2.2.3.orig/docs/manpages/smbclient.1 Sun Feb 3 01:45:39 2002
239 +++ samba-2.2.3/docs/manpages/smbclient.1 Sun Feb 3 13:24:50 2002
243 It is recommended that the smbclient software be installed
244 -in the \fI/usr/local/samba/bin/\fR or \fI /usr/samba/bin/\fR directory, this directory readable
245 +in the \fI/usr/bin/\fR or \fI /usr/samba/bin/\fR directory, this directory readable
246 by all, writeable only by root. The client program itself should
247 be executable by all. The client should \fBNOT\fR be
249 diff -uNr samba-2.2.3.orig/docs/manpages/smbd.8 samba-2.2.3/docs/manpages/smbd.8
250 --- samba-2.2.3.orig/docs/manpages/smbd.8 Sun Feb 3 01:45:39 2002
251 +++ samba-2.2.3/docs/manpages/smbd.8 Sun Feb 3 13:25:14 2002
253 See the UNIX_INSTALL.html
254 document for details.
256 -\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
257 +\fB\fI/etc/samba/smb.conf\fB\fR
258 This is the default location of the
260 server configuration file. Other common places that systems
261 diff -uNr samba-2.2.3.orig/docs/manpages/swat.8 samba-2.2.3/docs/manpages/swat.8
262 --- samba-2.2.3.orig/docs/manpages/swat.8 Sun Feb 3 01:45:39 2002
263 +++ samba-2.2.3/docs/manpages/swat.8 Sun Feb 3 13:27:53 2002
268 -/usr/local/samba/bin/swat
272 -/usr/local/samba/swat/images/*
273 +/usr/share/swat/images/*
276 -/usr/local/samba/swat/help/*
277 +/usr/share/swat/help/*
278 .SS "INETD INSTALLATION"
280 You need to edit your \fI/etc/inetd.conf
282 add a line like this:
284 \fBswat stream tcp nowait.400 root
285 -/usr/local/samba/bin/swat swat\fR
286 +/usr/sbin/swat swat\fR
288 One you have edited \fI/etc/services\fR
289 and \fI/etc/inetd.conf\fR you need to send a
291 (e.g., swat) to service port (e.g., 901) and protocol type
294 -\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
295 +\fB\fI/etc/samba/smb.conf\fB\fR
296 This is the default location of the \fIsmb.conf(5)
297 \fRserver configuration file that swat edits. Other
298 common places that systems install this file are \fI /usr/samba/lib/smb.conf\fR and \fI/etc/smb.conf
299 diff -uNr samba-2.2.3.orig/docs/manpages/winbindd.8 samba-2.2.3/docs/manpages/winbindd.8
300 --- samba-2.2.3.orig/docs/manpages/winbindd.8 Sun Feb 3 01:45:39 2002
301 +++ samba-2.2.3/docs/manpages/winbindd.8 Sun Feb 3 13:28:29 2002
303 Storage for the Windows NT rid to UNIX user/group
304 id mapping. The lock directory is specified when Samba is initially
305 compiled using the \fI--with-lockdir\fR option.
306 -This directory is by default \fI/usr/local/samba/var/locks
307 +This directory is by default \fI/var/lock/samba
310 \fB$LOCKDIR/winbindd_cache.tdb\fR