Changeset 952 for trunk/server/source3/lib/popt_common.c
- Timestamp:
- Aug 12, 2016, 12:48:26 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/source3/lib/popt_common.c
r745 r952 40 40 extern bool override_logfile; 41 41 42 #ifdef __OS2__ 43 static void set_logfile(poptContext con, const char * arg, bool setcmdline) 44 #else 42 45 static void set_logfile(poptContext con, const char * arg) 46 #endif 43 47 { 44 48 … … 58 62 } 59 63 lp_set_logfile(lfile); 64 #ifdef __OS2__ 65 if (setcmdline) { 66 lp_set_cmdline("log file", lfile); 67 } 68 #endif 69 60 70 SAFE_FREE(lfile); 61 71 } … … 75 85 76 86 if (reason == POPT_CALLBACK_REASON_PRE) { 87 #ifdef __OS2__ 88 set_logfile(con, get_dyn_LOGFILEBASE(), false); 89 #else 77 90 set_logfile(con, get_dyn_LOGFILEBASE()); 91 #endif 78 92 talloc_set_log_fn(popt_s3_talloc_log_fn); 79 93 talloc_set_abort_fn(smb_panic); … … 136 150 case 'l': 137 151 if (arg) { 152 #ifdef __OS2__ 153 set_logfile(con, arg, true); 154 #else 138 155 set_logfile(con, arg); 156 #endif 139 157 override_logfile = True; 140 158 set_dyn_LOGFILEBASE(arg);
Note:
See TracChangeset
for help on using the changeset viewer.