[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2621-g6f2b33f

Jeremy Allison jra at samba.org
Thu Feb 28 13:55:10 GMT 2008


The branch, v3-2-test has been updated
       via  6f2b33f6072629be393f88d4450fa6631ef672f6 (commit)
      from  735235e32bf41a7564ce2d585c1dae187b00bf6b (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 6f2b33f6072629be393f88d4450fa6631ef672f6
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 28 05:54:50 2008 -0800

    Don't define SMB_TRANS_ENC_GSS if we don't have KRB5.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/include/client.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/client.h b/source/include/client.h
index f8adf56..d29a2e7 100644
--- a/source/include/client.h
+++ b/source/include/client.h
@@ -82,7 +82,12 @@ struct rpc_pipe_client {
 };
 
 /* Transport encryption state. */
-enum smb_trans_enc_type { SMB_TRANS_ENC_NTLM, SMB_TRANS_ENC_GSS };
+enum smb_trans_enc_type {
+		SMB_TRANS_ENC_NTLM
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
+		, SMB_TRANS_ENC_GSS
+#endif
+};
 
 #if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
 struct smb_tran_enc_state_gss {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list