[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sun Dec 19 14:30:03 MST 2010
The branch, master has been updated
via 1ca3534 heimdal: Fix build if using system roken.
via fcecca7 ldb: Bump version after renaming some public symbols which didn't have a ldb_ prefix.
via 2f4bd23 dcesrv_srvsvc: Use constants.
from 716ea73 Rename vfs operation posix_fallocate to just fallocate and add the vfs_fallocate_mode parameter.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1ca35347cb812aff6880f7815a2e0a952474ffd2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 19 18:34:22 2010 +0100
heimdal: Fix build if using system roken.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sun Dec 19 22:29:41 CET 2010 on sn-devel-104
commit fcecca76a532121cef3bf91594840bd436c5d9cb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 19 18:29:12 2010 +0100
ldb: Bump version after renaming some public symbols which didn't have a
ldb_ prefix.
commit 2f4bd23e9e12f03c71ee63b6c76f1e4441696c77
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Dec 19 18:10:29 2010 +0100
dcesrv_srvsvc: Use constants.
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal_build/wscript_build | 2 +-
.../ldb/ABI/{ldb-0.9.20.sigs => ldb-0.9.22.sigs} | 16 ++++++++--------
source4/lib/ldb/wscript | 2 +-
source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
copy source4/lib/ldb/ABI/{ldb-0.9.20.sigs => ldb-0.9.22.sigs} (96%)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index e97867c..5c9378d 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -698,7 +698,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_TOMMATH"):
HEIMDAL_LIBRARY('hcrypto',
'lib/hcrypto/aes.c lib/hcrypto/bn.c lib/hcrypto/dh.c lib/hcrypto/dh-ltm.c lib/hcrypto/des.c lib/hcrypto/dsa.c lib/hcrypto/engine.c lib/hcrypto/md2.c lib/hcrypto/md4.c lib/hcrypto/md5.c lib/hcrypto/rsa.c lib/hcrypto/rsa-ltm.c lib/hcrypto/rc2.c lib/hcrypto/rc4.c lib/hcrypto/rijndael-alg-fst.c lib/hcrypto/rnd_keys.c lib/hcrypto/sha.c lib/hcrypto/sha256.c lib/hcrypto/sha512.c lib/hcrypto/ui.c lib/hcrypto/evp.c lib/hcrypto/evp-hcrypto.c lib/hcrypto/pkcs5.c lib/hcrypto/pkcs12.c lib/hcrypto/rand.c lib/hcrypto/rand-egd.c lib/hcrypto/rand-unix.c lib/hcrypto/rand-fortuna.c lib/hcrypto/rand-timer.c lib/hcrypto/hmac.c lib/hcrypto/camellia.c lib/hcrypto/camellia-ntt.c lib/hcrypto/common.c lib/hcrypto/validate.c',
includes='../heimdal/lib/hcrypto ../heimdal/lib ../heimdal/include',
- deps='roken asn1 tommath',
+ deps='roken asn1 tommath replace',
version_script='lib/hcrypto/version-script.map',
vnum='5.0.1',
)
diff --git a/source4/lib/ldb/ABI/ldb-0.9.20.sigs b/source4/lib/ldb/ABI/ldb-0.9.22.sigs
similarity index 96%
copy from source4/lib/ldb/ABI/ldb-0.9.20.sigs
copy to source4/lib/ldb/ABI/ldb-0.9.22.sigs
index 6273870..b5a69c1 100644
--- a/source4/lib/ldb/ABI/ldb-0.9.20.sigs
+++ b/source4/lib/ldb/ABI/ldb-0.9.22.sigs
@@ -1,7 +1,6 @@
ldb_add: int (struct ldb_context *, const struct ldb_message *)
ldb_any_comparison: int (struct ldb_context *, void *, ldb_attr_handler_t, const struct ldb_val *, const struct ldb_val *)
ldb_asprintf_errstring: void (struct ldb_context *, const char *, ...)
-ldb_asq_init: int (const char *)
ldb_attr_casefold: char *(TALLOC_CTX *, const char *)
ldb_attr_dn: int (const char *)
ldb_attr_in_list: int (const char * const *, const char *)
@@ -21,9 +20,11 @@ ldb_build_search_req: int (struct ldb_request **, struct ldb_context *, TALLOC_C
ldb_build_search_req_ex: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, struct ldb_parse_tree *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_casefold: char *(struct ldb_context *, TALLOC_CTX *, const char *, size_t)
ldb_casefold_default: char *(void *, TALLOC_CTX *, const char *, size_t)
+ldb_check_critical_controls: int (struct ldb_control **)
ldb_comparison_binary: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
ldb_comparison_fold: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
ldb_connect: int (struct ldb_context *, const char *, unsigned int, const char **)
+ldb_controls_except_specified: struct ldb_control **(struct ldb_control **, TALLOC_CTX *, struct ldb_control *)
ldb_debug: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
ldb_debug_add: void (struct ldb_context *, const char *, ...)
ldb_debug_end: void (struct ldb_context *, enum ldb_debug_level)
@@ -101,7 +102,12 @@ ldb_ldif_write: int (struct ldb_context *, int (*)(void *, const char *, ...), v
ldb_ldif_write_file: int (struct ldb_context *, FILE *, const struct ldb_ldif *)
ldb_ldif_write_string: char *(struct ldb_context *, TALLOC_CTX *, const struct ldb_ldif *)
ldb_load_modules: int (struct ldb_context *, const char **)
+ldb_map_add: int (struct ldb_module *, struct ldb_request *)
+ldb_map_delete: int (struct ldb_module *, struct ldb_request *)
ldb_map_init: int (struct ldb_module *, const struct ldb_map_attribute *, const struct ldb_map_objectclass *, const char * const *, const char *, const char *)
+ldb_map_modify: int (struct ldb_module *, struct ldb_request *)
+ldb_map_rename: int (struct ldb_module *, struct ldb_request *)
+ldb_map_search: int (struct ldb_module *, struct ldb_request *)
ldb_match_msg: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope)
ldb_match_msg_error: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope, bool *)
ldb_match_msg_objectclass: int (const struct ldb_message *, const char *)
@@ -172,14 +178,11 @@ ldb_next_request: int (struct ldb_module *, struct ldb_request *)
ldb_next_start_trans: int (struct ldb_module *)
ldb_op_default_callback: int (struct ldb_request *, struct ldb_reply *)
ldb_options_find: const char *(struct ldb_context *, const char **, const char *)
-ldb_paged_results_init: int (const char *)
-ldb_paged_searches_init: int (const char *)
ldb_parse_control_strings: struct ldb_control **(struct ldb_context *, TALLOC_CTX *, const char **)
ldb_parse_tree: struct ldb_parse_tree *(TALLOC_CTX *, const char *)
ldb_parse_tree_attr_replace: void (struct ldb_parse_tree *, const char *, const char *)
ldb_parse_tree_copy_shallow: struct ldb_parse_tree *(TALLOC_CTX *, const struct ldb_parse_tree *)
ldb_qsort: void (void * const, size_t, size_t, void *, ldb_qsort_cmp_fn_t)
-ldb_rdn_name_init: int (const char *)
ldb_register_backend: int (const char *, ldb_connect_fn, bool)
ldb_register_hook: int (ldb_hook_fn)
ldb_register_module: int (const struct ldb_module_ops *)
@@ -198,7 +201,7 @@ ldb_request_get_status: int (struct ldb_request *)
ldb_request_replace_control: int (struct ldb_request *, const char *, bool, void *)
ldb_request_set_state: void (struct ldb_request *, int)
ldb_reset_err_string: void (struct ldb_context *)
-ldb_sample_init: int (const char *)
+ldb_save_controls: int (struct ldb_control *, struct ldb_request *, struct ldb_control ***)
ldb_schema_attribute_add: int (struct ldb_context *, const char *, unsigned int, const char *)
ldb_schema_attribute_add_with_syntax: int (struct ldb_context *, const char *, unsigned int, const struct ldb_schema_syntax *)
ldb_schema_attribute_by_name: const struct ldb_schema_attribute *(struct ldb_context *, const char *)
@@ -207,7 +210,6 @@ ldb_schema_attribute_set_override_handler: void (struct ldb_context *, ldb_attri
ldb_search: int (struct ldb_context *, TALLOC_CTX *, struct ldb_result **, struct ldb_dn *, enum ldb_scope, const char * const *, const char *, ...)
ldb_search_default_callback: int (struct ldb_request *, struct ldb_reply *)
ldb_sequence_number: int (struct ldb_context *, enum ldb_sequence_type, uint64_t *)
-ldb_server_sort_init: int (const char *)
ldb_set_create_perms: void (struct ldb_context *, unsigned int)
ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, va_list), void *)
ldb_set_debug_stderr: int (struct ldb_context *)
@@ -223,12 +225,10 @@ ldb_set_utf8_default: void (struct ldb_context *)
ldb_set_utf8_fns: void (struct ldb_context *, void *, char *(*)(void *, void *, const char *, size_t))
ldb_setup_wellknown_attributes: int (struct ldb_context *)
ldb_should_b64_encode: int (struct ldb_context *, const struct ldb_val *)
-ldb_skel_init: int (const char *)
ldb_standard_syntax_by_name: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
ldb_strerror: const char *(int)
ldb_string_to_time: time_t (const char *)
ldb_string_utc_to_time: time_t (const char *)
-ldb_tdb_init: int (const char *)
ldb_timestring: char *(TALLOC_CTX *, time_t)
ldb_timestring_utc: char *(TALLOC_CTX *, time_t)
ldb_transaction_cancel: int (struct ldb_context *)
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index dd47942..97b7cc1 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'ldb'
-VERSION = '0.9.21'
+VERSION = '0.9.22'
blddir = 'bin'
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 611916c..8ccfe6b 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -431,13 +431,13 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
info[i].name = SHARE_TYPE;
info[i].type = SHARE_INFO_STRING;
switch (r->in.info->info2->type) {
- case 0x00:
+ case STYPE_DISKTREE:
info[i].value = talloc_strdup(info, "DISK");
break;
- case 0x01:
+ case STYPE_PRINTQ:
info[i].value = talloc_strdup(info, "PRINTER");
break;
- case 0x03:
+ case STYPE_IPC:
info[i].value = talloc_strdup(info, "IPC");
break;
default:
--
Samba Shared Repository
More information about the samba-cvs
mailing list