Make it possible to add custom radius dictionaries. Top Makefile.am needs more modifi...
authorAnders Broman <anders.broman@ericsson.com>
Wed, 23 Jan 2013 12:08:15 +0000 (12:08 -0000)
committerAnders Broman <anders.broman@ericsson.com>
Wed, 23 Jan 2013 12:08:15 +0000 (12:08 -0000)
svn path=/trunk/; revision=47224

Makefile.am
packaging/nsis/Makefile.am
packaging/nsis/custom_radius_dict.txt [new file with mode: 0644]
packaging/nsis/wireshark.nsi
radius/custom.includes [new file with mode: 0644]
radius/dictionary

index 15c4de4360fc5fc9a0c7e98d2aa608403c4c2138..4ded234c110e28d705ccc42f1122372f12a3d6d4 100644 (file)
@@ -113,6 +113,7 @@ dtds_DATA = \
 radiusdir = $(pkgdatadir)/radius
 radius_DATA = \
        radius/README.radius_dictionary  \
+       radius/custom.includes  \
        radius/dictionary  \
        radius/dictionary.3com  \
        radius/dictionary.3gpp  \
index c1e8ec1c217487d1b95c67604eba64fdde1496c8..c8549ca328efaaeb7d77fe735aaf5056f80f5ff8 100644 (file)
@@ -16,4 +16,5 @@ EXTRA_DIST = \
        Custom.nmake \
        custom_plugins.txt      \
        custom_mibs.txt \
+       custom_radius_dict.txt  \
        x64.nsh
diff --git a/packaging/nsis/custom_radius_dict.txt b/packaging/nsis/custom_radius_dict.txt
new file mode 100644 (file)
index 0000000..48ecad6
--- /dev/null
@@ -0,0 +1,3 @@
+;Add your custom radius dictionary here
+; Example:
+;File "..\..\radius\dictionary.foo"
\ No newline at end of file
index 2fa722ae5ff553f2051cb50ca62cd0e2dd6d8ba6..c38f3c63920241f6f144564b8794a9ea542eaca6 100644 (file)
@@ -445,6 +445,7 @@ SetOutPath $INSTDIR
 ;
 SetOutPath $INSTDIR\radius
 File "..\..\radius\README.radius_dictionary"
+File "..\..\radius\custom.includes"
 File "..\..\radius\dictionary"
 File "..\..\radius\dictionary.3com"
 File "..\..\radius\dictionary.3gpp"
@@ -588,6 +589,7 @@ File "..\..\radius\dictionary.wimax.wichorus"
 File "..\..\radius\dictionary.wispr"
 File "..\..\radius\dictionary.xedia"
 File "..\..\radius\dictionary.zyxel"
+!include "custom_radius_dict.txt"
 SetOutPath $INSTDIR
 
 ;
diff --git a/radius/custom.includes b/radius/custom.includes
new file mode 100644 (file)
index 0000000..6f14af0
--- /dev/null
@@ -0,0 +1,4 @@
+#
+# Version $Id$
+# Add custom Radius files her in the format $INCLUDE dictionary.foo
+#
index 5005ff7f1cd9f6b12488a359a2be7987b000cf13..7c499106fbf45826d045b18a5c628566a21fff76 100644 (file)
@@ -212,6 +212,7 @@ $INCLUDE dictionary.wichorus
 $INCLUDE dictionary.wimax
 $INCLUDE dictionary.wispr
 $INCLUDE dictionary.xedia
+$INCLUDE custom.includes
 
 #
 #      And finally the server internal attributes.