summaryrefslogtreecommitdiff
path: root/source3
AgeCommit message (Collapse)AuthorFilesLines
2012-06-15lib/param: Create a seperate server role for "active directory domain ↵Andrew Bartlett1-1/+1
controller" This will allow us to detect from the smb.conf if this is a Samba4 AD DC which will allow smarter handling of (for example) accidentially starting smbd rather than samba. To cope with upgrades from existing Samba4 installs, 'domain controller' is a synonym of 'active directory domain controller' and new parameters 'classic primary domain controller' and 'classic backup domain controller' are added. Andrew Bartlett
2012-06-15s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth ↵Andrew Bartlett1-7/+2
module list
2012-06-15s3-auth: Fix system info3 return to be just SID_NT_SYSTEMAndrew Bartlett1-11/+17
The SID for the SYSTEM token should be a fixed value, and not the administrator. Note however that it will be replaced by the SID of sec_initial_uid() by the create_local_token() code. Fixing this requires fixes the other parts of the code that cannot cope with a token of just SID_NT_SYSTEM. Andrew Bartlett
2012-06-15s3-auth: Fix system token generation not to dereference pointer as an integerAndrew Bartlett1-1/+1
This continues on from commit caaebb455cf955f66c2f662c53998c480cb2d6c9 which is marked as being part of bug #8944, ldapsam:trusted and ipasam and an additional fix for bug #8567 (0528cb5f3a15b72dcb34ece21a3ffb3e7b8d6eb9). The problem here was that the primary_gid was simply the pointer result of dom_sid_parse_talloc() cast to a uint32_t (found by the IRIX cc on the build farm). Andrew Bartlett
2012-06-15s3-auth: Give the SYSTEM token all privilegesAndrew Bartlett1-0/+4
2012-06-15s3:smb2_server: remember the request_time on an incoming requestStefan Metzmacher3-0/+5
metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Fri Jun 15 09:17:33 CEST 2012 on sn-devel-104
2012-06-15s3:smbd: remember the request_time on an incoming requestStefan Metzmacher2-0/+6
metze
2012-06-15s3:vfs: change files_struct.fnum from int to uint64_tMichael Adam3-3/+4
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Fri Jun 15 05:22:41 CEST 2012 on sn-devel-104
2012-06-15s3:smbd: change trans2.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-17/+17
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_write.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-6/+6
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_setinfo.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-3/+4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_read.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-6/+6
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_notify.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_lock.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-6/+6
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_ioctl.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_getinfo.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-4/+4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_flush.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_find.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_close.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change smb2_break.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-6/+6
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change reply.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-50/+50
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change pipes.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-3/+3
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change oplock.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-5/+5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change open.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-4/+4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change nttrans.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-3/+5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change files.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change fake_file.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change blocking.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-14/+15
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change aio.c to use fsp_fnum_dbg() for logging fsp->fnum.Michael Adam1-2/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:vfs_default: use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-6/+10
Note: it is actually wrong to access the fsp->fnum at all here, since the fnum is part of the smb layer that should not be used in the vfs layer. But this is subject be separated more cleanly in later commits. This change only unifies the logging of fsp->fnum. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:locking: change locking.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-8/+8
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:locking: change brlock.c to use fsp_fnum_dbg() for fsp->fnum logging.Michael Adam1-4/+4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:lib: add a utility function "fsp_fnum_dbg" for logging the fnum of an fspMichael Adam2-0/+29
This is to unify logging of an files_struct. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:lib: elaborate the comment for fsp_str_debug a bit.Michael Adam1-1/+1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:lib: remove part of a comment for fsp_str_dbg that does not apply any more.Michael Adam1-2/+1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: change FNUM_FIELD_INVALID from -1 to 0Michael Adam1-1/+1
This is in preparation for changing the type of files_struct.fnum to unit64_t. This can safely be done, since all checks have been converted to using FNUM_FIELD_INVALID and fsp->fnum is only ever set to either FNUM_FIELD_INVALID or some i + FILE_HANDLE_OFFSET with i >= 0 and FILE_HANDLE_OFFSET > 0. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: use FNUM_FIELD_INVALID instead of literal -1Michael Adam4-9/+13
This is in preparation of changing fnum to uint64_t Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:include: define FNUM_FIELD_INVALID - the invalid value for the fnumMichael Adam1-0/+2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:files: factor fsp_free() out of file_free()Michael Adam2-20/+28
To be reused in the durable reconnect code. Pair-Programmed-With: Volker Lendecke <vl@samba.org>
2012-06-15s3:files: reorder file_free() a bitMichael Adam1-16/+18
Pair-Programmed-With: Volker Lendecke <vl@samba.org> Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
2012-06-15s3:smbd: refactor fsp_new() out of file_new()Michael Adam2-34/+57
Pair-Programmed-With: Volker Lendecke <vl@samba.org> Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
2012-06-14s3:smbd: use fsp_persistent_id() as persistent_file_id part for SMB2 (bug #8995)Stefan Metzmacher3-6/+9
It seems to be important to have unique persistent file ids, because windows clients seem to index files by server_guid + persistent_file_id. Which may break, if we just have a 16-bit range per connection and the client connects multiple times. Based on code from Ira Cooper. Use fsp->fh->gen_id as the persistent fileid in SMB2. metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Jun 14 22:04:13 CEST 2012 on sn-devel-104
2012-06-14s3:smbd: add a fsp_persistent_id() functionStefan Metzmacher2-0/+25
This calculates a 64-bit value that most likely uniquely identifies the files_struct globally to the server. * 32-bit random gen_id * 16-bit truncated open_time * 16-bit fnum (valatile_id) Based on code from Ira Cooper. Use fsp->fh->gen_id as the persistent fileid in SMB2. Pair-Programmed-With: Michael Adam <obnox@samba.org> metze
2012-06-14s3:smbd: only set fsp->fh->gen_id for a client connectionStefan Metzmacher1-1/+2
For faked connections, like dfs and printing, we leave it as 0. metze
2012-06-14s3:smbd: try to make fsp->fh->gen_id as globally unique as possibleStefan Metzmacher1-1/+19
This makes sure the value is never 0, it's between 1 and UINT32_MAX. While fsp->fh->gen_id is 'unsigned long' currently (which might by 8 bytes), there's some oplock code which truncates it to uint32_t (using IVAL()). Which means we could reuse fsp->fh->gen_id as persistent file id until we have a final fix, which uses database. See bug #8995 for more details. Based on code from Ira Cooper. Ensure fsp->fh->gen_id starts from a random point. We will use this as the SMB2 persistent_id. metze
2012-06-14s3: Simplify tdb_data_is_cstr a bitVolker Lendecke1-1/+1
The original code contained rawmemchr for performance reasons. I would expect the very common strlen routine to be not much worse performance-wise than rawmemchr. On top, for me this patch simplifies the expression a bit. Signed-off-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Thu Jun 14 16:55:58 CEST 2012 on sn-devel-104
2012-06-14s3: Fix a commentVolker Lendecke1-15/+13
The fd count is implicit Signed-off-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Jun 14 01:53:17 CEST 2012 on sn-devel-104
2012-06-12s3: Make --pw-nt-hash useable in smbclientVolker Lendecke1-0/+3
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Tue Jun 12 12:41:10 CEST 2012 on sn-devel-104
2012-06-12s3: Add --pw-nt-hash to popt_common_credentialsVolker Lendecke1-0/+5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-12s3: Add cli_state->pw_nt_hashVolker Lendecke3-1/+10
Signed-off-by: Stefan Metzmacher <metze@samba.org>