Attachment 2170 Details for Bug 4143 – modify log levels in nmbd source code

[patch] modify log levels in nmbd source code

samba-nmb-syslog.patch (text/plain), 6.54 KB, created by Mikel Ward on 2006-10-03 06:56:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikel Ward

Created: 2006-10-03 06:56:17 UTC

Size: 6.54 KB

patch

obsolete

>? samba-nmb-syslog.patch
>Index: nmbd.c
>===================================================================
>RCS file: /cvsroot/samba/source/nmbd/nmbd.c,v
>retrieving revision 1.161
>diff -u -t -w -r1.161 nmbd.c
>--- nmbd.c	11 Jan 2004 13:21:03 -0000	1.161
>+++ nmbd.c	3 Oct 2006 11:33:54 -0000
>@@ -51,7 +51,7 @@
> 
> static void terminate(void)
> {
>-        DEBUG(0,("Got SIGTERM: going down...\n"));
>+        DEBUG(2,("Got SIGTERM: going down...\n"));
>   
>         /* Write out wins.dat file if samba is a WINS server */
>         wins_write_database(False);
>@@ -217,7 +217,7 @@
>                  */
> 
>                 if (ip_equal(iface->ip, loopback_ip)) {
>-                        DEBUG(2,("reload_interfaces: Ignoring loopback interface %s\n", inet_ntoa(iface->ip)));
>+                        DEBUG(3,("reload_interfaces: Ignoring loopback interface %s\n", inet_ntoa(iface->ip)));
>                         continue;
>                 }
> 
>@@ -228,7 +228,7 @@
> 
>                 if (!subrec) {
>                         /* it wasn't found! add it */
>-                        DEBUG(2,("Found new interface %s\n", 
>+                        DEBUG(3,("Found new interface %s\n", 
>                                  inet_ntoa(iface->ip)));
>                         subrec = make_normal_subnet(iface);
>                         if (subrec)
>@@ -250,7 +250,7 @@
>                          instead we just wear the memory leak and
>                          remove it from the list of interfaces without
>                          freeing it */
>-                        DEBUG(2,("Deleting dead interface %s\n", 
>+                        DEBUG(3,("Deleting dead interface %s\n", 
>                                  inet_ntoa(subrec->myip)));
>                         close_subnet(subrec);
>                 }
>@@ -537,7 +537,7 @@
>                  */
> 
>                 if(reload_after_sighup) {
>-                        DEBUG( 0, ( "Got SIGHUP dumping debug info.\n" ) );
>+                        DEBUG( 2, ( "Got SIGHUP dumping debug info.\n" ) );
>                         msg_reload_nmbd_services(MSG_SMB_CONF_UPDATED, (pid_t) 0, (void*) &no_subnets, 0);
>                         if(no_subnets)
>                                 return;
>@@ -661,8 +661,8 @@
> 
>         reopen_logs();
> 
>-        DEBUG( 0, ( "Netbios nameserver version %s started.\n", SAMBA_VERSION_STRING) );
>-        DEBUGADD( 0, ( "Copyright Andrew Tridgell and the Samba Team 1994-2004\n" ) );
>+        DEBUG( 3, ( "Netbios nameserver version %s started.\n", SAMBA_VERSION_STRING) );
>+        DEBUGADD( 3, ( "Copyright Andrew Tridgell and the Samba Team 1994-2004\n" ) );
> 
>         if ( !reload_nmbd_services(False) )
>                 return(-1);
>@@ -680,12 +680,12 @@
>         set_samba_nb_type();
> 
>         if (!is_daemon && !is_a_socket(0)) {
>-                DEBUG(0,("standard input is not a socket, assuming -D option\n"));
>+                DEBUG(1,("standard input is not a socket, assuming -D option\n"));
>                 is_daemon = True;
>         }
>   
>         if (is_daemon && !opt_interactive) {
>-                DEBUG( 2, ( "Becoming a daemon.\n" ) );
>+                DEBUG( 3, ( "Becoming a daemon.\n" ) );
>                 become_daemon(Fork);
>         }
> 
>@@ -754,7 +754,7 @@
>          */
> 
>         if( False == register_my_workgroup_and_names() ) {
>-                DEBUG(0,("ERROR: Failed when creating my my workgroup. Exiting.\n"));
>+                DEBUG(0,("ERROR: Failed when creating my workgroup. Exiting.\n"));
>                 kill_async_dns_child();
>                 exit(1);
>         }
>Index: nmbd_become_dmb.c
>===================================================================
>RCS file: /cvsroot/samba/source/nmbd/nmbd_become_dmb.c,v
>retrieving revision 1.21
>diff -u -t -w -r1.21 nmbd_become_dmb.c
>--- nmbd_become_dmb.c	15 Mar 2004 21:53:59 -0000	1.21
>+++ nmbd_become_dmb.c	3 Oct 2006 11:33:55 -0000
>@@ -110,7 +110,7 @@
>         /* Tell the namelist writer to write out a change. */
>         subrec->work_changed = True;
> 
>-        if( DEBUGLVL( 0 ) ) {
>+        if( DEBUGLVL( 2 ) ) {
>                 dbgtext( "*****\n\nSamba server %s ", global_myname() );
>                 dbgtext( "is now a domain master browser for " );
>                 dbgtext( "workgroup %s ", work->work_group );
>@@ -222,7 +222,7 @@
> 
>                 become_domain_master_stage1(subrec, name);
>         } else {
>-                if( DEBUGLVL( 0 ) ) {
>+                if( DEBUGLVL( 1 ) ) {
>                         dbgtext( "become_domain_master_query_success:\n" );
>                         dbgtext( "There is already a domain master browser at " );
>                         dbgtext( "IP %s for workgroup %s ", inet_ntoa(ip), name );
>@@ -279,7 +279,7 @@
>                          */
> 
>                         if (find_name_on_subnet(subrec, &nmbname, FIND_SELF_NAME) == NULL) {
>-                                if( DEBUGLVL( 0 ) ) {
>+                                if( DEBUGLVL( 2 ) ) {
>                                         dbgtext( "become_domain_master_browser_bcast:\n" );
>                                         dbgtext( "Attempting to become domain master browser on " );
>                                         dbgtext( "workgroup %s on subnet %s\n",
>@@ -291,7 +291,7 @@
>                                    we can become a domain controller. 
>                                 */
> 
>-                                DEBUG(0,("become_domain_master_browser_bcast: querying subnet %s \
>+                                DEBUG(3,("become_domain_master_browser_bcast: querying subnet %s \
> for domain master browser on workgroup %s\n", subrec->subnet_name, workgroup_name));
> 
>                                 query_name(subrec, workgroup_name, nmbname.name_type,
>@@ -324,7 +324,7 @@
>                  */
> 
>                 if (find_name_on_subnet(unicast_subnet, &nmbname, FIND_SELF_NAME) == NULL) {
>-                        if( DEBUGLVL( 0 ) ) {
>+                        if( DEBUGLVL( 2 ) ) {
>                                 dbgtext( "become_domain_master_browser_wins:\n" );
>                                 dbgtext( "Attempting to become domain master browser " );
>                                 dbgtext( "on workgroup %s, subnet %s.\n",
>@@ -336,7 +336,7 @@
>                            we can become a domain master browser. 
>                         */
> 
>-                        DEBUG(0,("become_domain_master_browser_wins: querying WINS server from IP %s \
>+                        DEBUG(3,("become_domain_master_browser_wins: querying WINS server from IP %s \
> for domain master browser name %s on workgroup %s\n",
>                                 inet_ntoa(unicast_subnet->myip), nmb_namestr(&nmbname), workgroup_name));
>

Actions: View

Attachments on bug 4143: 2170