diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/cli.gaa | 2 | ||||
| -rw-r--r-- | src/common.c | 22 | ||||
| -rw-r--r-- | src/serv.c | 19 | ||||
| -rw-r--r-- | src/serv.gaa | 2 |
5 files changed, 5 insertions, 43 deletions
@@ -14,6 +14,9 @@ Varshavchik <mrsam@courier-mta.com>. ** gnutls-cli: Improve --list output to include public key and signature algs. +** gnutls-cli, gnutls-serv: Remove --copyright parameter. +Use standard --version to get license info. + ** API and ABI modifications: gnutls_pk_list: ADDED gnutls_pk_get_id: ADDED diff --git a/src/cli.gaa b/src/cli.gaa index a343ca8da6..c015db5746 100644 --- a/src/cli.gaa +++ b/src/cli.gaa @@ -4,7 +4,6 @@ #include <common.h> -void print_license(void); void cli_version(void); #} @@ -117,7 +116,6 @@ option (l, list) { print_list($verbose); exit(0); } "Print a list of the support option (h, help) { gaa_help(); exit(0); } "prints this help" option (v, version) { cli_version(); exit(0); } "prints the program's version number" -option ( copyright) { print_license(); exit(0); } "prints the program's license" #char *rest_args; rest STR "hostname" { $rest_args = $1; } diff --git a/src/common.c b/src/common.c index 8a70c37441..cc50888154 100644 --- a/src/common.c +++ b/src/common.c @@ -8,12 +8,12 @@ * 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. - * + * * GNUTLS 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 this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -786,24 +786,6 @@ print_list (int verbose) } } -void -print_license (void) -{ - fputs ("\nCopyright (C) 2004,2005,2006,2007 Free Software Foundation\n" - "This program is free software; you can redistribute it and/or modify \n" - "it under the terms of the GNU General Public License as published by \n" - "the Free Software Foundation; either version 3 of the License, or \n" - "(at your option) any later version. \n" "\n" - "This program is distributed in the hope that it will be useful, \n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of \n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n" - "GNU General Public License for more details. \n" "\n" - "You should have received a copy of the GNU General Public License \n" - "along with this program; if not, write to the Free Software \n" - "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\n", - stdout); -} - static int depr_printed = 0; #define DEPRECATED if (depr_printed==0) { \ fprintf(stderr, "This method of specifying algorithms is deprecated. Please use the --priority option.\n"); \ diff --git a/src/serv.c b/src/serv.c index f7fdeb04a1..b90eb2315d 100644 --- a/src/serv.c +++ b/src/serv.c @@ -1539,22 +1539,3 @@ wrap_db_delete (void *dbf, gnutls_datum_t key) return -1; } - -void -print_serv_license (void) -{ - fputs ("\nCopyright (C) 2001-2003 Paul Sheer, Nikos Mavrogiannopoulos\n" - "\nCopyright (C) 2004 Free Software Foundation\n" - "This program is free software; you can redistribute it and/or modify \n" - "it under the terms of the GNU General Public License as published by \n" - "the Free Software Foundation; either version 3 of the License, or \n" - "(at your option) any later version. \n" "\n" - "This program is distributed in the hope that it will be useful, \n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of \n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n" - "GNU General Public License for more details. \n" "\n" - "You should have received a copy of the GNU General Public License \n" - "along with this program; if not, write to the Free Software \n" - "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\n", - stdout); -} diff --git a/src/serv.gaa b/src/serv.gaa index ed0137b6d6..a2c4620557 100644 --- a/src/serv.gaa +++ b/src/serv.gaa @@ -2,7 +2,6 @@ #include <common.h> -void print_serv_license(void); void serv_version(void); #} @@ -116,7 +115,6 @@ option (l, list) { print_list(0); exit(0); } "Print a list of the supported algo option (h, help) { gaa_help(); exit(0); } "prints this help" option (v, version) { serv_version(); exit(0); } "prints the program's version number" -option ( copyright) { print_serv_license(); exit(0); } "prints the program's license" INCOMP ra |