Merge tag 'upstream/3.3.3'

[debian/amanda] / perl / Amanda / Disklist.swg

diff --git a/perl/Amanda/Disklist.swg b/perl/Amanda/Disklist.swg
index 50c842ac3a0598dcdb95ce6304fa090b87c37d7d..d66a4696d9dc0c3b5a1c59995931fb1ef9b028a1 100644 (file)
--- a/perl/Amanda/Disklist.swg
+++ b/perl/Amanda/Disklist.swg
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * This program 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.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -316,3 +317,4 @@ push @EXPORT_OK, qw( read_disklist
        get_interface all_interfaces);
 
 %}
+char *clean_dle_str_for_client(char *dle_str, am_feature_t *their_features);