Updates samba und fixed ovpn adress detection

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 331032b8300c9c006781432d03fd8a90e27f6843..3747893eebb98d8aa97990891d1ccd6d28c7049b 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -60,6 +60,10 @@ my %shares = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
+my @ovpnnetwork = split(/\//,$ovpnsettings{'DOVPN_SUBNET'});
+my @ovpnip      = split(/\./,$ovpnnetwork[0]);
+$ovpnip[3]=$ovpnip[3]+1;
+
 ############################################################################################################################
 ############################################# Samba Dienste fr Statusberprfung ##########################################
 
@@ -230,7 +234,7 @@ $sambasettings{'INTERFACES'} = '';
 if ($sambasettings{'GREEN'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'GREEN_DEV'}";}
 if ($sambasettings{'BLUE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'BLUE_DEV'}";}
 if ($sambasettings{'ORANGE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'ORANGE_DEV'}";}
-if ($sambasettings{'VPN'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $ovpnsettings{'DOVPN_SUBNET'}";}
+if ($sambasettings{'VPN'} eq 'on'){$sambasettings{'INTERFACES'} .= " ";}
 if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .= " $sambasettings{'OTHERINTERFACES'}";}
 
 ############################################################################################################################
@@ -447,7 +451,7 @@ print <<END
                                                                                                                                                                                        <input type='radio' name='LOCALMASTER' value='off' $checked{'LOCALMASTER'}{'off'} /> off</td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'interfaces'}</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
                                                                                                                                                                                <input type='radio' name='VPN' value='off' $checked{'VPN'}{'off'} /> off |
-                                                                                                                                                                               <font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnsettings{'DOVPN_SUBNET'}</b></font></td></tr>
+                                                                                                                                                                               <font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1]</b></font></td></tr>
 <tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='GREEN' value='on' $checked{'GREEN'}{'on'} />/
                                                                                                                                        <input type='radio' name='GREEN' value='off' $checked{'GREEN'}{'off'} /> off |
                                                                                                                                        <font size='2' color='$Header::colourgreen'><b>   $Lang::tr{'green'}  -  $netsettings{'GREEN_DEV'}</b></font></td></tr>

diff --git a/lfs/samba b/lfs/samba
index 11ee55eb215ade43fbc41105afb7f424c4e8de25..27a355d60c7b4fa4d981833db7c2aaf96530ad6c 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,119 +1,119 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# 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 3 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, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 3.3.6
-
-THISAPP    = samba-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = samba
-PAK_VER    = 17
-
-DEPS       = "cups cyrus-sasl"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 858cb6c640358be0e81297c5de615a3c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP)/source && ./configure \
-                               --prefix=/usr \
-                               --libdir=/usr/lib/ \
-                               --sysconfdir=/var/ipfire \
-                               --localstatedir=/var \
-                               --with-piddir=/var/run \
-                               --with-fhs \
-                               --with-winbind \
-                               --disable-swat \
-                               --enable-cups \
-                               --with-cifsmount \
-                               --with-syslog
-       cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP)/source && make install
-#      cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib
-#      cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so
-#      cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so
-#      cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so
-#      cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so
-       cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h
-       cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h
-       cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_wins.so /lib
-       cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_winbind.so /lib
-       cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
-       cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
-#      cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
-       cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
-       -mkdir -p /var/ipfire/samba     
-       cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
-       chown nobody:nobody -R /var/ipfire/samba/
-       cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
-       cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
-       cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings
-       cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
-       cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
-       cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
-       -mkdir -p /var/log/samba
-       install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
+###############################################################################\r
+#                                                                             #\r
+# IPFire.org - A linux based firewall                                         #\r
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #\r
+#                                                                             #\r
+# This program is free software: you can redistribute it and/or modify        #\r
+# it under the terms of the GNU General Public License as published by        #\r
+# the Free Software Foundation, either version 3 of the License, or           #\r
+# (at your option) any later version.                                         #\r
+#                                                                             #\r
+# This program is distributed in the hope that it will be useful,             #\r
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #\r
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #\r
+# GNU General Public License for more details.                                #\r
+#                                                                             #\r
+# You should have received a copy of the GNU General Public License           #\r
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #\r
+#                                                                             #\r
+###############################################################################\r
+\r
+###############################################################################\r
+# Definitions\r
+###############################################################################\r
+\r
+include Config\r
+\r
+VER        = 3.3.7\r
+\r
+THISAPP    = samba-$(VER)\r
+DL_FILE    = $(THISAPP).tar.gz\r
+DL_FROM    = $(URL_IPFIRE)\r
+DIR_APP    = $(DIR_SRC)/$(THISAPP)\r
+TARGET     = $(DIR_INFO)/$(THISAPP)\r
+PROG       = samba\r
+PAK_VER    = 18\r
+\r
+DEPS       = "cups cyrus-sasl"\r
+\r
+###############################################################################\r
+# Top-level Rules\r
+###############################################################################\r
+\r
+objects = $(DL_FILE)\r
+\r
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)\r
+\r
+$(DL_FILE)_MD5 = bc7228cc686986353df67ff42b1b2b1e\r
+\r
+install : $(TARGET)\r
+\r
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))\r
+\r
+download :$(patsubst %,$(DIR_DL)/%,$(objects))\r
+\r
+md5 : $(subst %,%_MD5,$(objects))\r
+\r
+dist: \r
+       @$(PAK)\r
+\r
+###############################################################################\r
+# Downloading, checking, md5sum\r
+###############################################################################\r
+\r
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :\r
+       @$(CHECK)\r
+\r
+$(patsubst %,$(DIR_DL)/%,$(objects)) :\r
+       @$(LOAD)\r
+\r
+$(subst %,%_MD5,$(objects)) :\r
+       @$(MD5)\r
+\r
+###############################################################################\r
+# Installation Details\r
+###############################################################################\r
+\r
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))\r
+       @$(PREBUILD)\r
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)\r
+       cd $(DIR_APP)/source && ./configure \\r
+                               --prefix=/usr \\r
+                               --libdir=/usr/lib/ \\r
+                               --sysconfdir=/var/ipfire \\r
+                               --localstatedir=/var \\r
+                               --with-piddir=/var/run \\r
+                               --with-fhs \\r
+                               --with-winbind \\r
+                               --disable-swat \\r
+                               --enable-cups \\r
+                               --with-cifsmount \\r
+                               --with-syslog\r
+       cd $(DIR_APP)/source && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)\r
+       cd $(DIR_APP)/source && make install\r
+#      cp -vfp /usr/lib/samba/{libsmbclient.so.0,libtalloc.so.1,libtdb.so.1,libwbclient.so.0} /usr/lib\r
+#      cd /usr/lib/ && ln -v -sf libsmbclient.so.0 libsmbclient.so\r
+#      cd /usr/lib/ && ln -v -sf libtalloc.so.1 libtalloc.so\r
+#      cd /usr/lib/ && ln -v -sf libtdb.so.1 libtdb.so\r
+#      cd /usr/lib/ && ln -v -sf libwbclient.so.0 libwbclient.so\r
+       cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h\r
+       cd $(DIR_APP)/source && chmod -v 644 /usr/include/libsmbclient.h\r
+       cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_wins.so /lib\r
+       cd $(DIR_APP)/source && install -v -m755 nsswitch/libnss_winbind.so /lib\r
+       cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2\r
+       cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2\r
+#      cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security\r
+       cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba\r
+       -mkdir -p /var/ipfire/samba     \r
+       cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/\r
+       chown nobody:nobody -R /var/ipfire/samba/\r
+       cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global\r
+       cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc\r
+       cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings\r
+       cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares\r
+       cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer\r
+       cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf\r
+       -mkdir -p /var/log/samba\r
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba\r
+       @rm -rf $(DIR_APP)\r
+       @$(POSTBUILD)\r