Changeset 953

Timestamp:

Aug 12, 2016, 1:07:15 AM (9 years ago)

Author:

dmik

Message:

samba server: Properly derive log file suffix from program name.

The code removing the path didn't expect back slashes or the
.exe extension in the name and could result into invalid
(no log file at all) or strange (ending with .exe) log file
names.

File:

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

trunk/server/source3/lib/popt_common.c

@@ -51 +51 @@
 
         /* Find out basename of current program */
+#ifdef __OS2__
+        char *fname = SMB_STRDUP(_getname(poptGetInvocationName(con)));
+        _remext(fname);
+        pname = fname;
+#else
         pname = strrchr_m(poptGetInvocationName(con),'/');
 
@@ -57 +62 @@
         else
                 pname++;
+#endif
 
         if (asprintf(&lfile, "%s/log.%s", arg, pname) < 0) {
@@ -66 +72 @@
                 lp_set_cmdline("log file", lfile);
         }
+        SAFE_FREE(fname);
 #endif