Changeset 923 for trunk/server

Timestamp:

Jun 14, 2016, 11:32:05 AM (9 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.6 log.nmbd PID change, remove eCS, tidy CRLF mess

Location:

trunk/server/source3

Files:

• nmbd/nmbd_winsserver.c (modified) (1 diff)
• smbd/sesssetup.c (modified) (1 diff)
• utils/net_time.c (modified) (1 diff)

trunk/server/source3/nmbd/nmbd_winsserver.c

@@ -2474 +2474 @@
                         return;
                 }
+#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
                 if (tdb_reopen(wins_tdb)) {
                         DEBUG(0,("wins_write_database: tdb_reopen failed. Error was %s\n",

trunk/server/source3/smbd/sesssetup.c

@@ -91 +91 @@
         tmp = message_push_string(outbuf, "Unix", STR_TERMINATE);
 #else
-        tmp = message_push_string(outbuf, "eCS (OS/2)", STR_TERMINATE);
+        tmp = message_push_string(outbuf, "OS/2", STR_TERMINATE);
 #endif
 

trunk/server/source3/utils/net_time.c

@@ -118 +118 @@
 
 #ifdef __OS2__
-        /* eCS (OS/2) native "net time set" routine */
+        /* OS/2 native "net time set" routine */
         result = os2_setdatetime(tv.tv_sec);
 #else