From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 25 Feb 2011 08:01:28 +0000 (+0100)
Subject: Merge branch 'master' into perl
X-Git-Tag: v2.9-core48~15^2^2~1
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=68388766c3ce8644b8983d9c1b6726c9e94fa2a6;hp=4eb60dc7806f41bb07d2e45c69ac5ebc8d5353d2

Merge branch 'master' into perl
---

diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files
index d63f861870..a83bb340a0 100644
--- a/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/rc.d/init.d/sshd
 etc/rc.d/init.d/networking/red
+srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/remote.cgi
diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/core/48/filelists/files
new file mode 100644
index 0000000000..0037af1833
--- /dev/null
+++ b/config/rootfiles/core/48/filelists/files
@@ -0,0 +1 @@
+etc/system-release
diff --git a/config/rootfiles/core/48/meta b/config/rootfiles/core/48/meta
new file mode 100644
index 0000000000..d547fa86fa
--- /dev/null
+++ b/config/rootfiles/core/48/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/48/update.sh b/config/rootfiles/core/48/update.sh
new file mode 100644
index 0000000000..b67200a70a
--- /dev/null
+++ b/config/rootfiles/core/48/update.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove core updates from pakfire cache to save space...
+rm -f /var/cache/pakfire/core-upgrade-*.ipfire
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 476de52cc3..8b3200dab4 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3192,7 +3192,7 @@ END
 		{
 			if ($proxysettings{'NTLM_ENABLE_INT_AUTH'} eq 'on')
 			{
-				print FILE "auth_param ntlm program $authdir/ntlm_auth $proxysettings{'NTLM_DOMAIN'}/$proxysettings{'NTLM_PDC'}";
+				print FILE "auth_param ntlm program $authdir/ntlm_smb_lm_auth $proxysettings{'NTLM_DOMAIN'}/$proxysettings{'NTLM_PDC'}";
 				if ($proxysettings{'NTLM_BDC'} eq '') { print FILE "\n"; } else { print FILE " $proxysettings{'NTLM_DOMAIN'}/$proxysettings{'NTLM_BDC'}\n"; }
 				print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n";
 				if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; }
diff --git a/make.sh b/make.sh
index 2a8abc8a6b..55bdf9aa47 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.9"							# Version number
-CORE="47"							# Core Level (Filename)
-PAKFIRE_CORE="46"						# Core Level (PAKFIRE)
+CORE="48"							# Core Level (Filename)
+PAKFIRE_CORE="47"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir