summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-18 21:56:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:27 -0500
commit8e1b82e7ac13b596af0d33a81fa5deba39c671d7 (patch)
tree623499596772d496780f2b1b47070d15b7aed499
parent01be4914b37f7e5887f3ecd4ecc53fbd846fc22e (diff)
downloadsamba-8e1b82e7ac13b596af0d33a81fa5deba39c671d7.tar.gz
samba-8e1b82e7ac13b596af0d33a81fa5deba39c671d7.tar.bz2
samba-8e1b82e7ac13b596af0d33a81fa5deba39c671d7.zip
r22344: Correctly create sub-struct for GSS encryption.
Jeremy. (This used to be commit 197c90ec78545e7e3c03ff5787839ca134f3036a)
-rw-r--r--source3/libsmb/clifsinfo.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index be988a433f..1ec1aea5af 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -368,6 +368,21 @@ static struct smb_trans_enc_state *make_cli_enc_state(enum smb_trans_enc_type sm
}
ZERO_STRUCTP(es);
es->smb_enc_type = smb_enc_type;
+
+ if (smb_enc_type == SMB_TRANS_ENC_GSS) {
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
+ es->s.gss_state = SMB_MALLOC_P(struct smb_tran_enc_state_gss);
+ if (!es->s.gss_state) {
+ SAFE_FREE(es);
+ return NULL;
+ }
+ ZERO_STRUCTP(es->s.gss_state);
+#else
+ DEBUG(0,("make_cli_enc_state: no krb5 compiled.\n");
+ SAFE_FREE(es);
+ return NULL;
+#endif
+ }
return es;
}