Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 17:19:45 +0000 (10:19 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 17:19:45 +0000 (10:19 -0700)
(This used to be commit c833c336435cffd20579903d22ccb910ab467e53)

source3/nmbd/nmbd.c
source3/smbd/server.c
source3/winbindd/winbindd.c

index c6be4914da0fb41aeaa34e3131d3b0c5fd1e7da8..6fadefe682aeaf5a191868d5e4bdcf24caac4fbd 100644 (file)
@@ -812,8 +812,8 @@ static bool open_sockets(bool isdaemon, int port)
 
        reopen_logs();
 
-       DEBUG( 0, ( "Netbios nameserver version %s started.\n", SAMBA_VERSION_STRING) );
-       DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
+       DEBUG(0,("nmbd version %s started.\n", SAMBA_VERSION_STRING));
+       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
        if ( !reload_nmbd_services(False) )
                return(-1);
index bcf997f2d242759b825aa2028c3490d8d22377cf..b9ab7ef7ac9562476ac64dcb6ba31202a495f421 100644 (file)
@@ -1057,8 +1057,8 @@ 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 ) );
+       DEBUG(0,("smbd version %s started.\n", SAMBA_VERSION_STRING));
+       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
        DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
                 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
index 8449795e1360fe6944661b354f6b190bbbf1a08e..ee993efca5a6e96f368bf5fb21992ffc7c6b9980 100644 (file)
@@ -1091,9 +1091,8 @@ int main(int argc, char **argv, char **envp)
        setup_logging("winbindd", log_stdout);
        reopen_logs();
 
-       DEBUG(1, ("winbindd version %s started.\n%s\n", 
-                 SAMBA_VERSION_STRING, 
-                 COPYRIGHT_STARTUP_MESSAGE) );
+       DEBUG(0,("winbindd version %s started.\n", SAMBA_VERSION_STRING));
+       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
        if (!reload_services_file()) {
                DEBUG(0, ("error opening config file\n"));