Changeset 949

Timestamp:

Aug 11, 2016, 10:27:39 AM (9 years ago)

Author:

Silvan Scherrer

Message:

samba server: revert logging changes in nmbd and asycdns

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.nmbd.%d", 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

@@ -399 +399 @@
         /* restore the logfile to log.nmbd always */
         char *lfile = NULL;
-        if (asprintf(&lfile, "%s/log.nmbd.%d", get_dyn_LOGFILEBASE(), getpid()) < 0)
+        if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0)
                 exit(1);
 
@@ -895 +895 @@
         }
 
-#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) {
                 return 1;