[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0afea2c WHATSNEW: Spotlight via e0edda7 s3-mdssvc: add documentation for mdssvc and mdssd via 480cc51 s3-mdssvc: add mdssd RPC service daemon for mdssvc via 4b0ee5d s3-mdssvc: lexer and parser for Spotlight queries via c2c5621 s3-mdssvc: main Spotlight code via 0de03ce s3-mdssvc: Spotlight attribute mappings via 5d4ecea s3-mdssvc: (un)marshalling Spotlight RPC blob via 222e863 s3-mdssvc: dalloc: dynamic object store based on talloc via 25f56f5 s3-mdssvc: add new option 'spotlight' via 63dd793 s3-mdssvc: add Spotlight RPC stubs via 5c6e2b2 mdssvc: IDL file for new RPC service via 6e332ab s3-mdssvc: add configure option --enable-spotlight from 66736fe s4:torture/rpc: use dcerpc_secondary_auth_connection with creds https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0afea2c364234a28f0b18e97fa08a2c7fe2ae4ae Author: Ralph Boehme s...@samba.org Date: Fri Mar 27 17:39:43 2015 +0100 WHATSNEW: Spotlight Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Ralph Böhme s...@samba.org Autobuild-Date(master): Tue Jul 7 20:35:07 CEST 2015 on sn-devel-104 commit e0edda73115e8671da11cdb18bd88b6461a02210 Author: Ralph Boehme r...@sernet.de Date: Mon Aug 11 22:30:53 2014 +0200 s3-mdssvc: add documentation for mdssvc and mdssd Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 480cc511ff350fd6c6952e8fa991571784b3aa23 Author: Ralph Boehme r...@sernet.de Date: Mon Aug 11 22:29:09 2014 +0200 s3-mdssvc: add mdssd RPC service daemon for mdssvc Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 4b0ee5d209778694d7ee8514bfa9d38f07e39901 Author: Ralph Boehme r...@sernet.de Date: Thu Jul 31 18:01:34 2014 +0200 s3-mdssvc: lexer and parser for Spotlight queries Add a lexer and parser for translating Spotlight query strings to SPARQL. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit c2c5621380ce59e034bddc12e7dc4feebc7daa9f Author: Ralph Boehme s...@samba.org Date: Thu Mar 26 22:39:21 2015 +0100 s3-mdssvc: main Spotlight code Implement all Spotlight RPC commands with the Tracker SPARQL async query API. Tracker uses glib for implemeting async tasks, we thus have to use a glib mainloop for processing sheduled tasks in threads. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 0de03ce4a451ac6887a84b4f9786b1b5bd12cbbb Author: Ralph Boehme r...@sernet.de Date: Thu Jul 31 17:56:44 2014 +0200 s3-mdssvc: Spotlight attribute mappings Add mappings for metadata attribute between Spotlight and NEPOMUK for use with Tracker. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 5d4eceae1579de341e69a090a3983e323591ce8e Author: Ralph Boehme r...@sernet.de Date: Thu Jul 31 17:07:28 2014 +0200 s3-mdssvc: (un)marshalling Spotlight RPC blob Add code for marshalling and unmarshalling Spotlight RPC blobs from/into a dalloc object store. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 222e863d4e31f0a30c83eef39e5b4d8475f066d1 Author: Ralph Boehme r...@sernet.de Date: Thu Jul 31 16:27:36 2014 +0200 s3-mdssvc: dalloc: dynamic object store based on talloc dalloc is a hack with a bizarre API, but it does its job: it's a simple object store that allows for storing simple and complex data types. We'll use it for storing Spotlight query data. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 25f56f5f4060c912f4fb6a9ef7179829233369bd Author: Ralph Boehme r...@sernet.de Date: Thu Jul 31 13:49:49 2014 +0200 s3-mdssvc: add new option 'spotlight' Per share option: it reflects whether a share is indexed by Tracker or not. The global switch that controls whether Spotlight is enabled or not, are the mdsvc RPC switches. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 63dd793cde70a3d3a5bf4144c316b764d687546b Author: Ralph Boehme r...@sernet.de Date: Wed Jul 23 09:58:45 2014 +0200 s3-mdssvc: add Spotlight RPC stubs 'mdssvc' aka 'Metadata Search Service' is an RPC service used by Apple for passing marshalled Spotlight search queries and results between client to server. Signed-off-by: Ralph Boehme s...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 117e87d librpc:ndr:witness: remove an unneeded block, reducing
indentation.
via dd0f79d librpc:ndr:witness: move variables into scope
via 76f8d0f smbd:trans2: treat new SMB_SIGNING_DESIRED in case
via fd16861 librpc:ndr:witness: fix CID 1311245: Memory - illegal
accesses (UNINIT)
from 0afea2c WHATSNEW: Spotlight
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 117e87d8040c6a7e625aa2c52cbc7ab350bf669a
Author: Michael Adam ob...@samba.org
Date: Tue Jul 7 09:50:21 2015 +0200
librpc:ndr:witness: remove an unneeded block, reducing indentation.
Check with git diff -w.
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
Autobuild-User(master): Günther Deschner g...@samba.org
Autobuild-Date(master): Tue Jul 7 23:37:05 CEST 2015 on sn-devel-104
commit dd0f79df94d6aabe5a55211c17df8955ddff4e02
Author: Michael Adam ob...@samba.org
Date: Tue Jul 7 09:47:51 2015 +0200
librpc:ndr:witness: move variables into scope
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
commit 76f8d0fbada15c9466f66a2d9961bebd1425d141
Author: Michael Adam ob...@samba.org
Date: Tue Jul 7 17:15:00 2015 +0200
smbd:trans2: treat new SMB_SIGNING_DESIRED in case
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
commit fd16861839ec6f5c255db78288ef13a7bc110839
Author: Michael Adam ob...@samba.org
Date: Tue Jul 7 08:52:20 2015 +0200
librpc:ndr:witness: fix CID 1311245: Memory - illegal accesses (UNINIT)
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
---
Summary of changes:
librpc/ndr/ndr_witness.c | 80
source3/smbd/trans2.c| 1 +
2 files changed, 41 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_witness.c b/librpc/ndr/ndr_witness.c
index 40586f4..288e640 100644
--- a/librpc/ndr/ndr_witness.c
+++ b/librpc/ndr/ndr_witness.c
@@ -60,51 +60,51 @@ _PUBLIC_ enum ndr_err_code
ndr_push_witness_notifyResponse(struct ndr_push *ndr,
_PUBLIC_ enum ndr_err_code ndr_pull_witness_notifyResponse(struct ndr_pull
*ndr, int ndr_flags, struct witness_notifyResponse *r)
{
- uint32_t size_messages_0 = 0;
- uint32_t cntr_messages_0;
- TALLOC_CTX *_mem_save_messages_0;
- {
- uint32_t _flags_save_STRUCT = ndr-flags;
- ndr_set_flags(ndr-flags, LIBNDR_PRINT_ARRAY_HEX);
- NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
- if (ndr_flags NDR_SCALARS) {
- NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_witness_notifyResponse_type(ndr,
NDR_SCALARS, r-type));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
r-length));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-num));
- {
- uint32_t
_flags_save_witness_notifyResponse_message = ndr-flags;
- uint32_t _ptr_messages;
- ndr_set_flags(ndr-flags,
LIBNDR_FLAG_REMAINING);
- NDR_CHECK(ndr_pull_generic_ptr(ndr,
_ptr_messages));
- if (_ptr_messages) {
- NDR_PULL_ALLOC(ndr, r-messages);
- } else {
- r-messages = NULL;
- }
- if (r-messages) {
- size_messages_0 = r-num;
- NDR_PULL_ALLOC_N(ndr, r-messages,
size_messages_0);
- _mem_save_messages_0 =
NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r-messages,
0);
- {
- struct ndr_pull *_ndr_messages;
-
NDR_CHECK(ndr_pull_subcontext_start(ndr, _ndr_messages, 4, r-length));
- for (cntr_messages_0 = 0;
cntr_messages_0 (size_messages_0); cntr_messages_0++) {
-
NDR_CHECK(ndr_pull_set_switch_value(_ndr_messages,
r-messages[cntr_messages_0], r-type));
-
NDR_CHECK(ndr_pull_witness_notifyResponse_message(_ndr_messages, NDR_SCALARS,
r-messages[cntr_messages_0]));
- }
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 66736fe s4:torture/rpc: use dcerpc_secondary_auth_connection with creds via 87bf1a6 s4:torture/rpc: use dcerpc_secondary_auth_connection with anon creds via e0bb97f s4:torture/samba3rpc: use pipe_bind_smb_auth() via 810d630 s4:torture/samba3rpc: add pipe_bind_smb_auth() via f42d4e9 s4:torture/samba3rpc: use pipe_bind_smb2() via 1df9416 s4:torture/samba3rpc: add pipe_bind_smb2() via d80c389 s4:torture/samba3rpc: use pipe_bind_smb() in more places via 5a849c1 s4:torture/samba3rpc: move pipe_bind_smb() to the top via 07b1e37 s4:libnet: make use of dcerpc_secondary_auth_connection_send/recv() via f036683 s4:libcli/clilsa: only remember the dcerpc_binding_handle via 8c22f81 s4:librpc/rpc: add dcerpc_secondary_auth_connection() via 9c165e5 dcerpc.idl: fix calculatin of uint16 secondary_address_size; via 9f62c4e pidl:Samba4/NDR/Parser: always initialize _mem_save_ pointers to NULL via 856c9aa pidl:Samba3/ServerNDR: add pidl_reset() and pidl_return() helper functions via 16952dc pidl:Samba3/ServerNDR: make CallWithStruct() more flexible via b3de334 pidl:Samba3/ServerNDR: simplify CallWithStruct() via 365d9d8 docs:smb.conf: explain effect of new setting 'desired' of smb encrypt via 1435770 smbd:smb2: use encryption_desired in send_break via 41cb881 smbd:smb2: only enable encryption in tcon if desired via fc22802 smbd:smb2: only enable encryption in session if desired via 3bb2999 smbd:smb2: separate between encryption required and enc desired via a3ea6db smbXsrv: add bools encryption_desired to session and tcon via 204cbe3 Introduce setting desired for 'smb encrypt' and 'client/server signing' from 8fec359 vfs_fruit: Fix CID 1311244 Out-of-bounds read https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 66736fee3a896edf5571dc627a9cf6d8eee405b0 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 17 13:39:45 2014 +0100 s4:torture/rpc: use dcerpc_secondary_auth_connection with creds This is the same as calling dcerpc_secondary_connection/dcerpc_bind_auth. Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org Autobuild-User(master): Günther Deschner g...@samba.org Autobuild-Date(master): Tue Jul 7 17:07:49 CEST 2015 on sn-devel-104 commit 87bf1a6edd2395b1a98775af0edb0a0b5be59c62 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 17 09:54:39 2014 +0100 s4:torture/rpc: use dcerpc_secondary_auth_connection with anon creds This is the same as calling dcerpc_secondary_connection/dcerpc_bind_auth_none. Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit e0bb97fde61bf3577651a8624bc1014561087d31 Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 16 07:20:37 2014 +0100 s4:torture/samba3rpc: use pipe_bind_smb_auth() Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit 810d630bd5120f12540ce9ab09e106c41a028347 Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 16 07:20:20 2014 +0100 s4:torture/samba3rpc: add pipe_bind_smb_auth() Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit f42d4e9dd342f207b206f7cf00a75e690ded76ed Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 16 07:19:49 2014 +0100 s4:torture/samba3rpc: use pipe_bind_smb2() Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit 1df9416bdb9ce569618a94df4dbcdbb016b8f8a1 Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 16 07:19:26 2014 +0100 s4:torture/samba3rpc: add pipe_bind_smb2() Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit d80c38990fa8821cbda554aa18c19a50207172a9 Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 16 07:18:30 2014 +0100 s4:torture/samba3rpc: use pipe_bind_smb() in more places Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit 5a849c13a7100fe5c3a84386988b0910608b3ece Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 16 07:17:00 2014 +0100 s4:torture/samba3rpc: move pipe_bind_smb() to the top Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit 07b1e375e561dfe4bac9e8dd495401df1b4fcff7 Author: Stefan Metzmacher me...@samba.org Date: Wed Jan 22 12:49:58 2014 +0100 s4:libnet: make use of dcerpc_secondary_auth_connection_send/recv() This avoid the bogus usage of dcerpc_pipe_auth().
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8fec359 vfs_fruit: Fix CID 1311244 Out-of-bounds read
from bba1771 Treat uid_t, git_t as 64 bit in Pidl Python bindings
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8fec35994c8b880c681f14291194763759e1c24d
Author: Volker Lendecke v...@samba.org
Date: Tue Jul 7 09:04:22 2015 +0200
vfs_fruit: Fix CID 1311244 Out-of-bounds read
We should not call memcpy if the offset is exactly AFP_INFO_SIZE
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Ralph Boehme s...@samba.org
Autobuild-User(master): Ralph Böhme s...@samba.org
Autobuild-Date(master): Tue Jul 7 14:04:39 CEST 2015 on sn-devel-104
---
Summary of changes:
source3/modules/vfs_fruit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index d05d786..e29440b 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2624,7 +2624,7 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
char afpinfo_buf[AFP_INFO_SIZE];
size_t to_return;
- if ((offset 0) || (offset AFP_INFO_SIZE)) {
+ if ((offset 0) || (offset = AFP_INFO_SIZE)) {
len = 0;
rc = 0;
goto exit;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 93c91bd Remove ctdb_conn.[ch] via 4e8e76d notifyd: Add notifydd via b4d6aee utils: add net notify via 14b426c notify: Remove two now unused stubs via 70283ff smbd: Remove SMB_VFS_NOTIFY_WATCH via c118c30 notify: Re-add notify_walk() via 0deb657 notifyd: Add notifyd_parse_db() via 730b025 smbd: Remove the notify_fam module via ce26c64 smbd: Kernel change notify is done by notifyd via b434eb5 smbd: Replace the tdb-based notify_internal with notify_msg via 96a256b smbd: Don't start the notify cleanup anymore via 72a8fcf smbd: Start the notify daemon via 802b282 smbd: Add the notify daemon via 45a2c2e smbd: Add direct notify_fam support via a24f037 param: Make kernel change notify global via e5895c3 param: Make change notify global via e749174 lib: Add server_id_db_set_exclusive via bf65865 lib: Add server_id_db_pid() via b593cc7 lib: Add server_id_db_prune_name via 07c9f69 lib: Add tevent_req_poll_unix from 117e87d librpc:ndr:witness: remove an unneeded block, reducing indentation. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 93c91bddd89be74d7721d36d67112d86b71d0bf1 Author: Volker Lendecke v...@samba.org Date: Sun May 3 16:30:45 2015 + Remove ctdb_conn.[ch] This was only used in notify_internal.c Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Wed Jul 8 02:53:33 CEST 2015 on sn-devel-104 commit 4e8e76dd597aae36193e440e49cdf225707d66be Author: Volker Lendecke v...@samba.org Date: Tue Jun 16 14:57:14 2015 + notifyd: Add notifydd A little standalone notify daemon to play around with. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit b4d6aee15ef5643c1516347cb19402e7dd0b7b95 Author: Volker Lendecke v...@samba.org Date: Mon Jun 15 12:14:03 2015 + utils: add net notify A little tool to play with the notify daemon Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 14b426ce07ec28713b297b27cfed8d5c61073f07 Author: Volker Lendecke v...@samba.org Date: Fri Jan 9 12:59:46 2015 + notify: Remove two now unused stubs Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 70283ffd38bdaccbf05f66953aec6cfd83611aa5 Author: Volker Lendecke v...@samba.org Date: Fri Dec 12 15:37:30 2014 +0100 smbd: Remove SMB_VFS_NOTIFY_WATCH No longer needed Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit c118c301c9d9b5eb9244e473ac8f251d40d11526 Author: Volker Lendecke v...@samba.org Date: Fri Jan 9 12:48:56 2015 + notify: Re-add notify_walk() This used to be a tdb traverse wrapper. Now we get the notify db from notifyd via messages. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 0deb657ba689c8b0e259b385bce30d4ff56f2810 Author: Volker Lendecke v...@samba.org Date: Fri Jan 9 12:24:58 2015 + notifyd: Add notifyd_parse_db() The database format notifyd is private to it. This makes it possible for smbcontrol and others to query notifyd's database with MSG_SMB_NOTIFY_GET_DB and inspect it without having to know exactly what format it uses. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 730b025d7bf8c951d55db60018c6ef85eae387a3 Author: Volker Lendecke v...@samba.org Date: Fri Nov 21 17:28:02 2014 +0100 smbd: Remove the notify_fam module This has been moved to main smbd Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit ce26c642724fb95d610c19d7f03e8c1e065219a2 Author: Volker Lendecke v...@samba.org Date: Fri Nov 21 17:23:18 2014 +0100 smbd: Kernel change notify is done by notifyd smbd itself does not need to call VFS_NOTIFY_WATCH anymore Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit b434eb5077948fb8db2f1cc90556edce34d26af0 Author: Volker Lendecke v...@samba.org Date: Fri Nov 21 17:05:16 2014 +0100 smbd: Replace the tdb-based notify_internal with notify_msg For the moment, this removes smbstatus -N output. It will come back with the next commits. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 96a256baf273d8fe5327809b4ff37618c621e2b9 Author: Volker Lendecke v...@samba.org Date: Fri Nov 21
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b6c9d9a gpfswrap: Use gpfs.h instead of gpfs_fcntl.h
via e4a9667 gpfswrap: Remove unused wrapper for gpfs_fnctl
via 2d62b9a vfs_gpfs: Use C99 initializers instead of ZERO_STRUCT
via 4099bdf vfs_gpfs: Use ACL defines from GPFS 3.5 header files
via cd55349 ctdb: Accept hex format for pdelete and ptrans commands
via 663db9f ctdb: Create helper function for optional hex input
from 93c91bd Remove ctdb_conn.[ch]
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b6c9d9a59e015fdf0ab9c11f4d808e28a2d0d109
Author: Christof Schmitt c...@samba.org
Date: Thu Jul 2 15:31:29 2015 -0700
gpfswrap: Use gpfs.h instead of gpfs_fcntl.h
Signed-off-by: Christof Schmitt c...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
Autobuild-User(master): Christof Schmitt c...@samba.org
Autobuild-Date(master): Wed Jul 8 05:55:13 CEST 2015 on sn-devel-104
commit e4a96670781631894b2fe649710e99fb0a75a1e8
Author: Christof Schmitt c...@samba.org
Date: Thu Jul 2 15:20:01 2015 -0700
gpfswrap: Remove unused wrapper for gpfs_fnctl
With the removal of the fileset quota check this wrapper function is
longer used.
Signed-off-by: Christof Schmitt c...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit 2d62b9ab7d80b8970ca16c962e6fbc942b9d1bd6
Author: Christof Schmitt c...@samba.org
Date: Mon Mar 23 12:57:39 2015 -0700
vfs_gpfs: Use C99 initializers instead of ZERO_STRUCT
Signed-off-by: Christof Schmitt c...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit 4099bdfae84962b126cb5420f61fc0caebd38268
Author: Christof Schmitt c...@samba.org
Date: Mon Mar 23 12:54:34 2015 -0700
vfs_gpfs: Use ACL defines from GPFS 3.5 header files
GPFS 3.5 is now the oldest support version. Cleanup the ACL code by
using the defines and structs from the 3.5 header file.
Signed-off-by: Christof Schmitt c...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit cd55349e9b0cfc9bb8c04a5cfa3c142efead6b83
Author: Christof Schmitt c...@samba.org
Date: Mon Jul 6 14:32:15 2015 -0700
ctdb: Accept hex format for pdelete and ptrans commands
Signed-off-by: Christof Schmitt c...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
commit 663db9fbb028fe524bb0eef09398c62bf4fb08d4
Author: Christof Schmitt c...@samba.org
Date: Mon Jul 6 13:07:33 2015 -0700
ctdb: Create helper function for optional hex input
Signed-off-by: Christof Schmitt c...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
---
Summary of changes:
ctdb/tools/ctdb.c | 82 ++
lib/util/gpfswrap.c| 12 ---
lib/util/gpfswrap.h| 3 +-
lib/util/wscript_configure | 2 +-
source3/modules/vfs_gpfs.c | 40 +-
5 files changed, 57 insertions(+), 82 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 91ada44..57c7052 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -180,12 +180,11 @@ static int h2i(char h)
return h - '0';
}
-static TDB_DATA hextodata(TALLOC_CTX *mem_ctx, const char *str)
+static TDB_DATA hextodata(TALLOC_CTX *mem_ctx, const char *str, size_t len)
{
- int i, len;
+ int i;
TDB_DATA key = {NULL, 0};
- len = strlen(str);
if (len 0x01) {
DEBUG(DEBUG_ERR,(Key specified with odd number of hexadecimal
digits\n));
return key;
@@ -200,6 +199,20 @@ static TDB_DATA hextodata(TALLOC_CTX *mem_ctx, const char
*str)
return key;
}
+static TDB_DATA strtodata(TALLOC_CTX *mem_ctx, const char *str, size_t len)
+{
+ TDB_DATA key;
+
+ if (!strncmp(str, 0x, 2)) {
+ key = hextodata(mem_ctx, str + 2, len - 2);
+ } else {
+ key.dptr = talloc_memdup(mem_ctx, str, len);
+ key.dsize = len;
+ }
+
+ return key;
+}
+
/* Parse a nodestring. Parameter dd_ok controls what happens to nodes
* that are disconnected or deleted. If dd_ok is true those nodes are
* included in the output list of nodes. If dd_ok is false, those
@@ -4031,15 +4044,10 @@ static int control_tfetch(struct ctdb_context *ctdb,
int argc, const char **argv
return -1;
}
- if (!strncmp(argv[1], 0x, 2)) {
- key = hextodata(tmp_ctx, argv[1] + 2);
- if (key.dsize == 0) {
- printf(Failed to convert \%s\ into a TDB_DATA\n,
argv[1]);
- return -1;
- }
- } else {
- key.dptr = discard_const(argv[1]);
- key.dsize = strlen(argv[1]);
+ key = strtodata(tmp_ctx, argv[1],
