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

[Günther Deschner]

The branch, v3-2-test has been updated
       via  30337bce2c748e5338f9cc923e096883322f50d3 (commit)
       via  882475f5566592b3a675d3609c3af8cf7d4e256d (commit)
       via  729eda95401e63feabb3ed329c6d2888dabe1d68 (commit)
      from  59a2f0873c789822d46f862042921a8ba8f2bd28 (commit)

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


- Log -----------------------------------------------------------------
commit 30337bce2c748e5338f9cc923e096883322f50d3
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 10 21:23:59 2008 +0200

    Fix typo.
    
    Guenther

commit 882475f5566592b3a675d3609c3af8cf7d4e256d
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 10 21:21:27 2008 +0200

    Add some more cli_cm_set_X functions.
    
    Guenther

commit 729eda95401e63feabb3ed329c6d2888dabe1d68
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 10 21:19:30 2008 +0200

    Add MAX_NERR define.
    
    Guenther

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

Summary of changes:
 source/include/doserr.h    |    4 +++
 source/lib/netapi/netapi.h |    2 +-
 source/libsmb/clidfs.c     |   53 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 5794fbe..d5892c1 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -270,6 +270,10 @@
 #define NERR_BASE (2100)
 #endif
 
+#ifndef MAX_NERR
+#define MAX_NERR (NERR_BASE+899)
+#endif
+
 #define WERR_DFS_NO_SUCH_VOL            W_ERROR(NERR_BASE+562)
 #define WERR_DFS_NO_SUCH_SHARE          W_ERROR(NERR_BASE+565)
 #define WERR_DFS_NO_SUCH_SERVER         W_ERROR(NERR_BASE+573)
diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index 4839735..ea850c5 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -52,7 +52,7 @@ struct DOMAIN_CONTROLLER_INFO {
 	uint32_t domain_controller_address_type;
 	struct GUID domain_guid;
 	const char * domain_name;
-	const char * dns_foreset_name;
+	const char * dns_forest_name;
 	uint32_t flags;
 	const char * dc_site_name;
 	const char * client_site_name;
diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index 971cde1..0b55d93 100644
--- a/source/libsmb/clidfs.c
+++ b/source/libsmb/clidfs.c
@@ -46,6 +46,7 @@ static struct cm_cred_struct {
 	char *password;
 	bool got_pass;
 	bool use_kerberos;
+	bool fallback_after_kerberos;
 	int signing_state;
 } cm_creds;
 
@@ -172,6 +173,7 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
 
 	c->protocol = max_protocol;
 	c->use_kerberos = cm_creds.use_kerberos;
+	c->fallback_after_kerberos = cm_creds.fallback_after_kerberos;
 	cli_setup_signing_state(c, cm_creds.signing_state);
 
 	if (!cli_session_request(c, &calling, &called)) {
@@ -199,7 +201,7 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
 		return NULL;
 	}
 
-	if (!cm_creds.got_pass) {
+	if (!cm_creds.got_pass && !cm_creds.use_kerberos) {
 		char *pass = getpass("Password: ");
 		if (pass) {
 			cm_set_password(pass);
@@ -461,6 +463,9 @@ static void cm_set_password(const char *newpass)
 	}
 }
 
+/****************************************************************************
+****************************************************************************/
+
 void cli_cm_set_credentials(void)
 {
 	SAFE_FREE(cm_creds.username);
@@ -471,6 +476,7 @@ void cli_cm_set_credentials(void)
 	}
 
 	cm_creds.use_kerberos = get_cmdline_auth_info_use_kerberos();
+	cm_creds.fallback_after_kerberos = false;
 	cm_creds.signing_state = get_cmdline_auth_info_signing_state();
 }
 
@@ -493,6 +499,51 @@ void cli_cm_set_dest_name_type(int type)
 /****************************************************************************
 ****************************************************************************/
 
+void cli_cm_set_signing_state(int state)
+{
+	cm_creds.signing_state = state;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+void cli_cm_set_username(const char *username)
+{
+	SAFE_FREE(cm_creds.username);
+	cm_creds.username = SMB_STRDUP(username);
+}
+
+/****************************************************************************
+****************************************************************************/
+
+void cli_cm_set_password(const char *newpass)
+{
+	SAFE_FREE(cm_creds.password);
+	cm_creds.password = SMB_STRDUP(newpass);
+	if (cm_creds.password) {
+		cm_creds.got_pass = true;
+	}
+}
+
+/****************************************************************************
+****************************************************************************/
+
+void cli_cm_set_use_kerberos(void)
+{
+	cm_creds.use_kerberos = true;
+}
+
+/****************************************************************************
+****************************************************************************/
+
+void cli_cm_set_fallback_after_kerberos(void)
+{
+	cm_creds.fallback_after_kerberos = true;
+}
+
+/****************************************************************************
+****************************************************************************/
+
 void cli_cm_set_dest_ss(struct sockaddr_storage *pss)
 {
 	dest_ss = *pss;


-- 
Samba Shared Repository