Build status as of Wed Aug 18 06:00:02 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-08-17 00:00:03.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-08-18 00:00:03.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Tue Aug 17 06:00:02 2010 +Build status as of Wed Aug 18 06:00:02 2010 Build counts: Tree Total Broken Panic @@ -16,7 +16,7 @@ samba_3_current 32 32 4 samba_3_master 32 31 0 samba_3_next 32 32 5 -samba_4_0_waf 36 34 3 +samba_4_0_waf 36 33 2 talloc 32 6 0 tdb 30 8 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5a2f6c9... s3:selftest This test does not fail anymore (Samba4's smbtorture has been fixed) from effc61c... smbtorture: Make SAMBA3CASEINSENSITIVE report failures properly. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5a2f6c970027aacf8505d0971b44907900959f6d Author: Andrew Bartlett abart...@samba.org Date: Wed Aug 18 13:15:03 2010 +1000 s3:selftest This test does not fail anymore (Samba4's smbtorture has been fixed) --- Summary of changes: source3/selftest/knownfail |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail index 803d973..e69de29 100644 --- a/source3/selftest/knownfail +++ b/source3/selftest/knownfail @@ -1 +0,0 @@ -samba3.posix_s3.rpc.spoolss.notify # currently broken, see https://bugzilla.samba.org/show_bug.cgi?id=7486 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 59289d4... s3-build: only include smb_signing.h where needed. from 5a2f6c9... s3:selftest This test does not fail anymore (Samba4's smbtorture has been fixed) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 59289d4fa9e5f6f2ff6abd13e8f07ca6ee3e2a3c Author: Günther Deschner g...@samba.org Date: Tue Aug 17 15:03:58 2010 +0200 s3-build: only include smb_signing.h where needed. Guenther --- Summary of changes: source3/include/includes.h |1 - source3/libsmb/clientgen.c |1 + source3/libsmb/clisigning.c |1 + source3/libsmb/smb_signing.c |1 + source3/param/loadparm.c |2 ++ source3/smbd/signing.c |2 +- 6 files changed, 6 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index 23ea30a..64b4a77 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -639,7 +639,6 @@ extern void *cmdline_lp_ctx; #include messages.h #include locking.h #include smb_perfcount.h -#include smb_signing.h #include smb.h #include nameserv.h #include ../lib/util/byteorder.h diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 608288d..5c6c86d 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -19,6 +19,7 @@ */ #include includes.h +#include smb_signing.h /*** Setup the word count and byte count for a client smb message. diff --git a/source3/libsmb/clisigning.c b/source3/libsmb/clisigning.c index 0d0e926..1752edb 100644 --- a/source3/libsmb/clisigning.c +++ b/source3/libsmb/clisigning.c @@ -20,6 +20,7 @@ */ #include includes.h +#include smb_signing.h bool cli_simple_set_signing(struct cli_state *cli, const DATA_BLOB user_session_key, diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c index d4b350f..c926b48 100644 --- a/source3/libsmb/smb_signing.c +++ b/source3/libsmb/smb_signing.c @@ -21,6 +21,7 @@ #include includes.h #include ../lib/crypto/md5.h +#include smb_signing.h /* Used by the SMB signing functions. */ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index fa74470..f02ef26 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -60,6 +60,8 @@ #include ads.h #include ../librpc/gen_ndr/svcctl.h +#include smb_signing.h + #ifdef HAVE_SYS_SYSCTL_H #include sys/sysctl.h #endif diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c index 5370f57..ad7fa87 100644 --- a/source3/smbd/signing.c +++ b/source3/smbd/signing.c @@ -21,7 +21,7 @@ #include includes.h #include smbd/globals.h - +#include smb_signing.h /*** Called to validate an incoming packet from the client. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 536d4d4... s3: Fix an uninitialized variable
via a847f13... s3: Use pipe_struct-client_id-name for
pjob.clientmachine
via 29093bc... s3: Move initializing pjob.clientname to
print_job_start()
via 4b5e252... s3: Add client_id to pipes_struct
via 6d10684... s3: Remove unneeded client_address from
connection_struct
via 7b6835e... s3: Add smbd_server_connection-client_id
via ac7b633... s3: Lift smbd_server_fd from reload_services()
from 59289d4... s3-build: only include smb_signing.h where needed.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 536d4d48bfc3e915be210988fa7d9f6433d875f2
Author: Volker Lendecke v...@samba.org
Date: Wed Aug 18 11:17:52 2010 +0200
s3: Fix an uninitialized variable
commit a847f13d7b0c8606471792a50e9c64d1f6bd430c
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 17 09:34:27 2010 +0200
s3: Use pipe_struct-client_id-name for pjob.clientmachine
commit 29093bc0009bbcd5f9a98a2f4611fc3eb65f2539
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 17 09:17:26 2010 +0200
s3: Move initializing pjob.clientname to print_job_start()
commit 4b5e252354660501576c8452f48514852f40270e
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 16 11:01:26 2010 +0200
s3: Add client_id to pipes_struct
commit 6d10684556e9f9e847ec03dd8af057e8d4558e35
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 16 09:39:29 2010 +0200
s3: Remove unneeded client_address from connection_struct
commit 7b6835ec1da127713d0a412edcbe0a3c1bcc6192
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 16 08:30:36 2010 +0200
s3: Add smbd_server_connection-client_id
commit ac7b63384d3f8afdb768f95e7744380f4df07d76
Author: Volker Lendecke v...@samba.org
Date: Sun Aug 15 16:13:00 2010 +0200
s3: Lift smbd_server_fd from reload_services()
---
Summary of changes:
source3/auth/auth_ntlmssp.c|2 +-
source3/include/ntdomain.h |2 +-
source3/include/printing.h |1 +
source3/include/proto.h|7 +--
source3/include/smb.h |7 +--
source3/lib/util_sock.c|5 ++---
source3/printing/nt_printing_migrate.c |1 +
source3/printing/printing.c| 11 +++
source3/rpc_server/rpc_ncacn_np_internal.c | 15 ---
source3/rpc_server/srv_netlog_nt.c |5 +++--
source3/rpc_server/srv_pipe_hnd.c | 17 +++--
source3/rpc_server/srv_spoolss_nt.c| 15 ---
source3/rpc_server/srv_spoolss_util.c |1 +
source3/smbd/connection.c |2 +-
source3/smbd/globals.h |1 +
source3/smbd/lanman.c | 14 +++---
source3/smbd/negprot.c |4 ++--
source3/smbd/pipes.c |1 +
source3/smbd/process.c |6 +++---
source3/smbd/reply.c |2 +-
source3/smbd/server.c | 27 ---
source3/smbd/server_reload.c | 11 ++-
source3/smbd/service.c | 14 ++
source3/smbd/sesssetup.c | 10 +-
source3/smbd/smb2_sesssetup.c |2 +-
source3/torture/vfstest.c |2 +-
source3/winbindd/winbindd_samr.c |2 ++
27 files changed, 107 insertions(+), 80 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index a910201..d533ac9 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -122,7 +122,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct
ntlmssp_state *ntlmssp_state,
/* sub_set_smb_name checks for weird internally */
sub_set_smb_name(auth_ntlmssp_state-ntlmssp_state-user);
- reload_services(smbd_messaging_context(), True);
+ reload_services(smbd_messaging_context(), smbd_server_fd(), True);
nt_status = make_user_info_map(user_info,
auth_ntlmssp_state-ntlmssp_state-user,
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 071e915..073efe5 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -131,7 +131,7 @@ struct pipe_auth_data {
struct pipes_struct {
struct pipes_struct *next, *prev;
- char client_address[INET6_ADDRSTRLEN];
+ struct client_address *client_id;
struct auth_serversupplied_info *server_info;
struct messaging_context *msg_ctx;
diff --git a/source3/include/printing.h b/source3/include/printing.h
index b5fd98d..a16917f 100644
---
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 937da4d... s3-lib: Fixed a possible crash bug.
via 555b175... s3-printing: Added function to update the queue.
via 7e9d602... s3-printing: Rename jobs_changed functions to jobs_added.
from 536d4d4... s3: Fix an uninitialized variable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 937da4d14111e1cd32f514a9382291f12764c1c9
Author: Andreas Schneider a...@samba.org
Date: Wed Aug 18 12:08:47 2010 +0200
s3-lib: Fixed a possible crash bug.
Volker please check!
commit 555b175212d5c7e5b8628d4d5e3cba4541037dbb
Author: Andreas Schneider a...@samba.org
Date: Thu Apr 29 14:00:30 2010 +0200
s3-printing: Added function to update the queue.
commit 7e9d6021c91919f2e457e1e471cb253886aad9aa
Author: Andreas Schneider a...@samba.org
Date: Thu Apr 29 13:43:40 2010 +0200
s3-printing: Rename jobs_changed functions to jobs_added.
---
Summary of changes:
source3/include/printing.h |2 +-
source3/lib/serverid.c |2 +
source3/printing/printing.c | 256 +--
3 files changed, 203 insertions(+), 57 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/printing.h b/source3/include/printing.h
index a16917f..180f6a0 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -83,7 +83,7 @@ extern struct printif iprint_printif;
#ifndef PRINT_SPOOL_PREFIX
#define PRINT_SPOOL_PREFIX smbprn.
#endif
-#define PRINT_DATABASE_VERSION 6
+#define PRINT_DATABASE_VERSION 7
/* There can be this many printing tdb's open, plus any locked ones. */
#define MAX_PRINT_DBS_OPEN 1
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 5523eca..6adad7e 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -157,6 +157,8 @@ bool serverid_register_msg_flags(const struct server_id id,
bool do_reg,
data-msg_flags = ~msg_flags;
}
+ ZERO_STRUCT(tdbdata);
+
status = rec-store(rec, tdbdata, 0);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, (Storing serverid.tdb record failed: %s\n,
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 4240ddf..ca6139c 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -30,7 +30,7 @@ extern struct current_user current_user;
extern userdom_struct current_user_info;
/* Current printer interface */
-static bool remove_from_jobs_changed(const char* sharename, uint32 jobid);
+static bool remove_from_jobs_added(const char* sharename, uint32 jobid);
/*
the printing backend revolves around a tdb database that stores the
@@ -558,19 +558,97 @@ static uint32 map_to_spoolss_status(uint32 lpq_status)
return 0;
}
+/***
+ Append a jobid to the 'jobs changed' list.
+***/
+
+static bool add_to_jobs_changed(struct tdb_print_db *pdb, uint32_t jobid)
+{
+ TDB_DATA data;
+ uint32_t store_jobid;
+
+ SIVAL(store_jobid, 0, jobid);
+ data.dptr = (uint8 *) store_jobid;
+ data.dsize = 4;
+
+ DEBUG(10,(add_to_jobs_added: Added jobid %u\n, (unsigned int)jobid ));
+
+ return (tdb_append(pdb-tdb, string_tdb_data(INFO/jobs_changed),
+ data) == 0);
+}
+
+/***
+ Remove a jobid from the 'jobs changed' list.
+***/
+
+static bool remove_from_jobs_changed(const char* sharename, uint32_t jobid)
+{
+ struct tdb_print_db *pdb = get_print_db_byname(sharename);
+ TDB_DATA data, key;
+ size_t job_count, i;
+ bool ret = False;
+ bool gotlock = False;
+
+ if (!pdb) {
+ return False;
+ }
+
+ ZERO_STRUCT(data);
+
+ key = string_tdb_data(INFO/jobs_changed);
+
+ if (tdb_chainlock_with_timeout(pdb-tdb, key, 5) == -1)
+ goto out;
+
+ gotlock = True;
+
+ data = tdb_fetch(pdb-tdb, key);
+
+ if (data.dptr == NULL || data.dsize == 0 || (data.dsize % 4 != 0))
+ goto out;
+
+ job_count = data.dsize / 4;
+ for (i = 0; i job_count; i++) {
+ uint32 ch_jobid;
+
+ ch_jobid = IVAL(data.dptr, i*4);
+ if (ch_jobid == jobid) {
+ if (i job_count -1 )
+ memmove(data.dptr + (i*4), data.dptr + (i*4) +
4, (job_count - i - 1)*4 );
+ data.dsize -= 4;
+ if (tdb_store(pdb-tdb, key, data, TDB_REPLACE) == -1)
+ goto out;
+ break;
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b9353c6... s3: Fix serverid_register_msg_flags
from 937da4d... s3-lib: Fixed a possible crash bug.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b9353c65c0662895c8e87f3d1c6657ccfa12
Author: Volker Lendecke v...@samba.org
Date: Wed Aug 18 13:20:50 2010 +0200
s3: Fix serverid_register_msg_flags
Thanks, Andreas, for pointing this out! (How drunk have I been?...)
---
Summary of changes:
source3/lib/serverid.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 6adad7e..0fac375 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -124,7 +124,7 @@ bool serverid_register_msg_flags(const struct server_id id,
bool do_reg,
struct serverid_key key;
struct serverid_data *data;
struct db_record *rec;
- TDB_DATA tdbkey, tdbdata;
+ TDB_DATA tdbkey;
NTSTATUS status;
bool ret = false;
@@ -157,9 +157,7 @@ bool serverid_register_msg_flags(const struct server_id id,
bool do_reg,
data-msg_flags = ~msg_flags;
}
- ZERO_STRUCT(tdbdata);
-
- status = rec-store(rec, tdbdata, 0);
+ status = rec-store(rec, rec-value, 0);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, (Storing serverid.tdb record failed: %s\n,
nt_errstr(status)));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 71dfa62... s3-ads: cleanup ads_keytab_list()
via 64d8300... s3-ads: cleanup ads_keytab_create_default()
via 3a99123... s3-ads: cleanup ads_keytab_add_entry()
via d6d1ed8... s3-ads: Split, simplify and cleanup keytab functions
from b9353c6... s3: Fix serverid_register_msg_flags
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 71dfa62b61380396785c7856c38f45c77c966ff0
Author: Simo Sorce i...@samba.org
Date: Wed Aug 18 06:46:53 2010 -0400
s3-ads: cleanup ads_keytab_list()
commit 64d8300a56eb0891389a5a2afc5e4902c2d909a2
Author: Simo Sorce i...@samba.org
Date: Wed Aug 18 06:09:27 2010 -0400
s3-ads: cleanup ads_keytab_create_default()
commit 3a9912370dc36500d207aeb9d1ae58834526b6c3
Author: Simo Sorce i...@samba.org
Date: Wed Aug 18 04:33:32 2010 -0400
s3-ads: cleanup ads_keytab_add_entry()
commit d6d1ed8bdfb290ac6e1fa4264f2b84d0e4790d98
Author: Simo Sorce i...@samba.org
Date: Wed Aug 18 04:16:41 2010 -0400
s3-ads: Split, simplify and cleanup keytab functions
add helper function for both smb_krb5_kt_add_entry_ext() and
ads_keytab_flush()
---
Summary of changes:
source3/libads/kerberos_keytab.c | 756 --
1 files changed, 404 insertions(+), 352 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 386ce83..d2215ec 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -35,130 +35,184 @@
/**
**/
-int smb_krb5_kt_add_entry_ext(krb5_context context,
- krb5_keytab keytab,
- krb5_kvno kvno,
- const char *princ_s,
- krb5_enctype *enctypes,
- krb5_data password,
- bool no_salt,
- bool keep_old_entries)
+static krb5_error_code seek_and_delete_old_entries(krb5_context context,
+ krb5_keytab keytab,
+ krb5_kvno kvno,
+ const char *princ_s,
+ krb5_principal princ,
+ bool flush,
+ bool keep_old_entries)
{
- krb5_error_code ret = 0;
+ krb5_error_code ret;
krb5_kt_cursor cursor;
+ krb5_kt_cursor zero_csr;
krb5_keytab_entry kt_entry;
- krb5_principal princ = NULL;
- int i;
+ krb5_keytab_entry zero_kt_entry;
char *ktprinc = NULL;
- ZERO_STRUCT(kt_entry);
ZERO_STRUCT(cursor);
-
- ret = smb_krb5_parse_name(context, princ_s, princ);
- if (ret) {
- DEBUG(1,(smb_krb5_kt_add_entry_ext: smb_krb5_parse_name(%s)
failed (%s)\n, princ_s, error_message(ret)));
- goto out;
- }
+ ZERO_STRUCT(zero_csr);
+ ZERO_STRUCT(kt_entry);
+ ZERO_STRUCT(zero_kt_entry);
- /* Seek and delete old keytab entries */
ret = krb5_kt_start_seq_get(context, keytab, cursor);
- if (ret != KRB5_KT_END ret != ENOENT ) {
- DEBUG(3,(smb_krb5_kt_add_entry_ext: Will try to delete old
keytab entries\n));
- while(!krb5_kt_next_entry(context, keytab, kt_entry, cursor))
{
- bool compare_name_ok = False;
+ if (ret == KRB5_KT_END ret == ENOENT ) {
+ /* no entries */
+ return 0;
+ }
+
+ DEBUG(3, (__location__ : Will try to delete old keytab entries\n));
+ while (!krb5_kt_next_entry(context, keytab, kt_entry, cursor)) {
+ bool name_ok = False;
- ret = smb_krb5_unparse_name(talloc_tos(), context,
kt_entry.principal, ktprinc);
+ if (!flush (princ_s != NULL)) {
+ ret = smb_krb5_unparse_name(talloc_tos(), context,
+ kt_entry.principal,
+ ktprinc);
if (ret) {
- DEBUG(1,(smb_krb5_kt_add_entry_ext:
smb_krb5_unparse_name failed (%s)\n,
- error_message(ret)));
+ DEBUG(1, (__location__
+ : smb_krb5_unparse_name failed
+ (%s)\n, error_message(ret)));
goto out;
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d7c8fb2... s3: async cli_list
via 77761d9... s3: Add cli_flush
from 71dfa62... s3-ads: cleanup ads_keytab_list()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d7c8fb21bb0a29bb7227d4b242aba2f1524f6c48
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 10 07:44:15 2010 +0200
s3: async cli_list
commit 77761d9adcf34a9d1cd4567422c98efac101b3f6
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 13 14:01:03 2010 +0200
s3: Add cli_flush
---
Summary of changes:
source3/include/proto.h| 31 +-
source3/libsmb/clifile.c | 103 +
source3/libsmb/clilist.c | 1043 +++-
source3/torture/masktest.c | 47 ++-
source3/torture/torture.c |9 +-
5 files changed, 811 insertions(+), 422 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5c664eb..4f63a77 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2070,6 +2070,8 @@ NTSTATUS cli_ntcreate(struct cli_state *cli,
uint16_t *pfid);
uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2, const char *str,
size_t str_len, size_t *pconverted_size);
+uint8_t *smb_bytes_push_bytes(uint8_t *buf, uint8_t prefix,
+ const uint8_t *bytes, size_t num_bytes);
struct tevent_req *cli_open_create(TALLOC_CTX *mem_ctx,
struct event_context *ev,
struct cli_state *cli, const char *fname,
@@ -2334,12 +2336,22 @@ bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB
*auth_data, DATA_BLOB *unwrapped_
/* The following definitions come from libsmb/clilist.c */
-int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
-void (*fn)(const char *, struct file_info *, const char *,
- void *), void *state);
-int cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute,
-void (*fn)(const char *, struct file_info *, const char *,
- void *), void *state);
+NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute,
+ void (*fn)(const char *, struct file_info *,
+const char *, void *), void *state);
+NTSTATUS cli_list_trans(struct cli_state *cli, const char *mask,
+ uint16_t attribute, int info_level,
+ void (*fn)(const char *mnt, struct file_info *finfo,
+ const char *mask, void *private_data),
+ void *private_data);
+struct tevent_req *cli_list_send(TALLOC_CTX *mem_ctx,
+struct tevent_context *ev,
+struct cli_state *cli,
+const char *mask,
+uint16_t attribute,
+uint16_t info_level);
+NTSTATUS cli_list_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+ struct file_info **finfo, size_t *num_finfo);
NTSTATUS cli_list(struct cli_state *cli,const char *Mask,uint16 attribute,
void (*fn)(const char *, struct file_info *, const char *,
void *), void *state);
@@ -2483,6 +2495,13 @@ NTSTATUS cli_qpathinfo(TALLOC_CTX *mem_ctx, struct
cli_state *cli,
uint32_t max_rdata,
uint8_t **rdata, uint32_t *num_rdata);
+struct tevent_req *cli_flush_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct cli_state *cli,
+ uint16_t fnum);
+NTSTATUS cli_flush_recv(struct tevent_req *req);
+NTSTATUS cli_flush(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint16_t fnum);
+
/* The following definitions come from libsmb/clirap2.c */
struct rap_group_info_1;
struct rap_user_info_1;
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 48af0cc..d6b2e31 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -91,6 +91,26 @@ uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2,
true, pconverted_size);
}
+uint8_t *smb_bytes_push_bytes(uint8_t *buf, uint8_t prefix,
+ const uint8_t *bytes, size_t num_bytes)
+{
+ size_t buflen;
+
+ if (buf == NULL) {
+ return NULL;
+ }
+ buflen = talloc_get_size(buf);
+
+ buf = TALLOC_REALLOC_ARRAY(NULL, buf, uint8_t,
+ buflen + 1 + num_bytes);
+ if (buf == NULL) {
+ return NULL;
+ }
+ buf[buflen] = prefix;
+ memcpy(buf[buflen+1],
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1ab17f1... s3-ads: Remove unused wrapper and make function static
from d7c8fb2... s3: async cli_list
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1ab17f13a27429d34439c0ba3b77685e3a55c2c3
Author: Simo Sorce i...@samba.org
Date: Wed Aug 18 09:36:54 2010 -0400
s3-ads: Remove unused wrapper and make function static
---
Summary of changes:
source3/include/krb5_protos.h|8 ---
source3/libads/kerberos_keytab.c | 39 +++--
2 files changed, 12 insertions(+), 35 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index 0b8aa71..e229a14 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -124,14 +124,6 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
krb5_context context,
krb5_keytab keytab,
const char **keytab_name);
-int smb_krb5_kt_add_entry_ext(krb5_context context,
- krb5_keytab keytab,
- krb5_kvno kvno,
- const char *princ_s,
- krb5_enctype *enctypes,
- krb5_data password,
- bool no_salt,
- bool keep_old_entries);
krb5_error_code smb_krb5_get_credentials(krb5_context context,
krb5_ccache ccache,
krb5_principal me,
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index d2215ec..10c7087 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -180,14 +180,14 @@ out:
return ret;
}
-int smb_krb5_kt_add_entry_ext(krb5_context context,
- krb5_keytab keytab,
- krb5_kvno kvno,
- const char *princ_s,
- krb5_enctype *enctypes,
- krb5_data password,
- bool no_salt,
- bool keep_old_entries)
+static int smb_krb5_kt_add_entry(krb5_context context,
+krb5_keytab keytab,
+krb5_kvno kvno,
+const char *princ_s,
+krb5_enctype *enctypes,
+krb5_data password,
+bool no_salt,
+bool keep_old_entries)
{
krb5_error_code ret;
krb5_keytab_entry kt_entry;
@@ -250,23 +250,6 @@ out:
return (int)ret;
}
-static int smb_krb5_kt_add_entry(krb5_context context,
-krb5_keytab keytab,
-krb5_kvno kvno,
-const char *princ_s,
-krb5_enctype *enctypes,
-krb5_data password)
-{
- return smb_krb5_kt_add_entry_ext(context,
-keytab,
-kvno,
-princ_s,
-enctypes,
-password,
-false,
-false);
-}
-
/**
Adds a single service principal, i.e. 'host' to the system keytab
***/
@@ -415,7 +398,8 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char
*srvPrinc)
/* add the fqdn principal to the keytab */
ret = smb_krb5_kt_add_entry(context, keytab, kvno,
- princ_s, enctypes, password);
+ princ_s, enctypes, password,
+ false, false);
if (ret) {
DEBUG(1, (__location__ : Failed to add entry to keytab\n));
goto out;
@@ -424,7 +408,8 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char
*srvPrinc)
/* add the short principal name if we have one */
if (short_princ_s) {
ret = smb_krb5_kt_add_entry(context, keytab, kvno,
- short_princ_s, enctypes, password);
+ short_princ_s, enctypes, password,
+ false, false);
if (ret) {
DEBUG(1, (__location__
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ce60e8d... librpc/rpc: call do_ndr_print hook in
dcerpc_binding_handle_call*()
from 1ab17f1... s3-ads: Remove unused wrapper and make function static
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ce60e8d69735bc2d5c6f776c84dea2e17dae95ac
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 18 15:47:15 2010 +0200
librpc/rpc: call do_ndr_print hook in dcerpc_binding_handle_call*()
metze
---
Summary of changes:
librpc/rpc/binding_handle.c | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/rpc/binding_handle.c b/librpc/rpc/binding_handle.c
index 153d7d1..75b2ded 100644
--- a/librpc/rpc/binding_handle.c
+++ b/librpc/rpc/binding_handle.c
@@ -311,6 +311,11 @@ struct tevent_req
*dcerpc_binding_handle_call_send(TALLOC_CTX *mem_ctx,
state-push-flags |= LIBNDR_FLAG_NDR64;
}
+ if (h-ops-do_ndr_print) {
+ h-ops-do_ndr_print(h, NDR_IN | NDR_SET_VALUES,
+state-r_ptr, state-call);
+ }
+
/* push the structure into a blob */
ndr_err = state-call-ndr_push(state-push, NDR_IN, state-r_ptr);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -401,6 +406,11 @@ static void dcerpc_binding_handle_call_done(struct
tevent_req *subreq)
return;
}
+ if (h-ops-do_ndr_print) {
+ h-ops-do_ndr_print(h, NDR_OUT,
+state-r_ptr, state-call);
+ }
+
if (h-ops-ndr_validate_out) {
error = h-ops-ndr_validate_out(h,
state-pull,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8f7bf85... s3: Remove an unused variable from ce60e8d... librpc/rpc: call do_ndr_print hook in dcerpc_binding_handle_call*() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8f7bf85c40068523b607b01a141d24e27b9f4be1 Author: Volker Lendecke v...@samba.org Date: Wed Aug 18 16:44:04 2010 +0200 s3: Remove an unused variable --- Summary of changes: source3/smbd/service.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/service.c b/source3/smbd/service.c index d66a7a0..ef74b39 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -650,7 +650,6 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, struct smb_filename *smb_fname_cpath = NULL; fstring dev; int ret; - char *addr; bool on_err_call_dis_hook = false; bool claimed_connection = false; uid_t effuid; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via ec78096... From master: b9353c65c0662895c8e87f3d1c6657ccfa12.
from 0060b1e... s3:winbindd: don't ignore 'result' in
wb_dsgetdcname_done()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit ec78096e7cc4ca60dd8741a065fd33156001558b
Author: Jeremy Allison j...@samba.org
Date: Wed Aug 18 11:07:49 2010 -0700
From master: b9353c65c0662895c8e87f3d1c6657ccfa12.
Volker Lendecke v...@samba.org s3: Fix serverid_register_msg_flags.
---
Summary of changes:
source3/lib/serverid.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 5523eca..0fac375 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -124,7 +124,7 @@ bool serverid_register_msg_flags(const struct server_id id,
bool do_reg,
struct serverid_key key;
struct serverid_data *data;
struct db_record *rec;
- TDB_DATA tdbkey, tdbdata;
+ TDB_DATA tdbkey;
NTSTATUS status;
bool ret = false;
@@ -157,7 +157,7 @@ bool serverid_register_msg_flags(const struct server_id id,
bool do_reg,
data-msg_flags = ~msg_flags;
}
- status = rec-store(rec, tdbdata, 0);
+ status = rec-store(rec, rec-value, 0);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, (Storing serverid.tdb record failed: %s\n,
nt_errstr(status)));
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch v3-6-test updated
On Wed, Aug 18, 2010 at 01:08:44PM -0500, Jeremy Allison wrote: The branch, v3-6-test has been updated via ec78096... From master: b9353c65c0662895c8e87f3d1c6657ccfa12. from 0060b1e... s3:winbindd: don't ignore 'result' in wb_dsgetdcname_done() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit ec78096e7cc4ca60dd8741a065fd33156001558b Author: Jeremy Allison j...@samba.org Date: Wed Aug 18 11:07:49 2010 -0700 From master: b9353c65c0662895c8e87f3d1c6657ccfa12. Volker Lendecke v...@samba.org s3: Fix serverid_register_msg_flags. Thanks! I'd forgotten 3.6. Volker
[SCM] CTDB repository - branch master updated - ctdb-1.0.114-250-g25c4ce7
The branch, master has been updated
via 25c4ce7e919f13226219f036bcffd2be76b2f06c (commit)
from c3eb53509331045074579468d94ed7e31101bba4 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 25c4ce7e919f13226219f036bcffd2be76b2f06c
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Aug 19 07:18:22 2010 +1000
On RHEL,service nfs stop;service nfs start and service nfs
restart
sometimes (very rarely) fails to restart the service.
Add a function to restart NFSd on SLES and RHEL-like systems.
If we detect the system is unhealthy due to kNFSd not running,
try to restart the service again service nfs restart and
hope for the best.
CQ1019372
---
Summary of changes:
config/events.d/60.nfs |7 ++-
config/functions |7 +++
2 files changed, 13 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index d403792..637efe8 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -78,7 +78,12 @@ case $1 in
# check that NFS responds to rpc requests
[ $CTDB_NFS_SKIP_KNFSD_ALIVE_CHECK = yes ] || {
- ctdb_check_rpc NFS 13 3
+ (ctdb_check_rpc NFS 13 3)
+ [ $? = 0 ] || {
+ echo Trying to restart NFS service
+ startstop_nfs restart
+ exit 1
+ }
}
# and that its directories are available
diff --git a/config/functions b/config/functions
index 69c5ce1..35b7db2 100755
--- a/config/functions
+++ b/config/functions
@@ -366,6 +366,9 @@ startstop_nfs() {
stop)
service nfsserver stop /dev/null 21
;;
+ restart)
+ service nfsserver restart
+ ;;
esac
;;
rhel)
@@ -378,6 +381,10 @@ startstop_nfs() {
service nfs stop /dev/null 21
service nfslock stop /dev/null 21
;;
+ restart)
+ service nfslock restart
+ service nfs restart
+ ;;
esac
;;
*)
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3423060... Fix bug 7563 - Creation of symlink using smbclient is
buggy.
from 8f7bf85... s3: Remove an unused variable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 34230608dfa7e9f4aa0c633e7a92df37ca94d28f
Author: Jeremy Allison j...@samba.org
Date: Mon Aug 16 16:31:33 2010 -0700
Fix bug 7563 - Creation of symlink using smbclient is buggy.
Fix semantics of symlink. oldpath should be an untouched blob,
newpath should fit the share path semantics.
Jeremy.
---
Summary of changes:
source3/client/client.c | 22 +-
1 files changed, 9 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index e11e3bf..ce5b4e6 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2869,21 +2869,16 @@ static int cmd_symlink(void)
char *newname = NULL;
char *buf = NULL;
char *buf2 = NULL;
- char *targetname = NULL;
- struct cli_state *targetcli;
+ struct cli_state *newcli;
if (!next_token_talloc(ctx, cmd_ptr,buf,NULL) ||
!next_token_talloc(ctx, cmd_ptr,buf2,NULL)) {
d_printf(symlink oldname newname\n);
return 1;
}
- oldname = talloc_asprintf(ctx,
- %s%s,
- client_get_cur_dir(),
- buf);
- if (!oldname) {
- return 1;
- }
+ /* Oldname (link target) must be an untouched blob. */
+ oldname = buf;
+
newname = talloc_asprintf(ctx,
%s%s,
client_get_cur_dir(),
@@ -2892,19 +2887,20 @@ static int cmd_symlink(void)
return 1;
}
- if (!cli_resolve_path(ctx, , auth_info, cli, oldname, targetcli,
targetname)) {
+ /* New name must be present in share namespace. */
+ if (!cli_resolve_path(ctx, , auth_info, cli, newname, newcli,
newname)) {
d_printf(link %s: %s\n, oldname, cli_errstr(cli));
return 1;
}
- if (!SERVER_HAS_UNIX_CIFS(targetcli)) {
+ if (!SERVER_HAS_UNIX_CIFS(newcli)) {
d_printf(Server doesn't support UNIX CIFS calls.\n);
return 1;
}
- if (!NT_STATUS_IS_OK(cli_posix_symlink(targetcli, targetname,
newname))) {
+ if (!NT_STATUS_IS_OK(cli_posix_symlink(newcli, oldname, newname))) {
d_printf(%s symlinking files (%s - %s)\n,
- cli_errstr(targetcli), newname, targetname);
+ cli_errstr(newcli), newname, newname);
return 1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 2e7c697... Fix bug 7563 - Creation of symlink using smbclient is
buggy.
from ec78096... From master: b9353c65c0662895c8e87f3d1c6657ccfa12.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 2e7c697f1c4f81c30029b47949dd8b1013a0aa97
Author: Jeremy Allison j...@samba.org
Date: Mon Aug 16 16:31:33 2010 -0700
Fix bug 7563 - Creation of symlink using smbclient is buggy.
Fix semantics of symlink. oldpath should be an untouched blob,
newpath should fit the share path semantics.
Jeremy.
---
Summary of changes:
source3/client/client.c | 22 +-
1 files changed, 9 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index 81e3cd4..b0c931c 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2845,21 +2845,16 @@ static int cmd_symlink(void)
char *newname = NULL;
char *buf = NULL;
char *buf2 = NULL;
- char *targetname = NULL;
- struct cli_state *targetcli;
+ struct cli_state *newcli;
if (!next_token_talloc(ctx, cmd_ptr,buf,NULL) ||
!next_token_talloc(ctx, cmd_ptr,buf2,NULL)) {
d_printf(symlink oldname newname\n);
return 1;
}
- oldname = talloc_asprintf(ctx,
- %s%s,
- client_get_cur_dir(),
- buf);
- if (!oldname) {
- return 1;
- }
+ /* Oldname (link target) must be an untouched blob. */
+ oldname = buf;
+
newname = talloc_asprintf(ctx,
%s%s,
client_get_cur_dir(),
@@ -2868,19 +2863,20 @@ static int cmd_symlink(void)
return 1;
}
- if (!cli_resolve_path(ctx, , auth_info, cli, oldname, targetcli,
targetname)) {
+ /* New name must be present in share namespace. */
+ if (!cli_resolve_path(ctx, , auth_info, cli, newname, newcli,
newname)) {
d_printf(link %s: %s\n, oldname, cli_errstr(cli));
return 1;
}
- if (!SERVER_HAS_UNIX_CIFS(targetcli)) {
+ if (!SERVER_HAS_UNIX_CIFS(newcli)) {
d_printf(Server doesn't support UNIX CIFS calls.\n);
return 1;
}
- if (!NT_STATUS_IS_OK(cli_posix_symlink(targetcli, targetname,
newname))) {
+ if (!NT_STATUS_IS_OK(cli_posix_symlink(newcli, oldname, newname))) {
d_printf(%s symlinking files (%s - %s)\n,
- cli_errstr(targetcli), newname, targetname);
+ cli_errstr(newcli), newname, newname);
return 1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via da25541... Fix bug 7626 - Typo in configure samba_cv__CC_NEGATIVE_ENUM_VALUES two underscores. from 3423060... Fix bug 7563 - Creation of symlink using smbclient is buggy. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit da2554117e2d9dc4bde7d47d6e81d5d572ca1d02 Author: Jeremy Allison j...@samba.org Date: Wed Aug 18 16:25:15 2010 -0700 Fix bug 7626 - Typo in configure samba_cv__CC_NEGATIVE_ENUM_VALUES two underscores. Noticed by b...@sernet.de. --- Summary of changes: source3/configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 627ec7f..5156159 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -343,7 +343,7 @@ AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_C return 0; } ], - samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)]) + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)]) if test x$samba_cv_CC_NEGATIVE_ENUM_VALUES != xyes; then AC_MSG_WARN([using --uint-enums for pidl]) PIDL_ARGS=$PIDL_ARGS --uint-enums -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via b26e86c... Fix bug 7626 - Typo in configure samba_cv__CC_NEGATIVE_ENUM_VALUES two underscores. from 2e7c697... Fix bug 7563 - Creation of symlink using smbclient is buggy. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit b26e86c3b11ec38f0f5a9d4ce3ea3256946e5353 Author: Jeremy Allison j...@samba.org Date: Wed Aug 18 16:25:15 2010 -0700 Fix bug 7626 - Typo in configure samba_cv__CC_NEGATIVE_ENUM_VALUES two underscores. Noticed by b...@sernet.de. (cherry picked from commit da2554117e2d9dc4bde7d47d6e81d5d572ca1d02) --- Summary of changes: source3/configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index bfd6abb..cb685c6 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -339,7 +339,7 @@ AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_C return 0; } ], - samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)]) + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)]) if test x$samba_cv_CC_NEGATIVE_ENUM_VALUES != xyes; then AC_MSG_WARN([using --uint-enums for pidl]) PIDL_ARGS=$PIDL_ARGS --uint-enums -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 89899f5... s4-drs: ATTIDs for deleted attributes should be based on msDs-IntId value if it exists via e050274... s4-test: make better error message for ATTID checks via c3cf388... s4-test: Change attribute syntax and value for readability via a46ead0... s4-test: Enable drs.rpc.msdsintid test case - it should be passing now via 6950724... s4-dsdb: No need for dsdb_syntax_one_DN_drsuapi_to_ldb() to be public via 6a51afc... s4-drs: GetNCChanges() to return correct (in AD-way) ATTIDs via 35d886d... s4-dsdb-syntax: ATTID should be msDs-IntId value for the attributeSchema object via fffc98f... s4: fix few comment typos via d01804d... s4-schema_syntax.c: Fix white spaces and alignment via c5ec1f3... s4-dsdb: Use dsdb_syntax_ctx in *_drsuapi_to_ldb functions via b5af7b9... s4-dsdb: Use dsdb_syntax_ctx in *_ldb_to_drsuapi functions via ca80918... s4-dsdb: Use dsdb_syntax_ctx in *_validate_ldb functions via b7d1586... s4-dsdb: Add context structure for dsdb_syntax conversion functions via 20a8481... s4-test-dssync: remove unused variable from da25541... Fix bug 7626 - Typo in configure samba_cv__CC_NEGATIVE_ENUM_VALUES two underscores. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 89899f55dc1fb137a0adfd734c87b65039f598a4 Author: Kamen Mazdrashki kame...@samba.org Date: Thu Aug 19 03:17:36 2010 +0300 s4-drs: ATTIDs for deleted attributes should be based on msDs-IntId value if it exists commit e05027401f4733e43b62148fa5c59559f49b4c1b Author: Kamen Mazdrashki kame...@samba.org Date: Thu Aug 19 03:08:29 2010 +0300 s4-test: make better error message for ATTID checks commit c3cf388eaf322b7646aa464774baa324be81a56d Author: Kamen Mazdrashki kame...@samba.org Date: Thu Aug 19 02:47:14 2010 +0300 s4-test: Change attribute syntax and value for readability When it comes to read logs and dumping data received Octet String syntax comes in handy commit a46ead0724f54a6034913fe5d1da077140d58133 Author: Kamen Mazdrashki kame...@samba.org Date: Wed Aug 18 13:21:10 2010 +0300 s4-test: Enable drs.rpc.msdsintid test case - it should be passing now commit 695072478d5d5bd476524228fc09cde200abcf6b Author: Kamen Mazdrashki kame...@samba.org Date: Wed Aug 18 03:19:45 2010 +0300 s4-dsdb: No need for dsdb_syntax_one_DN_drsuapi_to_ldb() to be public It is intended to be used in schema_syntax.c module commit 6a51afcfdbcbce7813fb59c0655e4178268ca70e Author: Kamen Mazdrashki kame...@samba.org Date: Wed Aug 18 03:52:48 2010 +0300 s4-drs: GetNCChanges() to return correct (in AD-way) ATTIDs Depending on which NC is being replicated, GetNCChanges() returns either ATTID based on local prefixMap or msDs-IntId value of the attributeSchema class for the attribute being replicated. If set, msDs-IntId value is always returned when replicating object form NC other than Schema NC. Objects in Schema NC replica always use prefixMap based ATTIDs. commit 35d886db176123b3ef3a0436463f59edcaed1322 Author: Kamen Mazdrashki kame...@samba.org Date: Wed Aug 18 03:06:53 2010 +0300 s4-dsdb-syntax: ATTID should be msDs-IntId value for the attributeSchema object in case object replicated is not in Schema NC and attributeSchema object has msDs-IntId attribute value set commit fffc98f33e333b8711da053e5cd5ddcc601cd275 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Aug 17 04:48:24 2010 +0300 s4: fix few comment typos commit d01804dda9d1e1793f3e1d2f863ced7e900c Author: Kamen Mazdrashki kame...@samba.org Date: Tue Aug 17 04:44:52 2010 +0300 s4-schema_syntax.c: Fix white spaces and alignment commit c5ec1f3d9246f5737279340bf1755baf542d982b Author: Kamen Mazdrashki kame...@samba.org Date: Tue Aug 17 04:20:46 2010 +0300 s4-dsdb: Use dsdb_syntax_ctx in *_drsuapi_to_ldb functions commit b5af7b9a1eb70db949c83fe6b55e402b82a2a9a4 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Aug 17 04:12:54 2010 +0300 s4-dsdb: Use dsdb_syntax_ctx in *_ldb_to_drsuapi functions commit ca809186137e259060032ef61d9d3e93cddad298 Author: Kamen Mazdrashki kame...@samba.org Date: Tue Aug 17 03:58:26 2010 +0300 s4-dsdb: Use dsdb_syntax_ctx in *_validate_ldb functions commit b7d1586ccd05a78a4fae512c54fa39dda408e08b Author: Kamen Mazdrashki kame...@samba.org Date: Tue Aug 17 03:21:46 2010 +0300 s4-dsdb: Add context structure for dsdb_syntax conversion functions This structure is intended to hold context-dependent data. Syntax-conversion and object-conversion functions need that data to convert objects and attributes from drs-to-ldb and ldb-to-drs correctly. For instance: ATTID value depends on whether we are converting object from
[SCM] CTDB repository - branch master updated - ctdb-1.0.114-259-g3afa5d9
The branch, master has been updated via 3afa5d945a56952a7f211af068d671945de960e5 (commit) via 13e58d92f5f1723e850a82ae030d0ca57e89b1ee (commit) via dc301b324d2c14a2425a965c076113c4fe97903e (commit) via 68b3761a0874429b90731741f0531f76dcfbb081 (commit) via 08f7f85477610a4916c1ec866aa467b28f1bbec3 (commit) via aeb70c7e7822854eb87873a5c7783e27e6e72318 (commit) via d8df6835a931082af232c4b94f1dede6f16169f9 (commit) via 8e518950ba281502318d6300f7a5ec6cdf6b5674 (commit) via f5d7dc679501e607c2c83a248a89d3cada9df146 (commit) from 25c4ce7e919f13226219f036bcffd2be76b2f06c (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 3afa5d945a56952a7f211af068d671945de960e5 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Thu Aug 19 14:48:19 2010 +1000 We need the deprecated talloc_append_string() for now so set the TALLOC_DEPRECATED sympol to allow use of this call from ctdb_client.c commit 13e58d92f5f1723e850a82ae030d0ca57e89b1ee Merge: dc301b324d2c14a2425a965c076113c4fe97903e 68b3761a0874429b90731741f0531f76dcfbb081 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Thu Aug 19 13:17:56 2010 +1000 Merge commit 'rusty/ports-from-1.0.112' into foo commit dc301b324d2c14a2425a965c076113c4fe97903e Merge: 25c4ce7e919f13226219f036bcffd2be76b2f06c d8df6835a931082af232c4b94f1dede6f16169f9 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Thu Aug 19 13:16:35 2010 +1000 Merge commit 'rusty/vacuum-fix-master' commit 68b3761a0874429b90731741f0531f76dcfbb081 Author: Rusty Russell ru...@rustcorp.com.au Date: Mon Jul 19 19:29:09 2010 +0930 logging: give a unique logging name to each forked child. This means we can distinguish which child is logging, esp. via syslog where we have no pid. Signed-off-by: Rusty Russell ru...@rustcorp.com.au commit 08f7f85477610a4916c1ec866aa467b28f1bbec3 Author: Rusty Russell ru...@rustcorp.com.au Date: Mon Jul 26 13:58:48 2010 +0930 takeover: prevent crash by avoiding free in traverse on RST timeout After 5 attempts to send a RST to a client without any response, we free con; this is done during a traverse. This frees the node we are walking through (the node is made a child of con down in rb_tree.c's trbt_create_node() (Valgrind would catch this, as Martin confirmed). So, we create a temporary parent and reparent onto that; then we free that parent after the traverse, thus deleting the unwanted nodes. CQ:S1019041 Signed-off-by: Rusty Russell ru...@rustcorp.com.au commit aeb70c7e7822854eb87873a5c7783e27e6e72318 Author: Martin Schwenke mar...@meltin.net Date: Tue Jul 6 17:54:43 2010 +1000 Move NAT gateway firewall rules to recovered|updatenatgw events. The existing code wasn't working as designed in the start event. It should work here. BZ: 62613 Signed-off-by: Martin Schwenke mar...@meltin.net commit d8df6835a931082af232c4b94f1dede6f16169f9 Author: Rusty Russell ru...@rustcorp.com.au Date: Wed Jul 21 12:28:04 2010 +0930 vacuum: disabling vacuuming during a freeze We shouldn't even think about vacuuming when we've frozen the database (which is earlier than when we set CTDB_RECOVERY_ACTIVE) CQ:S1018154 S1018349 Signed-off-by: Rusty Russell ru...@rustcorp.com.au commit 8e518950ba281502318d6300f7a5ec6cdf6b5674 Author: Rusty Russell ru...@rustcorp.com.au Date: Mon Jul 26 16:08:07 2010 +0930 vacuum: fix crash on vacuum abort Martin Schwenke discovered that 517f05e42f17766b1e8db8f1f4789cbad968e304 (freeze: abort vacuuming when we're going to freeze.) used ctdb_db for a logging message which is in fact uninitialized, causing a crash (even if it wasn't actually logged). Initialize it properly. Also fix incorrect format in another logging message introduced in that same change. CQ:S1019093 Signed-off-by: Rusty Russell ru...@rustcorp.com.au commit f5d7dc679501e607c2c83a248a89d3cada9df146 Author: Rusty Russell ru...@rustcorp.com.au Date: Wed Jul 21 12:29:55 2010 +0930 freeze: abort vacuuming when we're going to freeze. There are some reports of freeze timeouts, and it looks like vacuuming might be the culprit. So we add code to tell them to abort when a freeze is going on. (This is based on the 1.0.112 branch version 517f05e42f, but far simpler since tdb is now robust against processes being killed during transaction commit) CQ:S1018154 S1018349 Signed-off-by: Rusty Russell ru...@rustcorp.com.au --- Summary of changes: client/ctdb_client.c | 11 ++- common/ctdb_logging.c|2 +- config/events.d/11.natgw |6 ++ include/ctdb_client.h
