summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-01-22 23:49:54 +0000
committerTim Potter <tpot@samba.org>2003-01-22 23:49:54 +0000
commit210cb79d29fcf8e01b538b6af4dee430f9032882 (patch)
treee8938c4d3e97357888f37dbc49c8e516f2069509
parentf27d292efcc60a7ce3bf12e54a918c8177032199 (diff)
downloadsamba-210cb79d29fcf8e01b538b6af4dee430f9032882.tar.gz
samba-210cb79d29fcf8e01b538b6af4dee430f9032882.tar.bz2
samba-210cb79d29fcf8e01b538b6af4dee430f9032882.zip
Minor merges from HEAD.
(This used to be commit 902a1dc1d5f74ce94496d03327c07416bc2061be)
-rw-r--r--examples/LDAP/README2
-rw-r--r--examples/VFS/.cvsignore2
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/LDAP/README b/examples/LDAP/README
index 281a66e65a..42cf4ff33a 100644
--- a/examples/LDAP/README
+++ b/examples/LDAP/README
@@ -5,7 +5,7 @@
!==
This is a quick and dirty means of storing smbpasswd entries
-in smbpasswd. Samba 2.2.x does not have any ability to grab
+in LDAP. Samba 2.2.x does not have any ability to grab
this information directly from LDAP so you will need to
periodically generate an smbpasswd from an ldapsearch
"(objectclass=smbPasswordEntry)".
diff --git a/examples/VFS/.cvsignore b/examples/VFS/.cvsignore
index 0b0923a496..92b494f978 100644
--- a/examples/VFS/.cvsignore
+++ b/examples/VFS/.cvsignore
@@ -1,2 +1,4 @@
.libs
*.so
+*.o
+Makefile