RE: [Samba] ACLS, inherit owner=yes
Do you have the acl/xattr utilities installed and necessary kernel support? (I'm going to assume yes for a moment). While I can't confirm the inherit owner issue with RHEL4 (don't run the distro), I can definitely say that inherit owner _WILL_ work in versions after 3.0.15 properly. I am using .23c with little to no issues. I believe that you should upgrade to a newer RHEL rpm of Samba if at all possible. Hope that works out for you. Theodore Charles III Network Administrator Los Angeles Senior High From: Pierig Le Saux [EMAIL PROTECTED] To: samba@lists.samba.org Subject: [Samba] ACLS, inherit owner=yes Date: Fri, 20 Apr 2007 16:15:04 +0200 Hello, I am currently migrating data from NT4 to Samba, and ownership is not preserved. Could someone please confirm the option inherit owner does not work on RHEL4 (samba-3.0.10-1.4E.11)? How can I get this working? Regards -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba _ Mortgage refinance is Hot. *Terms. Get a 5.375%* fix rate. Check savings https://www2.nextag.com/goto.jsp?product=10035url=%2fst.jsptm=ysearch=mortgage_text_links_88_h2bbbdisc=yvers=925s=4056p=5117 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Syncing tdb files although it's not the best idea ;-)
Hi, I've read the documentation that syncing tdb files from one machine to aonther is a bad idea, but I'd like to get more information why. I've set up a Samba server acting as a PDC and another one acting as domain member (so no logons). Thus I'm missing the user/group mappings. I've copied the tdb files to the domain member and it works. I was thinking why this method should not be used when user accounts will change rarely and the PDC and the domain member can be stopped during the copy process of the tdb files. (winbind was not used because I want the same uids/gids as on the PDC) Do I have to expect other problems which I haven't realized yet? greets Jimmy -- Andreas Jimmy Gredler ,'`. http://www.jimmy.co.at/ | [EMAIL PROTECTED] ( grml.org -ยป Linux Live-CD for texttool-users and sysadmins `._, http://www.grml.org/| [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba pdc issue
I have upgrade the pdc server from debian sarge to etch. After this operation we can't login to the domain (client windows 2000 XP) smbclient works fine and from a windows local account I can browser the samba directories too (puttin username and password before..) I use tdbsam of course and pdbedit -L let me see all the accounts, it seems to work fine I tried to remove a pc from the domain, and putting it into again, but it doesn't works. I tried to create a new user account, but the same it doesnt work What can I do? Thanks Alessandro -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba pdc issue
After this operation we can't login to the domain (client windows 2000 XP) I forgot the message windows says: windows cannot connect to the domain, either because the domain controller is down or otherwise unavailable, or because your computer account was not found. .. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba pdc issue
Alessandro wrote: I have upgrade the pdc server from debian sarge to etch. After this operation we can't login to the domain (client windows 2000 XP) smbclient works fine and from a windows local account I can browser the samba directories too (puttin username and password before..) I use tdbsam of course and pdbedit -L let me see all the accounts, it seems to work fine I tried to remove a pc from the domain, and putting it into again, but it doesn't works. I tried to create a new user account, but the same it doesnt work What can I do? For starters, you could provide enough details for someone to help you... What was the old version? What version did you upgrade to? What platform? What OS? What OS version? Samba config details? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba pdc issue
Charles Marcus wrote: For starters, you could provide enough details for someone to help you... of course! What was the old version? What version did you upgrade to? What platform? What OS? What OS version? I upgraded the server from linux debian sarge (samba 3.0.14a-3sarge4) to debian etch (samba 3.0.24-6) The kernel is the 2.6.18.4 compiled, since few weeks ago. Samba config details? [global] workgroup = FRIGEL netbios name = ACTIVENSA server string = ACTIVENSA %v interfaces = 192.168.5.1 bind interfaces only = Yes obey pam restrictions = Yes private dir = /var/lib/samba passdb backend = tdbsam passwd program = /usr/bin/passwd %u passwd chat = *new*password* %n\n *new*password* %n\n *updated* . unix password sync = Yes log level = 19 enable privileges = yes syslog = 0 log file = /var/log/samba/log.%m max log size = 1000 name resolve order = wins lmhosts bcast host time server = Yes socket options = TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_RCVBUF=8192 SO_SNDBUF=8192 dns proxy = yes add user script = /var/activensa/lib/scripts/adduseraccountfromusrmgr.sh %u delete user script = /var/activensa/lib/scripts/deluseraccountfromusrmgr.sh %u add group script = /usr/sbin/groupadd '%g' delete group script = /usr/sbin/groupdel '%g' add user to group script = /usr/sbin/usermod -G '%g' %u delete user from group script = /usr/sbin/deluser %u '%g' set primary group script = /usr/sbin/usermod -g '%g' '%u' add machine script = /var/activensa/lib/scripts/addmachineaccountfromusrmgr.sh %u logon script = access.bat logon drive = H: logon home = \\%L\%U logon path =domain logons = Yes os level = 40 local master = Yes preferred master = Yes domain master = Yes wins support = Yes ldap ssl = no utmp directory = /var/run wtmp directory = /var/log utmp = Yes panic action = /usr/share/samba/panic-action %d invalid users = root admin users = domainmaster force group = msusers oplocks = false [xxxDirsxxx] . Few info: The windows loging error appears everytime I try to login; it doesnt matter if I use an existing or not existing user account Samba logs seems full of secrets_fetch failed!, I don't know if it is a problem. The following doesnt works pdbedit -a -m newmacchineaccount (it has never worked..), I add machine accounts with useradd -g msmachines -c Machine -d /dev/null -s /bin/false $MACHINEACCOUNT [pdbedit -a -b newmacchineaccount] ... new privilege mask: SE_PRIV 0xff0 0x0 0x0 0x0 account_policy_get: name: maximum password age, val: -1 element 10 - now CHANGED account_policy_get: name: minimum password age, val: 0 element 9 - now CHANGED account_policy_get: name: password history, val: 10 element 34 - now CHANGED pdb_set_username: setting username newmacchineacco$, was element 12 - now CHANGED element 20 - now CHANGED tdb_update_sam: struct samu (newmacchineacco$) with no RID! Unable to add machine! (does it already exist?) Let me know if you need some more informations and if I can make some tests in order to clarify the situation. Thanks very much! Alessandro Here the pdbedit -v prova55 and samba/log.guestpc -very verbose..- after a login attempt with username and password prova55: ---pdbedit -v prova55 doing parameter enable privileges = yes doing parameter syslog = 0 doing parameter log file = /var/log/samba/log.%m doing parameter max log size = 1000 doing parameter name resolve order = wins lmhosts bcast host doing parameter time server = Yes doing parameter socket options = TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_RCVBUF=8192 SO_SNDBUF=8192 doing parameter dns proxy = yes doing parameter add user script = /var/activensa/lib/scripts/adduseraccountfromusrmgr.sh %u doing parameter delete user script = /var/activensa/lib/scripts/deluseraccountfromusrmgr.sh %u doing parameter add group script = /usr/sbin/groupadd '%g' doing parameter delete group script = /usr/sbin/groupdel '%g' doing parameter add user to group script = /usr/sbin/usermod -G '%g' %u doing parameter delete user from group script = /usr/sbin/deluser %u '%g' doing parameter set primary group script = /usr/sbin/usermod -g '%g' '%u' doing parameter add machine script = /var/activensa/lib/scripts/addmachineaccountfromusrmgr.sh %u doing parameter logon script = access.bat doing parameter logon drive = H: doing parameter logon home = \\%L\%U doing parameter logon path = doing parameter domain logons = Yes doing parameter os level = 40 doing parameter local master = Yes doing parameter preferred master = Yes doing parameter domain master = Yes doing parameter wins support = Yes doing parameter ldap ssl = no doing parameter utmp directory = /var/run doing parameter wtmp directory = /var/log doing parameter utmp = Yes doing parameter panic action = /usr/share/samba/panic-action %d doing parameter invalid users = root doing
Re: [Samba] 3.0.25rc2?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Guillermo Gutierrez wrote: Any word on when the next update of 3.0.25 will be ready for download? Working on it right now. Looks like a Sunday release. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGKn8zIR7qMdg1EfYRArgRAKDTprmY47DQ5yyaXLGatRMDoOi9SwCfYq5Q qrNJ31gO8oCc9gbVxrPzOB8= =LHeN -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r22420 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze
Date: 2007-04-21 07:21:08 + (Sat, 21 Apr 2007)
New Revision: 22420
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22420
Log:
fix smbd timeout
metze
Modified:
branches/SAMBA_4_0/source/script/tests/Samba4.pm
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm2007-04-20 21:31:04 UTC
(rev 22419)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm2007-04-21 07:21:08 UTC
(rev 22420)
@@ -710,7 +710,7 @@
my $env = $self-provision_member($path, $dc_vars);
- $self-check_or_start($env, ($ENV{SMBD_MAX_TIME} or 6500));
+ $self-check_or_start($env, ($ENV{SMBD_MAXTIME} or 6500));
$self-wait_for_start($env);
@@ -724,7 +724,7 @@
my $env = $self-provision_dc($path);
$self-check_or_start($env,
- ($ENV{SMBD_MAX_TIME} or 5400));
+ ($ENV{SMBD_MAXTIME} or 6500));
$self-wait_for_start($env);
Rev 172: merge tdb updates from samba4 in http://samba.org/~tridge/ctdb
revno: 172 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Sat 2007-04-21 13:07:49 +1000 message: merge tdb updates from samba4 modified: lib/tdb/common/freelist.c freelist.c-20070220022425-m1wibgjq7n5hahs6-4 lib/tdb/common/freelistcheck.c freelistcheck.c-20070220022425-m1wibgjq7n5hahs6-5 lib/tdb/config.mk config.mk-20070125040949-7t3f5zdl1q4z9hyv-63 lib/tdb/tools/tdbbackup.c tdbbackup.c-20070125040949-7t3f5zdl1q4z9hyv-105 lib/tdb/tools/tdbdump.ctdbdump.c-20070125040949-7t3f5zdl1q4z9hyv-106 Diff too large for email (409, the limit is 200).
Rev 170: added ctdb_status tool in http://samba.org/~tridge/ctdb
revno: 170 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-04-20 20:07:47 +1000 message: added ctdb_status tool added: tools/ tools-20070420100703-w2y116bm9be7hmlv-1 tools/ctdb_status.cctdb_status.c-20070420100703-w2y116bm9be7hmlv-2 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_lockwait.c ctdb_lockwait.c-20070416214118-n1aeonljj3vpdd9q-1 common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 Diff too large for email (737, the limit is 200).
Rev 174: - prevent sending dmaster requests to ourselves in http://samba.org/~tridge/ctdb
revno: 174
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-04-21 09:22:46 +0200
message:
- prevent sending dmaster requests to ourselves
- add some debug code
modified:
common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
=== modified file 'common/ctdb_call.c'
--- a/common/ctdb_call.c2007-04-20 07:58:37 +
+++ b/common/ctdb_call.c2007-04-21 07:22:46 +
@@ -370,9 +370,10 @@
then give them the record
or if the node requested an immediate migration
*/
- if ( (header.laccessor == c-hdr.srcnode
- header.lacount = ctdb-max_lacount)
- || c-flagsCTDB_IMMEDIATE_MIGRATION ) {
+ if ( c-hdr.srcnode != ctdb-vnn
+((header.laccessor == c-hdr.srcnode
+ header.lacount = ctdb-max_lacount)
+ || (c-flagsCTDB_IMMEDIATE_MIGRATION)) ) {
ctdb_call_send_dmaster(ctdb_db, c, header, call.key, data);
talloc_free(data.dptr);
ctdb_ltdb_unlock(ctdb_db, call.key);
@@ -419,7 +420,7 @@
state = idr_find_type(ctdb-idr, hdr-reqid, struct ctdb_call_state);
if (state == NULL) {
- DEBUG(0, (reqid %d not found\n, hdr-reqid));
+ DEBUG(0, (__location__ reqid %d not found\n, hdr-reqid));
return;
}
@@ -562,6 +563,7 @@
struct timeval t, void *private_data)
{
struct ctdb_call_state *state = talloc_get_type(private_data, struct
ctdb_call_state);
+ DEBUG(0,(__location__ call timeout for reqid %d\n,
state-c-hdr.reqid));
state-state = CTDB_CALL_ERROR;
ctdb_set_error(state-node-ctdb, ctdb_call %u timed out,
state-c-hdr.reqid);
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c 2007-04-20 10:07:47 +
+++ b/common/ctdb_client.c 2007-04-21 07:22:46 +
@@ -71,7 +71,7 @@
state = idr_find_type(ctdb-idr, hdr-reqid, struct
ctdb_client_call_state);
if (state == NULL) {
- DEBUG(0, (reqid %d not found\n, hdr-reqid));
+ DEBUG(0,(__location__ reqid %d not found\n, hdr-reqid));
return;
}
@@ -628,7 +628,7 @@
state = idr_find_type(ctdb-idr, hdr-reqid, struct ctdb_status_state);
if (state == NULL) {
- DEBUG(0, (reqid %d not found\n, hdr-reqid));
+ DEBUG(0,(__location__ reqid %d not found\n, hdr-reqid));
return;
}
Rev 173: merge fixes from samba4 in http://samba.org/~tridge/ctdb
revno: 173
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-04-21 13:08:22 +1000
message:
merge fixes from samba4
modified:
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
common/ctdb_lockwait.c
ctdb_lockwait.c-20070416214118-n1aeonljj3vpdd9q-1
config.mk config.mk-20070416041303-xql6zaaq90w8kovl-1
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-04-20 11:02:53 +
+++ b/common/ctdb_daemon.c 2007-04-21 03:08:22 +
@@ -338,9 +338,9 @@
if (res != 0) {
DEBUG(0, (__location__ Failed to queue packet from daemon to
client\n));
}
+ ctdb_latency(client-ctdb-status.max_call_latency,
dstate-start_time);
talloc_free(dstate);
client-ctdb-status.pending_calls--;
- ctdb_latency(client-ctdb-status.max_call_latency,
dstate-start_time);
}
=== modified file 'common/ctdb_lockwait.c'
--- a/common/ctdb_lockwait.c2007-04-20 11:02:53 +
+++ b/common/ctdb_lockwait.c2007-04-21 03:08:22 +
@@ -23,9 +23,9 @@
#include system/filesys.h
#include system/wait.h
#include popt.h
-#include ../include/ctdb_private.h
#include db_wrap.h
#include lib/tdb/include/tdb.h
+#include ../include/ctdb_private.h
struct lockwait_handle {
=== modified file 'config.mk'
--- a/config.mk 2007-04-16 06:01:37 +
+++ b/config.mk 2007-04-21 03:08:22 +
@@ -15,7 +15,6 @@
##
[SUBSYSTEM::ctdb]
-INIT_FUNCTION = server_service_ctdbd_init
OBJ_FILES = \
ctdb_cluster.o \
common/ctdb.o \
@@ -25,6 +24,7 @@
common/ctdb_util.o \
common/ctdb_io.o \
common/ctdb_client.o \
- common/ctdb_daemon.o
+ common/ctdb_daemon.o \
+ common/ctdb_lockwait.o
PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
PRIVATE_DEPENDENCIES = ctdb_tcp
Rev 171: - expanded status to include count of each call type in http://samba.org/~tridge/ctdb
revno: 171
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-04-20 21:02:53 +1000
message:
- expanded status to include count of each call type
- added lockwait latency
modified:
common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
common/ctdb_lockwait.c
ctdb_lockwait.c-20070416214118-n1aeonljj3vpdd9q-1
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
tools/ctdb_status.cctdb_status.c-20070420100703-w2y116bm9be7hmlv-2
=== modified file 'common/ctdb.c'
--- a/common/ctdb.c 2007-04-20 10:07:47 +
+++ b/common/ctdb.c 2007-04-20 11:02:53 +
@@ -246,34 +246,42 @@
switch (hdr-operation) {
case CTDB_REQ_CALL:
+ ctdb-status.count.req_call++;
ctdb_request_call(ctdb, hdr);
break;
case CTDB_REPLY_CALL:
+ ctdb-status.count.reply_call++;
ctdb_reply_call(ctdb, hdr);
break;
case CTDB_REPLY_ERROR:
+ ctdb-status.count.reply_error++;
ctdb_reply_error(ctdb, hdr);
break;
case CTDB_REPLY_REDIRECT:
+ ctdb-status.count.reply_redirect++;
ctdb_reply_redirect(ctdb, hdr);
break;
case CTDB_REQ_DMASTER:
+ ctdb-status.count.req_dmaster++;
ctdb_request_dmaster(ctdb, hdr);
break;
case CTDB_REPLY_DMASTER:
+ ctdb-status.count.reply_dmaster++;
ctdb_reply_dmaster(ctdb, hdr);
break;
case CTDB_REQ_MESSAGE:
+ ctdb-status.count.req_message++;
ctdb_request_message(ctdb, hdr);
break;
case CTDB_REQ_FINISHED:
+ ctdb-status.count.req_finished++;
ctdb_request_finished(ctdb, hdr);
break;
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-04-20 10:07:47 +
+++ b/common/ctdb_daemon.c 2007-04-20 11:02:53 +
@@ -443,6 +443,7 @@
struct ctdb_req_header *hdr = (struct ctdb_req_header *)data;
struct ctdb_client *client = talloc_get_type(p, struct ctdb_client);
TALLOC_CTX *tmp_ctx;
+ struct ctdb_context *ctdb = client-ctdb;
/* place the packet as a child of a tmp_ctx. We then use
talloc_free() below to free it. If any of the calls want
@@ -463,26 +464,32 @@
switch (hdr-operation) {
case CTDB_REQ_CALL:
+ ctdb-status.client.req_call++;
daemon_request_call_from_client(client, (struct ctdb_req_call
*)hdr);
break;
case CTDB_REQ_REGISTER:
+ ctdb-status.client.req_register++;
daemon_request_register_message_handler(client,
(struct
ctdb_req_register *)hdr);
break;
case CTDB_REQ_MESSAGE:
+ ctdb-status.client.req_message++;
daemon_request_message_from_client(client, (struct
ctdb_req_message *)hdr);
break;
case CTDB_REQ_CONNECT_WAIT:
+ ctdb-status.client.req_connect_wait++;
daemon_request_connect_wait(client, (struct
ctdb_req_connect_wait *)hdr);
break;
case CTDB_REQ_SHUTDOWN:
+ ctdb-status.client.req_shutdown++;
daemon_request_shutdown(client, (struct ctdb_req_shutdown
*)hdr);
break;
case CTDB_REQ_STATUS:
+ ctdb-status.client.req_status++;
daemon_request_status(client, (struct ctdb_req_status *)hdr);
break;
=== modified file 'common/ctdb_lockwait.c'
--- a/common/ctdb_lockwait.c2007-04-20 10:07:47 +
+++ b/common/ctdb_lockwait.c2007-04-20 11:02:53 +
@@ -35,7 +35,7 @@
pid_t child;
void *private_data;
void (*callback)(void *);
- struct timeval t;
+ struct timeval start_time;
};
static void lockwait_handler(struct event_context *ev, struct fd_event *fde,
@@ -48,7 +48,7 @@
pid_t child = h-child;
talloc_set_destructor(h, NULL);
close(h-fd[0]);
- DEBUG(3,(__location__ lockwait took %.6f seconds\n,
timeval_elapsed(h-t)));
+ ctdb_latency(h-ctdb-status.max_lockwait_latency, h-start_time);
h-ctdb-status.pending_lockwait_calls--;
talloc_free(h);
callback(p);
@@ -133,7 +133,7 @@
return NULL;
}
- result-t = timeval_current();
+ result-start_time = timeval_current();
return result;
}
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h
Rev 169: - fixed a problem with packets to ourselves. The packets were being in http://samba.org/~tridge/ctdb
revno: 169
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-04-20 17:58:37 +1000
message:
- fixed a problem with packets to ourselves. The packets were being
processed immediately, but the input routines indirectly assumed
they were being called as a new event (for example, a calling
routine might queue the packet, then afterwards modify the ltdb
record). The solution was to make self packets queue via a zero
timeout.
- fixed unlinking of the socket in a exit in the lockwait code. Needed
an _exit instead of exit so atexit() doesn't trigger
- print latency of lockwait delays
modified:
common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2
common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1
common/ctdb_lockwait.c
ctdb_lockwait.c-20070416214118-n1aeonljj3vpdd9q-1
=== modified file 'common/ctdb.c'
--- a/common/ctdb.c 2007-04-19 06:27:56 +
+++ b/common/ctdb.c 2007-04-20 07:58:37 +
@@ -331,6 +331,44 @@
DEBUG(3,(ctdb_connect_wait: got all %d nodes\n, expected));
}
+struct queue_next {
+ struct ctdb_context *ctdb;
+ struct ctdb_req_header *hdr;
+};
+
+
+/*
+ trigered when a deferred packet is due
+ */
+static void queue_next_trigger(struct event_context *ev, struct timed_event
*te,
+ struct timeval t, void *private_data)
+{
+ struct queue_next *q = talloc_get_type(private_data, struct queue_next);
+ ctdb_recv_pkt(q-ctdb, (uint8_t *)q-hdr, q-hdr-length);
+ talloc_free(q);
+}
+
+/*
+ defer a packet, so it is processed on the next event loop
+ this is used for sending packets to ourselves
+ */
+static void ctdb_defer_packet(struct ctdb_context *ctdb, struct
ctdb_req_header *hdr)
+{
+ struct queue_next *q;
+ q = talloc(ctdb, struct queue_next);
+ if (q == NULL) {
+ DEBUG(0,(__location__ Failed to allocate deferred packet\n));
+ return;
+ }
+ q-ctdb = ctdb;
+ q-hdr = talloc_memdup(ctdb, hdr, hdr-length);
+ if (q-hdr == NULL) {
+ DEBUG(0,(Error copying deferred packet to self\n));
+ return;
+ }
+ event_add_timed(ctdb-ev, q, timeval_zero(), queue_next_trigger, q);
+}
+
/*
queue a packet or die
*/
@@ -338,7 +376,9 @@
{
struct ctdb_node *node;
node = ctdb-nodes[hdr-destnode];
- if (ctdb-methods-queue_pkt(node, (uint8_t *)hdr, hdr-length) != 0) {
+ if (hdr-destnode == ctdb-vnn !(ctdb-flags
CTDB_FLAG_SELF_CONNECT)) {
+ ctdb_defer_packet(ctdb, hdr);
+ } else if (ctdb-methods-queue_pkt(node, (uint8_t *)hdr, hdr-length)
!= 0) {
ctdb_fatal(ctdb, Unable to queue packet\n);
}
}
=== modified file 'common/ctdb_call.c'
--- a/common/ctdb_call.c2007-04-19 07:43:27 +
+++ b/common/ctdb_call.c2007-04-20 07:58:37 +
@@ -222,17 +222,12 @@
memcpy(r-data[0], key-dptr, key-dsize);
memcpy(r-data[key-dsize], data-dptr, data-dsize);
- if (r-hdr.destnode == ctdb-vnn) {
- /* we are the lmaster - don't send to ourselves */
- ctdb_recv_pkt(ctdb, (uint8_t *)r-hdr, r-hdr.length);
- return;
- } else {
- ctdb_queue_packet(ctdb, r-hdr);
-
- /* update the ltdb to record the new dmaster */
- header-dmaster = r-hdr.destnode;
- ctdb_ltdb_store(ctdb_db, *key, header, *data);
- }
+ /* XXX - probably not necessary when lmaster==dmaster
+ update the ltdb to record the new dmaster */
+ header-dmaster = r-hdr.destnode;
+ ctdb_ltdb_store(ctdb_db, *key, header, *data);
+
+ ctdb_queue_packet(ctdb, r-hdr);
talloc_free(r);
}
@@ -280,7 +275,8 @@
}
/* its a protocol error if the sending node is not the current dmaster
*/
- if (header.dmaster != hdr-srcnode) {
+ if (header.dmaster != hdr-srcnode
+ hdr-srcnode != ctdb_lmaster(ctdb_db-ctdb, key)) {
ctdb_fatal(ctdb, dmaster request from non-master);
return;
}
@@ -313,13 +309,7 @@
r-datalen = data.dsize;
memcpy(r-data[0], data.dptr, data.dsize);
- if (r-hdr.destnode == r-hdr.srcnode) {
- /* inject the packet back into the input queue */
- talloc_steal(ctdb, r);
- ctdb_recv_pkt(ctdb, (uint8_t *)r-hdr, r-hdr.length);
- } else {
- ctdb_queue_packet(ctdb, r-hdr);
- }
+ ctdb_queue_packet(ctdb, r-hdr);
talloc_free(tmp_ctx);
}
=== modified file 'common/ctdb_lockwait.c'
--- a/common/ctdb_lockwait.c2007-04-17 01:26:59 +
+++ b/common/ctdb_lockwait.c2007-04-20 07:58:37 +
@@ -34,6 +34,7
svn commit: samba r22421 - in branches/SAMBA_4_0/source/cluster/ctdb: . common direct ib include tcp tests tools
Author: tridge Date: 2007-04-21 07:23:42 + (Sat, 21 Apr 2007) New Revision: 22421 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22421 Log: merged in latest ctdb changes from bzr Added: branches/SAMBA_4_0/source/cluster/ctdb/common/cmdline.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_lockwait.c branches/SAMBA_4_0/source/cluster/ctdb/include/cmdline.h branches/SAMBA_4_0/source/cluster/ctdb/tests/lockwait.c branches/SAMBA_4_0/source/cluster/ctdb/tools/ branches/SAMBA_4_0/source/cluster/ctdb/tools/ctdb_status.c Modified: branches/SAMBA_4_0/source/cluster/ctdb/Makefile.in branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_client.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_daemon.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_message.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c branches/SAMBA_4_0/source/cluster/ctdb/config.mk branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c branches/SAMBA_4_0/source/cluster/ctdb/direct/ctdbd.c branches/SAMBA_4_0/source/cluster/ctdb/direct/ctdbd.sh branches/SAMBA_4_0/source/cluster/ctdb/direct/ctdbd_test.c branches/SAMBA_4_0/source/cluster/ctdb/ib/ibw_ctdb_init.c branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb.h branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb_private.h branches/SAMBA_4_0/source/cluster/ctdb/include/includes.h branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_connect.c branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_init.c branches/SAMBA_4_0/source/cluster/ctdb/tests/bench.sh branches/SAMBA_4_0/source/cluster/ctdb/tests/bench1.sh branches/SAMBA_4_0/source/cluster/ctdb/tests/ctdb_bench.c branches/SAMBA_4_0/source/cluster/ctdb/tests/ctdb_fetch.c branches/SAMBA_4_0/source/cluster/ctdb/tests/ctdb_fetch1.c branches/SAMBA_4_0/source/cluster/ctdb/tests/ctdb_messaging.c branches/SAMBA_4_0/source/cluster/ctdb/tests/ctdb_test.c branches/SAMBA_4_0/source/cluster/ctdb/tests/fetch.sh branches/SAMBA_4_0/source/cluster/ctdb/tests/fetch1.sh branches/SAMBA_4_0/source/cluster/ctdb/tests/messaging.sh branches/SAMBA_4_0/source/cluster/ctdb/tests/test.sh branches/SAMBA_4_0/source/cluster/ctdb/tests/test1.sh Changeset: Sorry, the patch is too large (4888 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22421
svn commit: samba r22422 - in branches/SAMBA_4_0/source/lib/tdb: . common include tools
Author: tridge
Date: 2007-04-21 07:25:40 + (Sat, 21 Apr 2007)
New Revision: 22422
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22422
Log:
merged tdb changes from ctdb
Modified:
branches/SAMBA_4_0/source/lib/tdb/autogen.sh
branches/SAMBA_4_0/source/lib/tdb/common/lock.c
branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
branches/SAMBA_4_0/source/lib/tdb/include/tdb.h
branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/autogen.sh
===
--- branches/SAMBA_4_0/source/lib/tdb/autogen.sh2007-04-21 07:23:42 UTC
(rev 22421)
+++ branches/SAMBA_4_0/source/lib/tdb/autogen.sh2007-04-21 07:25:40 UTC
(rev 22422)
@@ -3,7 +3,7 @@
rm -rf autom4te.cache
rm -f configure config.h.in
-IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace
+IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace -I
../lib/replace
autoconf $IPATHS || exit 1
autoheader $IPATHS || exit 1
Modified: branches/SAMBA_4_0/source/lib/tdb/common/lock.c
===
--- branches/SAMBA_4_0/source/lib/tdb/common/lock.c 2007-04-21 07:23:42 UTC
(rev 22421)
+++ branches/SAMBA_4_0/source/lib/tdb/common/lock.c 2007-04-21 07:25:40 UTC
(rev 22422)
@@ -105,7 +105,7 @@
/* lock a list in the database. list -1 is the alloc list */
-int tdb_lock(struct tdb_context *tdb, int list, int ltype)
+static int _tdb_lock(struct tdb_context *tdb, int list, int ltype, int op)
{
struct tdb_lock_type *new_lck;
int i;
@@ -158,10 +158,8 @@
/* Since fcntl locks don't nest, we do a lock for the first one,
and simply bump the count for future ones */
- if (tdb-methods-tdb_brlock(tdb,FREELIST_TOP+4*list,ltype,F_SETLKW,
+ if (tdb-methods-tdb_brlock(tdb,FREELIST_TOP+4*list,ltype, op,
0, 1)) {
- TDB_LOG((tdb, TDB_DEBUG_ERROR, tdb_lock failed on list %d
-ltype=%d (%s)\n, list, ltype, strerror(errno)));
return -1;
}
@@ -175,6 +173,25 @@
return 0;
}
+/* lock a list in the database. list -1 is the alloc list */
+int tdb_lock(struct tdb_context *tdb, int list, int ltype)
+{
+ int ret;
+ ret = _tdb_lock(tdb, list, ltype, F_SETLKW);
+ if (ret) {
+ TDB_LOG((tdb, TDB_DEBUG_ERROR, tdb_lock failed on list %d
+ltype=%d (%s)\n, list, ltype, strerror(errno)));
+ }
+ return ret;
+}
+
+/* lock a list in the database. list -1 is the alloc list. non-blocking lock */
+int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype)
+{
+ return _tdb_lock(tdb, list, ltype, F_SETLK);
+}
+
+
/* unlock the database: returns void because it's too late for errors. */
/* changed to return int it may be interesting to know there
has been an error --simo */
@@ -351,6 +368,14 @@
return tdb_lock(tdb, BUCKET(tdb-hash_fn(key)), F_WRLCK);
}
+/* lock/unlock one hash chain, non-blocking. This is meant to be used
+ to reduce contention - it cannot guarantee how many records will be
+ locked */
+int tdb_chainlock_nonblock(struct tdb_context *tdb, TDB_DATA key)
+{
+ return tdb_lock_nonblock(tdb, BUCKET(tdb-hash_fn(key)), F_WRLCK);
+}
+
int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key)
{
return tdb_unlock(tdb, BUCKET(tdb-hash_fn(key)), F_WRLCK);
Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
===
--- branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h 2007-04-21
07:23:42 UTC (rev 22421)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h 2007-04-21
07:25:40 UTC (rev 22422)
@@ -206,7 +206,7 @@
struct list_struct *rec);
void tdb_io_init(struct tdb_context *tdb);
int tdb_expand(struct tdb_context *tdb, tdb_off_t size);
-int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off,
- struct list_struct *rec);
+int rec_free_read(struct tdb_context *tdb, tdb_off_t off,
+ struct list_struct *rec);
Modified: branches/SAMBA_4_0/source/lib/tdb/include/tdb.h
===
--- branches/SAMBA_4_0/source/lib/tdb/include/tdb.h 2007-04-21 07:23:42 UTC
(rev 22421)
+++ branches/SAMBA_4_0/source/lib/tdb/include/tdb.h 2007-04-21 07:25:40 UTC
(rev 22422)
@@ -134,6 +134,7 @@
/* Low level locking functions: use with care */
int tdb_chainlock(struct tdb_context *tdb, TDB_DATA key);
+int tdb_chainlock_nonblock(struct tdb_context *tdb, TDB_DATA key);
int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key);
int tdb_chainlock_read(struct tdb_context *tdb, TDB_DATA key);
int tdb_chainunlock_read(struct tdb_context *tdb,
svn commit: samba r22423 - in branches/SAMBA_4_0/source/cluster/ctdb/common: .
Author: tridge Date: 2007-04-21 07:37:21 + (Sat, 21 Apr 2007) New Revision: 22423 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22423 Log: don't need popt here Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_lockwait.c Changeset: Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_lockwait.c === --- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_lockwait.c 2007-04-21 07:25:40 UTC (rev 22422) +++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_lockwait.c 2007-04-21 07:37:21 UTC (rev 22423) @@ -22,7 +22,6 @@ #include lib/events/events.h #include system/filesys.h #include system/wait.h -#include popt.h #include db_wrap.h #include lib/tdb/include/tdb.h #include ../include/ctdb_private.h
Re: svn commit: samba r22422 - in branches/SAMBA_4_0/source/lib/tdb: . common include tools
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Author: tridge Date: 2007-04-21 07:25:40 + (Sat, 21 Apr 2007) New Revision: 22422 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22422 Log: merged tdb changes from ctdb Modified: branches/SAMBA_4_0/source/lib/tdb/autogen.sh branches/SAMBA_4_0/source/lib/tdb/common/lock.c branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h branches/SAMBA_4_0/source/lib/tdb/include/tdb.h branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/autogen.sh === --- branches/SAMBA_4_0/source/lib/tdb/autogen.sh 2007-04-21 07:23:42 UTC (rev 22421) +++ branches/SAMBA_4_0/source/lib/tdb/autogen.sh 2007-04-21 07:25:40 UTC (rev 22422) @@ -3,7 +3,7 @@ rm -rf autom4te.cache rm -f configure config.h.in -IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace +IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../lib/replace Is that really needed? I just removed that from samba3. Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h === --- branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h2007-04-21 07:23:42 UTC (rev 22421) +++ branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h2007-04-21 07:25:40 UTC (rev 22422) @@ -206,7 +206,7 @@ struct list_struct *rec); void tdb_io_init(struct tdb_context *tdb); int tdb_expand(struct tdb_context *tdb, tdb_off_t size); -int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off, - struct list_struct *rec); +int rec_free_read(struct tdb_context *tdb, tdb_off_t off, + struct list_struct *rec); this seems wrong, you need to sync the samba4 changes to ctdb ! I just renamed the function in samba 3 and 4 please also sync to samba3 when you have fixed the above problems, thanks! metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGKcBYm70gjA5TCD8RAswuAJ9G3CI9PWHohz7gIiLMDwNsYpNPBgCg0G5P 1o/q51Llbwz37aMizKnp9Vk= =0m3Y -END PGP SIGNATURE-
Re: svn commit: samba r22422 - in branches/SAMBA_4_0/source/lib/tdb: . common include tools
Metze, -IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace +IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../lib/replace Is that really needed? I just removed that from samba3. darn! Looks like I merged badly while on the plane. I'll fix it. Thanks for noticing :) Cheers, Tridge
Rev 175: merge from samba4 in http://samba.org/~tridge/ctdb
revno: 175 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Sat 2007-04-21 10:09:37 +0200 message: merge from samba4 modified: lib/tdb/autogen.sh autogen.sh-20070125040949-7t3f5zdl1q4z9hyv-61 lib/tdb/common/tdb_private.h tdb_private.h-20070220022425-m1wibgjq7n5hahs6-10 === modified file 'lib/tdb/autogen.sh' --- a/lib/tdb/autogen.sh2007-04-16 12:52:58 + +++ b/lib/tdb/autogen.sh2007-04-21 08:09:37 + @@ -3,7 +3,7 @@ rm -rf autom4te.cache rm -f configure config.h.in -IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../lib/replace +IPATHS=-I libreplace -I lib/replace -I ../libreplace -I ../replace autoconf $IPATHS || exit 1 autoheader $IPATHS || exit 1 === modified file 'lib/tdb/common/tdb_private.h' --- a/lib/tdb/common/tdb_private.h 2007-04-16 12:52:58 + +++ b/lib/tdb/common/tdb_private.h 2007-04-21 08:09:37 + @@ -206,7 +206,7 @@ struct list_struct *rec); void tdb_io_init(struct tdb_context *tdb); int tdb_expand(struct tdb_context *tdb, tdb_off_t size); -int rec_free_read(struct tdb_context *tdb, tdb_off_t off, - struct list_struct *rec); +int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off, + struct list_struct *rec);
svn commit: samba r22425 - in branches/SAMBA_3_0/source/libsmb: .
Author: idra
Date: 2007-04-21 20:43:54 + (Sat, 21 Apr 2007)
New Revision: 22425
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22425
Log:
Avoid to segfault if we only have the realm.
Modified:
branches/SAMBA_3_0/source/libsmb/namequery_dc.c
Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/namequery_dc.c
===
--- branches/SAMBA_3_0/source/libsmb/namequery_dc.c 2007-04-21 08:04:58 UTC
(rev 22424)
+++ branches/SAMBA_3_0/source/libsmb/namequery_dc.c 2007-04-21 20:43:54 UTC
(rev 22425)
@@ -215,6 +215,11 @@
if ( (our_domain lp_security()==SEC_ADS) || realm ) {
ret = ads_dc_name(domain, realm, dc_ip, srv_name);
}
+
+ if (!domain) {
+ /* if we have only the realm we can't do anything else */
+ return False;
+ }
if (!ret) {
/* fall back on rpc methods if the ADS methods fail */
svn commit: samba r22426 - in branches/SAMBA_3_0_25/source/libsmb: .
Author: idra
Date: 2007-04-21 20:44:19 + (Sat, 21 Apr 2007)
New Revision: 22426
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22426
Log:
Avoid to segfault if we only have the realm
Modified:
branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c
===
--- branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c 2007-04-21 20:43:54 UTC
(rev 22425)
+++ branches/SAMBA_3_0_25/source/libsmb/namequery_dc.c 2007-04-21 20:44:19 UTC
(rev 22426)
@@ -215,6 +215,11 @@
if ( (our_domain lp_security()==SEC_ADS) || realm ) {
ret = ads_dc_name(domain, realm, dc_ip, srv_name);
}
+
+ if (!domain) {
+ /* if we have only the realm we can't do anything else */
+ return False;
+ }
if (!ret) {
/* fall back on rpc methods if the ADS methods fail */
svn commit: samba r22427 - in branches/SAMBA_4_0/source/script/tests: .
Author: abartlet
Date: 2007-04-21 21:09:56 + (Sat, 21 Apr 2007)
New Revision: 22427
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22427
Log:
Abort in a few more cases of failure to provision.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/script/tests/Samba4.pm
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm2007-04-21 20:44:19 UTC
(rev 22426)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm2007-04-21 21:09:56 UTC
(rev 22427)
@@ -257,7 +257,7 @@
;
close(LDIF);
- system($self-{bindir}/ad2oLschema $configuration -H
$privatedir/sam.ldb --option=convert:target=fedora-ds -I
$self-{setupdir}/schema-map-fedora-ds-1.0 -O $fedora_ds_dir/schema/99_ad.ldif
2);
+ system($self-{bindir}/ad2oLschema $configuration -H
$privatedir/sam.ldb --option=convert:target=fedora-ds -I
$self-{setupdir}/schema-map-fedora-ds-1.0 -O $fedora_ds_dir/schema/99_ad.ldif
2) == 0 or die(schema conversion for Fedora DS failed);
return ($fedora_ds_dir, $pidfile);
}
@@ -359,10 +359,10 @@
close(CONF);
#This uses the provision we just did, to read out the schema
- system($self-{bindir}/ad2oLschema $configuration -H
$privatedir/sam.ldb -I $self-{setupdir}/schema-map-openldap-2.3 -O
$ldapdir/ad.schema 2);
+ system($self-{bindir}/ad2oLschema $configuration -H
$privatedir/sam.ldb -I $self-{setupdir}/schema-map-openldap-2.3 -O
$ldapdir/ad.schema 2) == 0 or die(schema conversion for OpenLDAP failed);
#Now create an LDAP baseDN
- system($self-{bindir}/smbscript $self-{setupdir}/provision
$provision_options --ldap-base 2);
+ system($self-{bindir}/smbscript $self-{setupdir}/provision
$provision_options --ldap-base 2) == 0 or die(creating an OpenLDAP basedn
failed);
my $oldpath = $ENV{PATH};
$ENV{PATH} = /usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH};
@@ -531,10 +531,10 @@
#Ensure the config file is valid before we start
if (system($self-{bindir}/testparm $configuration -v
--suppress-prompt /dev/null 21) != 0) {
system($self-{bindir}/testparm $configuration 2);
- die(Failed to create configuration!);
+ die(Failed to create a valid smb.conf configuration!);
}
- (system(($self-{bindir}/testparm $configuration -v --suppress-prompt
--parameter-name=\netbios name\ --section-name=global 2 /dev/null | grep -i
^$netbiosname ) /dev/null 21) == 0) or die(Failed to create
configuration!);
+ (system(($self-{bindir}/testparm $configuration -v --suppress-prompt
--parameter-name=\netbios name\ --section-name=global 2 /dev/null | grep -i
^$netbiosname ) /dev/null 21) == 0) or die(Failed to create a valid
smb.conf configuration!);
my @provision_options = ($configuration);
push (@provision_options, --host-name=$netbiosname);
Rev 176: update the vnn as well when getting the connection information in http://samba.org/~tridge/ctdb
revno: 176
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-04-21 23:24:39 +0200
message:
update the vnn as well when getting the connection information
modified:
common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c 2007-04-21 07:22:46 +
+++ b/common/ctdb_client.c 2007-04-21 21:24:39 +
@@ -45,6 +45,7 @@
struct ctdb_req_header *hdr)
{
struct ctdb_reply_connect_wait *r = (struct ctdb_reply_connect_wait
*)hdr;
+ ctdb-vnn = r-vnn;
ctdb-num_connected = r-num_connected;
}
svn commit: samba r22428 - in branches/SAMBA_3_0_25/source/nsswitch: .
Author: jerry
Date: 2007-04-21 21:27:38 + (Sat, 21 Apr 2007)
New Revision: 22428
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22428
Log:
cleanup compile warnings in idmap_rid
Modified:
branches/SAMBA_3_0_25/source/nsswitch/idmap_rid.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_rid.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_rid.c 2007-04-21 21:09:56 UTC
(rev 22427)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_rid.c 2007-04-21 21:27:38 UTC
(rev 22428)
@@ -37,7 +37,7 @@
we support multiple domains in the new idmap
*/
-static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom, const char
*compat_params)
+static NTSTATUS idmap_rid_initialize(struct idmap_domain *dom)
{
NTSTATUS ret;
struct idmap_rid_context *ctx;
@@ -86,9 +86,6 @@
static NTSTATUS idmap_rid_id_to_sid(TALLOC_CTX *memctx, struct
idmap_rid_context *ctx, struct id_map *map)
{
- const char *domname, *name;
- enum lsa_SidType sid_type;
- BOOL ret;
struct winbindd_domain *domain;
/* apply filters before checking */
@@ -119,10 +116,7 @@
static NTSTATUS idmap_rid_sid_to_id(TALLOC_CTX *memctx, struct
idmap_rid_context *ctx, struct id_map *map)
{
- const char *domname, *name;
- enum lsa_SidType sid_type;
uint32_t rid;
- BOOL ret;
sid_peek_rid(map-sid, rid);
map-xid.id = rid - ctx-base_rid + ctx-low_id;
svn commit: samba r22429 - in branches/SAMBA_3_0_25/source: .
Author: jerry Date: 2007-04-21 21:27:59 + (Sat, 21 Apr 2007) New Revision: 22429 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22429 Log: set version to 3.0.25rc3 Modified: branches/SAMBA_3_0_25/source/VERSION Changeset: Modified: branches/SAMBA_3_0_25/source/VERSION === --- branches/SAMBA_3_0_25/source/VERSION2007-04-21 21:27:38 UTC (rev 22428) +++ branches/SAMBA_3_0_25/source/VERSION2007-04-21 21:27:59 UTC (rev 22429) @@ -56,7 +56,7 @@ # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=2 +SAMBA_VERSION_RC_RELEASE=3 # To mark SVN snapshots this should be set to 'yes'#
svn commit: samba r22430 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: jerry
Date: 2007-04-21 21:29:31 + (Sat, 21 Apr 2007)
New Revision: 22430
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22430
Log:
Add SID validate to sid2uid() and sid2gid() public entry points in winbindd
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c 2007-04-21 21:27:59 UTC
(rev 22429)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c 2007-04-21 21:29:31 UTC
(rev 22430)
@@ -183,6 +183,40 @@
request_ok(state);
}
+static void sid2uid_lookupsid_recv( void *private_data, BOOL success,
+ const char *domain_name,
+ const char *name,
+ enum lsa_SidType type)
+{
+ struct winbindd_cli_state *state =
+ talloc_get_type_abort(private_data, struct winbindd_cli_state);
+ DOM_SID sid;
+
+ if (!success) {
+ DEBUG(5, (sid2uid_lookupsid_recv Could not convert get sid
type for %s\n,
+ state-request.data.sid));
+ request_error(state);
+ return;
+ }
+
+ if ( (type!=SID_NAME_USER) || (type!=SID_NAME_COMPUTER) ) {
+ DEBUG(5,(sid2uid_lookupsid_recv: Sid %s is not a user or a
computer.\n,
+state-request.data.sid));
+ request_error(state);
+ return;
+ }
+
+ if (!string_to_sid(sid, state-request.data.sid)) {
+ DEBUG(1, (sid2uid_lookupsid_recv: Could not get convert sid %s
from string\n,
+ state-request.data.sid));
+ request_error(state);
+ return;
+ }
+
+ /* always use the async interface (may block) */
+ winbindd_sid2uid_async(state-mem_ctx, sid, sid2uid_recv, state);
+}
+
void winbindd_sid_to_uid(struct winbindd_cli_state *state)
{
DOM_SID sid;
@@ -200,8 +234,11 @@
return;
}
- /* always use the async interface (may block) */
- winbindd_sid2uid_async(state-mem_ctx, sid, sid2uid_recv, state);
+ /* Validate the SID as a user. Hopefully this will hit cache.
+ Needed to prevent DoS by exhausting the uid allocation
+ range from random SIDs. */
+
+ winbindd_lookupsid_async( state-mem_ctx, sid, sid2uid_lookupsid_recv,
state );
}
/* Convert a sid to a gid. We assume we only have one rid attached to the
@@ -223,6 +260,43 @@
request_ok(state);
}
+static void sid2gid_lookupsid_recv( void *private_data, BOOL success,
+ const char *domain_name,
+ const char *name,
+ enum lsa_SidType type)
+{
+ struct winbindd_cli_state *state =
+ talloc_get_type_abort(private_data, struct winbindd_cli_state);
+ DOM_SID sid;
+
+ if (!success) {
+ DEBUG(5, (sid2gid_lookupsid_recv: Could not convert get sid
type for %s\n,
+ state-request.data.sid));
+ request_error(state);
+ return;
+ }
+
+ if ( (type!=SID_NAME_DOM_GRP) ||
+(type!=SID_NAME_ALIAS) ||
+(type!=SID_NAME_WKN_GRP) )
+ {
+ DEBUG(5,(sid2gid_lookupsid_recv: Sid %s is not a group.\n,
+state-request.data.sid));
+ request_error(state);
+ return;
+ }
+
+ if (!string_to_sid(sid, state-request.data.sid)) {
+ DEBUG(1, (sid2gid_lookupsid_recv: Could not get convert sid %s
from string\n,
+ state-request.data.sid));
+ request_error(state);
+ return;
+ }
+
+ /* always use the async interface (may block) */
+ winbindd_sid2gid_async(state-mem_ctx, sid, sid2gid_recv, state);
+}
+
void winbindd_sid_to_gid(struct winbindd_cli_state *state)
{
DOM_SID sid;
@@ -240,8 +314,11 @@
return;
}
- /* always use the async interface (may block) */
- winbindd_sid2gid_async(state-mem_ctx, sid, sid2gid_recv, state);
+ /* Validate the SID as a group. Hopefully this will hit cache.
+ Needed to prevent DoS by exhausting the uid allocation
+ range from random SIDs. */
+
+ winbindd_lookupsid_async( state-mem_ctx, sid, sid2gid_lookupsid_recv,
state );
}
static void sids2xids_recv(void *private_data, BOOL success, void *data, int
len)
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c
svn commit: samba r22431 - in branches/SAMBA_3_0_25/source: auth nsswitch
Author: jerry
Date: 2007-04-21 21:39:05 + (Sat, 21 Apr 2007)
New Revision: 22431
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22431
Log:
compiler cleanup fixes for the idmap changes that were not checked in fotr some
reason
Modified:
branches/SAMBA_3_0_25/source/auth/auth_util.c
branches/SAMBA_3_0_25/source/nsswitch/idmap.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/auth/auth_util.c
===
--- branches/SAMBA_3_0_25/source/auth/auth_util.c 2007-04-21 21:29:31 UTC
(rev 22430)
+++ branches/SAMBA_3_0_25/source/auth/auth_util.c 2007-04-21 21:39:05 UTC
(rev 22431)
@@ -982,9 +982,7 @@
NTSTATUS create_local_token(auth_serversupplied_info *server_info)
{
TALLOC_CTX *mem_ctx;
- struct id_map *ids;
NTSTATUS status;
- BOOL wb = True;
size_t i;
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap.c 2007-04-21 21:29:31 UTC
(rev 22430)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap.c 2007-04-21 21:39:05 UTC
(rev 22431)
@@ -91,24 +91,6 @@
return NULL;
}
-/* part of a quick hack to avoid loops, need to be sorted out correctly later
on */
-static BOOL idmap_in_own_child;
-
-static BOOL idmap_is_in_own_child(void)
-{
- return idmap_in_own_child;
-}
-
-void reset_idmap_in_own_child(void)
-{
- idmap_in_own_child = False;
-}
-
-void set_idmap_in_own_child(void)
-{
- idmap_in_own_child = True;
-}
-
BOOL idmap_is_offline(void)
{
return ( lp_winbind_offline_logon()
@@ -855,9 +837,6 @@
{
NTSTATUS ret;
struct idmap_domain *dom;
- char *domname, *name;
- enum lsa_SidType sid_type;
- BOOL wbret;
/* If we are offline we cannot lookup SIDs, deny mapping */
if (idmap_is_offline()) {
@@ -1415,6 +1394,8 @@
(unsigned long)maps[i].xid.id,
sid_string_static(maps[i].sid));
break;
+ case ID_TYPE_NOT_SPECIFIED:
+ break;
}
}
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd.c2007-04-21 21:29:31 UTC
(rev 22430)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd.c2007-04-21 21:39:05 UTC
(rev 22431)
@@ -1012,9 +1012,6 @@
namecache_enable();
- /* quick hack to avoid a loop in idmap, proper fix later */
- reset_idmap_in_own_child();
-
/* Winbind daemon initialisation */
if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) {
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c 2007-04-21
21:29:31 UTC (rev 22430)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c 2007-04-21
21:39:05 UTC (rev 22431)
@@ -923,9 +923,6 @@
child);
}
- /* quick hack to avoid a loop in idmap, proper fix later */
- set_idmap_in_own_child();
-
while (1) {
int ret;
svn commit: samba r22432 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2007-04-21 21:45:37 + (Sat, 21 Apr 2007) New Revision: 22432 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22432 Log: release notes for 3.0.25rc2 Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt === --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-04-21 21:39:05 UTC (rev 22431) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-04-21 21:45:37 UTC (rev 22432) @@ -1,9 +1,9 @@ = - Release Notes for Samba 3.0.25rc1 - Apr 9, 2007 + Release Notes for Samba 3.0.25rc2 + Apr 22, 2007 = -This is the first release candidate of the Samba 3.0.25 code base +This is the second release candidate of the Samba 3.0.25 code base and is provided for testing only. An RC release means that we are close to the final release but the code may still have a few remaining minor bugs. This release is *not* intended for production @@ -102,6 +102,120 @@ --- o Jeremy Allison [EMAIL PROTECTED] +* BUG 4494: Make sure to fail immediately if sendfile fails and + don't continue on to call chain_reply() (based on report from + Kevin Jamieson). +* Remove tdb.h from the libsmbsharemodes.so header file. +* BUG 3634: Fix crash in nmbd caused by a bad interfaces include + in smb.conf. +* Add initial version to winbindd_cache.tdb file. Automatically + delete existing non-versioned cache files. +* Fix the storage size of time_t in winbindd_cache.tdb to be 8 + bytes. +* Cope with signature errors on sessionsetupX logins where the + server just reflects our signature back to us. Allow the upper + layer to see the real error. +* BUG 4512: Limit the volume label for a share to 32 UNICODE + characters. +* Allow arbitrary bases in int and ulong parsing in smb.conf. +* Fix off-by-one error in tconX parsing. + + +o Andrew Bartlett [EMAIL PROTECTED] +* Ensure debug messages from tools print the correct config file + location if the file was defined as a command line option. + + +o Gerald (Jerry) Carter [EMAIL PROTECTED] +* BUG 4501 (partial): Fix crash bugs in idmap_ad plugin by adding + the schema_mode option when using winbind nss info = template. +* BUG 4491, 4501 (partial): Disable attempts to allocate a uid/gid if no + idmap alloc backend has been defined. Do not defined a default + alloc backend. +* Fix make install to include creating the links between + idmap_ad and the nss_info_rfc2307 and nss_info_sfu plugins. +* Enable the --with-dnsupdate in the Fedora/RHEL RPM packaging + files. +* BUG 4508: Remove potential loops in the idmap API by requiring + the caller defined the SID type rather than having the idmap layer + call back up to determine the SID type when allocating + uids/gids. +* Don't inherit the offline flag for winbindd_domains that have + not been initialized yet. +* Fix a crash in idmap_ldap caused by a NULL pointer dereference. +* Fix deadlock and timeout conditions in idmap_rid. + + +o Guenther Deschner [EMAIL PROTECTED] +* Build fixes when linking against Heimdal 0.8 Kerberos libraries. +* Build fixes when using older Heimdal Krb5 libs (e.g. 0.6.3). + + +o William Jojo [EMAIL PROTECTED] +* BUG 3632: Fix for EISCON in open_any_socket_out() on AIX. + + +o Taj Khattra [EMAIL PROTECTED] +* Fix missing lock count release in transaction cancel. + + +o Herb Lewis [EMAIL PROTECTED] +* Allow profiling level to be set on startup. + + +o Jason Mader [EMAIL PROTECTED] +* Various compile warning fixes. +* Initial patch set for strptime() in libreplace. + + +o Jim McDonough [EMAIL PROTECTED] +* Fix the GPFS VFS module to pass the POSIX ACL tests (Thanks to + Gomati Mohanan). + + +o Stefan Metzmacher [EMAIL PROTECTED] +* BUG 4496: Fix libreplace failure on ulibc systems. +* Merge numerous libreplace fixes from the SAMBA_4_0 code base + (stdint.h, stdbool.h, unsetenv, strptime(), strtoll(), et. al.). +* Move ZERO_*, ARRAY_SIZE and PTR_DIFF macros into libreplace. + + +o Lars Mueller [EMAIL PROTECTED] +* Log the reason for failures when not creating a core file on a + crash due to restrictive permissions on the log file directory. + + +o Jorge Santos [EMAIL PROTECTED] +* BUG 4500: Fix compile bug in quota.c. + + +o Simo Sorce [EMAIL PROTECTED] +* Offline logon fixes in the idmap backend manager. +* Cleanup initialization code in the sfu and rfc2307 nss_info + plugins to protect against a crash if called before the idmap_ad + module has been initialized. + + +Release
svn commit: samba r22433 - in branches/SAMBA_3_0_RELEASE/source: .
Author: jerry Date: 2007-04-21 21:49:40 + (Sat, 21 Apr 2007) New Revision: 22433 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22433 Log: set version to 3.0.25rc2 Modified: branches/SAMBA_3_0_RELEASE/source/VERSION Changeset: Modified: branches/SAMBA_3_0_RELEASE/source/VERSION === --- branches/SAMBA_3_0_RELEASE/source/VERSION 2007-04-21 21:45:37 UTC (rev 22432) +++ branches/SAMBA_3_0_RELEASE/source/VERSION 2007-04-21 21:49:40 UTC (rev 22433) @@ -56,7 +56,7 @@ # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE=1 +SAMBA_VERSION_RC_RELEASE=2 # To mark SVN snapshots this should be set to 'yes'#
svn commit: samba r22434 - in branches/SAMBA_3_0_RELEASE: packaging/RHEL source source/auth source/client source/include source/lib source/lib/replace source/lib/replace/system source/lib/replace/test
Author: jerry Date: 2007-04-21 21:51:01 + (Sat, 21 Apr 2007) New Revision: 22434 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22434 Log: sync from the 3.0.25 tree for rc2 Modified: branches/SAMBA_3_0_RELEASE/packaging/RHEL/samba.spec.tmpl branches/SAMBA_3_0_RELEASE/source/Makefile.in branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c branches/SAMBA_3_0_RELEASE/source/client/client.c branches/SAMBA_3_0_RELEASE/source/configure.in branches/SAMBA_3_0_RELEASE/source/include/idmap.h branches/SAMBA_3_0_RELEASE/source/include/includes.h branches/SAMBA_3_0_RELEASE/source/include/smb.h branches/SAMBA_3_0_RELEASE/source/include/smb_macros.h branches/SAMBA_3_0_RELEASE/source/include/smb_share_modes.h branches/SAMBA_3_0_RELEASE/source/lib/fault.c branches/SAMBA_3_0_RELEASE/source/lib/messages.c branches/SAMBA_3_0_RELEASE/source/lib/replace/Makefile.in branches/SAMBA_3_0_RELEASE/source/lib/replace/README branches/SAMBA_3_0_RELEASE/source/lib/replace/libreplace.m4 branches/SAMBA_3_0_RELEASE/source/lib/replace/libreplace_macros.m4 branches/SAMBA_3_0_RELEASE/source/lib/replace/replace.c branches/SAMBA_3_0_RELEASE/source/lib/replace/replace.h branches/SAMBA_3_0_RELEASE/source/lib/replace/samba.m4 branches/SAMBA_3_0_RELEASE/source/lib/replace/system/wait.h branches/SAMBA_3_0_RELEASE/source/lib/replace/test/os2_delete.c branches/SAMBA_3_0_RELEASE/source/lib/replace/test/testsuite.c branches/SAMBA_3_0_RELEASE/source/lib/talloc/talloc.h branches/SAMBA_3_0_RELEASE/source/lib/util_sock.c branches/SAMBA_3_0_RELEASE/source/libads/kerberos.c branches/SAMBA_3_0_RELEASE/source/libsmb/clientgen.c branches/SAMBA_3_0_RELEASE/source/libsmb/clikrb5.c branches/SAMBA_3_0_RELEASE/source/libsmb/namequery_dc.c branches/SAMBA_3_0_RELEASE/source/libsmb/smb_share_modes.c branches/SAMBA_3_0_RELEASE/source/modules/vfs_gpfs.c branches/SAMBA_3_0_RELEASE/source/modules/vfs_readahead.c branches/SAMBA_3_0_RELEASE/source/nmbd/nmbd_subnetdb.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_ad.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_cache.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_ldap.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_nss.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_passdb.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_rid.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_tdb.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_util.c branches/SAMBA_3_0_RELEASE/source/nsswitch/pam_winbind.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_sid.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c branches/SAMBA_3_0_RELEASE/source/param/loadparm.c branches/SAMBA_3_0_RELEASE/source/profile/profile.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_prs.c branches/SAMBA_3_0_RELEASE/source/smbd/connection.c branches/SAMBA_3_0_RELEASE/source/smbd/process.c branches/SAMBA_3_0_RELEASE/source/smbd/quotas.c branches/SAMBA_3_0_RELEASE/source/smbd/reply.c branches/SAMBA_3_0_RELEASE/source/smbd/server.c branches/SAMBA_3_0_RELEASE/source/smbd/trans2.c branches/SAMBA_3_0_RELEASE/source/tdb/common/transaction.c branches/SAMBA_3_0_RELEASE/source/utils/net_status.c branches/SAMBA_3_0_RELEASE/source/utils/smbpasswd.c branches/SAMBA_3_0_RELEASE/source/utils/status.c branches/SAMBA_3_0_RELEASE/source/web/statuspage.c Changeset: Sorry, the patch is too large (4063 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22434
svn commit: samba r22435 - in branches/SAMBA_3_0_RELEASE/source/lib/replace: . test
Author: jerry Date: 2007-04-21 21:52:40 + (Sat, 21 Apr 2007) New Revision: 22435 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22435 Log: adding new librepleasce files for release Added: branches/SAMBA_3_0_RELEASE/source/lib/replace/strptime.c branches/SAMBA_3_0_RELEASE/source/lib/replace/strptime.m4 branches/SAMBA_3_0_RELEASE/source/lib/replace/test/strptime.c Changeset: Sorry, the patch is too large (1193 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22435
svn commit: samba r22437 - in branches/SAMBA_4_0/source/libnet: .
Author: metze Date: 2007-04-21 22:33:23 + (Sat, 21 Apr 2007) New Revision: 22437 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22437 Log: fix dependencies metze Modified: branches/SAMBA_4_0/source/libnet/config.mk Changeset: Modified: branches/SAMBA_4_0/source/libnet/config.mk === --- branches/SAMBA_4_0/source/libnet/config.mk 2007-04-21 22:07:10 UTC (rev 22436) +++ branches/SAMBA_4_0/source/libnet/config.mk 2007-04-21 22:33:23 UTC (rev 22437) @@ -27,4 +27,5 @@ userinfo.o \ userman.o \ prereq_domain.o -PUBLIC_DEPENDENCIES = dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel +PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel +PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5
svn commit: samba r22438 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze Date: 2007-04-21 23:02:49 + (Sat, 21 Apr 2007) New Revision: 22438 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22438 Log: get rid of printf format warnings in heimdal code metze Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h === --- branches/SAMBA_4_0/source/heimdal_build/roken.h 2007-04-21 22:33:23 UTC (rev 22437) +++ branches/SAMBA_4_0/source/heimdal_build/roken.h 2007-04-21 23:02:49 UTC (rev 22438) @@ -73,6 +73,12 @@ #define HAVE_INNETGR #endif +#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1 ) +#ifndef HAVE___ATTRIBUTE__ +#define HAVE___ATTRIBUTE__ +#endif +#endif + /* * we don't want that roken.h.in includes socket_wrapper * we include socket_wrapper via system/network.h
svn commit: samba r22439 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze
Date: 2007-04-21 23:12:45 + (Sat, 21 Apr 2007)
New Revision: 22439
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22439
Log:
fix some dependencies
metze
Modified:
branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl
branches/SAMBA_4_0/source/heimdal_build/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl
===
--- branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl2007-04-21
23:02:49 UTC (rev 22438)
+++ branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl2007-04-21
23:12:45 UTC (rev 22439)
@@ -46,7 +46,7 @@
close(IN);
print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'.\n;
-print CFLAGS = -Iheimdal_build -I$dirname\n;
+print CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n;
print OBJ_FILES = ;
foreach $o_file (@o_files) {
print \\\n\t$o_file;
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk 2007-04-21 23:02:49 UTC
(rev 22438)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2007-04-21 23:12:45 UTC
(rev 22439)
@@ -54,7 +54,7 @@
###
# Start SUBSYSTEM HEIMDAL_GSSAPI
[SUBSYSTEM::HEIMDAL_GSSAPI]
-CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi
-Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
+CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi/gssapi
-Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
OBJ_FILES = \
../heimdal/lib/gssapi/mech/gss_krb5.o \
../heimdal/lib/gssapi/mech/gss_mech_switch.o \
@@ -163,7 +163,8 @@
../heimdal/lib/gssapi/krb5/accept_sec_context.o \
../heimdal/lib/gssapi/krb5/set_sec_context_option.o \
../heimdal/lib/gssapi/krb5/process_context_token.o
-PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1
HEIMDAL_SPNEGO_ASN1
+PRIVATE_DEPENDENCIES = HEIMDAL_DES HEIMDAL_ASN1 HEIMDAL_SPNEGO_ASN1
+PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5
# End SUBSYSTEM HEIMDAL_GSSAPI
###
@@ -171,8 +172,8 @@
# Start SUBSYSTEM HEIMDAL_KRB5
[SUBSYSTEM::HEIMDAL_KRB5]
CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_HX509
HEIMDAL_PKINIT_ASN1 HEIMDAL_GLUE
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_PKINIT_ASN1
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509
OBJ_FILES = \
../heimdal/lib/krb5/acache.o \
../heimdal/lib/krb5/add_et_list.o \
@@ -330,7 +331,12 @@
# Start SUBSYSTEM HEIMDAL_HX509
[SUBSYSTEM::HEIMDAL_HX509]
CFLAGS = -Iheimdal_build -Iheimdal/lib/hx509
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_CMS_ASN1
HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1
HEIMDAL_PKCS12_ASN1
+PRIVATE_DEPENDENCIES = \
+ HEIMDAL_ROKEN HEIMDAL_COM_ERR \
+ HEIMDAL_ASN1 HEIMDAL_DES \
+ HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \
+ HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \
+ HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1
OBJ_FILES = \
../heimdal/lib/hx509/ca.o \
../heimdal/lib/hx509/cert.o \
Build status as of Sun Apr 22 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-04-21 00:01:27.0 + +++ /home/build/master/cache/broken_results.txt 2007-04-22 00:01:42.0 + @@ -1,4 +1,4 @@ -Build status as of Sat Apr 21 00:00:02 2007 +Build status as of Sun Apr 22 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -16,9 +16,9 @@ samba0 0 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 38 35 3 +samba4 38 31 4 samba_3_041 20 1 smb-build31 30 0 talloc 36 1 0 -tdb 33 2 0 +tdb 34 2 0
svn commit: samba r22440 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze Date: 2007-04-22 00:21:14 + (Sun, 22 Apr 2007) New Revision: 22440 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22440 Log: fix autodependencies build metze Added: branches/SAMBA_4_0/source/heimdal_build/vis.h Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk === --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2007-04-21 23:12:45 UTC (rev 22439) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2007-04-22 00:21:14 UTC (rev 22440) @@ -553,20 +553,12 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi| include perl_path_wrapper.sh et_deps.pl heimdal/lib/hx509/hx509_err.et heimdal/lib/hx509| -.SUFFIXES: .hin -.hin.h: - @cp $ $@ - -heimdal/lib/roken/vis.h: heimdal/lib/roken/vis.hin -heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin - include perl_path_wrapper.sh hcrypto-deps.pl heimdal/lib/des/*.h| heimdal/lib/des/hcrypto: @rm -f $@; ln -s ./../des $@ clean:: - @-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h @-rm -f bin/compile_et bin/asn1_compile @-rm -f heimdal/lib/krb5/des/hcrypto Added: branches/SAMBA_4_0/source/heimdal_build/vis.h === --- branches/SAMBA_4_0/source/heimdal_build/vis.h 2007-04-21 23:12:45 UTC (rev 22439) +++ branches/SAMBA_4_0/source/heimdal_build/vis.h 2007-04-22 00:21:14 UTC (rev 22440) @@ -0,0 +1,4 @@ +#ifndef _HEIMDAL_BUILD_VIS_H +#define _HEIMDAL_BUILD_VIS_H +#include heimdal/lib/roken/vis.hin +#endif
svn commit: samba r22441 - in branches/SAMBA_3_0/source: . m4
Author: jpeach Date: 2007-04-22 03:17:31 + (Sun, 22 Apr 2007) New Revision: 22441 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22441 Log: Add automatic dependency tracking. The dependency generation is toolchain independent, but since there's no portable method for doing makefile includes, we can actually use the dependencies with GNU make. It's easy to add this for other makes, but I don't have any to test. This also moves as much m4 as possible into the m4 directory where no-one has to look at it. AFAICT, there's no way to hide depcomp in there too, which is unfortunate. Added: branches/SAMBA_3_0/source/depcomp branches/SAMBA_3_0/source/m4/ branches/SAMBA_3_0/source/m4/aclocal.m4 branches/SAMBA_3_0/source/m4/check_gnu_make.m4 branches/SAMBA_3_0/source/m4/cond.m4 branches/SAMBA_3_0/source/m4/depend.m4 branches/SAMBA_3_0/source/m4/depout.m4 branches/SAMBA_3_0/source/m4/lead-dot.m4 branches/SAMBA_3_0/source/m4/make.m4 branches/SAMBA_3_0/source/m4/substnot.m4 Removed: branches/SAMBA_3_0/source/aclocal.m4 Modified: branches/SAMBA_3_0/source/ branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/autogen.sh branches/SAMBA_3_0/source/configure.in Changeset: Sorry, the patch is too large (2071 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=22441
