[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a06e5cd... s4: Happy New Year 2010
via 2ed51fb... s3: Happy New Year 2010
from 283a73c... s3: Trim down smbcontrol a bit
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a06e5cdb99ddf7abf16486d3837105ec4e0da9ee
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 4 08:42:49 2010 +0100
s4: Happy New Year 2010
metze
commit 2ed51fbc4c3ff576db31c0258a91dc6347aae670
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 4 08:42:03 2010 +0100
s3: Happy New Year 2010
metze
---
Summary of changes:
source3/include/smb.h |2 +-
source4/smbd/server.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 4affd4a..b23ea64 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
#define _SMB_H
/* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2009
+#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2010
#if defined(LARGE_SMB_OFF_T)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index ddfa220..e73cdfd 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -326,7 +326,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
umask(0);
DEBUG(0,(%s version %s started.\n, binary_name,
SAMBA_VERSION_STRING));
- DEBUGADD(0,(Copyright Andrew Tridgell and the Samba Team
1992-2009\n));
+ DEBUGADD(0,(Copyright Andrew Tridgell and the Samba Team
1992-2010\n));
if (sizeof(uint16_t) 2 || sizeof(uint32_t) 4 || sizeof(uint64_t)
8) {
DEBUG(0,(ERROR: Samba is not configured correctly for the word
size on your machine\n));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 1ea5e11... s3: Happy New Year 2010 from 8c3dd08... Prevent NULL dereference if group has no members http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 1ea5e114f3bb5fb22a7dab36b69a08e5a09df50d Author: Stefan Metzmacher me...@samba.org Date: Mon Jan 4 08:42:03 2010 +0100 s3: Happy New Year 2010 metze (cherry picked from commit 2ed51fbc4c3ff576db31c0258a91dc6347aae670) Signed-off-by: Stefan Metzmacher me...@samba.org --- Summary of changes: source3/include/smb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/smb.h b/source3/include/smb.h index 4affd4a..b23ea64 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -27,7 +27,7 @@ #define _SMB_H /* logged when starting the various Samba daemons */ -#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2009 +#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2010 #if defined(LARGE_SMB_OFF_T) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via 7ea471b... Prevent NULL dereference if group has no members
from 958367d... WHATSNEW: Update changes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 7ea471ba8db84b4fb2f02672e59a9f2a9932b4fa
Author: Jim McDonough j...@samba.org
Date: Wed Dec 30 15:04:55 2009 -0500
Prevent NULL dereference if group has no members
Fix bug #7014 (domain mode winbind crashes retriveing empty group members).
---
Summary of changes:
source3/winbindd/winbindd_rpc.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index f176fb3..aa8a5c8 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -789,16 +789,16 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
- *num_names = rids-count;
- rid_mem = rids-rids;
-
- if (!*num_names) {
+ if (!rids || !rids-count) {
names = NULL;
name_types = NULL;
sid_mem = NULL;
return NT_STATUS_OK;
}
+ *num_names = rids-count;
+ rid_mem = rids-rids;
+
/* Step #2: Convert list of rids into list of usernames. Do this
in bunches of ~1000 to avoid crashing NT4. It looks like there
is a buffer overflow or something like that lurking around
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated
The branch, v3-3-test has been updated
via 5fd3261... Prevent NULL dereference if group has no members
from e3be5dd... Fix bug 7005 - mangle method = hash truncates files with
dot '. ' character
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 5fd32614f147a045aaee30ed9cf62e42ac6e30d8
Author: Jim McDonough j...@samba.org
Date: Wed Dec 30 18:19:46 2009 -0800
Prevent NULL dereference if group has no members
Fix bug #7014 (domain mode winbind crashes retriveing empty group members).
---
Summary of changes:
source/winbindd/winbindd_rpc.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index db43559..459a844 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -787,16 +787,16 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
- *num_names = rids-count;
- rid_mem = rids-rids;
-
- if (!*num_names) {
+ if (!rids || !rids-count) {
names = NULL;
name_types = NULL;
sid_mem = NULL;
return NT_STATUS_OK;
}
+ *num_names = rids-count;
+ rid_mem = rids-rids;
+
/* Step #2: Convert list of rids into list of usernames. Do this
in bunches of ~1000 to avoid crashing NT4. It looks like there
is a buffer overflow or something like that lurking around
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f04e10f... s4:dsdb/repl: convert dreplsrv_out_drsuapi_send/recv to
tevent_req
via 1525e59... blackbox/test_export_keytab.sh: correctly remove
temporary files
via 5df8b33... blackbox/test_export_keytab.sh: use VALGRIND for
samba4kinit
from a06e5cd... s4: Happy New Year 2010
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f04e10f4c0f8dfd3cb0add9f85f3b569b644c5e7
Author: Stefan Metzmacher me...@samba.org
Date: Wed Dec 23 17:44:40 2009 +0100
s4:dsdb/repl: convert dreplsrv_out_drsuapi_send/recv to tevent_req
metze
commit 1525e59886da66a716a0d90206108b4a4f51dc24
Author: Stefan Metzmacher me...@sernet.private
Date: Mon Jan 4 09:27:23 2010 +0100
blackbox/test_export_keytab.sh: correctly remove temporary files
metze
commit 5df8b33ddcccaebef6d899cd07617226c60993a3
Author: Stefan Metzmacher me...@sernet.private
Date: Mon Jan 4 09:26:25 2010 +0100
blackbox/test_export_keytab.sh: use VALGRIND for samba4kinit
metze
---
Summary of changes:
source4/dsdb/repl/drepl_notify.c | 18 ++-
source4/dsdb/repl/drepl_out_helpers.c| 208 +-
testprogs/blackbox/test_export_keytab.sh |6 +-
3 files changed, 130 insertions(+), 102 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index fe3b2d2..2f0fa48 100644
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -101,13 +101,14 @@ static void dreplsrv_op_notify_replica_sync_send(struct
dreplsrv_op_notify_state
/*
called when we have an established connection
*/
-static void dreplsrv_op_notify_connect_recv(struct composite_context *creq)
+static void dreplsrv_op_notify_connect_done(struct tevent_req *subreq)
{
- struct dreplsrv_op_notify_state *st =
talloc_get_type(creq-async.private_data,
- struct
dreplsrv_op_notify_state);
+ struct dreplsrv_op_notify_state *st = tevent_req_callback_data(subreq,
+ struct dreplsrv_op_notify_state);
struct composite_context *c = st-creq;
- c-status = dreplsrv_out_drsuapi_recv(creq);
+ c-status = dreplsrv_out_drsuapi_recv(subreq);
+ TALLOC_FREE(subreq);
if (!composite_is_ok(c)) return;
dreplsrv_op_notify_replica_sync_send(st);
@@ -119,8 +120,8 @@ static void dreplsrv_op_notify_connect_recv(struct
composite_context *creq)
static struct composite_context *dreplsrv_op_notify_send(struct
dreplsrv_notify_operation *op)
{
struct composite_context *c;
- struct composite_context *creq;
struct dreplsrv_op_notify_state *st;
+ struct tevent_req *subreq;
c = composite_create(op, op-service-task-event_ctx);
if (c == NULL) return NULL;
@@ -131,8 +132,11 @@ static struct composite_context
*dreplsrv_op_notify_send(struct dreplsrv_notify_
st-creq= c;
st-op = op;
- creq = dreplsrv_out_drsuapi_send(op-source_dsa-conn);
- composite_continue(c, creq, dreplsrv_op_notify_connect_recv, st);
+ subreq = dreplsrv_out_drsuapi_send(st,
+ op-service-task-event_ctx,
+ op-source_dsa-conn);
+ if (composite_nomem(subreq, c)) return c;
+ tevent_req_set_callback(subreq, dreplsrv_op_notify_connect_done, st);
return c;
}
diff --git a/source4/dsdb/repl/drepl_out_helpers.c
b/source4/dsdb/repl/drepl_out_helpers.c
index 03f8842..722db4f 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -34,10 +34,9 @@
#include libcli/composite/composite.h
#include auth/gensec/gensec.h
#include param/param.h
+#include ../lib/util/tevent_ntstatus.h
struct dreplsrv_out_drsuapi_state {
- struct composite_context *creq;
-
struct dreplsrv_out_connection *conn;
struct dreplsrv_drsuapi_connection *drsuapi;
@@ -46,139 +45,160 @@ struct dreplsrv_out_drsuapi_state {
struct drsuapi_DsBind bind_r;
};
-static void dreplsrv_out_drsuapi_connect_recv(struct composite_context *creq);
+static void dreplsrv_out_drsuapi_connect_done(struct composite_context *creq);
-struct composite_context *dreplsrv_out_drsuapi_send(struct
dreplsrv_out_connection *conn)
+struct tevent_req *dreplsrv_out_drsuapi_send(TALLOC_CTX *mem_ctx,
+struct tevent_context *ev,
+struct dreplsrv_out_connection
*conn)
{
- struct composite_context *c;
+ struct tevent_req *req;
+ struct dreplsrv_out_drsuapi_state *state;
struct composite_context *creq;
-
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via 945b2d1... WHATSNEW: Update changes. from 7ea471b... Prevent NULL dereference if group has no members http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 945b2d1982d4e47aed2552a29e522b3c03b931f4 Author: Karolin Seeger ksee...@samba.org Date: Mon Jan 4 13:59:21 2010 +0100 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 129cd3f..18d0d31 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -10,6 +10,7 @@ Major enhancements in Samba 3.4.4 include: o Fix interdomain trust relationships with Win2008R2 (bug #6697). o Fix Winbind crashes when queried from nss (bug #6889). + o Fix Winbind crash when retrieving empty group members (bug #7014). o Fix UID range full error in Winbind (bug #6901). o Fix multiple LDAP servers in idmap backend and idmap alloc backend (bug #6910). @@ -66,6 +67,7 @@ o Volker Lendecke v...@samba.org o Jim McDonough j...@samba.org * BUG 6967: Fix 'net ads join' with OU. +* BUG 7014: Fix Winbind crash when retrieving empty group members. o Andrew Tridgell tri...@samba.org -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-stable updated
The branch, v3-4-stable has been updated
via 656624f... WHATSNEW: Update changes.
via 2ca6165... Prevent NULL dereference if group has no members
from ce98fae... WHATSNEW: Update changes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -
commit 656624f2d643567451f8c7f1f9bb91a6262148fa
Author: Karolin Seeger ksee...@samba.org
Date: Mon Jan 4 13:59:21 2010 +0100
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 945b2d1982d4e47aed2552a29e522b3c03b931f4)
commit 2ca6165c786b30f6bd6667a5517e43ea39f79875
Author: Jim McDonough j...@samba.org
Date: Wed Dec 30 15:04:55 2009 -0500
Prevent NULL dereference if group has no members
Fix bug #7014 (domain mode winbind crashes retriveing empty group members).
(cherry picked from commit 7ea471ba8db84b4fb2f02672e59a9f2a9932b4fa)
---
Summary of changes:
WHATSNEW.txt|2 ++
source3/winbindd/winbindd_rpc.c |8
2 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 129cd3f..18d0d31 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -10,6 +10,7 @@ Major enhancements in Samba 3.4.4 include:
o Fix interdomain trust relationships with Win2008R2 (bug #6697).
o Fix Winbind crashes when queried from nss (bug #6889).
+ o Fix Winbind crash when retrieving empty group members (bug #7014).
o Fix UID range full error in Winbind (bug #6901).
o Fix multiple LDAP servers in idmap backend and idmap alloc
backend (bug #6910).
@@ -66,6 +67,7 @@ o Volker Lendecke v...@samba.org
o Jim McDonough j...@samba.org
* BUG 6967: Fix 'net ads join' with OU.
+* BUG 7014: Fix Winbind crash when retrieving empty group members.
o Andrew Tridgell tri...@samba.org
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index f176fb3..aa8a5c8 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -789,16 +789,16 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
- *num_names = rids-count;
- rid_mem = rids-rids;
-
- if (!*num_names) {
+ if (!rids || !rids-count) {
names = NULL;
name_types = NULL;
sid_mem = NULL;
return NT_STATUS_OK;
}
+ *num_names = rids-count;
+ rid_mem = rids-rids;
+
/* Step #2: Convert list of rids into list of usernames. Do this
in bunches of ~1000 to avoid crashing NT4. It looks like there
is a buffer overflow or something like that lurking around
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 26a8591... WHATSNEW: Update changes. from 1ea5e11... s3: Happy New Year 2010 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 26a85914e38acb4f83ee535618aeb05453dd1bf6 Author: Karolin Seeger ksee...@samba.org Date: Mon Jan 4 14:42:46 2010 +0100 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index a7906c8..eb0c8f3 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -142,6 +142,10 @@ o Simo Sorce i...@samba.org * Change the way mksysms work in libtalloc. +o Jim McDonough j...@samba.org +* BUG 7014: Fix Winbind crash when retrieving empty group members. + + o Stefan Metzmacher me...@samba.org * Add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr() to tsocket. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated
via 919b1bd... WHATSNEW: Update changes.
via 68c1d26... s3: Happy New Year 2010
via ad67530... Prevent NULL dereference if group has no members (cherry
picked from commit 8c3dd08f6a361a24799f5ec958668e477b8127d0)
from ea7c356... WHATSNEW: Update changes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -
commit 919b1bdacb97cc7e90b251428c63587dcab4cee9
Author: Karolin Seeger ksee...@samba.org
Date: Mon Jan 4 14:42:46 2010 +0100
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 26a85914e38acb4f83ee535618aeb05453dd1bf6)
commit 68c1d26d7998f1779880ccc560cb82e8e54bceb5
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 4 08:42:03 2010 +0100
s3: Happy New Year 2010
metze
(cherry picked from commit 2ed51fbc4c3ff576db31c0258a91dc6347aae670)
Signed-off-by: Stefan Metzmacher me...@samba.org
(cherry picked from commit 1ea5e114f3bb5fb22a7dab36b69a08e5a09df50d)
commit ad6753083c47ef23ad80b7ea87b3f197da56c378
Author: Jim McDonough j...@samba.org
Date: Wed Dec 30 15:04:55 2009 -0500
Prevent NULL dereference if group has no members
(cherry picked from commit 8c3dd08f6a361a24799f5ec958668e477b8127d0)
---
Summary of changes:
WHATSNEW.txt|4
source3/include/smb.h |2 +-
source3/winbindd/winbindd_rpc.c |8
3 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a7906c8..eb0c8f3 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -142,6 +142,10 @@ o Simo Sorce i...@samba.org
* Change the way mksysms work in libtalloc.
+o Jim McDonough j...@samba.org
+* BUG 7014: Fix Winbind crash when retrieving empty group members.
+
+
o Stefan Metzmacher me...@samba.org
* Add tsocket_address_bsd_sockaddr() and
tsocket_address_bsd_from_sockaddr()
to tsocket.
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 4affd4a..b23ea64 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
#define _SMB_H
/* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2009
+#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2010
#if defined(LARGE_SMB_OFF_T)
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index e7a1f86..8797aeb 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -782,16 +782,16 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
- *num_names = rids-count;
- rid_mem = rids-rids;
-
- if (!*num_names) {
+ if (!rids || !rids-count) {
names = NULL;
name_types = NULL;
sid_mem = NULL;
return NT_STATUS_OK;
}
+ *num_names = rids-count;
+ rid_mem = rids-rids;
+
/* Step #2: Convert list of rids into list of usernames. Do this
in bunches of ~1000 to avoid crashing NT4. It looks like there
is a buffer overflow or something like that lurking around
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via e743177... VERSION: Raise version number up to 3.5.0rc1. from 26a8591... WHATSNEW: Update changes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit e7431770b6966ea62d08bb8d25df6ceb5efebbc6 Author: Karolin Seeger ksee...@samba.org Date: Mon Jan 4 16:36:14 2010 +0100 VERSION: Raise version number up to 3.5.0rc1. Karolin --- Summary of changes: source3/VERSION |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/VERSION b/source3/VERSION index 4028112..57b741e 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # - 2.2.9pre1 # -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE= # For 'rc' releases the version will be# @@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=2 # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE= +SAMBA_VERSION_RC_RELEASE=1 # To mark SVN snapshots this should be set to 'yes'# -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via ea57f91... VERSION: Raise version number up to 3.5.0rc1. from 919b1bd... WHATSNEW: Update changes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit ea57f91c3838b77ac531bdffc05585fe5cdb5739 Author: Karolin Seeger ksee...@samba.org Date: Mon Jan 4 16:36:14 2010 +0100 VERSION: Raise version number up to 3.5.0rc1. Karolin (cherry picked from commit e7431770b6966ea62d08bb8d25df6ceb5efebbc6) --- Summary of changes: source3/VERSION |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/VERSION b/source3/VERSION index e06aae6..3addc63 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # - 2.2.9pre1 # -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE= # For 'rc' releases the version will be# @@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=2 # e.g. SAMBA_VERSION_RC_RELEASE=1 # # - 3.0.0rc1 # -SAMBA_VERSION_RC_RELEASE= +SAMBA_VERSION_RC_RELEASE=1 # To mark SVN snapshots this should be set to 'yes'# -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2a66db8... Fix the merged build. Probably not strictly correct but allows us to make test. Jeremy. from f04e10f... s4:dsdb/repl: convert dreplsrv_out_drsuapi_send/recv to tevent_req http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2a66db8f93d18a88a8da7201b131b01c45ace36d Author: Jeremy Allison j...@samba.org Date: Mon Jan 4 13:27:48 2010 -0800 Fix the merged build. Probably not strictly correct but allows us to make test. Jeremy. --- Summary of changes: source4/lib/ldb/config.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 7d110fc..54e1416 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -16,7 +16,7 @@ ldb_asq_OBJ_FILES = $(ldbsrcdir)/modules/asq.o PRIVATE_DEPENDENCIES = LIBTALLOC LIBTEVENT CFLAGS = -I$(ldbsrcdir)/include INIT_FUNCTION = LDB_MODULE(sample) -SUBSYSTEM = LIBTESTLDB +SUBSYSTEM = LIBLDB # End MODULE sample_module -- Samba Shared Repository
Build status as of Tue Jan 5 07:00:03 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-01-04 00:00:05.0 -0700 +++ /home/build/master/cache/broken_results.txt 2010-01-05 00:00:08.0 -0700 @@ -1,22 +1,22 @@ -Build status as of Mon Jan 4 07:00:02 2010 +Build status as of Tue Jan 5 07:00:03 2010 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 2 1 0 +ccache 1 0 0 distcc 0 0 0 -ldb 31 31 0 -libreplace 29 12 0 +ldb 29 29 0 +libreplace 28 11 0 lorikeet 0 0 0 -pidl 1 1 0 +pidl 0 0 0 ppp 0 0 0 -rsync31 12 0 +rsync29 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 1 1 0 -samba_3_master 28 28 5 -samba_3_next 1 1 0 -samba_4_0_test 31 28 1 -talloc 29 11 0 -tdb 28 27 0 +samba_3_current 27 26 0 +samba_3_master 27 27 5 +samba_3_next 26 26 2 +samba_4_0_test 29 26 2 +talloc 28 10 0 +tdb 26 25 0
