From 9ad5a3fe36ac2b32bcb7a50c608ec586629f2125 Mon Sep 17 00:00:00 2001
From: Samba Release Account <samba-bugs@samba.org>
Date: Sat, 24 Aug 1996 01:41:46 +0000
Subject: removed all of lukes recent changes. I need to do a p2 release but
 can't test the multi group changes.

I also found that some of lukes changes wiped out some recent bug
fixes. Is your CVS tree ok luke?
(This used to be commit 8b7fe224bce64803d55ae279fa61ef3ebbbb0241)
---
 source3/smbd/ipc.c    | 38 +++-----------------------------------
 source3/smbd/server.c |  2 --
 2 files changed, 3 insertions(+), 37 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 916d7e3cc4..dd9b9661ae 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -983,26 +983,8 @@ static BOOL api_RNetServerEnum(int cnum, int uid, char *param, char *data,
 
   if (strcmp(str1, "WrLehDz") == 0) {
     StrnCpy(domain, p, sizeof(fstring)-1);
-  }
-  else
-  {
-    /* a server will connect to us under one of samba's NetBIOS
-       name aliases, and by not giving us a domain name it
-       assumes we know which domain it's talking about.
-       do a look-up for the workgroup name against the name
-       the host connected to us as.
-     */
-       
-    char *work_alias;
-	char host_alias[16];
-
-	StrnCpy(host_alias, local_machine, 15);
-	work_alias = conf_alias_to_workgroup(host_alias); /* look-up */
-
-	DEBUG(4,("host alias: %s work_alias: %s\n",
-				host_alias, work_alias));
-	if (work_alias)
-      StrnCpy(domain, work_alias, sizeof(fstring)-1);    
+  } else {
+    StrnCpy(domain, lp_workgroup(), sizeof(fstring)-1);    
   }
 
   if (lp_browse_list())
@@ -1686,23 +1668,9 @@ static BOOL api_RNetServerGetInfo(int cnum,int uid, char *param,char *data,
       pstring comment;
       uint32 servertype=DFLT_SERVER_TYPE;
 
-      char *work_alias;
-	  char host_alias[16];
-	  char domain[16];
-  
-	  StrnCpy(host_alias, local_machine, 15);
-	  work_alias = conf_alias_to_workgroup(host_alias); /* look-up */
-  
-	  DEBUG(4,("host alias: %s work_alias: %s\n",
-				  host_alias, work_alias));
-	  if (work_alias)
-        StrnCpy(domain, work_alias, sizeof(fstring)-1);    
-      else
-        *domain = 0;
-
       strcpy(comment,lp_serverstring());
 
-      if ((count=get_server_info(SV_TYPE_ALL,&servers,domain))>0) {
+      if ((count=get_server_info(SV_TYPE_ALL,&servers,lp_workgroup()))>0) {
 	for (i=0;i<count;i++)
 	  if (strequal(servers[i].name,local_machine)) {
 	    servertype = servers[i].type;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 4aaab4c087..0e0a524f16 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -3746,8 +3746,6 @@ static void usage(char *pname)
 	DEBUG(2,("%s changed root to %s\n",timestring(),lp_rootdir()));
     }
 
-  read_smbbrowse_conf(myhostname);
-
   process();
   close_sockets();
 
-- 
cgit