update samba package to 2.2.4.

              WHAT'S NEW IN Samba 2.2.4  - 2nd May 2002
              =========================================

This is the latest stable release of Samba. This is the version that all
production Samba servers should be running for all current bug-fixes.

There have been several fixes and internal enhancements which include:

 * More/better SPOOLSS printing functionality for Windows
   NT/2k/XP clients.
 * Several fixes relating to serving PC database files such
   as (Access and FoxPro) from a Samba file share.
 * Several improves in Samba's VFS layer which can be seen
   in the inclusion of a "Recycle Bin" vfs module.  See
   examples/VFS/README for more details on this.
 * Addition of a tool (tdbbackup) for backup/restore of Samba's
   tdb's
 * Continued improvements to winbind for greater scalability
   and stability
 * Several fixes related to Samba's MS-DFS support
 * Rpcclient's various printer commands now work (again)


New/Changed parameters in 2.2.4
--------------------------------

For more information on these parameters, see the man pages for
smb.conf(5).

Added/changed parameters
------------------------

* csc policy
* inherit acls
* nt status support
* lock spin count
* lock spin time
* pid directory
* winbind use default domain


Depreciated parameters
----------------------

The following parameters have been marked as depreciated
and will be removed in Samba 3.0

* postscript
* printer driver
* printer driver file
* printer driver location


Removed Parameters
------------------

  none


Changes in 2.2.4
----------------

See the cvs log for SAMBA_2_2 for more details

1)  added -c option to smbpasswd
2)  reworked smbpasswd internal command line option parsing
3)  small various bug fixes to experimental pdb_tdb.c
4)  Enforce spoolss RPCs based on the access granted at PrinterOpen()
5)  Added missing access checks to [add/delete/set]form
6)  Compile fixes for pam_smbpass
7)  fix smbd crash when netbios session request fails from
    spoolss_connect_to_client().
8)  fixed logic bug that prevent SetPrinter() from storing devmode
9)  Removed extra get_printer_snum() calls from set_printer_hnd_name()
10) fix joining domain on big endian machine when using -U to smbpasswd
11) allow command line arg to override smb.conf log level
12) continue to retry to register 1b name with wins server if there is an old IP there
13) fix smbclient print crash bug
14) 9x pnp fix when the config file and driver file are different
15) force testparm to print the correct value for log level
16) fix swat to show full log level info
17) fix server GetPrinterData() fields to be more sensible
18) fix logic error in SetPrinterDataEx()
19) Only set smb_read_error if not already set
20) Fix string returns that require unicode
21) Merge of printing performance fixes from appliance
22) lpq parsing fixes
23) Back port tridge's xcopy /o fix from HEAD
24) Fix the printer change notify code (unfinished)
25) Patch for Domain users not showing up
26) Fixed SetPrinterData(magic key) to support zero length DEVMODE
27) Ensure that all methods of looking up and connecting to DC's work
    using identical logic.
28) Merge in the mutex code to stop multiple domain logon failure
29) Ignore 0/0 lock
30) Fix winbindd to respect command line debuglevel as nmbd/smbd
31) Update with tdbbackup from HEAD
32) Fix for typo on solaris nss
33) Merge in the locking changes from HEAD
34) Added POSIX ACL layer into the vfs
35) Fix the returning of domain enum
36) Fix the generation of the MACHINE.SID file into the secrets.tdb.
37) Enable test for -rdynamic when building binaries
38) Remove the "stat open" code - make it inline
39) Fix the mp3 rename bug
40) Fix for Explorer DFS problems on older Windows 9X machines
41) implement OpenPrinter() opnum == 0x01
42) Matched W2K *insane* open semantics....
43) small fix that will prevent the "failed to marshall
    R_NET_SAMLOGON" message in the logs
42) don't do checking of local passdb in smbpasswd if using -r option
43) fix "smbpasswd -j DOMAIN -r * -U Admin%XXXX" so that it doesn't
    try to connect to a server named '*'
44) merge rpcclient code from HEAD
45) Ensure MACHINE.SID update done before child spawns
46) Fix the bad path errors for mkdir so mkdir \a\b\c\d works
47) Removed --with-vfs - always built if available
48) Fixed psec for 2.2
49) Fixed the handle leak in the connection management code
50) fix disable spoolss after the switch to nt status codes
51) Added Shirish's client side caching policy change
52) Honor the specversion when parsing the the DEVICEMODE
53) fix parsing bug when DEVICEMODE's private data does not end
    on a 4 byte boundary
54) do not idle an smbd when there is an open pipe
55) when a new driver is added to a Samba server, cycle through
    all printers and bump the change_id for each one bound to the driver
56) allow smbclient to work with a FIFO as well (needed for KDE
    ioslave)
57) various updates to pdb_nisplus.c
58) many small documentation updates
59) removed many compiler warnings



Known Bugs
----------

* Under certain conditions when serving the MS Access 2000
  executable file and an Access database from a Samba share,
  it is possible to experience data corruption.  This pug does
  does occur when the database is served from a Samba file share
  but the Access *.exe is stored on the client's local file system.
  The exact reason for this bug is unknown at this time.

9 files changed, 38 insertions, 202 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 90a023797b8..361eb905891 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2002/02/07 09:57:19 taca Exp $
+# $NetBSD: Makefile,v 1.82 2002/05/05 16:57:10 taca Exp $
 
-DISTNAME=		samba-2.2.3a
-PKGNAME=		samba-2.2.3.1
+DISTNAME=		samba-2.2.4
+PKGNAME=		samba-2.2.4
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/ \
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 3a639fb2ab6..885442d5813 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/02/05 00:36:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/05/05 16:57:11 taca Exp $
 bin/make_printerdef
 bin/make_smbcodepage
 bin/make_unicodemap
@@ -12,6 +12,7 @@ bin/smbpasswd
 bin/smbspool
 bin/smbstatus
 bin/smbtar
+bin/tdbbackup
 bin/testparm
 bin/testprns
 etc/rc.d/nmbd
@@ -86,14 +87,15 @@ share/doc/samba/PROFILES.txt
 share/doc/samba/Passwords.txt
 share/doc/samba/Printing.txt
 share/doc/samba/README.DCEDFS
-share/doc/samba/README.jis
 share/doc/samba/README.NOW
+share/doc/samba/README.jis
 share/doc/samba/README.sambatar
 share/doc/samba/Recent-FAQs.txt
 share/doc/samba/RoutedNetworks.txt
 share/doc/samba/SCO.txt
 share/doc/samba/SMBTAR.notes
 share/doc/samba/Samba-OpenSSL.txt
+share/doc/samba/Solaris-Winbind-HOWTO.txt
 share/doc/samba/Speed.txt
 share/doc/samba/Speed2.txt
 share/doc/samba/Tracing.txt
@@ -110,9 +112,6 @@ share/doc/samba/WinXP_SignOrSeal.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/doc/samba/announce
 share/doc/samba/cifsntdomain.txt
-share/doc/samba/kurs.pdf
-share/doc/samba/kurs.tex
-share/doc/samba/logo.ps
 share/doc/samba/security_level.txt
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/export2_smbpasswd.pl
@@ -121,6 +120,9 @@ share/examples/samba/LDAP/import2_smbpasswd.pl
 share/examples/samba/LDAP/import_smbpasswd.pl
 share/examples/samba/LDAP/ldapchpasswd
 share/examples/samba/LDAP/ldapsync.pl
+share/examples/samba/LDAP/samba-schema-netscapeds4.x
+share/examples/samba/LDAP/samba-schema-netscapeds5.x
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
 share/examples/samba/LDAP/samba.schema
 share/examples/samba/README
 share/examples/samba/VFS/Makefile
@@ -130,6 +132,7 @@ share/examples/samba/VFS/block/Makefile
 share/examples/samba/VFS/block/block.c
 share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
+share/examples/samba/VFS/recycle.c
 share/examples/samba/VFS/skel.c
 share/examples/samba/appliance/Makefile
 share/examples/samba/appliance/README
@@ -152,8 +155,9 @@ share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
 share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint-new.sh
 share/examples/samba/printing/smbprint.newer
+share/examples/samba/printing/smbprint.old
+share/examples/samba/printing/smbprint.safer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf
diff --git a/net/samba/distinfo b/net/samba/distinfo
index d1686642ade..43bc1eb7727 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.16 2002/02/07 09:57:19 taca Exp $
+$NetBSD: distinfo,v 1.17 2002/05/05 16:57:11 taca Exp $
 
-SHA1 (samba-2.2.3a.tar.gz) = cbcb16419fc83e1b17f97c971d8f41962ff49d5b
-Size (samba-2.2.3a.tar.gz) = 5460531 bytes
-SHA1 (patch-aa) = 10a0f8f0f92b2ceae89eb4307ea5e60b6364b425
-SHA1 (patch-ab) = 92e8d3721ff137d90ae2e2fcf6d5c6820a90273e
+SHA1 (samba-2.2.4.tar.gz) = 0c2613e709f6f89e7986d7a7324263498e5b7d8c
+Size (samba-2.2.4.tar.gz) = 5205845 bytes
+SHA1 (patch-aa) = 8edea648581741845067097a3f82c973cd89a846
+SHA1 (patch-ab) = f2b84b6764cb960dcebd34df83c1b395021bf07a
 SHA1 (patch-ac) = a055bcc69e1a40124ada075ac836d1061ecfcd15
 SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c
 SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa
 SHA1 (patch-ai) = cc31eb9cfb2ee650400c18ceaaa9ec1a3626260f
 SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb
-SHA1 (patch-ak) = 110a676a911867b64bc319fceaf5e1dc1d7ecb26
+SHA1 (patch-ak) = a6f5c68e47f2251f8d697de14f4252c4c5f52f62
 SHA1 (patch-al) = 368c7f88c5538fcaa32d7263ba98d138ba179859
-SHA1 (patch-am) = 82ea8411d7988aa4b49bf98825d368339bbc25ec
-SHA1 (patch-an) = 74ce033913cc6ba19b1d98640a9f1a554286a9d7
-SHA1 (patch-ao) = b1fd0c8c73d88a4d53ca4f0f8b969f0744301ce7
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index b601a7cae1a..7eab2532cfc 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,52 +1,23 @@
-$NetBSD: patch-aa,v 1.17 2002/02/05 00:36:26 taca Exp $
+$NetBSD: patch-aa,v 1.18 2002/05/05 16:57:11 taca Exp $
 
---- configure.in.orig	Sun Feb  3 09:46:35 2002
+--- configure.in.orig	Fri May  3 10:02:46 2002
 +++ configure.in
-@@ -13,13 +13,15 @@
+@@ -13,15 +13,15 @@
      codepagedir="\$(DATADIR)/samba/codepages"
      configdir="${sysconfdir}/samba"
      lockdir="\${VARDIR}/cache/samba"
+-    piddir="\$(VARDIR)/run/samba"
 +    piddir="\$(VARDIR)/run"
      logfilebase="\${VARDIR}/log/samba"
      privatedir="\${CONFIGDIR}/private"
      swatdir="\${DATADIR}/samba/swat",
      codepagedir="\$(LIBDIR)/codepages"
      configdir="\$(LIBDIR)"
-     lockdir="\$(VARDIR)/locks"
 -    logfilebase="\$(VARDIR)"
-+    piddir="\${VARDIR}/run"
 +    logfilebase="\$(VARDIR)/log"
+     lockdir="\${VARDIR}/locks"
+-    piddir="\$(VARDIR)/locks"
++    piddir="\$(VARDIR)/run"
      privatedir="\${prefix}/private"
      swatdir="\${prefix}/swat")
  
-@@ -56,6 +58,22 @@
-   esac])
- 
- #################################################
-+# set pid directory location
-+AC_ARG_WITH(piddir,
-+[  --with-piddir=DIR      Where to put lock files (\${VARDIR}/run)],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-piddir called without argument - will use default])
-+  ;;
-+  * )
-+    piddir="$withval"
-+    ;;
-+  esac])
-+
-+#################################################
- # set SWAT directory location
- AC_ARG_WITH(swatdir,
- [  --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)],
-@@ -123,6 +141,7 @@
- AC_SUBST(configdir)
- AC_SUBST(lockdir)
- AC_SUBST(logfilebase)
-+AC_SUBST(piddir)
- AC_SUBST(privatedir)
- AC_SUBST(swatdir)
- AC_SUBST(bindir)
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index c88fe6eae96..7db57937c10 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,65 +1,24 @@
-$NetBSD: patch-ab,v 1.13 2002/02/05 00:36:26 taca Exp $
+$NetBSD: patch-ab,v 1.14 2002/05/05 16:57:12 taca Exp $
 
---- configure.orig	Sun Feb  3 09:46:35 2002
+--- configure.orig	Fri May  3 10:02:45 2002
 +++ configure
-@@ -19,6 +19,8 @@
- ac_help="$ac_help
-   --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)"
- ac_help="$ac_help
-+  --with-piddir=DIR      Where to put lock files (\${VARDIR}/run)"
-+ac_help="$ac_help
-   --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)"
- ac_help="$ac_help
-   --with-configdir=DIR    Where to put configuration files (\$libdir)"
-@@ -604,6 +606,7 @@
+@@ -1017,16 +1017,16 @@
    codepagedir="\$(DATADIR)/samba/codepages"
      configdir="${sysconfdir}/samba"
      lockdir="\${VARDIR}/cache/samba"
+-    piddir="\$(VARDIR)/run/samba"
 +    piddir="\$(VARDIR)/run"
      logfilebase="\${VARDIR}/log/samba"
      privatedir="\${CONFIGDIR}/private"
      swatdir="\${DATADIR}/samba/swat"
-@@ -611,7 +614,8 @@
+ else
    codepagedir="\$(LIBDIR)/codepages"
      configdir="\$(LIBDIR)"
-     lockdir="\$(VARDIR)/locks"
 -    logfilebase="\$(VARDIR)"
-+    piddir="\${VARDIR}/run"
 +    logfilebase="\$(VARDIR)/log"
+     lockdir="\${VARDIR}/locks"
+-    piddir="\$(VARDIR)/locks"
++    piddir="\$(VARDIR)/run"
      privatedir="\${prefix}/private"
      swatdir="\${prefix}/swat"
- fi
-@@ -656,6 +660,25 @@
- 
- 
- #################################################
-+# set pid directory location
-+# Check whether --with-piddir or --without-piddir was given.
-+if test "${with_piddir+set}" = set; then
-+  withval="$with_piddir"
-+   case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    echo "configure: warning: --with-piddir called without argument - will use default" 1>&2
-+  ;;
-+  * )
-+    piddir="$withval"
-+    ;;
-+  esac
-+fi
-+
-+
-+#################################################
- # set SWAT directory location
- # Check whether --with-swatdir or --without-swatdir was given.
- if test "${with_swatdir+set}" = set; then
-@@ -13167,6 +13190,7 @@
- s%@configdir@%$configdir%g
- s%@lockdir@%$lockdir%g
- s%@logfilebase@%$logfilebase%g
-+s%@piddir@%$piddir%g
- s%@privatedir@%$privatedir%g
- s%@swatdir@%$swatdir%g
- s%@RUNPROG@%$RUNPROG%g
+ fi;
diff --git a/net/samba/patches/patch-ak b/net/samba/patches/patch-ak
index 41cbcf3c0a2..c9f7c7730c8 100644
--- a/net/samba/patches/patch-ak
+++ b/net/samba/patches/patch-ak
@@ -1,13 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2002/02/05 00:36:27 taca Exp $
+$NetBSD: patch-ak,v 1.2 2002/05/05 16:57:12 taca Exp $
 
---- Makefile.in.orig	Sun Feb  3 09:46:05 2002
+--- Makefile.in.orig	Fri May  3 10:02:26 2002
 +++ Makefile.in
-@@ -46,11 +46,11 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--LOGFILEBASE = @logfilebase@
-+LOGFILEBASE = $(VARDIR)/log
+@@ -51,7 +51,7 @@
  CONFIGFILE = $(CONFIGDIR)/smb.conf
  LMHOSTSFILE = $(CONFIGDIR)/lmhosts
  DRIVERFILE = $(CONFIGDIR)/printers.def
@@ -16,22 +11,3 @@ $NetBSD: patch-ak,v 1.1 2002/02/05 00:36:27 taca Exp $
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -63,6 +63,9 @@
- # the directory where lock files go
- LOCKDIR = @lockdir@
- 
-+# the directory where pid files go
-+PIDFILEDIR = /var/run
-+
- # libsmbclient support here
- BLDSHARED = @BLDSHARED@
- LIBSMBCLIENT_MAJOR=0
-@@ -78,7 +81,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
- FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
--FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" 
- FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
- FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
deleted file mode 100644
index 9ea45e24b64..00000000000
--- a/net/samba/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/02/05 00:36:27 taca Exp $
-
---- include/proto.h.orig	Sun Feb  3 09:46:40 2002
-+++ include/proto.h
-@@ -1813,6 +1813,7 @@
- char *lp_deleteprinter_cmd(void);
- char *lp_os2_driver_map(void);
- char *lp_lockdir(void);
-+char *lp_piddir(void);
- char *lp_utmpdir(void);
- char *lp_wtmpdir(void);
- BOOL lp_utmp(void);
diff --git a/net/samba/patches/patch-an b/net/samba/patches/patch-an
deleted file mode 100644
index 9e03fd127d9..00000000000
--- a/net/samba/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/02/05 00:36:27 taca Exp $
-
---- lib/pidfile.c.orig	Sun Feb  3 09:46:42 2002
-+++ lib/pidfile.c
-@@ -37,7 +37,7 @@
- 	unsigned ret;
- 	pstring pidFile;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	fd = sys_open(pidFile, O_NONBLOCK | O_RDONLY, 0644);
- 	if (fd == -1) {
-@@ -78,7 +78,7 @@
- 	pstring pidFile;
- 	pid_t pid;
- 
--	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
-+	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
- 
- 	pid = pidfile_pid(name);
- 	if (pid != 0) {
diff --git a/net/samba/patches/patch-ao b/net/samba/patches/patch-ao
deleted file mode 100644
index b6fd0bfe9e7..00000000000
--- a/net/samba/patches/patch-ao
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/02/05 00:36:27 taca Exp $
-
---- param/loadparm.c.orig	Sun Feb  3 09:46:46 2002
-+++ param/loadparm.c
-@@ -108,6 +108,7 @@
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
- 	char *szLockDir;
-+	char *szPidDir;
- 	char *szRootdir;
- 	char *szDefaultService;
- 	char *szDfree;
-@@ -997,6 +998,8 @@
- 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
- 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
- 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
-+	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
-+	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
- #ifdef WITH_UTMP
- 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
- 	{"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, 0},
-@@ -1231,6 +1234,7 @@
- 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
- 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
- 	string_set(&Globals.szLockDir, LOCKDIR);
-+	string_set(&Globals.szPidDir, PIDFILEDIR);
- #ifdef WITH_UTMP
- 	string_set(&Globals.szUtmpDir, "");
- 	string_set(&Globals.szWtmpDir, "");
-@@ -1481,6 +1485,7 @@
- FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
- FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
- FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
- #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)