[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  29629b9... s3 smb2: Fix the build without kerberos
      from  33c96e6... s3-net: Created a migration tool for printing TDBs.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 29629b93907fd32e48d347c109333e9c0ad244eb
Author: Kai Blin <kai at samba.org>
Date:   Thu May 20 11:29:03 2010 +0200

    s3 smb2: Fix the build without kerberos
    
    Jeremy, please check

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

Summary of changes:
 source3/smbd/smb2_sesssetup.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 9662894..ed58189 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -143,6 +143,7 @@ static int smbd_smb2_session_destructor(struct smbd_smb2_session *session)
 	return 0;
 }
 
+#ifdef HAVE_KRB5
 static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
 					struct smbd_smb2_request *smb2req,
 					uint8_t in_security_mode,
@@ -511,6 +512,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session,
 	data_blob_free(&secblob_out);
 	return status;
 }
+#endif
 
 static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session,
 					struct smbd_smb2_request *smb2req,


-- 
Samba Shared Repository