1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Commit Graph

38007 Commits

Author SHA1 Message Date
Volker Lendecke
5068a0d14d s3: Fix smb2 handling error returns from aio
Found when reading with aio_fork beyond the end of file.

Metze, Jeremy, please check!

Without this we get

[2011/08/02 21:02:54.082661,  0] lib/util.c:778(smb_panic_s3)
  PANIC (pid 2302): smbd/smb2_read.c:593: Type mismatch: name[NULL] expected[struct smbd_smb2_read_state]
[2011/08/02 21:02:54.094316,  0] lib/util.c:882(log_stack_trace)
  BACKTRACE: 23 stack frames:
   #0 bin/smbd(log_stack_trace+0x2d) [0xb72873d8]
   #1 bin/smbd(smb_panic_s3+0x7c) [0xb7287529]
   #2 bin/smbd(smb_panic+0x2f) [0xb7277e1f]
   #3 /root/git/s3-work/source3/bin/libtalloc.so.2 [0xb6c6bc48]
   #4 /root/git/s3-work/source3/bin/libtalloc.so.2 [0xb6c6ec79]
   #5 /root/git/s3-work/source3/bin/libtalloc.so.2(_talloc_get_type_abort+0x34) [0xb6c6ecb3]
   #6 bin/smbd [0xb6fbc405]
   #7 bin/smbd(_tevent_req_notify_callback+0x4a) [0xb729a85a]
   #8 bin/smbd [0xb729a888]
   #9 bin/smbd(_tevent_req_done+0x19) [0xb729aa73]
   #10 bin/smbd [0xb6fae517]
   #11 bin/smbd [0xb6fad258]
   #12 bin/smbd(smbd_aio_complete_aio_ex+0xf5) [0xb6fad6e8]
   #13 /root/git/inst/modules/vfs/aio_fork.so [0xb66d4992]
   #14 bin/smbd(run_events_poll+0x400) [0xb7297df2]
   #15 bin/smbd(smbd_process+0xd75) [0xb6f9d3a7]
   #16 bin/smbd [0xb756f07b]
   #17 bin/smbd(run_events_poll+0x400) [0xb7297df2]
   #18 bin/smbd [0xb7298254]
   #19 bin/smbd(_tevent_loop_once+0x9e) [0xb72986ac]
   #20 bin/smbd(main+0x185c) [0xb7570e59]
   #21 /lib/i686/cmov/libc.so.6(__libc_start_main+0xe5) [0xb6b08455]
   #22 bin/smbd [0xb6f14e01]

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Aug  2 22:33:15 CEST 2011 on sn-devel-104
2011-08-02 22:33:15 +02:00
Volker Lendecke
e114a21cc2 s3: Remove unused ERROR_FORCE_NT macro
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Aug  2 20:32:08 CEST 2011 on sn-devel-104
2011-08-02 20:32:08 +02:00
Volker Lendecke
9b1e4cfb8f s3: Remove unused ERROR_DOS macro 2011-08-02 19:18:09 +02:00
Volker Lendecke
d20e968cff s3: Move deferred_open_queue to smbd_server_connection 2011-08-02 19:18:09 +02:00
Volker Lendecke
cb69d105f5 s3: Pass sconn explicitly to get_deferred_open_message_smb 2011-08-02 19:18:08 +02:00
Volker Lendecke
f9d183f931 s3: Pass sconn explicitly to open_was_deferred 2011-08-02 19:18:08 +02:00
Volker Lendecke
502fdae7f1 s3: Pass sconn explicitly to schedule_deferred_open_message_smb 2011-08-02 19:18:08 +02:00
Volker Lendecke
04253dfd9f s3: Explicitly pass sconn to remove_deferred_open_message_smb 2011-08-02 19:18:08 +02:00
Volker Lendecke
77f5246f09 s3: Fix some nonempty blank lines 2011-08-02 19:18:08 +02:00
Simo Sorce
a68f16cb56 s3:server Consolidate printing related initialization
Signed-off-by: Günther Deschner <gd@samba.org>

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Aug  2 17:37:44 CEST 2011 on sn-devel-104
2011-08-02 17:37:44 +02:00
Simo Sorce
2e8a85ec72 s3:smbd - Move printing queue stuff
This way we can properly deal with pcap updates in the background queue process
if it is enabled (on by default) and not perform these actions in the main
smbd process.

Signed-off-by: Günther Deschner <gd@samba.org>
2011-08-02 15:28:03 +02:00
Stefan Metzmacher
6d1ef3faee s3:libsmb/libsmb_server: make use of cli_set_timeout()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
91b0aab3fc s3:libsmb/cli*: make use of cli_state_protocol()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
5e59a36beb s3:client: make use of cli_state_protocol()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
ec9b6134b7 s3:auth_server: make use of cli_state_protocol()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
da53434391 s3:spoolss: make use of cli_state_protocol()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
32a47730da s3:masktest: make use of cli_state_protocol()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
ed6b8deea7 s3:net_rpc: make use of cli_state_protocol()
metze
2011-08-02 04:54:29 +02:00
Stefan Metzmacher
a60b1695b1 s3:winbindd_cm: make use of cli_state_protocol()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
233336d0c2 s3:libsmb: add cli_state_protocol()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
c399ad4cdd s3:include: change cli->protocol to enum protocol_types
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
6e8a6e033f s3:libsmb/cli*: make use of cli_state_capabilities()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
ffd99c5de5 s3:libsmb/libsmb_*: make use of cli_state_capabilities()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
a4d79a3799 s3:torture: make use of cli_state_capabilities()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
3ce648aee4 s3:winbindd_cm: make use of cli_state_capabilities()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
f934aa1aea s3:include: make use of cli_state_capabilities() in SERVER_HAS_UNIX_CIFS()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
24c5427810 s3:libsmb: add cli_state_capabilities()
metze
2011-08-02 04:54:28 +02:00
Stefan Metzmacher
a83e769b01 s3:smb2cli_base: smb2cli_req_send() needs to call tevent_req_post() on error
metze
2011-08-02 04:54:28 +02:00
Alban Browaeys
11c2d3717c Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share via an uri
Fix null deref.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Aug  2 02:58:26 CEST 2011 on sn-devel-104
2011-08-02 02:58:26 +02:00
Stefan Metzmacher
a833aaf52c s3:rpc_transport_tstream: call tstream_cli_np_use_trans() before tstream_writev_queue_send()
This will be needed when tstream_writev_queue_send() changes it's behavior and
avoids using an immediate event when the queue is empty.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Aug  1 14:55:00 CEST 2011 on sn-devel-104
2011-08-01 14:55:00 +02:00
Andreas Schneider
f72d56de50 s3-rpc_server: Only setup tcpip ports if epmapper is enabled.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Mon Aug  1 12:31:59 CEST 2011 on sn-devel-104
2011-08-01 12:31:59 +02:00
Andreas Schneider
aca4dbe000 s3-rpc_server: Use rpc_spoolss_mode(). 2011-08-01 11:08:37 +02:00
Andreas Schneider
538bd1eca6 s3-rpc_server: Add rpc_spoolss_mode(). 2011-08-01 11:08:37 +02:00
Andreas Schneider
b11878d5a5 s3-rpc_server: Enable endpoint mapper as daemon by default. 2011-08-01 11:08:36 +02:00
Andreas Schneider
d189d2bf32 s3-rpc_server: Use rpc_epmapper_mode().
Remove embedded mode cause this will not work. It was only there for
testing.
2011-08-01 11:08:36 +02:00
Andreas Schneider
176ce4b42f s3-rpc_server: Add rpc_epmapper_mode(). 2011-08-01 11:08:36 +02:00
Andreas Schneider
9c5f2ec121 s3-rpc_server: Disable listening on tcpip ports by default. 2011-08-01 11:08:36 +02:00
Andreas Schneider
e0931a53c8 s3-torture: Run epmapper as daemon and the tests over ncalrpc. 2011-08-01 08:50:35 +02:00
Andreas Schneider
48542728b1 s3-epmd: Use rpc_setup_tcpip_sockets(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
4b751b29e5 s3-librpc: Remove obsolete dcerpc_binding_vector_create(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
0fef6766b9 s3-rpc_server: Use binding vector in rpc_ep_try_register(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
498e53c220 s3-rpc_server: Add RPC socket helper functions. 2011-08-01 08:50:35 +02:00
Andreas Schneider
02cdb65fc6 s3-librpc: Add dcerpc_binding_vector_replace_iface(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
9cc6f90424 s3-librpc: Add dcerpc_binding_vector_dup(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
169d0c4312 s3-librpc: Add dcerpc_binding_vector_add_unix(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
eaced2e909 s3-librpc: Add dcerpc_binding_vector_add_port(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
c810e47519 s3-librpc: Add dcerpc_binding_vector_add_np_default(). 2011-08-01 08:50:35 +02:00
Andreas Schneider
08523ed6b8 s3-librpc: Add dcerpc_binding_vector_new(). 2011-08-01 08:50:34 +02:00
Andreas Schneider
d597bf4dad s3-rpc_server: Rename to rpc service setup. 2011-08-01 08:50:34 +02:00
Andreas Schneider
e25b34ab0c s3-rpc_server: Move the endpoint registration to own file. 2011-08-01 08:50:34 +02:00
Andreas Schneider
cca96e4726 s3-rpc_server: Added common function to create tcpip socket. 2011-08-01 08:50:34 +02:00
Günther Deschner
95e8f09f6e s3-lsa: Fix crypto prototypes.
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Aug  1 00:18:34 CEST 2011 on sn-devel-104
2011-08-01 00:18:34 +02:00
Günther Deschner
70192f034c s3-build: remove some unused/duplicate headers.
Guenther
2011-07-31 22:37:28 +02:00
Günther Deschner
df13422421 s3-selftest: finally enable RPC-LSA against s3.
Guenther
2011-07-31 22:37:28 +02:00
Günther Deschner
d45b33cd28 s3-selftest: enable RPC-LSA-SECRETS against s3.
Guenther
2011-07-31 22:37:28 +02:00
Günther Deschner
6544bde277 s3-lsa: support secret objects in _lsa_QuerySecurity().
Guenther
2011-07-31 22:37:28 +02:00
Günther Deschner
1387095990 s3-lsa: support secret objects in _lsa_DeleteObject().
Guenther
2011-07-31 22:37:27 +02:00
Günther Deschner
caa0cc76b0 s3-lsa: implement _lsa_QuerySecret().
Guenther
2011-07-31 22:37:27 +02:00
Günther Deschner
eb88c7e61e s3-lsa: implement _lsa_SetSecret().
Guenther
2011-07-31 22:37:27 +02:00
Günther Deschner
d2d59ff3ee s3-lsa: implement _lsa_CreateSecret().
Guenther
2011-07-31 22:37:27 +02:00
Günther Deschner
7158e27724 s3-lsa: implement _lsa_OpenSecret().
Guenther
2011-07-31 22:37:27 +02:00
Günther Deschner
51481c5912 s3-secrets: add lsa_secret passdb api.
Guenther
2011-07-31 22:37:26 +02:00
Günther Deschner
3fd1652104 s3-secrets: add lsa_secret struct to secrets IDL.
Guenther
2011-07-31 22:37:26 +02:00
Günther Deschner
f9a5df8929 s3-passdb: add dummy calls to control global (replicated) secrets.
Guenther
2011-07-31 22:37:26 +02:00
Günther Deschner
b0d9f620aa s3-lsa: add LSA_HANDLE_SECRET_TYPE.
Guenther
2011-07-31 22:37:26 +02:00
Günther Deschner
b98145edc9 s3-lsa: Fix _lsa_DeleteObject to handle trusted domain objects.
Guenther
2011-07-31 22:37:26 +02:00
Jeremy Allison
2049357217 Added missing return. Not strictly neccessary, the following if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED))
clause will catch this and use tevent_req_nterror(req, status); to set the status as NT_STATUS_OK, but
it looks strange to do it that way.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Jul 30 01:34:24 CEST 2011 on sn-devel-104
2011-07-30 01:34:24 +02:00
Jeremy Allison
1d4d9194ab Secod part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id
Modify the credit granting algorithm to closer to what I believe
Windows does.

Split up max_credits into 1/16ths, and then scale
the requested credits by how many 16ths have been
currently granted. Less than 1/16th == grant all
requested (100%), scale down as more have been
granted. Never ask for less than 1 if the client
asked for at least 1.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Jul 29 20:37:42 CEST 2011 on sn-devel-104
2011-07-29 20:37:42 +02:00
Jeremy Allison
9edc159912 First part of bugfix for bug #8335 - file copy aborts with smb2_validate_message_id: bad message_id
Set default max credits to 8192 now this has been documented in the
SMB2 spec.
2011-07-29 10:18:12 -07:00
Volker Lendecke
fac5c654e2 s3: Add a fallback for missing open&x support in OS/X Lion
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Jul 29 17:55:20 CEST 2011 on sn-devel-104
2011-07-29 17:55:20 +02:00
Volker Lendecke
190b5432f0 s3: Make map_open_params_to_ntcreate() available in lib/ 2011-07-29 16:43:17 +02:00
Volker Lendecke
0102c6e2bc s3: Make is_executable() available in lib/ 2011-07-29 16:43:17 +02:00
Volker Lendecke
6d67d41444 s3: We only need base_name in map_open_params_to_ntcreate 2011-07-29 16:43:17 +02:00
Michael Adam
0b5c4a601a s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 29 13:34:22 CEST 2011 on sn-devel-104
2011-07-29 13:34:22 +02:00
Michael Adam
d4c93ca721 s3-waf: replace the dbwrap_util library by a dbwrap library that contains the dbwrap core 2011-07-29 12:23:13 +02:00
Michael Adam
2414fc88d8 s3:dbwrap: move db_is_local() from dbwrap.c to dbwrap_open.c 2011-07-29 12:23:13 +02:00
Michael Adam
1abdd9b2bb s3:dbwrap: move db_open() to a file dbwrap_open.c of its own.
Also start new folder lib/dbwrap/ where dbwrap_open.c is stored and
make the fallbacke implementation functoins non-static and create a
dbwrap_private.h header file that contains their prototypes.
2011-07-29 12:23:13 +02:00
Michael Adam
75c7320497 s3:g_lock: explicitly include dbwrap.h 2011-07-29 12:23:12 +02:00
Michael Adam
ee3be0defa s3:modules:nfs4_acls: fix the include of dbwrap.h to not include "include/" 2011-07-29 12:23:12 +02:00
Michael Adam
f72153ea83 s3:dbwrap: explicitly include dbwrap.h in dbwrap_ctdb.c
This used to come in via g_lock.h

Pair-Programmed-With: Gregor Beck <gbeck@sernet.de>
2011-07-29 12:23:12 +02:00
Andrew Bartlett
8f13c84dce s3-selftest Add tests for 'map to guest = bad user'
Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-29 04:24:07 +02:00
Andrew Bartlett
61cb2150cb selftest: explain how the message command test works 2011-07-29 04:24:06 +02:00
Andreas Schneider
fcb90f4761 s3-printing: Add forward declaration for dcerpc_binding_handle.
This fixes a build warning.

Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Thu Jul 28 20:07:37 CEST 2011 on sn-devel-104
2011-07-28 20:07:37 +02:00
Volker Lendecke
5812645f49 s3: Priorize the async echo responder over the client
Without this, an active client connection can starve the echo responder. This
leads to apparently "lost" SMBs.

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Jul 28 18:53:38 CEST 2011 on sn-devel-104
2011-07-28 18:53:38 +02:00
Volker Lendecke
4dd0a3b5e2 s3: Remove unused smbd_echo_reader() 2011-07-28 17:42:23 +02:00
Volker Lendecke
710e5d9256 s3: Use smbd_echo_read_send in the async echo handler 2011-07-28 17:42:23 +02:00
Volker Lendecke
27afb8910f s3: Add smbd_echo_read_send/recv
Read a SMB packet in the echo responder, giving the parent one second to step
in
2011-07-28 17:42:23 +02:00
Simo Sorce
e84c7a2e26 s3-rpc_server: Use talloc for pipe_rpc_fns
Everything uses talloc in the rpc server nowadays, remove this ancient use of
malloc. This also allows us to remove the free fucntion and let talloc handle
it properly.

Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Thu Jul 28 17:41:08 CEST 2011 on sn-devel-104
2011-07-28 17:41:08 +02:00
Simo Sorce
48a71664f2 s3-rpc_server: remove useless code
We do not reuse pies_struct so there is no reason to SERO_STRUCT() it when we
are freeing it as we are done using it anyways.
2011-07-28 10:27:58 -04:00
Simo Sorce
262af4713e s3-rpc_server: remove unnecessary talloc_free
The auth_ctx is a child of pipes_struct, and this function is a used only as a
destructor on pipes_struct. So it is not really necessary to free this struct
in the destructor as it will be freed soon enough anyway.
2011-07-28 10:27:52 -04:00
Simo Sorce
0a72744dd2 s3-rpc_server: Remove dead code
srv_str and cli_str are not used anymore.
2011-07-28 10:27:45 -04:00
Andreas Schneider
a97fef36bc s3-spoolss: Use existing handle in printer_driver_files_in_use().
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Thu Jul 28 16:20:11 CEST 2011 on sn-devel-104
2011-07-28 16:20:11 +02:00
Andreas Schneider
5fa9fe39ea s3-spoolss: Use existing handle in printer_driver_in_use(). 2011-07-28 15:08:42 +02:00
Volker Lendecke
553124a663 s3: In the async echo test, write 65k
This leads to the writev from echo responder child to parent to only deliver a
partial blob and thus excercises the retry code.

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Jul 28 15:07:40 CEST 2011 on sn-devel-104
2011-07-28 15:07:40 +02:00
Michael Adam
0ad8c12d48 s3:modules:nfs4_acls: improve fix for bug #8330
simplify the check insmbacl4_find_equal_special()

Signed-off-by: Michael Adam <obnox@samba.org>

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Thu Jul 28 13:20:38 CEST 2011 on sn-devel-104
2011-07-28 13:20:38 +02:00
Michael Adam
7b7c6c85f1 s3:torture: use lp_load_global() in pdbtest - this does not need shares nor IPC$ 2011-07-28 11:17:42 +02:00
Michael Adam
a6fe4d20f1 s3:winbindd: use lp_load_global() - winbindd does not need shares or IPC$ 2011-07-28 11:17:42 +02:00
Michael Adam
b793e02c6b s3:smbstatus: use lp_load_global() - smbstatus does not need to load shares! 2011-07-28 11:17:42 +02:00
Michael Adam
7c41dda1b3 s3:split_tokens: use lp_load_global(), fixing the call to lp_load()
this does not need share and it dos not need to save defaults
2011-07-28 11:17:41 +02:00
Michael Adam
d696beefb1 s3:split_tokens: fix a nonempty blank line 2011-07-28 11:17:41 +02:00
Michael Adam
d29be7d263 s3: use lp_load_global() in smbw_sample -- whatever this is ... :-) 2011-07-28 11:17:40 +02:00
Michael Adam
b9fdfbad2e s3:smbtree: use lp_load_global() 2011-07-28 11:17:40 +02:00
Michael Adam
7e2deb94dc s3:smbpasswd: use lp_load_global() 2011-07-28 11:17:40 +02:00
Michael Adam
039ae12dbb s3:smbfilter: use lp_load_global() 2011-07-28 11:17:39 +02:00
Michael Adam
e6176d597a s3:smbcquotas: use lp_load_global() 2011-07-28 11:17:39 +02:00
Michael Adam
ce8beb5133 s3:smbcontrol: use lp_load_global(): smbcontrol does not need to load the shares 2011-07-28 11:17:38 +02:00
Michael Adam
b608cfc8ec s3:smbcacls: use lp_load_global() 2011-07-28 11:17:38 +02:00
Michael Adam
d4abfcc04b s3:pdbedit: use lp_load_global() 2011-07-28 11:17:38 +02:00
Michael Adam
2a98ee0f83 s3:ntlm_auth: use lp_load_global() 2011-07-28 11:17:37 +02:00
Michael Adam
ac9a61bda8 s3:nmblookup: use lp_load_global() 2011-07-28 11:17:37 +02:00
Michael Adam
82202f99b3 s3:net: use lp_load_global() 2011-07-28 11:17:36 +02:00
Michael Adam
7557ba1eb2 s3:eventlogadm: use lp_load_global() 2011-07-28 11:17:36 +02:00
Michael Adam
1679fe5ca9 s3:dbwrap_torture: use lp_load_global() 2011-07-28 11:17:35 +02:00
Michael Adam
59a2f3d707 s3:dbwrap_tool: use lp_load_global() 2011-07-28 11:17:35 +02:00
Michael Adam
ae752ec3a5 s3:smbtorture: use the lp_load_global() wrapper of lp_load() 2011-07-28 11:17:35 +02:00
Michael Adam
c32479f584 s3:torture: use lp_load_global() in the strstr test 2011-07-28 11:17:34 +02:00
Michael Adam
ecc487e026 s3:torture: use lp_load_global in the strcmp test 2011-07-28 11:17:34 +02:00
Michael Adam
426ae350ee s3:torture: use lp_load_global() in the push_ucs2 test 2011-07-28 11:17:33 +02:00
Michael Adam
bfde6fa535 s3:torture: use lp_load_global() in the msgtest 2011-07-28 11:17:33 +02:00
Michael Adam
d6b4c693be s3:torture: use lp_load_global() in the masktest 2011-07-28 11:17:33 +02:00
Michael Adam
ee495ab5c3 s3:torture: use lp_load_global() in locktest2 2011-07-28 11:17:32 +02:00
Michael Adam
407a514f8b s3:torture: use lp_load_global() in the locktest 2011-07-28 11:17:32 +02:00
Michael Adam
4a21e50474 s3:rpcclient: use the lp_load_global() wrapper of lp_load() 2011-07-28 11:17:31 +02:00
Michael Adam
a7e9219002 s3:nmbd: use the lp_load_global() wrapper of lp_load() 2011-07-28 11:17:31 +02:00
Michael Adam
74b806c888 s3:libnet_join: use lp_load_global() wrapper of lp_load() 2011-07-28 11:17:31 +02:00
Michael Adam
88ee6973f0 s3:libsmbconf: use lp_load_global() in the testsuite 2011-07-28 11:17:30 +02:00
Michael Adam
2c3a1f44fa s3:libnetapi: use lp_load_global() 2011-07-28 11:17:30 +02:00
Michael Adam
c2aa8e5d63 s3:loadparm: make lp_set_in_client() static - only used in wrappers in loadparm now. 2011-07-28 11:17:29 +02:00
Michael Adam
c9efe307cb s3:pam_smbpass: use lp_load_client() in pam_smbpass 2011-07-28 11:17:29 +02:00
Michael Adam
f764de64e3 s3:libsmb: use lp_load_client() and lp_load_client_no_reinit() in libsmb_context 2011-07-28 11:17:29 +02:00
Michael Adam
4e41d38df3 s3:loadparm: add wrapper lp_load_client_no_reinit() 2011-07-28 11:17:28 +02:00
Michael Adam
5676fbb399 s3:loadparm: add wrapper lp_load_globals_no_reinit() 2011-07-28 11:17:28 +02:00
Michael Adam
fbf254c19a s3:libsmb: fix a call to lp_load to reinit the globals in any case
The potential previous lp_load of $HOME/.smb/smb.conf might have failed
halfway through and might have left globals initialized in an unwanted state.
So we should make sure to clean up before loading the dyn_CONFIGFILE()
2011-07-28 11:17:27 +02:00
Michael Adam
bff217cf4a s3:smbspool: use lp_load_client() 2011-07-28 11:17:27 +02:00
Michael Adam
0c55a7606f s3:smbclient: use lp_load_client() 2011-07-28 11:17:27 +02:00
Michael Adam
0b21c7750f s3:loadparm: make lp_is_in_client() static - only used inside loadparm 2011-07-28 11:17:26 +02:00
Michael Adam
37f548d788 s3:loadparm: add lp_load_client() that also sets the client state internally 2011-07-28 11:17:26 +02:00
Michael Adam
1379ef8b7b s3:loadparm: add a convenience wrapper lp_load_global()
This is the use case for most callers, especially the client tools.
2011-07-28 11:17:25 +02:00
Michael Adam
13329112e9 s3:loadparm: rename parameter "allow_registry_shares" to "load_all_shares" 2011-07-28 11:17:25 +02:00
Andrew Tridgell
356a2cc0b0 s3-waf: the passdb subsystem needs to be called pdb
the 'pdb' name is builtin to the passdb module loading code as a fixed
string. We need to call the subsystem pdb so that external passdb
modules end up in bin/modules/pdb/ where they can be found by the
Samba3 module loader

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-07-28 15:20:51 +10:00
Jeremy Allison
d82256ca11 Use existing ISDOT and ISDOTDOT macros.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Jul 28 02:09:20 CEST 2011 on sn-devel-104
2011-07-28 02:09:20 +02:00
Volker Lendecke
94a2328367 s3: Avoid calls to cli_dos/nt_error in torture
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Jul 27 23:07:51 CEST 2011 on sn-devel-104
2011-07-27 23:07:50 +02:00
Volker Lendecke
a7f8d9e798 s3: Fix formatting in check_error() 2011-07-27 21:55:21 +02:00
Stefan Metzmacher
34faeb8bba s3:test_async_echo: unsure the desired smb message sequence
We want to start sending echo requests once the rpc related
smb operation arrived the smb layer.

metze
2011-07-27 21:55:21 +02:00
Christian Ambach
abf3573c21 s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken
we should not merge ACEs with different flags (e.g. CI/OI/I/)
Otherwise ACLs get wrong entries and thus wrong semantics

Example:
ACL:BUILTIN\Users:ALLOWED/0x0/FULL
ACL:BUILTIN\Users:ALLOWED/I/READ
got merged to
ACL:BUILTIN\Users:ALLOWED/I/FULL

This is not the same and also leads to wrong displays
in the Windows ACL dialog

Autobuild-User: Christian Ambach <ambi@samba.org>
Autobuild-Date: Wed Jul 27 16:03:51 CEST 2011 on sn-devel-104
2011-07-27 16:03:51 +02:00
Andreas Schneider
133fb0ebcc s3-spoolss: Use get_session_info_system().
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Wed Jul 27 10:38:34 CEST 2011 on sn-devel-104
2011-07-27 10:38:34 +02:00
Andreas Schneider
b77f626def s3-spoolss: Free the info2 structure in _spoolss_GetPrinter. 2011-07-27 08:50:01 +02:00
Andreas Schneider
f26441d8ba s3-spoolss: Use tmp_ctx everywhere in _spoolss_DeletePrinterDriverEx. 2011-07-27 08:50:01 +02:00
Andreas Schneider
fea4a3111b s3-spoolss: Use tmp_ctx in winreg_enum_printer_key_internal. 2011-07-27 08:50:01 +02:00
Andreas Schneider
c58c0ba0bd s3-spoolss: Use tmp_ctx in winreg_printer_deleteform1_internal. 2011-07-27 08:50:01 +02:00
Andreas Schneider
80c1a8e04e s3-spoolss: Use tmp_ctx in winreg_printer_setform1_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
baccb06658 s3-spoolss: Use tmp_ctx in winreg_printer_addform1_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
a6ea1542c5 s3-spoolss: Use tmp_ctx in winreg_printer_getform1_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
f49917ade0 s3-spoolss: Use tmp_ctx in winreg_printer_enumforms1_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
81eae6ebd4 s3-spoolss: Use tmp_ctx in winreg_set_printer_secdesc_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
41c2e711bd s3-spoolss: Use tmp_ctx in winreg_get_printer_secdesc_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
022a13f1e0 s3-spoolss: Use tmp_ctx in winreg_add_driver_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
ff6294ef0f s3-spoolss: Use tmp_ctx in winreg_del_driver_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
72ac68e746 s3-spoolss: Use tmp_ctx in winreg_get_driver_list_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
2e2631f554 s3-spoolss: Use tmp_ctx in winreg_get_driver_internal. 2011-07-27 08:50:00 +02:00
Andreas Schneider
106829545c s3-spoolss: Use tmp_ctx in winreg_delete_printer_dataex_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
e6e80ea137 s3-spoolss: Use tmp_ctx in winreg_get_printer_dataex_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
7aef2f6308 s3-spoolss: Use tmp_ctx in winreg_enum_printer_dataex_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
311d6dbeb7 s3-spoolss: Use tmp_ctx in winreg_set_printer_dataex_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
2b0adab76e s3-spoolss: Use tmp_ctx in winreg_update_printer_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
34dc5a57f9 s3-spoolss: Use tmp_ctx in winreg_create_printer_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
f9359a2dc9 s3-spoolss: Use tmp_ctx in winreg_get_printer_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
20afdeec3c s3-spoolss: Use tmp_ctx in winreg_printer_get_changeid_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
ba74c5df2d s3-spoolss: Use tmp_ctx in winreg_printer_update_changeid_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
43604dd321 s3-spoolss: Use tmp_ctx in winreg_delete_printer_key_internal. 2011-07-27 08:49:59 +02:00
Andreas Schneider
bed0672b03 s3-spoolss: Free local in winreg_printer_binding_handle. 2011-07-27 08:49:58 +02:00
Simo Sorce
99e03bee7a s3-spoolss: Improve memory efficiency.
p->mem_ctx is a relatively long lived context as it will not be freed until
a full request is served. In spoolss we do a lot of operations including
opening new pipes to connect to winreg.
Use more shortlived temporary contexts to avoid leaking a lot of memory on
p->mem_ctx and carrying it around untill all the operations in the current call
are done.

Signed-off-by: Andreas Schneider <asn@samba.org>
2011-07-27 08:49:58 +02:00
Andreas Schneider
8831402596 s3-rpc_client: Fix memory context in winreg_enum_printer_dataex(). 2011-07-27 08:49:58 +02:00
Andreas Schneider
5045281e17 s3-rpc_client: Close policy handles before creating defaults.
We reopen the hive and key so close them before reopen.
2011-07-27 08:49:58 +02:00
Andreas Schneider
f8afaa76f2 s3-rpc_client: Close the hive handle before we open it again. 2011-07-27 08:49:58 +02:00
Andreas Schneider
a0597b75e6 s3-rpc_client: Close hive if opening of the key fails. 2011-07-27 08:49:58 +02:00
Andreas Schneider
fe7e4ac462 s3-rpc_server: Copy correct local tsocket address. 2011-07-27 08:49:58 +02:00
Michael Adam
3276060da4 s3:idmap_tdb2: remove the undocumented option of the silly name "tdb:idmap2.tdb"
In ancient times, when ctdb had not support for persistent databases and
tdb2 was introduced as a two-layer solution and it was more important than
today to be able to change the location of the permanent database file
because it had to reside on shared storage.

But these were times when idmap_tdb2 was not even officially released.
Nowadays, with ctdb handling the persistent idmap2.tdb database, the path
is stripped anyways, so this undocumented option has become unnecessary
and is hence removed.

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Jul 27 05:37:57 CEST 2011 on sn-devel-104
2011-07-27 05:37:57 +02:00
Michael Adam
67cd2f9d86 s3:idmap_tdb2: remove a legacy comment 2011-07-27 04:29:05 +02:00
Michael Adam
4b5ada3d27 s3:idmap_tdb2: remove legacy comment 2011-07-27 04:29:05 +02:00
Michael Adam
5511855738 s3:idmap_tdb2: remove superfluous initialization with bogus comment 2011-07-27 04:29:05 +02:00
Michael Adam
7d3dc2164b s3:idmap_tdb2: fix a legacy comment that does not apply any more 2011-07-27 04:29:05 +02:00
Michael Adam
b6c82f18f1 s3:idmap_tdb2: deprecate the idmap:script parameter and use "idmap config * : script" instead
With this patch, "idmap config * : script" will override "idmap : script".
If "idmap : script" is present, a deprecation warning will be printed in any
case. If "idmap config * : script" is not set, then the value of "idmap :script"
will be used for backwards compatibility.
2011-07-27 04:29:05 +02:00
Jeremy Allison
4fdad1960c Fix bug #8324 - smbclient cannot list directories from a big-endian machine.
Two uses of the setup array are not being correctly byte-swapped to little
endian.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Jul 27 03:14:48 CEST 2011 on sn-devel-104
2011-07-27 03:14:48 +02:00
Volker Lendecke
61d420e0d8 s3: cli_close_done->write_andx_done in test_async_echo
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Jul 27 02:03:49 CEST 2011 on sn-devel-104
2011-07-27 02:03:49 +02:00
Volker Lendecke
cdae9ef267 s3: Fix a debug message 2011-07-27 00:47:45 +02:00
Volker Lendecke
45ec7d6f24 s3: Fix formatting 2011-07-27 00:47:45 +02:00
Volker Lendecke
9f66e302b8 s3: Fix an error message 2011-07-27 00:47:45 +02:00
Volker Lendecke
1335059ff5 s3: Fix async smb handling
In cli_echo with more than one response we ended up with more than one read_smb
request. One from the call to cli_smb_req_set_pending called from
cli_smb_received. The other one from cli_smb_received itself. I don't really
see another way to deal with this than to hold the read_smb request in the
cli_state.

Metze, please check!

Volker
2011-07-27 00:47:45 +02:00
Kai Blin
c79e08fb1b s3 swat: Create random nonce in CGI mode
In CGI mode, we don't get access to the user's password, which would
reduce the hash used so far to parameters an attacker can easily guess.
To work around this, read the nonce from secrets.tdb or generate one if
it's not there.
Also populate the C_user field so we can use that for token creation.

Signed-off-by: Kai Blin <kai@samba.org>

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Jul 26 23:33:24 CEST 2011 on sn-devel-104
2011-07-26 23:33:24 +02:00
Kai Blin
52d2ba7103 s3 swat: Add time component to XSRF token
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
b5d63c3c11 s3 swat: Add XSRF protection to printer page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
072c199180 s3 swat: Add XSRF protection to password page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
c02df79f61 s3 swat: Add XSRF protection to shares page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
68f8924c7c s3 swat: Add XSRF protection to globals page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
99fa6b386a s3 swat: Add XSRF protection to wizard page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
ab98edd79d s3 swat: Add XSRF protection to wizard_params page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
00d255fc1d s3 swat: Add XSRF protection to viewconfig page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
15ed2a0eed s3 swat: Add XSRF protection to status page
Signed-off-by: Kai Blin <kai@samba.org>
2011-07-26 22:22:25 +02:00
Kai Blin
c379b3623a s3 swat: Add support for anti-XSRF token 2011-07-26 22:22:25 +02:00