Re: [Samba] Help infomation to build the system as Microsoft Active Directory !
Many of your questions should be answered on www.samba.org and wiki.samba.org Samba4 provides Active Directory functionality. It is free - you don't have to pay for it, but there is the cost of your time. On 07/24/12 08:08, Ha Minh Ai wrote: Dear Mr/Madam, We have wanted to build the system for centralizal management: User account, printer, policy, deploy softwares to client, manage update OS, Single Sign On, I know there have a same system as Micrsoft Active Directory, but we haven't a lot dollars. Please help me to answer some questions as the below: - How is the solution (*OpenLDAP + Samba*) on Ubuntu, RHEL/CentOS or SUSE server ? - How many user can the system support maximum ? - Could i build the system include Primary Domain Controller Server and Additional Domain Controller ? - Does Samba/OpenLDAP has cost-edition for enterprise ? If yes, what is it different from free-edition ? I'm looking forward to supporting from you. Thanks so much Best regards, Aihm -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 and Bind9
Samba 4.0.0beta4, CentOS 6.3.
It seems to me that when samba updates its DNS entries by processing a
dns_update_list entry such as:
A ${DNSDOMAIN} $IP
then:
(1) it is using the Kerberos realm name for DNSDOMAIN rather than the DNS
domain name. Indeed, it seems to me that there is quite a bit of confusion
between the two throughout Samba4.
(2) when a second or third DC is added, the value for $IP inserted in the
second or third DNS is the IP address of the first DC, not that of the
second or third. Huh?
I would _like_ the realm name and the DNS domain name to be the same, but
it appears that one cannot do that: bind9 will no longer start, as I
observed and reported previously.
Steve
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
[Samba] ANNOUNCE: cifs-utils release 5.6 is ready for download
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Time for another cifs-utils release! Highlights: * binaries are now built by default with PIE and RELRO support for better protection against exploits * better debugging and warnings for cifs.upcall and cifscreds * better integration with systemd by having mount.cifs use systemd-ask-password if it's appropriate and available webpage:https://wiki.samba.org/index.php/LinuxCIFS_utils tarball:ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/ git:git://git.samba.org/cifs-utils.git gitweb: http://git.samba.org/?p=cifs-utils.git;a=summary Detailed list of changes since 5.5: commit df561d40947e0b520deb48e1a4749afe9787949a Author: Jeff Layton jlay...@samba.org Date: Fri Jun 1 13:56:21 2012 -0400 autoconf: set version to 5.5.1 for interim builds Signed-off-by: Jeff Layton jlay...@samba.org commit 74edf24d9780900f3ce15d2403c6e331b031d454 Author: Jeff Layton jlay...@samba.org Date: Thu Jun 14 10:59:18 2012 -0400 automake: revert -Werror by default I think in hindsight, that adding -Werror by default was a mistake. cifs-utils is built in a wide range of environments and tools, and it's very difficult to eliminate all of the possible warnings. Let's go ahead and remove it and reduce the steady trickle of patches that are simply to silence obscure warnings. Cc: Suresh Jayaraman sjayara...@suse.com Signed-off-by: Jeff Layton jlay...@samba.org commit 0eb3daa4b17ee64b464594f1a5d413ecb364957c Author: Jeff Layton jlay...@samba.org Date: Thu Jun 14 10:59:18 2012 -0400 mount.cifs: set rc to 0 in libcap toggle_dac_capability Thus spake Jochen: The mount.cifs program from the cifs-utils package 5.5 did not work on my Linux system. It just exited without an error message and did not mount anything. [...] I think, when this variable rc is now used in this function, it has also to be properly initialized there. Reported-by: Jochen Roderburg roderb...@uni-koeln.de Signed-off-by: Jeff Layton jlay...@samba.org commit b7bea5254443cb121b0cf03a64b123b85d7f9fbb Author: Jeff Layton jlay...@samba.org Date: Thu Jun 14 11:05:43 2012 -0400 cifs.upcall: more debug logging for krb5 upcalls While helping to track down a configuration problem, I found this little bit of extra debug logging to be helpful. Might as well make it part of the stock binary. Signed-off-by: Jeff Layton jlay...@samba.org commit a8611e25d44211cd57a91dce4fe7d7a7ad7534d4 Author: Jeff Layton jlay...@samba.org Date: Fri Jul 6 11:48:18 2012 -0400 replace: remove bzero() redefinition from replace.h I borrowed replace.h from samba when I split off the package, and we have a ton of definitions in there that we don't really need. This is one of them and it causes a warning when we build on RHEL5. Reported-by: Andreas Schneider a...@samba.org Signed-off-by: Jeff Layton jlay...@samba.org commit 233e17db8ef7edba1fea660e076a03a56b0117d2 Author: Jeff Layton jlay...@samba.org Date: Mon Jul 9 14:12:33 2012 -0400 autoconf: add --enable-pie and --enable-relro -pie and -fpie enable the building of position-independent executables, and -Wl,-z,relro turns on read-only relocation support in gcc. These options are important for security purposes to guard against possible buffer overflows that lead to exploits. Follow the example of samba here and enable these by default, but add configure options that allow people to turn them off at build-time if necessary. We may also want to eventually add checks to ensure that the compiler and linker understand these options, but I'll wait until we have some evidence that it's needed before I expend the effort. Reported-by: Andreas Schneider a...@samba.org Signed-off-by: Jeff Layton jlay...@samba.org commit ced19dedc0fa7b36087b8eaeef6a6a9dc76aa55e Author: Andreas Schneider a...@cryptomilk.org Date: Mon Jul 9 22:21:04 2012 -0400 autoconf: Fix building with autoconf version older than 2.60. AC_PROG_SED is only avaliable in recent autoconf versions. Use AC_CHECK_PROG instead if AC_PROG_SED is not present. Signed-off-by: Andreas Schneider a...@cryptomilk.org commit 4e264031d0da7d3f2a287337e86b623e814f5c56 Author: Ankit Jain jan...@suse.de Date: Wed Jul 18 06:47:07 2012 -0400 mount.cifs: Use systemd's mechanism for getting password, if present. If systemd is running and /bin/systemd-ask-password if available, then use that else fallback on getpass(..). And add a --enable-systemd configure option, which defaults to yes. Signed-off-by: Ankit Jain jan...@suse.com commit 877701f3cc23df3cb2a293c060bdbf05a87bff6a Author: Luk Claes l...@debian.org Date: Thu Jul 19 09:27:01 2012 -0400 mount.cifs: Use errno instead of having unknown error
Re: [Samba] Samba4 and Bind9
On 26/07/12 15:32, Steve Thompson wrote:
Samba 4.0.0beta4, CentOS 6.3.
It seems to me that when samba updates its DNS entries by processing a
dns_update_list entry such as:
A ${DNSDOMAIN} $IP
then:
(1) it is using the Kerberos realm name for DNSDOMAIN rather than the
DNS domain name. Indeed, it seems to me that there is quite a bit of
confusion between the two throughout Samba4.
(2) when a second or third DC is added, the value for $IP inserted in
the second or third DNS is the IP address of the first DC, not that of
the second or third. Huh?
I would _like_ the realm name and the DNS domain name to be the same,
but it appears that one cannot do that: bind9 will no longer start, as
I observed and reported previously.
Steve
Bind9 will not start if you set it up before provisioning Samba4, you
will end up with two zones, one will be the flat file you created and
the other will be the dlz file created by Samba4 and they will clash.
Provision Samba4 then add any servers, workstations etc to the dns
domain (and yes, the realm can be the same as the dns domain, i.e. they
both can be example.com). To add to the bind9 dlz file, use samba-tool
dns add server zone name A||PTR|CNAME|NS|MX|SRV|TXT data
Try samba-tool dns add --help
Rowland
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 and Bind9
On Thu, 26 Jul 2012, Rowland Penny wrote: To add to the bind9 dlz file, use samba-tool dns add server zone name A||PTR|CNAME|NS|MX|SRV|TXT data I realize that one could do this if absolutely desperate, but it is the most dreadful hack! Very ugly. Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a67daa3 s3:smb2_negprot: return the current system time in the SMB2
NEGPROT response
via f6592c4 s3:smbd: fix compiler warnings in notify_internal.c
via 8cb6557 libcli/smb: add basic session-smb2.channel_sequence
handling
via fdd9867 libcli/smb: add SMB2_HDR_CHANNEL_SEQUENCE
via ba14bc5 libcli/smb: introduce a smb2cli_session
from df08929 s3:smb2_sesssetup: reject SMB2_SESSION_FLAG_BINDING requests
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a67daa3aa6ce0e9ba8cf8db34d889fe5c8f65f3f
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 26 09:55:29 2012 +0200
s3:smb2_negprot: return the current system time in the SMB2 NEGPROT response
metze
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Thu Jul 26 11:56:02 CEST 2012 on sn-devel-104
commit f6592c427dbcc347ec7752c8182029a3ba937fbd
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 26 08:37:43 2012 +0200
s3:smbd: fix compiler warnings in notify_internal.c
metze
commit 8cb6557d22fef2570156f56a8bad00cac6b7e016
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 26 01:54:33 2012 +0200
libcli/smb: add basic session-smb2.channel_sequence handling
metze
commit fdd98675ac6faa3f4a9cd1d8907796bbbd97b729
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 26 01:54:02 2012 +0200
libcli/smb: add SMB2_HDR_CHANNEL_SEQUENCE
metze
commit ba14bc52dab26bd9fdf54bbd317f329281cecb52
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 26 02:36:37 2012 +0200
libcli/smb: introduce a smb2cli_session
This maintains the shared state between multiple session
channels.
metze
---
Summary of changes:
libcli/smb/smb2_constants.h|1 +
libcli/smb/smbXcli_base.c | 233 ++--
libcli/smb/smbXcli_base.h |1 +
source3/smbd/notify_internal.c |8 +-
source3/smbd/smb2_negprot.c|3 +-
5 files changed, 135 insertions(+), 111 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index a00a4a7..6b9ad85 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -43,6 +43,7 @@
#define SMB2_HDR_CREDIT_CHARGE 0x06
#define SMB2_HDR_EPOCH SMB2_HDR_CREDIT_CHARGE /* TODO: remove this */
#define SMB2_HDR_STATUS0x08
+#define SMB2_HDR_CHANNEL_SEQUENCE SMB2_HDR_STATUS /* in requests */
#define SMB2_HDR_OPCODE0x0c
#define SMB2_HDR_CREDIT0x0e
#define SMB2_HDR_FLAGS 0x10
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 7a5a0b0..a363b44 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -128,6 +128,20 @@ struct smbXcli_conn {
struct smbXcli_session *sessions;
};
+struct smb2cli_session {
+ uint64_t session_id;
+ uint16_t session_flags;
+ DATA_BLOB application_key;
+ DATA_BLOB signing_key;
+ bool should_sign;
+ bool should_encrypt;
+ DATA_BLOB encryption_key;
+ DATA_BLOB decryption_key;
+ uint64_t nonce_high;
+ uint64_t nonce_low;
+ uint16_t channel_sequence;
+};
+
struct smbXcli_session {
struct smbXcli_session *prev, *next;
struct smbXcli_conn *conn;
@@ -136,19 +150,11 @@ struct smbXcli_session {
uint16_t session_id;
} smb1;
+ struct smb2cli_session *smb2;
+
struct {
- uint64_t session_id;
- uint16_t session_flags;
- DATA_BLOB application_key;
DATA_BLOB signing_key;
- bool should_sign;
- bool should_encrypt;
- DATA_BLOB encryption_key;
- DATA_BLOB decryption_key;
- uint64_t channel_nonce;
- uint64_t channel_next;
- DATA_BLOB channel_signing_key;
- } smb2;
+ } smb2_channel;
};
struct smbXcli_tcon {
@@ -905,6 +911,8 @@ static bool smbXcli_conn_receive_next(struct smbXcli_conn
*conn)
void smbXcli_conn_disconnect(struct smbXcli_conn *conn, NTSTATUS status)
{
+ struct smbXcli_session *session;
+
tevent_queue_stop(conn-outgoing);
if (conn-read_fd != -1) {
@@ -916,6 +924,18 @@ void smbXcli_conn_disconnect(struct smbXcli_conn *conn,
NTSTATUS status)
conn-read_fd = -1;
conn-write_fd = -1;
+ session = conn-sessions;
+ if (talloc_array_length(conn-pending) == 0) {
+ /*
+* if we do not have pending requests
+* there is no need to update the channel_sequence
+*/
+ session = NULL;
+ }
+ for (; session; session
[SCM] CTDB repository - branch master updated - ctdb-1.13-214-gb3e798f
The branch, master has been updated
via b3e798f357606648f04d8a67ffee775b34fdede7 (commit)
via 538c68d0e83e14f981ee06408b8f0035be37 (commit)
via 3de2830ae68241ee95bcc14dc1bb896ff18d86ce (commit)
via 25f84797a64a683c303b04057aa8113e9fc47c49 (commit)
from d29e1880c8ce7219e065d31b47b0e8ad9e83146d (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit b3e798f357606648f04d8a67ffee775b34fdede7
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Jul 24 17:27:22 2012 +1000
web: Add my name to the developer list.
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 538c68d0e83e14f981ee06408b8f0035be37
Author: Amitay Isaacs ami...@gmail.com
Date: Fri Jun 15 11:05:00 2012 +1000
Remove tevent_loop_allow_nesting()
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 3de2830ae68241ee95bcc14dc1bb896ff18d86ce
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Jun 6 16:19:10 2012 +1000
ctdbd: Return explicit boolean values for function returning bool
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 25f84797a64a683c303b04057aa8113e9fc47c49
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Jun 6 16:16:15 2012 +1000
util: Do not try to lockdown memory when running in local daemons mode
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
common/ctdb_util.c|7 ++-
server/ctdb_daemon.c |2 +-
server/ctdb_freeze.c |2 +-
server/ctdb_logging.c |1 -
tools/ctdb.c |1 -
web/index.html|1 +
6 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index b9af95b..30effdd 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -642,10 +642,15 @@ void ctdb_lockdown_memory(struct ctdb_context *ctdb)
return;
}
+ /* Ignore when running in local daemons mode */
+ if (getpid() != 0) {
+ return;
+ }
+
/* Avoid compiler optimizing out dummy. */
mlock(dummy, sizeof(dummy));
if (mlockall(MCL_CURRENT) != 0) {
- DEBUG(DEBUG_WARNING,(Failed to lock memory: %s'\n,
+ DEBUG(DEBUG_WARNING,(Failed to lockdown memory: %s'\n,
strerror(errno)));
}
#endif
diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index e403c08..13ea319 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -1214,7 +1214,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool
do_fork, bool use_syslog,
ctdb_run_notification_script(ctdb, init);
/* start frozen, then let the first election sort things out */
- if (ctdb_blocking_freeze(ctdb)) {
+ if (!ctdb_blocking_freeze(ctdb)) {
ctdb_fatal(ctdb, Failed to get initial freeze\n);
}
diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
index c8941f2..7d17899 100644
--- a/server/ctdb_freeze.c
+++ b/server/ctdb_freeze.c
@@ -359,7 +359,7 @@ bool ctdb_blocking_freeze(struct ctdb_context *ctdb)
}
}
- return 0;
+ return true;
}
diff --git a/server/ctdb_logging.c b/server/ctdb_logging.c
index 7133d06..9455ff1 100644
--- a/server/ctdb_logging.c
+++ b/server/ctdb_logging.c
@@ -118,7 +118,6 @@ int start_syslog_daemon(struct ctdb_context *ctdb)
debug_extra = talloc_asprintf(NULL, syslogd:);
talloc_free(ctdb-ev);
ctdb-ev = event_context_init(NULL);
- tevent_loop_allow_nesting(ctdb-ev);
syslog(LOG_ERR, Starting SYSLOG daemon with pid:%d, (int)getpid());
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 8e960a1..d034591 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -5927,7 +5927,6 @@ int main(int argc, const char *argv[])
DEBUG(DEBUG_ERR, (Failed to initialize event system\n));
exit(1);
}
- tevent_loop_allow_nesting(ev);
for (i=0;iARRAY_SIZE(ctdb_commands);i++) {
if (strcmp(control, ctdb_commands[i].name) == 0) {
diff --git a/web/index.html b/web/index.html
index d9d03a2..91f87e8 100644
--- a/web/index.html
+++ b/web/index.html
@@ -135,6 +135,7 @@ projects that want to make their services cluster aware
using CTDB.
lia href=http://sernet.de/Samba/;Volker Lendecke/a/li
liStefan Metzmacher/li
lia href=http://meltin.net/people/martin/;Martin Schwenke/a/li
+liAmitay Isaacs/li
/ul
!--#include virtual=footer.html --
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-221-g624f467
The branch, master has been updated
via 624f4677e99ed1710a0ace76201150349b1a0335 (commit)
via 5d713d5e5be67f5914a661694c15d938bd67dea3 (commit)
via 630cfe6451ba23d959fa4907fbba42702337ed3b (commit)
via 34f58a0773618c4508a55ad75fc4602dad5a5f4c (commit)
via f6e421e8bf935cae790a6dc2b861eb9c7f8610b4 (commit)
via 07149edaecb3caa672163e5a3b89715557d5205a (commit)
via e20fdb974158061f4627d6f360c168d764690e6f (commit)
from b3e798f357606648f04d8a67ffee775b34fdede7 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 624f4677e99ed1710a0ace76201150349b1a0335
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 24 11:23:09 2012 +1000
Eventscripts: Default route on NAT gateway should have a metric of 10
At the moment routes from 11.routing can fail to be added because they
conflict with the default route added by 11.natgw.
NAT gateway is meant to be a last resort, so routes from 11.routing
should override it.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 5d713d5e5be67f5914a661694c15d938bd67dea3
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 20:10:11 2012 +1000
Eventscripts: Update/remove stale comments in 11.natgw
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 630cfe6451ba23d959fa4907fbba42702337ed3b
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 15:39:50 2012 +1000
Eventscripts: Retrieve and build NAT gateway details better in 11.natgw
* ctdb natgw is run twice when it doesn't need to be.
* Tweak the parsing of ctdb natgw output so that it is done by the
shell instead of a bunch of external processes.
* Make default NAT gateway be -1, even on error. If the process
failed entirely then it could previously be empty.
* Streamline the error handling using die() for when there is no NAT
gateway.
* Downcase script-local variable names.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 34f58a0773618c4508a55ad75fc4602dad5a5f4c
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 15:37:14 2012 +1000
Eventscripts: Optimise building the host address in 11.natgw
It can be build without forking unnecessary processes.
Also downcase variable name because it is local to script.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit f6e421e8bf935cae790a6dc2b861eb9c7f8610b4
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 15:32:38 2012 +1000
Eventscripts: Clean up startup sanity check in 11.natgw
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 07149edaecb3caa672163e5a3b89715557d5205a
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 15:26:16 2012 +1000
Eventscripts: remove redundant firewall rules from 11.natgw
aeb70c7e7822854eb87873a5c7783e27e6e72318 said it moved these but it
redundantly duplicated them instead. That commit also fixed the
problem because it moved the rules after delete_all() not out of the
startup event as claimed.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit e20fdb974158061f4627d6f360c168d764690e6f
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 15:21:10 2012 +1000
Eventscripts: 11.natgw $CTDB_NATGW_PUBLIC_IP splitting optimisation
$CTDB_NATGW_PUBLIC_IP can be split into $_ip and $_maskbits without
forking lots of processes.
Also local isn't supported by POSIX.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/11.natgw | 54 +--
doc/ctdbd.1 |8 +-
doc/ctdbd.1.html | 168 +++--
doc/ctdbd.1.xml | 12 ++-
4 files changed, 116 insertions(+), 126 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index 5093752..3eb3dad 100755
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -18,8 +18,8 @@ else
fi
delete_all() {
- local _ip=`echo $CTDB_NATGW_PUBLIC_IP | cut -d '/' -f1`
- local _maskbits=`echo $CTDB_NATGW_PUBLIC_IP | cut -d '/' -f2`
+ _ip=${CTDB_NATGW_PUBLIC_IP%/*}
+ _maskbits=${CTDB_NATGW_PUBLIC_IP#*/}
[ -z $CTDB_NATGW_PUBLIC_IFACE ] || {
delete_ip_from_iface $CTDB_NATGW_PUBLIC_IFACE $_ip $_maskbits
2/dev/null
@@ -36,58 +36,40 @@ delete_all() {
case $1 in
startup)
- [ -z $CTDB_PUBLIC_ADDRESSES ] {
- CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
- }
- egrep ^$CTDB_NATGW_PUBLIC_IP[ \t] $CTDB_PUBLIC_ADDRESSES /dev/null
- [ $? = 0 ] {
- echo ERROR: NATGW configured to use a public address. NATGW
must not use
[SCM] CTDB repository - branch master updated - ctdb-1.13-222-g25d45e6
The branch, master has been updated via 25d45e69f4ffc2b26061ac13038d52a353e79e61 (commit) from 624f4677e99ed1710a0ace76201150349b1a0335 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 25d45e69f4ffc2b26061ac13038d52a353e79e61 Author: Martin Schwenke mar...@meltin.net Date: Thu Jul 5 16:27:54 2012 +1000 statd-callout: Fix a bug in the calculations of $STATE It is just meant to be even, so divided *and* multiplied by 2. Use $(( )) to make it more readable. While touching this code, make the related calculation a bit more readable too. Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: config/statd-callout |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/config/statd-callout b/config/statd-callout index 63fee09..0e52cba 100755 --- a/config/statd-callout +++ b/config/statd-callout @@ -129,8 +129,7 @@ case $1 in # We use epoch and hope the nodes are close enough in clock. # Even numbers mean service is shut down, odd numbers mean # service is started. - STATE=`date +%s` - STATE=`expr $STATE / 2` + STATE=$(( $(date '+%s') / 2 * 2)) # we must also let some time pass between stopping and restarting the @@ -189,7 +188,7 @@ case $1 in rm $CTDB_VARDIR/state/statd/ip/$IP/$CLIENT smnotify --client=$CLIENT --ip=$IP --server=$ip --stateval=$STATE smnotify --client=$CLIENT --ip=$IP --server=$NFS_HOSTNAME --stateval=$STATE - STATE=`expr $STATE + 1` + STATE=$(($STATE + 1)) smnotify --client=$CLIENT --ip=$IP --server=$ip --stateval=$STATE smnotify --client=$CLIENT --ip=$IP --server=$NFS_HOSTNAME --stateval=$STATE done -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-223-g21a5cbf
The branch, master has been updated
via 21a5cbf9518fafc610939f14874371a52b1dc8b3 (commit)
from 25d45e69f4ffc2b26061ac13038d52a353e79e61 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 21a5cbf9518fafc610939f14874371a52b1dc8b3
Author: Amitay Isaacs ami...@gmail.com
Date: Thu Jul 26 22:01:50 2012 +1000
util: Do not lock down memory when running with local daemons
Thanks to Ronnie for highlighting the issue of memory lockdown on AIX.
Fix typo, use getuid and not getpid.
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
common/ctdb_util.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 30effdd..ed322ac 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -642,8 +642,13 @@ void ctdb_lockdown_memory(struct ctdb_context *ctdb)
return;
}
+ /* TODO: Add a command line option to disable memory lockdown.
+* This can be a performance issue on AIX since fork() copies
+* all locked memory pages.
+*/
+
/* Ignore when running in local daemons mode */
- if (getpid() != 0) {
+ if (getuid() != 0) {
return;
}
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-232-g6616a57
The branch, master has been updated via 6616a5712b5d4db2b9ba6a88cec79378696c2184 (commit) via 7ef9916bd95ff2472359a412eac5489f1aad2dce (commit) via 3f268805c14c51f23024267916eae161bada8a0e (commit) via 8d17dacee415dd0b4268805a366a86f83e33f27c (commit) via 2fd0157382b42aa5c5212b8e743c6f589edc6662 (commit) via 47180dc75d15f3d61470705603565b718491c9f8 (commit) via 619af3e857c2ced3840abfd86135cc954796da97 (commit) via 6e7bd9685406ae024d413a5d9d8c6e0d89b15567 (commit) via f02e501342112aab67aee95f253e29a670b29273 (commit) from 21a5cbf9518fafc610939f14874371a52b1dc8b3 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 6616a5712b5d4db2b9ba6a88cec79378696c2184 Author: Martin Schwenke mar...@meltin.net Date: Fri Jul 20 17:00:12 2012 +1000 tests/tool: Run ctdb_tool_* under $VALGRIND Signed-off-by: Martin Schwenke mar...@meltin.net commit 7ef9916bd95ff2472359a412eac5489f1aad2dce Author: Martin Schwenke mar...@meltin.net Date: Wed Jul 4 07:29:18 2012 +1000 tests/eventscripts: Rewrite the testparm stub It currently needs the real testparm command installed even though it only uses limited features. It is easy enough to fake up the functionality that 50.samba uses. Signed-off-by: Martin Schwenke mar...@meltin.net commit 3f268805c14c51f23024267916eae161bada8a0e Author: Martin Schwenke mar...@meltin.net Date: Tue Jul 3 13:05:58 2012 +1000 tests/complex: Fix broken ctdb_test_check_real_cluster() It doesn't set $h at all... Signed-off-by: Martin Schwenke mar...@meltin.net commit 8d17dacee415dd0b4268805a366a86f83e33f27c Author: Martin Schwenke mar...@meltin.net Date: Mon Jul 2 14:18:51 2012 +1000 tests/simple: ctdb stop/continue tests weren't actually checking IPs The correct variable is $test_node_ips, not $ips. Signed-off-by: Martin Schwenke mar...@meltin.net commit 2fd0157382b42aa5c5212b8e743c6f589edc6662 Author: Martin Schwenke mar...@meltin.net Date: Mon Jul 2 14:06:35 2012 +1000 tests: select_test_node_and_ips() should try to avoid failing Sometimes ctdb sync doesn't do its job, so we end up with unassigned IPs. If $test_node isn't set then this is bad. However, try a few times to ensure it is set. Signed-off-by: Martin Schwenke mar...@meltin.net commit 47180dc75d15f3d61470705603565b718491c9f8 Author: Martin Schwenke mar...@meltin.net Date: Mon Jul 2 14:05:21 2012 +1000 tests: simple tests against local daemons should check $TEST_LOCAL_DEAMONS Note the old $CTDB_TEST_REAL_CLUSTER - it doesn't exist anymore... Signed-off-by: Martin Schwenke mar...@meltin.net commit 619af3e857c2ced3840abfd86135cc954796da97 Author: Martin Schwenke mar...@meltin.net Date: Wed Jun 20 15:57:48 2012 +1000 tests: run_tests should exit with $status with -e option Signed-off-by: Martin Schwenke mar...@meltin.net commit 6e7bd9685406ae024d413a5d9d8c6e0d89b15567 Author: Martin Schwenke mar...@meltin.net Date: Thu Jun 14 19:37:39 2012 +1000 tests/simple: ctdb reloadips test should use $test_ip There's no point recalculating this value. Signed-off-by: Martin Schwenke mar...@meltin.net commit f02e501342112aab67aee95f253e29a670b29273 Author: Martin Schwenke mar...@meltin.net Date: Thu Jun 14 19:36:04 2012 +1000 tests: select_test_node_and_ips() should never select non-node -1 Instead of selecting the 1st pnn found, select the 1st one that isn't -1. Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: tests/complex/scripts/local.bash |3 +++ tests/events.d/00.test|4 ++-- tests/eventscripts/stubs/testparm | 31 +++ tests/scripts/integration.bash| 31 --- tests/scripts/run_tests |2 +- tests/simple/11_ctdb_ip.sh|2 +- tests/simple/18_ctdb_reloadips.sh | 11 +-- tests/simple/41_ctdb_stop.sh |2 +- tests/simple/42_ctdb_continue.sh |2 +- tests/tool/scripts/local.sh |2 +- 10 files changed, 62 insertions(+), 28 deletions(-) Changeset truncated at 500 lines: diff --git a/tests/complex/scripts/local.bash b/tests/complex/scripts/local.bash index 0976c3f..eb4c41c 100644 --- a/tests/complex/scripts/local.bash +++ b/tests/complex/scripts/local.bash @@ -132,6 +132,9 @@ ctdb_test_check_real_cluster () [ -z $TEST_LOCAL_DAEMONS ] || \ die ERROR: This test must be run against a real/virtual cluster, not local daemons. +local h=$(hostname) + +local i for i in $(onnode -q all hostname) ; do [ $h != $i ] || \ die ERROR: This test must not be run from a cluster node. diff --git
[SCM] CTDB repository - branch master updated - ctdb-1.13-233-g5b2725d
The branch, master has been updated
via 5b2725d1ae052e848c2487cb10c5393a877d118c (commit)
from 6616a5712b5d4db2b9ba6a88cec79378696c2184 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 5b2725d1ae052e848c2487cb10c5393a877d118c
Author: Martin Schwenke mar...@meltin.net
Date: Tue Jul 17 15:45:45 2012 +1000
Initscript: clean up drop_all_public_ips()
This makes the case implicit where $CTDB_PUBLIC_ADDRESSES is unset.
This is OK because that's not an interesting code path.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/ctdb.init | 10 +++---
1 files changed, 3 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.init b/config/ctdb.init
index 5d01a9c..71b187a 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -244,13 +244,9 @@ wait_until_ready () {
ctdbd=${CTDBD:-/usr/sbin/ctdbd}
drop_all_public_ips() {
-[ -z $CTDB_PUBLIC_ADDRESSES ] {
- return
-}
-
-cat $CTDB_PUBLIC_ADDRESSES | while read IP IFACE REST; do
- ip addr del $IP dev $IFACE /dev/null 2/dev/null
-done
+while read _ip _iface _rest; do
+ ip addr del $_ip dev $_iface /dev/null 21
+done ${CTDB_PUBLIC_ADDRESSES:-/dev/null}
}
start() {
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 115a88e lib/param: Merge Filename Handling section from source3/param via deb9a05 lib/param: Merge Domain Options section from source3/param via 932f0a6 lib/param: Merge Logon Options section from source3/param via b727e70 lib/param: Merge Browse Options section from source3/param via 3f1dfdd lib/param: Merge WINS Options section from source3/param via ebc2cc7 lib/param: Merge Locking Options section from source3/param via 3e9c001 lib/param: Merge Ldap Options section from source3/param via 8d2ba95 lib/param: Merge EventLog Options section from source3/param via a0e08ac lib/param: Merge Miscellaneous Options section from source3/param from a67daa3 s3:smb2_negprot: return the current system time in the SMB2 NEGPROT response http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 115a88e18f103e2191bba7ce30604086b619081b Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 16:32:11 2012 +1000 lib/param: Merge Filename Handling section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Thu Jul 26 14:16:02 CEST 2012 on sn-devel-104 commit deb9a05a590245f632ac792f9960e220f4ed1a4f Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 16:28:51 2012 +1000 lib/param: Merge Domain Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit 932f0a6af47bf5eec44c80b858598ba9ed69b8e2 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 16:25:29 2012 +1000 lib/param: Merge Logon Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit b727e706c3992a881eef225bdd032a8cb699b8d4 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 16:03:09 2012 +1000 lib/param: Merge Browse Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit 3f1dfdd8b4f7ccfb16d30b46f917f22523d4bec6 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 16:00:40 2012 +1000 lib/param: Merge WINS Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit ebc2cc7f8a596f1ca63f263c33537ebe7726e20d Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 15:58:54 2012 +1000 lib/param: Merge Locking Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit 3e9c00112e129d7a6251b190345090b86723b249 Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 15:56:15 2012 +1000 lib/param: Merge Ldap Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit 8d2ba95c90794e4ea0f2fa9a4c36223cf1aa25ea Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 15:54:25 2012 +1000 lib/param: Merge EventLog Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit a0e08acbe04ac519f129e6934a44af739067bdfa Author: Andrew Bartlett abart...@samba.org Date: Tue Jul 24 09:44:03 2012 +1000 lib/param: Merge Miscellaneous Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett --- Summary of changes: lib/param/loadparm.c | 1311 -- 1 files changed, 1264 insertions(+), 47 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a5fa3c9..c211875 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -76,6 +76,13 @@ static bool defaults_saved = false;
[SCM] CTDB repository - branch master updated - ctdb-1.13-236-g553455b
The branch, master has been updated
via 553455b386aa7848a516a921dfc14eb87c8a3fc1 (commit)
via 3880589db4d563e438126cf5080261fa06b9e242 (commit)
via 38e8651b955afdbaf0ae87c24c55c052f8209290 (commit)
from 5b2725d1ae052e848c2487cb10c5393a877d118c (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 553455b386aa7848a516a921dfc14eb87c8a3fc1
Author: Martin Schwenke mar...@meltin.net
Date: Wed Jul 4 07:21:01 2012 +1000
ctdbd: Log a meaningful message if the nodes file/list is empty
Right now the message says it can't bind to any of the
addresses... even when there aren't any!
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 3880589db4d563e438126cf5080261fa06b9e242
Author: Martin Schwenke mar...@meltin.net
Date: Mon Jul 2 17:15:42 2012 +1000
ctdbd: Remove the worked Forced from message about running eventscripts
The eventscripts are run after a takeover run and in this case they're
not forced. The messages seems to imply that somone has run ctdb
eventscript when that is not necessarily the case.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 38e8651b955afdbaf0ae87c24c55c052f8209290
Author: Martin Schwenke mar...@meltin.net
Date: Mon Jul 2 14:09:32 2012 +1000
ctdbd: Fix ctdb_control_release_ip() on local daemons
When running on local daemons no IPs are actually assigned to
interfaces. Commit 9a806dec8687e2ec08a308853b61af6aed5e5d1e broke
ctdb_control_release_ip() for local daemons because it asks the system
which interface the given IP is on, instead of the old behaviour of
trusting CTDB's internal records.
For local deamons (i.e. !ctdb-do_checkpublicip) revert to the old
behaviour of looking up the interface internally. This is good
enough, given that the tests don't tend to misconfigure the addresses.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
server/ctdb_takeover.c | 18 +-
server/eventscript.c |2 +-
tcp/tcp_connect.c |9 +
3 files changed, 23 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 99d765e..538f776 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -819,12 +819,20 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
ctdb_vnn_unassign_iface(ctdb, vnn);
return 0;
}
- }
- iface = ctdb_sys_find_ifname(pip-addr);
- if (iface == NULL) {
- DEBUG(DEBUG_ERR, (Could not find which interface the ip
address is hosted on. can not release it\n));
- return 0;
+ iface = ctdb_sys_find_ifname(pip-addr);
+ if (iface == NULL) {
+ DEBUG(DEBUG_ERR, (Could not find which interface the
ip address is hosted on. can not release it\n));
+ return 0;
+ }
+ } else {
+ if (vnn-iface == NULL) {
+ DEBUG(DEBUG_DEBUG,(Redundant release of IP %s/%u (ip
not held)\n,
+ ctdb_addr_to_str(pip-addr),
+ vnn-public_netmask_bits));
+ return 0;
+ }
+ iface = strdup(ctdb_vnn_iface_string(vnn));
}
DEBUG(DEBUG_NOTICE,(Release of IP %s/%u on interface %s node:%d\n,
diff --git a/server/eventscript.c b/server/eventscript.c
index fe4299b..3b9ec93 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -993,7 +993,7 @@ int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
state-c = talloc_steal(state, c);
- DEBUG(DEBUG_NOTICE,(Forced running of eventscripts with arguments
%s\n, indata.dptr));
+ DEBUG(DEBUG_NOTICE,(Running eventscripts with arguments %s\n,
indata.dptr));
ctdb_disable_monitoring(ctdb);
diff --git a/tcp/tcp_connect.c b/tcp/tcp_connect.c
index 2814201..c94b88f 100644
--- a/tcp/tcp_connect.c
+++ b/tcp/tcp_connect.c
@@ -281,6 +281,15 @@ static int ctdb_tcp_listen_automatic(struct ctdb_context
*ctdb)
int sock_size;
struct tevent_fd *fde;
+ /* If there are no nodes, then it won't be possible to find
+* the first one. Log a failure and short circuit the whole
+* process.
+*/
+ if (ctdb-num_nodes == 0) {
+ DEBUG(DEBUG_CRIT,(No nodes available to attempt bind to - is
the nodes file empty?\n));
+ return -1;
+ }
+
/* We only need to serialize this if we dont yet know the node ip */
if (!ctdb-node_ip) {
/* in order to ensure that we don't get two nodes with the
--
CTDB repository
[SCM] CTDB repository - tag 1.2.40 deleted - ctdb-1.9.1-535-g0a9484c
The tag, 1.2.40 has been deleted was 0a9484c20cb0d3cd58c0ffeabca81c7b9aeca12d --- 0a9484c20cb0d3cd58c0ffeabca81c7b9aeca12d New version 1.2.40 --- -- CTDB repository
[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.45-2-gec1bfce
The branch, 1.2.40 has been updated via ec1bfcec167194344a5694427bede4597bcf2547 (commit) via 34e329c87d8104b3ce71d0c0f4004387ef058b41 (commit) from 95efb0cffb19a4311d706b2fd7031834a2711022 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40 - Log - commit ec1bfcec167194344a5694427bede4597bcf2547 Author: Martin Schwenke mar...@meltin.net Date: Tue Jul 24 11:26:32 2012 +1000 New version 1.2.46 Signed-off-by: Martin Schwenke mar...@meltin.net commit 34e329c87d8104b3ce71d0c0f4004387ef058b41 Author: Martin Schwenke mar...@meltin.net Date: Fri Jul 20 16:43:39 2012 +1000 Eventscripts: Default route on NAT gateway should have a metric of 10 At the moment routes from 11.routing can fail to be added because they conflict with the default route added by 11.natgw. NAT gateway is meant to be a last resort, so routes from 11.routing should override it. Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: config/events.d/11.natgw |2 +- doc/ctdbd.1| 39 +++--- doc/ctdbd.1.html | 92 +++- doc/ctdbd.1.xml| 12 -- packaging/RPM/ctdb.spec.in |4 +- 5 files changed, 84 insertions(+), 65 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw index ba6d7a5..c7ff289 100755 --- a/config/events.d/11.natgw +++ b/config/events.d/11.natgw @@ -79,7 +79,7 @@ case $1 in iptables -I INPUT -p tcp --syn -d $CTDB_NATGW_PUBLIC_IP_HOST -j REJECT 2/dev/null ip addr add $CTDB_NATGW_PUBLIC_IP dev $CTDB_NATGW_PUBLIC_IFACE - ip route add 0.0.0.0/0 via $CTDB_NATGW_DEFAULT_GATEWAY /dev/null 2/dev/null + ip route add 0.0.0.0/0 metric 10 via $CTDB_NATGW_DEFAULT_GATEWAY /dev/null 2/dev/null else # This is not the NAT-GW # Assign the public ip to the private interface and make diff --git a/doc/ctdbd.1 b/doc/ctdbd.1 index 5800520..b7e7c04 100644 --- a/doc/ctdbd.1 +++ b/doc/ctdbd.1 @@ -1,13 +1,22 @@ '\ t .\ Title: ctdbd .\Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\ Generator: DocBook XSL Stylesheets v1.75.2 http://docbook.sf.net/ -.\ Date: 09/08/2010 +.\ Generator: DocBook XSL Stylesheets v1.76.1 http://docbook.sf.net/ +.\ Date: 07/24/2012 .\Manual: CTDB - clustered TDB database .\Source: ctdb .\ Language: English .\ -.TH CTDBD 1 09/08/2010 ctdb CTDB \- clustered TDB database +.TH CTDBD 1 07/24/2012 ctdb CTDB \- clustered TDB database +.\ - +.\ * Define some portability stuff +.\ - +.\ ~ +.\ http://bugs.debian.org/507673 +.\ http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\ ~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' .\ - .\ * set default formatting .\ - @@ -118,7 +127,7 @@ This is a ctdbd debugging option\. this option is only used when debugging ctdb .sp Normally ctdb will change its scheduler to run as a real\-time process\. This is the default mode for a normal ctdbd operation to gurarantee that ctdbd always gets the cpu cycles that it needs\. .sp -This option is used to tell ctdbd to NOT run as a real\-time process and instead run ctdbd as a normal userspace process\. This is useful for debugging and when you want to run ctdbd under valgrind or gdb\. (You don\'t want to attach valgrind or gdb to a real\-time process\.) +This option is used to tell ctdbd to NOT run as a real\-time process and instead run ctdbd as a normal userspace process\. This is useful for debugging and when you want to run ctdbd under valgrind or gdb\. (You don\*(Aqt want to attach valgrind or gdb to a real\-time process\.) .RE .PP \-\-notification\-script=filename @@ -141,7 +150,7 @@ This is usually the file /etc/ctdb/public_addresses .RS 4 This option tells ctdb which interface to attach public\-addresses to and also where to attach the single\-public\-ip when used\. .sp -This is only required when using public ip addresses and only when you don\'t specify the interface explicitly in /etc/ctdb/public_addresses or when you are using \-\-single\-public\-ip\. +This is only required when using public ip addresses and only when you don\*(Aqt specify the interface explicitly in /etc/ctdb/public_addresses or when you are using \-\-single\-public\-ip\. .sp If you omit this argument when
[SCM] CTDB repository - annotated tag ctdb-1.2.46 created - ctdb-1.2.46
The annotated tag, ctdb-1.2.46 has been created at 16ec4a955ab3ee2323c0a845cadd327bcde86cd7 (tag) tagging ec1bfcec167194344a5694427bede4597bcf2547 (commit) replaces ctdb-1.2.45 tagged by Amitay Isaacs on Thu Jul 26 22:46:36 2012 +1000 - Log - new version 1.2.46 Martin Schwenke (2): Eventscripts: Default route on NAT gateway should have a metric of 10 New version 1.2.46 --- -- CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 96340e6 s3: add Darwin sendfile support and merge with the FreeBSD
code
via 887cebf s3:waf: add Darwin sendfile() test
via d347c8d s3:configure: add Darwin sendfile() test
from 115a88e lib/param: Merge Filename Handling section from
source3/param
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 96340e60b7f7ff86a49cbb822ae9170812114dcd
Author: Björn Jacke b...@sernet.de
Date: Fri Jun 29 20:16:18 2012 +0200
s3: add Darwin sendfile support and merge with the FreeBSD code
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 b...@sernet.de
Autobuild-Date(master): Thu Jul 26 17:19:09 CEST 2012 on sn-devel-104
commit 887cebffd06c1a9e8b3979c209cebf230de49d45
Author: Björn Jacke b...@sernet.de
Date: Mon Jul 2 12:47:06 2012 +0200
s3:waf: add Darwin sendfile() test
commit d347c8d5775261a59679bc7ecd3b5e9b5b9ccca7
Author: Björn Jacke b...@sernet.de
Date: Fri Jun 29 20:13:57 2012 +0200
s3:configure: add Darwin sendfile() test
---
Summary of changes:
source3/configure.in | 32
source3/lib/sendfile.c | 94 ++-
source3/wscript| 23
3 files changed, 99 insertions(+), 50 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 6a26038..bd21db9 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5649,7 +5649,39 @@ samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
AC_MSG_RESULT(no);
fi
;;
+ *darwin*)
+ AC_CACHE_CHECK([for Darwin sendfile support],
+ samba_cv_HAVE_SENDFILE,
+ [
+ AC_TRY_LINK([
+#include sys/types.h
+#include sys/socket.h
+#include sys/uio.h
+ ],
+ [
+ int fromfd, tofd, ret;
+ off_t offset, nwritten;
+ struct sf_hdtr hdr;
+ struct iovec hdtrl;
+ hdr.headers = hdtrl;
+ hdr.hdr_cnt = 1;
+ hdr.trailers = (void *)0;
+ hdr.trl_cnt = 0;
+ hdtrl.iov_base = (void *)0;
+ hdtrl.iov_len = 0;
+ ret = sendfile(fromfd, tofd, offset, nwritten, hdr, 0);
+ ],
+ samba_cv_HAVE_SENDFILE=yes,
+ samba_cv_HAVE_SENDFILE=no)])
+ if test x$samba_cv_HAVE_SENDFILE = xyes; then
+ AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() support is
available])
+ AC_DEFINE(DARWIN_SENDFILE_API,1,[Whether the Darwin sendfile()
API is available])
+ AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be
included])
+ else
+ AC_MSG_RESULT(no);
+ fi
+ ;;
*hpux*|*osf*)
AC_CACHE_CHECK([for osf/hpux sendfile
support],samba_cv_HAVE_SENDFILE,[
AC_TRY_LINK([\
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c
index 196ef68..d5fd5a6 100644
--- a/source3/lib/sendfile.c
+++ b/source3/lib/sendfile.c
@@ -248,80 +248,74 @@ ssize_t sys_sendfile(int tofd, int fromfd, const
DATA_BLOB *header, off_t offset
return count + hdr_len;
}
-#elif defined(FREEBSD_SENDFILE_API)
+#elif defined(FREEBSD_SENDFILE_API) || defined(DARWIN_SENDFILE_API)
#include sys/types.h
#include sys/socket.h
#include sys/uio.h
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t
offset, size_t count)
+ssize_t sys_sendfile(int tofd, int fromfd,
+ const DATA_BLOB *header, off_t offset, size_t count)
{
- size_t total=0;
- struct sf_hdtr hdr;
- struct iovec hdtrl;
- size_t hdr_len = 0;
+ struct sf_hdtr sf_header = {0};
+ struct iovecio_header = {0};
- hdr.headers = hdtrl;
- hdr.hdr_cnt = 1;
- hdr.trailers = NULL;
- hdr.trl_cnt = 0;
+ off_t nwritten;
+ int ret;
- /* Set up the header iovec. */
if (header) {
- hdtrl.iov_base = (void *)header-data;
- hdtrl.iov_len = hdr_len = header-length;
- } else {
- hdtrl.iov_base = NULL;
- hdtrl.iov_len = 0;
+ sf_header.headers = io_header;
+ sf_header.hdr_cnt = 1;
+ io_header.iov_base = header-data;
+ io_header.iov_len = header-length;
+ sf_header.trailers = NULL;
+ sf_header.trl_cnt = 0;
}
- total = count;
- while (total + hdtrl.iov_len) {
- off_t nwritten;
- int ret;
-
- /*
-* FreeBSD sendfile returns 0 on success, -1 on error.
-*
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 684f834 Use ippGet/ippSet (accessors) for IPP API.
from c6673d9 Fix bug #9037 - Name clash in MD5 cause...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 684f83433d9697137aab9d8516ad2155929e15bf
Author: Jiri Popelka jpope...@redhat.com
Date: Fri Jul 20 11:53:31 2012 -0700
Use ippGet/ippSet (accessors) for IPP API.
CUPS 1.6 makes various structures private and
introduces these ippGet and ippSet functions
for all of the fields in these structures.
http://www.cups.org/str.php?L3928
We define our own accessors when CUPS 1.6.
Modified for 3.6.x by Jeremy Allison.
Signed-off-by: Jeremy Allison j...@samba.org
Fix bug #9055 - doesn't build against CUPS 1.6.
---
Summary of changes:
source3/printing/print_cups.c | 191 ++
source3/printing/print_iprint.c | 249 ++-
2 files changed, 259 insertions(+), 181 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 9f23866..67af965 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -31,6 +31,47 @@
#include cups/cups.h
#include cups/language.h
+#if (CUPS_VERSION_MAJOR 1) || (CUPS_VERSION_MINOR 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetGroupTag(attr) attr-group_tag
+#define ippGetName(attr) attr-name
+#define ippGetValueTag(attr) attr-value_tag
+#define ippGetStatusCode(ipp) ipp-request.status.status_code
+#define ippGetInteger(attr, element) attr-values[element].integer
+#define ippGetString(attr, element, language) attr-values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+ if (!ipp)
+return (NULL);
+ return (ipp-current = ipp-attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+ if (!ipp || !ipp-current)
+return (NULL);
+ return (ipp-current = ipp-current-next);
+}
+
+static int ippSetOperation(ipp_t *ipp, ipp_op_t op)
+{
+ipp-request.op.operation_id = op;
+return (1);
+}
+
+static int ippSetRequestId(ipp_t *ipp, int request_id)
+{
+ipp-request.any.request_id = request_id;
+return (1);
+}
+#endif
+
static SIG_ATOMIC_T gotalarm;
/***
@@ -167,13 +208,13 @@ static bool process_cups_printers_response(TALLOC_CTX
*mem_ctx,
struct pcap_printer *printer;
bool ret_ok = false;
- for (attr = response-attrs; attr != NULL;) {
+ for (attr = ippFirstAttribute(response); attr != NULL;) {
/*
* Skip leading attributes until we hit a printer...
*/
- while (attr != NULL attr-group_tag != IPP_TAG_PRINTER)
- attr = attr-next;
+ while (attr != NULL ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+ attr = ippNextAttribute(response);
if (attr == NULL)
break;
@@ -185,39 +226,39 @@ static bool process_cups_printers_response(TALLOC_CTX
*mem_ctx,
name = NULL;
info = NULL;
- while (attr != NULL attr-group_tag == IPP_TAG_PRINTER) {
+ while (attr != NULL ippGetGroupTag(attr) == IPP_TAG_PRINTER)
{
size_t size;
- if (strcmp(attr-name, printer-name) == 0
- attr-value_tag == IPP_TAG_NAME) {
+ if (strcmp(ippGetName(attr), printer-name) == 0
+ ippGetValueTag(attr) == IPP_TAG_NAME) {
if (!pull_utf8_talloc(mem_ctx,
name,
- attr-values[0].string.text,
+ ippGetString(attr, 0, NULL),
size)) {
goto err_out;
}
}
- if (strcmp(attr-name, printer-info) == 0
- attr-value_tag == IPP_TAG_TEXT) {
+ if (strcmp(ippGetName(attr), printer-info) == 0
+ ippGetValueTag(attr) == IPP_TAG_TEXT) {
if (!pull_utf8_talloc(mem_ctx,
info,
- attr-values[0].string.text,
+ ippGetString(attr, 0, NULL),
size)) {
goto err_out;
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via db007b4 Fix bug 9062: cmd_lsarpc.c:1171: bad call to data_blob_const from 684f834 Use ippGet/ippSet (accessors) for IPP API. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit db007b46222c02e23fb9566128ee436ad6c11bf9 Author: David Binderman dcb...@hotmail.com Date: Mon Jul 23 15:25:57 2012 -0700 Fix bug 9062: cmd_lsarpc.c:1171: bad call to data_blob_const Signed-off-by: Jeremy Allison j...@samba.org --- Summary of changes: source3/rpcclient/cmd_lsarpc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c index 4b065d0..3aaef5c 100644 --- a/source3/rpcclient/cmd_lsarpc.c +++ b/source3/rpcclient/cmd_lsarpc.c @@ -1168,7 +1168,7 @@ static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p, DATA_BLOB data = data_blob_const(p-password-data, p-password-length); DATA_BLOB data_old = data_blob_const(p-old_password-data, p-old_password-length); - DATA_BLOB session_key_blob = data_blob_const(session_key, sizeof(session_key)); + DATA_BLOB session_key_blob = data_blob_const(session_key, 16); pwd = sess_decrypt_string(talloc_tos(), data, session_key_blob); pwd_old = sess_decrypt_string(talloc_tos(), data_old, session_key_blob); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 5c57ea4 WHATSNEW: Add changes since 3.6.6. from db007b4 Fix bug 9062: cmd_lsarpc.c:1171: bad call to data_blob_const http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 5c57ea4fd6af0b520dd3cabc57f07cc94f95b468 Author: Karolin Seeger ksee...@samba.org Date: Thu Jul 26 19:50:09 2012 +0200 WHATSNEW: Add changes since 3.6.6. Karolin --- Summary of changes: WHATSNEW.txt | 45 + 1 files changed, 45 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 5361cbc..d129e17 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -14,6 +14,51 @@ Changes since 3.6.6: o Jeremy Allison j...@samba.org +* BUG 8974: Fix kernel oplocks when uid(file) != uid(process). +* BUG 8989: Send correct responses to NT Transact Secondary when no data and + no params for the Trans2 calls are set. +* BUG 9034: Fix typo in set_re_uid() call when USE_SETRESUID selected in + configure. + + +o David Binderman dcb...@hotmail.com +* BUG 9062: rpcclient: Fix bad call to data_blob_const. + + +o David Disseldorp dd...@samba.org +* BUG 8719: Printing fails in function cups_job_submit. + + +o Olaf Flebbe o.fle...@science-computing.de +* BUG 8552: Correct documentation of case sensitive. + + +o Björn Jacke b...@sernet.de +* BUG 8996: Fix build without ads support. + + +o Volker Lendecke v...@samba.org +* BUG 9003: Fix posix acl on gpfs. +* BUG 9040: Using asynchronous IO with SMB2 can return NT_STATUS_FILE_CLOSED + in error instead ofNT_STATUS_FILE_LOCK_CONFLICT. + + +o Stefan Metzmacher me...@samba.org +* BUG 9002: Don't turn negative cache entries into valid idmappings. +* BUG 9022: Make vfs_gpfs less verbose in get/set_xattr functions. +* BUG 9057: Fix bugs in SMB2 credit handling code. + + +o Jiri Popelka jpope...@redhat.com +* BUG 9055: Fix build against CUPS 1.6. + + +o Jura Sasek jiri.sa...@oracle.com +* BUG 9037: Fix 'net ads join' on T4 (sun4v) systems on Solaris 10. + + +o Andreas Schneider a...@samba.org +* BUG 9052: Fix resolving our own Domain Local groups. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via a7e0d4a WHATSNEW: Add changes since 3.5.16. from a224e4c Fix bug #9034 - Typo in set_re_uid() call when USE_SETRESUID selected in configure. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit a7e0d4a78eaacc56463d3a9160db5862c2ea8f7b Author: Karolin Seeger ksee...@samba.org Date: Thu Jul 26 20:03:39 2012 +0200 WHATSNEW: Add changes since 3.5.16. Karolin --- Summary of changes: WHATSNEW.txt | 12 +++- 1 files changed, 11 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index a7333f8..06c1f77 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -15,7 +15,17 @@ Changes since 3.5.16: - o Jeremy Allison j...@samba.org -* BUG +* BUG 9034: Fix typo in set_re_uid() call when USE_SETRESUID selected in + configure. + + +o Björn Jacke b...@sernet.de +* BUG 8996: Fix build without ads support. +* BUG 9011: Second part of a fix for bug #9011 (Build on HP-UX broken). + + +o Stefan Metzmacher me...@samba.org +* BUG 9022: Make vfs_gpfs less verbose in get/set_xattr functions. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 86c2d48 buildtools: use egrep when we need the -f patternfile
option
via 4f0b8f3 s3/aio_fork: fix build on irix
via 4b914a2 s3: use libreplace in pthreadpooltest to fix some builds
from 96340e6 s3: add Darwin sendfile support and merge with the FreeBSD
code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 86c2d486f2731b0790c6a906f9fc96244a125b6f
Author: Björn Jacke b...@sernet.de
Date: Thu Jul 26 18:55:43 2012 +0200
buildtools: use egrep when we need the -f patternfile option
Solaris' default grep doesn't know the -f option
Autobuild-User(master): Björn Jacke b...@sernet.de
Autobuild-Date(master): Thu Jul 26 20:49:18 CEST 2012 on sn-devel-104
commit 4f0b8f30c981249012c958768e58857d5b4c27f5
Author: Björn Jacke b...@sernet.de
Date: Thu Jul 26 18:27:40 2012 +0200
s3/aio_fork: fix build on irix
IRIX needs _XOPEN_SOURCE defined for SCM_RIGHTS to be available
commit 4b914a223da0490495c1f2988172583469565eb2
Author: Björn Jacke b...@sernet.de
Date: Thu Jul 26 18:07:29 2012 +0200
s3: use libreplace in pthreadpooltest to fix some builds
---
Summary of changes:
buildtools/compare_config_h3.sh |4 ++--
lib/replace/libreplace_cc.m4|1 +
lib/replace/wscript |4
source3/Makefile.in |2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh
index a56dd2a..45be1ec 100755
--- a/buildtools/compare_config_h3.sh
+++ b/buildtools/compare_config_h3.sh
@@ -19,8 +19,8 @@ if test x$DIFF = x ; then
DIFF=comm -23
fi
-grep ^.define $NEW_CONFIG | grep -v -f $EXCEPTIONS | sort waf-config.h
-grep ^.define $OLD_CONFIG | grep -v -f $EXCEPTIONS | sort old-config.h
+grep ^.define $NEW_CONFIG | egrep -v -f $EXCEPTIONS | sort waf-config.h
+grep ^.define $OLD_CONFIG | egrep -v -f $EXCEPTIONS | sort old-config.h
$DIFF old-config.h waf-config.h
rm -f old-config.h waf-config.h
diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
index c755047..e316f8b 100644
--- a/lib/replace/libreplace_cc.m4
+++ b/lib/replace/libreplace_cc.m4
@@ -63,6 +63,7 @@ AC_SYS_LARGEFILE
dnl Add #include for broken IRIX header files
case $host_os in
*irix6*) AC_ADD_INCLUDE(standards.h)
+ AC_N_DEFINE(_XOPEN_SOURCE,600)
;;
*hpux*)
# mmap on HPUX is completely broken...
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 157296b..e178cca 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -38,6 +38,10 @@ def configure(conf):
conf.DEFINE('_OSF_SOURCE', 1, add_to_cflags=True)
conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
+# SCM_RIGHTS is only avail if _XOPEN_SOURCE iѕ defined on IRIX
+if conf.env['SYSTEM_UNAME_SYSNAME'] == 'IRIX':
+conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
+
conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b572edc..75a3262 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1195,7 +1195,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
$(POPT_LIB_OBJ)
PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \
- lib/pthreadpool/tests.o
+ lib/pthreadpool/tests.o $(LIBREPLACE_OBJ)
LIBNET_OBJ = libnet/libnet_join.o \
libnet/libnet_keytab.o \
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 9b59590 s3:vlp: fix build on OS X from 86c2d48 buildtools: use egrep when we need the -f patternfile option http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9b59590a89e796c302d77da0e42949ff6b43190f Author: Björn Jacke b...@sernet.de Date: Fri Jul 27 01:04:33 2012 +0200 s3:vlp: fix build on OS X Autobuild-User(master): Björn Jacke b...@sernet.de Autobuild-Date(master): Fri Jul 27 03:13:59 CEST 2012 on sn-devel-104 --- Summary of changes: source3/Makefile.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 75a3262..1408614 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1585,6 +1585,7 @@ VLP_OBJ = printing/tests/vlp.o \ ../lib/util/charset/iconv.o \ ../lib/util/charset/weird.o \ ../lib/util/charset/convert_string.o \ + $(CHARSET_MACOSXFS_OBJ) \ ../lib/util/talloc_stack.o \ ../lib/util/smb_threads.o \ ../lib/util/xfile.o \ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ec64f79 lib/param: Mark lpcfg_cachedir and lpcfg_statedir as const char * via ca24820 lib/param: Remove unused paranoid server security via ecb89ce docs: Mark socket address as deprecated via 42e405a param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286 via bc1826a lib/param: Merge parameter tables into a common file via c4eeda9 lib/param: Merge in source3 parameters into parmeter table via 081a010 lib/param: Merge Security Options section from source3/param via 8cb47ef lib/param: Merge Logging Options section from source3/param via 2429647 s3-param: Merge log file parameter with lib/param via 08691f7 lib/param: Merge Protocol Options section from source3/param via 97a6447 lib/param: Merge Tuning Options section from source3/param via c5713ac lib/param: Merge Printing Options section from source3/param via a943a9b s3-build: Make recursive waf build a developer build again (to build developer test facilities) from 9b59590 s3:vlp: fix build on OS X http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ec64f7907d290276485e61b540e844bf1c839713 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 27 11:11:58 2012 +1000 lib/param: Mark lpcfg_cachedir and lpcfg_statedir as const char * This matters as we sync up the declarations with the source3/param code. Andrew Bartlett Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Fri Jul 27 05:26:45 CEST 2012 on sn-devel-104 commit ca2482073627994d6a8c0be6dcf6463aba889635 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 27 10:34:05 2012 +1000 lib/param: Remove unused paranoid server security This became unused when security=server went away. Andrew Bartlett commit ecb89cebd63ed1dcf4815a45b2a26c643c939ecb Author: Andrew Bartlett abart...@samba.org Date: Mon Jul 23 13:15:23 2012 +1000 docs: Mark socket address as deprecated commit 42e405a422b4913e014740678fa067d5a441db88 Author: Andrew Bartlett abart...@samba.org Date: Mon Jul 23 09:23:04 2012 +1000 param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286 This essentially reverts the commit 611ef42053eb99f4c29d4efa86eaea9f1ca06286 Author: Yasuma Takeda yas...@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 commit bc1826abd67627588f40a7fe3a0a993ab83bb65d Author: Andrew Bartlett abart...@samba.org Date: Mon Jul 23 13:53:16 2012 +1000 lib/param: Merge parameter tables into a common file This file is then included into both loadparm systems. Andrew Bartlett Pair-Programmed-With: Andrew Tridgell tri...@samba.org commit c4eeda91b0237e17cd837c8c965d381f2b3e01d6 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 27 09:07:19 2012 +1000 lib/param: Merge in source3 parameters into parmeter table 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 tri...@samba.org Andrew Bartlett commit 081a010f8cadd5a739f432a3f9c6cdcddd0239a8 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 27 10:15:10 2012 +1000 lib/param: Merge Security Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit 8cb47eff7edabcd29d1bcbbebc88ff9e528257d8 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 27 09:54:39 2012 +1000 lib/param: Merge Logging Options section from source3/param This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell tri...@samba.org Andrew Bartlett commit 24296477908b810cfe2ec6450d4b5deddc7acde6 Author: Andrew Bartlett abart...@samba.org Date: Fri Jul 27 10:01:44 2012 +1000 s3-param: Merge log file parameter with lib/param 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 commit 08691f7eafea0c050be79bad996a6b86a8fa648f Author: Andrew Bartlett abart...@samba.org Date: Thu Jul 26 16:45:59 2012 +1000 lib/param: Merge Protocol Options section from source3/param
