webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade and fix for samba pack

Browse Source
This commit is contained in:
maniacikarus
2009-05-08 20:40:22 +02:00
parent 2b5b6b9e75
commit 060ecb123a
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/packages-list.txt
View File

@@ -219,7 +219,6 @@
* mtools-3.9.10
* mysql-5.0.24a
* nagios-3.0.5
* nano-1.2.5
* nano-2.0.9
* nasm-0.98.39
* ncftp-3.2.1-src
@@ -271,7 +270,7 @@
* rssdler-0.4.0a
* rsync-3.0.4
* rtorrent-0.8.4
* samba-3.3.3
* samba-3.3.4
* sane-1.0.19
* screen-4.0.3
* sdparm-1.01
@@ -289,7 +288,6 @@
* squashfs3.4
* squid-2.7.STABLE6
* squidGuard-1.4
* squidclamav-3.9
* squidclamav-4.0
* sshfs-fuse-2.2
* sslh-1.6g

11
html/cgi-bin/samba.cgi
View File

@@ -315,7 +315,7 @@ END
close FILE;
}
if ($sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' )
if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' )
{
open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!";
flock (FILE, 2);
@@ -334,12 +334,12 @@ END
if ( -e "/var/ipfire/cups/enable")
{
if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
}
else
{
if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
else{system("/usr/local/bin/sambactrl smbsafeconf");}
}
@@ -1206,18 +1206,17 @@ close FILE;
if ( -e "/var/ipfire/cups/enable")
{
if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
}
else
{
if ( $sambasettings{'SECURITY'} eq 'User' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
else{system("/usr/local/bin/sambactrl smbsafeconf");}
}
system("/usr/local/bin/sambactrl smbreload");
refreshpage();
}
sub isrunning
{

6
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.3.3
VER = 3.3.4
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 14
PAK_VER = 15
DEPS = "cups cyrus-sasl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4d5835817416d1ffa30783af45c5a9ed
$(DL_FILE)_MD5 = 1443165edb7cb3f56f1e77aec1ee3266
install : $(TARGET)