--- a/src/auth.c
+++ b/src/auth.c
@@ -6,7 +6,6 @@
 #include <pthread.h>
 #include "list.h"
 #include "common.h"
-#include "auth-gnome-keyring.h"
 #include "auth.h"
 
 struct authitem{
@@ -20,12 +19,12 @@
     };
 };
 
-static char		auth_login[64]		= "guest";
-static char		*auth_fake_password	= "********";
-static struct authinfo	authinfo_default	= {{NULL, NULL}, 1, "", auth_login, ""};
-static LIST		authinfo_list		= STATIC_LIST_INITIALIZER(authinfo_list);
-static struct authitem	authroot		= {NULL, (time_t) 0, NULL, {0, 0, NULL}};
-static pthread_mutex_t	m_auth			= PTHREAD_MUTEX_INITIALIZER;
+char		auth_login[64]		= "guest";
+char		*auth_fake_password	= "********";
+struct authinfo	authinfo_default	= {{NULL, NULL}, 1, "", auth_login, ""};
+LIST		authinfo_list		= STATIC_LIST_INITIALIZER(authinfo_list);
+struct authitem	authroot		= {NULL, (time_t) 0, NULL, {0, 0, NULL}};
+pthread_mutex_t	m_auth			= PTHREAD_MUTEX_INITIALIZER;
 
 
 void auth_set_default_login_name(const char *name){
@@ -34,7 +33,7 @@
     DPRINTF(5, "login=%s\n", auth_login);
 }
 
-static struct authinfo * authinfo_create_new(
+struct authinfo * authinfo_create_new(
 				const char *domain,
 				const char *user,
 				const char *password){
@@ -62,7 +61,7 @@
     free(info);
 }
 
-static inline int authinfo_compare(struct authinfo *info,
+inline int authinfo_compare(struct authinfo *info,
 				const char *domain,
 				const char *user,
 				const char *password){
@@ -71,7 +70,7 @@
 	    (strcmp(info->password, password) == 0));
 }
 
-static struct authinfo * authinfo_find_in_list(
+struct authinfo * authinfo_find_in_list(
 				const char *domain,
 				const char *user,
 				const char *password){
@@ -88,7 +87,7 @@
     return NULL;
 }
 
-static struct authinfo * authinfo_store_list(
+struct authinfo * authinfo_store_list(
 				const char *domain,
 				const char *user,
 				const char *password){
@@ -111,7 +110,7 @@
     return info;
 }
 
-static void authinfo_release(struct authinfo *info){
+void authinfo_release(struct authinfo *info){
     info->ref_count--;
     if (info->ref_count == 0){
 	remove_from_list(&authinfo_list, &info->entries);
@@ -119,7 +118,7 @@
     }
 }
 
-static struct authitem* authitem_create_item(const char *name){
+struct authitem* authitem_create_item(const char *name){
     struct authitem	*item;
 
     item = malloc(sizeof(struct authitem) + strlen(name) + 1);
@@ -138,7 +137,7 @@
     free(item);
 }
 
-static void authitem_delete_obsolete_items(struct authitem *item, time_t threshold){
+void authitem_delete_obsolete_items(struct authitem *item, time_t threshold){
     int		i;
 
     for(i = item->child_cnt - 1; i >= 0; i--){
@@ -175,7 +174,7 @@
  *   b) negative value -(pos+1), if item was not found,
  *      where 'pos' is the position to insert the new element
  */
-static int authitem_find_subitem(struct authitem *item, const char *name){
+int authitem_find_subitem(struct authitem *item, const char *name){
     int		first = 0, last = item->child_cnt - 1;
 
     while(first <= last){
@@ -197,7 +196,7 @@
  *   a) zero, if no errors
  *   b) (-1), if insertion failed
  */
-static int authitem_insert_subitem(struct authitem *item,
+int authitem_insert_subitem(struct authitem *item,
 				struct authitem *subitem, int pos){
     if ((pos > item->child_cnt) || (pos < 0)) return -1;
 
@@ -225,7 +224,7 @@
     return 0;
 }
 
-static struct authitem * authitem_get_subitem(
+struct authitem * authitem_get_subitem(
 				struct authitem *item,
 				const char *name){
     int			pos;
@@ -248,8 +247,7 @@
 struct authinfo * auth_get_authinfo(
 				const char *domain,
 				const char *server,
-				const char *share,
-				int *suitability){
+				const char *share){
 
     int			pos;
     struct authitem	*item;
@@ -263,40 +261,28 @@
 
     item = &authroot;
     info = &authinfo_default;
-    *suitability = AUTH_FALLBACK;
     pthread_mutex_lock(&m_auth);
-	if (item->info != NULL){
-	    info = item->info;
-	    *suitability = AUTH_MATCH_DEFAULT;
-	}
+	if (item->info != NULL) info = item->info;
 	if (*domain != '\0'){
 	    pos = authitem_find_subitem(item, domain);
-	    if ((pos >= 0) && (item->childs[pos]->info != NULL)){
+	    if ((pos >= 0) && (item->childs[pos]->info != NULL))
 		info = item->childs[pos]->info;
-		*suitability = AUTH_MATCH_DOMAIN_COMPAT;
-	    }
 	}
 
 	if ((pos = authitem_find_subitem(item, server)) < 0) goto end;
 	item = item->childs[pos];
-	if (item->info != NULL){
-	    info = item->info;
-	    *suitability = AUTH_MATCH_SERVER;
-	}
+	if (item->info != NULL) info = item->info;
 
 	if (*share == '\0') goto end;
 	if ((pos = authitem_find_subitem(item, share)) < 0) goto end;
 	item = item->childs[pos];
-	if (item->info != NULL){
-	    info = item->info;
-	    *suitability = AUTH_MATCH_RESOURCE;
-	}
+	if (item->info != NULL) info = item->info;
 
       end:
         info->ref_count++;
     pthread_mutex_unlock(&m_auth);
-    DPRINTF(10, "domain=%s, user=%s, password=%s, suitability=%d\n",
-		info->domain, info->user, auth_fake_password, *suitability);
+    DPRINTF(10, "domain=%s, user=%s, password=%s\n",
+			info->domain, info->user, auth_fake_password);
     return info;
 }