param: Change from _lp to lp__ as the prefix for internal parameter wrappers

This will make a merge with the lib/param param code easier, as we can then paste lp_ to the front of
all parameters unconditionally.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 57d39b032d20a273fb8b3ada55b6da6492a3161d..dae69b7501b803a273059056392fed20330d65cd 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1259,7 +1259,7 @@ bool lp_paranoid_server_security(void);
 int lp_maxdisksize(void);
 int lp_lpqcachetime(void);
 int lp_max_smbd_processes(void);
-bool _lp_disable_spoolss(void);
+bool lp__disable_spoolss(void);
 int lp_syslog(void);
 int lp_lm_announce(void);
 int lp_lm_interval(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 539df04975eb595028a6b323b0d86b2a48fa9bd3..06dbb357527fe4e1439a683183412ccecf8f64a1 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5221,9 +5221,9 @@ static FN_GLOBAL_BOOL(lp_domain_logons, bDomainLogons)
 FN_GLOBAL_LIST(lp_init_logon_delayed_hosts, szInitLogonDelayedHosts)
 FN_GLOBAL_INTEGER(lp_init_logon_delay, InitLogonDelay)
 FN_GLOBAL_BOOL(lp_load_printers, bLoadPrinters)
-static FN_GLOBAL_BOOL(_lp_readraw, bReadRaw)
+static FN_GLOBAL_BOOL(lp__readraw, bReadRaw)
 FN_GLOBAL_BOOL(lp_large_readwrite, bLargeReadwrite)
-static FN_GLOBAL_BOOL(_lp_writeraw, bWriteRaw)
+static FN_GLOBAL_BOOL(lp__writeraw, bWriteRaw)
 FN_GLOBAL_BOOL(lp_null_passwords, bNullPasswords)
 FN_GLOBAL_BOOL(lp_obey_pam_restrictions, bObeyPamRestrictions)
 FN_GLOBAL_BOOL(lp_encrypted_passwords, bEncryptPasswords)
@@ -5291,7 +5291,7 @@ FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security)
 FN_GLOBAL_INTEGER(lp_maxdisksize, maxdisksize)
 FN_GLOBAL_INTEGER(lp_lpqcachetime, lpqcachetime)
 FN_GLOBAL_INTEGER(lp_max_smbd_processes, iMaxSmbdProcesses)
-FN_GLOBAL_BOOL(_lp_disable_spoolss, bDisableSpoolss)
+FN_GLOBAL_BOOL(lp__disable_spoolss, bDisableSpoolss)
 FN_GLOBAL_INTEGER(lp_syslog, syslog)
 FN_GLOBAL_INTEGER(lp_lm_announce, lm_announce)
 FN_GLOBAL_INTEGER(lp_lm_interval, lm_interval)
@@ -9449,7 +9449,7 @@ static uint32 spoolss_state;
 bool lp_disable_spoolss( void )
 {
        if ( spoolss_state == SVCCTL_STATE_UNKNOWN )
-               spoolss_state = _lp_disable_spoolss() ? SVCCTL_STOPPED : SVCCTL_RUNNING;
+               spoolss_state = lp__disable_spoolss() ? SVCCTL_STOPPED : SVCCTL_RUNNING;
 
        return spoolss_state == SVCCTL_STOPPED ? true : false;
 }
@@ -9630,7 +9630,7 @@ bool lp_writeraw(void)
        if (lp_async_smb_echo_handler()) {
                return false;
        }
-       return _lp_writeraw();
+       return lp__writeraw();
 }
 
 bool lp_readraw(void)
@@ -9638,7 +9638,7 @@ bool lp_readraw(void)
        if (lp_async_smb_echo_handler()) {
                return false;
        }
-       return _lp_readraw();
+       return lp__readraw();
 }
 
 int lp_server_role(void)

diff --git a/source3/rpc_server/rpc_service_setup.c b/source3/rpc_server/rpc_service_setup.c
index 9fc12f2e31934789c73aa54d09cf16977e36a2e8..b8bb8aef4492911616c855ed2de8493c1191e94d 100644 (file)
--- a/source3/rpc_server/rpc_service_setup.c
+++ b/source3/rpc_server/rpc_service_setup.c
@@ -302,7 +302,7 @@ static bool rpc_setup_spoolss(struct tevent_context *ev_ctx,
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
        enum rpc_service_mode_e service_mode = rpc_service_mode(t->name);
 
-       if (_lp_disable_spoolss()) {
+       if (lp__disable_spoolss()) {
                return true;
        }
 

diff --git a/source3/services/svc_spoolss.c b/source3/services/svc_spoolss.c
index 3b56f9350d47cdb472c8f255da01f25edb20df89..e827013d00ec2ccf4a9c1551d47305a13a3053b6 100644 (file)
--- a/source3/services/svc_spoolss.c
+++ b/source3/services/svc_spoolss.c
@@ -48,7 +48,7 @@ static WERROR spoolss_start( const char *service )
 {
        /* see if the smb.conf will support this anyways */
 
-       if ( _lp_disable_spoolss() )
+       if ( lp__disable_spoolss() )
                return WERR_ACCESS_DENIED;
 
        if (lp_get_spoolss_state() == SVCCTL_RUNNING) {

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d3bcc48893e9c8cb25a7eab170abe70521173ba0..16c2d28a26678a11b8505da1422ae8c5f862dd69 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1392,7 +1392,7 @@ extern void build_options(bool screen);
                        start_lsasd(ev_ctx, msg_ctx);
                }
 
-               if (!_lp_disable_spoolss() &&
+               if (!lp__disable_spoolss() &&
                    (rpc_spoolss_daemon() != RPC_DAEMON_DISABLED)) {
                        bool bgq = lp_parm_bool(-1, "smbd", "backgroundqueue", true);
 
@@ -1400,7 +1400,7 @@ extern void build_options(bool screen);
                                exit(1);
                        }
                }
-       } else if (!_lp_disable_spoolss() &&
+       } else if (!lp__disable_spoolss() &&
                   (rpc_spoolss_daemon() != RPC_DAEMON_DISABLED)) {
                if (!printing_subsystem_init(ev_ctx, msg_ctx, false, false)) {
                        exit(1);