Rev 628: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 628 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-09-14 15:23:23 +1000 message: merge from ronnie modified: 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 tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 web/configuring.html configuring_ctdb.htm-20070608021649-cipqdfao7xedp6ji-1 revno: 432.1.287 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-09-14 15:19:44 +1000 message: let ctdb ip only print the ip addresses known to the specified node and not the entire cluster modified: tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 revno: 432.1.286 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-09-14 14:24:53 +1000 message: update vnn -> pnn in documentation modified: doc/ctdb.1 ctdb.1-20070609004027-2618fsab2br6vqha-1 doc/ctdb.1.html ctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1 doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2 revno: 432.1.285 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-09-14 14:19:12 +1000 message: documentation updates it is --event-script-dir not --event-script add explanation of the public_addresses file modified: doc/ctdbd.1ctdbd.1-20070610004249-06awdka4n3gyea3w-1 doc/ctdbd.1.html ctdbd.1.html-20070610004253-y2xxgjfgnpsucekc-1 doc/ctdbd.1.xml ctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1 web/configuring.html configuring_ctdb.htm-20070608021649-cipqdfao7xedp6ji-1 revno: 432.1.284 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-09-14 12:18:34 +1000 message: merge from tridge modified: config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6 config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1 config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 Diff too large for email (911, the limit is 200).
Re: svn commit: samba r25114 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
>> >> jelmer: we need to handle this more genericly, I assume >> we have a lot of other related bugs > I've just fixed this properly. ? I don't see any related commit... metze signature.asc Description: OpenPGP digital signature
Rev 627: cope with non-standard install dirs in event scripts in http://samba.org/~tridge/ctdb
revno: 627 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-09-14 14:14:03 +1000 message: cope with non-standard install dirs in event scripts modified: config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6 config/events.d/00.ctdbevents-20070529030121-04fjh63cxfh8v1pj-1 config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1 config/events.d/40.vsftpd 40.vsftpd-20070605080716-mih15mjbgsjt7niv-1 config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3 config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1 config/events.d/61.nfstickle 61.nfstickle-20070706005204-6etuzuk8b86aoua5-1 config/functions functions-20070601105405-gajwirydr5a9zd6x-1 config/statd-callout statdcallout-20070531010857-6sdlz455vusye5y5-1 server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 Diff too large for email (339, the limit is 200).
svn commit: samba r25142 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jpeach
Date: 2007-09-14 04:17:17 + (Fri, 14 Sep 2007)
New Revision: 25142
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25142
Log:
Panic if setting the group list fails while switching security
contexts. Patch from Tim Prouty <[EMAIL PROTECTED]>.
Modified:
branches/SAMBA_3_2/source/smbd/sec_ctx.c
branches/SAMBA_3_2_0/source/smbd/sec_ctx.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/sec_ctx.c
===
--- branches/SAMBA_3_2/source/smbd/sec_ctx.c2007-09-14 01:07:57 UTC (rev
25141)
+++ branches/SAMBA_3_2/source/smbd/sec_ctx.c2007-09-14 04:17:17 UTC (rev
25142)
@@ -239,7 +239,9 @@
/* Start context switch */
gain_root();
#ifdef HAVE_SETGROUPS
- sys_setgroups(gid, ngroups, groups);
+ if (sys_setgroups(gid, ngroups, groups) != 0) {
+ smb_panic("sys_setgroups failed");
+ }
#endif
become_id(uid, gid);
/* end context switch */
@@ -282,6 +284,7 @@
DEBUG(0, ("WARNING: failed to set group list "
"(%d groups) for UID %ld: %s\n",
ngroups, uid, strerror(errno)));
+ smb_panic("sys_setgroups failed");
}
become_uid(uid);
Modified: branches/SAMBA_3_2_0/source/smbd/sec_ctx.c
===
--- branches/SAMBA_3_2_0/source/smbd/sec_ctx.c 2007-09-14 01:07:57 UTC (rev
25141)
+++ branches/SAMBA_3_2_0/source/smbd/sec_ctx.c 2007-09-14 04:17:17 UTC (rev
25142)
@@ -239,7 +239,9 @@
/* Start context switch */
gain_root();
#ifdef HAVE_SETGROUPS
- sys_setgroups(gid, ngroups, groups);
+ if (sys_setgroups(gid, ngroups, groups) != 0) {
+ smb_panic("sys_setgroups failed");
+ }
#endif
become_id(uid, gid);
/* end context switch */
@@ -282,6 +284,7 @@
DEBUG(0, ("WARNING: failed to set group list "
"(%d groups) for UID %ld: %s\n",
ngroups, uid, strerror(errno)));
+ smb_panic("sys_setgroups failed");
}
become_uid(uid);
Rev 625: make sure all public IPs are removed at startup in http://samba.org/~tridge/ctdb
revno: 625
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.test2
timestamp: Fri 2007-09-14 11:56:40 +1000
message:
make sure all public IPs are removed at startup
modified:
config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1
server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
revno: 432.1.283
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-09-14 10:37:10 +1000
message:
during startup make sure to delete any public addresses from any
interface
modified:
config/events.d/10.interface
10.interface-20070604050809-s21zslfirn07zjt8-1
revno: 432.1.282
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-09-14 10:16:36 +1000
message:
let each node verify that they have a correct assignment of public ip
addresses (i.e. htey hold those they should hold and they dont hold
any of those they shouldnt hold)
if an inconsistency is found, mark the local node as recovery mode
active
and wait for the recovery master to trigger a full blown recovery
modified:
server/ctdb_recoverd.c
recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
=== modified file 'config/events.d/10.interface'
--- a/config/events.d/10.interface 2007-09-13 04:28:18 +
+++ b/config/events.d/10.interface 2007-09-14 01:56:40 +
@@ -35,6 +35,7 @@
destip=`echo $dest | cut -d: -f1`
destport=`echo $dest | cut -d: -f2`
ctdb killtcp $srcip:$srcport $destip:$destport >/dev/null 2>&1 ||
_failed=1
+ echo "`date` Killing TCP connection $srcip:$srcport $destip:$destport"
_killcount=`expr $_killcount + 1`
done < $connfile
/bin/rm -f $connfile
@@ -66,6 +67,15 @@
[ -f /proc/sys/net/ipv4/conf/all/arp_filter ] && {
echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
}
+ cat "$CTDB_PUBLIC_ADDRESSES" | cut -d/ -f1 | while read _IP; do
+ _IP_HELD=`/sbin/ip addr show | grep "inet $_IP/"`
+ [ -z "$_IP_HELD" ] || {
+ _IFACE=`echo $_IP_HELD | sed -e "s/.*\s//"`
+ _NM=`echo $_IP_HELD | sed -e "s/.*$_IP\///" -e
"s/\s.*//"`
+ echo "`date` Removing public address $_IP/$_NM from
device $_IFACE"
+ /sbin/ip addr del $_IP/$_NM dev $_IFACE
+ }
+ done
;;
@@ -124,7 +134,25 @@
/sbin/iptables -D INPUT -i $iface -d $ip -j DROP 2> /dev/null
/sbin/iptables -I INPUT -i $iface -d $ip -j DROP
kill_tcp_connections $ip
+
+ # the ip tool will delete all secondary IPs if this is the primary. To
work around
+ # this _very_ annoying behaviour we have to keep a record of the
secondaries and re-add
+ # them afterwards. yuck
+ secondaries=""
+ if /sbin/ip addr list dev $iface primary | grep "inet $ip/$maskbits " >
/dev/null; then
+ secondaries=`/sbin/ip addr list dev $iface secondary | grep " inet
" | awk '{print $2}'`
+ fi
/sbin/ip addr del $ip/$maskbits dev $iface || failed=1
+ [ -z "$secondaries" ] || {
+ for i in $secondaries; do
+ if /sbin/ip addr list dev $iface | grep "inet $i" > /dev/null;
then
+ echo "`date` kept secondary $i on dev $iface"
+ else
+ echo "`date` re-adding secondary address $i to dev $iface"
+ /sbin/ip addr add $i dev $iface || failed=1
+ fi
+ done
+ }
/sbin/iptables -D INPUT -i $iface -d $ip -j DROP
[ $failed = 0 ] || {
echo "`/bin/date` Failed to del $ip on dev $iface"
=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c2007-09-13 23:49:12 +
+++ b/server/ctdb_recoverd.c2007-09-14 01:56:40 +
@@ -21,6 +21,7 @@
#include "lib/events/events.h"
#include "system/filesys.h"
#include "system/time.h"
+#include "system/network.h"
#include "popt.h"
#include "cmdline.h"
#include "../include/ctdb.h"
@@ -1423,6 +1424,7 @@
struct ctdb_vnn_map *remote_vnnmap=NULL;
int i, j, ret;
struct ctdb_recoverd *rec;
+ struct ctdb_all_public_ips *ips;
rec = talloc_zero(ctdb, struct ctdb_recoverd);
CTDB_NO_MEMORY_FATAL(ctdb, rec);
@@ -1533,7 +1535,34 @@
force_election(rec, mem_ctx, pnn, nodemap);
goto again;
}
-
+
+ /* ve
Rev 626: fix pkill args in http://samba.org/~tridge/ctdb
revno: 626
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.test2
timestamp: Fri 2007-09-14 11:59:04 +1000
message:
fix pkill args
modified:
config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6
=== modified file 'config/ctdb.init'
--- a/config/ctdb.init 2007-09-13 23:49:12 +
+++ b/config/ctdb.init 2007-09-14 01:59:04 +
@@ -100,7 +100,7 @@
[ $count -gt 10 ] && {
echo -n $"killing ctdbd "
killall -q -9 ctdbd
- pkill -f -9 /etc/ctdb/events.d/
+ pkill -9 -f /etc/ctdb/events.d/
}
done
case $init_style in
svn commit: samba r25141 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-09-14 01:07:57 + (Fri, 14 Sep 2007)
New Revision: 25141
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25141
Log:
More pstring removal.
Jeremy.
Modified:
branches/SAMBA_3_2/source/smbd/oplock_irix.c
branches/SAMBA_3_2_0/source/smbd/oplock_irix.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/oplock_irix.c
===
--- branches/SAMBA_3_2/source/smbd/oplock_irix.c2007-09-13 22:41:04 UTC
(rev 25140)
+++ branches/SAMBA_3_2/source/smbd/oplock_irix.c2007-09-14 01:07:57 UTC
(rev 25141)
@@ -33,17 +33,25 @@
{
int fd;
int pfd[2];
- pstring tmpname;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ char *tmpname = NULL;
set_effective_capability(KERNEL_OPLOCK_CAPABILITY);
- slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_lockdir(),
-(int)sys_getpid());
+ tmpname = talloc_asprintf(ctx,
+ "%s/koplock.%d",
+ lp_lockdir(),
+ (int)sys_getpid());
+ if (!tmpname) {
+ TALLOC_FREE(ctx);
+ return False;
+ }
if(pipe(pfd) != 0) {
DEBUG(0,("check_kernel_oplocks: Unable to create pipe. Error "
"was %s\n",
strerror(errno) ));
+ TALLOC_FREE(ctx);
return False;
}
@@ -54,11 +62,14 @@
unlink( tmpname );
close(pfd[0]);
close(pfd[1]);
+ TALLOC_FREE(ctx);
return False;
}
unlink(tmpname);
+ TALLOC_FREE(ctx);
+
if(sys_fcntl_long(fd, F_OPLKREG, pfd[1]) == -1) {
DEBUG(0,("check_kernel_oplocks: Kernel oplocks are not "
"available on this machine. Disabling kernel oplock "
Modified: branches/SAMBA_3_2_0/source/smbd/oplock_irix.c
===
--- branches/SAMBA_3_2_0/source/smbd/oplock_irix.c 2007-09-13 22:41:04 UTC
(rev 25140)
+++ branches/SAMBA_3_2_0/source/smbd/oplock_irix.c 2007-09-14 01:07:57 UTC
(rev 25141)
@@ -33,17 +33,25 @@
{
int fd;
int pfd[2];
- pstring tmpname;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ char *tmpname = NULL;
set_effective_capability(KERNEL_OPLOCK_CAPABILITY);
- slprintf(tmpname,sizeof(tmpname)-1, "%s/koplock.%d", lp_lockdir(),
-(int)sys_getpid());
+ tmpname = talloc_asprintf(ctx,
+ "%s/koplock.%d",
+ lp_lockdir(),
+ (int)sys_getpid());
+ if (!tmpname) {
+ TALLOC_FREE(ctx);
+ return False;
+ }
if(pipe(pfd) != 0) {
DEBUG(0,("check_kernel_oplocks: Unable to create pipe. Error "
"was %s\n",
strerror(errno) ));
+ TALLOC_FREE(ctx);
return False;
}
@@ -54,11 +62,14 @@
unlink( tmpname );
close(pfd[0]);
close(pfd[1]);
+ TALLOC_FREE(ctx);
return False;
}
unlink(tmpname);
+ TALLOC_FREE(ctx);
+
if(sys_fcntl_long(fd, F_OPLKREG, pfd[1]) == -1) {
DEBUG(0,("check_kernel_oplocks: Kernel oplocks are not "
"available on this machine. Disabling kernel oplock "
Rev 624: - merge from ronnie in http://samba.org/~tridge/ctdb
revno: 624 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge.test2 timestamp: Fri 2007-09-14 09:49:12 +1000 message: - merge from ronnie - add a flag to check that recovery completed correctly. If not, re-trigger it in monitoring modified: common/system_linux.c system.c-20070525071636-a5n1ihghjtppy08r-3 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 web/configuring.html configuring_ctdb.htm-20070608021649-cipqdfao7xedp6ji-1 web/nfs.html nfs.html-20070608234340-a8i1dxro7a7i6jz6-1 revno: 432.1.281 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-09-14 08:56:27 +1000 message: update the section about event scripts modified: web/configuring.html configuring_ctdb.htm-20070608021649-cipqdfao7xedp6ji-1 revno: 432.1.280 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-09-14 08:15:24 +1000 message: disable nfsv4 in etc/sysconfig/nfs modified: web/nfs.html nfs.html-20070608234340-a8i1dxro7a7i6jz6-1 revno: 432.1.279 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-09-13 14:51:37 +1000 message: when a ctdb_takeover_run has failed we must make sure that need_takeover_run is set to true or else we might forget to rerun it again during the next recovery othervise, need_takeover_run is only set to true IFF the node flags for a remote node and the local nodes differ. It is possible that a takeover run fails and thus the reassignment of ip addresses is incomplete but before we get back to the test in monitor_cluster() that all the node flags of all nodes have converged and they now match each others again. and thus causing monitor_cluster() to fail to realize that a takeover run is needed. modified: server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 revno: 432.1.278 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Thu 2007-09-13 14:28:18 +1000 message: merge from tridge modified: common/system_aix.c system_aix.c-20070714002637-rpu7y2dxeoh1ckej-1 common/system_linux.c system.c-20070525071636-a5n1ihghjtppy08r-3 config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6 config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1 config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1 config/functions functions-20070601105405-gajwirydr5a9zd6x-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 server/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2 server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 tools/ctdb_diagnostics ctdb_diagnostics-20070905041904-9d9r1qnt1j9qiwiz-1 revno: 432.1.277 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Wed 2007-09-12 07:28:24 +1000 message: use the public addresses variable instead of hardcoding the path modified: config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1 revno: 432.1.276 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Wed 2007-09-12 07:26:30 +1000 message: move all ip addresses onto loopback when we startup ctdb modified: config/events.d/10.interface 10.interface-20070604050809-s21zslfirn07zjt8-1 --
Rev 623: wait for ctdbd to finish cleanup before considering "service ctdb stop" to be done in http://samba.org/~tridge/ctdb
revno: 623
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.test2
timestamp: Fri 2007-09-14 09:25:11 +1000
message:
wait for ctdbd to finish cleanup before considering "service ctdb stop" to be
done
modified:
config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6
=== modified file 'config/ctdb.init'
--- a/config/ctdb.init 2007-09-13 04:36:23 +
+++ b/config/ctdb.init 2007-09-13 23:25:11 +
@@ -92,12 +92,17 @@
stop() {
echo -n $"Shutting down ctdbd service: "
ctdb shutdown
- killall -q -0 ctdbd && {
- # if it survived, give it 1 second then kill it with extreme
prejudice
+ RETVAL=$?
+ count=0
+ while killall -q -0 ctdbd; do
sleep 1
- killall -q -9 ctdbd
- }
- RETVAL=$?
+ count=`expr $count + 1`
+ [ $count -gt 10 ] && {
+ echo -n $"killing ctdbd "
+ killall -q -9 ctdbd
+ pkill -f -9 /etc/ctdb/events.d/
+ }
+ done
case $init_style in
suse)
rc_status -v
Rev 622: nicer use of testparm in http://samba.org/~tridge/ctdb
revno: 622 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge.test2 timestamp: Fri 2007-09-14 09:24:34 +1000 message: nicer use of testparm modified: config/events.d/50.samba samba-20070601105340-vlcvnp6euoj3zdwy-3 === modified file 'config/events.d/50.samba' --- a/config/events.d/50.samba 2007-09-13 04:36:23 + +++ b/config/events.d/50.samba 2007-09-13 23:24:34 + @@ -50,7 +50,7 @@ nice service smb start # wait for the Samba tcp ports to become available - smb_ports=`testparm -sv 2> /dev/null | egrep '\s*smb ports =' | cut -d= -f2` + smb_ports=`testparm -s --parameter-name="smb ports" 2> /dev/null` ctdb_wait_tcp_ports "Samba" $smb_ports # wait for winbind to be ready @@ -96,7 +96,7 @@ smb_dirs=`testparm -s 2> /dev/null | egrep '^\s*path = ' | cut -d= -f2` ctdb_check_directories "Samba" $smb_dirs - smb_ports=`testparm -sv 2> /dev/null | egrep '\s*smb ports =' | cut -d= -f2` + smb_ports=`testparm -s --parameter-name="smb ports" 2> /dev/null` ctdb_check_tcp_ports "Samba" $smb_ports # check winbind is OK
Build status as of Fri Sep 14 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-09-13 00:00:55.0 + +++ /home/build/master/cache/broken_results.txt 2007-09-14 00:01:37.0 + @@ -1,4 +1,4 @@ -Build status as of Thu Sep 13 00:00:03 2007 +Build status as of Fri Sep 14 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -16,8 +16,8 @@ rsync31 13 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 28 25 2 -samba_3_232 17 0 +samba4 28 23 2 +samba_3_232 19 0 smb-build28 28 0 talloc 31 1 0 tdb 30 3 0
svn commit: samba r25140 - in branches: SAMBA_3_2/source/registry SAMBA_3_2_0/source/registry
Author: obnox Date: 2007-09-13 22:41:04 + (Thu, 13 Sep 2007) New Revision: 25140 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25140 Log: Less red bars to hurt my eyes... Modified: branches/SAMBA_3_2/source/registry/reg_objects.c branches/SAMBA_3_2_0/source/registry/reg_objects.c Changeset: Sorry, the patch is too large (577 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25140
svn commit: samba r25139 - in branches: SAMBA_3_2/source/registry SAMBA_3_2_0/source/registry
Author: obnox
Date: 2007-09-13 22:36:10 + (Thu, 13 Sep 2007)
New Revision: 25139
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25139
Log:
Avoid code duplication: let regval_ctr_copyvalue() call regval_ctr_addvalue().
This also corrects regval_ctr_copyvalue() in that it cannot create (invalid)
regval containers with dupliacte entries...
Michael
Modified:
branches/SAMBA_3_2/source/registry/reg_objects.c
branches/SAMBA_3_2_0/source/registry/reg_objects.c
Changeset:
Modified: branches/SAMBA_3_2/source/registry/reg_objects.c
===
--- branches/SAMBA_3_2/source/registry/reg_objects.c2007-09-13 22:08:59 UTC
(rev 25138)
+++ branches/SAMBA_3_2/source/registry/reg_objects.c2007-09-13 22:36:10 UTC
(rev 25139)
@@ -347,43 +347,8 @@
int regval_ctr_copyvalue( REGVAL_CTR *ctr, REGISTRY_VALUE *val )
{
if ( val ) {
- /* allocate a slot in the array of pointers */
-
- if ( ctr->num_values == 0 ) {
- ctr->values = TALLOC_P( ctr, REGISTRY_VALUE *);
- } else {
- ctr->values = TALLOC_REALLOC_ARRAY( ctr, ctr->values,
REGISTRY_VALUE *, ctr->num_values+1 );
- }
-
- if (!ctr->values) {
- ctr->num_values = 0;
- return 0;
- }
-
- /* allocate a new value and store the pointer in the arrya */
-
- ctr->values[ctr->num_values] = TALLOC_P( ctr, REGISTRY_VALUE);
- if (!ctr->values[ctr->num_values]) {
- ctr->num_values = 0;
- return 0;
- }
-
- /* init the value */
-
- fstrcpy( ctr->values[ctr->num_values]->valuename,
val->valuename );
- ctr->values[ctr->num_values]->type = val->type;
- if (val->size) {
- ctr->values[ctr->num_values]->data_p = (uint8
*)TALLOC_MEMDUP(
- ctr, val->data_p, val->size );
- if (!ctr->values[ctr->num_values]->data_p) {
- ctr->num_values = 0;
- return 0;
- }
- } else {
- ctr->values[ctr->num_values]->data_p = NULL;
- }
- ctr->values[ctr->num_values]->size = val->size;
- ctr->num_values++;
+ regval_ctr_addvalue(ctr, val->valuename, val->type,
+ (char *)val->data_p, val->size);
}
return ctr->num_values;
Modified: branches/SAMBA_3_2_0/source/registry/reg_objects.c
===
--- branches/SAMBA_3_2_0/source/registry/reg_objects.c 2007-09-13 22:08:59 UTC
(rev 25138)
+++ branches/SAMBA_3_2_0/source/registry/reg_objects.c 2007-09-13 22:36:10 UTC
(rev 25139)
@@ -347,43 +347,8 @@
int regval_ctr_copyvalue( REGVAL_CTR *ctr, REGISTRY_VALUE *val )
{
if ( val ) {
- /* allocate a slot in the array of pointers */
-
- if ( ctr->num_values == 0 ) {
- ctr->values = TALLOC_P( ctr, REGISTRY_VALUE *);
- } else {
- ctr->values = TALLOC_REALLOC_ARRAY( ctr, ctr->values,
REGISTRY_VALUE *, ctr->num_values+1 );
- }
-
- if (!ctr->values) {
- ctr->num_values = 0;
- return 0;
- }
-
- /* allocate a new value and store the pointer in the arrya */
-
- ctr->values[ctr->num_values] = TALLOC_P( ctr, REGISTRY_VALUE);
- if (!ctr->values[ctr->num_values]) {
- ctr->num_values = 0;
- return 0;
- }
-
- /* init the value */
-
- fstrcpy( ctr->values[ctr->num_values]->valuename,
val->valuename );
- ctr->values[ctr->num_values]->type = val->type;
- if (val->size) {
- ctr->values[ctr->num_values]->data_p = (uint8
*)TALLOC_MEMDUP(
- ctr, val->data_p, val->size );
- if (!ctr->values[ctr->num_values]->data_p) {
- ctr->num_values = 0;
- return 0;
- }
- } else {
- ctr->values[ctr->num_values]->data_p = NULL;
- }
- ctr->values[ctr->num_values]->size = val->size;
- ctr->num_values++;
+ regval_ctr_addvalue(ctr, val->valuename, val->type,
+ (char *)val->data_p, val->size);
}
return ctr->num_values;
svn commit: samba r25137 - in branches/SAMBA_3_2_0/examples: .
Author: jerry Date: 2007-09-13 18:50:51 + (Thu, 13 Sep 2007) New Revision: 25137 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25137 Log: removing libmsrpc example files Removed: branches/SAMBA_3_2_0/examples/libmsrpc/ Changeset:
svn commit: samba r25136 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib
Author: jra
Date: 2007-09-13 17:25:57 + (Thu, 13 Sep 2007)
New Revision: 25136
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25136
Log:
When tallocing a string to uppercase remember the terminating
'\0' in size calculations.
Jeremy.
Modified:
branches/SAMBA_3_2/source/lib/charcnv.c
branches/SAMBA_3_2_0/source/lib/charcnv.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/charcnv.c
===
--- branches/SAMBA_3_2/source/lib/charcnv.c 2007-09-13 16:48:46 UTC (rev
25135)
+++ branches/SAMBA_3_2/source/lib/charcnv.c 2007-09-13 17:25:57 UTC (rev
25136)
@@ -841,7 +841,7 @@
TALLOC_FREE(out_buffer);
size = convert_string_talloc(ctx, CH_UNIX, CH_UTF16LE,
- s, strlen(s),
+ s, strlen(s)+1,
(void *)&ubuf,
True);
if (size == (size_t)-1) {
Modified: branches/SAMBA_3_2_0/source/lib/charcnv.c
===
--- branches/SAMBA_3_2_0/source/lib/charcnv.c 2007-09-13 16:48:46 UTC (rev
25135)
+++ branches/SAMBA_3_2_0/source/lib/charcnv.c 2007-09-13 17:25:57 UTC (rev
25136)
@@ -841,7 +841,7 @@
TALLOC_FREE(out_buffer);
size = convert_string_talloc(ctx, CH_UNIX, CH_UTF16LE,
- s, strlen(s),
+ s, strlen(s)+1,
(void *)&ubuf,
True);
if (size == (size_t)-1) {
Re: svn commit: samba r25135 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
On Thu, Sep 13, 2007 at 04:48:47PM +, [EMAIL PROTECTED] wrote: > Author: gd > Date: 2007-09-13 16:48:46 + (Thu, 13 Sep 2007) > New Revision: 25135 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25135 > > Log: > Remove one END_PROFILE(SMBntcreateX) from call_nt_transact_create() which > appears to be a leftover. Should fix the build with profiling enabled. > > Jeremy, please check. Thanks for catching this ! Jeremy.
svn commit: samba r25135 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: gd
Date: 2007-09-13 16:48:46 + (Thu, 13 Sep 2007)
New Revision: 25135
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25135
Log:
Remove one END_PROFILE(SMBntcreateX) from call_nt_transact_create() which
appears to be a leftover. Should fix the build with profiling enabled.
Jeremy, please check.
Guenther
Modified:
branches/SAMBA_3_2/source/smbd/nttrans.c
branches/SAMBA_3_2_0/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/nttrans.c
===
--- branches/SAMBA_3_2/source/smbd/nttrans.c2007-09-13 16:11:46 UTC (rev
25134)
+++ branches/SAMBA_3_2/source/smbd/nttrans.c2007-09-13 16:48:46 UTC (rev
25135)
@@ -1396,7 +1396,6 @@
if (!fname) {
reply_nterror(
req, NT_STATUS_NO_MEMORY);
- END_PROFILE(SMBntcreateX);
return;
}
memcpy(fname, dir_fsp->fsp_name, dir_name_len+1);
Modified: branches/SAMBA_3_2_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_2_0/source/smbd/nttrans.c 2007-09-13 16:11:46 UTC (rev
25134)
+++ branches/SAMBA_3_2_0/source/smbd/nttrans.c 2007-09-13 16:48:46 UTC (rev
25135)
@@ -1396,7 +1396,6 @@
if (!fname) {
reply_nterror(
req, NT_STATUS_NO_MEMORY);
- END_PROFILE(SMBntcreateX);
return;
}
memcpy(fname, dir_fsp->fsp_name, dir_name_len+1);
svn commit: samba r25134 - in branches: SAMBA_3_2/source/libaddns SAMBA_3_2_0/source/libaddns
Author: gd
Date: 2007-09-13 16:11:46 + (Thu, 13 Sep 2007)
New Revision: 25134
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25134
Log:
Fix Bug #4968 and make dns updates work with heimdal as well (again,
gss_import_name() needs to follow the same logic as in the LDAP sasl wrapping
(see -r25133).
Tested with MIT 1.2.7, 1.3.6, 1.4.3, 1.5.1, 1.6.1 and Heimdal 0.7.2, 1.0,
1.0.1.
Guenther
Modified:
branches/SAMBA_3_2/source/libaddns/dnsgss.c
branches/SAMBA_3_2_0/source/libaddns/dnsgss.c
Changeset:
Modified: branches/SAMBA_3_2/source/libaddns/dnsgss.c
===
--- branches/SAMBA_3_2/source/libaddns/dnsgss.c 2007-09-13 15:59:46 UTC (rev
25133)
+++ branches/SAMBA_3_2/source/libaddns/dnsgss.c 2007-09-13 16:11:46 UTC (rev
25134)
@@ -219,11 +219,8 @@
gss_name_t targ_name;
- krb5_principal host_principal;
- krb5_context krb_ctx = NULL;
-
gss_OID_desc nt_host_oid_desc =
- { 10, (char *)"\052\206\110\206\367\022\001\002\002\002" };
+ {10, (char *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01"};
TALLOC_CTX *mem_ctx;
@@ -247,23 +244,13 @@
goto error;
}
- krb5_init_context( &krb_ctx );
- krb5_parse_name( krb_ctx, targetname, &host_principal );
+ input_name.value = targetname;
+ input_name.length = strlen(targetname);
- /* don't free the principal until after you call
- gss_release_name() or else you'll get a segv
- as the krb5_copy_principal() does a structure
- copy and not a deep copy.--jerry*/
-
- input_name.value = &host_principal;
- input_name.length = sizeof( host_principal );
-
major = gss_import_name( &minor, &input_name,
&nt_host_oid_desc, &targ_name );
if (major) {
- krb5_free_principal( krb_ctx, host_principal );
- krb5_free_context( krb_ctx );
err = ERROR_DNS_GSS_ERROR;
goto error;
}
@@ -273,11 +260,6 @@
gss_release_name( &minor, &targ_name );
- /* now we can free the principal */
-
- krb5_free_principal( krb_ctx, host_principal );
- krb5_free_context( krb_ctx );
-
error:
TALLOC_FREE(mem_ctx);
Modified: branches/SAMBA_3_2_0/source/libaddns/dnsgss.c
===
--- branches/SAMBA_3_2_0/source/libaddns/dnsgss.c 2007-09-13 15:59:46 UTC
(rev 25133)
+++ branches/SAMBA_3_2_0/source/libaddns/dnsgss.c 2007-09-13 16:11:46 UTC
(rev 25134)
@@ -219,11 +219,8 @@
gss_name_t targ_name;
- krb5_principal host_principal;
- krb5_context krb_ctx = NULL;
-
gss_OID_desc nt_host_oid_desc =
- { 10, (char *)"\052\206\110\206\367\022\001\002\002\002" };
+ {10, (char *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01"};
TALLOC_CTX *mem_ctx;
@@ -247,23 +244,13 @@
goto error;
}
- krb5_init_context( &krb_ctx );
- krb5_parse_name( krb_ctx, targetname, &host_principal );
+ input_name.value = targetname;
+ input_name.length = strlen(targetname);
- /* don't free the principal until after you call
- gss_release_name() or else you'll get a segv
- as the krb5_copy_principal() does a structure
- copy and not a deep copy.--jerry*/
-
- input_name.value = &host_principal;
- input_name.length = sizeof( host_principal );
-
major = gss_import_name( &minor, &input_name,
&nt_host_oid_desc, &targ_name );
if (major) {
- krb5_free_principal( krb_ctx, host_principal );
- krb5_free_context( krb_ctx );
err = ERROR_DNS_GSS_ERROR;
goto error;
}
@@ -273,11 +260,6 @@
gss_release_name( &minor, &targ_name );
- /* now we can free the principal */
-
- krb5_free_principal( krb_ctx, host_principal );
- krb5_free_context( krb_ctx );
-
error:
TALLOC_FREE(mem_ctx);
svn commit: samba r25133 - in branches: SAMBA_3_2/source/libads SAMBA_3_2_0/source/libads
Author: gd
Date: 2007-09-13 15:59:46 + (Thu, 13 Sep 2007)
New Revision: 25133
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25133
Log:
Fix sasl wrapping (for ldap sign&seal).
The gss_import_name() broke as we switched from the internal MIT OID
"gss_nt_krb5_principal" to "GSS_KRB5_NT_PRINCIPAL_NAME" and didn't switch from
passing the krb5_principal (or better: a pointer to that, see MIT's "*HORRIBLE*
bug") to pass the string principal directly.
Jerry, Jeremy, neither I could figure out the need of passing in a
krb5_principal at all nor could I reproduce the crash you were seeing.
I sucessfully tested the code (now importing a string) with MIT 1.2.7, 1.3.6,
1.4.3, 1.5.1, 1.6.1 and Heimdal 0.7.2, 1.0, 1.0.1.
Guenther
Modified:
branches/SAMBA_3_2/source/libads/sasl.c
branches/SAMBA_3_2_0/source/libads/sasl.c
Changeset:
Modified: branches/SAMBA_3_2/source/libads/sasl.c
===
--- branches/SAMBA_3_2/source/libads/sasl.c 2007-09-13 15:10:36 UTC (rev
25132)
+++ branches/SAMBA_3_2/source/libads/sasl.c 2007-09-13 15:59:46 UTC (rev
25133)
@@ -607,9 +607,7 @@
#ifdef HAVE_KRB5
struct ads_service_principal {
-krb5_context ctx;
char *string;
-krb5_principal principal;
#ifdef HAVE_GSSAPI
gss_name_t name;
#endif
@@ -625,14 +623,6 @@
gss_release_name(&minor_status, &p->name);
}
#endif
- if (p->principal) {
- krb5_free_principal(p->ctx, p->principal);
- }
-
- if (p->ctx) {
- krb5_free_context(p->ctx);
- }
-
ZERO_STRUCTP(p);
}
@@ -641,15 +631,10 @@
struct ads_service_principal
*p)
{
ADS_STATUS status;
- krb5_enctype enc_types[] = {
-#ifdef ENCTYPE_ARCFOUR_HMAC
- ENCTYPE_ARCFOUR_HMAC,
-#endif
- ENCTYPE_DES_CBC_MD5,
- ENCTYPE_NULL};
#ifdef HAVE_GSSAPI
gss_buffer_desc input_name;
- gss_OID_desc nt_principal =
+ /* GSS_KRB5_NT_PRINCIPAL_NAME */
+ gss_OID_desc nt_principal =
{10, CONST_DISCARD(char *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01")};
uint32 minor_status;
int gss_rc;
@@ -678,35 +663,9 @@
}
}
- initialize_krb5_error_table();
- status = ADS_ERROR_KRB5(krb5_init_context(&p->ctx));
- if (!ADS_ERR_OK(status)) {
- ads_free_service_principal(p);
- return status;
- }
- status = ADS_ERROR_KRB5(krb5_set_default_tgs_ktypes(p->ctx, enc_types));
- if (!ADS_ERR_OK(status)) {
- ads_free_service_principal(p);
- return status;
- }
- status = ADS_ERROR_KRB5(smb_krb5_parse_name(p->ctx, p->string,
&p->principal));
- if (!ADS_ERR_OK(status)) {
- ads_free_service_principal(p);
- return status;
- }
-
#ifdef HAVE_GSSAPI
- /*
-* The MIT libraries have a *HORRIBLE* bug - input_value.value needs
-* to point to the *address* of the krb5_principal, and the gss
libraries
-* to a shallow copy of the krb5_principal pointer - so we need to keep
-* the krb5_principal around until we do the gss_release_name. MIT
*SUCKS* !
-* Just one more way in which MIT engineers screwed me over JRA.
-*
-* That's the reason for principal not beeing a local var in this
function
-*/
- input_name.value = &p->principal;
- input_name.length = sizeof(p->principal);
+ input_name.value = p->string;
+ input_name.length = strlen(p->string);
gss_rc = gss_import_name(&minor_status, &input_name, &nt_principal,
&p->name);
if (gss_rc) {
@@ -715,7 +674,7 @@
}
#endif
- return status;
+ return ADS_SUCCESS;
}
/*
Modified: branches/SAMBA_3_2_0/source/libads/sasl.c
===
--- branches/SAMBA_3_2_0/source/libads/sasl.c 2007-09-13 15:10:36 UTC (rev
25132)
+++ branches/SAMBA_3_2_0/source/libads/sasl.c 2007-09-13 15:59:46 UTC (rev
25133)
@@ -607,9 +607,7 @@
#ifdef HAVE_KRB5
struct ads_service_principal {
-krb5_context ctx;
char *string;
-krb5_principal principal;
#ifdef HAVE_GSSAPI
gss_name_t name;
#endif
@@ -625,14 +623,6 @@
gss_release_name(&minor_status, &p->name);
}
#endif
- if (p->principal) {
- krb5_free_principal(p->ctx, p->principal);
- }
-
- if (p->ctx) {
- krb5_free_context(p->ctx);
- }
-
ZERO_STRUCTP(p);
}
@@ -641,15 +631,10 @@
struct ads_service_principal
*p)
{
ADS_STATUS status;
- krb5_enctype enc_types[] = {
-#ifdef ENCTYPE_ARCFOUR_HMAC
- ENCTYPE_ARCFOUR_HMAC,
-#en
svn commit: samba r25132 - in branches/SAMBA_3_0_MAINT/packaging/Debian/debian-sarge/patches: .
Author: idra Date: 2007-09-13 15:10:36 + (Thu, 13 Sep 2007) New Revision: 25132 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25132 Log: Unneeded patch Removed: branches/SAMBA_3_0_MAINT/packaging/Debian/debian-sarge/patches/py_smb.patch Changeset: Deleted: branches/SAMBA_3_0_MAINT/packaging/Debian/debian-sarge/patches/py_smb.patch === --- branches/SAMBA_3_0_MAINT/packaging/Debian/debian-sarge/patches/py_smb.patch 2007-09-13 14:42:25 UTC (rev 25131) +++ branches/SAMBA_3_0_MAINT/packaging/Debian/debian-sarge/patches/py_smb.patch 2007-09-13 15:10:36 UTC (rev 25132) @@ -1,11 +0,0 @@ samba-3.0.25c.orig/source/python/py_smb.c 2007-09-03 15:34:13.0 + -+++ samba-3.0.25c/source/python/py_smb.c 2007-09-03 15:34:31.0 + -@@ -48,7 +48,7 @@ - - ZERO_STRUCT(ip); - -- if (!cli_connect(cli, server, &ip)) -+ if (!NT_STATUS_IS_OK(cli_connect(cli, server, &ip))) - return NULL; - - return new_cli_state_object(cli);
svn commit: samba r25131 - in branches/SAMBA_3_2_0/source/nsswitch: .
Author: metze Date: 2007-09-13 14:42:25 + (Thu, 13 Sep 2007) New Revision: 25131 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25131 Log: make use only of base types which are provided by libreplace in winbind client and nss/pam stuff metze Modified: branches/SAMBA_3_2_0/source/nsswitch/pam_winbind.c branches/SAMBA_3_2_0/source/nsswitch/smb_krb5_locator.c branches/SAMBA_3_2_0/source/nsswitch/wb_common.c branches/SAMBA_3_2_0/source/nsswitch/winbind_client.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h Changeset: Sorry, the patch is too large (997 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25131
svn commit: samba r25130 - in branches/SAMBA_3_2/source/nsswitch: .
Author: metze Date: 2007-09-13 14:14:02 + (Thu, 13 Sep 2007) New Revision: 25130 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25130 Log: make use only of base types which are provided by libreplace in winbind client and nss/pam stuff metze Modified: branches/SAMBA_3_2/source/nsswitch/pam_winbind.c branches/SAMBA_3_2/source/nsswitch/smb_krb5_locator.c branches/SAMBA_3_2/source/nsswitch/wb_common.c branches/SAMBA_3_2/source/nsswitch/winbind_client.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_linux.c branches/SAMBA_3_2/source/nsswitch/winbindd_nss.h Changeset: Sorry, the patch is too large (997 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25130
svn commit: samba r25129 - in branches/SAMBA_3_2_0/source: . include nsswitch
Author: metze Date: 2007-09-13 12:55:58 + (Thu, 13 Sep 2007) New Revision: 25129 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25129 Log: _XOPEN_SOURCE_EXTENDED and socklen_t are always provided by libreplace metze Modified: branches/SAMBA_3_2_0/source/configure.in branches/SAMBA_3_2_0/source/include/includes.h branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h Changeset: Modified: branches/SAMBA_3_2_0/source/configure.in === --- branches/SAMBA_3_2_0/source/configure.in2007-09-13 12:54:53 UTC (rev 25128) +++ branches/SAMBA_3_2_0/source/configure.in2007-09-13 12:55:58 UTC (rev 25129) @@ -699,7 +699,6 @@ AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to use large file support]) AC_DEFINE(_ALIGNMENT_REQUIRED, 1, [Required alignment]) AC_DEFINE(_MAX_ALIGNMENT, 4, [Maximum alignment]) - AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Unix 98 sources -- needed for socklen_t in getsockopt on HP/UX 11]) ;; esac ;; @@ -1086,19 +1085,6 @@ fi -AC_CACHE_CHECK([for socklen_t type],samba_cv_socklen_t, [ -AC_TRY_COMPILE([ -#include -#if STDC_HEADERS -#include -#include -#endif -#include ],[socklen_t i = 0], - samba_cv_socklen_t=yes,samba_cv_socklen_t=no)]) -if test x"$samba_cv_socklen_t" = x"yes"; then - AC_DEFINE(HAVE_SOCKLEN_T_TYPE,1,[Whether we have the variable type socklen_t]) -fi - AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [ AC_TRY_COMPILE([ #include Modified: branches/SAMBA_3_2_0/source/include/includes.h === --- branches/SAMBA_3_2_0/source/include/includes.h 2007-09-13 12:54:53 UTC (rev 25128) +++ branches/SAMBA_3_2_0/source/include/includes.h 2007-09-13 12:55:58 UTC (rev 25129) @@ -303,12 +303,6 @@ typedef int VOLATILE SIG_ATOMIC_T; #endif -#ifndef HAVE_SOCKLEN_T_TYPE -#define HAVE_SOCKLEN_T_TYPE -typedef int socklen_t; -#endif - - #ifndef uchar #define uchar unsigned char #endif Modified: branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h === --- branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h 2007-09-13 12:54:53 UTC (rev 25128) +++ branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_config.h 2007-09-13 12:55:58 UTC (rev 25129) @@ -111,9 +111,4 @@ #define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) #endif -#ifndef HAVE_SOCKLEN_T_TYPE -#define HAVE_SOCKLEN_T_TYPE -typedef int socklen_t; #endif - -#endif
svn commit: samba r25128 - in branches/SAMBA_3_2/source: . include nsswitch
Author: metze Date: 2007-09-13 12:54:53 + (Thu, 13 Sep 2007) New Revision: 25128 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25128 Log: _XOPEN_SOURCE_EXTENDED and socklen_t are always provided by libreplace metze Modified: branches/SAMBA_3_2/source/configure.in branches/SAMBA_3_2/source/include/includes.h branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h Changeset: Modified: branches/SAMBA_3_2/source/configure.in === --- branches/SAMBA_3_2/source/configure.in 2007-09-13 12:51:00 UTC (rev 25127) +++ branches/SAMBA_3_2/source/configure.in 2007-09-13 12:54:53 UTC (rev 25128) @@ -767,7 +767,6 @@ AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to use large file support]) AC_DEFINE(_ALIGNMENT_REQUIRED, 1, [Required alignment]) AC_DEFINE(_MAX_ALIGNMENT, 4, [Maximum alignment]) - AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Unix 98 sources -- needed for socklen_t in getsockopt on HP/UX 11]) ;; esac ;; @@ -1163,19 +1162,6 @@ fi -AC_CACHE_CHECK([for socklen_t type],samba_cv_socklen_t, [ -AC_TRY_COMPILE([ -#include -#if STDC_HEADERS -#include -#include -#endif -#include ],[socklen_t i = 0], - samba_cv_socklen_t=yes,samba_cv_socklen_t=no)]) -if test x"$samba_cv_socklen_t" = x"yes"; then - AC_DEFINE(HAVE_SOCKLEN_T_TYPE,1,[Whether we have the variable type socklen_t]) -fi - AC_CACHE_CHECK([for sig_atomic_t type],samba_cv_sig_atomic_t, [ AC_TRY_COMPILE([ #include Modified: branches/SAMBA_3_2/source/include/includes.h === --- branches/SAMBA_3_2/source/include/includes.h2007-09-13 12:51:00 UTC (rev 25127) +++ branches/SAMBA_3_2/source/include/includes.h2007-09-13 12:54:53 UTC (rev 25128) @@ -303,12 +303,6 @@ typedef int VOLATILE SIG_ATOMIC_T; #endif -#ifndef HAVE_SOCKLEN_T_TYPE -#define HAVE_SOCKLEN_T_TYPE -typedef int socklen_t; -#endif - - #ifndef uchar #define uchar unsigned char #endif Modified: branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h === --- branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h 2007-09-13 12:51:00 UTC (rev 25127) +++ branches/SAMBA_3_2/source/nsswitch/winbind_nss_config.h 2007-09-13 12:54:53 UTC (rev 25128) @@ -111,9 +111,4 @@ #define S_ISSOCK(mode) ((mode & S_IFSOCK) == S_IFSOCK) #endif -#ifndef HAVE_SOCKLEN_T_TYPE -#define HAVE_SOCKLEN_T_TYPE -typedef int socklen_t; #endif - -#endif
svn commit: samba r25127 - in branches: SAMBA_3_2/examples/LDAP SAMBA_3_2_0/examples/LDAP
Author: idra Date: 2007-09-13 12:51:00 + (Thu, 13 Sep 2007) New Revision: 25127 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25127 Log: Add ol-schema-migrate.pl to the repo. This script is useful for migrating OpenLDAP schema files to FDS/RHDS lidf schema files. License kindly updated to GPLv3+ at our request. Simo. Added: branches/SAMBA_3_2/examples/LDAP/ol-schema-migrate.pl branches/SAMBA_3_2_0/examples/LDAP/ol-schema-migrate.pl Modified: branches/SAMBA_3_2/examples/LDAP/README branches/SAMBA_3_2_0/examples/LDAP/README Changeset: Sorry, the patch is too large (915 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25127
svn commit: samba r25126 - in branches/SAMBA_3_2_0/source/script: .
Author: metze
Date: 2007-09-13 12:27:10 + (Thu, 13 Sep 2007)
New Revision: 25126
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25126
Log:
create prototypes for 'bool ' functions
metze
Modified:
branches/SAMBA_3_2_0/source/script/mkproto.awk
Changeset:
Modified: branches/SAMBA_3_2_0/source/script/mkproto.awk
===
--- branches/SAMBA_3_2_0/source/script/mkproto.awk 2007-09-13 12:25:28 UTC
(rev 25125)
+++ branches/SAMBA_3_2_0/source/script/mkproto.awk 2007-09-13 12:27:10 UTC
(rev 25126)
@@ -139,7 +139,7 @@
gotstart = 1;
}
- if( $0 ~
/^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/
) {
+ if( $0 ~
/^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^bool|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/
) {
gotstart = 1;
}
Re: svn commit: samba r25114 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: .
Hi metze, Am Mittwoch, den 12.09.2007, 12:31 + schrieb [EMAIL PROTECTED]: > Author: metze > Date: 2007-09-12 12:31:19 + (Wed, 12 Sep 2007) > New Revision: 25114 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25114 > > Log: > handle structs and unions without typedefs better > in can_contain_deffered() > > jelmer: we need to handle this more genericly, I assume > we have a lot of other related bugs I've just fixed this properly. I'm pretty sure all other cases where TYPEDEF is special are already handled in similar ways. Please add tests when fixing bugs if you can in pidl. Cheers, jelmer -- Jelmer Vernooij <[EMAIL PROTECTED]> - http://samba.org/~jelmer/ Jabber: [EMAIL PROTECTED] signature.asc Description: Dies ist ein digital signierter Nachrichtenteil
svn commit: samba r25125 - in branches/SAMBA_3_2/source/script: .
Author: metze
Date: 2007-09-13 12:25:28 + (Thu, 13 Sep 2007)
New Revision: 25125
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25125
Log:
create prototypes for 'bool ' functions
metze
Modified:
branches/SAMBA_3_2/source/script/mkproto.awk
Changeset:
Modified: branches/SAMBA_3_2/source/script/mkproto.awk
===
--- branches/SAMBA_3_2/source/script/mkproto.awk2007-09-13 12:22:08 UTC
(rev 25124)
+++ branches/SAMBA_3_2/source/script/mkproto.awk2007-09-13 12:25:28 UTC
(rev 25125)
@@ -139,7 +139,7 @@
gotstart = 1;
}
- if( $0 ~
/^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/
) {
+ if( $0 ~
/^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^bool|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/
) {
gotstart = 1;
}
svn commit: samba r25124 - in branches/SAMBA_4_0: . source/selftest/output
Author: jelmer
Date: 2007-09-13 12:22:08 + (Thu, 13 Sep 2007)
New Revision: 25124
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25124
Log:
Include link to summary page, hide environment variables for 'none' environment.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/output/html.pm
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/selftest/output/html.pm
===
--- branches/SAMBA_4_0/source/selftest/output/html.pm 2007-09-13 10:53:35 UTC
(rev 25123)
+++ branches/SAMBA_4_0/source/selftest/output/html.pm 2007-09-13 12:22:08 UTC
(rev 25124)
@@ -92,23 +92,25 @@
$self->print_html_header("Test Results for $state->{NAME}",
*TEST);
- print TEST "Environment settings\n";
+ if ($state->{ENVNAME} ne "none") {
+ print TEST "Environment settings\n";
- print TEST " \n";
- print TEST "Variable nameVariable
value\n";
- foreach (keys %{$state->{ENVVARS}}) {
- print TEST "$_";
- my $val = $state->{ENVVARS}->{$_};
- if ($val =~ /^\.\// and -r $val) {
- print TEST "$val";
- } elsif (-r $val) {
- print TEST "$val";
- } else {
- print TEST $val;
+ print TEST " \n";
+ print TEST "Variable
nameVariable value\n";
+ foreach (keys %{$state->{ENVVARS}}) {
+ print TEST "$_";
+ my $val = $state->{ENVVARS}->{$_};
+ if ($val =~ /^\.\// and -r $val) {
+ print TEST "$val";
+ } elsif (-r $val) {
+ print TEST "$val";
+ } else {
+ print TEST $val;
+ }
+ print TEST "\n";
}
- print TEST "\n";
+ print TEST " \n";
}
- print TEST " \n";
print TEST "Tests\n";
@@ -285,6 +287,7 @@
print INDEX "\n";
print INDEX "\n";
+ print INDEX "Summary\n";
print INDEX "\n";
$self->print_html_footer(*INDEX);
close(INDEX);
svn commit: samba r25123 - in branches/SAMBA_4_0/source: .
Author: metze Date: 2007-09-13 10:53:35 + (Thu, 13 Sep 2007) New Revision: 25123 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25123 Log: we only need lib/ldb/sqlite3.m4 and lib/ldb/libldb.m4, when we build our own ldb... metze Modified: branches/SAMBA_4_0/source/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/configure.ac === --- branches/SAMBA_4_0/source/configure.ac 2007-09-13 10:51:31 UTC (rev 25122) +++ branches/SAMBA_4_0/source/configure.ac 2007-09-13 10:53:35 UTC (rev 25123) @@ -50,13 +50,12 @@ SMB_SUBSYSTEM(ldb_map, [], [LIBLDB]) ], [ + m4_include(lib/ldb/sqlite3.m4) m4_include(lib/ldb/libldb.m4) SMB_INCLUDE_MK(lib/ldb/config.mk) ] ) -m4_include(lib/ldb/sqlite3.m4) -m4_include(lib/ldb/libldb.m4) m4_include(lib/tls/config.m4) m4_include(lib/events/config.m4)
svn commit: samba r25122 - in branches/SAMBA_4_0/source/lib/socket: .
Author: metze Date: 2007-09-13 10:51:31 + (Thu, 13 Sep 2007) New Revision: 25122 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25122 Log: fix interface detection code jelmer: I wonder what broke it... metze Modified: branches/SAMBA_4_0/source/lib/socket/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/socket/config.m4 === --- branches/SAMBA_4_0/source/lib/socket/config.m4 2007-09-13 01:10:01 UTC (rev 25121) +++ branches/SAMBA_4_0/source/lib/socket/config.m4 2007-09-13 10:51:31 UTC (rev 25122) @@ -102,8 +102,10 @@ # # This tests need LIBS="$NSL_LIBS $SOCKET_LIBS" # +old_CFLAGS=$CFLAGS old_LIBS=$LIBS LIBS="$NSL_LIBS $SOCKET_LIBS" +CFLAGS="$CFLAGS -Ilib/replace" iface=no; AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[ AC_TRY_RUN([ @@ -140,4 +142,5 @@ fi fi +CFLAGS=$old_CFLAGS LIBS=$old_LIBS
