logging: use DBG_STARTUP_NOTICE for startup message

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15377

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 159cfde446c95c387ef212be103b109ea0dca93d)

diff --git a/source3/rpc_server/rpc_host.c b/source3/rpc_server/rpc_host.c
index b59916b5dda88c1dc7e44b1bd38655bb0484c5ba..9e64fa62d0c2ddcb027ee3d744a9237f75a4b98a 100644 (file)
--- a/source3/rpc_server/rpc_host.c
+++ b/source3/rpc_server/rpc_host.c
@@ -2840,10 +2840,10 @@ int main(int argc, const char *argv[])
 
        reopen_logs();
 
-       DEBUG(0, ("%s version %s started.\n",
+       DBG_STARTUP_NOTICE("%s version %s started.\n"
+                       COPYRIGHT_STARTUP_MESSAGE "\n",
                  progname,
-                 samba_version_string()));
-       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+                 samba_version_string());
 
        (void)winbind_off();
        ok = init_guest_session_info(frame);

diff --git a/source3/rpc_server/rpc_worker.c b/source3/rpc_server/rpc_worker.c
index 2ef90547dd6661cbac53bce83b6ef70d11ad9b5c..cde0e7bcd5933e1f6da5f218ba47d8f9768e1109 100644 (file)
--- a/source3/rpc_server/rpc_worker.c
+++ b/source3/rpc_server/rpc_worker.c
@@ -1124,10 +1124,10 @@ int rpc_worker_main(
 
        reopen_logs();
 
-       DEBUG(0, ("%s version %s started.\n",
-                 progname,
-                 samba_version_string()));
-       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+       DBG_STARTUP_NOTICE("%s version %s started.\n"
+                       COPYRIGHT_STARTUP_MESSAGE "\n",
+               progname,
+               samba_version_string());
 
        msg_ctx = global_messaging_context();
        if (msg_ctx == NULL) {

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 18c79f9df35637404bca2cb0c45ca872dd5e31fa..ddef5b6de168b3fa421b1fed30f64eaa7196f7fd 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1743,8 +1743,9 @@ extern void build_options(bool screen);
 
        reopen_logs();
 
-       DEBUG(0,("smbd version %s started.\n", samba_version_string()));
-       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+       DBG_STARTUP_NOTICE("smbd version %s started.\n"
+                       COPYRIGHT_STARTUP_MESSAGE "\n",
+               samba_version_string());
 
        DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
                 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 765e5a2561b37bcb6465ad05dcbc5bfdbb09ba83..cdd6d4319cbde3d40c5989eba2d321ef53313511 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1438,8 +1438,9 @@ int main(int argc, const char **argv)
 
        reopen_logs();
 
-       DEBUG(0,("winbindd version %s started.\n", samba_version_string()));
-       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
+       DBG_STARTUP_NOTICE("winbindd version %s started.\n"
+                       COPYRIGHT_STARTUP_MESSAGE "\n",
+               samba_version_string());
 
        /* After parsing the configuration file we setup the core path one more time
         * as the log file might have been set in the configuration and cores's

diff --git a/source4/samba/server.c b/source4/samba/server.c
index a66e1cf0363cf9f5a2f36d55217540e23da89382..e1ad646fae286970f35f4904171f358e62945b81 100644 (file)
--- a/source4/samba/server.c
+++ b/source4/samba/server.c
@@ -630,11 +630,10 @@ static int binary_smbd_main(TALLOC_CTX *mem_ctx,
           so set our umask to 0 */
        umask(0);
 
-       DEBUG(0,("%s version %s started.\n",
+       DBG_STARTUP_NOTICE("%s version %s started.\n"
+                       COPYRIGHT_STARTUP_MESSAGE "\n",
                binary_name,
-               SAMBA_VERSION_STRING));
-       DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team"
-               " 1992-2023\n"));
+               SAMBA_VERSION_STRING);
 
        if (sizeof(uint16_t) < 2 ||
                        sizeof(uint32_t) < 4 ||