Dateianhang 'samba-2.1.6.diff'
Herunterladen 1 diff -urN current/check/samba_lpd.txt foo/check/samba_lpd.txt
2 --- current/check/samba_lpd.txt Fri Mar 12 05:09:40 2004
3 +++ foo/check/samba_lpd.txt Wed Apr 7 11:48:45 2004
4 @@ -50,15 +50,26 @@
5 SAMBA_TRUSTED_NETS OPT_SAMBA - ENETWORKS
6 SAMBA_LOG OPT_SAMBA - YESNO
7
8 -SAMBA_LPD_PARPORT_%_NAME OPT_LPD LPD_PARPORT_N SMB_PRINTERNAME
9 -SAMBA_LPD_PARPORT_%_NET OPT_LPD LPD_PARPORT_N SMB_ACCESS
10 +SAMBA_LPD_PARPORT_%_NAME OPT_LPD_PARPORT LPD_PARPORT_N SMB_PRINTERNAME
11 +SAMBA_LPD_PARPORT_%_NET OPT_LPD_PARPORT LPD_PARPORT_N SMB_ACCESS
12
13 -SAMBA_LPD_USBPORT_%_NAME OPT_LPD LPD_USBPORT_N SMB_PRINTERNAME
14 -SAMBA_LPD_USBPORT_%_NET OPT_LPD LPD_USBPORT_N SMB_ACCESS
15 +SAMBA_LPD_USBPORT_%_NAME OPT_LPD_USBPORT LPD_USBPORT_N SMB_PRINTERNAME
16 +SAMBA_LPD_USBPORT_%_NET OPT_LPD_USBPORT LPD_USBPORT_N SMB_ACCESS
17
18 -SAMBA_LPD_REMOTE_%_NAME OPT_LPD LPD_REMOTE_N SMB_PRINTERNAME
19 -SAMBA_LPD_REMOTE_%_NET OPT_LPD LPD_REMOTE_N SMB_ACCESS
20 +SAMBA_LPD_REMOTE_%_NAME OPT_LPD_REMOTE LPD_REMOTE_N SMB_PRINTERNAME
21 +SAMBA_LPD_REMOTE_%_NET OPT_LPD_REMOTE LPD_REMOTE_N SMB_ACCESS
22
23 +SAMBA_ADMINIP OPT_SAMBA - SMB_ACCESS
24 +SAMBA_SHARE_N OPT_SAMBA - NUMERIC
25 +SAMBA_SHARE_%_NAME OPT_SAMBA SAMBA_SHARE_N SMB_NAME
26 +SAMBA_SHARE_%_RW OPT_SAMBA SAMBA_SHARE_N YESNO
27 +SAMBA_SHARE_%_BROWSE OPT_SAMBA SAMBA_SHARE_N YESNO
28 +SAMBA_SHARE_%_PATH OPT_SAMBA SAMBA_SHARE_N ABS_PATH
29 +SAMBA_SHARE_%_NET OPT_SAMBA SAMBA_SHARE_N SMB_ACCESS
30 +
31 +SAMBA_CDROM_N OPT_SAMBA - NUMERIC
32 +SAMBA_CDROM_%_DEV OPT_SAMBA SAMBA_CDROM_N DISK
33 +SAMBA_CDROM_%_NET OPT_SAMBA SAMBA_CDROM_N SMB_ACCESS
34 #------------------------------------------------------------------------------
35 # nmbd
36 #
37 diff -urN current/config/samba_lpd.txt foo/config/samba_lpd.txt
38 --- current/config/samba_lpd.txt Fri Mar 12 05:09:40 2004
39 +++ foo/config/samba_lpd.txt Wed Apr 7 11:47:10 2004
40 @@ -28,6 +28,18 @@
41 SAMBA_TRUSTED_NETS='' # grant access also to nets
42 SAMBA_LOG='no' # log errors in /var/log/log.smb and
43 # /var/log/log.nmb: yes or no
44 +SAMBA_ADMINIP='' # ip addr of smb-client (mount fli4l rootfs)
45 +SAMBA_SHARE_N='0' # how many shares you want to create
46 +SAMBA_SHARE_1_NAME='share1' # name of the 1st share
47 +SAMBA_SHARE_1_RW='yes' # should share writeable: yes or no
48 +SAMBA_SHARE_1_BROWSE='yes' # should share browseable: yes or no
49 +SAMBA_SHARE_1_PATH='/usr/local/data' # path of the share, see MOUNT_x_POINT !
50 +SAMBA_SHARE_1_NET='' # allowed networks for 1st share,
51 + # if empty all internal nets
52 +
53 +SAMBA_CDROM_N='1' # create shares for n CDROMs
54 +SAMBA_CDROM_1_DEV='hdc' # name of the CDROM device eg. hdc
55 +SAMBA_CDROM_1_NET='' # allowed networks for 1st CDROM,
56
57 SAMBA_LPD_PARPORT_1_NAME='' # printer name in network neighborhood
58 SAMBA_LPD_PARPORT_1_NET='' # allowed networks for LPD_PARPORT_1,
59 diff -urN current/opt/etc/rc.d/file_shares.sh foo/opt/etc/rc.d/file_shares.sh
60 --- current/opt/etc/rc.d/file_shares.sh Wed Apr 7 11:40:07 2004
61 +++ foo/opt/etc/rc.d/file_shares.sh Wed Apr 7 11:47:10 2004
62 @@ -0,0 +1,115 @@
63 + #----------------------------------------------------------------------------
64 + # create share(s):
65 + #----------------------------------------------------------------------------
66 +
67 + echo "configuring shares"
68 + idx='1'
69 +
70 + while [ "$idx" -le "$SAMBA_SHARE_N" ]
71 + do
72 + eval name='$SAMBA_SHARE_'$idx'_NAME'
73 + eval write='$SAMBA_SHARE_'$idx'_RW'
74 + eval browse='$SAMBA_SHARE_'$idx'_BROWSE'
75 + eval path='$SAMBA_SHARE_'$idx'_PATH'
76 + path=$path/$name
77 + eval hosts='$SAMBA_SHARE_'$idx'_NET'
78 +
79 + if [ ! -d "$path" ]
80 + then
81 + mkdir $path
82 + if [ "$?" = "0" ]
83 + then
84 + echo "directory $path for share $name on $HOSTNAME created"
85 + else
86 + colecho "*** ERROR: cannot create directory $path for share $name on $HOSTNAME! ***" br x br
87 + colecho "*** ERROR: check OPT_MOUNT and SAMBA_SHARE_PATH! ***" br x br
88 + fi
89 + else
90 + echo "directory for share $name on $HOSTNAME always exists"
91 + fi
92 +
93 + if [ "$hosts" != '' ] # which net will be allowed to access the share?
94 + then # net is defined
95 + hosts1=$hosts # net in SAMBA_SHARE_NET_X will be allowed
96 + echo "share $name on $HOSTNAME will be accessable for network(s):"
97 + echo "$hosts1"
98 + else # net is not defined
99 + hosts1=$sambahosts # net in IP_ETH_X_NETWORK/$IP_ETH_X_NETMASK will be allowed
100 + echo "share $name on $HOSTNAME will be accessable for network(s):"
101 + echo "$hosts1"
102 + fi
103 +
104 + (echo "[$name]"
105 + echo " comment = share $name on $HOSTNAME"
106 + echo " browseable = $browse"
107 + echo " available = yes"
108 + echo " writeable = $write"
109 + echo " path = $path"
110 + echo " hosts allow = $hosts1"
111 + echo " force user = root"
112 + echo " "
113 + ) >> /etc/smb.conf
114 + idx=`expr $idx + 1`
115 + done
116 +
117 + #----------------------------------------------------------------------------
118 + # create share(s) for cdrom(s):
119 + #----------------------------------------------------------------------------
120 +
121 + idx='1'
122 +
123 + while [ "$idx" -le "$SAMBA_CDROM_N" ]
124 + do
125 + eval dev='$SAMBA_CDROM_'$idx'_DEV'
126 + eval hosts='$SAMBA_CDROM_'$idx'_NET'
127 + path=''
128 +
129 + if [ "$hosts" != '' ] # which net will be allowed to access the share?
130 + then # net is defined
131 + hosts1=$hosts # net in SAMBA_CDROM_NET_X will be allowed
132 + echo "cdrom$idx on $HOSTNAME will be accessable for network(s):"
133 + echo "$hosts1"
134 + else # net is not defined
135 + hosts1=$sambahosts # net in IP_ETH_X_NETWORK/$IP_ETH_X_NETMASK will be allowed
136 + echo "cdrom$idx on $HOSTNAME will be accessable for network(s):"
137 + echo "$hosts1"
138 + fi
139 +
140 + if [ -n "`cat /proc/mounts | grep $dev`" ]
141 + then # found mounted cdrom$idx
142 + echo "cdrom$idx already mounted"
143 + path=`cat /proc/mounts | grep /dev/$dev | cut -d" " -f2` # cut mountpath for sharing
144 + echo "path for cdrom$idx is $path"
145 + exec=false
146 + else # cdrom$idx not mounted
147 + echo "cdrom$idx not mounted"
148 + path=/mnt/cdrom$idx
149 + echo "path for cdrom$idx is $path"
150 + exec=true
151 +
152 + if [ ! -d /mnt/cdrom$idx ]
153 + then
154 + mkdir /mnt/cdrom$idx
155 + fi
156 + fi
157 +
158 + (echo "[cdrom$idx]"
159 + echo " comment = cdrom$idx on $HOSTNAME at device $dev"
160 + echo " read only = yes"
161 + echo " hosts allow = $hosts1"
162 + echo " path = $path"
163 + ) >> /etc/smb.conf
164 +
165 + if [ "$exec" = "true" ]
166 + then
167 + (echo " root preexec = /bin/mount -t iso9660 /dev/$dev /mnt/cdrom$idx -o ro"
168 + echo " root postexec = /bin/umount /dev/$dev"
169 + echo " "
170 + ) >> /etc/smb.conf
171 + else
172 + (echo " "
173 + ) >> /etc/smb.conf
174 + fi
175 + idx=`expr $idx + 1`
176 + done
177 +
178 diff -urN current/opt/etc/rc.d/rc455.samba foo/opt/etc/rc.d/rc455.samba
179 --- current/opt/etc/rc.d/rc455.samba Fri Mar 12 05:09:40 2004
180 +++ foo/opt/etc/rc.d/rc455.samba Wed Apr 7 11:47:10 2004
181 @@ -15,7 +15,7 @@
182 # configuring parameters from config.txt:
183 #----------------------------------------------------------------------------
184
185 -SAMBA_ADMINIP=''
186 +# SAMBA_ADMINIP=''
187 interface=''
188 sambahosts=''
189 start_samba=false
190 @@ -314,6 +314,11 @@
191 echo " dont descend = proc"
192 echo " "
193 ) >> /etc/smb.conf
194 + fi
195 +
196 + if [ -f /etc/rc.d/file_shares.sh ]
197 + then
198 + . /etc/rc.d/file_shares.sh
199 fi
200
201 #----------------------------------------------------------------------------
202 diff -urN current/opt/samba_lpd.txt foo/opt/samba_lpd.txt
203 --- current/opt/samba_lpd.txt Fri Mar 12 05:09:43 2004
204 +++ foo/opt/samba_lpd.txt Wed Apr 7 11:47:10 2004
205 @@ -12,6 +12,7 @@
206 #----------------------------------------------------------------------------
207 samba yes etc/rc0.d/rc400.samba
208 samba yes etc/rc.d/rc455.samba
209 +samba yes etc/rc.d/file_shares.sh
210 samba yes etc/prep/rc400.samba
211 samba yes etc/lmhosts
212 samba yes files/usr/lib/samba/codepages/codepage.850
Gespeicherte Dateianhänge
Um Dateianhänge in eine Seite einzufügen sollte unbedingt eine Angabe wie attachment:dateiname benutzt werden, wie sie auch in der folgenden Liste der Dateien erscheint. Es sollte niemals die URL des Verweises ("laden") kopiert werden, da sich diese jederzeit ändern kann und damit der Verweis auf die Datei brechen würde.Sie dürfen keine Anhänge an diese Seite anhängen!