added CAMEL_PROVIDER_CONF_HIDDEN to conf item type enum. This is used by

2004-05-24  Sivaiah Nallagatla <snallagatla@novell.com>

        * camel-provider.h : added CAMEL_PROVIDER_CONF_HIDDEN to
         conf item type enum. This is used by groupwise provider
        * providers/groupwise/camel-groupwise-provider.c : Added CAMEL_PROVIDER_CONF_HIDDEN
        to groupwise_conf_entries to pass the auth-domain value
        * providers/imap/camel-imap-store.c (imap_auth_loop) : read the auth-domain
        property from imap url and pass it camel sesstion apis

svn path=/trunk/; revision=26057

4 files changed, 18 insertions, 3 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 19903fff77..421c841453 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-24  Sivaiah Nallagatla <snallagatla@novell.com>
+
+        * camel-provider.h : added CAMEL_PROVIDER_CONF_HIDDEN to
+         conf item type enum. This is used by groupwise provider
+        * providers/groupwise/camel-groupwise-provider.c : Added CAMEL_PROVIDER_CONF_HIDDEN
+        to groupwise_conf_entries to pass the auth-domain value
+        * providers/imap/camel-imap-store.c (imap_auth_loop) : read the auth-domain
+        property from imap url and pass it camel sesstion apis
+
 2004-05-22  Not Zed  <NotZed@Ximian.com>
 
 	* camel-store.c: oops, forgot folder_created.  Removed locking, the
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index cc9f173fb4..46977d4844 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -120,6 +120,7 @@ typedef enum {
 	CAMEL_PROVIDER_CONF_CHECKSPIN,
 	CAMEL_PROVIDER_CONF_ENTRY,
 	CAMEL_PROVIDER_CONF_LABEL,
+	CAMEL_PROVIDER_CONF_HIDDEN
 } CamelProviderConfType;
 
 typedef struct {
diff --git a/camel/providers/groupwise/camel-groupwise-provider.c b/camel/providers/groupwise/camel-groupwise-provider.c
index cd85359206..b7eb368b1f 100644
--- a/camel/providers/groupwise/camel-groupwise-provider.c
+++ b/camel/providers/groupwise/camel-groupwise-provider.c
@@ -67,7 +67,10 @@ CamelProviderConfEntry groupwise_conf_entries[] = {
 
 	{ CAMEL_PROVIDER_CONF_ENTRY, "soap_port", NULL,
 	  N_("Post Office Agent SOAP Port:"), "7181" },
-	
+
+	{ CAMEL_PROVIDER_CONF_HIDDEN, "auth-domain", NULL,
+	  NULL, "Groupwise" },
+	 	
 	{ CAMEL_PROVIDER_CONF_SECTION_END }, 
 
 
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 75c609a6bf..ccba426398 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1257,8 +1257,10 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 	CamelImapResponse *response;
 	char *errbuf = NULL;
 	gboolean authenticated = FALSE;
+	const char *auth_domain;
 	
 	CAMEL_SERVICE_ASSERT_LOCKED (store, connect_lock);
+	auth_domain = camel_url_get_param (service->url, "auth-domain");
 	
 	if (store->preauthed) {
 		if (camel_verbose_debug)
@@ -1295,7 +1297,7 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 	while (!authenticated) {
 		if (errbuf) {
 			/* We need to un-cache the password before prompting again */
-			camel_session_forget_password (session, service, NULL, "password", ex);
+			camel_session_forget_password (session, service, auth_domain, "password", ex);
 			g_free (service->url->passwd);
 			service->url->passwd = NULL;
 		}
@@ -1309,7 +1311,7 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 						  service->url->user,
 						  service->url->host);
 			service->url->passwd =
-				camel_session_get_password (session, service, NULL,
+				camel_session_get_password (session, service, auth_domain,
 							    prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, ex);
 			g_free (prompt);
 			g_free (errbuf);