Changeset 689
- Timestamp:
- Mar 1, 2012, 10:27:21 AM (13 years ago)
- Location:
- branches/samba-3.3.x/source
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/samba-3.3.x/source/dynconfig.c
r680 r689 275 275 if (!*buffer) 276 276 { 277 if (lp_is_in_client()) 278 { 279 snprintf(buffer, 260, "%s/samba/lock/client", getenv("ETC")); 280 } else { 281 snprintf(buffer, 260, "%s/samba/lock", getenv("ETC")); 282 } 277 snprintf(buffer, 260, "%s/samba/lock", getenv("ETC")); 283 278 } 284 279 if (dyn_LOCKDIR == NULL) { -
branches/samba-3.3.x/source/param/loadparm.c
r411 r689 82 82 static bool in_client = False; /* Not in the client by default */ 83 83 static struct smbconf_csn conf_last_csn; 84 #ifdef __OS2__ 85 static bool newLockDir = False; 86 #endif 84 87 85 88 #define CONFIG_BACKEND_FILE 0 … … 4709 4712 string_set(&Globals.szPidDir, get_dyn_PIDDIR()); 4710 4713 string_set(&Globals.szLockDir, get_dyn_LOCKDIR()); 4714 #ifdef __OS2__ 4715 newLockDir = True; 4716 #endif 4711 4717 string_set(&Globals.szSocketAddress, "0.0.0.0"); 4712 4718 … … 8971 8977 lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1"); 8972 8978 } 8979 #ifdef __OS2__ 8980 if (lp_is_in_client() && newLockDir) { 8981 char* s=NULL; 8982 if (asprintf(&s, "%s/%s", lp_lockdir(), "client") < 0) { 8983 smb_panic("init_globals: ENOMEM"); 8984 } 8985 lp_do_parameter(GLOBAL_SECTION_SNUM, "lock directory", s); 8986 SAFE_FREE(s); 8987 newLockDir = False; 8988 } 8989 #endif 8973 8990 8974 8991 init_iconv();
Note:
See TracChangeset
for help on using the changeset viewer.