Some copyright fixes.

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 73092a7508dfff523a01bd4430ba2ed15a76a088..727bea6da5e1077de8621faeca72ffad23ba1fa6 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -2,9 +2,11 @@
 
 metric {
     name = "default";
-    action = "reject:10";
-    action = "greylist:4";
-    action = "add_header:6";
+       actions {
+               reject = 10;
+               add_header = 6;
+               greylist = 4;
+       };
     symbol {
         weight = 2.0;
         description = "Subject is missing inside message";

diff --git a/debian/copyright b/debian/copyright
index be773226c49c961ac08f15b3c8cf9fbabf7724cf..ba8245db1f87624395b39e4917c1d749b1b82433 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -89,7 +89,7 @@ License: BSD-3-CLAUSE
 
 Files: contrib/uthash/*
 Copyright: 2003-2013 Troy D. Hanson http://troydhanson.github.com/uthash/
-License: BSD-1-CLAUSE
+License: BSD-2-CLAUSE
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -163,7 +163,7 @@ License: Apache 2.0
  Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
 
 Files: *
-Copyright: 2008-2012 Vsevolod Stakhov <vsevolod@highsecure.ru>
+Copyright: 2008-2013 Vsevolod Stakhov <vsevolod@highsecure.ru>
 License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met: