Changeset 855 for trunk/server/source3/nmbd/nmbd.c

Timestamp:

Feb 24, 2014, 5:43:22 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: seperate logfiles per pid in nmbd and also take smb.conf into account

File:

• trunk/server/source3/nmbd/nmbd.c (modified) (3 diffs)

trunk/server/source3/nmbd/nmbd.c

@@ -399 +399 @@
         /* restore the logfile to log.nmbd always */
         char *lfile = NULL;
-        if (asprintf(&lfile, "%s/log%d.nmbd", get_dyn_LOGFILEBASE(), getpid()) < 0)
+        if (asprintf(&lfile, "%s/log.nmbd.%d", get_dyn_LOGFILEBASE(), getpid()) < 0)
                 exit(1);
 
@@ -841 +841 @@
         if (!override_logfile) {
                 char *lfile = NULL;
-                if (asprintf(&lfile, "%s/log%d.nmbd", get_dyn_LOGFILEBASE(), getpid()) < 0) {
+                if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) {
                         exit(1);
                 }
@@ -894 +894 @@
                 exit(1);
         }
+
+#ifdef __OS2__ 
+        /* restore the logfile to log.nmbd always and also use smb.conf settings*/
+        char *lfile = NULL;
+        if (asprintf(&lfile, "%s/log.nmbd.%d", get_dyn_LOGFILEBASE(), getpid()) < 0)
+                exit(1);
+
+        lp_set_logfile(lfile);
+        SAFE_FREE(lfile);
+
+        reopen_logs();
+#endif
 
         if (nmbd_messaging_context() == NULL) {