includes.h: Added USE_SETSID for SGI.

nameelect.c:	Added debug 0 comments so you know when you have become a master/domain master.
nameservreply.c:Stopped SELF names from being remotely released. This still needs work.
nmbsync.c:	Added debug 0 comments so you know when a sync is being done.
Jeremy jallison@whistle.com
(This used to be commit b40d3bede60c8e040ee30c72d605a4950e1a8c8b)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 265e838be0dce36d605d4df1a6cd551f197c7806..7403fc4b641393cd8c8a07f08ddc57186b886f30 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -341,6 +341,7 @@ char *getwd(char *);
 #define STATFS4
 #define USE_WAITPID
 #define USE_DIRECT
 #define STATFS4
 #define USE_WAITPID
 #define USE_DIRECT

+#define USE_SETSID

 #endif
 
 #ifdef SGI5
 #endif
 
 #ifdef SGI5


@@ -358,6 +359,7 @@ char *getwd(char *);
 #define SIGNAL_CAST (void (*)())
 #define USE_STATVFS
 #define USE_WAITPID
 #define SIGNAL_CAST (void (*)())
 #define USE_STATVFS
 #define USE_WAITPID

+#define USE_SETSID

 #endif
 
 
 #endif
 
 

diff --git a/source3/nameelect.c b/source3/nameelect.c
index 752e27fb070ac10cee4d05a57819ec5e0705ef39..258ee98931e0f526945cc657031738f2288768a2 100644 (file)
--- a/source3/nameelect.c
+++ b/source3/nameelect.c
@@ -402,6 +402,10 @@ on subnet %s\n", work->work_group, inet_ntoa(d->bcast_ip)));
       /* Reset the announce master timer so that we do an announce as soon as possible
          now we are a master. */
       reset_announce_timer();
       /* Reset the announce master timer so that we do an announce as soon as possible
          now we are a master. */
       reset_announce_timer();

+
+      DEBUG(0,("Samba is now a local master browser for workgroup %s on subnet %s\n", 
+                work->work_group, inet_ntoa(d->bcast_ip)));
+

       break;
     }
 
       break;
     }
 


@@ -492,7 +496,7 @@ void become_domain_master(struct subnet_record *d, struct work_record *work)
       add_server_entry(d,work,myname,work->ServerType,0,
                         lp_serverstring(),True);
 
       add_server_entry(d,work,myname,work->ServerType,0,
                         lp_serverstring(),True);
 

-      DEBUG(4,("Samba is now a domain master browser for workgroup %s on subnet %s\n", 
+      DEBUG(0,("Samba is now a domain master browser for workgroup %s on subnet %s\n", 

                 work->work_group, inet_ntoa(d->bcast_ip)));
 
       break;
                 work->work_group, inet_ntoa(d->bcast_ip)));
 
       break;

diff --git a/source3/nameservreply.c b/source3/nameservreply.c
index db517dff82590cfd0bf99d3a79ad0cb16430ef98..9e46b80303922a8efde1aa9f0a48e96e0b8fc2a2 100644 (file)
--- a/source3/nameservreply.c
+++ b/source3/nameservreply.c
@@ -135,10 +135,10 @@ void reply_name_release(struct packet_struct *p)
   
   /* XXXX under what conditions should we reject the removal?? */
   /* For now - remove if the names match and the group bit matches. */
   
   /* XXXX under what conditions should we reject the removal?? */
   /* For now - remove if the names match and the group bit matches. */

-  if (n && (NAME_GROUP(n->ip_flgs[0].nb_flags) == NAME_GROUP(nb_flags)))
+  if (n && (n->source != SELF) && (NAME_GROUP(n->ip_flgs[0].nb_flags) == NAME_GROUP(nb_flags)))

     {
       success = True;
     {
       success = True;

-      
+     

       DEBUG(5, ("reply_name_release: Removing name %s on subnet %s\n",
                 namestr(&nmb->question.question_name), inet_ntoa(d->bcast_ip)));
       remove_name(d,n);
       DEBUG(5, ("reply_name_release: Removing name %s on subnet %s\n",
                 namestr(&nmb->question.question_name), inet_ntoa(d->bcast_ip)));
       remove_name(d,n);

diff --git a/source3/nmbsync.c b/source3/nmbsync.c
index 7c23c64a96ad478afe54551d76b03f117dd1a4ab..7f5d608998a865b1e1e37efcb22ff20fb4694d6c 100644 (file)
--- a/source3/nmbsync.c
+++ b/source3/nmbsync.c
@@ -156,7 +156,7 @@ void sync_browse_lists(struct subnet_record *d, struct work_record *work,
   
   got_pass = True;
   
   
   got_pass = True;
   

-  DEBUG(4,("sync browse lists with %s for %s %s\n",
+  DEBUG(0,("sync_browse_lists: Sync browse lists with %s for %s %s\n",

            work->work_group, name, inet_ntoa(ip)));
   
   strcpy(workgroup,work->work_group);
            work->work_group, name, inet_ntoa(ip)));
   
   strcpy(workgroup,work->work_group);