[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via de53fcd tevent: change the version to 0.9.15
via b5436fd tevent: Fix deleting signal events from within themselves
from 4328f3c smbwrapper: Remove smbwrapper
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit de53fcd8de5b751efb97adb43663a73059dc8ed3
Author: Stefan Metzmacher me...@samba.org
Date: Thu Feb 9 10:11:19 2012 +0100
tevent: change the version to 0.9.15
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Feb 9 12:24:19 CET 2012 on sn-devel-104
commit b5436fde5bbe5b849212258088add492ee8fc4ce
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 28 22:18:00 2012 +0100
tevent: Fix deleting signal events from within themselves
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
.../ABI/{tevent-0.9.14.sigs = tevent-0.9.15.sigs} |0
lib/tevent/tevent_signal.c | 35 ++-
lib/tevent/wscript |2 +-
3 files changed, 34 insertions(+), 3 deletions(-)
copy lib/tevent/ABI/{tevent-0.9.14.sigs = tevent-0.9.15.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/ABI/tevent-0.9.14.sigs
b/lib/tevent/ABI/tevent-0.9.15.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.14.sigs
copy to lib/tevent/ABI/tevent-0.9.15.sigs
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index fabe72c..248dd35 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -307,6 +307,15 @@ struct tevent_signal *tevent_common_add_signal(struct
tevent_context *ev,
return se;
}
+struct tevent_se_exists {
+ struct tevent_se_exists **myself;
+};
+
+static int tevent_se_exists_destructor(struct tevent_se_exists *s)
+{
+ *s-myself = NULL;
+ return 0;
+}
/*
check if a signal is pending
@@ -335,6 +344,23 @@ int tevent_common_check_signal(struct tevent_context *ev)
}
for (sl=sig_state-sig_handlers[i];sl;sl=next) {
struct tevent_signal *se = sl-se;
+ struct tevent_se_exists *exists;
+
+ /*
+* We have to be careful to not touch se
+* after it was deleted in its handler. Thus
+* we allocate a child whose destructor will
+* tell by nulling out itself that its parent
+* is gone.
+*/
+ exists = talloc(se, struct tevent_se_exists);
+ if (exists == NULL) {
+ continue;
+ }
+ exists-myself = exists;
+ talloc_set_destructor(
+ exists, tevent_se_exists_destructor);
+
next = sl-next;
#ifdef SA_SIGINFO
if (se-sa_flags SA_SIGINFO) {
@@ -352,21 +378,26 @@ int tevent_common_check_signal(struct tevent_context *ev)
se-handler(ev, se, i, 1,
(void*)sig_state-sig_info[i][ofs],
se-private_data);
+ if (!exists) {
+ break;
+ }
}
#ifdef SA_RESETHAND
- if (se-sa_flags SA_RESETHAND) {
+ if (exists (se-sa_flags SA_RESETHAND)) {
talloc_free(se);
}
#endif
+ talloc_free(exists);
continue;
}
#endif
se-handler(ev, se, i, count, NULL, se-private_data);
#ifdef SA_RESETHAND
- if (se-sa_flags SA_RESETHAND) {
+ if (exists (se-sa_flags SA_RESETHAND)) {
talloc_free(se);
}
#endif
+ talloc_free(exists);
}
#ifdef SA_SIGINFO
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index f98253f..b4bcb71 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.9.14'
+VERSION = '0.9.15'
blddir = 'bin'
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2464a7b s3-libsmb: Remove obsolete smb_krb5_locate_kdc.
via 419e92b s3-net: Don't use an internal krb5 for kdc lookup.
from de53fcd tevent: change the version to 0.9.15
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2464a7b0ddb556bed86a845c9400e26c4d7f584a
Author: Andreas Schneider a...@samba.org
Date: Wed Nov 30 17:58:30 2011 +0100
s3-libsmb: Remove obsolete smb_krb5_locate_kdc.
Signed-off-by: Günther Deschner g...@samba.org
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Thu Feb 9 14:58:57 CET 2012 on sn-devel-104
commit 419e92b1499c77ddf3648d6b99ed482a57b3e713
Author: Andreas Schneider a...@samba.org
Date: Wed Nov 30 17:39:22 2011 +0100
s3-net: Don't use an internal krb5 for kdc lookup.
This replaces the use of the internal krb5_locate_kdc() function with
our own get_kdc_list() function.
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
source3/configure.in |1 -
source3/include/krb5_protos.h |4 --
source3/libsmb/clikrb5.c | 89 -
source3/utils/net_lookup.c| 42 +++-
source3/wscript |2 +-
5 files changed, 24 insertions(+), 114 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 298fe1b..1ce1a5b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3860,7 +3860,6 @@ if test x$with_ads_support != xno; then
AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS)
- AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_free_data_contents, $KRB5_LIBS)
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index 32f995c..f16cafd 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -67,10 +67,6 @@ bool setup_kaddr( krb5_address *pkaddr, struct
sockaddr_storage *paddr);
int create_kerberos_key_from_string(krb5_context context, krb5_principal
host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool
no_salt);
bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data,
krb5_ticket *tkt);
krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
-krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
struct sockaddr **addr_pp, int *naddrs, int get_masters);
-#if defined(HAVE_KRB5_LOCATE_KDC)
-krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
struct sockaddr **addr_pp, int *naddrs, int get_masters);
-#endif
krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype
**enctypes);
bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
krb5_context context,
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 9af3e49..8cea29c 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -347,95 +347,6 @@ bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data,
DATA_BLOB *unwrapped_
#endif
}
-#if !defined(HAVE_KRB5_LOCATE_KDC)
-
-/* krb5_locate_kdc is an internal MIT symbol. MIT are not yet willing to commit
- * to a public interface for this functionality, so we have to be able to live
- * without it if the MIT libraries are hiding their internal symbols.
- */
-
-#if defined(KRB5_KRBHST_INIT)
-/* Heimdal */
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
- krb5_krbhst_handle hnd;
- krb5_krbhst_info *hinfo;
- krb5_error_code rc;
- int num_kdcs, i;
- struct sockaddr *sa;
- struct addrinfo *ai;
-
- *addr_pp = NULL;
- *naddrs = 0;
-
- rc = krb5_krbhst_init(ctx, realm-data, KRB5_KRBHST_KDC, hnd);
- if (rc) {
- DEBUG(0, (smb_krb5_locate_kdc: krb5_krbhst_init failed
(%s)\n, error_message(rc)));
- return rc;
- }
-
- for ( num_kdcs = 0; (rc = krb5_krbhst_next(ctx, hnd, hinfo) == 0);
num_kdcs++)
- ;
-
- krb5_krbhst_reset(ctx, hnd);
-
- if (!num_kdcs) {
- DEBUG(0, (smb_krb5_locate_kdc: zero kdcs found !\n));
- krb5_krbhst_free(ctx, hnd);
- return -1;
- }
-
- sa = SMB_MALLOC_ARRAY( struct sockaddr, num_kdcs );
- if (!sa) {
- DEBUG(0, (smb_krb5_locate_kdc: malloc failed\n));
- krb5_krbhst_free(ctx, hnd);
- naddrs = 0;
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5ec1273 s3-printing: Add new printers to registry.
from 2464a7b s3-libsmb: Remove obsolete smb_krb5_locate_kdc.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5ec12732c3092d248a374ae7af155a409c7ee88e
Author: Björn Baumbach b...@sernet.de
Date: Tue Feb 7 11:41:54 2012 +0100
s3-printing: Add new printers to registry.
This fixes bug #8554, #8612 and #8748.
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Thu Feb 9 16:39:04 CET 2012 on sn-devel-104
---
Summary of changes:
source3/include/nt_printing.h |4 +++
source3/printing/nt_printing.c | 19 +++-
source3/smbd/server_reload.c | 44 ++--
3 files changed, 54 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 4735c4e..08a2161 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -176,5 +176,9 @@ void nt_printer_remove(TALLOC_CTX *mem_ctx,
const struct auth_session_info *server_info,
struct messaging_context *msg_ctx,
const char *printer);
+void nt_printer_add(TALLOC_CTX *mem_ctx,
+ const struct auth_session_info *server_info,
+ struct messaging_context *msg_ctx,
+ const char *printer);
#endif /* NT_PRINTING_H_ */
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 7fc55c3..92aa320 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1845,7 +1845,22 @@ void nt_printer_remove(TALLOC_CTX *mem_ctx,
result = winreg_delete_printer_key_internal(mem_ctx, session_info,
msg_ctx,
printer, );
if (!W_ERROR_IS_OK(result)) {
- DEBUG(0, (nt_printer_remove: failed to remove printer %s,
- printer));
+ DEBUG(0, (nt_printer_remove: failed to remove printer %s:
+ %s\n, printer, win_errstr(result)));
+ }
+}
+
+void nt_printer_add(TALLOC_CTX *mem_ctx,
+ const struct auth_session_info *session_info,
+ struct messaging_context *msg_ctx,
+ const char *printer)
+{
+ WERROR result;
+
+ result = winreg_create_printer_internal(mem_ctx, session_info, msg_ctx,
+ printer);
+ if (!W_ERROR_IS_OK(result)) {
+ DEBUG(0, (nt_printer_add: failed to add printer %s: %s\n,
+ printer, win_errstr(result)));
}
}
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index f15f80e..6d4b876 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -50,14 +50,19 @@ void delete_and_reload_printers(struct tevent_context *ev,
{
struct auth_session_info *session_info = NULL;
struct spoolss_PrinterInfo2 *pinfo2 = NULL;
+ int n_services;
+ int pnum;
int snum;
- int n_services = lp_numservices();
- int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
+ const char *sname;
NTSTATUS status;
- bool skip = false;
- SMB_ASSERT(pcap_cache_loaded());
+ /* Get pcap printers updated */
+ load_printers(ev, msg_ctx);
+
+ n_services = lp_numservices();
+ pnum = lp_servicenumber(PRINTERS_NAME);
+
DEBUG(10, (reloading printer services from pcap cache\n));
status = make_session_info_system(talloc_tos(), session_info);
@@ -66,18 +71,29 @@ void delete_and_reload_printers(struct tevent_context *ev,
Could not create system session_info\n));
/* can't remove stale printers before we
* are fully initilized */
- skip = true;
+ return;
}
- /* remove stale printers */
- for (snum = 0; skip == false snum n_services; snum++) {
- /* avoid removing PRINTERS_NAME or non-autoloaded printers */
- if (snum == pnum || !(lp_snum_ok(snum) lp_print_ok(snum)
- lp_autoloaded(snum)))
+ /*
+* Add default config for printers added to smb.conf file and remove
+* stale printers
+*/
+ for (snum = 0; snum n_services; snum++) {
+ /* avoid removing PRINTERS_NAME */
+ if (snum == pnum) {
+ continue;
+ }
+
+ /* skip no-printer services */
+ if (!(lp_snum_ok(snum) lp_print_ok(snum))) {
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 744ed53 gensec: Fix a memory corruption in gensec_use_kerberos_mechs
from 5ec1273 s3-printing: Add new printers to registry.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 744ed53a62037a659133ccd4de2065491208ae7d
Author: Volker Lendecke v...@samba.org
Date: Thu Feb 9 16:07:12 2012 +0100
gensec: Fix a memory corruption in gensec_use_kerberos_mechs
Without this I get the following valgrind error:
==27740== Invalid write of size 8
==27740==at 0x62C53E: gensec_use_kerberos_mechs (gensec_start.c:112)
==27740==by 0x62C623: gensec_security_mechs (gensec_start.c:141)
==27740==by 0x62C777: gensec_security_by_oid (gensec_start.c:181)
==27740==by 0x62DD6E: gensec_start_mech_by_oid (gensec_start.c:735)
==27740==by 0x50D6FD: negprot_spnego (negprot.c:210)
==27740==by 0x5B0DEA: smbd_smb2_request_process_negprot
(smb2_negprot.c:209)
==27740==by 0x5AD036: smbd_smb2_request_dispatch (smb2_server.c:1417)
==27740==by 0x5AFB77: smbd_smb2_first_negprot (smb2_server.c:2643)
==27740==by 0x585C00: process_smb (process.c:1641)
==27740==by 0x587F78: smbd_server_connection_read_handler
(process.c:2314)
==27740==by 0x587FD6: smbd_server_connection_handler (process.c:2331)
==27740==by 0x99E05B: run_events_poll (events.c:286)
==27740==by 0x584AFF: smbd_server_connection_loop_once (process.c:984)
==27740==by 0x58B2D9: smbd_process (process.c:3389)
==27740==by 0xDE4CA8: smbd_accept_connection (server.c:469)
==27740==by 0x99E05B: run_events_poll (events.c:286)
==27740==by 0x99E2D5: s3_event_loop_once (events.c:349)
==27740==by 0x99F990: _tevent_loop_once (tevent.c:504)
==27740==by 0xDE5A9B: smbd_parent_loop (server.c:869)
==27740==by 0xDE6DD8: main (server.c:1413)
==27740== Address 0x9ff3538 is 4,232 bytes inside a block of size 8,288
alloc'd
==27740==at 0x4C261D7: malloc (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==27740==by 0x6926965: __talloc (talloc.c:560)
==27740==by 0x6926771: talloc_pool (talloc.c:598)
==27740==by 0x93B927: talloc_stackframe_internal (talloc_stack.c:145)
==27740==by 0x93B9D6: talloc_stackframe_pool (talloc_stack.c:171)
==27740==by 0x58B2B7: smbd_process (process.c:3385)
==27740==by 0xDE4CA8: smbd_accept_connection (server.c:469)
==27740==by 0x99E05B: run_events_poll (events.c:286)
==27740==by 0x99E2D5: s3_event_loop_once (events.c:349)
==27740==by 0x99F990: _tevent_loop_once (tevent.c:504)
==27740==by 0xDE5A9B: smbd_parent_loop (server.c:869)
==27740==by 0xDE6DD8: main (server.c:1413)
In the for-loop we can increment j twice, so we need twice as many output
array
elements as input array elements.
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Thu Feb 9 19:44:47 CET 2012 on sn-devel-104
---
Summary of changes:
auth/gensec/gensec_start.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 08b2fb6..ab092a7 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -75,7 +75,8 @@ _PUBLIC_ struct gensec_security_ops
**gensec_use_kerberos_mechs(TALLOC_CTX *mem_
/* noop */
}
- new_gensec_list = talloc_array(mem_ctx, struct gensec_security_ops *,
num_mechs_in + 1);
+ new_gensec_list = talloc_array(mem_ctx, struct gensec_security_ops *,
+ num_mechs_in*2 + 1);
if (!new_gensec_list) {
return NULL;
}
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-02-10-0020/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-10-0020/samba3.stderr http://git.samba.org/autobuild.flakey/2012-02-10-0020/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-10-0020/samba4.stderr http://git.samba.org/autobuild.flakey/2012-02-10-0020/samba4.stdout The top commit at the time of the failure was: commit 744ed53a62037a659133ccd4de2065491208ae7d Author: Volker Lendecke v...@samba.org Date: Thu Feb 9 16:07:12 2012 +0100 gensec: Fix a memory corruption in gensec_use_kerberos_mechs Without this I get the following valgrind error: ==27740== Invalid write of size 8 ==27740==at 0x62C53E: gensec_use_kerberos_mechs (gensec_start.c:112) ==27740==by 0x62C623: gensec_security_mechs (gensec_start.c:141) ==27740==by 0x62C777: gensec_security_by_oid (gensec_start.c:181) ==27740==by 0x62DD6E: gensec_start_mech_by_oid (gensec_start.c:735) ==27740==by 0x50D6FD: negprot_spnego (negprot.c:210) ==27740==by 0x5B0DEA: smbd_smb2_request_process_negprot (smb2_negprot.c:209) ==27740==by 0x5AD036: smbd_smb2_request_dispatch (smb2_server.c:1417) ==27740==by 0x5AFB77: smbd_smb2_first_negprot (smb2_server.c:2643) ==27740==by 0x585C00: process_smb (process.c:1641) ==27740==by 0x587F78: smbd_server_connection_read_handler (process.c:2314) ==27740==by 0x587FD6: smbd_server_connection_handler (process.c:2331) ==27740==by 0x99E05B: run_events_poll (events.c:286) ==27740==by 0x584AFF: smbd_server_connection_loop_once (process.c:984) ==27740==by 0x58B2D9: smbd_process (process.c:3389) ==27740==by 0xDE4CA8: smbd_accept_connection (server.c:469) ==27740==by 0x99E05B: run_events_poll (events.c:286) ==27740==by 0x99E2D5: s3_event_loop_once (events.c:349) ==27740==by 0x99F990: _tevent_loop_once (tevent.c:504) ==27740==by 0xDE5A9B: smbd_parent_loop (server.c:869) ==27740==by 0xDE6DD8: main (server.c:1413) ==27740== Address 0x9ff3538 is 4,232 bytes inside a block of size 8,288 alloc'd ==27740==at 0x4C261D7: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==27740==by 0x6926965: __talloc (talloc.c:560) ==27740==by 0x6926771: talloc_pool (talloc.c:598) ==27740==by 0x93B927: talloc_stackframe_internal (talloc_stack.c:145) ==27740==by 0x93B9D6: talloc_stackframe_pool (talloc_stack.c:171) ==27740==by 0x58B2B7: smbd_process (process.c:3385) ==27740==by 0xDE4CA8: smbd_accept_connection (server.c:469) ==27740==by 0x99E05B: run_events_poll (events.c:286) ==27740==by 0x99E2D5: s3_event_loop_once (events.c:349) ==27740==by 0x99F990: _tevent_loop_once (tevent.c:504) ==27740==by 0xDE5A9B: smbd_parent_loop (server.c:869) ==27740==by 0xDE6DD8: main (server.c:1413) In the for-loop we can increment j twice, so we need twice as many output array elements as input array elements. Autobuild-User: Volker Lendecke v...@samba.org Autobuild-Date: Thu Feb 9 19:44:47 CET 2012 on sn-devel-104
Re: [SCM] Samba Shared Repository - branch master updated
Hi Andreas, Björn, On 02/09/2012 04:40 PM, Andreas Schneider wrote: The branch, master has been updated via 5ec1273 s3-printing: Add new printers to registry. from 2464a7b s3-libsmb: Remove obsolete smb_krb5_locate_kdc. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5ec12732c3092d248a374ae7af155a409c7ee88e Author: Björn Baumbachb...@sernet.de Date: Tue Feb 7 11:41:54 2012 +0100 s3-printing: Add new printers to registry. This fixes bug #8554, #8612 and #8748. Pair-Programmed-With: Stefan Metzmacherme...@samba.org Autobuild-User: Andreas Schneidera...@cryptomilk.org Autobuild-Date: Thu Feb 9 16:39:04 CET 2012 on sn-devel-104 After this change (or perhaps an earlier one?) I'm unable to push changes to autobuild. The last two builds fail with: [275/1226 in 17m41s] samba3.posix_s3.rpc.spoolss.printer (s3dc) Testing DsSpooler- SetPrinter relations Testing GetPrinter level 2 Testing SetPrinter level 2 Testing GetPrinterDataEx(DsSpooler - description) Testing SetPrinter level 2 Testing GetPrinterDataEx(DsSpooler - location) Testing GetPrinter level 2 Testing GetPrinterDataEx(DsSpooler - description) Testing GetPrinterDataEx(DsSpooler - driverName) WARNING!: ../source4/torture/rpc/spoolss.c:3648: r.out.result was WERR_BADFILE, expected WERR_OK: GetPrinterDataEx(DsSpooler - driverName) failed WARNING!: ../source4/torture/rpc/spoolss.c:5509: Expression `test_GetPrinterDataEx(tctx, p, handle, DsSpooler, driverName,type,data,needed)' failed: failed to query UNEXPECTED(failure): samba3.posix_s3.rpc.spoolss.printer .addprinterex.printerdata_dsspooler REASON: _StringException: _StringException: ../source4/torture/rpc/spoolss.c:7879: Expression `test_PrinterData_DsSpooler(tctx, p,t-handle, t-info2.printername)' failed: failed to test printer data winreg dsspooler FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites) A summary with detailed information can be found in: ./bin/ab/summary test: running (/usr/bin/perl /memdisk/autobuild/flakey/b12981/samba4/selftest/selftest.pl --target=samba --prefix=./bin/ab --srcdir=/memdisk/autobuild/flakey/b12981/samba4 --exclude=/memdisk/autobuild/flakey/b12981/samba4/selftest/skip --testlist=/usr/bin/python /memdisk/autobuild/flakey/b12981/samba4/source3/selftest/tests.py| --testlist=/usr/bin/python /memdisk/autobuild/flakey/b12981/samba4/source4/selftest/tests.py| --binary-mapping=nmblookup3:nmblookup3,smbclient3:smbclient3,smbtorture4:smbtorture,ntlm_auth3:ntlm_auth3 --exclude=/memdisk/autobuild/flakey/b12981/samba4/selftest/slow --socket-wrapper touch ./bin/ab/st_done) | /usr/bin/python -u /memdisk/autobuild/flakey/b12981/samba4/selftest/filter-subunit --expected-failures=/memdisk/autobuild/flakey/b12981/samba4/selftest/knownfail --flapping=/memdisk/autobuild/flakey/b12981/samba4/selftest/flapping --fail-immediately | tee ./bin/ab/subunit | /usr/bin/python -u /memdisk/autobuild/flakey/b12981/samba4/selftest/format-subunit --prefix=./bin/ab --immediate Cheers, Jelmer
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 209d3c0 tests/source: Add wafsamba/ files to list of Python files
to check.
via 88a041a wafsamba: Expand tabs.
from 744ed53 gensec: Fix a memory corruption in gensec_use_kerberos_mechs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 209d3c0b7187f2c4e6be5a972206094cdf70224f
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Feb 9 13:12:06 2012 +0100
tests/source: Add wafsamba/ files to list of Python files to check.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Fri Feb 10 01:45:16 CET 2012 on sn-devel-104
commit 88a041aa21c520fef46fae5a7db8958d4202cc8f
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Feb 9 13:08:31 2012 +0100
wafsamba: Expand tabs.
---
Summary of changes:
buildtools/wafsamba/gccdeps.py | 182 ++--
buildtools/wafsamba/generic_cc.py | 68 +++---
buildtools/wafsamba/irixcc.py | 96 +++---
buildtools/wafsamba/nothreads.py | 362
buildtools/wafsamba/samba3.py | 18 +-
buildtools/wafsamba/samba_conftests.py |2 +-
buildtools/wafsamba/samba_optimisation.py | 156 +-
buildtools/wafsamba/samba_pidl.py |4 +-
buildtools/wafsamba/samba_wildcard.py | 210 +++---
buildtools/wafsamba/tru64cc.py | 96 +++---
source4/scripting/python/samba/tests/source.py | 18 +-
11 files changed, 613 insertions(+), 599 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/gccdeps.py b/buildtools/wafsamba/gccdeps.py
index 6600c9c..2f09083 100644
--- a/buildtools/wafsamba/gccdeps.py
+++ b/buildtools/wafsamba/gccdeps.py
@@ -18,111 +18,111 @@ preprocessor_flag = '-MD'
@feature('cc')
@before('apply_core')
def add_mmd_cc(self):
- if self.env.get_flat('CCFLAGS').find(preprocessor_flag) 0:
- self.env.append_value('CCFLAGS', preprocessor_flag)
+if self.env.get_flat('CCFLAGS').find(preprocessor_flag) 0:
+self.env.append_value('CCFLAGS', preprocessor_flag)
@feature('cxx')
@before('apply_core')
def add_mmd_cxx(self):
- if self.env.get_flat('CXXFLAGS').find(preprocessor_flag) 0:
- self.env.append_value('CXXFLAGS', preprocessor_flag)
+if self.env.get_flat('CXXFLAGS').find(preprocessor_flag) 0:
+self.env.append_value('CXXFLAGS', preprocessor_flag)
def scan(self):
- the scanner does not do anything initially
- nodes = self.generator.bld.node_deps.get(self.unique_id(), [])
- names = []
- return (nodes, names)
+the scanner does not do anything initially
+nodes = self.generator.bld.node_deps.get(self.unique_id(), [])
+names = []
+return (nodes, names)
re_o = re.compile(\.o$)
re_src = re.compile(^(\.\.)[\\/](.*)$)
def post_run(self):
- # The following code is executed by threads, it is not safe, so a lock
is needed...
-
- if getattr(self, 'cached', None):
- return Task.Task.post_run(self)
-
- name = self.outputs[0].abspath(self.env)
- name = re_o.sub('.d', name)
- txt = Utils.readf(name)
- #os.unlink(name)
-
- txt = txt.replace('\\\n', '')
-
- lst = txt.strip().split(':')
- val = :.join(lst[1:])
- val = val.split()
-
- nodes = []
- bld = self.generator.bld
-
- f = re.compile(^(+self.env.variant()+|\.\.)[\\/](.*)$)
- for x in val:
- if os.path.isabs(x):
-
- if not preproc.go_absolute:
- continue
-
- lock.acquire()
- try:
- node = bld.root.find_resource(x)
- finally:
- lock.release()
- else:
- g = re.search(re_src, x)
- if g:
- x = g.group(2)
- lock.acquire()
- try:
- node =
bld.bldnode.parent.find_resource(x)
- finally:
- lock.release()
- else:
- g = re.search(f, x)
- if g:
- x = g.group(2)
- lock.acquire()
- try:
- node =
bld.srcnode.find_resource(x)
- finally:
- lock.release()
-
- if id(node) == id(self.inputs[0]):
- # ignore the
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-02-10-0225/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-10-0225/samba3.stderr http://git.samba.org/autobuild.flakey/2012-02-10-0225/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-10-0225/samba4.stderr http://git.samba.org/autobuild.flakey/2012-02-10-0225/samba4.stdout The top commit at the time of the failure was: commit 209d3c0b7187f2c4e6be5a972206094cdf70224f Author: Jelmer Vernooij jel...@samba.org Date: Thu Feb 9 13:12:06 2012 +0100 tests/source: Add wafsamba/ files to list of Python files to check. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Fri Feb 10 01:45:16 CET 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a056238 s4-nbt_server: remove unused winsdb_get_seqnumber() via 5c2a213 s3-libsmb: Remove unused kerberos_set_creds_enctype() via 292974e s3-libsmb: Remove unused kerberos_compatible_enctypes via 474fbfb s3-lib: Remove unused is_myworkgroup() via 4512353 s3-charcnv: Remove unused rpcstr_push() via a7835f4 s3-libsmb: Remove unused smb_krb5_mk_error() via 3d63100 s3-param: Remove unused share_defined() via a74e556 s4-lib/samba3: Remove unused smbpasswd_decode_acb_info() via efc210d lib/util: Remove unused str_format_nbt_domain() via fc5a214 charset: Remove unused strcmp_w() via ac57def s4-lib/tls: remove unused tls_support() via abc90d8 s4-cmdline: Remove unused popt_common_dont_ask() via 40bf23d s3-lib: Remove unused pid_path() via 7824fd5 s3-registry: Remove unused prs_uint8() via 3b88c1e s3-charcnv: Remove unused pull_string_fn via 983d205 charset: Remove unused iconv_talloc() via 88298f9 build: Add --enable-coverage option to build with gcov support via 45e681d heimdal: Re-run lexyacc.sh to remove #line statements via 11c5301 heimdal_build: omit #line statments via c38ba53 heimdal: Re-run lexyacc.sh via 292b863 credentials: Show returned error_string in debug message from 209d3c0 tests/source: Add wafsamba/ files to list of Python files to check. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a056238bcd67ca611a4856c73e1e947c184ac7f5 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 11:25:58 2012 +1100 s4-nbt_server: remove unused winsdb_get_seqnumber() Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Fri Feb 10 08:21:41 CET 2012 on sn-devel-104 commit 5c2a2135c92388659cf5b3d151272671cc2c5383 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 15:37:50 2012 +1100 s3-libsmb: Remove unused kerberos_set_creds_enctype() Also remove the unused configure tests for krb5_c_enctype_compare. Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit 292974ed0ca768ff1cffb85313a923e7d4bcf549 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 15:34:45 2012 +1100 s3-libsmb: Remove unused kerberos_compatible_enctypes Also remove the unused configure tests for krb5_c_enctype_compare. Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit 474fbfb7b712fe6be61505ca1796d0a3442a618a Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 15:20:24 2012 +1100 s3-lib: Remove unused is_myworkgroup() Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit 45123530e52d9d096d5a01f02ba4672bd75b9305 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 13:40:52 2012 +1100 s3-charcnv: Remove unused rpcstr_push() Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit a7835f473694dd7ff0ad7679e86fd4b2de7e23ce Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 13:29:06 2012 +1100 s3-libsmb: Remove unused smb_krb5_mk_error() Also remove now-unused configure checks for krb5_mk_error(). Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit 3d63100890371b25a873afe0fd240d6069e274dc Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 13:24:46 2012 +1100 s3-param: Remove unused share_defined() Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit a74e556a7c2446a25f796a76043d7cdf2d8745b3 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 13:22:37 2012 +1100 s4-lib/samba3: Remove unused smbpasswd_decode_acb_info() Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit efc210d5208a2da1fc33c7ebd745bf806dd26f62 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 12:49:45 2012 +1100 lib/util: Remove unused str_format_nbt_domain() Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit fc5a214d71ac46d031098afb3b8ccf2de472ef94 Author: Andrew Bartlett abart...@samba.org Date: Thu Feb 9 12:46:38 2012 +1100 charset: Remove unused strcmp_w() Found by callcatcher. Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett commit ac57defdb4171c5b8266083f18ce89fecf0a4032 Author: Andrew Bartlett
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-02-10-0824/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-10-0824/samba3.stderr http://git.samba.org/autobuild.flakey/2012-02-10-0824/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-02-10-0824/samba4.stderr http://git.samba.org/autobuild.flakey/2012-02-10-0824/samba4.stdout The top commit at the time of the failure was: commit 209d3c0b7187f2c4e6be5a972206094cdf70224f Author: Jelmer Vernooij jel...@samba.org Date: Thu Feb 9 13:12:06 2012 +0100 tests/source: Add wafsamba/ files to list of Python files to check. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Fri Feb 10 01:45:16 CET 2012 on sn-devel-104
