Changeset 369f47a in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Jan 29, 2013, 3:41:38 PM (7 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

8400c2e

Parents:

b8df283

git-author:

Daniel Kahn Gillmor <dkg@…> (01/26/13 02:57:28)

git-committer:

Daniel Kahn Gillmor <dkg@…> (01/29/13 15:41:38)

Message:

avoid calling gnutls_srp_server_get_username() unless SRP is configured

File:

• src/gnutls_hooks.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -735 +735 @@
 
 #ifdef ENABLE_SRP
-    tmp = gnutls_srp_server_get_username(ctxt->session);
-    apr_table_setn(env, "SSL_SRP_USER", (tmp != NULL) ? tmp : "");
+    if (ctxt->sc->srp_tpasswd_conf_file != NULL && ctxt->sc->srp_tpasswd_file != NULL) {
+        tmp = gnutls_srp_server_get_username(ctxt->session);
+        apr_table_setn(env, "SSL_SRP_USER", (tmp != NULL) ? tmp : "");
+    } else {
+        apr_table_unset(env, "SSL_SRP_USER");
+    }
 #endif