summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-12-02 19:00:18 +0000
committerJeremy Allison <jra@samba.org>1997-12-02 19:00:18 +0000
commitc4aaa6bc3f7e8bd823f7279c78583384e7617d93 (patch)
tree6dac417a546e6eb48121de1b1d77596ba6813758 /source3
parent00b5a07744964eb48cda7c72a428bd6c4587cca7 (diff)
downloadsamba-c4aaa6bc3f7e8bd823f7279c78583384e7617d93.tar.gz
samba-c4aaa6bc3f7e8bd823f7279c78583384e7617d93.tar.bz2
samba-c4aaa6bc3f7e8bd823f7279c78583384e7617d93.zip
asyncdns.c: Removed warning when compiling with -DSYNC_DNS.
nameelect.c: Tidied up settings of work->ServerType when unbecoming things. nmbd.c: Fixed pidFile warning. server.c: Fixed pidFile warning. Jeremy. (This used to be commit 94d53dcac5d06e48be5cea9d54625da795f62d20)
Diffstat (limited to 'source3')
-rw-r--r--source3/nameelect.c24
-rw-r--r--source3/nmbd/asyncdns.c1
-rw-r--r--source3/nmbd/nmbd.c4
-rw-r--r--source3/smbd/server.c4
4 files changed, 11 insertions, 22 deletions
diff --git a/source3/nameelect.c b/source3/nameelect.c
index c5d145f979..b977741c5f 100644
--- a/source3/nameelect.c
+++ b/source3/nameelect.c
@@ -586,14 +586,9 @@ void become_logon_server(struct subnet_record *d, struct work_record *work)
void unbecome_local_master(struct subnet_record *d, struct work_record *work,
int remove_type)
{
- int new_server_type = work->ServerType;
-
/* can only remove master types with this function */
- remove_type &= SV_TYPE_MASTER_BROWSER;
-
- new_server_type &= ~remove_type;
- if (remove_type)
+ if (remove_type & SV_TYPE_MASTER_BROWSER)
{
DEBUG(2,("Becoming local non-master for %s\n",work->work_group));
@@ -619,19 +614,14 @@ void unbecome_local_master(struct subnet_record *d, struct work_record *work,
void unbecome_domain_master(struct subnet_record *d, struct work_record *work,
int remove_type)
{
- int new_server_type = work->ServerType;
-
DEBUG(2,("Becoming domain non-master for %s\n",work->work_group));
/* can only remove master or domain types with this function */
- remove_type &= SV_TYPE_DOMAIN_MASTER;
-
- new_server_type &= ~remove_type;
-
- if (remove_type)
+ if (remove_type & SV_TYPE_DOMAIN_MASTER)
{
/* no longer a domain master browser of any sort */
+ work->ServerType &= ~SV_TYPE_DOMAIN_MASTER;
work->dom_state = DOMAIN_NONE;
/* announce ourselves as no longer active as a master browser on
@@ -659,19 +649,15 @@ void unbecome_domain_master(struct subnet_record *d, struct work_record *work,
void unbecome_logon_server(struct subnet_record *d, struct work_record *work,
int remove_type)
{
- int new_server_type = work->ServerType;
-
DEBUG(2,("Becoming logon non-server for %s\n",work->work_group));
/* can only remove master or domain types with this function */
- remove_type &= SV_TYPE_DOMAIN_MEMBER;
-
- new_server_type &= ~remove_type;
- if (remove_type)
+ if (remove_type & SV_TYPE_DOMAIN_MEMBER)
{
/* no longer a master browser of any sort */
+ work->ServerType &= ~SV_TYPE_DOMAIN_MEMBER;
work->log_state = LOGON_NONE;
remove_name_entry(d,work->work_group,0x1c);
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c
index 3d1b3cc995..c87e090754 100644
--- a/source3/nmbd/asyncdns.c
+++ b/source3/nmbd/asyncdns.c
@@ -266,7 +266,6 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
struct name_record **n)
{
- int name_type = question->name_type;
char *qname = question->name;
struct in_addr dns_ip;
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 1e4a2d9a79..a34e2caf42 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -465,7 +465,9 @@ static void usage(char *pname)
int opt;
extern FILE *dbf;
extern char *optarg;
- char pidFile[100] = { 0 };
+ char pidFile[100];
+
+ *pidFile = '\0';
global_nmb_port = NMB_PORT;
*host_file = 0;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 9ca4ab5b78..d707699e33 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -5043,7 +5043,9 @@ static void usage(char *pname)
int port = SMB_PORT;
int opt;
extern char *optarg;
- char pidFile[100] = { 0 };
+ char pidFile[100];
+
+ *pidFile = '\0';
#ifdef NEED_AUTH_PARAMETERS
set_auth_parameters(argc,argv);