Rev 413: merge initial web site from ronnie in http://samba.org/~tridge/ctdb
revno: 413 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-06-01 15:33:45 +1000 message: merge initial web site from ronnie added: web/ web-20070601052353-vgod9lfo4an4o83j-1 web/ctdb.html ctdb.html-20070601052353-vgod9lfo4an4o83j-2 revno: 393.1.5 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-06-01 15:31:23 +1000 message: add a developers section revno: 393.1.4 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-06-01 15:23:57 +1000 message: initial webpage === added directory 'web' === added file 'web/ctdb.html' --- a/web/ctdb.html 1970-01-01 00:00:00 + +++ b/web/ctdb.html 2007-06-01 05:31:23 + @@ -0,0 +1,47 @@ + + + +ctdb + + + +ctdb + +ctdb is a fast cluster database for temporary data. +ctdb also provides HA features such as IP failover between nodes. + +It is the core component for samba3/4 clustering. + +To get started with ctdb, I would recommend you read http://wiki.samba.org/CTDB_Setup";>the ctdb wiki. + +Discussion and bug reports + +ctdb does not currently have its own mailing list or bug tracking +system. For now, please use the https://lists.samba.org/mailman/listinfo/samba-technical";>samba-technical +mailing list, and the http://bugzilla.samba.org/";>Samba +bugzilla bug tracking system. + +Download + +You can download the latest release either via rsync or anonymous +svn. To fetch via svn use the following command: + + + svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/cluster/ctdb ctdb + + +To fetch via rsync use this command: + + + rsync -Pavz samba.org::ftp/unpacked/samba4/source/cluster/ctdb . + + + +Developers +http://samba.org/~tridge/";>Andrew Tridgell +Ronnie Sahlberg + + + +
Rev 412: log dates/time in event startup messages in http://samba.org/~tridge/ctdb
revno: 412
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-06-01 15:23:16 +1000
message:
log dates/time in event startup messages
modified:
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'tools/events'
--- a/tools/events 2007-06-01 03:50:18 +
+++ b/tools/events 2007-06-01 05:23:16 +
@@ -11,7 +11,7 @@
# wait for local services to come up.
[ -z "$CTDB_WAIT_TCP_PORTS" ] || {
all_ok=0
- echo "Waiting for local tcp ports $CTDB_WAIT_TCP_PORTS"
+ echo "`/bin/date` Waiting for local tcp ports $CTDB_WAIT_TCP_PORTS"
while [ $all_ok -eq 0 ]; do
all_ok=1
for p in $CTDB_WAIT_TCP_PORTS; do
@@ -23,12 +23,12 @@
exit 1
}
done
- echo "Local tcp services are up"
+ echo "`/bin/date` Local tcp services are up"
}
# wait for local directories to becomes available (could be slow to
mount)
[ -z "$CTDB_WAIT_DIRECTORIES" ] || {
all_ok=0
- echo "Waiting for local directories $CTDB_WAIT_DIRECTORIES"
+ echo "`/bin/date` Waiting for local directories
$CTDB_WAIT_DIRECTORIES"
while [ $all_ok -eq 0 ]; do
all_ok=1
for d in $CTDB_WAIT_DIRECTORIES; do
@@ -40,7 +40,7 @@
exit 1
}
done
- echo "Local directories are available"
+ echo "`/bin/date` Local directories are available"
}
exit 0;
;;
@@ -55,7 +55,7 @@
maskbits=$3
/sbin/ip addr add $ip/$maskbits dev $iface || {
-echo "Failed to add $ip/$maskbits on dev $iface"
+echo "`/bin/date` Failed to add $ip/$maskbits on dev $iface"
exit 1
}
echo $ip >> /etc/ctdb/taken_ips
@@ -72,14 +72,14 @@
releaseip)
if [ $# != 3 ]; then
- echo "must supply interface, IP and maskbits"
+ echo "`/bin/date` must supply interface, IP and maskbits"
exit 1
fi
iface=$1
ip=$2
maskbits=$3
/sbin/ip addr del $ip dev $iface || {
-echo "Failed to del $ip on dev $iface"
+echo "`/bin/date` Failed to del $ip on dev $iface"
exit 1
}
# if we have a local arp entry for this IP then remove it
@@ -115,5 +115,5 @@
;;
esac
-echo "Invalid command $cmd"
+echo "`/bin/date` Invalid command $cmd"
exit 1
Rev 411: added CTDB_WAIT_DIRECTORIES support in http://samba.org/~tridge/ctdb
revno: 411
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-06-01 13:50:18 +1000
message:
added CTDB_WAIT_DIRECTORIES support
modified:
packaging/RHEL/setup/ctdb.sysconfig
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'packaging/RHEL/setup/ctdb.sysconfig'
--- a/packaging/RHEL/setup/ctdb.sysconfig 2007-05-31 01:09:45 +
+++ b/packaging/RHEL/setup/ctdb.sysconfig 2007-06-01 03:50:18 +
@@ -47,6 +47,11 @@
# the default is not to wait for any local services
# CTDB_WAIT_TCP_PORTS="445 139"
+# use this to specify any local directories to wait on before starting
+# ctdb. You should list any critical Samba or NFS shared directories
+# the default is not to wait for any local directories
+# CTDB_WAIT_DIRECTORIES="/some/directory"
+
# the shared directory where you want to put statd information on
# which clients to notify on a NFS restart
# there is no default
=== modified file 'tools/events'
--- a/tools/events 2007-06-01 03:26:14 +
+++ b/tools/events 2007-06-01 03:50:18 +
@@ -8,10 +8,10 @@
case $cmd in
startup)
- # wait for local services to come up
+ # wait for local services to come up.
[ -z "$CTDB_WAIT_TCP_PORTS" ] || {
all_ok=0
- echo "Waiting for tcp services on $CTDB_WAIT_TCP_PORTS to come up"
+ echo "Waiting for local tcp ports $CTDB_WAIT_TCP_PORTS"
while [ $all_ok -eq 0 ]; do
all_ok=1
for p in $CTDB_WAIT_TCP_PORTS; do
@@ -23,7 +23,24 @@
exit 1
}
done
- echo "Local tcp services on $CTDB_WAIT_TCP_PORTS are up"
+ echo "Local tcp services are up"
+ }
+ # wait for local directories to becomes available (could be slow to
mount)
+ [ -z "$CTDB_WAIT_DIRECTORIES" ] || {
+ all_ok=0
+ echo "Waiting for local directories $CTDB_WAIT_DIRECTORIES"
+ while [ $all_ok -eq 0 ]; do
+ all_ok=1
+ for d in $CTDB_WAIT_DIRECTORIES; do
+ [ -d $d ] || all_ok=0
+ done
+ [ $all_ok -eq 1 ] || sleep 1
+ /usr/bin/ctdb status > /dev/null 2>&1 || {
+ echo "ctdb daemon has died. Exiting event startup"
+ exit 1
+ }
+ done
+ echo "Local directories are available"
}
exit 0;
;;
svn commit: samba r23286 - in branches/SAMBA_4_0/webapps/install: .
Author: abartlet
Date: 2007-06-01 03:47:35 + (Fri, 01 Jun 2007)
New Revision: 23286
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23286
Log:
In SWAT, it was not possible to use a domain name other than the default.
Fix this in the same way the setup/provision script does.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/webapps/install/provision.esp
Changeset:
Modified: branches/SAMBA_4_0/webapps/install/provision.esp
===
--- branches/SAMBA_4_0/webapps/install/provision.esp2007-06-01 00:04:13 UTC
(rev 23285)
+++ branches/SAMBA_4_0/webapps/install/provision.esp2007-06-01 03:47:35 UTC
(rev 23286)
@@ -47,7 +47,10 @@
}
if (form['submit'] == "Provision") {
+/* overcome an initially blank smb.conf */
lp.set("realm", subobj.REALM);
+ lp.set("workgroup", subobj.DOMAIN);
+ lp.reload()
var goodpass = (subobj.CONFIRM == subobj.ADMINPASS);
if (!goodpass) {
Re: svn commit: samba r23284 - in branches/SAMBA_3_0/source/nsswitch: .
On Thu, May 31, 2007 at 11:58:57PM +, [EMAIL PROTECTED] wrote: > Author: obnox > Date: 2007-05-31 23:58:56 + (Thu, 31 May 2007) > New Revision: 23284 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23284 > > Log: > Oh what a nasty typo! This gave me some headache, > with talloc randomly failing. > > Hey, shouldn't TALLOC_ARRAY _not_ return NULL when > requested to allocate an array with zero entries? :-) Yes it should at the moment. It should be calling _talloc_array_zeronull() under the covers in lib/util.c which explicitly does this. Was this not happening for you ? I'd like you to debug that as I can't see a codepath for this not to happen. Jeremy.
Rev 410: merged from ronnie in http://samba.org/~tridge/ctdb
revno: 410
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-06-01 13:29:11 +1000
message:
merged from ronnie
modified:
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
tools/statd-calloutstatdcallout-20070531010857-6sdlz455vusye5y5-1
revno: 393.1.3
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-06-01 13:26:14 +1000
message:
it is -f not -x to check if a file exists
revno: 393.1.2
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-06-01 13:14:05 +1000
message:
- create /etc/ctdb/taken_ips and /etc/ctdb/changed_ips analog to the
existing /etc/ctdb/released_ips
- only call the statd-callout script if the ips have changed and call
it with a "notify" argument.we need to restart nfslock service in
both cases
- change statd-callout to explicitely restart the lock manager and statd
when "notify" is called. copy the state directory for each held ip
from shared storage to /tmp then use sm-notify to send notifications to
all monitored clients
revno: 393.1.1
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-06-01 13:03:53 +1000
message:
new branch from tridges tree
=== modified file 'tools/events'
--- a/tools/events 2007-05-31 01:09:45 +
+++ b/tools/events 2007-06-01 03:26:14 +
@@ -41,6 +41,9 @@
echo "Failed to add $ip/$maskbits on dev $iface"
exit 1
}
+ echo $ip >> /etc/ctdb/taken_ips
+ echo $ip >> /etc/ctdb/changed_ips
+
# if we have a local arp entry for this IP then remove it
/sbin/arp -d $ip 2> /dev/null
@@ -65,19 +68,27 @@
# if we have a local arp entry for this IP then remove it
/sbin/arp -d $ip 2> /dev/null
echo $ip >> /etc/ctdb/released_ips
+ echo $ip >> /etc/ctdb/changed_ips
/bin/rm -f /etc/ctdb/ip.$ip
exit 0
;;
recovered)
-# restart any services as necessary, like NFS
- #
- [ -x /etc/ctdb/statd-callout ] && /etc/ctdb/statd-callout copy
+ # if we have taken or released any ips we must send out
+ # statd notifications to recover lost nfs locks
+ [ -x /etc/ctdb/statd-callout ] && [ -f /etc/ctdb/changed_ips ] && {
+ /etc/ctdb/statd-callout notify &
+ } >/dev/null 2>&1
+
+# restart NFS to ensure that all TCP connections to the released ip
+ # are closed
[ -f /etc/ctdb/released_ips ] && {
( /sbin/service nfs status > /dev/null 2>&1 &&
/sbin/service nfs restart > /dev/null 2>&1 ) &
} > /dev/null 2>&1
+ /bin/rm -f /etc/ctdb/changed_ips
/bin/rm -f /etc/ctdb/released_ips
+ /bin/rm -f /etc/ctdb/taken_ips
exit 0
;;
=== modified file 'tools/statd-callout'
--- a/tools/statd-callout 2007-05-31 01:14:07 +
+++ b/tools/statd-callout 2007-06-01 03:14:05 +
@@ -22,23 +22,23 @@
/bin/rm -f $STATD_SHARED_DIRECTORY/$ip/$2
done
;;
- copy)
- restart_needed=0
+ notify)
+ # restart the local lock manager and statd
+ /sbin/service nfslock stop > /dev/null 2>&1
+ /sbin/service nfslock start > /dev/null 2>&1
+ # send out notifications to any additional ips we now serve
for f in `/bin/ls /etc/ctdb/ip.*`; do
fname=`/bin/basename $f`
ip=`echo $fname | cut -d. -f2-`
[ -d $STATD_SHARED_DIRECTORY/$ip ] && {
- /bin/mv $STATD_SHARED_DIRECTORY/$ip
$STATD_SHARED_DIRECTORY/$ip.$$
- /bin/cp -a $STATD_SHARED_DIRECTORY/$ip.$$/.
/var/lib/nfs/statd/sm/
- /bin/rm -rf $STATD_SHARED_DIRECTORY/$ip.$$
- restart_needed=1
+ # we must copy to a different directory since rpc.statd gets
+ # "upset" if sm-notify touches the files.
+ /bin/rm -rf /tmp/statd/$ip
+ /bin/mkdir -p /tmp/statd/$ip
+ /bin/cp -apr $STATD_SHARED_DIRECTORY/$ip/* /tmp/statd/$ip
+ /usr/sbin/sm-notify -P /tmp/statd/$ip -v $ip -n
}
done
- # restart lockd if necessary
- [ $restart_needed -eq 1 ] && {
-
svn commit: samba r23285 - in branches/SAMBA_3_0_26/source/nsswitch: .
Author: obnox
Date: 2007-06-01 00:04:13 + (Fri, 01 Jun 2007)
New Revision: 23285
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23285
Log:
r23283 and r23284 also for SAMBA_3_0_26.
Use a temporary talloc context in ads:lookup_groupmem and clean up
at the end. And fix one nasty typo.
Modified:
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
23:58:56 UTC (rev 23284)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
00:04:13 UTC (rev 23285)
@@ -912,12 +912,20 @@
uint32 *name_types_nocache = NULL;
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
+ TALLOC_CTX *tmp_ctx = NULL;
DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name,
sid_string_static(group_sid)));
*num_names = 0;
+ tmp_ctx = talloc_new(mem_ctx);
+ if (!tmp_ctx) {
+ DEBUG(1, ("ads: lookup_groupmem: talloc failed\n"));
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
if ( !winbindd_can_contact_domain( domain ) ) {
DEBUG(10,("lookup_groupmem: No incoming trust for domain %s\n",
domain->name));
@@ -932,8 +940,8 @@
}
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",
-sid_string_static(group_sid
+ if (!(ldap_exp = talloc_asprintf(tmp_ctx, "(objectSid=%s)",
+sid_string_static(group_sid
{
DEBUG(1, ("ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n"));
status = NT_STATUS_NO_MEMORY;
@@ -944,7 +952,7 @@
args.val = ADS_EXTENDED_DN_HEX_STRING;
args.critical = True;
- rc = ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_SUBTREE,
ads->config.bind_path,
+ rc = ads_ranged_search(ads, tmp_ctx, LDAP_SCOPE_SUBTREE,
ads->config.bind_path,
ldap_exp, &args, "member", &members,
&num_members);
if (!ADS_ERR_OK(rc)) {
@@ -967,17 +975,17 @@
* we try to resolve as many sids as possible from the
* cache. Only the rest is passed to the lsa_lookup_sids call. */
- if (num_names) {
+ if (num_members) {
(*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
- (sid_mem_nocache) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID,
num_members);
+ (sid_mem_nocache) = TALLOC_ZERO_ARRAY(tmp_ctx, DOM_SID,
num_members);
if ((members == NULL) || (*sid_mem == NULL) ||
(*names == NULL) || (*name_types == NULL) ||
(sid_mem_nocache == NULL))
{
- DEBUG(1, ("talloc failed\n"));
+ DEBUG(1, ("ads: lookup_groupmem: talloc failed\n"));
status = NT_STATUS_NO_MEMORY;
goto done;
}
@@ -993,7 +1001,7 @@
char *name, *domain_name;
DOM_SID sid;
- if (!ads_get_sid_from_extended_dn(mem_ctx, members[i],
args.val, &sid)) {
+ if (!ads_get_sid_from_extended_dn(tmp_ctx, members[i],
args.val, &sid)) {
status = NT_STATUS_INVALID_PARAMETER;
goto done;
}
@@ -1019,13 +1027,13 @@
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache > 0) {
- status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
+ status = cm_connect_lsa(domain, tmp_ctx, &cli, &lsa_policy);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
- status = rpccli_lsa_lookup_sids_all(cli, mem_ctx,
+ status = rpccli_lsa_lookup_sids_all(cli, tmp_ctx,
&lsa_policy,
num_nocache,
sid_mem_nocache,
@@ -1046,7 +1054,7 @@
{
sid_copy(&(*sid_mem)[*num_names],
&sid_mem_nocache[i]);
- (*names)[*num_names] = names_nocache[i];
+ (*names)[*num_names] =
talloc_steal(names, names_nocache[i]);
Build status as of Fri Jun 1 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-05-31 00:01:49.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-01 00:00:37.0 + @@ -1,25 +1,25 @@ -Build status as of Thu May 31 00:00:02 2007 +Build status as of Fri Jun 1 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 33 6 0 +ccache 34 6 0 ctdb 0 0 0 distcc 2 0 0 -ldb 32 9 0 -libreplace 31 12 0 -lorikeet-heimdal 27 17 0 -pidl 16 2 0 -ppp 12 0 0 +ldb 33 9 0 +libreplace 32 12 0 +lorikeet-heimdal 28 17 0 +pidl 17 2 0 +ppp 13 0 0 python 0 0 0 -rsync33 13 0 +rsync34 13 0 samba0 0 0 samba-docs 0 0 0 -samba-gtk2 2 0 -samba4 30 21 3 -samba_3_033 18 0 -smb-build30 30 0 -talloc 33 7 0 -tdb 32 3 0 +samba-gtk3 3 0 +samba4 31 22 1 +samba_3_033 17 0 +smb-build31 31 0 +talloc 34 7 0 +tdb 33 3 0
svn commit: samba r23284 - in branches/SAMBA_3_0/source/nsswitch: .
Author: obnox
Date: 2007-05-31 23:58:56 + (Thu, 31 May 2007)
New Revision: 23284
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23284
Log:
Oh what a nasty typo! This gave me some headache,
with talloc randomly failing.
Hey, shouldn't TALLOC_ARRAY _not_ return NULL when
requested to allocate an array with zero entries? :-)
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:55:37 UTC
(rev 23283)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:58:56 UTC
(rev 23284)
@@ -975,7 +975,7 @@
* we try to resolve as many sids as possible from the
* cache. Only the rest is passed to the lsa_lookup_sids call. */
- if (num_names) {
+ if (num_members) {
(*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
svn commit: samba r23283 - in branches/SAMBA_3_0/source/nsswitch: .
Author: obnox
Date: 2007-05-31 23:55:37 + (Thu, 31 May 2007)
New Revision: 23283
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23283
Log:
Use a temporary talloc context in ads:lookup_groupmem.
And clean up unused stuff at the end.
Daringly, I use talloc_steal at some point, where it
appears natural to me.
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:03:47 UTC
(rev 23282)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 23:55:37 UTC
(rev 23283)
@@ -912,12 +912,20 @@
uint32 *name_types_nocache = NULL;
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
+ TALLOC_CTX *tmp_ctx = NULL;
DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name,
sid_string_static(group_sid)));
*num_names = 0;
+ tmp_ctx = talloc_new(mem_ctx);
+ if (!tmp_ctx) {
+ DEBUG(1, ("ads: lookup_groupmem: talloc failed\n"));
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
if ( !winbindd_can_contact_domain( domain ) ) {
DEBUG(10,("lookup_groupmem: No incoming trust for domain %s\n",
domain->name));
@@ -932,7 +940,7 @@
}
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",
+ if (!(ldap_exp = talloc_asprintf(tmp_ctx, "(objectSid=%s)",
sid_string_static(group_sid
{
DEBUG(1, ("ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n"));
@@ -944,7 +952,7 @@
args.val = ADS_EXTENDED_DN_HEX_STRING;
args.critical = True;
- rc = ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_SUBTREE,
ads->config.bind_path,
+ rc = ads_ranged_search(ads, tmp_ctx, LDAP_SCOPE_SUBTREE,
ads->config.bind_path,
ldap_exp, &args, "member", &members,
&num_members);
if (!ADS_ERR_OK(rc)) {
@@ -971,13 +979,13 @@
(*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
(*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
(*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
- (sid_mem_nocache) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID,
num_members);
+ (sid_mem_nocache) = TALLOC_ZERO_ARRAY(tmp_ctx, DOM_SID,
num_members);
if ((members == NULL) || (*sid_mem == NULL) ||
(*names == NULL) || (*name_types == NULL) ||
(sid_mem_nocache == NULL))
{
- DEBUG(1, ("talloc failed\n"));
+ DEBUG(1, ("ads: lookup_groupmem: talloc failed\n"));
status = NT_STATUS_NO_MEMORY;
goto done;
}
@@ -993,7 +1001,7 @@
char *name, *domain_name;
DOM_SID sid;
- if (!ads_get_sid_from_extended_dn(mem_ctx, members[i],
args.val, &sid)) {
+ if (!ads_get_sid_from_extended_dn(tmp_ctx, members[i],
args.val, &sid)) {
status = NT_STATUS_INVALID_PARAMETER;
goto done;
}
@@ -1019,13 +1027,13 @@
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache > 0) {
- status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
+ status = cm_connect_lsa(domain, tmp_ctx, &cli, &lsa_policy);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
- status = rpccli_lsa_lookup_sids_all(cli, mem_ctx,
+ status = rpccli_lsa_lookup_sids_all(cli, tmp_ctx,
&lsa_policy,
num_nocache,
sid_mem_nocache,
@@ -1046,7 +1054,7 @@
{
sid_copy(&(*sid_mem)[*num_names],
&sid_mem_nocache[i]);
- (*names)[*num_names] = names_nocache[i];
+ (*names)[*num_names] =
talloc_steal(names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
@@ -1073,11 +1081,7 @@
done:
- /* free intermediate lists. - a temp talloc ctx might be better. */
- TALLOC_FREE(sid_me
svn commit: samba r23282 - in branches/SAMBA_4_0_RELEASE/source: . script
Author: abartlet Date: 2007-05-31 23:03:47 + (Thu, 31 May 2007) New Revision: 23282 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23282 Log: Merge mkrelease.sh and fixes for make distclean from SAMBA_4_0 Andrew Bartlett Modified: branches/SAMBA_4_0_RELEASE/source/main.mk branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh Changeset: Modified: branches/SAMBA_4_0_RELEASE/source/main.mk === --- branches/SAMBA_4_0_RELEASE/source/main.mk 2007-05-31 23:01:08 UTC (rev 23281) +++ branches/SAMBA_4_0_RELEASE/source/main.mk 2007-05-31 23:03:47 UTC (rev 23282) @@ -269,7 +269,7 @@ -rm -f config.status -rm -f config.log config.cache -rm -f config.pm config.mk - -rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache + -rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache -rm -f $(PC_FILES) removebackup: @@ -417,7 +417,7 @@ DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ include/includes.d -dist:: distclean idl_full manpages configure +dist:: idl_full manpages configure distclean configure: ./autogen.sh Modified: branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh === --- branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh 2007-05-31 23:01:08 UTC (rev 23281) +++ branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh 2007-05-31 23:03:47 UTC (rev 23282) @@ -4,9 +4,8 @@ svn export . samba-$VERSION || exit 1 -cd samba-$VERSION/source -./autogen.sh || exit 1 -./configure || exit 1 -make dist || exit 1 - -tar -zcf samba-$VERSION.tar.gz samba-$VERSION +( cd samba-$VERSION/source + ./autogen.sh || exit 1 + ./configure || exit 1 + make dist || exit 1 +) && tar -zcf samba-$VERSION.tar.gz samba-$VERSION
svn commit: samba r23281 - in branches/SAMBA_4_0/source: .
Author: abartlet Date: 2007-05-31 23:01:08 + (Thu, 31 May 2007) New Revision: 23281 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23281 Log: Ensure we wipe all the right things in distclean. Andrew Bartlett Modified: branches/SAMBA_4_0/source/main.mk Changeset: Modified: branches/SAMBA_4_0/source/main.mk === --- branches/SAMBA_4_0/source/main.mk 2007-05-31 22:41:27 UTC (rev 23280) +++ branches/SAMBA_4_0/source/main.mk 2007-05-31 23:01:08 UTC (rev 23281) @@ -269,7 +269,7 @@ -rm -f config.status -rm -f config.log config.cache -rm -f config.pm config.mk - -rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache + -rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache -rm -f $(PC_FILES) removebackup: @@ -417,7 +417,7 @@ DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ include/includes.d -dist:: distclean idl_full manpages configure +dist:: idl_full manpages configure distclean configure: ./autogen.sh
svn commit: samba r23280 - in branches/SAMBA_3_0_26/source: . include rpc_client rpc_parse rpc_server utils
Author: jerry Date: 2007-05-31 22:41:27 + (Thu, 31 May 2007) New Revision: 23280 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23280 Log: Replace the NetFileClose() call with the pidl generated code. No risk since we don't support the call functionally anyways. Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_srvsvc.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_client/cli_srvsvc.c branches/SAMBA_3_0_26/source/rpc_parse/parse_srv.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_26/source/utils/net_rpc.c Changeset: Sorry, the patch is too large (673 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23280
svn commit: samba r23279 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-05-31 22:02:49 + (Thu, 31 May 2007)
New Revision: 23279
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23279
Log:
Replace occurrence of sid_binstring inside lookup_groupmem
by sid_string_static.
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 21:15:53 UTC
(rev 23278)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 22:02:49 UTC
(rev 23279)
@@ -901,7 +901,6 @@
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
- char *sidstr;
char **members = NULL;
int i;
size_t num_members = 0;
@@ -914,7 +913,6 @@
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
-
DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name,
sid_string_static(group_sid)));
@@ -933,19 +931,14 @@
goto done;
}
- if ((sidstr = sid_binstring(group_sid)) == NULL) {
- status = NT_STATUS_NO_MEMORY;
- goto done;
- }
-
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",sidstr))) {
- SAFE_FREE(sidstr);
- DEBUG(1, ("ads: lookup_groupmem: tallloc_asprintf for ldap_exp
failed!\n"));
+ if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",
+sid_string_static(group_sid
+ {
+ DEBUG(1, ("ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n"));
status = NT_STATUS_NO_MEMORY;
goto done;
}
- SAFE_FREE(sidstr);
args.control = ADS_EXTENDED_DN_OID;
args.val = ADS_EXTENDED_DN_HEX_STRING;
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
21:15:53 UTC (rev 23278)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
22:02:49 UTC (rev 23279)
@@ -901,7 +901,6 @@
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
- char *sidstr;
char **members = NULL;
int i;
size_t num_members = 0;
@@ -914,7 +913,6 @@
char **domains_nocache = NULL; /* only needed for
rpccli_lsa_lookup_sids */
uint32 num_nocache = 0;
-
DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name,
sid_string_static(group_sid)));
@@ -933,19 +931,14 @@
goto done;
}
- if ((sidstr = sid_binstring(group_sid)) == NULL) {
- status = NT_STATUS_NO_MEMORY;
- goto done;
- }
-
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",sidstr))) {
- SAFE_FREE(sidstr);
- DEBUG(1, ("ads: lookup_groupmem: tallloc_asprintf for ldap_exp
failed!\n"));
+ if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",
+sid_string_static(group_sid
+ {
+ DEBUG(1, ("ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n"));
status = NT_STATUS_NO_MEMORY;
goto done;
}
- SAFE_FREE(sidstr);
args.control = ADS_EXTENDED_DN_OID;
args.val = ADS_EXTENDED_DN_HEX_STRING;
svn commit: samba r23278 - in branches/SAMBA_3_0_26/source: include libmsrpc rpc_client rpc_parse utils
Author: jerry
Date: 2007-05-31 21:15:53 + (Thu, 31 May 2007)
New Revision: 23278
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23278
Log:
remove vestiges of rpccli_reg_close()
Modified:
branches/SAMBA_3_0_26/source/include/rpc_reg.h
branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c
branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c
branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c
branches/SAMBA_3_0_26/source/utils/net_rpc_registry.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/include/rpc_reg.h
===
--- branches/SAMBA_3_0_26/source/include/rpc_reg.h 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/include/rpc_reg.h 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -348,19 +348,7 @@
/***/
typedef struct {
- POLICY_HND pol; /* policy handle */
-} REG_Q_CLOSE;
-
-typedef struct {
POLICY_HND pol;
- WERROR status;
-} REG_R_CLOSE;
-
-
-/***/
-
-typedef struct {
- POLICY_HND pol;
uint32 key_index;
uint16 key_name_len;
uint16 unknown_1; /* 0x0414 */
Modified: branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c
===
--- branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -93,7 +93,6 @@
POLICY_HND * key )
{
struct rpc_pipe_client *pipe_hnd = NULL;
- WERROR err;
if ( !hnd )
return CAC_FAILURE;
@@ -114,8 +113,7 @@
return CAC_FAILURE;
}
- err = rpccli_reg_close( pipe_hnd, mem_ctx, key );
- hnd->status = werror_to_ntstatus( err );
+ hnd->status = rpccli_winreg_CloseKey( pipe_hnd, mem_ctx, key );
if ( !NT_STATUS_IS_OK( hnd->status ) ) {
return CAC_FAILURE;
@@ -203,8 +201,7 @@
if ( !op->in.parent_key ) {
/*then close the one that we opened above */
- err = rpccli_reg_close( pipe_hnd, mem_ctx, parent_key );
- hnd->status = werror_to_ntstatus( err );
+ hnd->status = rpccli_winreg_CloseKey( pipe_hnd, mem_ctx,
parent_key );
if ( !NT_STATUS_IS_OK( hnd->status ) ) {
return CAC_FAILURE;
@@ -436,7 +433,7 @@
rpccli_reg_flush_key( pipe_hnd, mem_ctx, key );
/*close the key that we opened */
- rpccli_reg_close( pipe_hnd, mem_ctx, &subkey );
+ rpccli_winreg_CloseKey( pipe_hnd, mem_ctx, &subkey );
/*now we delete the subkey */
err = rpccli_reg_delete_key( pipe_hnd, mem_ctx, key,
Modified: branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c
===
--- branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -635,31 +635,6 @@
}
/
-/
-
-WERROR rpccli_reg_close(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hnd)
-{
- REG_Q_CLOSE in;
- REG_R_CLOSE out;
- prs_struct qbuf, rbuf;
-
- ZERO_STRUCT (in);
- ZERO_STRUCT (out);
-
- init_reg_q_close(&in, hnd);
-
- CLI_DO_RPC_WERR( cli, mem_ctx, PI_WINREG, REG_CLOSE,
- in, out,
- qbuf, rbuf,
- reg_io_q_close,
- reg_io_r_close,
- WERR_GENERAL_FAILURE );
-
- return out.status;
-}
-
-/
do a REG Query Info
/
Modified: branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c
===
--- branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c 2007-05-31 21:09:57 UTC
(rev 23277)
+++ branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c 2007-05-31 21:15:53 UTC
(rev 23278)
@@ -685,66 +685,6 @@
}
/***
- Inits an REG_Q_CLOSE structure.
-/
-
-void init_reg_q_close(REG_Q_CLOSE *q_c, POLICY_HND *hnd)
-{
- DEBUG(5,("init_reg_q_close\n"));
-
- memcpy(&q_c->pol, hnd, sizeof(q_c->pol));
-}
-
-/***
-reads or writes a structure.
-***
svn commit: samba r23277 - in branches/SAMBA_3_0_26/source: . include libmsrpc rpc_client rpc_parse rpc_server rpcclient utils
Author: jerry Date: 2007-05-31 21:09:57 + (Thu, 31 May 2007) New Revision: 23277 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23277 Log: This might break the shutdown script functionality. I think it is safe for now. * Merge the initshutdown code from SAMBA_3_0 * Replace _reg_close() with the pidl generate winreg_CloseKey() client and server code Added: branches/SAMBA_3_0_26/source/rpc_server/srv_initshutdown_nt.c Removed: branches/SAMBA_3_0_26/source/include/rpc_shutdown.h branches/SAMBA_3_0_26/source/rpc_client/cli_shutdown.c branches/SAMBA_3_0_26/source/rpc_parse/parse_shutdown.c Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c branches/SAMBA_3_0_26/source/rpc_server/srv_winreg.c branches/SAMBA_3_0_26/source/rpc_server/srv_winreg_nt.c branches/SAMBA_3_0_26/source/rpcclient/cmd_shutdown.c branches/SAMBA_3_0_26/source/utils/net_rpc.c Changeset: Sorry, the patch is too large (1157 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23277
svn commit: samba r23276 - in branches/SAMBA_3_0_26/source: . rpc_server
Author: jerry Date: 2007-05-31 20:32:02 + (Thu, 31 May 2007) New Revision: 23276 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23276 Log: File renames to reduce the diff between the 3.0 and 3.0.26 tree. Added: branches/SAMBA_3_0_26/source/rpc_server/srv_winreg.c branches/SAMBA_3_0_26/source/rpc_server/srv_winreg_nt.c Removed: branches/SAMBA_3_0_26/source/rpc_server/srv_reg.c branches/SAMBA_3_0_26/source/rpc_server/srv_reg_nt.c Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Sorry, the patch is too large (2040 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23276
svn commit: samba r23275 - in branches/SAMBA_3_0_26/source: . include rpc_client rpc_parse rpc_server rpcclient
Author: jerry Date: 2007-05-31 18:53:32 + (Thu, 31 May 2007) New Revision: 23275 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23275 Log: Have not tested this (I don't think the dfs RPC code has even really been considered stable). merge the complete netdfs pipe support from SAMBA_3_0. Removed: branches/SAMBA_3_0_26/source/include/rpc_dfs.h branches/SAMBA_3_0_26/source/rpc_client/cli_dfs.c branches/SAMBA_3_0_26/source/rpc_parse/parse_dfs.c branches/SAMBA_3_0_26/source/rpc_server/srv_dfs.c Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_server/srv_dfs_nt.c branches/SAMBA_3_0_26/source/rpcclient/cmd_dfs.c Changeset: Sorry, the patch is too large (5245 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23275
svn commit: samba r23274 - in branches/SAMBA_3_0/source: . include rpc_parse rpc_server
Author: jerry Date: 2007-05-31 17:59:04 + (Thu, 31 May 2007) New Revision: 23274 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23274 Log: merge CloseEventlog() pidl conversion from 3.0.26 && fix a few init call renames for svcctl in the previous commit Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/rpc_eventlog.h branches/SAMBA_3_0/source/include/rpc_svcctl.h branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0/source/rpc_server/srv_eventlog.c branches/SAMBA_3_0/source/rpc_server/srv_eventlog_nt.c branches/SAMBA_3_0/source/rpc_server/srv_pipe.c Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/Makefile.in 2007-05-31 17:59:04 UTC (rev 23274) @@ -395,7 +395,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o -RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o +RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \ + rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \ rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/configure.in 2007-05-31 17:59:04 UTC (rev 23274) @@ -692,7 +692,7 @@ dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog rpc_unixinfo rpc_epmapper auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" +default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_winreg rpc_initshutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 rpc_unixinfo rpc_epmapper auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead" @@ -6277,13 +6277,13 @@ SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), "bin/librpc_initshutdown.$SHLIBEXT", RPC) SMB_MODULE(rpc_lsa_ds, \$(RPC_LSA_DS_OBJ), "bin/librpc_lsa_ds.$SHLIBEXT", RPC) SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC) -SMB_MODULE(rpc_svcctl, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl.$SHLIBEXT", RPC) +SMB_MODULE(rpc_svcctl2, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl2.$SHLIBEXT", RPC) SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs.$SHLIBEXT", RPC) SMB_MODULE(rpc_net, \$(RPC_NETLOG_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC) SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC) SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), "bin/librpc_srvsvc.$SHLIBEXT", RPC) SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC) -SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog.$SHLIBEXT", RPC) +SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog2.$SHLIBEXT", RPC) SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC) SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), "bin/librpc_echo.$SHLIBEXT", RPC) SMB_MODULE(rpc_unixinfo, \$(RPC_UNIXINFO_OBJ), "bin/librpc_unixinfo.$SHLIBEXT", RPC) Modified: branches/SAMBA_3_0/source/include/includes.h === --- branches/SAMBA_3_0/source/include/includes.h2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/include/includes.h2007-05-31 17:59:04 UTC (rev 23274) @@ -782,6 +782,7 @@ #include "librpc/gen_ndr/srv_echo.h" #include "librpc/gen_ndr/srv_svcctl.h" #include "librpc/gen_ndr/srv_lsa.h" +#include "librpc/gen_ndr/srv_eventlog.h" /* automatically generated prototypes */ #ifndef NO_PROTO_H Modified: branches/SAMBA_3_0/source/include/rpc_eventlog.h === --- branches/SAMBA_3_0/source/include/rpc_eventlog.h2007-05-31 17:33:47 UTC (rev 23273) +++ branches/SAMBA_3_0/source/include/rpc_eventlog.h2007-05-31 17:59:04 U
svn commit: samba r23273 - in branches/SAMBA_3_0_26/source: . include rpc_parse rpc_server
Author: jerry Date: 2007-05-31 17:33:47 + (Thu, 31 May 2007) New Revision: 23273 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23273 Log: Replace hand written CloseEventlog() with pidl generated stub Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_eventlog.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog.c branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog_nt.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in === --- branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 17:33:47 UTC (rev 23273) @@ -233,7 +233,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o librpc/gen_ndr/ndr_notify.o \ librpc/gen_ndr/ndr_lsa.o librpc/gen_ndr/ndr_echo.o \ -librpc/gen_ndr/ndr_svcctl.o +librpc/gen_ndr/ndr_svcctl.o librpc/gen_ndr/ndr_eventlog.o RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o @@ -338,6 +338,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wkssvc.o librpc/gen_ndr/cli_lsa.o \ librpc/gen_ndr/cli_echo.o librpc/gen_ndr/cli_svcctl.o \ + librpc/gen_ndr/cli_eventlog.o \ $(LIBNDR_GEN_OBJ) $(RPCCLIENT_NDR_OBJ) REGOBJS_OBJ = registry/reg_objects.o @@ -375,7 +376,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o -RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o +RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \ + rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \ rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o Modified: branches/SAMBA_3_0_26/source/configure.in === --- branches/SAMBA_3_0_26/source/configure.in 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/configure.in 2007-05-31 17:33:47 UTC (rev 23273) @@ -610,7 +610,7 @@ dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_shutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" +default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_shutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead" @@ -6131,7 +6131,7 @@ SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC) SMB_MODULE(rpc_srv, \$(RPC_SVC_OBJ), "bin/librpc_svc.$SHLIBEXT", RPC) SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC) -SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog.$SHLIBEXT", RPC) +SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog2.$SHLIBEXT", RPC) SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC) SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), "bin/librpc_rpcecho.$SHLIBEXT", RPC) SMB_SUBSYSTEM(RPC,smbd/server.o) Modified: branches/SAMBA_3_0_26/source/include/includes.h === --- branches/SAMBA_3_0_26/source/include/includes.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/includes.h 2007-05-31 17:33:47 UTC (rev 23273) @@ -786,6 +786,7 @@ #include "librpc/gen_ndr/srv_echo.h" #include "librpc/gen_ndr/srv_svcctl.h" #include "librpc/gen_ndr/srv_lsa.h" +#include "librpc/gen_ndr/srv_eventlog.h" /* automatically generated prototypes */ #ifndef NO_PROTO_H Modified: branches/SAMBA_3_0_26/source/include/rpc_client.h === --- branches/SAMBA_3_0_26/source/include/rpc_client.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/rpc_client
svn commit: samba r23272 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: jra
Date: 2007-05-31 17:26:30 + (Thu, 31 May 2007)
New Revision: 23272
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23272
Log:
Fix main event loop - reviewed by Volker.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/server.c
branches/SAMBA_3_0_26/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2007-05-31 17:24:30 UTC (rev
23271)
+++ branches/SAMBA_3_0/source/smbd/server.c 2007-05-31 17:26:30 UTC (rev
23272)
@@ -418,8 +418,6 @@
timeval_is_zero(&idle_timeout) ?
NULL : &idle_timeout);
- run_events(smbd_event_context(), num, &r_fds, &w_fds);
-
if (num == -1 && errno == EINTR) {
if (got_sig_term) {
exit_server_cleanly(NULL);
@@ -436,6 +434,10 @@
continue;
}
+ if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) {
+ continue;
+ }
+
#if 0
Deactivated for now, this needs to become a timed event
vl
Modified: branches/SAMBA_3_0_26/source/smbd/server.c
===
--- branches/SAMBA_3_0_26/source/smbd/server.c 2007-05-31 17:24:30 UTC (rev
23271)
+++ branches/SAMBA_3_0_26/source/smbd/server.c 2007-05-31 17:26:30 UTC (rev
23272)
@@ -516,8 +516,6 @@
timeval_is_zero(&idle_timeout) ?
NULL : &idle_timeout);
- run_events(smbd_event_context(), num, &r_fds, &w_fds);
-
if (num == -1 && errno == EINTR) {
if (got_sig_term) {
exit_server_cleanly(NULL);
@@ -534,6 +532,10 @@
continue;
}
+ if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) {
+ continue;
+ }
+
/* check if we need to reload services */
check_reload(time(NULL));
svn commit: samba r23271 - in branches/SAMBA_3_0/source: . include libmsrpc rpc_client rpc_parse rpc_server utils
Author: jerry Date: 2007-05-31 17:24:30 + (Thu, 31 May 2007) New Revision: 23271 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23271 Log: merge service control pidl change for CloseServiceHandle() from SAMBA_3_0_26 Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/includes.h branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/libmsrpc/cac_svcctl.c branches/SAMBA_3_0/source/rpc_client/cli_svcctl.c branches/SAMBA_3_0/source/rpc_parse/parse_svcctl.c branches/SAMBA_3_0/source/rpc_server/srv_svcctl.c branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c branches/SAMBA_3_0/source/utils/net_rpc_service.c Changeset: Sorry, the patch is too large (632 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23271
svn commit: samba r23270 - in branches/SAMBA_3_0_26/source: . include libmsrpc rpc_client rpc_parse rpc_server utils
Author: jerry Date: 2007-05-31 16:57:18 + (Thu, 31 May 2007) New Revision: 23270 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23270 Log: Replace hand code CloseServiceHandle() with the pidl generated stubs (client and server) Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_svcctl.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/libmsrpc/cac_svcctl.c branches/SAMBA_3_0_26/source/rpc_client/cli_svcctl.c branches/SAMBA_3_0_26/source/rpc_parse/parse_svcctl.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c branches/SAMBA_3_0_26/source/rpc_server/srv_svcctl.c branches/SAMBA_3_0_26/source/rpc_server/srv_svcctl_nt.c branches/SAMBA_3_0_26/source/utils/net_rpc_service.c Changeset: Sorry, the patch is too large (708 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23270
svn commit: samba r23269 - in branches: SAMBA_3_0/source/librpc/gen_ndr SAMBA_3_0_26/source/librpc/gen_ndr
Author: jerry Date: 2007-05-31 15:46:01 + (Thu, 31 May 2007) New Revision: 23269 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23269 Log: Regenerate svcctl files after IDL fixes Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/cli_svcctl.c branches/SAMBA_3_0/source/librpc/gen_ndr/cli_svcctl.h branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_svcctl.c branches/SAMBA_3_0/source/librpc/gen_ndr/srv_svcctl.c branches/SAMBA_3_0/source/librpc/gen_ndr/svcctl.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/cli_svcctl.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/cli_svcctl.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/ndr_svcctl.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/srv_svcctl.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/svcctl.h Changeset: Sorry, the patch is too large (1327 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23269
svn commit: samba r23268 - in branches: SAMBA_3_0/source/librpc/idl SAMBA_3_0_26/source/librpc/idl
Author: jerry Date: 2007-05-31 15:43:40 + (Thu, 31 May 2007) New Revision: 23268 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23268 Log: Rename some variables in the svcctl.idl to prevent redeclaration compile failures in the generated client code. Modified: branches/SAMBA_3_0/source/librpc/idl/svcctl.idl branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl Changeset: Modified: branches/SAMBA_3_0/source/librpc/idl/svcctl.idl === --- branches/SAMBA_3_0/source/librpc/idl/svcctl.idl 2007-05-31 15:41:46 UTC (rev 23267) +++ branches/SAMBA_3_0/source/librpc/idl/svcctl.idl 2007-05-31 15:43:40 UTC (rev 23268) @@ -96,7 +96,7 @@ WERROR svcctl_ControlService( [in,ref] policy_handle *handle, [in] uint32 control, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -127,7 +127,7 @@ /* Function 0x06 */ WERROR svcctl_QueryServiceStatus( [in,ref] policy_handle *handle, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -197,7 +197,7 @@ WERROR svcctl_EnumDependentServicesW( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -248,7 +248,7 @@ WERROR svcctl_QueryServiceLockStatusW( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, + [out,ref] SERVICE_LOCK_STATUS *lock_status, [out,ref] uint32 *required_buf_size ); @@ -326,7 +326,7 @@ WERROR svcctl_EnumDependentServicesA( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -376,7 +376,7 @@ WERROR svcctl_QueryServiceLockStatusA( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, + [out,ref] SERVICE_LOCK_STATUS *lock_status, [out,ref] uint32 *required_buf_size ); Modified: branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl === --- branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl 2007-05-31 15:41:46 UTC (rev 23267) +++ branches/SAMBA_3_0_26/source/librpc/idl/svcctl.idl 2007-05-31 15:43:40 UTC (rev 23268) @@ -96,7 +96,7 @@ WERROR svcctl_ControlService( [in,ref] policy_handle *handle, [in] uint32 control, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -127,7 +127,7 @@ /* Function 0x06 */ WERROR svcctl_QueryServiceStatus( [in,ref] policy_handle *handle, - [out,ref] SERVICE_STATUS *status + [out,ref] SERVICE_STATUS *service_status ); /*/ @@ -197,7 +197,7 @@ WERROR svcctl_EnumDependentServicesW( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -248,7 +248,7 @@ WERROR svcctl_QueryServiceLockStatusW( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, + [out,ref] SERVICE_LOCK_STATUS *lock_status, [out,ref] uint32 *required_buf_size ); @@ -326,7 +326,7 @@ WERROR svcctl_EnumDependentServicesA( [in,ref] policy_handle *service, [in] uint32 state, - [out] ENUM_SERVICE_STATUS *status, + [out] ENUM_SERVICE_STATUS *service_status, [in] uint32 buf_size, [out,ref] uint32 *bytes_needed, [out,ref] uint32 *services_returned @@ -376,7 +376,7 @@ WERROR svcctl_QueryServiceLockStatusA( [in,ref] policy_handle *handle, [in] uint32 buf_size, - [out,ref] SERVICE_LOCK_STATUS *status, +
svn commit: samba r23267 - in branches/SAMBA_3_0_26/source: . script
Author: jerry Date: 2007-05-31 15:41:46 + (Thu, 31 May 2007) New Revision: 23267 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23267 Log: Merge idl Makefile target and associated files from SAMBA_3_0 Added: branches/SAMBA_3_0_26/source/script/build_idl.sh Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in === --- branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 13:59:08 UTC (rev 23266) +++ branches/SAMBA_3_0_26/source/Makefile.in2007-05-31 15:41:46 UTC (rev 23267) @@ -33,6 +33,8 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ + [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -172,7 +174,7 @@ EVERYTHING_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ - bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ + bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ SHLIBS = @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBMSRPC@ @LIBADDNS@ @@ -729,6 +731,11 @@ lib/replace/test/strptime.o \ $(LIBREPLACE_OBJ) +NDRDUMP_OBJ = librpc/tools/ndrdump.o \ + $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \ + $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ + $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(SECRETS_OBJ) + RPCTORTURE_OBJ = torture/rpctorture.o \ rpcclient/display.o \ rpcclient/cmd_lsarpc.o \ @@ -900,6 +907,20 @@ cac: SHOWFLAGS $(LIBMSRPC) +# +## Perl IDL Compiler +IDL_FILES = unixinfo.idl lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \ + srvsvc.idl svcctl.idl eventlog.idl wkssvc.idl netlogon.idl notify.idl \ + epmapper.idl messaging.idl + +idl: + @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \ +srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS) + + +# + + everything: all libsmbclient debug2html smbfilter talloctort replacetort modules torture \ $(EVERYTHING_PROGS) @@ -1165,6 +1186,11 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) +bin/[EMAIL PROTECTED]@: $(NDRDUMP_OBJ) bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \ + @POPTLIBS@ @LDAP_LIBS@ + bin/[EMAIL PROTECTED]@: proto_exists $(DEBUG2HTML_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) Copied: branches/SAMBA_3_0_26/source/script/build_idl.sh (from rev 23266, branches/SAMBA_3_0/source/script/build_idl.sh)
svn commit: samba r23266 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-05-31 13:59:08 + (Thu, 31 May 2007) New Revision: 23266 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23266 Log: HP-UX 11.23 doesn't like this, but HP-UX 11.00 and 11.11 need it metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 12:23:52 UTC (rev 23265) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 13:59:08 UTC (rev 23266) @@ -60,10 +60,10 @@ *hpux*) # mmap on HPUX is completely broken... AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken]) -# if test "`uname -r`" = "B.11.11"; then + if test "`uname -r`" = "B.11.00" -o "`uname -r`" = "B.11.11"; then AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) CFLAGS="$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000" -# fi + fi if test "`uname -r`" = "B.11.23"; then AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround]) CFLAGS="$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED"
svn commit: samba r23265 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-05-31 12:23:52 + (Thu, 31 May 2007) New Revision: 23265 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23265 Log: HP-UX 11.00 also needs this, try to see if 11.23 is also happy with it... metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 12:08:03 UTC (rev 23264) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-05-31 12:23:52 UTC (rev 23265) @@ -60,10 +60,10 @@ *hpux*) # mmap on HPUX is completely broken... AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken]) - if test "`uname -r`" = "B.11.11"; then +# if test "`uname -r`" = "B.11.11"; then AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) CFLAGS="$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000" - fi +# fi if test "`uname -r`" = "B.11.23"; then AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround]) CFLAGS="$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED"
svn commit: samba r23264 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet
Date: 2007-05-31 12:08:03 + (Thu, 31 May 2007)
New Revision: 23264
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23264
Log:
Make it more clear what this is actually setting up
Modified:
branches/SAMBA_4_0/source/scripting/libjs/provision.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-31
09:23:51 UTC (rev 23263)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-31
12:08:03 UTC (rev 23264)
@@ -720,7 +720,7 @@
info.subobj = subobj;
info.message = message;
- message("Setting up sam.ldb partitions\n");
+ message("Setting up " + tmp_schema_path + " as a temporary database to
store the schema\n");
/* This will erase anything in the tmp db */
var samdb = open_ldb(info, tmp_schema_path, true);
svn commit: samba r23263 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: vlendec
Date: 2007-05-31 09:23:51 + (Thu, 31 May 2007)
New Revision: 23263
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23263
Log:
Remove an unused variable -- Fix Coverity ID 358
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 05:37:52 UTC
(rev 23262)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-05-31 09:23:51 UTC
(rev 23263)
@@ -898,7 +898,6 @@
uint32 **name_types)
{
ADS_STATUS rc;
- LDAPMessage *res=NULL;
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@@ -1081,9 +1080,6 @@
done:
- if (res)
- ads_msgfree(ads, res);
-
/* free intermediate lists. - a temp talloc ctx might be better. */
TALLOC_FREE(sid_mem_nocache);
TALLOC_FREE(names_nocache);
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
05:37:52 UTC (rev 23262)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-05-31
09:23:51 UTC (rev 23263)
@@ -898,7 +898,6 @@
uint32 **name_types)
{
ADS_STATUS rc;
- LDAPMessage *res=NULL;
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@@ -1081,9 +1080,6 @@
done:
- if (res)
- ads_msgfree(ads, res);
-
/* free intermediate lists. - a temp talloc ctx might be better. */
TALLOC_FREE(sid_mem_nocache);
TALLOC_FREE(names_nocache);
