only claim krb5 support if really present

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10821 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-02-07 17:27:12 +00:00
parent 5c081c1559
commit 442c130de0

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1995 - 2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -108,7 +108,7 @@ doit_v4 (char *host, int port)
ret = krb_sendauth(0, ret = krb_sendauth(0,
s, s,
&ticket, &ticket,
"pop", POP_TICKET_NAME,
host, host,
krb_realmofhost(host), krb_realmofhost(host),
getpid(), getpid(),
@@ -143,7 +143,7 @@ doit_v5 (char *host, int port)
ret = krb5_sname_to_principal (context, ret = krb5_sname_to_principal (context,
host, host,
"pop", POP_TICKET_NAME,
KRB5_NT_SRV_HST, KRB5_NT_SRV_HST,
&server); &server);
if (ret) { if (ret) {
@@ -178,7 +178,9 @@ doit_v5 (char *host, int port)
#ifdef KRB4 #ifdef KRB4
static int use_v4 = -1; static int use_v4 = -1;
#endif #endif
#ifdef KRB5
static int use_v5 = -1; static int use_v5 = -1;
#endif
static char *port_str; static char *port_str;
static int do_version; static int do_version;
static int do_help; static int do_help;
@@ -188,8 +190,10 @@ struct getargs args[] = {
{ "krb4", '4', arg_flag, &use_v4, "Use Kerberos V4", { "krb4", '4', arg_flag, &use_v4, "Use Kerberos V4",
NULL }, NULL },
#endif #endif
#ifdef KRB5
{ "krb5", '5', arg_flag, &use_v5, "Use Kerberos V5", { "krb5", '5', arg_flag, &use_v5, "Use Kerberos V5",
NULL }, NULL },
#endif
{ "port", 'p', arg_string, &port_str, "Use this port", { "port", 'p', arg_string, &port_str, "Use this port",
"number-or-service" }, "number-or-service" },
{ "version", 0, arg_flag, &do_version, "Print version", { "version", 0, arg_flag, &do_version, "Print version",