[SCM] Samba Shared Repository - branch master updated
Gary Lockyer
gary at samba.org
Wed May 22 07:16:01 UTC 2019
The branch, master has been updated
via 31de52ed2ef s4-ntvfs: Remove untested ntvfs_cifsposix backend
via 679227d6063 s4-ntvfs: Remove untested stub vfs_print backend
via ee8b48df0f9 ntvfs: Remove unused and untested SMB1 -> SMB2 proxy module
via 2017e291a2d ntvfs: Remove unused nbench vfs module
via 5b957f816c8 libcli/ldap: Remove unsued ldap_transaction()
via 3e197d4370b libcli/security: Remove unused dup_sec_desc_buf()
via 93db0aac0d3 lib: Remove "tdb based replacement for gettext"
via a011e033d5d s4-rpc_server: Remove unused dnsserver_find_partition()
via abe7b673941 libcli/auth: Remove des_crypt64() from smbdes
via e421c13bbc7 dsdb: Remove unsued dsdb_class_by_cn()
via 433296c614f Remove unused auth_get_challenge_not_implemented
via 40a9b739c64 Makefile: add lcov command
from a666a99e4dc ldb: ldbdump key and pack format version comments
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 31de52ed2efe598e7fab72d90a742d4f9e03c97e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 13:57:57 2019 +1200
s4-ntvfs: Remove untested ntvfs_cifsposix backend
It had a note:
WARNING: All file access is done as user root!!!
Only use this module for testing, with only test data!!!
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Autobuild-User(master): Gary Lockyer <gary at samba.org>
Autobuild-Date(master): Wed May 22 07:15:43 UTC 2019 on sn-devel-184
commit 679227d6063074aabb986d78fab42b856db265e3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 13:55:16 2019 +1200
s4-ntvfs: Remove untested stub vfs_print backend
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit ee8b48df0f995611e0c8f8d6766e4882c5f4f4cd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 6 15:12:56 2019 +1200
ntvfs: Remove unused and untested SMB1 -> SMB2 proxy module
While this could have been a very interesting idea (particularly
if it allowed our main SMB server to disable SMB1), it has never
been enabled in our testsuite so relying on it would be quite
brave.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 2017e291a2da3d63741df82b480f32ee57f6a165
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 6 15:07:52 2019 +1200
ntvfs: Remove unused nbench vfs module
A pass-though NTVFS module to write nbench files is a cute idea,
but this is untested and almost certainly unused.
Found by looking at the LCOV results.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 5b957f816c8647c6423926ee47243ff0bb1e09e5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 15:42:39 2019 +1200
libcli/ldap: Remove unsued ldap_transaction()
This is unsued since a87dea2a0894015cf4a3140995791f5468c40038 in 2007
when we moved to using LDB for LDAP in this area of the code.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 3e197d4370b03f6a8d711f5b61c6525bd75aa304
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 15:03:06 2019 +1200
libcli/security: Remove unused dup_sec_desc_buf()
This has been unused since before
762e7e1dff89cc14b0130fc9a22038b0845630a2 in 2003.
Found by callcatcher
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 93db0aac0d3c4c44bcb5b52618705d63b94534cd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 14:59:00 2019 +1200
lib: Remove "tdb based replacement for gettext"
This is unused since SWAT was removed in Samba 4.1
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit a011e033d5d3af3d63fdfd1def95e22b54a8aa3f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 14:41:06 2019 +1200
s4-rpc_server: Remove unused dnsserver_find_partition()
This has been unused since it was introduced by
5673e2cec946502da84956f866658718e7632a3e in 2011.
Found by callcatcher
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit abe7b673941d932d65839fb616f95a717c57d445
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 14:35:52 2019 +1200
libcli/auth: Remove des_crypt64() from smbdes
This has been unused since it was introduced by
ad8b47a2ba4e81420bc2272e8438a727cc2223ee in 2006
Found by callcatcher
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit e421c13bbc73e654c4683339f1a14c262e43f7eb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 14:24:43 2019 +1200
dsdb: Remove unsued dsdb_class_by_cn()
The callers moved to dsdb_class_by_cn_ldb_val() with
43aa546ecc3f05845793b1a7354685d50a77c170 in 2009.
Found by callcatcher
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 433296c614f9fcab1b6390662a0f915395c9fc82
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 21 14:15:36 2019 +1200
Remove unused auth_get_challenge_not_implemented
This became unused after eba87995145b0e14672c1f6993f7aa3422d62541 in 2012
Found by callcatcher
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 40a9b739c640b4944289ec19d5efaee5b30f995c
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 16 14:38:25 2019 +1200
Makefile: add lcov command
A helper cmd to generate .info file from .gcno and .gcda file,
and then generate html report from .info file.
Usage:
./configure --enable-coverage
make -j
make test TESTS=mytest
make lcov
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 13 +
libcli/auth/proto.h | 1 -
libcli/auth/smbdes.c | 11 -
libcli/security/secdesc.c | 12 -
libcli/security/secdesc.h | 5 -
source3/intl/lang_tdb.c | 263 ------
source3/intl/lang_tdb.h | 30 -
source3/wscript_build | 1 -
source4/auth/ntlm/auth_util.c | 9 -
source4/dsdb/schema/schema_query.c | 10 -
source4/libcli/ldap/ldap_client.c | 23 -
source4/ntvfs/cifs_posix_cli/README | 12 -
source4/ntvfs/cifs_posix_cli/cifsposix.h | 38 -
source4/ntvfs/cifs_posix_cli/svfs_util.c | 195 -----
source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c | 1112 -------------------------
source4/ntvfs/nbench/README | 13 -
source4/ntvfs/nbench/vfs_nbench.c | 982 ----------------------
source4/ntvfs/print/README | 3 -
source4/ntvfs/print/vfs_print.c | 132 ---
source4/ntvfs/smb2/vfs_smb2.c | 904 --------------------
source4/ntvfs/wscript_build | 35 -
source4/rpc_server/dnsserver/dnsserver.h | 2 -
source4/rpc_server/dnsserver/dnsutils.c | 14 -
23 files changed, 13 insertions(+), 3807 deletions(-)
delete mode 100644 source3/intl/lang_tdb.c
delete mode 100644 source3/intl/lang_tdb.h
delete mode 100644 source4/ntvfs/cifs_posix_cli/README
delete mode 100644 source4/ntvfs/cifs_posix_cli/cifsposix.h
delete mode 100644 source4/ntvfs/cifs_posix_cli/svfs_util.c
delete mode 100644 source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
delete mode 100644 source4/ntvfs/nbench/README
delete mode 100644 source4/ntvfs/nbench/vfs_nbench.c
delete mode 100644 source4/ntvfs/print/README
delete mode 100644 source4/ntvfs/print/vfs_print.c
delete mode 100644 source4/ntvfs/smb2/vfs_smb2.c
Changeset truncated at 500 lines:
diff --git a/Makefile b/Makefile
index d456a410050..07b928e4f01 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,19 @@ subunit-test:
testenv:
$(WAF) test --testenv $(TEST_OPTIONS)
+lcov:
+ @echo usage:
+ @echo ""
+ @echo ./configure --enable-coverage
+ @echo make -j
+ @echo make test TESTS=mytest
+ @echo make lcov
+ @echo ""
+ rm -f lcov.info
+ lcov --capture --directory . --output-file lcov.info && \
+ genhtml lcov.info --output-directory public --prefix=$$(pwd) && \
+ echo Please open public/index.html in browser to view the coverage report
+
gdbtestenv:
$(WAF) test --testenv --gdbtest $(TEST_OPTIONS)
diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 82febe74440..47e8b96fb21 100644
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -214,7 +214,6 @@ void E_P24(const uint8_t *p21, const uint8_t *c8, uint8_t *p24);
void D_P16(const uint8_t *p14, const uint8_t *in, uint8_t *out);
void E_old_pw_hash( uint8_t *p14, const uint8_t *in, uint8_t *out);
void des_crypt128(uint8_t out[8], const uint8_t in[8], const uint8_t key[16]);
-void des_crypt64(uint8_t out[8], const uint8_t in[8], const uint8_t key[8], int forw);
void des_crypt112(uint8_t out[8], const uint8_t in[8], const uint8_t key[14], int forw);
void des_crypt112_16(uint8_t out[16], const uint8_t in[16], const uint8_t key[14], int forw);
void sam_rid_crypt(unsigned int rid, const uint8_t *in, uint8_t *out, int forw);
diff --git a/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
index 7ee51ce722e..6d9a6dc2ce8 100644
--- a/libcli/auth/smbdes.c
+++ b/libcli/auth/smbdes.c
@@ -338,17 +338,6 @@ void des_crypt128(uint8_t out[8], const uint8_t in[8], const uint8_t key[16])
des_crypt56(out, buf, key+9, 1);
}
-/* des encryption with a 64 bit key */
-void des_crypt64(uint8_t out[8], const uint8_t in[8], const uint8_t key[8], int forw)
-{
- uint8_t buf[8];
- uint8_t key2[8];
- ZERO_STRUCT(key2);
- des_crypt56(buf, in, key, forw);
- key2[0] = key[7];
- des_crypt56(out, buf, key2, forw);
-}
-
/* des encryption with a 112 bit (14 byte) key */
void des_crypt112(uint8_t out[8], const uint8_t in[8], const uint8_t key[14], int forw)
{
diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index 53e0e023a7b..cd944306ee1 100644
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -384,18 +384,6 @@ struct sec_desc_buf *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, struct secur
return dst;
}
-/*******************************************************************
- Duplicates a struct sec_desc_buf structure.
-********************************************************************/
-
-struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src)
-{
- if(src == NULL)
- return NULL;
-
- return make_sec_desc_buf( ctx, src->sd_size, src->sd);
-}
-
/*
* Determine if an struct security_ace is inheritable
*/
diff --git a/libcli/security/secdesc.h b/libcli/security/secdesc.h
index dd8cf4ed716..ca9376a372e 100644
--- a/libcli/security/secdesc.h
+++ b/libcli/security/secdesc.h
@@ -84,11 +84,6 @@ struct security_descriptor *make_standard_sec_desc(TALLOC_CTX *ctx, const struct
********************************************************************/
struct sec_desc_buf *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, struct security_descriptor *sec_desc);
-/*******************************************************************
- Duplicates a struct sec_desc_buf structure.
-********************************************************************/
-struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src);
-
bool sd_has_inheritable_components(const struct security_descriptor *parent_ctr, bool container);
NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
struct security_descriptor **ppsd,
diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c
deleted file mode 100644
index 2e050fd96de..00000000000
--- a/source3/intl/lang_tdb.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- tdb based replacement for gettext
- Copyright (C) Andrew Tridgell 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "intl/lang_tdb.h"
-#include "util_tdb.h"
-#include "lib/util/util_paths.h"
-
-static TDB_CONTEXT *tdb;
-
-/* the currently selected language */
-static char *current_lang;
-
-
-/* load a msg file into the tdb */
-static bool load_msg(const char *msg_file)
-{
- char **lines;
- int num_lines, i;
- char *msgid, *msgstr;
- TDB_DATA data;
-
- lines = file_lines_load(msg_file, &num_lines, 0, NULL);
-
- if (!lines) {
- return False;
- }
-
- if (tdb_lockall(tdb) != 0) {
- TALLOC_FREE(lines);
- return False;
- }
-
- /* wipe the db */
- tdb_wipe_all(tdb);
-
- msgid = NULL;
-
- for (i=0;i<num_lines;i++) {
- if (strncmp(lines[i], "msgid \"", 7) == 0) {
- msgid = lines[i] + 7;
- }
- if (msgid && strncmp(lines[i], "msgstr \"", 8) == 0) {
- msgstr = lines[i] + 8;
- trim_char(msgid, '\0', '\"');
- trim_char(msgstr, '\0', '\"');
- if (*msgstr == 0) {
- msgstr = msgid;
- }
- all_string_sub(msgid, "\\n", "\n", 0);
- all_string_sub(msgstr, "\\n", "\n", 0);
- data = string_term_tdb_data(msgstr);
- tdb_store_bystring(tdb, msgid, data, 0);
- msgid = NULL;
- }
- }
-
- TALLOC_FREE(lines);
- tdb_unlockall(tdb);
-
- return True;
-}
-
-
-/* work out what language to use from locale variables */
-static const char *get_lang(void)
-{
- const char *vars[] = {"LANGUAGE", "LC_ALL", "LC_LANG", "LANG", NULL};
- int i;
- char *p;
-
- for (i=0; vars[i]; i++) {
- if ((p = getenv(vars[i]))) {
- return p;
- }
- }
-
- return NULL;
-}
-
-/* initialise the message translation subsystem. If the "lang" argument
- is NULL then get the language from the normal environment variables */
-bool lang_tdb_init(const char *lang)
-{
- char *path = NULL;
- char *msg_path = NULL;
- struct stat st;
- static int initialised;
- time_t loadtime;
- bool result = false;
- char *dpath = NULL;
- char *lpath = NULL;
-
- /* we only want to init once per process, unless given
- an override */
- if (initialised && !lang)
- return True;
-
- if (initialised) {
- /* we are re-initialising, free up any old init */
- if (tdb) {
- tdb_close(tdb);
- tdb = NULL;
- }
- SAFE_FREE(current_lang);
- }
-
- initialised = 1;
-
- if (!lang) {
- /* no lang given, use environment */
- lang = get_lang();
- }
-
- /* if no lang then we don't translate */
- if (!lang)
- return True;
-
- dpath = data_path(talloc_tos(), (const char *)lang);
- if (dpath == NULL) {
- goto done;
- }
-
- if (asprintf(&msg_path, "%s.msg", dpath) == -1) {
- DEBUG(0, ("asprintf failed\n"));
- goto done;
- }
- if (stat(msg_path, &st) != 0) {
- /* the msg file isn't available */
- DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
- strerror(errno)));
- goto done;
- }
-
- lpath = lock_path(talloc_tos(), "lang_");
- if (lpath == NULL) {
- goto done;
- }
-
- if (asprintf(&path, "%s%s.tdb", lpath, lang) == -1) {
- DEBUG(0, ("asprintf failed\n"));
- goto done;
- }
-
- DEBUG(10, ("lang_tdb_init: loading %s\n", path));
-
- tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644);
- if (!tdb) {
- tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDONLY, 0);
- if (!tdb) {
- DEBUG(10, ("lang_tdb_init: %s: %s\n", path,
- strerror(errno)));
- goto done;
- }
- current_lang = SMB_STRDUP(lang);
- result = True;
- goto done;
- }
-
- loadtime = tdb_fetch_int32(tdb, "/LOADTIME/");
-
- if (loadtime == -1 || loadtime < st.st_mtime) {
- load_msg(msg_path);
- tdb_store_int32(tdb, "/LOADTIME/", (int)time(NULL));
- }
-
- current_lang = SMB_STRDUP(lang);
- result = True;
-
- done:
- SAFE_FREE(msg_path);
- SAFE_FREE(path);
- TALLOC_FREE(lpath);
- TALLOC_FREE(dpath);
-
- return result;
-}
-
-/* translate a msgid to a message string in the current language
- returns a string that must be freed by calling lang_msg_free()
-*/
-const char *lang_msg(const char *msgid)
-{
- TDB_DATA data;
- const char *p;
- char *q, *msgid_quoted;
- int count;
-
- lang_tdb_init(NULL);
-
- if (!tdb) return msgid;
-
- /* Due to the way quotes in msgids are escaped in the msg file we
- must replace " with \" before doing a lookup in the tdb. */
-
- count = 0;
-
- for(p = msgid; *p; p++) {
- if (*p == '\"')
- count++;
- }
-
- if (!(msgid_quoted = (char *)SMB_MALLOC(strlen(msgid) + count + 1)))
- return msgid;
-
- /* string_sub() is unsuitable here as it replaces some punctuation
- chars with underscores. */
-
- for(p = msgid, q = msgid_quoted; *p; p++) {
- if (*p == '\"') {
- *q = '\\';
- q++;
- }
- *q = *p;
- q++;
- }
-
- *q = 0;
-
- data = tdb_fetch_bystring(tdb, msgid_quoted);
-
- free(msgid_quoted);
-
- /* if the message isn't found then we still need to return a pointer
- that can be freed. Pity. */
- if (!data.dptr)
- return SMB_STRDUP(msgid);
-
- return (const char *)data.dptr;
-}
-
-
-/* free up a string from lang_msg() */
-void lang_msg_free(const char *msgstr)
-{
- if (!tdb) return;
- free(discard_const_p(void, msgstr));
-}
-
-/*
- return the current language - needed for language file mappings
-*/
-char *lang_tdb_current(void)
-{
- return current_lang;
-}
diff --git a/source3/intl/lang_tdb.h b/source3/intl/lang_tdb.h
deleted file mode 100644
index 2f9c3f19e56..00000000000
--- a/source3/intl/lang_tdb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- tdb based replacement for gettext
- Copyright (C) Andrew Tridgell 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _INTL_LANG_TDB_H_
-#define _INTL_LANG_TDB_H_
-
-/* The following definitions come from intl/lang_tdb.c */
-
-bool lang_tdb_init(const char *lang);
-const char *lang_msg(const char *msgid);
-void lang_msg_free(const char *msgstr);
-char *lang_tdb_current(void);
-
-#endif /* _INTL_LANG_TDB_H_ */
diff --git a/source3/wscript_build b/source3/wscript_build
index fd4101a315f..3a19fd3517c 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -397,7 +397,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
lib/ms_fnmatch.c
lib/tallocmsg.c
lib/dmallocmsg.c
- intl/lang_tdb.c
lib/gencache.c
lib/util_event.c
lib/global_contexts.c
diff --git a/source4/auth/ntlm/auth_util.c b/source4/auth/ntlm/auth_util.c
index af89130466b..7e72cb5123d 100644
--- a/source4/auth/ntlm/auth_util.c
+++ b/source4/auth/ntlm/auth_util.c
@@ -32,15 +32,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
-/* this default function can be used by mostly all backends
- * which don't want to set a challenge
- */
-NTSTATUS auth_get_challenge_not_implemented(struct auth_method_context *ctx, TALLOC_CTX *mem_ctx, uint8_t chal[8])
-{
- /* we don't want to set a challenge */
- return NT_STATUS_NOT_IMPLEMENTED;
-}
-
/****************************************************************************
Create an auth_usersupplied_data structure after appropriate mapping.
****************************************************************************/
diff --git a/source4/dsdb/schema/schema_query.c b/source4/dsdb/schema/schema_query.c
index 3860d373eea..8a582161721 100644
--- a/source4/dsdb/schema/schema_query.c
+++ b/source4/dsdb/schema/schema_query.c
@@ -169,16 +169,6 @@ const struct dsdb_class *dsdb_class_by_lDAPDisplayName_ldb_val(const struct dsdb
return c;
}
-const struct dsdb_class *dsdb_class_by_cn(const struct dsdb_schema *schema,
- const char *cn)
-{
- struct dsdb_class *c;
- if (!cn) return NULL;
- BINARY_ARRAY_SEARCH_P(schema->classes_by_cn,
- schema->num_classes, cn, cn, strcasecmp, c);
- return c;
-}
-
const struct dsdb_class *dsdb_class_by_cn_ldb_val(const struct dsdb_schema *schema,
const struct ldb_val *cn)
{
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 1cbcd0d42d5..da84adc7769 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -1026,26 +1026,3 @@ _PUBLIC_ NTSTATUS ldap_result_one(struct ldap_request *req, struct ldap_message
}
return status;
}
-
-/*
- a simple ldap transaction, for single result requests that only need a status code
- this relies on single valued requests having the response type == request type + 1
-*/
-_PUBLIC_ NTSTATUS ldap_transaction(struct ldap_connection *conn, struct ldap_message *msg)
-{
- struct ldap_request *req = ldap_request_send(conn, msg);
- struct ldap_message *res;
- NTSTATUS status;
- status = ldap_result_n(req, 0, &res);
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(req);
- return status;
- }
- if (res->type != msg->type + 1) {
- talloc_free(req);
- return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
- }
- status = ldap_check_response(conn, &res->r.GeneralResult);
- talloc_free(req);
- return status;
-}
diff --git a/source4/ntvfs/cifs_posix_cli/README b/source4/ntvfs/cifs_posix_cli/README
deleted file mode 100644
index 2bc92834180..00000000000
--- a/source4/ntvfs/cifs_posix_cli/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This module (ntvfs 'cifsposix') provides a simple posix backend which
-provides better semantics for clients which implement the cifs unix
-extensions or the newer cifs posix extensions
-
-WARNING: All file access is done as user 'root'!!!
- Only use this module for testing, with only test data!!!
-
-For activating this module use:
--
Samba Shared Repository
More information about the samba-cvs
mailing list