summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/samba/samba-3.6.24/documentation.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity/samba/samba-3.6.24/documentation.patch')
-rw-r--r--meta-oe/recipes-connectivity/samba/samba-3.6.24/documentation.patch302
1 files changed, 302 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba-3.6.24/documentation.patch b/meta-oe/recipes-connectivity/samba/samba-3.6.24/documentation.patch
new file mode 100644
index 000000000..73111fed7
--- /dev/null
+++ b/meta-oe/recipes-connectivity/samba/samba-3.6.24/documentation.patch
@@ -0,0 +1,302 @@
1Description: Remove documentation parts that do not apply to Debian
2Author: Christian Perrier <bubulle@debian.org>
3Forwarded: not-needed
4
5Index: experimental/docs/manpages/swat.8
6===================================================================
7--- experimental.orig/docs/manpages/swat.8
8+++ experimental/docs/manpages/swat.8
9@@ -120,86 +120,6 @@
10 .RS 4
11 Print a summary of command line options\&.
12 .RE
13-.SH "INSTALLATION"
14-.PP
15-Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
16-.PP
17-After you compile SWAT you need to run
18-make install
19-to install the
20-swat
21-binary and the various help files and images\&. A default install would put these in:
22-.sp
23-.RS 4
24-.ie n \{\
25-\h'-04'\(bu\h'+03'\c
26-.\}
27-.el \{\
28-.sp -1
29-.IP \(bu 2.3
30-.\}
31-/usr/local/samba/sbin/swat
32-.RE
33-.sp
34-.RS 4
35-.ie n \{\
36-\h'-04'\(bu\h'+03'\c
37-.\}
38-.el \{\
39-.sp -1
40-.IP \(bu 2.3
41-.\}
42-/usr/local/samba/swat/images/*
43-.RE
44-.sp
45-.RS 4
46-.ie n \{\
47-\h'-04'\(bu\h'+03'\c
48-.\}
49-.el \{\
50-.sp -1
51-.IP \(bu 2.3
52-.\}
53-/usr/local/samba/swat/help/*
54-.RE
55-.sp
56-.RE
57-.SS "Inetd Installation"
58-.PP
59-You need to edit your
60-/etc/inetd\&.conf
61-and
62-/etc/services
63-to enable SWAT to be launched via
64-inetd\&.
65-.PP
66-In
67-/etc/services
68-you need to add a line like this:
69-.PP
70-swat 901/tcp
71-.PP
72-Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local
73-/etc/services
74-file\&.
75-.PP
76-the choice of port number isn\*(Aqt really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
77-inetd
78-daemon)\&.
79-.PP
80-In
81-/etc/inetd\&.conf
82-you should add a line like this:
83-.PP
84-swat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat
85-.PP
86-Once you have edited
87-/etc/services
88-and
89-/etc/inetd\&.conf
90-you need to send a HUP signal to inetd\&. To do this use
91-kill \-1 PID
92-where PID is the process ID of the inetd daemon\&.
93 .SH "LAUNCHING"
94 .PP
95 To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
96@@ -217,14 +137,11 @@
97 This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
98 .RE
99 .PP
100-/usr/local/samba/lib/smb\&.conf
101+/etc/samba/smb\&.conf
102 .RS 4
103 This is the default location of the
104 \fBsmb.conf\fR(5)
105-server configuration file that swat edits\&. Other common places that systems install this file are
106-/usr/samba/lib/smb\&.conf
107-and
108-/etc/smb\&.conf\&. This file describes all the services the server is to make available to clients\&.
109+server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
110 .RE
111 .SH "WARNINGS"
112 .PP
113Index: experimental/docs/manpages/nmbd.8
114===================================================================
115--- experimental.orig/docs/manpages/nmbd.8
116+++ experimental/docs/manpages/nmbd.8
117@@ -115,10 +115,7 @@
118 to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
119 \fIONLY\fR\&.
120 .sp
121-The default path to this file is compiled into Samba as part of the build process\&. Common defaults are
122-/usr/local/samba/lib/lmhosts,
123-/usr/samba/lib/lmhosts
124-or
125+The default path to this file is
126 /etc/samba/lmhosts\&. See the
127 \fBlmhosts\fR(5)
128 man page for details on the contents of this file\&.
129@@ -187,14 +184,11 @@
130 inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
131 .RE
132 .PP
133-/usr/local/samba/lib/smb\&.conf
134+/etc/samba/smb\&.conf
135 .RS 4
136 This is the default location of the
137 \fBsmb.conf\fR(5)
138-server configuration file\&. Other common places that systems install this file are
139-/usr/samba/lib/smb\&.conf
140-and
141-/etc/samba/smb\&.conf\&.
142+server configuration file\&.
143 .sp
144 When run as a WINS server (see the
145 \m[blue]\fBwins support\fR\m[]
146@@ -238,10 +232,8 @@
147 will accept SIGHUP, which will cause it to dump out its namelists into the file
148 namelist\&.debug
149 in the
150-/usr/local/samba/var/locks
151-directory (or the
152-var/locks
153-directory configured under wherever Samba was configured to install itself)\&. This will also cause
154+/var/run/samba
155+directory\&. This will also cause
156 nmbd
157 to dump out its server database in the
158 log\&.nmb
159Index: experimental/docs/manpages/smbd.8
160===================================================================
161--- experimental.orig/docs/manpages/smbd.8
162+++ experimental/docs/manpages/smbd.8
163@@ -169,14 +169,11 @@
164 inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
165 .RE
166 .PP
167-/usr/local/samba/lib/smb\&.conf
168+/etc/samba/smb\&.conf
169 .RS 4
170 This is the default location of the
171 \fBsmb.conf\fR(5)
172-server configuration file\&. Other common places that systems install this file are
173-/usr/samba/lib/smb\&.conf
174-and
175-/etc/samba/smb\&.conf\&.
176+server configuration file\&.
177 .sp
178 This file describes all the services the server is to make available to clients\&. See
179 \fBsmb.conf\fR(5)
180Index: experimental/docs/manpages/lmhosts.5
181===================================================================
182--- experimental.orig/docs/manpages/lmhosts.5
183+++ experimental/docs/manpages/lmhosts.5
184@@ -96,10 +96,8 @@
185 file\&.
186 .SH "FILES"
187 .PP
188-lmhosts is loaded from the configuration directory\&. This is usually
189-/etc/samba
190-or
191-/usr/local/samba/lib\&.
192+lmhosts is loaded from the configuration directory\&. This is
193+/etc/samba\&.
194 .SH "VERSION"
195 .PP
196 This man page is correct for version 3 of the Samba suite\&.
197Index: experimental/docs/manpages/ntlm_auth.1
198===================================================================
199--- experimental.orig/docs/manpages/ntlm_auth.1
200+++ experimental/docs/manpages/ntlm_auth.1
201@@ -43,7 +43,7 @@
202 Some of these commands also require access to the directory
203 winbindd_privileged
204 in
205-$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
206+/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the
207 winbindd_privileged
208 directory\&. For security reasons, this directory should not be world\-accessable\&.
209 .SH "OPTIONS"
210@@ -69,7 +69,7 @@
211 Requires access to the directory
212 winbindd_privileged
213 in
214-$LOCKDIR\&. The protocol used is described here:
215+/var/run/samba\&. The protocol used is described here:
216 http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
217 YR
218 command\&. (Thus avoiding loss of information in the protocol exchange)\&.
219@@ -92,7 +92,7 @@
220 Requires access to the directory
221 winbindd_privileged
222 in
223-$LOCKDIR\&.
224+/var/run/samba\&.
225 .RE
226 .PP
227 gss\-spnego\-client
228Index: experimental/docs/manpages/tdbbackup.8
229===================================================================
230--- experimental.orig/docs/manpages/tdbbackup.8
231+++ experimental/docs/manpages/tdbbackup.8
232@@ -77,7 +77,7 @@
233 .\}
234
235 secrets\&.tdb
236-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
237+\- usual location is in the /var/lib/samba directory\&.
238 .RE
239 .sp
240 .RS 4
241@@ -90,7 +90,7 @@
242 .\}
243
244 passdb\&.tdb
245-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
246+\- usual location is in the /var/lib/samba directory\&.
247 .RE
248 .sp
249 .RS 4
250@@ -103,7 +103,7 @@
251 .\}
252
253 *\&.tdb
254-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
255+located in the /var/lib/samba and /var/run/samba directories\&.
256 .RE
257 .SH "VERSION"
258 .PP
259Index: experimental/docs/manpages/winbindd.8
260===================================================================
261--- experimental.orig/docs/manpages/winbindd.8
262+++ experimental/docs/manpages/winbindd.8
263@@ -539,16 +539,16 @@
264 file are owned by root\&.
265 .RE
266 .PP
267-$LOCKDIR/winbindd_privileged/pipe
268+/var/run/samba/winbindd_privileged/pipe
269 .RS 4
270 The UNIX pipe over which \*(Aqprivileged\*(Aq clients communicate with the
271 winbindd
272 program\&. For security reasons, access to some winbindd functions \- like those needed by the
273 ntlm_auth
274-utility \- is restricted\&. By default, only users in the \*(Aqroot\*(Aq group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \*(Aqsquid\*(Aq to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
275-$LOCKDIR/winbindd_privileged
276+utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
277+/var/run/samba/winbindd_privileged
278 directory and
279-$LOCKDIR/winbindd_privileged/pipe
280+/var/run/samba/winbindd_privileged/pipe
281 file are owned by root\&.
282 .RE
283 .PP
284@@ -557,15 +557,12 @@
285 Implementation of name service switch library\&.
286 .RE
287 .PP
288-$LOCKDIR/winbindd_idmap\&.tdb
289+/var/run/samba/winbindd_idmap\&.tdb
290 .RS 4
291-Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
292-\fI\-\-with\-lockdir\fR
293-option\&. This directory is by default
294-/usr/local/samba/var/locks\&.
295+Storage for the Windows NT rid to UNIX user/group id mapping\&.
296 .RE
297 .PP
298-$LOCKDIR/winbindd_cache\&.tdb
299+/var/run/samba/winbindd_cache\&.tdb
300 .RS 4
301 Storage for cached user and group information\&.
302 .RE