Changeset 854 for trunk/server/source3/nmbd

Timestamp:

Feb 24, 2014, 3:48:58 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: seperate logfiles per pid in nmbd

Location:

trunk/server/source3/nmbd

Files:

• asyncdns.c (modified) (1 diff)
• nmbd.c (modified) (2 diffs)

trunk/server/source3/nmbd/asyncdns.c

@@ -170 +170 @@
         CatchSignal(SIGTERM, sig_term);
 
+#ifdef __OS2__
+        /* restore the logfile to log.nmbd always */
+        char *lfile = NULL;
+        if (asprintf(&lfile, "%s/log%d.nmbd", get_dyn_LOGFILEBASE(), getpid()) < 0)
+                exit(1);
+
+        lp_set_logfile(lfile);
+        SAFE_FREE(lfile);
+        reopen_logs();
+#endif
         status = reinit_after_fork(nmbd_messaging_context(),
                                    nmbd_event_context(),

trunk/server/source3/nmbd/nmbd.c

@@ -398 +398 @@
 #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);
+        char *lfile = NULL;
+        if (asprintf(&lfile, "%s/log%d.nmbd", get_dyn_LOGFILEBASE(), getpid()) < 0)
+                exit(1);
+
+        lp_set_logfile(lfile);
+        SAFE_FREE(lfile);
 #endif
         return(ret);
@@ -841 +841 @@
         if (!override_logfile) {
                 char *lfile = NULL;
-                if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) {
+                if (asprintf(&lfile, "%s/log%d.nmbd", get_dyn_LOGFILEBASE(), getpid()) < 0) {
                         exit(1);
                 }