Changeset 689


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

Samba 3.3: fixed ticket 192

Location:
branches/samba-3.3.x/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/samba-3.3.x/source/dynconfig.c

    r680 r689  
    275275        if (!*buffer)
    276276        {
    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"));
    283278        }
    284279        if (dyn_LOCKDIR == NULL) {
  • branches/samba-3.3.x/source/param/loadparm.c

    r411 r689  
    8282static bool in_client = False;          /* Not in the client by default */
    8383static struct smbconf_csn conf_last_csn;
     84#ifdef __OS2__
     85static bool newLockDir = False;
     86#endif
    8487
    8588#define CONFIG_BACKEND_FILE 0
     
    47094712        string_set(&Globals.szPidDir, get_dyn_PIDDIR());
    47104713        string_set(&Globals.szLockDir, get_dyn_LOCKDIR());
     4714#ifdef __OS2__
     4715        newLockDir = True;
     4716#endif
    47114717        string_set(&Globals.szSocketAddress, "0.0.0.0");
    47124718
     
    89718977                lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
    89728978        }
     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
    89738990
    89748991        init_iconv();
Note: See TracChangeset for help on using the changeset viewer.