From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 9 Feb 2011 22:30:22 +0000 (+0100)
Subject: set the psk callback only if username/key were not supplied at command line.
X-Git-Tag: gnutls_2_99_0~280
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=262b70150677f2eeabbd05a54fb087821170b94e;p=thirdparty%2Fgnutls.git

set the psk callback only if username/key were not supplied at command line.
---

diff --git a/src/cli.c b/src/cli.c
index 9ef43f9615..1576b739bc 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1292,7 +1292,8 @@ init_global_tls_stuff (void)
                    gnutls_strerror (ret));
         }
     }
-  gnutls_psk_set_client_credentials_function (psk_cred, psk_callback);
+  else
+    gnutls_psk_set_client_credentials_function (psk_cred, psk_callback);
 #endif
 
 #ifdef ENABLE_ANON