diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-08-20 16:09:41 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-08-20 16:09:41 +0000 |
| commit | 1073bd65414d1e436e833c2e32bed129c72e1910 (patch) | |
| tree | aa84da19084ffe5c3017caa25728e41aae540ea0 /source3/nameelect.c | |
| parent | dafaf627c2ed4d3fa76e0a9426dde006cd6cf50c (diff) | |
| download | samba-1073bd65414d1e436e833c2e32bed129c72e1910.tar.gz samba-1073bd65414d1e436e833c2e32bed129c72e1910.tar.bz2 samba-1073bd65414d1e436e833c2e32bed129c72e1910.zip | |
- removed ServerComment and instead set the comment string in nmbd
using the "server string" option. This replaces the -C option to nmbd
(This used to be commit 9e0fab2ee6c89155e6ba6b2401a25de37cb89333)
Diffstat (limited to 'source3/nameelect.c')
| -rw-r--r-- | source3/nameelect.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/nameelect.c b/source3/nameelect.c index ef3935b1fd..041e4a8cca 100644 --- a/source3/nameelect.c +++ b/source3/nameelect.c @@ -43,9 +43,6 @@ extern pstring myname; extern struct in_addr ipzero; extern struct in_addr ipgrp; -/* machine comment for host announcements */ -extern pstring ServerComment; - /* here are my election parameters */ extern time_t StartupTime; @@ -266,7 +263,7 @@ void become_master(struct subnet_record *d, struct work_record *work) /* update our server status */ work->ServerType &= ~SV_TYPE_POTENTIAL_BROWSER; - add_server_entry(d,work,myname,work->ServerType,0,ServerComment,True); + add_server_entry(d,work,myname,work->ServerType,0,lp_serverstring(),True); /* add special browser name */ add_my_name_entry(d,MSBROWSE ,0x01,nb_type|NB_ACTIVE|NB_GROUP); @@ -295,7 +292,7 @@ void become_master(struct subnet_record *d, struct work_record *work) /* update our server status */ work->ServerType |= SV_TYPE_MASTER_BROWSER; - add_server_entry(d,work,myname,work->ServerType,0,ServerComment,True); + add_server_entry(d,work,myname,work->ServerType,0,lp_serverstring(),True); if (work->serverlist == NULL) /* no servers! */ { @@ -344,7 +341,7 @@ void become_master(struct subnet_record *d, struct work_record *work) if (lp_domain_logons()) { work->ServerType |= SV_TYPE_DOMAIN_MEMBER; - add_server_entry(d,work,myname,work->ServerType,0,ServerComment,True); + add_server_entry(d,work,myname,work->ServerType,0,lp_serverstring(),True); } /* add domain master name */ @@ -380,7 +377,7 @@ void become_master(struct subnet_record *d, struct work_record *work) } work->ServerType |= update_type; - add_server_entry(d,work,myname,work->ServerType,0,ServerComment,True); + add_server_entry(d,work,myname,work->ServerType,0,lp_serverstring(),True); for (d1 = subnetlist; d1; d1 = d1->next) { |