summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/nameelect.c6
-rw-r--r--source3/nameservreply.c4
-rw-r--r--source3/nmbsync.c2
4 files changed, 10 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 265e838be0..7403fc4b64 100644
--- 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 USE_SETSID
#endif
#ifdef SGI5
@@ -358,6 +359,7 @@ char *getwd(char *);
#define SIGNAL_CAST (void (*)())
#define USE_STATVFS
#define USE_WAITPID
+#define USE_SETSID
#endif
diff --git a/source3/nameelect.c b/source3/nameelect.c
index 752e27fb07..258ee98931 100644
--- 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();
+
+ 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;
}
@@ -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);
- 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;
diff --git a/source3/nameservreply.c b/source3/nameservreply.c
index db517dff82..9e46b80303 100644
--- 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. */
- 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;
-
+
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 7c23c64a96..7f5d608998 100644
--- 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;
- 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);