svn commit: samba r25044 - in branches/SAMBA_4_0/source/lib/tdb/swig: .
Author: tpot Date: 2007-09-09 06:39:24 + (Sun, 09 Sep 2007) New Revision: 25044 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25044 Log: The has_key() method should return a boolean, not an integer. Add TODO for missing iterator and other oddball methods. Modified: branches/SAMBA_4_0/source/lib/tdb/swig/Tdb.py Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/swig/Tdb.py === --- branches/SAMBA_4_0/source/lib/tdb/swig/Tdb.py 2007-09-09 01:08:50 UTC (rev 25043) +++ branches/SAMBA_4_0/source/lib/tdb/swig/Tdb.py 2007-09-09 06:39:24 UTC (rev 25044) @@ -69,7 +69,7 @@ tdb_delete(self.tdb, key) def has_key(self, key): -return tdb_exists(self.tdb, key) +return tdb_exists(self.tdb, key) != 0 # Tdb iterator @@ -113,3 +113,7 @@ def clear(self): for k in iter(self): del(self[k]) + +# TODO: iterkeys, itervalues, iteritems + +# TODO: any other missing methods for container types
svn commit: samba r25045 - in branches/SAMBA_4_0/source/lib/tdb/swig: .
Author: tpot
Date: 2007-09-09 06:41:15 + (Sun, 09 Sep 2007)
New Revision: 25045
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25045
Log:
Add constants for enum TDB_ERROR.
Remove some functions that I don't think should be in at the moment -
tdb_open_ex(), tdb_reopen{,_all} and locking functions. Locking
functions may come back at a later stage along with transaction support.
Modified:
branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i
Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i
===
--- branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i2007-09-09 06:39:24 UTC
(rev 25044)
+++ branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i2007-09-09 06:41:15 UTC
(rev 25045)
@@ -102,8 +102,22 @@
#define TDB_CONVERT 16 /* convert endian (internal use) */
#define TDB_BIGENDIAN 32 /* header is big-endian (internal use) */
-/* Throw an IOError exception if tdb_open() or tdb_open_ex() returns NULL */
+enum TDB_ERROR {
+ TDB_SUCCESS=0,
+ TDB_ERR_CORRUPT,
+ TDB_ERR_IO,
+ TDB_ERR_LOCK,
+ TDB_ERR_OOM,
+ TDB_ERR_EXISTS,
+ TDB_ERR_NOLOCK,
+ TDB_ERR_LOCK_TIMEOUT,
+ TDB_ERR_NOEXIST,
+ TDB_ERR_EINVAL,
+ TDB_ERR_RDONLY
+};
+/* Throw an IOError exception from errno if tdb_open() returns NULL */
+
%exception {
$action
if (result == NULL) {
@@ -115,17 +129,8 @@
TDB_CONTEXT *tdb_open(const char *name, int hash_size, int tdb_flags,
int open_flags, mode_t mode);
-TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
-int open_flags, mode_t mode,
-tdb_log_func log_fn,
-tdb_hash_func hash_fn);
-
%exception;
-int tdb_reopen(TDB_CONTEXT *tdb);
-
-int tdb_reopen_all(int parent_longlived);
-
enum TDB_ERROR tdb_error(TDB_CONTEXT *tdb);
const char *tdb_errorstr(TDB_CONTEXT *tdb);
@@ -147,13 +152,3 @@
int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state);
int tdb_exists(TDB_CONTEXT *tdb, TDB_DATA key);
-
-int tdb_lockall(TDB_CONTEXT *tdb);
-
-void tdb_unlockall(TDB_CONTEXT *tdb);
-
-/* Low level locking functions: use with care */
-
-int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
-
-int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
svn commit: samba r25046 - in branches/SAMBA_4_0/source/lib/tdb/swig: .
Author: tpot Date: 2007-09-09 12:02:51 + (Sun, 09 Sep 2007) New Revision: 25046 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25046 Log: Ditch tdb_traverse() as it doesn't lend itself to any Python idioms and the semantics can be reproduced using tdb_firstkey() and tdb_nextkey(). Oh, and also because I can't figure out how to get SWIG to do exactly what I want here. Modified: branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i === --- branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i2007-09-09 06:41:15 UTC (rev 25045) +++ branches/SAMBA_4_0/source/lib/tdb/swig/tdb.i2007-09-09 12:02:51 UTC (rev 25046) @@ -149,6 +149,4 @@ TDB_DATA tdb_nextkey(TDB_CONTEXT *tdb, TDB_DATA key); -int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state); - int tdb_exists(TDB_CONTEXT *tdb, TDB_DATA key);
svn commit: samba r25047 - in branches/SAMBA_4_0: . source/auth source/lib/messaging source/lib/registry source/lib/util source/libcli source/nsswitch source/param source/utils
Author: jelmer
Date: 2007-09-09 19:34:30 + (Sun, 09 Sep 2007)
New Revision: 25047
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25047
Log:
Fix more warnings.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/auth.c
branches/SAMBA_4_0/source/lib/messaging/messaging.c
branches/SAMBA_4_0/source/lib/registry/local.c
branches/SAMBA_4_0/source/lib/registry/patchfile_preg.c
branches/SAMBA_4_0/source/lib/registry/regf.c
branches/SAMBA_4_0/source/lib/util/ms_fnmatch.c
branches/SAMBA_4_0/source/lib/util/util.h
branches/SAMBA_4_0/source/lib/util/util_pw.c
branches/SAMBA_4_0/source/lib/util/util_str.c
branches/SAMBA_4_0/source/libcli/libcli.h
branches/SAMBA_4_0/source/nsswitch/wb_common.c
branches/SAMBA_4_0/source/param/loadparm.c
branches/SAMBA_4_0/source/param/share.c
branches/SAMBA_4_0/source/utils/testparm.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/auth.c
===
--- branches/SAMBA_4_0/source/auth/auth.c 2007-09-09 12:02:51 UTC (rev
25046)
+++ branches/SAMBA_4_0/source/auth/auth.c 2007-09-09 19:34:30 UTC (rev
25047)
@@ -455,13 +455,14 @@
return NT_STATUS_OBJECT_NAME_COLLISION;
}
- backends = realloc_p(backends, struct auth_backend, num_backends+1);
- if (!backends) {
- return NT_STATUS_NO_MEMORY;
- }
+ backends = talloc_realloc(talloc_autofree_context(), backends,
+ struct auth_backend, num_backends+1);
+ NT_STATUS_HAVE_NO_MEMORY(backends);
- new_ops = smb_xmemdup(ops, sizeof(*ops));
- new_ops-name = smb_xstrdup(ops-name);
+ new_ops = talloc_memdup(backends, ops, sizeof(*ops));
+ NT_STATUS_HAVE_NO_MEMORY(new_ops);
+ new_ops-name = talloc_strdup(new_ops, ops-name);
+ NT_STATUS_HAVE_NO_MEMORY(new_ops-name);
backends[num_backends].ops = new_ops;
Modified: branches/SAMBA_4_0/source/lib/messaging/messaging.c
===
--- branches/SAMBA_4_0/source/lib/messaging/messaging.c 2007-09-09 12:02:51 UTC
(rev 25046)
+++ branches/SAMBA_4_0/source/lib/messaging/messaging.c 2007-09-09 19:34:30 UTC
(rev 25047)
@@ -137,7 +137,8 @@
/* temporary IDs use an idtree, the rest use a array of pointers */
if (rec-header-msg_type = MSG_TMP_BASE) {
- d = idr_find(msg-dispatch_tree, rec-header-msg_type);
+ d = (struct dispatch_fn *)idr_find(msg-dispatch_tree,
+ rec-header-msg_type);
} else if (rec-header-msg_type msg-num_types) {
d = msg-dispatch[rec-header-msg_type];
} else {
@@ -417,7 +418,8 @@
struct dispatch_fn *d, *next;
if (msg_type = msg-num_types) {
- d = idr_find(msg-dispatch_tree, msg_type);
+ d = (struct dispatch_fn *)idr_find(msg-dispatch_tree,
+ msg_type);
if (!d) return;
idr_remove(msg-dispatch_tree, msg_type);
talloc_free(d);
@@ -666,7 +668,7 @@
{
struct irpc_request *irpc;
- irpc = idr_find(msg_ctx-idr, m-header.callid);
+ irpc = (struct irpc_request *)idr_find(msg_ctx-idr, m-header.callid);
if (irpc == NULL) return;
/* parse the reply data */
Modified: branches/SAMBA_4_0/source/lib/registry/local.c
===
--- branches/SAMBA_4_0/source/lib/registry/local.c 2007-09-09 12:02:51 UTC
(rev 25046)
+++ branches/SAMBA_4_0/source/lib/registry/local.c 2007-09-09 19:34:30 UTC
(rev 25047)
@@ -126,7 +126,8 @@
WERROR local_get_predefined_key (const struct registry_context *ctx,
uint32_t key_id, struct registry_key **key)
{
- struct registry_local *rctx = talloc_get_type(ctx, struct
registry_local);
+ struct registry_local *rctx = talloc_get_type(ctx,
+ struct registry_local);
struct mountpoint *mp;
for (mp = rctx-mountpoints; mp != NULL; mp = mp-next) {
Modified: branches/SAMBA_4_0/source/lib/registry/patchfile_preg.c
===
--- branches/SAMBA_4_0/source/lib/registry/patchfile_preg.c 2007-09-09
12:02:51 UTC (rev 25046)
+++ branches/SAMBA_4_0/source/lib/registry/patchfile_preg.c 2007-09-09
19:34:30 UTC (rev 25047)
@@ -211,8 +211,7 @@
close(fd);
return WERR_GENERAL_FAILURE;
}
- data.length = length;
- data.data =
Build status as of Mon Sep 10 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-09-09 00:02:30.0 + +++ /home/build/master/cache/broken_results.txt 2007-09-10 00:01:43.0 + @@ -1,24 +1,24 @@ -Build status as of Sun Sep 9 00:00:02 2007 +Build status as of Mon Sep 10 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 26 9 0 +ccache 28 9 0 ctdb 0 0 0 distcc 2 0 0 -ldb 25 4 0 -libreplace 24 7 0 -lorikeet-heimdal 21 10 0 -pidl 14 4 0 -ppp 8 6 0 +ldb 27 4 0 +libreplace 26 7 0 +lorikeet-heimdal 23 11 0 +pidl 15 4 0 +ppp 10 8 0 python 0 0 0 -rsync26 26 0 +rsync28 13 0 samba-docs 0 0 0 samba-gtk2 2 0 -samba4 24 24 0 -samba_3_227 16 0 -smb-build22 23 0 -talloc 26 1 0 -tdb 25 3 0 +samba4 25 21 1 +samba_3_228 16 0 +smb-build25 25 0 +talloc 28 1 0 +tdb 27 3 0
svn commit: samba r25048 - in branches/SAMBA_4_0/source/libnet: .
Author: abartlet
Date: 2007-09-10 01:39:20 + (Mon, 10 Sep 2007)
New Revision: 25048
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25048
Log:
From the archives (patch found in one of my old working trees):
Try two different DNs, when performing a samsync from an AD server.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c 2007-09-09
19:34:30 UTC (rev 25047)
+++ branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c 2007-09-10
01:39:20 UTC (rev 25048)
@@ -432,14 +432,21 @@
if (ret != 0) {
struct ldb_dn *first_try_dn = msg-dn;
/* Try again with the default DN */
- msg-dn = talloc_steal(msg, msgs[0]-dn);
- ret = samdb_add(state-sam_ldb, mem_ctx, msg);
- if (ret != 0) {
- *error_string = talloc_asprintf(mem_ctx,
Failed to create user record. Tried both %s and %s: %s,
+ if (!remote_msgs) {
+ *error_string = talloc_asprintf(mem_ctx,
Failed to create user record. Tried %s: %s,
ldb_dn_get_linearized(first_try_dn),
-
ldb_dn_get_linearized(msg-dn),
ldb_errstring(state-sam_ldb));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ } else {
+ msg-dn = talloc_steal(msg, remote_msgs[0]-dn);
+ ret = samdb_add(state-sam_ldb, mem_ctx, msg);
+ if (ret != 0) {
+ *error_string =
talloc_asprintf(mem_ctx, Failed to create user record. Tried both %s and %s:
%s,
+
ldb_dn_get_linearized(first_try_dn),
+
ldb_dn_get_linearized(msg-dn),
+
ldb_errstring(state-sam_ldb));
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ }
}
}
} else {
Rev 600: add crontab and sysctl output in http://samba.org/~tridge/ctdb
revno: 600
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Mon 2007-09-10 11:27:07 +1000
message:
add crontab and sysctl output
modified:
tools/ctdb_diagnostics
ctdb_diagnostics-20070905041904-9d9r1qnt1j9qiwiz-1
=== modified file 'tools/ctdb_diagnostics'
--- a/tools/ctdb_diagnostics2007-09-05 04:20:34 +
+++ b/tools/ctdb_diagnostics2007-09-10 01:27:07 +
@@ -111,7 +111,7 @@
cat EOF
-Showing filesystem and process status
+Showing system and process status
EOF
show_all df; df -i; mount
show_all uptime
@@ -121,6 +121,8 @@
show_all /sbin/ifconfig -a
show_all /sbin/ip addr list
show_all /sbin/route -n
+show_all crontab -l
+show_all sysctl -a
[ -d /usr/lpp/mmfs ] {
cat EOF
svn commit: samba r25049 - in branches/SAMBA_3_2/source/param: .
Author: abartlet Date: 2007-09-10 02:14:18 + (Mon, 10 Sep 2007) New Revision: 25049 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25049 Log: Set new, more secure defaults for Samba 3.2. Andrew Bartlett Modified: branches/SAMBA_3_2/source/param/loadparm.c Changeset: Modified: branches/SAMBA_3_2/source/param/loadparm.c === --- branches/SAMBA_3_2/source/param/loadparm.c 2007-09-10 01:39:20 UTC (rev 25048) +++ branches/SAMBA_3_2/source/param/loadparm.c 2007-09-10 02:14:18 UTC (rev 25049) @@ -1574,10 +1574,10 @@ Globals.bStatCache = True; /* use stat cache by default */ Globals.iMaxStatCacheSize = 1024; /* one Meg by default. */ Globals.restrict_anonymous = 0; - Globals.bClientLanManAuth = True; /* Do use the LanMan hash if it is available */ - Globals.bClientPlaintextAuth = True;/* Do use a plaintext password if is requested by the server */ - Globals.bLanmanAuth = True; /* Do use the LanMan hash if it is available */ - Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is available (otherwise NTLMv2) */ + Globals.bClientLanManAuth = False; /* Do NOT use the LanMan hash if it is available */ + Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */ + Globals.bLanmanAuth = False;/* Do NOT use the LanMan hash, even if it is supplied */ + Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */ Globals.bClientNTLMv2Auth = False; /* Client should not use NTLMv2, as we can't tell that the server supports it. */ /* Note, that we will use NTLM2 session security (which is different), if it is available */
svn commit: samba r25050 - in branches/SAMBA_3_2_0/source/param: .
Author: abartlet Date: 2007-09-10 02:49:57 + (Mon, 10 Sep 2007) New Revision: 25050 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25050 Log: Merge new, stricter NTLM password security requirements into Samba 3.2.0 As a client, we no longer send plaintext or LM responses, unless reconfigured. As a server, we no longer accept LM responses (encrypt passwords = yes has been set for a while), unless reconfigured. Andrew Bartlett Modified: branches/SAMBA_3_2_0/source/param/loadparm.c Changeset: Modified: branches/SAMBA_3_2_0/source/param/loadparm.c === --- branches/SAMBA_3_2_0/source/param/loadparm.c2007-09-10 02:14:18 UTC (rev 25049) +++ branches/SAMBA_3_2_0/source/param/loadparm.c2007-09-10 02:49:57 UTC (rev 25050) @@ -1580,10 +1580,10 @@ Globals.bStatCache = True; /* use stat cache by default */ Globals.iMaxStatCacheSize = 1024; /* one Meg by default. */ Globals.restrict_anonymous = 0; - Globals.bClientLanManAuth = True; /* Do use the LanMan hash if it is available */ - Globals.bClientPlaintextAuth = True;/* Do use a plaintext password if is requested by the server */ - Globals.bLanmanAuth = True; /* Do use the LanMan hash if it is available */ - Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is available (otherwise NTLMv2) */ + Globals.bClientLanManAuth = False; /* Do NOT use the LanMan hash if it is available */ + Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */ + Globals.bLanmanAuth = False;/* Do NOT use the LanMan hash, even if it is supplied */ + Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */ Globals.bClientNTLMv2Auth = False; /* Client should not use NTLMv2, as we can't tell that the server supports it. */ /* Note, that we will use NTLM2 session security (which is different), if it is available */
svn commit: samba-docs r1171 - in trunk/smbdotconf/security: .
Author: abartlet Date: 2007-09-10 02:51:19 + (Mon, 10 Sep 2007) New Revision: 1171 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1171 Log: Update docs to match the new defaults in Samba 3.2.0 and later. Andrew Bartlett Modified: trunk/smbdotconf/security/clientlanmanauth.xml trunk/smbdotconf/security/clientplaintextauth.xml trunk/smbdotconf/security/lanmanauth.xml Changeset: Modified: trunk/smbdotconf/security/clientlanmanauth.xml === --- trunk/smbdotconf/security/clientlanmanauth.xml 2007-09-04 13:26:57 UTC (rev 1170) +++ trunk/smbdotconf/security/clientlanmanauth.xml 2007-09-10 02:51:19 UTC (rev 1171) @@ -24,5 +24,5 @@ attempted./para /description -value type=defaultyes/value +value type=defaultno/value /samba:parameter Modified: trunk/smbdotconf/security/clientplaintextauth.xml === --- trunk/smbdotconf/security/clientplaintextauth.xml 2007-09-04 13:26:57 UTC (rev 1170) +++ trunk/smbdotconf/security/clientplaintextauth.xml 2007-09-10 02:51:19 UTC (rev 1171) @@ -7,6 +7,6 @@ paraSpecifies whether a client should send a plaintext password if the server does not support encrypted passwords./para /description -value type=defaultyes/value +value type=defaultno/value /samba:parameter Modified: trunk/smbdotconf/security/lanmanauth.xml === --- trunk/smbdotconf/security/lanmanauth.xml2007-09-04 13:26:57 UTC (rev 1170) +++ trunk/smbdotconf/security/lanmanauth.xml2007-09-10 02:51:19 UTC (rev 1171) @@ -29,5 +29,5 @@ special configuration to use it./para /description -value type=defaultyes/value +value type=defaultno/value /samba:parameter
svn commit: samba r25051 - in branches/SAMBA_4_0: . source source/build/smb_build source/param source/script source/scripting/ejs source/scripting/libjs source/web_server
Author: abartlet Date: 2007-09-10 03:44:47 + (Mon, 10 Sep 2007) New Revision: 25051 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25051 Log: Move SWAT back to the old-style form-submit modal. The Web 2.0, async client tools were really interesting, but without developer backing they remain impossible to support into a release. The most interesting app was the LDB browser, and I intend to replace this with phpLdapAdmin, preconfigured for Apache during provision. This also removes the need to 'compile' SWAT on SVN checkouts. Andrew Bartlett Added: branches/SAMBA_4_0/source/script/installswat.sh Removed: branches/SAMBA_4_0/services/ branches/SAMBA_4_0/source/script/installjsonrpc.sh branches/SAMBA_4_0/source/script/installwebapps.sh branches/SAMBA_4_0/webapps/ Modified: branches/SAMBA_4_0/source/autogen.sh branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/dynconfig.c branches/SAMBA_4_0/source/dynconfig.h branches/SAMBA_4_0/source/dynconfig.mk branches/SAMBA_4_0/source/main.mk branches/SAMBA_4_0/source/param/loadparm.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c branches/SAMBA_4_0/source/scripting/libjs/provision.js branches/SAMBA_4_0/source/web_server/http.c Changeset: Sorry, the patch is too large (581 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25051
svn commit: samba r25052 - in branches/SAMBA_4_0/source/rpc_server/samr: .
Author: abartlet Date: 2007-09-10 04:41:14 + (Mon, 10 Sep 2007) New Revision: 25052 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25052 Log: This missing 'break' caused problems on 32 bit platforms only, due to alignment of the union. Sorry for the time it took to test and fix this. Andrew Bartlett Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c Changeset: Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c === --- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2007-09-10 03:44:47 UTC (rev 25051) +++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2007-09-10 04:41:14 UTC (rev 25052) @@ -3232,6 +3232,7 @@ case 17: QUERY_UINT64(msg, info17.acct_expiry, accountExpires); + break; case 20: QUERY_STRING(msg, info20.parameters,userParameters);
Rev 603: - use struct sockaddr_in more consistently instead of string addresses in http://samba.org/~tridge/ctdb
revno: 603 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge.test timestamp: Mon 2007-09-10 14:27:29 +1000 message: - use struct sockaddr_in more consistently instead of string addresses - allow for public_address lines with a defaulting interface modified: common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3 common/system_aix.csystem_aix.c-20070714002637-rpu7y2dxeoh1ckej-1 common/system_linux.c system.c-20070525071636-a5n1ihghjtppy08r-3 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2 Diff too large for email (636, the limit is 200).
Rev 602: add back in --public-interface as a default in http://samba.org/~tridge/ctdb
revno: 602
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.test
timestamp: Mon 2007-09-10 14:26:35 +1000
message:
add back in --public-interface as a default
modified:
server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
=== modified file 'server/ctdbd.c'
--- a/server/ctdbd.c2007-09-04 00:09:58 +
+++ b/server/ctdbd.c2007-09-10 04:26:35 +
@@ -46,6 +46,7 @@
const char *logfile;
const char *recovery_lock_file;
const char *db_dir;
+ const char *public_interface;
int no_setsched;
} options = {
.nlist = ETCDIR /ctdb/nodes,
@@ -100,6 +101,7 @@
POPT_CTDB_CMDLINE
{ interactive, 'i', POPT_ARG_NONE, interactive, 0, don't
fork, NULL },
{ public-addresses, 0, POPT_ARG_STRING,
options.public_address_list, 0, public address list file, filename },
+ { public-interface, 0, POPT_ARG_STRING,
options.public_interface, 0, public interface, interface},
{ event-script-dir, 0, POPT_ARG_STRING,
options.event_script_dir, 0, event script directory, dirname },
{ logfile, 0, POPT_ARG_STRING, options.logfile, 0, log file
location, filename },
{ nlist, 0, POPT_ARG_STRING, options.nlist, 0, node list
file, filename },
@@ -198,6 +200,11 @@
}
}
+ if (options.public_interface) {
+ ctdb-default_public_interface = talloc_strdup(ctdb,
options.public_interface);
+ CTDB_NO_MEMORY(ctdb, ctdb-default_public_interface);
+ }
+
if (options.public_address_list) {
ret = ctdb_set_public_addresses(ctdb,
options.public_address_list);
if (ret == -1) {
Rev 601: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 601 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge.test timestamp: Mon 2007-09-10 13:21:11 +1000 message: merge from ronnie modified: client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/system_aix.csystem_aix.c-20070714002637-rpu7y2dxeoh1ckej-1 common/system_linux.c system.c-20070525071636-a5n1ihghjtppy08r-3 config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6 config/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7 config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1 config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1 config/events.d/61.nfstickle 61.nfstickle-20070706005204-6etuzuk8b86aoua5-1 config/statd-callout statdcallout-20070531010857-6sdlz455vusye5y5-1 doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1 doc/ctdb.1.htmlctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1 doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2 doc/ctdbd.1ctdbd.1-20070610004249-06awdka4n3gyea3w-1 doc/ctdbd.1.html ctdbd.1.html-20070610004253-y2xxgjfgnpsucekc-1 doc/ctdbd.1.xmlctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 server/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1 server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 server/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 server/ctdb_ltdb_server.c ctdb_ltdb_server.c-20070607120348-7r182h0nlqxysyss-1 server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1 server/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 server/ctdb_server.c ctdb.c-20061127094323-t50f58d65iaao5of-2 server/ctdb_serverids.c ctdb_serverids.c-20070824054041-oco3oebinbft02fl-1 server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2 server/ctdb_traverse.c ctdb_traverse.c-20070503021550-ztfs5rwx8jfm8qqx-1 server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 server/eventscript.c eventscript.c-20070704074533-95f10rsay8um8wrr-1 tcp/tcp_connect.c tcp_connect.c-20061128004937-x70q1cu5xzg5g2tm-1 tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1 tests/ctdb_fetch.c ctdb_fetch.c-20070405031748-f7gslozfj3rwh5ie-1 tests/ctdb_store.c ctdb_store.c-20070617011248-7ze8iaf75dwi0tk0-1 tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 web/configuring.html configuring_ctdb.htm-20070608021649-cipqdfao7xedp6ji-1 web/nfs.html nfs.html-20070608234340-a8i1dxro7a7i6jz6-1 revno: 432.1.273 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-09-10 07:45:57 +1000 message: update a comment modified: config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1 revno: 432.1.272 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Mon 2007-09-10 07:20:44 +1000 message: change the signature to ctdb_sys_have_ip() to also return: a bool that specifies whether the ip was held by a loopback adaptor or not the name of the interface where the ip was held when we release an ip address from an interface, move the ip address over to the loopback interface when we release an ip address after we have move it onto loopback, use 60.nfs to kill off the server side (the local part) of the tcp connection so that the tcp connections dont survive a failover/failback 61.nfstickle, since we kill hte tcp connections when we release an ip address we no longer need to restart the nfs service in 61.nfstickle update ctdb_takeover to use the new signature for ctdb_sys_have_ip when we add a tcp connection to kill in ctdb_killtcp_add_connection() check if either the srouce or destination address match a known public
Rev 605: fixed a pointer cast warning in http://samba.org/~tridge/ctdb
revno: 605
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.test
timestamp: Mon 2007-09-10 15:16:17 +1000
message:
fixed a pointer cast warning
modified:
client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
server/ctdb_serverids.c
ctdb_serverids.c-20070824054041-oco3oebinbft02fl-1
=== modified file 'client/ctdb_client.c'
--- a/client/ctdb_client.c 2007-09-05 04:59:29 +
+++ b/client/ctdb_client.c 2007-09-10 05:16:17 +
@@ -2379,6 +2379,8 @@
/*
check if a server id exists
+
+ if a server id does exist, return *status == 1, otherwise *status == 0
*/
int ctdb_ctrl_check_server_id(struct ctdb_context *ctdb,
struct timeval timeout,
=== modified file 'server/ctdb_serverids.c'
--- a/server/ctdb_serverids.c 2007-09-04 00:21:51 +
+++ b/server/ctdb_serverids.c 2007-09-10 05:16:17 +
@@ -92,9 +92,9 @@
{
struct ctdb_server_id *server_id = (struct ctdb_server_id *)indata.dptr;
- return (int32_t)trbt_lookuparray32(ctdb-server_ids,
- SERVER_ID_KEY_SIZE,
- get_server_id_key(server_id));
+ return trbt_lookuparray32(ctdb-server_ids,
+ SERVER_ID_KEY_SIZE,
+ get_server_id_key(server_id)) == NULL? 0 : 1;
}
/*
Rev 604: added back --public-interface to startup script in http://samba.org/~tridge/ctdb
revno: 604 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge.test timestamp: Mon 2007-09-10 15:09:28 +1000 message: added back --public-interface to startup script modified: config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6 config/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7 === modified file 'config/ctdb.init' --- a/config/ctdb.init 2007-09-03 23:50:07 + +++ b/config/ctdb.init 2007-09-10 05:09:28 + @@ -52,6 +52,7 @@ [ -z $CTDB_NODES ]|| CTDB_OPTIONS=$CTDB_OPTIONS --nlist=$CTDB_NODES [ -z $CTDB_SOCKET ] || CTDB_OPTIONS=$CTDB_OPTIONS --socket=$CTDB_SOCKET [ -z $CTDB_PUBLIC_ADDRESSES ] || CTDB_OPTIONS=$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES +[ -z $CTDB_PUBLIC_INTERFACE ] || CTDB_OPTIONS=$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE [ -z $CTDB_DBDIR ]|| CTDB_OPTIONS=$CTDB_OPTIONS --dbdir=$CTDB_DBDIR [ -z $CTDB_EVENT_SCRIPT_DIR ] || CTDB_OPTIONS=$CTDB_OPTIONS --event-script-dir $CTDB_EVENT_SCRIPT_DIR [ -z $CTDB_TRANSPORT ]|| CTDB_OPTIONS=$CTDB_OPTIONS --transport $CTDB_TRANSPORT === modified file 'config/ctdb.sysconfig' --- a/config/ctdb.sysconfig 2007-09-03 23:50:07 + +++ b/config/ctdb.sysconfig 2007-09-10 05:09:28 + @@ -5,6 +5,12 @@ # there is no default # CTDB_RECOVERY_LOCK=/some/place/on/shared/storage +# when doing IP takeover you also may specify what network interface +# to use by default for the public addresses. Otherwise you must +# specify an interface on each line of the public addresses file +# there is no default +# CTDB_PUBLIC_INTERFACE=eth0 + # Should ctdb do IP takeover? If it should, then specify a file # containing the list of public IP addresses that ctdb will manage # Note that these IPs must be different from those in $NODES above
