Revision: 5734
http://ipcop.svn.sourceforge.net/ipcop/?rev=5734&view=rev
Author: owes
Date: 2011-07-14 19:30:46 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Use : character instead of . character in aliasname, since the kernel uses : in
several places.
Modified Paths:
--------------
ipcop/trunk/src/misc-progs/setaliases.c
ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
Modified: ipcop/trunk/src/misc-progs/setaliases.c
===================================================================
--- ipcop/trunk/src/misc-progs/setaliases.c 2011-07-14 15:37:53 UTC (rev
5733)
+++ ipcop/trunk/src/misc-progs/setaliases.c 2011-07-14 19:30:46 UTC (rev
5734)
@@ -1,14 +1,28 @@
/*
* setaliases - configure red aliased interfaces
*
- * This program is distributed under the terms of the GNU General Public
- * Licence. See the file COPYING for details.
+ * This file is part of the IPCop Firewall.
*
+ * IPCop 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * IPCop 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 IPCop. If not, see <http://www.gnu.org/licenses/>.
+ *
* (c) Steve Bootes, 2002/04/15
*
* 21/04/03 Robert Kerr Changed to link directly to libsmooth rather than
* using a copy & paste
*
+ * (c) -2011, the IPCop team
+ *
* $Id$
*
*/
@@ -88,7 +102,7 @@
/* delete all aliases, readd the active ones below */
memset(command, 0, STRING_SIZE);
verbose_printf(2, "Flushing aliases\n");
- snprintf(command, STRING_SIZE - 1, "/sbin/ip addr flush label %s.alias",
ipcop_ethernet.device[RED][1]);
+ snprintf(command, STRING_SIZE - 1, "/sbin/ip addr flush label %s:alias",
ipcop_ethernet.device[RED][1]);
safe_system(command);
/* Check for RED_COUNT=1 (or higher) i.e. RED ethernet present. If not,
@@ -139,7 +153,7 @@
if (netmask == NULL || ( (!VALID_IP(netmask)) &&
(!VALID_SHORT_MASK(netmask)))) {
/* ip addr will set proper mask. /32 if alias outside RED ip
address range */
snprintf(command, STRING_SIZE - 1,
- "/sbin/ip addr add %s dev %s label %s.alias",
+ "/sbin/ip addr add %s dev %s label %s:alias",
aliasip, ipcop_ethernet.device[RED][1],
ipcop_ethernet.device[RED][1]);
verbose_printf(2, "Add alias %s/%s\n", aliasip,
ipcop_ethernet.netmask[RED][1]);
}
Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-14 15:37:53 UTC
(rev 5733)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-14 19:30:46 UTC
(rev 5734)
@@ -14,6 +14,7 @@
/usr/local/bin/emailhelper
/usr/local/bin/restartsquid
/usr/local/bin/scheduler.pl
+/usr/local/bin/setaliases
/usr/local/sbin/setup
/usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
/usr/share/locale/el_GR/LC_MESSAGES/install.mo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
