--- gale-copy1/lib/connect.c	Tue Feb 15 23:57:30 2000
+++ gale-0.99/lib/connect.c	Sat Jul 22 15:29:05 2000
@@ -283,9 +283,14 @@
 		else
 			port = gale_port;
 
+		if (!gale_global->avoid_localdomain ||
+			gale_text_compare(name, gale_var(G_("GALE_DOMAIN")))) {
 		add_name(conn,name,port);
-		add_name(conn,gale_text_concat(2,G_("gale."),name),port);
-		add_name(conn,gale_text_concat(2,name,G_(".gale.org")),port);
+		if (gale_global->galeorg_expand) {
+		    add_name(conn,gale_text_concat(2,G_("gale."),name),port);
+		    add_name(conn,gale_text_concat(2,name,G_(".gale.org")),port);
+		}
+		}
 	}
 
 	last_name(conn);
--- gale-copy1/include/gale/globals.h	Sun Feb 13 21:52:00 2000
+++ gale-0.99/include/gale/globals.h	Sat Jul 22 15:04:02 2000
@@ -40,6 +40,9 @@
 	/* Debugging level for dprintf().  Starts at zero. */
 	int debug_level;
 
+	int galeorg_expand;
+	int avoid_localdomain;
+
 	/* Hooks for the auth system to find keys with. */
 	auth_hook *find_public,*find_private;
 
--- gale-copy1/server/galed.c	Sat Oct 30 20:12:57 1999
+++ gale-0.99/server/galed.c	Sat Jul 22 15:01:02 2000
@@ -142,16 +142,18 @@
 	oop_source_sys *sys;
 
 	gale_init("galed",argc,argv);
+	gale_global->galeorg_expand = 1;
 	sys = oop_sys_new();
 	gale_init_signals(oop_sys_source(sys));
 
 	srand48(time(NULL) ^ getpid());
 
 	server_port = gale_port;
-	while ((opt = getopt(argc,argv,"hdDp:")) != EOF) switch (opt) {
+	while ((opt = getopt(argc,argv,"hdDp:l")) != EOF) switch (opt) {
 	case 'd': ++gale_global->debug_level; break;
 	case 'D': gale_global->debug_level += 5; break;
 	case 'p': server_port = atoi(optarg); break;
+	case 'l': gale_global->avoid_localdomain = 1; break;
 	case 'h':
 	case '?': usage();
 	}
--- gale-copy1/gdomain/gdomain.c	Sun Jan 30 20:57:37 2000
+++ gale-0.99/gdomain/gdomain.c	Sat Jul 22 18:42:41 2000
@@ -92,7 +92,7 @@
 
 	init_auth_id(&domain,gale_var(G_("GALE_DOMAIN")));
 	if (!domain || !auth_id_private(domain))
-		gale_alert(GALE_ERROR,"no access to domain private key",0);
+		gale_alert(GALE_WARNING,"no access to domain private key",0);
 
 	category = dom_category(auth_id_name(domain),G_("auth/query"));
 	link = new_link(source);
