summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/lib/netapi/serverinfo.c4
-rw-r--r--source3/nmbd/nmbd_sendannounce.c2
-rw-r--r--source3/nmbd/nmbd_serverlistdb.c2
-rw-r--r--source3/nmbd/nmbd_workgroupdb.c2
-rw-r--r--source3/param/loadparm.c4
-rw-r--r--source3/rpc_server/samr/srv_samr_nt.c4
-rw-r--r--source3/rpc_server/srvsvc/srv_srvsvc_nt.c4
-rw-r--r--source4/rpc_server/srvsvc/dcesrv_srvsvc.c4
10 files changed, 15 insertions, 15 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index d53fcf2f28..16a66e4ebf 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -403,7 +403,7 @@ FN_GLOBAL_STRING(remote_announce, remote_announce)
FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)
FN_GLOBAL_STRING(renameuser_script, renameuser_script)
FN_GLOBAL_STRING(rootdir, rootdir)
-FN_GLOBAL_STRING(serverstring, serverstring)
+FN_GLOBAL_STRING(server_string, server_string)
FN_GLOBAL_STRING(setprimarygroup_script, setprimarygroup_script)
FN_GLOBAL_STRING(set_quota_command, set_quota_command)
FN_GLOBAL_STRING(share_backend, share_backend)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 8285f20d45..f36763986c 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -373,7 +373,7 @@ static struct parm_struct parm_table[] = {
.label = "server string",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(serverstring),
+ .offset = GLOBAL_VAR(server_string),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_BASIC | FLAG_ADVANCED,
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index b2a84d11a5..3c7306c260 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -40,7 +40,7 @@ static WERROR NetServerGetInfo_l_101(struct libnetapi_ctx *ctx,
i.sv101_version_major = SAMBA_MAJOR_NBT_ANNOUNCE_VERSION;
i.sv101_version_minor = SAMBA_MINOR_NBT_ANNOUNCE_VERSION;
i.sv101_type = lp_default_server_announce();
- i.sv101_comment = lp_serverstring(ctx);
+ i.sv101_comment = lp_server_string(ctx);
*buffer = (uint8_t *)talloc_memdup(ctx, &i, sizeof(i));
if (!*buffer) {
@@ -58,7 +58,7 @@ static WERROR NetServerGetInfo_l_1005(struct libnetapi_ctx *ctx,
{
struct SERVER_INFO_1005 info1005;
- info1005.sv1005_comment = lp_serverstring(ctx);
+ info1005.sv1005_comment = lp_server_string(ctx);
*buffer = (uint8_t *)talloc_memdup(ctx, &info1005, sizeof(info1005));
if (!*buffer) {
return WERR_NOMEM;
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 86012b834b..5b011bfc02 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -477,7 +477,7 @@ void announce_remote(time_t t)
if (!*s)
return;
- comment = string_truncate(lp_serverstring(talloc_tos()),
+ comment = string_truncate(lp_server_string(talloc_tos()),
MAX_SERVER_STRING_LENGTH);
frame = talloc_stackframe();
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index 05ca6e9367..f697f05efe 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -359,7 +359,7 @@ void write_browse_list(time_t t, bool force_write)
/* Output server details, plus what workgroup they're in. */
write_browse_list_entry(fp, my_netbios_names(i), stype,
- string_truncate(lp_serverstring(talloc_tos()), MAX_SERVER_STRING_LENGTH), lp_workgroup());
+ string_truncate(lp_server_string(talloc_tos()), MAX_SERVER_STRING_LENGTH), lp_workgroup());
}
for (subrec = FIRST_SUBNET; subrec ; subrec = NEXT_SUBNET_INCLUDING_UNICAST(subrec)) {
diff --git a/source3/nmbd/nmbd_workgroupdb.c b/source3/nmbd/nmbd_workgroupdb.c
index 14b33b321e..4e72b8128b 100644
--- a/source3/nmbd/nmbd_workgroupdb.c
+++ b/source3/nmbd/nmbd_workgroupdb.c
@@ -254,7 +254,7 @@ workgroup %s on subnet %s\n", work->work_group, subrec->subnet_name));
stype &= ~(SV_TYPE_MASTER_BROWSER|SV_TYPE_POTENTIAL_BROWSER|SV_TYPE_DOMAIN_MASTER|SV_TYPE_DOMAIN_MEMBER);
create_server_on_workgroup(work,name,stype|SV_TYPE_LOCAL_LIST_ONLY, PERMANENT_TTL,
- string_truncate(lp_serverstring(talloc_tos()), MAX_SERVER_STRING_LENGTH));
+ string_truncate(lp_server_string(talloc_tos()), MAX_SERVER_STRING_LENGTH));
DEBUG(3,("initiate_myworkgroup_startup: Added server name entry %s \
on subnet %s\n", name, subrec->subnet_name));
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 31be7b0322..22d58d2473 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -782,7 +782,7 @@ static void init_globals(bool reinit_globals)
if (asprintf(&s, "Samba %s", samba_version_string()) < 0) {
smb_panic("init_globals: ENOMEM");
}
- string_set(&Globals.serverstring, s);
+ string_set(&Globals.server_string, s);
SAFE_FREE(s);
#ifdef DEVELOPER
string_set(&Globals.panic_action, "/bin/sleep 999999999");
@@ -1780,7 +1780,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
return false;
if (asprintf(&comment, "IPC Service (%s)",
- Globals.serverstring) < 0) {
+ Globals.server_string) < 0) {
return false;
}
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index b366eda2dd..0cb680d1ab 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -3352,7 +3352,7 @@ static NTSTATUS query_dom_info_2(TALLOC_CTX *mem_ctx,
unbecome_root();
- r->oem_information.string = lp_serverstring(r);
+ r->oem_information.string = lp_server_string(r);
r->domain_name.string = lp_workgroup();
r->primary.string = lp_netbios_name();
r->sequence_num = seq_num;
@@ -3396,7 +3396,7 @@ static NTSTATUS query_dom_info_3(TALLOC_CTX *mem_ctx,
static NTSTATUS query_dom_info_4(TALLOC_CTX *mem_ctx,
struct samr_DomOEMInformation *r)
{
- r->oem_information.string = lp_serverstring(r);
+ r->oem_information.string = lp_server_string(r);
return NT_STATUS_OK;
}
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index cc727a9a73..b4ccddb0b9 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -1131,7 +1131,7 @@ WERROR _srvsvc_NetSrvGetInfo(struct pipes_struct *p,
info102->version_major = SAMBA_MAJOR_NBT_ANNOUNCE_VERSION;
info102->version_minor = SAMBA_MINOR_NBT_ANNOUNCE_VERSION;
info102->server_type = lp_default_server_announce();
- info102->comment = string_truncate(lp_serverstring(talloc_tos()),
+ info102->comment = string_truncate(lp_server_string(talloc_tos()),
MAX_SERVER_STRING_LENGTH);
info102->users = 0xffffffff;
info102->disc = 0xf;
@@ -1157,7 +1157,7 @@ WERROR _srvsvc_NetSrvGetInfo(struct pipes_struct *p,
info101->version_major = SAMBA_MAJOR_NBT_ANNOUNCE_VERSION;
info101->version_minor = SAMBA_MINOR_NBT_ANNOUNCE_VERSION;
info101->server_type = lp_default_server_announce();
- info101->comment = string_truncate(lp_serverstring(talloc_tos()),
+ info101->comment = string_truncate(lp_server_string(talloc_tos()),
MAX_SERVER_STRING_LENGTH);
r->out.info->info101 = info101;
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 8ccfe6babf..0ef676638b 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -1464,7 +1464,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info101->version_major = server_info->version_major;
info101->version_minor = server_info->version_minor;
info101->server_type = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx);
- info101->comment = talloc_strdup(mem_ctx, lpcfg_serverstring(dce_ctx->lp_ctx));
+ info101->comment = talloc_strdup(mem_ctx, lpcfg_server_string(dce_ctx->lp_ctx));
W_ERROR_HAVE_NO_MEMORY(info101->comment);
r->out.info->info101 = info101;
@@ -1484,7 +1484,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info102->version_major = server_info->version_major;
info102->version_minor = server_info->version_minor;
info102->server_type = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx);
- info102->comment = talloc_strdup(mem_ctx, lpcfg_serverstring(dce_ctx->lp_ctx));
+ info102->comment = talloc_strdup(mem_ctx, lpcfg_server_string(dce_ctx->lp_ctx));
W_ERROR_HAVE_NO_MEMORY(info102->comment);
info102->users = dcesrv_common_get_users(mem_ctx, dce_ctx);
generated by cgit (git 2.34.1) at 2025-06-14 07:19:25 +0000