Changeset 690


Ignore:
Timestamp:
Mar 1, 2012, 10:28:56 AM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba 3.5: fixed ticket 192

Location:
trunk/server/source3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/source3/dynconfig.c

    r681 r690  
    301301        if (!*buffer)
    302302        {
    303                 if (lp_is_in_client())
    304                 {
    305                         snprintf(buffer, 260, "%s/samba/lock/client", getenv("ETC"));
    306                 } else {
    307                         snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
    308                 }
     303                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
    309304        }
    310305        if (dyn_LOCKDIR == NULL) {
  • trunk/server/source3/param/loadparm.c

    r599 r690  
    8989static bool in_client = False;          /* Not in the client by default */
    9090static struct smbconf_csn conf_last_csn;
     91#ifdef __OS2__
     92static bool newLockDir = False;
     93#endif
    9194
    9295#define CONFIG_BACKEND_FILE 0
     
    50145017        string_set(&Globals.szPasswdProgram, "");
    50155018        string_set(&Globals.szLockDir, get_dyn_LOCKDIR());
     5019#ifdef __OS2__
     5020        newLockDir = True;
     5021#endif
    50165022        string_set(&Globals.szStateDir, get_dyn_STATEDIR());
    50175023        string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());
     
    93019307                lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
    93029308        }
     9309#ifdef __OS2__
     9310        if (lp_is_in_client() && newLockDir) {
     9311           char* s=NULL;
     9312           if (asprintf(&s, "%s/%s", lp_lockdir(), "client") < 0) {
     9313                smb_panic("init_globals: ENOMEM");
     9314           }
     9315           lp_do_parameter(GLOBAL_SECTION_SNUM, "lock directory", s);
     9316           SAFE_FREE(s);
     9317           newLockDir = False;
     9318        }
     9319#endif
    93039320
    93049321        init_iconv();
Note: See TracChangeset for help on using the changeset viewer.