summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-07-29s4-dsdb: Provide a way to force incoming renames to take priorityAndrew Bartlett1-2/+4
This should mean that a samba-tool drs replicate --full-sync forces a replication of all objects, regardless of if we think the local name is newer and regards any local name as being in conflict. Andrew Bartlett
2012-07-29s4-dsdb: Provide a way to handle conflicts due to renameAndrew Bartlett1-25/+102
This allows us to proceed with replication when the source DC is sending us an object which has a matching object in this NC (by name) but not by GUID. Andrew Bartlett
2012-07-29s4-librpc: Fix private context for dcerpc_connect_timeout_handlerAndrew Bartlett1-4/+4
This was incorrect in 02a356ea775a3ba589cb50af3c861ab86aaffa0b. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sun Jul 29 14:54:33 CEST 2012 on sn-devel-104
2012-07-29s4-repl: Use ldb_dn_new() to create the rootDSE DNAndrew Bartlett1-1/+5
Based on a patch proposal by Matthieu Patou <mat@matws.net>. Andrew Bartlett
2012-07-29s4-repl: Use NULL for pointer test when checking for ldb_msg_new() failureAndrew Bartlett1-1/+1
2012-07-29s3-libsmbclient: Add missing talloc_stackframe() callsAndrew Bartlett1-0/+16
These caused a panic with the new assertion on the talloc stackframe being in place. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sun Jul 29 05:21:24 CEST 2012 on sn-devel-104
2012-07-28s4-dbcheck: Add lastKnownParent when moving an object to lostAndFoundAndrew Bartlett1-7/+28
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sat Jul 28 05:40:43 CEST 2012 on sn-devel-104
2012-07-27lib/param: Rename "socket address" to "nbt client socket address" to clarify ↵Andrew Bartlett9-17/+24
role This parameter is only used in our NBT client code and in nmbd as a fallback when we fail to select a better interface from "interfaces" to use directly. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Fri Jul 27 12:16:25 CEST 2012 on sn-devel-104
2012-07-27lib/param: Remove use of lp{cfg,}_socket_address outside the NBT client and ↵Andrew Bartlett4-32/+10
server In these other cases, control of the sockets to bind to can be obtained using "bind interfaces only = yes" and "interfaces = ". Andrew Bartlett
2012-07-27lib/param: Mark lpcfg_cachedir and lpcfg_statedir as const char *Andrew Bartlett1-2/+2
This matters as we sync up the declarations with the source3/param code. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Fri Jul 27 05:26:45 CEST 2012 on sn-devel-104
2012-07-27lib/param: Remove unused "paranoid server security"Andrew Bartlett4-12/+0
This became unused when security=server went away. Andrew Bartlett
2012-07-27docs: Mark "socket address" as deprecatedAndrew Bartlett2-1/+2
2012-07-27param: Make socket_address common, Revert ↵Andrew Bartlett4-18/+2
611ef42053eb99f4c29d4efa86eaea9f1ca06286 This essentially reverts the commit 611ef42053eb99f4c29d4efa86eaea9f1ca06286 Author: Yasuma Takeda <yasuma@osstech.co.jp> Date: Fri Dec 5 13:37:51 2008 -0800 Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in smb.conf Intead, the documentation is fixed so that the correct default is recorded. Removing the special case handling here allows this to be dealt with in the same way as all other parameters. Andrew Bartlett
2012-07-27lib/param: Merge parameter tables into a common fileAndrew Bartlett3-8247/+4126
This file is then included into both loadparm systems. Andrew Bartlett Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
2012-07-27lib/param: Merge in source3 parameters into parmeter tableAndrew Bartlett1-15/+48
This finishes the series to remove the various warnings from smb.conf loading when a source3 parameter is used. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-27lib/param: Merge "Security Options" section from source3/paramAndrew Bartlett1-24/+589
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-27lib/param: Merge "Logging Options" section from source3/paramAndrew Bartlett1-7/+109
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-27s3-param: Merge "log file" parameter with lib/paramAndrew Bartlett1-1/+7
The lib/param code uses a special handler for setting the log file. We need to set this here, so that we can make this table common. Andrew Bartlett
2012-07-27lib/param: Merge "Protocol Options" section from source3/paramAndrew Bartlett1-54/+253
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-27lib/param: Merge "Tuning Options" section from source3/paramAndrew Bartlett1-4/+252
This will reduced the weight of the eventual merge of all of source3/param. Andrew Bartlett
2012-07-27lib/param: Merge "Printing Options" section from source3/paramAndrew Bartlett1-3/+290
This will reduced the weight of the eventual merge of all of source3/param. Andrew Bartlett
2012-07-27s3-build: Make recursive waf build a developer build again (to build ↵Andrew Bartlett1-1/+1
developer test facilities) My commit f446506608ba93303b9c671bdaacd692f72bad28 was to work around the automatic ABI check in the waf developer build. However, now that the validity of loadparm options depends on this being a developer build, we need to change back, but disable the ABI check. Andrew Bartlett
2012-07-27s3:vlp: fix build on OS XBjörn Jacke1-0/+1
Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Fri Jul 27 03:13:59 CEST 2012 on sn-devel-104
2012-07-26buildtools: use egrep when we need the "-f patternfile" optionBjörn Jacke1-2/+2
Solaris' default grep doesn't know the -f option Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Thu Jul 26 20:49:18 CEST 2012 on sn-devel-104
2012-07-26s3/aio_fork: fix build on irixBjörn Jacke2-0/+5
IRIX needs _XOPEN_SOURCE defined for SCM_RIGHTS to be available
2012-07-26s3: use libreplace in pthreadpooltest to fix some buildsBjörn Jacke1-1/+1
2012-07-26s3: add Darwin sendfile support and merge with the FreeBSD codeBjörn Jacke1-50/+44
This is based on the adpotion of the FreeBSD sendfile code that was done by James Peach for Darwin. Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Thu Jul 26 17:19:09 CEST 2012 on sn-devel-104
2012-07-26s3:waf: add Darwin sendfile() testBjörn Jacke1-0/+23
2012-07-26s3:configure: add Darwin sendfile() testBjörn Jacke1-0/+32
2012-07-26lib/param: Merge "Filename Handling" section from source3/paramAndrew Bartlett1-7/+211
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Thu Jul 26 14:16:02 CEST 2012 on sn-devel-104
2012-07-26lib/param: Merge "Domain Options" section from source3/paramAndrew Bartlett1-0/+13
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "Logon Options" section from source3/paramAndrew Bartlett1-8/+186
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "Browse Options" section from source3/paramAndrew Bartlett1-14/+73
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "WINS Options" section from source3/paramAndrew Bartlett1-1/+13
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "Locking Options" section from source3/paramAndrew Bartlett1-5/+89
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "Ldap Options" section from source3/paramAndrew Bartlett1-0/+178
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "EventLog Options" section from source3/paramAndrew Bartlett1-0/+10
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26lib/param: Merge "Miscellaneous Options" section from source3/paramAndrew Bartlett1-12/+491
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
2012-07-26s3:smb2_negprot: return the current system time in the SMB2 NEGPROT responseStefan Metzmacher1-1/+2
metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Jul 26 11:56:02 CEST 2012 on sn-devel-104
2012-07-26s3:smbd: fix compiler warnings in notify_internal.cStefan Metzmacher1-3/+5
metze
2012-07-26libcli/smb: add basic session->smb2.channel_sequence handlingStefan Metzmacher2-0/+34
metze
2012-07-26libcli/smb: add SMB2_HDR_CHANNEL_SEQUENCEStefan Metzmacher1-0/+1
metze
2012-07-26libcli/smb: introduce a smb2cli_sessionStefan Metzmacher1-107/+93
This maintains the shared state between multiple session channels. metze
2012-07-26s3:smb2_sesssetup: reject SMB2_SESSION_FLAG_BINDING requestsStefan Metzmacher1-0/+13
metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Jul 26 02:08:56 CEST 2012 on sn-devel-104
2012-07-26s3:libcli/smb: add SMB2_SESSION_FLAG_BINDINGStefan Metzmacher1-1/+4
metze
2012-07-25s3:smb2_ioctl: fix GUID_compare() check in FSCTL_VALIDATE_NEGOTIATE_INFOStefan Metzmacher1-1/+1
metze
2012-07-25s3:smb2_ioctl: allow clients to send padding at the end of ↵Stefan Metzmacher1-1/+1
FSCTL_VALIDATE_NEGOTIATE_INFO metze
2012-07-25s3:smb2_ioctl: remove FSCTL_VALIDATE_NEGOTIATE_INFO_224 implementationStefan Metzmacher1-77/+0
Only Windows8 Beta uses this and it's broken, the client send wrong capabilities. Just returning an error seems to be fine for the Windows8 Beta client. metze
2012-07-25libcli/smb: setup tcon->smb2.should_encrypt in smb2cli_tcon_set_values()Stefan Metzmacher1-1/+16
metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Wed Jul 25 16:44:22 CEST 2012 on sn-devel-104
2012-07-25libcli/smb: pass smbXcli_session to smb2cli_tcon_set_values()Stefan Metzmacher8-0/+13
metze