Merge branch 'master' of ssh://git.samba.org/data/git/samba

9 files changed, 97 insertions, 2 deletions

diff --git a/source3/codepages/lowcase.dat b/codepages/lowcase.dat
index 62b6e2e952..62b6e2e952 100644
--- a/source3/codepages/lowcase.dat
+++ b/codepages/lowcase.dat
diff --git a/source3/codepages/upcase.dat b/codepages/upcase.dat
index bb6f9beb4e..bb6f9beb4e 100644
--- a/source3/codepages/upcase.dat
+++ b/codepages/upcase.dat
diff --git a/source3/codepages/valid.dat b/codepages/valid.dat
index 78c14b33f0..78c14b33f0 100644
--- a/source3/codepages/valid.dat
+++ b/codepages/valid.dat
diff --git a/docs-xml/manpages-3/winbind_krb5_locator.7.xml b/docs-xml/manpages-3/winbind_krb5_locator.7.xml
new file mode 100644
index 0000000000..b828116a53
--- /dev/null
+++ b/docs-xml/manpages-3/winbind_krb5_locator.7.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="winbind_krb5_locator.7">
+
+<refmeta>
+	<refentrytitle>winbind_krb5_locator</refentrytitle>
+	<manvolnum>7</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">7</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>winbind_krb5_locator</refname>
+	<refpurpose>A plugin for MIT and Heimdal Kerberos for detecting KDCs using Windows semantics.</refpurpose>
+</refnamediv>
+
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>
+	This plugin is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.
+	</para>
+
+	<para>
+		<command>winbind_krb5_locator</command> is a plugin that permits MIT and
+		Heimdal Kerberos libraries to detect Kerberos Servers (for the KDC and
+		kpasswd service) using the same semantics that other tools of the Samba
+		suite use. This include site-aware DNS service record lookups and caching
+		of closest dc.
+		The plugin uses the public locator API provided by most modern Kerberos
+		implementations.
+	</para>
+</refsect1>
+<refsect1>
+	<title>PREREQUISITES</title>
+	<para>
+		MIT Kerberos (at least version 1.5) or Heimdal Kerberos (at least version
+		1.0) is required.
+	</para>
+
+	<para>
+		The plugin queries the <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> daemon which needs to be configured
+		and started separately.
+	</para>
+
+	<para>
+		The <command>winbind_krb5_locator.so</command> file needs to be manually
+		copied to the plugin directory of the system Kerberos library.
+
+		For MIT Kerberos this is often:
+			<filename>/usr/lib/krb5/plugins/libkrb5/</filename>.
+		For Heimdal Kerberos this is often:
+			<filename>/usr/lib/plugin/krb5/</filename>.
+
+		Please check your local Kerberos installation for the correct
+		paths. No modification in <filename>/etc/krb5.conf</filename>
+		is required to enable the use of this plugin.
+	</para>
+	<para>
+		After copying the locator plugin to the appropriate plugin
+		directory it should immediately be available for use.
+		Users should be able to kinit into their kerberized Windows
+		environment without any modification or servers
+		being put manually into <filename>/etc/krb5.conf</filename>.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>
+	This man page is correct for version 3 of the Samba suite.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>
+		The original Samba software and related utilities were created by Andrew
+		Tridgell. Samba is now developed by the Samba Team as an Open Source
+		project similar to the way the Linux kernel is developed.
+	</para>
+
+	<para>
+		The winbind_krb5_locator manpage was written by Guenther Deschner.
+	</para>
+</refsect1>
+
+</refentry>
diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh
index 59bf2f919d..2cc3677fba 100755
--- a/source3/script/installdat.sh
+++ b/source3/script/installdat.sh
@@ -20,7 +20,7 @@ case $0 in
 	*) mode='install' ;;    
 esac
 
-for f in $SRCDIR/codepages/*.dat; do
+for f in $SRCDIR/../codepages/*.dat; do
 	FNAME="$DESTDIR/$DATDIR/`basename $f`"
 	if test "$mode" = 'install'; then
 		echo "Installing $f as $FNAME "
diff --git a/source4/codepages/lowcase.dat b/source4/codepages/lowcase.dat
deleted file mode 100644
index 62b6e2e952..0000000000
--- a/source4/codepages/lowcase.dat
+++ /dev/null
diff --git a/source4/codepages/upcase.dat b/source4/codepages/upcase.dat
deleted file mode 100644
index bb6f9beb4e..0000000000
--- a/source4/codepages/upcase.dat
+++ /dev/null
diff --git a/source4/codepages/valid.dat b/source4/codepages/valid.dat
deleted file mode 100644
index 78c14b33f0..0000000000
--- a/source4/codepages/valid.dat
+++ /dev/null
diff --git a/source4/script/installdat.sh b/source4/script/installdat.sh
index 7ff88ac788..bea8ad891a 100755
--- a/source4/script/installdat.sh
+++ b/source4/script/installdat.sh
@@ -6,7 +6,7 @@ SRCDIR=$2/
 
 echo Installing dat files in $DATDIR
 
-for f in $SRCDIR/codepages/*.dat; do
+for f in $SRCDIR/../codepages/*.dat; do
 	FNAME=$DATDIR/`basename $f`
 	echo $FNAME
 	cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?