[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-688-g15ba45e

[Günther Deschner]

The branch, v3-2-test has been updated
       via  15ba45e567d910c1b2336dcc0c475e12b082f30f (commit)
      from  a0cefd44009d414fa00ec6e08c70d21b74acdbcb (commit)

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


- Log -----------------------------------------------------------------
commit 15ba45e567d910c1b2336dcc0c475e12b082f30f
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 8 14:10:48 2008 +0200

    Add CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS define.
    
    This allows to switch on the cli->fallback_after_kerberos switch.
    
    Guenther

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

Summary of changes:
 source/include/client.h    |    1 +
 source/libsmb/cliconnect.c |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/client.h b/source/include/client.h
index 0787712..0e73745 100644
--- a/source/include/client.h
+++ b/source/include/client.h
@@ -242,5 +242,6 @@ typedef struct file_info {
 #define CLI_FULL_CONNECTION_DONT_SPNEGO 0x0001
 #define CLI_FULL_CONNECTION_USE_KERBEROS 0x0002
 #define CLI_FULL_CONNECTION_ANONYMOUS_FALLBACK 0x0004
+#define CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS 0x0008
 
 #endif /* _CLIENT_H */
diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index b76814e..949bca7 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -1652,6 +1652,11 @@ again:
 	else if (flags & CLI_FULL_CONNECTION_USE_KERBEROS)
 		cli->use_kerberos = True;
 
+	if ((flags & CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS) &&
+	     cli->use_kerberos) {
+		cli->fallback_after_kerberos = true;
+	}
+
 	if (!cli_negprot(cli)) {
 		DEBUG(1,("failed negprot\n"));
 		nt_status = cli_nt_error(cli);


-- 
Samba Shared Repository