[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2622-gd16c295
Jeremy Allison
jra at samba.org
Thu Feb 28 14:01:26 GMT 2008
The branch, v3-2-test has been updated
via d16c295642c3df49be02440427ded0cd9b4179f5 (commit)
from 6f2b33f6072629be393f88d4450fa6631ef672f6 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d16c295642c3df49be02440427ded0cd9b4179f5
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 28 06:01:09 2008 -0800
Fix the build - don't use SMB_TRANS_ENC_GSS without
KRB5.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/libsmb/clifsinfo.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clifsinfo.c b/source/libsmb/clifsinfo.c
index f4945f8..0005c39 100644
--- a/source/libsmb/clifsinfo.c
+++ b/source/libsmb/clifsinfo.c
@@ -368,20 +368,16 @@ 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)
+ if (smb_enc_type == SMB_TRANS_ENC_GSS) {
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
}
+#endif
return es;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list