diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-27 11:20:24 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-27 11:20:24 -0700 |
| commit | 929bb973dd3faf1655f03ac758942d5b009354ad (patch) | |
| tree | 56f50bd1940eae6c9aafc5a719584a355818dcbe /src/process.c | |
| parent | dde1458174882077ca799d03f0adea91286650a3 (diff) | |
| parent | 87e68db4734d89bab693744ad210560da0c20a87 (diff) | |
| download | emacs-929bb973dd3faf1655f03ac758942d5b009354ad.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index f04f4611ab7..716e74758c4 100644 --- a/src/process.c +++ b/src/process.c @@ -642,6 +642,9 @@ make_process (Lisp_Object name) p->gnutls_initstage = GNUTLS_STAGE_EMPTY; p->gnutls_log_level = 0; p->gnutls_p = 0; + p->gnutls_state = NULL; + p->gnutls_x509_cred = NULL; + p->gnutls_anon_cred = NULL; #endif /* If name is already in use, modify it until it is unused. */ @@ -3863,6 +3866,11 @@ deactivate_process (Lisp_Object proc) register int inchannel, outchannel; register struct Lisp_Process *p = XPROCESS (proc); +#ifdef HAVE_GNUTLS + /* Delete GnuTLS structures in PROC, if any. */ + emacs_gnutls_deinit (proc); +#endif /* HAVE_GNUTLS */ + inchannel = p->infd; outchannel = p->outfd; |