Changeset 952

Timestamp:

Aug 12, 2016, 12:48:26 AM (9 years ago)

Author:

dmik

Message:

samba server: Make nmbd obey max log size setting.

This is sorta backport from Samba 4 by @diver (to make sure
the manually set log file name is not changed when smb.conf
is loaded) with some additions that cause max log size
to be taken into account.

Location:

trunk/server/source3

Files:

• lib/popt_common.c (modified) (4 diffs)
• nmbd/nmbd.c (modified) (4 diffs)

trunk/server/source3/lib/popt_common.c

@@ -40 +40 @@
 extern bool override_logfile;
 
+#ifdef __OS2__
+static void set_logfile(poptContext con, const char * arg, bool setcmdline)
+#else
 static void set_logfile(poptContext con, const char * arg)
+#endif
 {
 
@@ -58 +62 @@
         }
         lp_set_logfile(lfile);
+#ifdef __OS2__
+        if (setcmdline) {
+                lp_set_cmdline("log file", lfile);
+        }
+#endif
+
         SAFE_FREE(lfile);
 }
@@ -75 +85 @@
 
         if (reason == POPT_CALLBACK_REASON_PRE) {
+#ifdef __OS2__
+                set_logfile(con, get_dyn_LOGFILEBASE(), false);
+#else
                 set_logfile(con, get_dyn_LOGFILEBASE());
+#endif
                 talloc_set_log_fn(popt_s3_talloc_log_fn);
                 talloc_set_abort_fn(smb_panic);
@@ -136 +150 @@
         case 'l':
                 if (arg) {
+#ifdef __OS2__
+                        set_logfile(con, arg, true);
+#else
                         set_logfile(con, arg);
+#endif
                         override_logfile = True;
                         set_dyn_LOGFILEBASE(arg);

trunk/server/source3/nmbd/nmbd.c

@@ -397 +397 @@
 
 #ifdef __OS2__
-        /* restore the logfile to log.nmbd always */
-        char *lfile = NULL;
-        if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0)
-                exit(1);
-
-        lp_set_logfile(lfile);
-        SAFE_FREE(lfile);
-#endif
+        reopen_logs();
+#endif
+
         return(ret);
 }
@@ -421 +416 @@
         dump_all_namelists();
         reload_nmbd_services( True );
+#ifndef __OS2__
         reopen_logs();
+#endif
         reload_interfaces(0);
 }
@@ -845 +842 @@
                 }
                 lp_set_logfile(lfile);
+#ifdef __OS2__
+                lp_set_cmdline("log file", lfile);
+#endif
                 SAFE_FREE(lfile);
         }
@@ -882 +882 @@
         }
 
+#ifndef __OS2__
         reopen_logs();
+#endif
 
         DEBUG(0,("nmbd version %s started.\n", samba_version_string()));