Fixup passdb stuff to add new nisplus and ldap backends.

Jeremy.
(This used to be commit 611bf806d569b70edabbc04a2f5408142370a550)

4 files changed, 845 insertions, 708 deletions

diff --git a/source3/po/Makefile.in b/source3/po/Makefile.in
index 8484546594..f24aaba1f8 100644
--- a/source3/po/Makefile.in
+++ b/source3/po/Makefile.in
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in.in by configure.
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
@@ -6,54 +7,53 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-PACKAGE = @PACKAGE@
+PACKAGE = i18n_swat
 VERSION = @VERSION@
 
 SHELL = /bin/sh
-@SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
 
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+srcdir = .
+top_srcdir = ..
+
+prefix = /usr/local/samba
+exec_prefix = ${prefix}
+datadir = $(prefix)/share
 localedir = $(datadir)/locale
 gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po
 
-INSTALL = @INSTALL@
-INSTALL_DATA = sh @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/script/@MKINSTALLDIRS@
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = $(SHELL) ${INSTALL} -m 644
+MKINSTALLDIRS = $(top_srcdir)/script/./mkinstalldirs
 
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
+CC = gcc
+GENCAT = 
+GMSGFMT = PATH=../src:$$PATH /usr/bin/msgfmt
+MSGFMT = /usr/bin/msgfmt
+XGETTEXT = PATH=../src:$$PATH /usr/bin/xgettext
 MSGMERGE = PATH=../src:$$PATH msgmerge
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+DEFS = -DHAVE_CONFIG_H
+CFLAGS = -O 
+CPPFLAGS = 
 
 INCLUDES = -I.. -I$(top_srcdir)/intl -I$(top_srcdir)/include
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
 SOURCES = cat-id-tbl.c
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in POTFILES.in $(PACKAGE).pot \
+POFILES =  en.po ja.po pl.po tr.po
+GMOFILES =  en.gmo ja.gmo pl.gmo tr.gmo
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
 stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
 
 POTFILES = \
 
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
+CATALOGS =  en.gmo ja.gmo pl.gmo tr.gmo
+CATOBJEXT = .gmo
+INSTOBJEXT = .mo
 
 .SUFFIXES:
 .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
@@ -79,16 +79,16 @@ INSTOBJEXT = @INSTOBJEXT@
 	rm -f $@ && $(GENCAT) $@ $*.msg
 
 
-all: all-@USE_NLS@
+all: all-yes
 
 all-yes: cat-id-tbl.c $(CATALOGS)
 all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	@$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in \
-	@&& test ! -f $(PACKAGE).po \
+	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
 
@@ -109,7 +109,7 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
 
 install: install-exec install-data
 install-exec:
-install-data: install-data-@USE_NLS@
+install-data: install-data-yes
 install-data-no: all
 install-data-yes: all install-data-basic
 install-data-basic:
@@ -160,8 +160,8 @@ install-data-basic:
 	  else \
 	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in \
-			  $(gettextsrcdir)/Makefile.in; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -179,7 +179,7 @@ uninstall:
 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
-	rm -f $(gettextsrcdir)/po-Makefile.in
+	rm -f $(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
@@ -242,7 +242,7 @@ POTFILES: POTFILES.in
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
 
-Makefile: Makefile.in ../config.status POTFILES
+Makefile: Makefile.in.in ../config.status POTFILES
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
diff --git a/source3/po/cat-id-tbl.c b/source3/po/cat-id-tbl.c
index 33b8b13215..05129f2989 100644
--- a/source3/po/cat-id-tbl.c
+++ b/source3/po/cat-id-tbl.c
@@ -222,212 +222,211 @@ const struct _msg_ent _msg_tbl[] = {
   {"read bmpx", 213},
   {"read raw", 214},
   {"write raw", 215},
-  {"nt smb support", 216},
-  {"nt pipe support", 217},
-  {"nt acl support", 218},
-  {"announce version", 219},
-  {"announce as", 220},
-  {"max mux", 221},
-  {"max xmit", 222},
-  {"name resolve order", 223},
-  {"max packet", 224},
-  {"packet size", 225},
-  {"max ttl", 226},
-  {"max wins ttl", 227},
-  {"min wins ttl", 228},
-  {"time server", 229},
-  {"Tuning Options", 230},
-  {"change notify timeout", 231},
-  {"deadtime", 232},
-  {"getwd cache", 233},
-  {"keepalive", 234},
-  {"lpq cache time", 235},
-  {"max smbd processes", 236},
-  {"max connections", 237},
-  {"paranoid server security", 238},
-  {"max disk size", 239},
-  {"max open files", 240},
-  {"min print space", 241},
-  {"read size", 242},
-  {"socket options", 243},
-  {"stat cache size", 244},
-  {"strict allocate", 245},
-  {"strict sync", 246},
-  {"sync always", 247},
-  {"use mmap", 248},
-  {"hostname lookups", 249},
-  {"write cache size", 250},
-  {"Printing Options", 251},
-  {"total print jobs", 252},
-  {"max print jobs", 253},
-  {"load printers", 254},
-  {"printcap name", 255},
-  {"printcap", 256},
-  {"printable", 257},
-  {"print ok", 258},
-  {"postscript", 259},
-  {"printing", 260},
-  {"print command", 261},
-  {"disable spoolss", 262},
-  {"lpq command", 263},
-  {"lprm command", 264},
-  {"lppause command", 265},
-  {"lpresume command", 266},
-  {"queuepause command", 267},
-  {"queueresume command", 268},
-  {"enumports command", 269},
-  {"addprinter command", 270},
-  {"deleteprinter command", 271},
-  {"show add printer wizard", 272},
-  {"os2 driver map", 273},
-  {"printer name", 274},
-  {"printer", 275},
-  {"use client driver", 276},
-  {"printer driver", 277},
-  {"printer driver file", 278},
-  {"printer driver location", 279},
-  {"Filename Handling", 280},
-  {"strip dot", 281},
-  {"mangled stack", 282},
-  {"default case", 283},
-  {"case sensitive", 284},
-  {"casesignames", 285},
-  {"preserve case", 286},
-  {"short preserve case", 287},
-  {"mangle case", 288},
-  {"mangling char", 289},
-  {"hide dot files", 290},
-  {"hide unreadable", 291},
-  {"delete veto files", 292},
-  {"veto files", 293},
-  {"hide files", 294},
-  {"veto oplock files", 295},
-  {"map system", 296},
-  {"map hidden", 297},
-  {"map archive", 298},
-  {"mangled names", 299},
-  {"mangled map", 300},
-  {"stat cache", 301},
-  {"Domain Options", 302},
-  {"domain admin group", 303},
-  {"domain guest group", 304},
-  {"groupname map", 305},
-  {"machine password timeout", 306},
-  {"Logon Options", 307},
-  {"add user script", 308},
-  {"delete user script", 309},
-  {"add group script", 310},
-  {"delete group script", 311},
-  {"add user to group script", 312},
-  {"delete user from group script", 313},
-  {"add machine script", 314},
-  {"shutdown script", 315},
-  {"abort shutdown script", 316},
-  {"logon script", 317},
-  {"logon path", 318},
-  {"logon drive", 319},
-  {"logon home", 320},
-  {"domain logons", 321},
-  {"Browse Options", 322},
-  {"os level", 323},
-  {"lm announce", 324},
-  {"lm interval", 325},
-  {"preferred master", 326},
-  {"prefered master", 327},
-  {"local master", 328},
-  {"domain master", 329},
-  {"browse list", 330},
-  {"browseable", 331},
-  {"browsable", 332},
-  {"enhanced browsing", 333},
-  {"WINS Options", 334},
-  {"dns proxy", 335},
-  {"wins proxy", 336},
-  {"wins server", 337},
-  {"wins support", 338},
-  {"wins hook", 339},
-  {"Locking Options", 340},
-  {"blocking locks", 341},
-  {"fake oplocks", 342},
-  {"kernel oplocks", 343},
-  {"locking", 344},
-  {"oplocks", 345},
-  {"level2 oplocks", 346},
-  {"oplock break wait time", 347},
-  {"oplock contention limit", 348},
-  {"posix locking", 349},
-  {"strict locking", 350},
-  {"share modes", 351},
-  {"Ldap Options", 352},
-  {"ldap server", 353},
-  {"ldap port", 354},
-  {"ldap suffix", 355},
-  {"ldap filter", 356},
-  {"ldap root", 357},
-  {"ldap root passwd", 358},
-  {"Miscellaneous Options", 359},
-  {"add share command", 360},
-  {"change share command", 361},
-  {"delete share command", 362},
-  {"config file", 363},
-  {"preload", 364},
-  {"auto services", 365},
-  {"lock dir", 366},
-  {"lock directory", 367},
-  {"utmp directory", 368},
-  {"wtmp directory", 369},
-  {"utmp", 370},
-  {"default service", 371},
-  {"default", 372},
-  {"message command", 373},
-  {"dfree command", 374},
-  {"remote announce", 375},
-  {"remote browse sync", 376},
-  {"socket address", 377},
-  {"homedir map", 378},
-  {"time offset", 379},
-  {"NIS homedir", 380},
-  {"-valid", 381},
-  {"copy", 382},
-  {"include", 383},
-  {"exec", 384},
-  {"preexec", 385},
-  {"preexec close", 386},
-  {"postexec", 387},
-  {"root preexec", 388},
-  {"root preexec close", 389},
-  {"root postexec", 390},
-  {"available", 391},
-  {"volume", 392},
-  {"fstype", 393},
-  {"set directory", 394},
-  {"source environment", 395},
-  {"wide links", 396},
-  {"follow symlinks", 397},
-  {"dont descend", 398},
-  {"magic script", 399},
-  {"magic output", 400},
-  {"delete readonly", 401},
-  {"dos filemode", 402},
-  {"dos filetimes", 403},
-  {"dos filetime resolution", 404},
-  {"fake directory create times", 405},
-  {"panic action", 406},
-  {"hide local users", 407},
-  {"VFS options", 408},
-  {"vfs object", 409},
-  {"vfs options", 410},
-  {"msdfs root", 411},
-  {"host msdfs", 412},
-  {"Winbind options", 413},
-  {"winbind uid", 414},
-  {"winbind gid", 415},
-  {"template homedir", 416},
-  {"template shell", 417},
-  {"winbind separator", 418},
-  {"winbind cache time", 419},
-  {"winbind enum users", 420},
-  {"winbind enum groups", 421},
+  {"nt pipe support", 216},
+  {"nt acl support", 217},
+  {"announce version", 218},
+  {"announce as", 219},
+  {"max mux", 220},
+  {"max xmit", 221},
+  {"name resolve order", 222},
+  {"max packet", 223},
+  {"packet size", 224},
+  {"max ttl", 225},
+  {"max wins ttl", 226},
+  {"min wins ttl", 227},
+  {"time server", 228},
+  {"Tuning Options", 229},
+  {"change notify timeout", 230},
+  {"deadtime", 231},
+  {"getwd cache", 232},
+  {"keepalive", 233},
+  {"lpq cache time", 234},
+  {"max smbd processes", 235},
+  {"max connections", 236},
+  {"paranoid server security", 237},
+  {"max disk size", 238},
+  {"max open files", 239},
+  {"min print space", 240},
+  {"read size", 241},
+  {"socket options", 242},
+  {"stat cache size", 243},
+  {"strict allocate", 244},
+  {"strict sync", 245},
+  {"sync always", 246},
+  {"use mmap", 247},
+  {"hostname lookups", 248},
+  {"write cache size", 249},
+  {"Printing Options", 250},
+  {"total print jobs", 251},
+  {"max print jobs", 252},
+  {"load printers", 253},
+  {"printcap name", 254},
+  {"printcap", 255},
+  {"printable", 256},
+  {"print ok", 257},
+  {"postscript", 258},
+  {"printing", 259},
+  {"print command", 260},
+  {"disable spoolss", 261},
+  {"lpq command", 262},
+  {"lprm command", 263},
+  {"lppause command", 264},
+  {"lpresume command", 265},
+  {"queuepause command", 266},
+  {"queueresume command", 267},
+  {"enumports command", 268},
+  {"addprinter command", 269},
+  {"deleteprinter command", 270},
+  {"show add printer wizard", 271},
+  {"os2 driver map", 272},
+  {"printer name", 273},
+  {"printer", 274},
+  {"use client driver", 275},
+  {"printer driver", 276},
+  {"printer driver file", 277},
+  {"printer driver location", 278},
+  {"Filename Handling", 279},
+  {"strip dot", 280},
+  {"mangled stack", 281},
+  {"default case", 282},
+  {"case sensitive", 283},
+  {"casesignames", 284},
+  {"preserve case", 285},
+  {"short preserve case", 286},
+  {"mangle case", 287},
+  {"mangling char", 288},
+  {"hide dot files", 289},
+  {"hide unreadable", 290},
+  {"delete veto files", 291},
+  {"veto files", 292},
+  {"hide files", 293},
+  {"veto oplock files", 294},
+  {"map system", 295},
+  {"map hidden", 296},
+  {"map archive", 297},
+  {"mangled names", 298},
+  {"mangled map", 299},
+  {"stat cache", 300},
+  {"Domain Options", 301},
+  {"domain admin group", 302},
+  {"domain guest group", 303},
+  {"groupname map", 304},
+  {"machine password timeout", 305},
+  {"Logon Options", 306},
+  {"add user script", 307},
+  {"delete user script", 308},
+  {"add group script", 309},
+  {"delete group script", 310},
+  {"add user to group script", 311},
+  {"delete user from group script", 312},
+  {"add machine script", 313},
+  {"shutdown script", 314},
+  {"abort shutdown script", 315},
+  {"logon script", 316},
+  {"logon path", 317},
+  {"logon drive", 318},
+  {"logon home", 319},
+  {"domain logons", 320},
+  {"Browse Options", 321},
+  {"os level", 322},
+  {"lm announce", 323},
+  {"lm interval", 324},
+  {"preferred master", 325},
+  {"prefered master", 326},
+  {"local master", 327},
+  {"domain master", 328},
+  {"browse list", 329},
+  {"browseable", 330},
+  {"browsable", 331},
+  {"enhanced browsing", 332},
+  {"WINS Options", 333},
+  {"dns proxy", 334},
+  {"wins proxy", 335},
+  {"wins server", 336},
+  {"wins support", 337},
+  {"wins hook", 338},
+  {"Locking Options", 339},
+  {"blocking locks", 340},
+  {"fake oplocks", 341},
+  {"kernel oplocks", 342},
+  {"locking", 343},
+  {"oplocks", 344},
+  {"level2 oplocks", 345},
+  {"oplock break wait time", 346},
+  {"oplock contention limit", 347},
+  {"posix locking", 348},
+  {"strict locking", 349},
+  {"share modes", 350},
+  {"Ldap Options", 351},
+  {"ldap server", 352},
+  {"ldap port", 353},
+  {"ldap suffix", 354},
+  {"ldap filter", 355},
+  {"ldap root", 356},
+  {"ldap root passwd", 357},
+  {"Miscellaneous Options", 358},
+  {"add share command", 359},
+  {"change share command", 360},
+  {"delete share command", 361},
+  {"config file", 362},
+  {"preload", 363},
+  {"auto services", 364},
+  {"lock dir", 365},
+  {"lock directory", 366},
+  {"utmp directory", 367},
+  {"wtmp directory", 368},
+  {"utmp", 369},
+  {"default service", 370},
+  {"default", 371},
+  {"message command", 372},
+  {"dfree command", 373},
+  {"remote announce", 374},
+  {"remote browse sync", 375},
+  {"socket address", 376},
+  {"homedir map", 377},
+  {"time offset", 378},
+  {"NIS homedir", 379},
+  {"-valid", 380},
+  {"copy", 381},
+  {"include", 382},
+  {"exec", 383},
+  {"preexec", 384},
+  {"preexec close", 385},
+  {"postexec", 386},
+  {"root preexec", 387},
+  {"root preexec close", 388},
+  {"root postexec", 389},
+  {"available", 390},
+  {"volume", 391},
+  {"fstype", 392},
+  {"set directory", 393},
+  {"source environment", 394},
+  {"wide links", 395},
+  {"follow symlinks", 396},
+  {"dont descend", 397},
+  {"magic script", 398},
+  {"magic output", 399},
+  {"delete readonly", 400},
+  {"dos filemode", 401},
+  {"dos filetimes", 402},
+  {"dos filetime resolution", 403},
+  {"fake directory create times", 404},
+  {"panic action", 405},
+  {"hide local users", 406},
+  {"VFS options", 407},
+  {"vfs object", 408},
+  {"vfs options", 409},
+  {"msdfs root", 410},
+  {"host msdfs", 411},
+  {"Winbind options", 412},
+  {"winbind uid", 413},
+  {"winbind gid", 414},
+  {"template homedir", 415},
+  {"template shell", 416},
+  {"winbind separator", 417},
+  {"winbind cache time", 418},
+  {"winbind enum users", 419},
+  {"winbind enum groups", 420},
 };
 
-int _msg_tbl_length = 421;
+int _msg_tbl_length = 420;
diff --git a/source3/po/i18n_swat.pot b/source3/po/i18n_swat.pot
index ad07acc744..9c8c41a759 100644
--- a/source3/po/i18n_swat.pot
+++ b/source3/po/i18n_swat.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-06-09 13:08+0900\n"
+"POT-Creation-Date: 2001-09-25 13:07-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,1543 +19,1681 @@ msgstr ""
 msgid "ERROR: Can't open %s\n"
 msgstr ""
 
-#: web/swat.c:208
+#: web/swat.c:204
 msgid "Help"
 msgstr ""
 
-#: web/swat.c:215 web/swat.c:223 web/swat.c:231 web/swat.c:240 web/swat.c:249
-#: web/swat.c:255 web/swat.c:261 web/swat.c:271
+#: web/swat.c:210 web/swat.c:224 web/swat.c:239 web/swat.c:247 web/swat.c:256
+#: web/swat.c:265 web/swat.c:271 web/swat.c:277 web/swat.c:290
 msgid "Set Default"
 msgstr ""
 
-#: web/swat.c:387
-#, c-format
-msgid "failed to open %s for writing\n"
-msgstr ""
-
-#: web/swat.c:399
-#, c-format
-msgid "Can't reload %s\n"
-msgstr ""
-
-#: web/swat.c:478
+#: web/swat.c:493
 #, c-format
 msgid "Logged in as <b>%s</b><p>\n"
 msgstr ""
 
-#: web/swat.c:481
+#: web/swat.c:496
 msgid "Home"
 msgstr ""
 
-#: web/swat.c:483
+#: web/swat.c:498
 msgid "Globals"
 msgstr ""
 
-#: web/swat.c:484
+#: web/swat.c:499
 msgid "Shares"
 msgstr ""
 
-#: web/swat.c:485
+#: web/swat.c:500
 msgid "Printers"
 msgstr ""
 
-#: web/swat.c:488
+#: web/swat.c:503
 msgid "Status"
 msgstr ""
 
-#: web/swat.c:489
+#: web/swat.c:504
 msgid "View Config"
 msgstr ""
 
-#: web/swat.c:491
+#: web/swat.c:506
 msgid "Password Management"
 msgstr ""
 
-#: web/swat.c:515
+#: web/swat.c:530
 msgid "Current Config"
 msgstr ""
 
-#: web/swat.c:519
+#: web/swat.c:534
 msgid "Normal View"
 msgstr ""
 
-#: web/swat.c:521
+#: web/swat.c:536
 msgid "Full View"
 msgstr ""
 
-#: web/swat.c:537
+#: web/swat.c:552
 msgid "Global Variables"
 msgstr ""
 
-#: web/swat.c:551 web/swat.c:651 web/swat.c:998
+#: web/swat.c:566 web/swat.c:662 web/swat.c:1004
 msgid "Commit Changes"
 msgstr ""
 
-#: web/swat.c:555 web/swat.c:654 web/swat.c:1000
+#: web/swat.c:570 web/swat.c:665 web/swat.c:1006
 msgid "Reset Values"
 msgstr ""
 
-#: web/swat.c:557 web/swat.c:656 web/swat.c:1002
+#: web/swat.c:572 web/swat.c:667 web/swat.c:1008
 msgid "Advanced View"
 msgstr ""
 
-#: web/swat.c:559 web/swat.c:658 web/swat.c:1004
+#: web/swat.c:574 web/swat.c:669 web/swat.c:1010
 msgid "Basic View"
 msgstr ""
 
-#: web/swat.c:588
+#: web/swat.c:604
 msgid "Share Parameters"
 msgstr ""
 
-#: web/swat.c:622
+#: web/swat.c:633
 msgid "Choose Share"
 msgstr ""
 
-#: web/swat.c:636
+#: web/swat.c:647
 msgid "Delete Share"
 msgstr ""
 
-#: web/swat.c:643
+#: web/swat.c:654
 msgid "Create Share"
 msgstr ""
 
-#: web/swat.c:688
+#: web/swat.c:699
 msgid "password change in demo mode rejected\n"
 msgstr ""
 
-#: web/swat.c:701
-msgid "Can't setup password database vectors.\n"
-msgstr ""
-
-#: web/swat.c:727
+#: web/swat.c:738
 msgid " Must specify \"User Name\" \n"
 msgstr ""
 
-#: web/swat.c:743
+#: web/swat.c:754
 msgid " Must specify \"Old Password\" \n"
 msgstr ""
 
-#: web/swat.c:749
+#: web/swat.c:760
 msgid " Must specify \"Remote Machine\" \n"
 msgstr ""
 
-#: web/swat.c:756
+#: web/swat.c:767
 msgid " Must specify \"New, and Re-typed Passwords\" \n"
 msgstr ""
 
-#: web/swat.c:762
+#: web/swat.c:773
 msgid " Re-typed password didn't match new password\n"
 msgstr ""
 
-#: web/swat.c:792
+#: web/swat.c:803
 #, c-format
 msgid " The passwd for '%s' has been changed. \n"
 msgstr ""
 
-#: web/swat.c:794
+#: web/swat.c:805
 #, c-format
 msgid " The passwd for '%s' has NOT been changed. \n"
 msgstr ""
 
-#: web/swat.c:818
+#: web/swat.c:829
 msgid "Server Password Management"
 msgstr ""
 
 #.
 #. * Create all the dialog boxes for data collection
 #.
-#: web/swat.c:827 web/swat.c:874
+#: web/swat.c:838 web/swat.c:885
 msgid " User Name : "
 msgstr ""
 
-#: web/swat.c:830 web/swat.c:876
+#: web/swat.c:841 web/swat.c:887
 msgid " Old Password : "
 msgstr ""
 
-#: web/swat.c:833 web/swat.c:878
+#: web/swat.c:844 web/swat.c:889
 msgid " New Password : "
 msgstr ""
 
-#: web/swat.c:835 web/swat.c:880
+#: web/swat.c:846 web/swat.c:891
 msgid " Re-type New Password : "
 msgstr ""
 
-#: web/swat.c:843 web/swat.c:891
+#: web/swat.c:854 web/swat.c:902
 msgid "Change Password"
 msgstr ""
 
-#: web/swat.c:846
+#: web/swat.c:857
 msgid "Add New User"
 msgstr ""
 
-#: web/swat.c:848
+#: web/swat.c:859
 msgid "Delete User"
 msgstr ""
 
-#: web/swat.c:850
+#: web/swat.c:861
 msgid "Disable User"
 msgstr ""
 
-#: web/swat.c:852
+#: web/swat.c:863
 msgid "Enable User"
 msgstr ""
 
-#: web/swat.c:865
+#: web/swat.c:876
 msgid "Client/Server Password Management"
 msgstr ""
 
-#: web/swat.c:882
+#: web/swat.c:893
 msgid " Remote Machine : "
 msgstr ""
 
-#: web/swat.c:920
+#: web/swat.c:931
 msgid "Printer Parameters"
 msgstr ""
 
-#: web/swat.c:922
+#: web/swat.c:933
 msgid "Important Note:"
 msgstr ""
 
-#: web/swat.c:923
+#: web/swat.c:934
 msgid "Printer names marked with [*] in the Choose Printer drop-down box "
 msgstr ""
 
-#: web/swat.c:924
+#: web/swat.c:935
 msgid "are autoloaded printers from "
 msgstr ""
 
-#: web/swat.c:925
+#: web/swat.c:936
 msgid "Printcap Name"
 msgstr ""
 
-#: web/swat.c:926
+#: web/swat.c:937
 msgid "Attempting to delete these printers from SWAT will have no effect.\n"
 msgstr ""
 
-#: web/swat.c:964
+#: web/swat.c:970
 msgid "Choose Printer"
 msgstr ""
 
-#: web/swat.c:983
+#: web/swat.c:989
 msgid "Delete Printer"
 msgstr ""
 
-#: web/swat.c:990
+#: web/swat.c:996
 msgid "Create Printer"
 msgstr ""
 
-#: web/statuspage.c:38
+#: web/statuspage.c:40
 msgid "DENY_NONE"
 msgstr ""
 
-#: web/statuspage.c:39
+#: web/statuspage.c:41
 msgid "DENY_ALL   "
 msgstr ""
 
-#: web/statuspage.c:40
+#: web/statuspage.c:42
 msgid "DENY_DOS   "
 msgstr ""
 
-#: web/statuspage.c:41
+#: web/statuspage.c:43
 msgid "DENY_READ  "
 msgstr ""
 
-#: web/statuspage.c:42
+#: web/statuspage.c:44
 msgid "DENY_WRITE "
 msgstr ""
 
-#: web/statuspage.c:48
+#: web/statuspage.c:50
 msgid "RDONLY     "
 msgstr ""
 
-#: web/statuspage.c:49
+#: web/statuspage.c:51
 msgid "WRONLY     "
 msgstr ""
 
-#: web/statuspage.c:50
+#: web/statuspage.c:52
 msgid "RDWR       "
 msgstr ""
 
-#: web/statuspage.c:58
+#: web/statuspage.c:60
 msgid "EXCLUSIVE+BATCH "
 msgstr ""
 
-#: web/statuspage.c:60
+#: web/statuspage.c:62
 msgid "EXCLUSIVE       "
 msgstr ""
 
-#: web/statuspage.c:62
+#: web/statuspage.c:64
 msgid "BATCH           "
 msgstr ""
 
-#: web/statuspage.c:64
+#: web/statuspage.c:66
 msgid "LEVEL_II        "
 msgstr ""
 
-#: web/statuspage.c:66
+#: web/statuspage.c:68
 msgid "NONE            "
 msgstr ""
 
-#: web/statuspage.c:146
+#: web/statuspage.c:194
 msgid "Server Status"
 msgstr ""
 
-#: web/statuspage.c:151
+#: web/statuspage.c:199
 msgid "Auto Refresh"
 msgstr ""
 
-#: web/statuspage.c:152 web/statuspage.c:157
+#: web/statuspage.c:200 web/statuspage.c:205
 msgid "Refresh Interval: "
 msgstr ""
 
-#: web/statuspage.c:156
+#: web/statuspage.c:204
 msgid "Stop Refreshing"
 msgstr ""
 
-#: web/statuspage.c:168
-msgid "You need to have status=yes in your smb config file\n"
-msgstr ""
-
-#: web/statuspage.c:174
+#: web/statuspage.c:219
 msgid "version:"
 msgstr ""
 
-#: web/statuspage.c:177
+#: web/statuspage.c:222
 msgid "smbd:"
 msgstr ""
 
-#: web/statuspage.c:177 web/statuspage.c:189
+#: web/statuspage.c:222 web/statuspage.c:234
 msgid "running"
 msgstr ""
 
-#: web/statuspage.c:177 web/statuspage.c:189
+#: web/statuspage.c:222 web/statuspage.c:234
 msgid "not running"
 msgstr ""
 
-#: web/statuspage.c:180
+#: web/statuspage.c:225
 msgid "Stop smbd"
 msgstr ""
 
-#: web/statuspage.c:182
+#: web/statuspage.c:227
 msgid "Start smbd"
 msgstr ""
 
-#: web/statuspage.c:184
+#: web/statuspage.c:229
 msgid "Restart smbd"
 msgstr ""
 
-#: web/statuspage.c:189
+#: web/statuspage.c:234
 msgid "nmbd:"
 msgstr ""
 
-#: web/statuspage.c:192
+#: web/statuspage.c:237
 msgid "Stop nmbd"
 msgstr ""
 
-#: web/statuspage.c:194
+#: web/statuspage.c:239
 msgid "Start nmbd"
 msgstr ""
 
-#: web/statuspage.c:196
+#: web/statuspage.c:241
 msgid "Restart nmbd"
 msgstr ""
 
-#: web/statuspage.c:203
+#: web/statuspage.c:248
 msgid "Active Connections"
 msgstr ""
 
-#: web/statuspage.c:205 web/statuspage.c:236 web/statuspage.c:256
+#: web/statuspage.c:250 web/statuspage.c:263 web/statuspage.c:271
 msgid "PID"
 msgstr ""
 
-#: web/statuspage.c:205 web/statuspage.c:236
+#: web/statuspage.c:250 web/statuspage.c:263
 msgid "Client"
 msgstr ""
 
-#: web/statuspage.c:205
+#: web/statuspage.c:250
 msgid "IP address"
 msgstr ""
 
-#: web/statuspage.c:205 web/statuspage.c:236 web/statuspage.c:256
+#: web/statuspage.c:250 web/statuspage.c:263 web/statuspage.c:271
 msgid "Date"
 msgstr ""
 
-#: web/statuspage.c:207
+#: web/statuspage.c:252
 msgid "Kill"
 msgstr ""
 
-#: web/statuspage.c:233
+#: web/statuspage.c:260
 msgid "Active Shares"
 msgstr ""
 
-#: web/statuspage.c:236
+#: web/statuspage.c:263
 msgid "Share"
 msgstr ""
 
-#: web/statuspage.c:236
+#: web/statuspage.c:263
 msgid "User"
 msgstr ""
 
-#: web/statuspage.c:236
+#: web/statuspage.c:263
 msgid "Group"
 msgstr ""
 
-#: web/statuspage.c:254
+#: web/statuspage.c:269
 msgid "Open Files"
 msgstr ""
 
-#: web/statuspage.c:256
+#: web/statuspage.c:271
 msgid "Sharing"
 msgstr ""
 
-#: web/statuspage.c:256
+#: web/statuspage.c:271
 msgid "R/W"
 msgstr ""
 
-#: web/statuspage.c:256
+#: web/statuspage.c:271
 msgid "Oplock"
 msgstr ""
 
-#: web/statuspage.c:256
+#: web/statuspage.c:271
 msgid "File"
 msgstr ""
 
-#: param/loadparm.c:571
+#: param/loadparm.c:641
 msgid "Base Options"
 msgstr ""
 
-#: param/loadparm.c:572
-msgid "coding system"
+#: param/loadparm.c:643
+msgid "dos charset"
 msgstr ""
 
-#: param/loadparm.c:573
-msgid "client code page"
+#: param/loadparm.c:644
+msgid "unix charset"
 msgstr ""
 
-#: param/loadparm.c:574
+#: param/loadparm.c:645
+msgid "display charset"
+msgstr ""
+
+#: param/loadparm.c:646
 msgid "comment"
 msgstr ""
 
-#: param/loadparm.c:575
+#: param/loadparm.c:647
 msgid "path"
 msgstr ""
 
-#: param/loadparm.c:576
+#: param/loadparm.c:648
 msgid "directory"
 msgstr ""
 
-#: param/loadparm.c:577
+#: param/loadparm.c:649
 msgid "workgroup"
 msgstr ""
 
-#: param/loadparm.c:578
+#: param/loadparm.c:650
 msgid "netbios name"
 msgstr ""
 
-#: param/loadparm.c:579
+#: param/loadparm.c:651
 msgid "netbios aliases"
 msgstr ""
 
-#: param/loadparm.c:580
+#: param/loadparm.c:652
 msgid "netbios scope"
 msgstr ""
 
-#: param/loadparm.c:581
+#: param/loadparm.c:653
 msgid "server string"
 msgstr ""
 
-#: param/loadparm.c:582
+#: param/loadparm.c:654
 msgid "interfaces"
 msgstr ""
 
-#: param/loadparm.c:583
+#: param/loadparm.c:655
 msgid "bind interfaces only"
 msgstr ""
 
-#: param/loadparm.c:585
+#: param/loadparm.c:657
 msgid "Security Options"
 msgstr ""
 
-#: param/loadparm.c:586
+#: param/loadparm.c:659
 msgid "security"
 msgstr ""
 
-#: param/loadparm.c:587
+#: param/loadparm.c:660
 msgid "encrypt passwords"
 msgstr ""
 
-#: param/loadparm.c:588
+#: param/loadparm.c:661
 msgid "update encrypted"
 msgstr ""
 
-#: param/loadparm.c:589
+#: param/loadparm.c:662
 msgid "allow trusted domains"
 msgstr ""
 
-#: param/loadparm.c:590
+#: param/loadparm.c:663
 msgid "alternate permissions"
 msgstr ""
 
-#: param/loadparm.c:591
+#: param/loadparm.c:664
 msgid "hosts equiv"
 msgstr ""
 
-#: param/loadparm.c:592
-msgid "min password length"
+#: param/loadparm.c:665
+msgid "min passwd length"
 msgstr ""
 
-#: param/loadparm.c:593
-msgid "min passwd length"
+#: param/loadparm.c:666
+msgid "min password length"
 msgstr ""
 
-#: param/loadparm.c:594
+#: param/loadparm.c:667
 msgid "map to guest"
 msgstr ""
 
-#: param/loadparm.c:595
+#: param/loadparm.c:668
 msgid "null passwords"
 msgstr ""
 
-#: param/loadparm.c:596
+#: param/loadparm.c:669
+msgid "obey pam restrictions"
+msgstr ""
+
+#: param/loadparm.c:670
 msgid "password server"
 msgstr ""
 
-#: param/loadparm.c:597
+#: param/loadparm.c:671
 msgid "smb passwd file"
 msgstr ""
 
-#: param/loadparm.c:598
+#: param/loadparm.c:672
+msgid "private dir"
+msgstr ""
+
+#: param/loadparm.c:673
+msgid "passdb module path"
+msgstr ""
+
+#: param/loadparm.c:674
 msgid "root directory"
 msgstr ""
 
-#: param/loadparm.c:599
+#: param/loadparm.c:675
 msgid "root dir"
 msgstr ""
 
-#: param/loadparm.c:600
+#: param/loadparm.c:676
 msgid "root"
 msgstr ""
 
-#: param/loadparm.c:601
+#: param/loadparm.c:678
+msgid "pam password change"
+msgstr ""
+
+#: param/loadparm.c:679
 msgid "passwd program"
 msgstr ""
 
-#: param/loadparm.c:602
+#: param/loadparm.c:680
 msgid "passwd chat"
 msgstr ""
 
-#: param/loadparm.c:603
+#: param/loadparm.c:681
 msgid "passwd chat debug"
 msgstr ""
 
-#: param/loadparm.c:604
+#: param/loadparm.c:682
 msgid "username map"
 msgstr ""
 
-#: param/loadparm.c:605
+#: param/loadparm.c:683
 msgid "password level"
 msgstr ""
 
-#: param/loadparm.c:606
+#: param/loadparm.c:684
 msgid "username level"
 msgstr ""
 
-#: param/loadparm.c:607
+#: param/loadparm.c:685
 msgid "unix password sync"
 msgstr ""
 
-#: param/loadparm.c:608
+#: param/loadparm.c:686
 msgid "restrict anonymous"
 msgstr ""
 
-#: param/loadparm.c:609
-msgid "revalidate"
+#: param/loadparm.c:687
+msgid "lanman auth"
+msgstr ""
+
+#: param/loadparm.c:688
+msgid "ntlm auth"
+msgstr ""
+
+#: param/loadparm.c:689
+msgid "plaintext to smbpasswd"
 msgstr ""
 
-#: param/loadparm.c:610
+#: param/loadparm.c:690
 msgid "use rhosts"
 msgstr ""
 
-#: param/loadparm.c:611
+#: param/loadparm.c:692
 msgid "username"
 msgstr ""
 
-#: param/loadparm.c:612
+#: param/loadparm.c:693
 msgid "user"
 msgstr ""
 
-#: param/loadparm.c:613
+#: param/loadparm.c:694
 msgid "users"
 msgstr ""
 
-#: param/loadparm.c:614
+#: param/loadparm.c:696
 msgid "guest account"
 msgstr ""
 
-#: param/loadparm.c:615
+#: param/loadparm.c:697
 msgid "invalid users"
 msgstr ""
 
-#: param/loadparm.c:616
+#: param/loadparm.c:698
 msgid "valid users"
 msgstr ""
 
-#: param/loadparm.c:617
+#: param/loadparm.c:699
 msgid "admin users"
 msgstr ""
 
-#: param/loadparm.c:618
+#: param/loadparm.c:700
 msgid "read list"
 msgstr ""
 
-#: param/loadparm.c:619
+#: param/loadparm.c:701
 msgid "write list"
 msgstr ""
 
-#: param/loadparm.c:620
+#: param/loadparm.c:702
+msgid "printer admin"
+msgstr ""
+
+#: param/loadparm.c:703
 msgid "force user"
 msgstr ""
 
-#: param/loadparm.c:621
+#: param/loadparm.c:704
 msgid "force group"
 msgstr ""
 
-#: param/loadparm.c:622
+#: param/loadparm.c:705
 msgid "group"
 msgstr ""
 
-#: param/loadparm.c:623
-msgid "writeable"
+#: param/loadparm.c:707
+msgid "read only"
 msgstr ""
 
-#: param/loadparm.c:624
+#: param/loadparm.c:708
 msgid "write ok"
 msgstr ""
 
-#: param/loadparm.c:625
-msgid "writable"
+#: param/loadparm.c:709
+msgid "writeable"
 msgstr ""
 
-#: param/loadparm.c:626
-msgid "read only"
+#: param/loadparm.c:710
+msgid "writable"
 msgstr ""
 
-#: param/loadparm.c:627
+#: param/loadparm.c:712
 msgid "create mask"
 msgstr ""
 
-#: param/loadparm.c:628
+#: param/loadparm.c:713
 msgid "create mode"
 msgstr ""
 
-#: param/loadparm.c:629
+#: param/loadparm.c:714
 msgid "force create mode"
 msgstr ""
 
-#: param/loadparm.c:630
+#: param/loadparm.c:715
 msgid "security mask"
 msgstr ""
 
-#: param/loadparm.c:631
+#: param/loadparm.c:716
 msgid "force security mode"
 msgstr ""
 
-#: param/loadparm.c:632
+#: param/loadparm.c:717
 msgid "directory mask"
 msgstr ""
 
-#: param/loadparm.c:633
+#: param/loadparm.c:718
 msgid "directory mode"
 msgstr ""
 
-#: param/loadparm.c:634
+#: param/loadparm.c:719
 msgid "force directory mode"
 msgstr ""
 
-#: param/loadparm.c:635
+#: param/loadparm.c:720
 msgid "directory security mask"
 msgstr ""
 
-#: param/loadparm.c:636
+#: param/loadparm.c:721
 msgid "force directory security mode"
 msgstr ""
 
-#: param/loadparm.c:637
+#: param/loadparm.c:722
 msgid "inherit permissions"
 msgstr ""
 
-#: param/loadparm.c:638
+#: param/loadparm.c:723
 msgid "guest only"
 msgstr ""
 
-#: param/loadparm.c:639
+#: param/loadparm.c:724
 msgid "only guest"
 msgstr ""
 
-#: param/loadparm.c:640
+#: param/loadparm.c:726
 msgid "guest ok"
 msgstr ""
 
-#: param/loadparm.c:641
+#: param/loadparm.c:727
 msgid "public"
 msgstr ""
 
-#: param/loadparm.c:642
+#: param/loadparm.c:729
 msgid "only user"
 msgstr ""
 
-#: param/loadparm.c:643
+#: param/loadparm.c:730
 msgid "hosts allow"
 msgstr ""
 
-#: param/loadparm.c:644
+#: param/loadparm.c:731
 msgid "allow hosts"
 msgstr ""
 
-#: param/loadparm.c:645
+#: param/loadparm.c:732
 msgid "hosts deny"
 msgstr ""
 
-#: param/loadparm.c:646
+#: param/loadparm.c:733
 msgid "deny hosts"
 msgstr ""
 
-#: param/loadparm.c:649
+#: param/loadparm.c:736
 msgid "Secure Socket Layer Options"
 msgstr ""
 
-#: param/loadparm.c:650
+#: param/loadparm.c:737
 msgid "ssl"
 msgstr ""
 
-#: param/loadparm.c:651
+#: param/loadparm.c:739
 msgid "ssl hosts"
 msgstr ""
 
-#: param/loadparm.c:652
+#: param/loadparm.c:740
 msgid "ssl hosts resign"
 msgstr ""
 
-#: param/loadparm.c:653
+#: param/loadparm.c:741
 msgid "ssl CA certDir"
 msgstr ""
 
-#: param/loadparm.c:654
+#: param/loadparm.c:742
 msgid "ssl CA certFile"
 msgstr ""
 
-#: param/loadparm.c:655
+#: param/loadparm.c:743
 msgid "ssl server cert"
 msgstr ""
 
-#: param/loadparm.c:656
+#: param/loadparm.c:744
 msgid "ssl server key"
 msgstr ""
 
-#: param/loadparm.c:657
+#: param/loadparm.c:745
 msgid "ssl client cert"
 msgstr ""
 
-#: param/loadparm.c:658
+#: param/loadparm.c:746
 msgid "ssl client key"
 msgstr ""
 
-#: param/loadparm.c:659
+#: param/loadparm.c:747
 msgid "ssl require clientcert"
 msgstr ""
 
-#: param/loadparm.c:660
+#: param/loadparm.c:748
 msgid "ssl require servercert"
 msgstr ""
 
-#: param/loadparm.c:661
+#: param/loadparm.c:749
 msgid "ssl ciphers"
 msgstr ""
 
-#: param/loadparm.c:662
+#: param/loadparm.c:750
 msgid "ssl version"
 msgstr ""
 
-#: param/loadparm.c:663
+#: param/loadparm.c:751
 msgid "ssl compatibility"
 msgstr ""
 
-#: param/loadparm.c:666
+#: param/loadparm.c:754
 msgid "Logging Options"
 msgstr ""
 
-#: param/loadparm.c:667
-msgid "debug level"
+#: param/loadparm.c:755
+msgid "log level"
 msgstr ""
 
-#: param/loadparm.c:668
-msgid "log level"
+#: param/loadparm.c:756
+msgid "debuglevel"
 msgstr ""
 
-#: param/loadparm.c:669
+#: param/loadparm.c:757
 msgid "syslog"
 msgstr ""
 
-#: param/loadparm.c:670
+#: param/loadparm.c:758
 msgid "syslog only"
 msgstr ""
 
-#: param/loadparm.c:671
+#: param/loadparm.c:759
 msgid "log file"
 msgstr ""
 
-#: param/loadparm.c:672
+#: param/loadparm.c:761
 msgid "max log size"
 msgstr ""
 
-#: param/loadparm.c:673
-msgid "debug timestamp"
+#: param/loadparm.c:762
+msgid "timestamp logs"
 msgstr ""
 
-#: param/loadparm.c:674
-msgid "timestamp logs"
+#: param/loadparm.c:763
+msgid "debug timestamp"
 msgstr ""
 
-#: param/loadparm.c:675
+#: param/loadparm.c:764
 msgid "debug hires timestamp"
 msgstr ""
 
-#: param/loadparm.c:676
+#: param/loadparm.c:765
 msgid "debug pid"
 msgstr ""
 
-#: param/loadparm.c:677
+#: param/loadparm.c:766
 msgid "debug uid"
 msgstr ""
 
-#: param/loadparm.c:678
-msgid "status"
-msgstr ""
-
-#: param/loadparm.c:680
+#: param/loadparm.c:768
 msgid "Protocol Options"
 msgstr ""
 
-#: param/loadparm.c:681
+#: param/loadparm.c:770
 msgid "protocol"
 msgstr ""
 
-#: param/loadparm.c:682
+#: param/loadparm.c:771
+msgid "large readwrite"
+msgstr ""
+
+#: param/loadparm.c:772
+msgid "max protocol"
+msgstr ""
+
+#: param/loadparm.c:773
+msgid "min protocol"
+msgstr ""
+
+#: param/loadparm.c:774
+msgid "unicode"
+msgstr ""
+
+#: param/loadparm.c:775
 msgid "read bmpx"
 msgstr ""
 
-#: param/loadparm.c:683
+#: param/loadparm.c:776
 msgid "read raw"
 msgstr ""
 
-#: param/loadparm.c:684
+#: param/loadparm.c:777
 msgid "write raw"
 msgstr ""
 
-#: param/loadparm.c:685
-msgid "nt smb support"
-msgstr ""
-
-#: param/loadparm.c:686
+#: param/loadparm.c:779
 msgid "nt pipe support"
 msgstr ""
 
-#: param/loadparm.c:687
+#: param/loadparm.c:780
 msgid "nt acl support"
 msgstr ""
 
-#: param/loadparm.c:688
+#: param/loadparm.c:781
 msgid "announce version"
 msgstr ""
 
-#: param/loadparm.c:689
+#: param/loadparm.c:782
 msgid "announce as"
 msgstr ""
 
-#: param/loadparm.c:690
+#: param/loadparm.c:783
 msgid "max mux"
 msgstr ""
 
-#: param/loadparm.c:691
+#: param/loadparm.c:784
 msgid "max xmit"
 msgstr ""
 
-#: param/loadparm.c:692
+#: param/loadparm.c:786
 msgid "name resolve order"
 msgstr ""
 
-#: param/loadparm.c:693
-msgid "packet size"
+#: param/loadparm.c:787
+msgid "max packet"
 msgstr ""
 
-#: param/loadparm.c:694
-msgid "max packet"
+#: param/loadparm.c:788
+msgid "packet size"
 msgstr ""
 
-#: param/loadparm.c:695
+#: param/loadparm.c:789
 msgid "max ttl"
 msgstr ""
 
-#: param/loadparm.c:696
+#: param/loadparm.c:790
 msgid "max wins ttl"
 msgstr ""
 
-#: param/loadparm.c:697
+#: param/loadparm.c:791
 msgid "min wins ttl"
 msgstr ""
 
-#: param/loadparm.c:698
+#: param/loadparm.c:792
 msgid "time server"
 msgstr ""
 
-#: param/loadparm.c:700
+#: param/loadparm.c:794
 msgid "Tuning Options"
 msgstr ""
 
-#: param/loadparm.c:701
+#: param/loadparm.c:796
 msgid "change notify timeout"
 msgstr ""
 
-#: param/loadparm.c:702
+#: param/loadparm.c:797
 msgid "deadtime"
 msgstr ""
 
-#: param/loadparm.c:703
+#: param/loadparm.c:798
 msgid "getwd cache"
 msgstr ""
 
-#: param/loadparm.c:704
+#: param/loadparm.c:799
 msgid "keepalive"
 msgstr ""
 
-#: param/loadparm.c:705
+#: param/loadparm.c:801
 msgid "lpq cache time"
 msgstr ""
 
-#: param/loadparm.c:706
+#: param/loadparm.c:802
+msgid "max smbd processes"
+msgstr ""
+
+#: param/loadparm.c:803
 msgid "max connections"
 msgstr ""
 
-#: param/loadparm.c:707
+#: param/loadparm.c:804
+msgid "paranoid server security"
+msgstr ""
+
+#: param/loadparm.c:805
 msgid "max disk size"
 msgstr ""
 
-#: param/loadparm.c:708
+#: param/loadparm.c:806
 msgid "max open files"
 msgstr ""
 
-#: param/loadparm.c:709
+#: param/loadparm.c:807
 msgid "min print space"
 msgstr ""
 
-#: param/loadparm.c:710
-msgid "read prediction"
-msgstr ""
-
-#: param/loadparm.c:711
+#: param/loadparm.c:808
 msgid "read size"
 msgstr ""
 
-#: param/loadparm.c:712
-msgid "shared mem size"
-msgstr ""
-
-#: param/loadparm.c:713
+#: param/loadparm.c:810
 msgid "socket options"
 msgstr ""
 
-#: param/loadparm.c:714
+#: param/loadparm.c:811
 msgid "stat cache size"
 msgstr ""
 
-#: param/loadparm.c:715
+#: param/loadparm.c:812
+msgid "strict allocate"
+msgstr ""
+
+#: param/loadparm.c:813
 msgid "strict sync"
 msgstr ""
 
-#: param/loadparm.c:716
+#: param/loadparm.c:814
 msgid "sync always"
 msgstr ""
 
-#: param/loadparm.c:717
+#: param/loadparm.c:815
+msgid "use mmap"
+msgstr ""
+
+#: param/loadparm.c:816
+msgid "hostname lookups"
+msgstr ""
+
+#: param/loadparm.c:817
 msgid "write cache size"
 msgstr ""
 
-#: param/loadparm.c:719
+#: param/loadparm.c:819
 msgid "Printing Options"
 msgstr ""
 
-#: param/loadparm.c:720
+#: param/loadparm.c:821
+msgid "total print jobs"
+msgstr ""
+
+#: param/loadparm.c:822
+msgid "max print jobs"
+msgstr ""
+
+#: param/loadparm.c:823
 msgid "load printers"
 msgstr ""
 
-#: param/loadparm.c:721
+#: param/loadparm.c:824
 msgid "printcap name"
 msgstr ""
 
-#: param/loadparm.c:722
+#: param/loadparm.c:825
 msgid "printcap"
 msgstr ""
 
-#: param/loadparm.c:723
-msgid "printer driver file"
-msgstr ""
-
-#: param/loadparm.c:724
+#: param/loadparm.c:826
 msgid "printable"
 msgstr ""
 
-#: param/loadparm.c:725
+#: param/loadparm.c:827
 msgid "print ok"
 msgstr ""
 
-#: param/loadparm.c:726
+#: param/loadparm.c:828
 msgid "postscript"
 msgstr ""
 
-#: param/loadparm.c:727
+#: param/loadparm.c:829
 msgid "printing"
 msgstr ""
 
-#: param/loadparm.c:728
+#: param/loadparm.c:830
 msgid "print command"
 msgstr ""
 
-#: param/loadparm.c:729
+#: param/loadparm.c:831
+msgid "disable spoolss"
+msgstr ""
+
+#: param/loadparm.c:832
 msgid "lpq command"
 msgstr ""
 
-#: param/loadparm.c:730
+#: param/loadparm.c:833
 msgid "lprm command"
 msgstr ""
 
-#: param/loadparm.c:731
+#: param/loadparm.c:834
 msgid "lppause command"
 msgstr ""
 
-#: param/loadparm.c:732
+#: param/loadparm.c:835
 msgid "lpresume command"
 msgstr ""
 
-#: param/loadparm.c:733
+#: param/loadparm.c:836
 msgid "queuepause command"
 msgstr ""
 
-#: param/loadparm.c:734
+#: param/loadparm.c:837
 msgid "queueresume command"
 msgstr ""
 
-#: param/loadparm.c:736
-msgid "printer"
+#: param/loadparm.c:839
+msgid "enumports command"
 msgstr ""
 
-#: param/loadparm.c:737
+#: param/loadparm.c:840
+msgid "addprinter command"
+msgstr ""
+
+#: param/loadparm.c:841
+msgid "deleteprinter command"
+msgstr ""
+
+#: param/loadparm.c:842
+msgid "show add printer wizard"
+msgstr ""
+
+#: param/loadparm.c:843
+msgid "os2 driver map"
+msgstr ""
+
+#: param/loadparm.c:845
 msgid "printer name"
 msgstr ""
 
-#: param/loadparm.c:738
+#: param/loadparm.c:846
+msgid "printer"
+msgstr ""
+
+#: param/loadparm.c:847
+msgid "use client driver"
+msgstr ""
+
+#: param/loadparm.c:848
 msgid "printer driver"
 msgstr ""
 
-#: param/loadparm.c:739
+#: param/loadparm.c:849
+msgid "printer driver file"
+msgstr ""
+
+#: param/loadparm.c:850
 msgid "printer driver location"
 msgstr ""
 
-#: param/loadparm.c:742
+#: param/loadparm.c:852
 msgid "Filename Handling"
 msgstr ""
 
-#: param/loadparm.c:743
+#: param/loadparm.c:853
 msgid "strip dot"
 msgstr ""
 
-#: param/loadparm.c:744
-msgid "character set"
-msgstr ""
-
-#: param/loadparm.c:745
+#: param/loadparm.c:855
 msgid "mangled stack"
 msgstr ""
 
-#: param/loadparm.c:746
+#: param/loadparm.c:856
 msgid "default case"
 msgstr ""
 
-#: param/loadparm.c:747
+#: param/loadparm.c:857
 msgid "case sensitive"
 msgstr ""
 
-#: param/loadparm.c:748
+#: param/loadparm.c:858
 msgid "casesignames"
 msgstr ""
 
-#: param/loadparm.c:749
+#: param/loadparm.c:859
 msgid "preserve case"
 msgstr ""
 
-#: param/loadparm.c:750
+#: param/loadparm.c:860
 msgid "short preserve case"
 msgstr ""
 
-#: param/loadparm.c:751
+#: param/loadparm.c:861
 msgid "mangle case"
 msgstr ""
 
-#: param/loadparm.c:752
+#: param/loadparm.c:862
 msgid "mangling char"
 msgstr ""
 
-#: param/loadparm.c:753
+#: param/loadparm.c:863
 msgid "hide dot files"
 msgstr ""
 
-#: param/loadparm.c:754
+#: param/loadparm.c:864
+msgid "hide unreadable"
+msgstr ""
+
+#: param/loadparm.c:865
 msgid "delete veto files"
 msgstr ""
 
-#: param/loadparm.c:755
+#: param/loadparm.c:866
 msgid "veto files"
 msgstr ""
 
-#: param/loadparm.c:756
+#: param/loadparm.c:867
 msgid "hide files"
 msgstr ""
 
-#: param/loadparm.c:757
+#: param/loadparm.c:868
 msgid "veto oplock files"
 msgstr ""
 
-#: param/loadparm.c:758
+#: param/loadparm.c:869
 msgid "map system"
 msgstr ""
 
-#: param/loadparm.c:759
+#: param/loadparm.c:870
 msgid "map hidden"
 msgstr ""
 
-#: param/loadparm.c:760
+#: param/loadparm.c:871
 msgid "map archive"
 msgstr ""
 
-#: param/loadparm.c:761
+#: param/loadparm.c:872
 msgid "mangled names"
 msgstr ""
 
-#: param/loadparm.c:762
+#: param/loadparm.c:873
 msgid "mangled map"
 msgstr ""
 
-#: param/loadparm.c:763
+#: param/loadparm.c:874
 msgid "stat cache"
 msgstr ""
 
-#: param/loadparm.c:765
+#: param/loadparm.c:876
 msgid "Domain Options"
 msgstr ""
 
-#: param/loadparm.c:766
-msgid "domain groups"
-msgstr ""
-
-#: param/loadparm.c:767
+#: param/loadparm.c:878
 msgid "domain admin group"
 msgstr ""
 
-#: param/loadparm.c:768
+#: param/loadparm.c:879
 msgid "domain guest group"
 msgstr ""
 
-#: param/loadparm.c:769
-msgid "domain admin users"
-msgstr ""
-
-#: param/loadparm.c:770
-msgid "domain guest users"
-msgstr ""
-
-#: param/loadparm.c:772
+#: param/loadparm.c:882
 msgid "groupname map"
 msgstr ""
 
-#: param/loadparm.c:774
+#: param/loadparm.c:885
 msgid "machine password timeout"
 msgstr ""
 
-#: param/loadparm.c:776
+#: param/loadparm.c:887
 msgid "Logon Options"
 msgstr ""
 
-#: param/loadparm.c:777
+#: param/loadparm.c:889
 msgid "add user script"
 msgstr ""
 
-#: param/loadparm.c:778
+#: param/loadparm.c:890
 msgid "delete user script"
 msgstr ""
 
-#: param/loadparm.c:779
+#: param/loadparm.c:891
+msgid "add group script"
+msgstr ""
+
+#: param/loadparm.c:892
+msgid "delete group script"
+msgstr ""
+
+#: param/loadparm.c:893
+msgid "add user to group script"
+msgstr ""
+
+#: param/loadparm.c:894
+msgid "delete user from group script"
+msgstr ""
+
+#: param/loadparm.c:895
+msgid "add machine script"
+msgstr ""
+
+#: param/loadparm.c:896
+msgid "shutdown script"
+msgstr ""
+
+#: param/loadparm.c:897
+msgid "abort shutdown script"
+msgstr ""
+
+#: param/loadparm.c:899
 msgid "logon script"
 msgstr ""
 
-#: param/loadparm.c:780
+#: param/loadparm.c:900
 msgid "logon path"
 msgstr ""
 
-#: param/loadparm.c:781
+#: param/loadparm.c:901
 msgid "logon drive"
 msgstr ""
 
-#: param/loadparm.c:782
+#: param/loadparm.c:902
 msgid "logon home"
 msgstr ""
 
-#: param/loadparm.c:783
+#: param/loadparm.c:903
 msgid "domain logons"
 msgstr ""
 
-#: param/loadparm.c:785
+#: param/loadparm.c:905
 msgid "Browse Options"
 msgstr ""
 
-#: param/loadparm.c:786
+#: param/loadparm.c:907
 msgid "os level"
 msgstr ""
 
-#: param/loadparm.c:787
+#: param/loadparm.c:908
 msgid "lm announce"
 msgstr ""
 
-#: param/loadparm.c:788
+#: param/loadparm.c:909
 msgid "lm interval"
 msgstr ""
 
-#: param/loadparm.c:789
+#: param/loadparm.c:910
 msgid "preferred master"
 msgstr ""
 
-#: param/loadparm.c:790
+#: param/loadparm.c:911
 msgid "prefered master"
 msgstr ""
 
-#: param/loadparm.c:791
+#: param/loadparm.c:912
 msgid "local master"
 msgstr ""
 
-#: param/loadparm.c:792
+#: param/loadparm.c:913
 msgid "domain master"
 msgstr ""
 
-#: param/loadparm.c:793
+#: param/loadparm.c:914
 msgid "browse list"
 msgstr ""
 
-#: param/loadparm.c:794
+#: param/loadparm.c:915
 msgid "browseable"
 msgstr ""
 
-#: param/loadparm.c:795
+#: param/loadparm.c:916
 msgid "browsable"
 msgstr ""
 
-#: param/loadparm.c:797
+#: param/loadparm.c:917
+msgid "enhanced browsing"
+msgstr ""
+
+#: param/loadparm.c:919
 msgid "WINS Options"
 msgstr ""
 
-#: param/loadparm.c:798
+#: param/loadparm.c:920
 msgid "dns proxy"
 msgstr ""
 
-#: param/loadparm.c:799
+#: param/loadparm.c:921
 msgid "wins proxy"
 msgstr ""
 
-#: param/loadparm.c:800
+#: param/loadparm.c:923
 msgid "wins server"
 msgstr ""
 
-#: param/loadparm.c:801
+#: param/loadparm.c:924
 msgid "wins support"
 msgstr ""
 
-#: param/loadparm.c:802
+#: param/loadparm.c:925
 msgid "wins hook"
 msgstr ""
 
-#: param/loadparm.c:804
+#: param/loadparm.c:927
 msgid "Locking Options"
 msgstr ""
 
-#: param/loadparm.c:805
+#: param/loadparm.c:929
 msgid "blocking locks"
 msgstr ""
 
-#: param/loadparm.c:806
+#: param/loadparm.c:930
 msgid "fake oplocks"
 msgstr ""
 
-#: param/loadparm.c:807
+#: param/loadparm.c:931
 msgid "kernel oplocks"
 msgstr ""
 
-#: param/loadparm.c:808
+#: param/loadparm.c:932
 msgid "locking"
 msgstr ""
 
-#: param/loadparm.c:810
-msgid "utmp"
-msgstr ""
-
-#: param/loadparm.c:812
-msgid "ole locking compatibility"
-msgstr ""
-
-#: param/loadparm.c:813
+#: param/loadparm.c:934
 msgid "oplocks"
 msgstr ""
 
-#: param/loadparm.c:814
+#: param/loadparm.c:935
 msgid "level2 oplocks"
 msgstr ""
 
-#: param/loadparm.c:815
+#: param/loadparm.c:936
 msgid "oplock break wait time"
 msgstr ""
 
-#: param/loadparm.c:816
+#: param/loadparm.c:937
 msgid "oplock contention limit"
 msgstr ""
 
-#: param/loadparm.c:817
+#: param/loadparm.c:938
+msgid "posix locking"
+msgstr ""
+
+#: param/loadparm.c:939
 msgid "strict locking"
 msgstr ""
 
-#: param/loadparm.c:818
+#: param/loadparm.c:940
 msgid "share modes"
 msgstr ""
 
-#: param/loadparm.c:821
+#: param/loadparm.c:943
 msgid "Ldap Options"
 msgstr ""
 
-#: param/loadparm.c:822
+#: param/loadparm.c:945
 msgid "ldap server"
 msgstr ""
 
-#: param/loadparm.c:823
+#: param/loadparm.c:946
 msgid "ldap port"
 msgstr ""
 
-#: param/loadparm.c:824
+#: param/loadparm.c:947
 msgid "ldap suffix"
 msgstr ""
 
-#: param/loadparm.c:825
+#: param/loadparm.c:948
 msgid "ldap filter"
 msgstr ""
 
-#: param/loadparm.c:826
+#: param/loadparm.c:949
 msgid "ldap root"
 msgstr ""
 
-#: param/loadparm.c:827
+#: param/loadparm.c:950
 msgid "ldap root passwd"
 msgstr ""
 
-#: param/loadparm.c:831
+#: param/loadparm.c:953
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: param/loadparm.c:832
-msgid "smbrun"
+#: param/loadparm.c:954
+msgid "add share command"
 msgstr ""
 
-#: param/loadparm.c:833
-msgid "config file"
+#: param/loadparm.c:955
+msgid "change share command"
 msgstr ""
 
-#: param/loadparm.c:834
-msgid "auto services"
+#: param/loadparm.c:956
+msgid "delete share command"
 msgstr ""
 
-#: param/loadparm.c:835
+#: param/loadparm.c:958
+msgid "config file"
+msgstr ""
+
+#: param/loadparm.c:959
 msgid "preload"
 msgstr ""
 
-#: param/loadparm.c:836
-msgid "lock directory"
+#: param/loadparm.c:960
+msgid "auto services"
 msgstr ""
 
-#: param/loadparm.c:837
+#: param/loadparm.c:961
 msgid "lock dir"
 msgstr ""
 
-#: param/loadparm.c:839
-msgid "utmp directory"
+#: param/loadparm.c:962
+msgid "lock directory"
 msgstr ""
 
-#: param/loadparm.c:840
-msgid "utmp dir"
+#: param/loadparm.c:964
+msgid "utmp directory"
 msgstr ""
 
-#: param/loadparm.c:841
+#: param/loadparm.c:965
 msgid "wtmp directory"
 msgstr ""
 
-#: param/loadparm.c:842
-msgid "wtmp dir"
-msgstr ""
-
-#: param/loadparm.c:843
-msgid "utmp hostname"
-msgstr ""
-
-#: param/loadparm.c:844
-msgid "utmp consolidate"
+#: param/loadparm.c:966
+msgid "utmp"
 msgstr ""
 
-#: param/loadparm.c:846
+#: param/loadparm.c:969
 msgid "default service"
 msgstr ""
 
-#: param/loadparm.c:847
+#: param/loadparm.c:970
 msgid "default"
 msgstr ""
 
-#: param/loadparm.c:848
+#: param/loadparm.c:971
 msgid "message command"
 msgstr ""
 
-#: param/loadparm.c:849
+#: param/loadparm.c:972
 msgid "dfree command"
 msgstr ""
 
-#: param/loadparm.c:850
-msgid "valid chars"
-msgstr ""
-
-#: param/loadparm.c:851
+#: param/loadparm.c:973
 msgid "remote announce"
 msgstr ""
 
-#: param/loadparm.c:852
+#: param/loadparm.c:974
 msgid "remote browse sync"
 msgstr ""
 
-#: param/loadparm.c:853
+#: param/loadparm.c:975
 msgid "socket address"
 msgstr ""
 
-#: param/loadparm.c:854
+#: param/loadparm.c:976
 msgid "homedir map"
 msgstr ""
 
-#: param/loadparm.c:855
+#: param/loadparm.c:977
 msgid "time offset"
 msgstr ""
 
-#: param/loadparm.c:856
-msgid "unix realname"
-msgstr ""
-
-#: param/loadparm.c:857
+#: param/loadparm.c:978
 msgid "NIS homedir"
 msgstr ""
 
-#: param/loadparm.c:858
+#: param/loadparm.c:979
 msgid "-valid"
 msgstr ""
 
-#: param/loadparm.c:859
+#: param/loadparm.c:981
 msgid "copy"
 msgstr ""
 
-#: param/loadparm.c:860
+#: param/loadparm.c:982
 msgid "include"
 msgstr ""
 
-#: param/loadparm.c:861
-msgid "preexec"
+#: param/loadparm.c:983
+msgid "exec"
 msgstr ""
 
-#: param/loadparm.c:862
-msgid "exec"
+#: param/loadparm.c:984
+msgid "preexec"
 msgstr ""
 
-#: param/loadparm.c:863
+#: param/loadparm.c:986
 msgid "preexec close"
 msgstr ""
 
-#: param/loadparm.c:864
+#: param/loadparm.c:987
 msgid "postexec"
 msgstr ""
 
-#: param/loadparm.c:865
+#: param/loadparm.c:988
 msgid "root preexec"
 msgstr ""
 
-#: param/loadparm.c:866
+#: param/loadparm.c:989
 msgid "root preexec close"
 msgstr ""
 
-#: param/loadparm.c:867
+#: param/loadparm.c:990
 msgid "root postexec"
 msgstr ""
 
-#: param/loadparm.c:868
+#: param/loadparm.c:991
 msgid "available"
 msgstr ""
 
-#: param/loadparm.c:869
+#: param/loadparm.c:992
 msgid "volume"
 msgstr ""
 
-#: param/loadparm.c:870
+#: param/loadparm.c:993
 msgid "fstype"
 msgstr ""
 
-#: param/loadparm.c:871
+#: param/loadparm.c:994
 msgid "set directory"
 msgstr ""
 
-#: param/loadparm.c:872
+#: param/loadparm.c:995
 msgid "source environment"
 msgstr ""
 
-#: param/loadparm.c:873
+#: param/loadparm.c:996
 msgid "wide links"
 msgstr ""
 
-#: param/loadparm.c:874
+#: param/loadparm.c:997
 msgid "follow symlinks"
 msgstr ""
 
-#: param/loadparm.c:875
+#: param/loadparm.c:998
 msgid "dont descend"
 msgstr ""
 
-#: param/loadparm.c:876
+#: param/loadparm.c:999
 msgid "magic script"
 msgstr ""
 
-#: param/loadparm.c:877
+#: param/loadparm.c:1000
 msgid "magic output"
 msgstr ""
 
-#: param/loadparm.c:878
+#: param/loadparm.c:1001
 msgid "delete readonly"
 msgstr ""
 
-#: param/loadparm.c:879
+#: param/loadparm.c:1002
+msgid "dos filemode"
+msgstr ""
+
+#: param/loadparm.c:1003
 msgid "dos filetimes"
 msgstr ""
 
-#: param/loadparm.c:880
+#: param/loadparm.c:1004
 msgid "dos filetime resolution"
 msgstr ""
 
-#: param/loadparm.c:882
+#: param/loadparm.c:1006
 msgid "fake directory create times"
 msgstr ""
 
-#: param/loadparm.c:883
+#: param/loadparm.c:1007
 msgid "panic action"
 msgstr ""
+
+#: param/loadparm.c:1008
+msgid "hide local users"
+msgstr ""
+
+#: param/loadparm.c:1011
+msgid "VFS options"
+msgstr ""
+
+#: param/loadparm.c:1013
+msgid "vfs object"
+msgstr ""
+
+#: param/loadparm.c:1014
+msgid "vfs options"
+msgstr ""
+
+#: param/loadparm.c:1017
+msgid "msdfs root"
+msgstr ""
+
+#: param/loadparm.c:1018
+msgid "host msdfs"
+msgstr ""
+
+#: param/loadparm.c:1020
+msgid "Winbind options"
+msgstr ""
+
+#: param/loadparm.c:1022
+msgid "winbind uid"
+msgstr ""
+
+#: param/loadparm.c:1023
+msgid "winbind gid"
+msgstr ""
+
+#: param/loadparm.c:1024
+msgid "template homedir"
+msgstr ""
+
+#: param/loadparm.c:1025
+msgid "template shell"
+msgstr ""
+
+#: param/loadparm.c:1026
+msgid "winbind separator"
+msgstr ""
+
+#: param/loadparm.c:1027
+msgid "winbind cache time"
+msgstr ""
+
+#: param/loadparm.c:1028
+msgid "winbind enum users"
+msgstr ""
+
+#: param/loadparm.c:1029
+msgid "winbind enum groups"
+msgstr ""
diff --git a/source3/po/pl.gmo b/source3/po/pl.gmo
index 0821904c31..aaa86efb50 100644
--- a/source3/po/pl.gmo
+++ b/source3/po/pl.gmo