]>
Commit | Line | Data |
---|---|---|
62804263 | 1 | --- samba-2.2.4/docs/manpages/nmbd.8 Fri May 3 03:02:05 2002 |
2 | +++ samba-2.2.4/docs/manpages/nmbd.8.org Mon May 20 10:31:37 2002 | |
f8c3252f | 3 | @@ -91,7 +91,7 @@ |
4 | ||
5 | The default path to this file is compiled into | |
6 | Samba as part of the build process. Common defaults | |
7 | -are \fI/usr/local/samba/lib/lmhosts\fR, | |
8 | +are \fI/etc/samba/lmhosts\fR, | |
9 | \fI/usr/samba/lib/lmhosts\fR or | |
10 | \fI/etc/lmhosts\fR. See the \fIlmhosts(5)\fRman page for details on the | |
11 | contents of this file. | |
f8c3252f | 12 | @@ -149,7 +149,7 @@ |
13 | .TP | |
14 | \fB-s <configuration file>\fR | |
15 | The default configuration file name | |
16 | -is set at build time, typically as \fI /usr/local/samba/lib/smb.conf\fR, but | |
17 | +is set at build time, typically as \fI /etc/samba/smb.conf\fR, but | |
18 | this may be changed when Samba is autoconfigured. | |
19 | ||
20 | The file specified contains the configuration details | |
62804263 | 21 | @@ -180,12 +180,12 @@ |
f8c3252f | 22 | See the UNIX_INSTALL.html |
23 | document for details. | |
24 | .TP | |
25 | -\fB\fI/usr/local/samba/lib/smb.conf\fB\fR | |
26 | +\fB\fI/etc/samba/smb.conf\fB\fR | |
27 | This is the default location of the | |
28 | \fIsmb.conf\fR | |
29 | server configuration file. Other common places that systems | |
62804263 | 30 | install this file are \fI/usr/samba/lib/smb.conf\fR |
31 | -and \fI/etc/smb.conf\fR. | |
32 | +and \fI/etc/samba/smb.conf\fR. | |
33 | ||
34 | When run as a WINS server (see the | |
35 | wins support | |
f8c3252f | 36 | @@ -211,7 +211,7 @@ |
37 | .PP | |
38 | \fBnmbd\fR will accept SIGHUP, which will cause | |
39 | it to dump out its namelists into the file \fInamelist.debug | |
40 | -\fRin the \fI/usr/local/samba/var/locks\fR | |
41 | +\fRin the \fI/var/lock/samba\fR | |
42 | directory (or the \fIvar/locks\fR directory configured | |
43 | under wherever Samba was configured to install itself). This will also | |
44 | cause \fBnmbd\fR to dump out its server database in | |
62804263 | 45 | --- samba-2.2.4/docs/manpages/smb.conf.5 Fri May 3 03:24:14 2002 |
46 | +++ samba-2.2.4/docs/manpages/smb.conf.5.org Mon May 20 10:28:07 2002 | |
47 | @@ -1526,7 +1526,7 @@ | |
f8c3252f | 48 | Default: \fBnone\fR |
49 | .PP | |
50 | .PP | |
51 | -Example: \fBadd share command = /usr/local/bin/addshare\fR | |
52 | +Example: \fBadd share command = /usr/bin/addshare\fR | |
53 | .PP | |
54 | .TP | |
62804263 | 55 | \fBadd user script (G)\fR |
56 | @@ -1569,7 +1569,7 @@ | |
f8c3252f | 57 | |
58 | Default: \fBadd user script = <empty string> | |
59 | \fR | |
60 | -Example: \fBadd user script = /usr/local/samba/bin/add_user | |
61 | +Example: \fBadd user script = /usr/bin/add_user | |
62 | %u\fR | |
63 | .TP | |
64 | \fBadmin users (S)\fR | |
62804263 | 65 | @@ -1802,7 +1802,7 @@ |
f8c3252f | 66 | Default: \fBnone\fR |
67 | .PP | |
68 | .PP | |
69 | -Example: \fBchange share command = /usr/local/bin/addshare\fR | |
70 | +Example: \fBchange share command = /usr/bin/addshare\fR | |
71 | .PP | |
72 | .TP | |
73 | \fBcharacter set (G)\fR | |
62804263 | 74 | @@ -2037,7 +2037,7 @@ |
f8c3252f | 75 | (allowing you to special case the config files of just a few |
76 | clients). | |
77 | ||
78 | -Example: \fBconfig file = /usr/local/samba/lib/smb.conf.%m | |
79 | +Example: \fBconfig file = /etc/samba/smb.conf.%m | |
80 | \fR.TP | |
81 | \fBcopy (S)\fR | |
82 | This parameter allows you to "clone" service | |
62804263 | 83 | @@ -2321,7 +2321,7 @@ |
f8c3252f | 84 | Default: \fBnone\fR |
85 | .PP | |
86 | .PP | |
87 | -Example: \fBdelete share command = /usr/local/bin/delshare\fR | |
88 | +Example: \fBdelete share command = /usr/bin/delshare\fR | |
89 | .PP | |
90 | .TP | |
91 | \fBdelete user script (G)\fR | |
62804263 | 92 | @@ -2367,7 +2367,7 @@ |
f8c3252f | 93 | |
94 | Default: \fBdelete user script = <empty string> | |
95 | \fR | |
96 | -Example: \fBdelete user script = /usr/local/samba/bin/del_user | |
97 | +Example: \fBdelete user script = /usr/bin/del_user | |
98 | %u\fR | |
99 | .TP | |
100 | \fBdelete veto files (S)\fR | |
62804263 | 101 | @@ -2425,7 +2425,7 @@ |
f8c3252f | 102 | Default: \fBBy default internal routines for |
103 | determining the disk capacity and remaining space will be used. | |
104 | \fR | |
105 | -Example: \fBdfree command = /usr/local/samba/bin/dfree | |
106 | +Example: \fBdfree command = /usr/bin/dfree | |
107 | \fR | |
108 | Where the script dfree (which must be made executable) could be: | |
109 | ||
62804263 | 110 | @@ -3250,7 +3250,7 @@ |
f8c3252f | 111 | |
112 | Default: \fBno file included\fR | |
113 | ||
114 | -Example: \fBinclude = /usr/local/samba/lib/admin_smb.conf | |
115 | +Example: \fBinclude = /etc/samba/admin_smb.conf | |
116 | \fR.TP | |
62804263 | 117 | \fBinherit acls (S)\fR |
118 | This parameter can be used to ensure | |
119 | @@ -3680,7 +3680,7 @@ | |
f8c3252f | 120 | This option takes the standard substitutions, allowing |
121 | you to have separate log files for each user or machine. | |
122 | ||
123 | -Example: \fBlog file = /usr/local/samba/var/log.%m | |
124 | +Example: \fBlog file = /var/log/samba/log.%m | |
125 | \fR.TP | |
126 | \fBlog level (G)\fR | |
127 | The value of the parameter (an integer) allows | |
62804263 | 128 | @@ -3793,11 +3793,11 @@ |
f8c3252f | 129 | file is recommended. |
130 | ||
131 | The script must be a relative path to the [netlogon] | |
132 | -service. If the [netlogon] service specifies a \fIpath\fR of \fI/usr/local/samba/netlogon | |
133 | +service. If the [netlogon] service specifies a \fIpath\fR of \fI/etc/samba/netlogon | |
134 | \fR, and \fBlogon script = STARTUP.BAT\fR, then | |
135 | the file that will be downloaded is: | |
136 | ||
137 | -\fI/usr/local/samba/netlogon/STARTUP.BAT\fR | |
138 | +\fI/etc/samba/netlogon/STARTUP.BAT\fR | |
139 | ||
140 | The contents of the batch file are entirely your choice. A | |
141 | suggested command would be to add \fBNET TIME \\\\SERVER /SET | |
62804263 | 142 | @@ -5182,7 +5182,7 @@ |
f8c3252f | 143 | is an example: |
144 | ||
145 | \fBpreexec = csh -c 'echo \\"Welcome to %S!\\" | | |
146 | -/usr/local/samba/bin/smbclient -M %m -I %I' & \fR | |
147 | +/usr/bin/smbclient -M %m -I %I' & \fR | |
148 | ||
149 | Of course, this could get annoying after a while :-) | |
150 | ||
62804263 | 151 | @@ -5332,7 +5332,7 @@ |
152 | and if SAMBA is compiled against libcups, any manually | |
153 | set print command will be ignored. | |
f8c3252f | 154 | |
155 | -Example: \fBprint command = /usr/local/samba/bin/myprintscript | |
156 | +Example: \fBprint command = /usr/bin/myprintscript | |
157 | %p %s\fR | |
158 | .TP | |
159 | \fBprint ok (S)\fR | |
62804263 | 160 | @@ -5462,7 +5462,7 @@ |
f8c3252f | 161 | Default: \fBNone (set in compile).\fR |
162 | ||
163 | Example: \fBprinter driver file = | |
164 | -/usr/local/samba/printers/drivers.def\fR | |
165 | +/etc/samba/drivers.def\fR | |
166 | .TP | |
167 | \fBprinter driver location (S)\fR | |
168 | \fBNote :\fRThis is a deprecated | |
62804263 | 169 | @@ -6291,7 +6291,7 @@ |
f8c3252f | 170 | Examples: \fBsource environment = |/etc/smb.conf.sh |
171 | \fR | |
172 | Example: \fBsource environment = | |
173 | -/usr/local/smb_env_vars\fR | |
174 | +/etc/samba/smb_env_vars\fR | |
175 | .TP | |
176 | \fBssl (G)\fR | |
177 | This variable is part of SSL-enabled Samba. This | |
62804263 | 178 | @@ -6321,7 +6321,7 @@ |
f8c3252f | 179 | directory that don't fit into this naming scheme are ignored. You |
180 | don't need this variable if you don't verify client certificates. | |
181 | ||
182 | -Default: \fBssl CA certDir = /usr/local/ssl/certs | |
183 | +Default: \fBssl CA certDir = /etc/samba/ssl/certs | |
184 | \fR.TP | |
185 | \fBssl CA certFile (G)\fR | |
186 | This variable is part of SSL-enabled Samba. This | |
62804263 | 187 | @@ -6338,7 +6338,7 @@ |
f8c3252f | 188 | simple (you won't need to create the hashed file names). You |
189 | don't need this variable if you don't verify client certificates. | |
190 | ||
191 | -Default: \fBssl CA certFile = /usr/local/ssl/certs/trustedCAs.pem | |
192 | +Default: \fBssl CA certFile = /etc/samba/ssl/certs/trustedCAs.pem | |
193 | \fR.TP | |
194 | \fBssl ciphers (G)\fR | |
195 | This variable is part of SSL-enabled Samba. This | |
62804263 | 196 | @@ -6359,7 +6359,7 @@ |
f8c3252f | 197 | The certificate in this file is used by \fBsmbclient(1)\fRif it exists. It's needed |
198 | if the server requires a client certificate. | |
199 | ||
200 | -Default: \fBssl client cert = /usr/local/ssl/certs/smbclient.pem | |
201 | +Default: \fBssl client cert = /etc/samba/ssl/certs/smbclient.pem | |
202 | \fR.TP | |
203 | \fBssl client key (G)\fR | |
204 | This variable is part of SSL-enabled Samba. This | |
62804263 | 205 | @@ -6370,7 +6370,7 @@ |
f8c3252f | 206 | This is the private key for \fBsmbclient(1)\fR. It's only needed if the |
207 | client should have a certificate. | |
208 | ||
209 | -Default: \fBssl client key = /usr/local/ssl/private/smbclient.pem | |
210 | +Default: \fBssl client key = /etc/samba/ssl/private/smbclient.pem | |
211 | \fR.TP | |
212 | \fBssl compatibility (G)\fR | |
213 | This variable is part of SSL-enabled Samba. This | |
62804263 | 214 | @@ -6989,7 +6989,7 @@ |
f8c3252f | 215 | |
216 | Default: \fBno username map\fR | |
217 | ||
218 | -Example: \fBusername map = /usr/local/samba/lib/users.map | |
219 | +Example: \fBusername map = /etc/samba/users.map | |
220 | \fR.TP | |
221 | \fButmp (G)\fR | |
222 | This boolean parameter is only available if | |
62804263 | 223 | --- samba-2.2.4/docs/manpages/smbd.8 Fri May 3 03:02:07 2002 |
224 | +++ samba-2.2.4/docs/manpages/smbd.8.org Mon May 20 10:28:07 2002 | |
225 | @@ -190,7 +190,7 @@ | |
f8c3252f | 226 | See the UNIX_INSTALL.html |
227 | document for details. | |
228 | .TP | |
229 | -\fB\fI/usr/local/samba/lib/smb.conf\fB\fR | |
230 | +\fB\fI/etc/samba/smb.conf\fB\fR | |
231 | This is the default location of the | |
232 | \fIsmb.conf\fR | |
233 | server configuration file. Other common places that systems | |
62804263 | 234 | --- samba-2.2.4/docs/manpages/swat.8 Fri May 3 03:02:08 2002 |
235 | +++ samba-2.2.4/docs/manpages/swat.8.org Mon May 20 10:28:07 2002 | |
f8c3252f | 236 | @@ -47,13 +47,13 @@ |
237 | these in: | |
238 | .TP 0.2i | |
239 | \(bu | |
98605f7e | 240 | -/usr/local/samba/bin/swat |
f8c3252f | 241 | +/usr/sbin/swat |
242 | .TP 0.2i | |
243 | \(bu | |
98605f7e | 244 | -/usr/local/samba/swat/images/* |
f8c3252f | 245 | +/usr/share/swat/images/* |
246 | .TP 0.2i | |
247 | \(bu | |
98605f7e | 248 | -/usr/local/samba/swat/help/* |
f8c3252f | 249 | +/usr/share/swat/help/* |
250 | .SS "INETD INSTALLATION" | |
251 | .PP | |
252 | You need to edit your \fI/etc/inetd.conf | |
253 | @@ -78,7 +78,7 @@ | |
254 | add a line like this: | |
255 | .PP | |
256 | \fBswat stream tcp nowait.400 root | |
257 | -/usr/local/samba/bin/swat swat\fR | |
258 | +/usr/sbin/swat swat\fR | |
259 | .PP | |
260 | One you have edited \fI/etc/services\fR | |
261 | and \fI/etc/inetd.conf\fR you need to send a | |
262 | @@ -104,7 +104,7 @@ | |
263 | (e.g., swat) to service port (e.g., 901) and protocol type | |
264 | (e.g., tcp). | |
265 | .TP | |
266 | -\fB\fI/usr/local/samba/lib/smb.conf\fB\fR | |
267 | +\fB\fI/etc/samba/smb.conf\fB\fR | |
268 | This is the default location of the \fIsmb.conf(5) | |
269 | \fRserver configuration file that swat edits. Other | |
270 | common places that systems install this file are \fI /usr/samba/lib/smb.conf\fR and \fI/etc/smb.conf | |
62804263 | 271 | --- samba-2.2.4/docs/manpages/winbindd.8 Fri May 3 03:02:08 2002 |
272 | +++ samba-2.2.4/docs/manpages/winbindd.8.org Mon May 20 10:28:07 2002 | |
f8c3252f | 273 | @@ -364,7 +364,7 @@ |
274 | Storage for the Windows NT rid to UNIX user/group | |
275 | id mapping. The lock directory is specified when Samba is initially | |
276 | compiled using the \fI--with-lockdir\fR option. | |
277 | -This directory is by default \fI/usr/local/samba/var/locks | |
278 | +This directory is by default \fI/var/lock/samba | |
279 | \fR\&. | |
280 | .TP | |
281 | \fB$LOCKDIR/winbindd_cache.tdb\fR |