Merge commit 'upstream/1.7.6p1'

[debian/sudo] / debian / README.Debian

diff --git a/debian/README.Debian b/debian/README.Debian
index 48333fc9a17c8d7c0009c046b1e1f51222547ace..e1ecb3e4a41a0214b285dbf8d3a4b3c6feca8b53 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,9 +2,8 @@ The version of sudo that ships with Debian by default resets the
 environment, as described by the "env_reset" flag in the sudoers file.
 
 This implies that all environment variables are removed, except for
-HOME, LOGNAME, PATH, SHELL, TERM, DISPLAY, XAUTHORITY, XAUTHORIZATION,
-XAPPLRESDIR, XFILESEARCHPATH, XUSERFILESEARCHPATH, LANG, LANGUAGE, LC_*, 
-and USER.
+LOGNAME, PATH, SHELL, TERM, DISPLAY, XAUTHORITY, XAUTHORIZATION, XAPPLRESDIR, 
+XFILESEARCHPATH, XUSERFILESEARCHPATH, LANG, LANGUAGE, LC_*, and USER.
 
 In case you want sudo to preserve more environment variables, you must
 specify the env_keep variable in the sudoers file. You should edit the
@@ -19,9 +18,29 @@ Preserve the default variables plus all variables starting with LC_:
 
     Defaults env_keep+="LC_*"
 
+       - - - - -
+
+If you're using the sudo-ldap package, note that it is now configured to 
+look for /etc/sudo-ldap.conf.  Depending on your system configuration, it
+probably makes sense for this to be a symlink to /etc/ldap.conf, or perhaps
+to /etc/libnss-ldap.conf or /etc/pam_ldap.conf.  By default, no symlink or
+file is provided, you'll need to decide what to do and create a suitable
+file before sudo-ldap will work.
+
+       - - - - -
+
+As of version 1.7, sudo-ldap now requires the LDAP source to be specified
+in /etc/nsswitch.conf with a line like:
+
+  sudoers:     ldap
+
+       - - - - -
+
 See the file OPTIONS in this directory for more information on the sudo
 build options used in building the Debian package.
 
+       - - - - -
+
 If you're having trouble grasping the fundamental idea of what sudo is all
 about, here's a succinct and humorous take on it...