net/samba3/patches/120-owrt_paths.patch

   1 Index: samba-3.0.24/source/Makefile
   2 ===================================================================
   3 --- samba-3.0.24.orig/source/Makefile   2008-08-06 23:33:20.000000000 +0200
   4 +++ samba-3.0.24/source/Makefile        2008-08-06 23:34:48.000000000 +0200
   5 @@ -12,7 +12,7 @@
   6
   7  # AR7
   8  # prefix=/usr/local/samba
   9 -prefix=/var/samba
  10 +prefix=
  11  exec_prefix=${prefix}
  12
  13  # AR7
  14 @@ -108,11 +108,11 @@
  15  # These can be overridden by command line switches (see smbd(8))
  16  # or in smb.conf (see smb.conf(5))
  17  LOGFILEBASE = ${VARDIR}
  18 -CONFIGFILE = $(CONFIGDIR)/smb.conf
  19 -LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  20 +CONFIGFILE = /etc/samba/smb.conf
  21 +LMHOSTSFILE = /etc/lmhosts
  22
  23  # This is where smbpasswd et al go
  24 -PRIVATEDIR = ${prefix}/private
  25 +PRIVATEDIR = /etc/samba/
  26
  27  SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
  28  PRIVATE_DIR = $(PRIVATEDIR)
  29 @@ -121,10 +121,10 @@
  30  SWATDIR = ${prefix}/swat
  31
  32  # the directory where lock files go
  33 -LOCKDIR = ${VARDIR}/locks
  34 +LOCKDIR = ${VARDIR}/lock
  35
  36  # the directory where pid files go
  37 -PIDDIR = ${VARDIR}/locks
  38 +PIDDIR = ${VARDIR}/lock
  39
  40  LIBSMBCLIENT=bin/libsmbclient.a bin/libsmbclient.so
  41  LIBSMBCLIENT_MAJOR=0
  42 Index: samba-3.0.24/source/lib/util.c
  43 ===================================================================
  44 --- samba-3.0.24.orig/source/lib/util.c 2008-08-06 23:41:58.000000000 +0200
  45 +++ samba-3.0.24/source/lib/util.c      2008-08-06 23:42:10.000000000 +0200
  46 @@ -300,11 +300,7 @@
  47         char *p;
  48         if ((p = getenv("TMPDIR")))
  49                 return p;
  50 -#if 1 /* AR7 */
  51 -       return "/var/tmp";
  52 -#else
  53         return "/tmp";
  54 -#endif
  55  }
  56
  57  /****************************************************************************