[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via a2d6884 BUG 9574: Fix a possible null pointer dereference in spoolss. via 43810c8 s3-rpc_server: Fix a possible null pointer dereference. from cd9c1a0 samr: Make use of posix_openpt http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit a2d68842ea33733fa7900831ed10e73f820afcf7 Author: Andreas Schneider a...@samba.org Date: Fri Jan 18 18:04:17 2013 +0100 BUG 9574: Fix a possible null pointer dereference in spoolss. If the the client enumerates the printers and didn't specify a servername we have a null pointer dereference, so the process serving the connection crashes. Reviewed-by: David Disseldorp dd...@samba.org Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Mon Jan 21 13:30:11 CET 2013 on sn-devel-104 (cherry picked from commit c38fb0b106b62e42a5b75b1c78386bb8912c7d7e) commit 43810c80936c8f509cc2adba6193dd4c55325875 Author: Andreas Schneider a...@samba.org Date: Mon Dec 17 15:31:21 2012 +0100 s3-rpc_server: Fix a possible null pointer dereference. This variable can be set to NULL in an earlier function call. Found by Coverity. Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Günther Deschner g...@samba.org (cherry picked from commit 72e02c73b64f1ff56b2d53ec63d68486a4f1ff90) --- Summary of changes: source3/rpc_server/spoolss/srv_spoolss_nt.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index b5949e4..a5579c2 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -4442,7 +4442,8 @@ static WERROR enum_all_printers_info_1_name(TALLOC_CTX *mem_ctx, DEBUG(4,(enum_all_printers_info_1_name\n)); - if ((servername[0] == '\\') (servername[1] == '\\')) { + if (servername != NULL + (servername[0] == '\\') (servername[1] == '\\')) { s = servername + 2; } @@ -4477,7 +4478,8 @@ static WERROR enum_all_printers_info_1_network(TALLOC_CTX *mem_ctx, listed. Windows responds to this call with a WERR_CAN_NOT_COMPLETE so we should do the same. */ - if (servername[0] == '\\' servername[1] == '\\') { + if (servername != NULL + (servername[0] == '\\') (servername[1] == '\\')) { s = servername + 2; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 069f102 BUG 9378: Add extra attributes for AD printer publishing. via 31d61ad printing: Remove invalid free from error path. from a2d6884 BUG 9574: Fix a possible null pointer dereference in spoolss. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 069f1029a76c9b9c0a48ac7cb3d2c5f45c3a231c Author: David Disseldorp dd...@samba.org Date: Thu Jan 17 13:21:25 2013 +0100 BUG 9378: Add extra attributes for AD printer publishing. Currently attempting to publish a printer in AD fails with Object class violation, due to a number of missing attributes in the LDAP request. Reviewed-by: Andreas Schneider a...@samba.org commit 31d61ad8f9c850c302c83a65af8474545723ea1c Author: David Disseldorp dd...@samba.org Date: Fri Jan 18 11:48:20 2013 +0100 printing: Remove invalid free from error path. Reviewed-by: Andreas Schneider a...@samba.org --- Summary of changes: source3/printing/nt_printing_ads.c | 87 +++- 1 files changed, 85 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c index 67046bc..5a0cd24 100644 --- a/source3/printing/nt_printing_ads.c +++ b/source3/printing/nt_printing_ads.c @@ -87,6 +87,86 @@ done: talloc_free(tmp_ctx); } +static WERROR nt_printer_info_to_mods(TALLOC_CTX *ctx, + struct spoolss_PrinterInfo2 *info2, + ADS_MODLIST *mods) +{ + char *info_str; + + ads_mod_str(ctx, mods, SPOOL_REG_PRINTERNAME, info2-sharename); + ads_mod_str(ctx, mods, SPOOL_REG_SHORTSERVERNAME, global_myname()); + ads_mod_str(ctx, mods, SPOOL_REG_SERVERNAME, get_mydnsfullname()); + + info_str = talloc_asprintf(ctx, %s\\%s, + get_mydnsfullname(), info2-sharename); + if (info_str == NULL) { + return WERR_NOMEM; + } + ads_mod_str(ctx, mods, SPOOL_REG_UNCNAME, info_str); + + info_str = talloc_asprintf(ctx, %d, 4); + if (info_str == NULL) { + return WERR_NOMEM; + } + ads_mod_str(ctx, mods, SPOOL_REG_VERSIONNUMBER, info_str); + + /* empty strings in the mods list result in an attrubute error */ + if (strlen(info2-drivername) != 0) + ads_mod_str(ctx, mods, SPOOL_REG_DRIVERNAME, info2-drivername); + if (strlen(info2-location) != 0) + ads_mod_str(ctx, mods, SPOOL_REG_LOCATION, info2-location); + if (strlen(info2-comment) != 0) + ads_mod_str(ctx, mods, SPOOL_REG_DESCRIPTION, info2-comment); + if (strlen(info2-portname) != 0) + ads_mod_str(ctx, mods, SPOOL_REG_PORTNAME, info2-portname); + if (strlen(info2-sepfile) != 0) + ads_mod_str(ctx, mods, SPOOL_REG_PRINTSEPARATORFILE, info2-sepfile); + + info_str = talloc_asprintf(ctx, %u, info2-starttime); + if (info_str == NULL) { + return WERR_NOMEM; + } + ads_mod_str(ctx, mods, SPOOL_REG_PRINTSTARTTIME, info_str); + + info_str = talloc_asprintf(ctx, %u, info2-untiltime); + if (info_str == NULL) { + return WERR_NOMEM; + } + ads_mod_str(ctx, mods, SPOOL_REG_PRINTENDTIME, info_str); + + info_str = talloc_asprintf(ctx, %u, info2-priority); + if (info_str == NULL) { + return WERR_NOMEM; + } + ads_mod_str(ctx, mods, SPOOL_REG_PRIORITY, info_str); + + if (info2-attributes PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS) { + ads_mod_str(ctx, mods, SPOOL_REG_PRINTKEEPPRINTEDJOBS, TRUE); + } else { + ads_mod_str(ctx, mods, SPOOL_REG_PRINTKEEPPRINTEDJOBS, FALSE); + } + + switch (info2-attributes 0x3) { + case 0: + ads_mod_str(ctx, mods, SPOOL_REG_PRINTSPOOLING, + SPOOL_REGVAL_PRINTWHILESPOOLING); + break; + case 1: + ads_mod_str(ctx, mods, SPOOL_REG_PRINTSPOOLING, + SPOOL_REGVAL_PRINTAFTERSPOOLED); + break; + case 2: + ads_mod_str(ctx, mods, SPOOL_REG_PRINTSPOOLING, + SPOOL_REGVAL_PRINTDIRECT); + break; + default: + DEBUG(3, (unsupported printer attributes %x\n, + info2-attributes)); + } + + return WERR_OK; +} + static WERROR nt_printer_publish_ads(struct messaging_context *msg_ctx, ADS_STRUCT *ads, struct spoolss_PrinterInfo2 *pinfo2) @@ -167,12 +247,15 @@ static WERROR nt_printer_publish_ads(struct messaging_context *msg_ctx,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 9aca528 Tests: Fix the display of test vars in screen --testenv via b1e2313 libcli-acl: add documentation via 65396ad drsuapi: Add documentation via d7bbd18 drepl-notify: change misleading message from 0a4a4ba devel-script: add options for RODC and partial replica for replicate flags http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9aca52877a3f6f59887098ebb8e664922c8c7aad Author: Matthieu Patou m...@matws.net Date: Thu Jan 3 14:33:45 2013 -0800 Tests: Fix the display of test vars in screen --testenv The form bash -c echo important stuff blabla bla LD_LIBARY_PATH bash is not working in screen when it's working in xterm and the in_screen script already wrap all the command within a bash shell so there is no need to re-force bash as the echo will execute in a bash shell Signed-off-by: Matthieu Patou m...@matws.net Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Tue Jan 22 13:03:52 CET 2013 on sn-devel-104 commit b1e231384a9245a191ef5e004544d7cafe17e036 Author: Matthieu Patou m...@matws.net Date: Sun Oct 14 01:01:08 2012 -0700 libcli-acl: add documentation Reviewed-by: Andrew Bartlett abart...@samba.org commit 65396adaad18821568f727a223c38c36a2b16291 Author: Matthieu Patou m...@matws.net Date: Sun Oct 14 01:04:51 2012 -0700 drsuapi: Add documentation Reviewed-by: Andrew Bartlett abart...@samba.org commit d7bbd182b33441a0a4e91c00a31de29b2b09f59a Author: Matthieu Patou m...@matws.net Date: Mon Oct 15 22:15:17 2012 -0700 drepl-notify: change misleading message Reviewed-by: Andrew Bartlett abart...@samba.org --- Summary of changes: libcli/security/access_check.c | 20 +++- selftest/selftest.pl| 15 --- source4/dsdb/repl/drepl_notify.c|2 +- source4/rpc_server/drsuapi/updaterefs.c | 21 ++--- 4 files changed, 46 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c index f0a7b66..936ffca 100644 --- a/libcli/security/access_check.c +++ b/libcli/security/access_check.c @@ -374,7 +374,25 @@ static const struct GUID *get_ace_object_type(struct security_ace *ace) return NULL; } -/* modified access check for the purposes of DS security +/** + * @brief Perform directoryservice (DS) related access checks for a given user + * + * Perform DS access checks for the user represented by its security_token, on + * the provided security descriptor. If an tree associating GUID and access + * required is provided then object access (OA) are checked as well. * + * @param[in] sd The security descritor against which the required + * access are requested + * + * @param[in] token The security_token associated with the user to + * test + * + * @param[in] access_desired A bitfield of rights that must be granted for the + * given user in the specified SD. + * + * If one + * of the entry in the tree grants all the requested rights for the given GUID + * FIXME + * tree can be null if not null it's the * Lots of code duplication, it will ve united in just one * function eventually */ diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 4ac5aeb..639c8a2 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -849,13 +849,7 @@ if ($opt_testenv) { my $envvarstr = exported_envvars_str($testenv_vars); - my @term = (); - if ($ENV{TERMINAL}) { - @term = ($ENV{TERMINAL}); - } else { - @term = (xterm, -e); - } - my @term_args = (bash, -c, echo -e \ + my @term_args = (echo -e \ Welcome to the Samba4 Test environment '$testenv_name' This matches the client environment used in make test @@ -867,6 +861,13 @@ SMB_CONF_PATH=\$SMB_CONF_PATH $envvarstr \ LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash); + my @term = (); + if ($ENV{TERMINAL}) { + @term = ($ENV{TERMINAL}); + } else { + @term = (xterm, -e); + unshift(@term_args, (bash, -c)); + } system(@term, @term_args); diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c index cd248d5..905fe5f 100644 --- a/source4/dsdb/repl/drepl_notify.c +++ b/source4/dsdb/repl/drepl_notify.c @@ -195,7 +195,7 @@ static void dreplsrv_notify_op_callback(struct tevent_req *subreq) ldb_dn_get_linearized(op-source_dsa-partition-dn), nt_errstr(status),
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d56b456 s3-winbind: fix the build of idmap_ldap. from 9aca528 Tests: Fix the display of test vars in screen --testenv http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d56b4560b585c613b65b05a9224c9e11f5038318 Author: Günther Deschner g...@samba.org Date: Tue Jan 22 11:54:19 2013 +0100 s3-winbind: fix the build of idmap_ldap. Guenther Signed-off-by: Günther Deschner g...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Günther Deschner g...@samba.org Autobuild-Date(master): Tue Jan 22 14:43:40 CET 2013 on sn-devel-104 --- Summary of changes: source3/winbindd/wscript_build |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index 0d826f0..7e80727 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -65,7 +65,8 @@ bld.SAMBA3_MODULE('idmap_ldap', deps='smbldap smbldaphelper pdb', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.CONFIG_SET(HAVE_LDAP)) + enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.CONFIG_SET(HAVE_LDAP), + allow_undefined_symbols=True) bld.SAMBA3_MODULE('idmap_nss', subsystem='idmap', -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 988350c libcli/auth: fix void function cannot return value error from d56b456 s3-winbind: fix the build of idmap_ldap. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 988350ccefbe8f22eb1814e071386ef2dfe6d6dd Author: Andrew Bartlett abart...@samba.org Date: Mon Jan 21 10:45:10 2013 +1100 libcli/auth: fix void function cannot return value error Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Tue Jan 22 22:32:31 CET 2013 on sn-devel-104 --- Summary of changes: libcli/auth/credentials.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c index 9d3df9f..2f14374 100644 --- a/libcli/auth/credentials.c +++ b/libcli/auth/credentials.c @@ -583,7 +583,7 @@ void netlogon_creds_decrypt_samlogon_validation(struct netlogon_creds_Credential uint16_t validation_level, union netr_Validation *validation) { - return netlogon_creds_crypt_samlogon_validation(creds, validation_level, + netlogon_creds_crypt_samlogon_validation(creds, validation_level, validation, false); } @@ -591,7 +591,7 @@ void netlogon_creds_encrypt_samlogon_validation(struct netlogon_creds_Credential uint16_t validation_level, union netr_Validation *validation) { - return netlogon_creds_crypt_samlogon_validation(creds, validation_level, + netlogon_creds_crypt_samlogon_validation(creds, validation_level, validation, true); } -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-8-gb054193
The branch, master has been updated via b054193d1d19a8eef998fa690899501f79badb8a (commit) via 109f428aa34f8f4cc0329880d2f4a5593a6cc6f3 (commit) via 258092aaf6b7a9bdc14f0fb35e8bd7f7dc742b3f (commit) via d202b2fdd4fd70172e5e44583627b57a1b7ad2ed (commit) via 3c6a9b73364c9543366fa033c778145dc7a152a9 (commit) via 95fc493a7d4145f976cb3fe928d9e92faec4dd71 (commit) via 506ecd186759675a1cf50a0a05a285fee03fc51e (commit) from 0e651e9da0f1f3c836b4474612ab13d0ccd272d9 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit b054193d1d19a8eef998fa690899501f79badb8a Author: Mathieu Parent math.par...@gmail.com Date: Mon Jan 14 17:48:01 2013 +0100 common: Don't lie on unimplemented gratuitous arp Signed-off-by: Mathieu Parent math.par...@gmail.com commit 109f428aa34f8f4cc0329880d2f4a5593a6cc6f3 Author: Mathieu Parent math.par...@gmail.com Date: Mon Jan 14 17:21:01 2013 +0100 tests: Test portability Curiously test_ctdb_sys_check_iface_exists fails on Linux Signed-off-by: Mathieu Parent math.par...@gmail.com commit 258092aaf6b7a9bdc14f0fb35e8bd7f7dc742b3f Author: Mathieu Parent math.par...@gmail.com Date: Mon Jan 14 12:13:24 2013 +0100 common: FreeBSD+kFreeBSD: Implement get_process_name (same as in Linux) Signed-off-by: Mathieu Parent math.par...@gmail.com commit d202b2fdd4fd70172e5e44583627b57a1b7ad2ed Author: Mathieu Parent math.par...@gmail.com Date: Mon Jan 14 11:23:46 2013 +0100 common: Detailed platform-specific FIXME Signed-off-by: Mathieu Parent math.par...@gmail.com commit 3c6a9b73364c9543366fa033c778145dc7a152a9 Author: Mathieu Parent math.par...@gmail.com Date: Sun Jan 13 14:15:20 2013 +0100 build: Update config.guess 2012-12-30 and config.sub to 2013-01-11 Signed-off-by: Mathieu Parent math.par...@gmail.com commit 95fc493a7d4145f976cb3fe928d9e92faec4dd71 Author: Mathieu Parent math.par...@gmail.com Date: Sat Jan 12 16:43:03 2013 +0100 doc: allows to - allows one to Signed-off-by: Mathieu Parent math.par...@gmail.com commit 506ecd186759675a1cf50a0a05a285fee03fc51e Author: Mathieu Parent math.par...@gmail.com Date: Sat Jan 12 15:14:48 2013 +0100 build: Add missing LDFLAGS Original Author: Simon Ruderich si...@ruderich.org Signed-off-by: Mathieu Parent math.par...@gmail.com --- Summary of changes: Makefile.in|9 +- common/system_aix.c| 11 +- common/system_freebsd.c| 27 ++- common/system_gnu.c| 13 +- common/system_kfreebsd.c | 28 ++- config.guess | 426 config.sub | 274 +- config/ctdb.sysconfig |2 +- doc/ctdbd.1.xml|2 +- tests/src/ctdb_porting_tests.c | 305 10 files changed, 768 insertions(+), 329 deletions(-) mode change 100755 = 100644 config.guess mode change 100755 = 100644 config.sub create mode 100644 tests/src/ctdb_porting_tests.c Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index fef2e45..e704d63 100755 --- a/Makefile.in +++ b/Makefile.in @@ -104,6 +104,7 @@ TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \ tests/bin/ctdb_takeover_tests tests/bin/ctdb_update_record \ tests/bin/ctdb_update_record_persistent \ tests/bin/ctdb_tool_libctdb tests/bin/ctdb_tool_stubby \ + tests/bin/ctdb_porting_tests \ @INFINIBAND_BINS@ BINS = bin/ctdb @CTDB_SCSI_IO@ bin/smnotify bin/ping_pong bin/ltdbtool @CTDB_PMDA@ @@ -173,7 +174,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) @echo Linking $@ - @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) + @$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS) bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ) @echo Linking $@ @@ -195,7 +196,7 @@ utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify bin/ping_pong: utils/ping_pong/ping_pong.o @echo Linking $@ - @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o + @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS) bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o @echo Linking $@ @@ -257,6 +258,10 @@ tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) +tests/bin/ctdb_porting_tests: $(CTDB_CLIENT_OBJ) tests/src/ctdb_porting_tests.o + @echo Linking $@ + $(CC)
[SCM] CTDB repository - branch master updated - ctdb-2.1-9-g124e2a4
The branch, master has been updated via 124e2a471aeda9c900fd898178a30522d7d74221 (commit) from b054193d1d19a8eef998fa690899501f79badb8a (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 124e2a471aeda9c900fd898178a30522d7d74221 Author: Amitay Isaacs ami...@gmail.com Date: Wed Jan 23 14:35:47 2013 +1100 recoverd: Fix printing of node flags from local information Signed-off-by: Amitay Isaacs ami...@gmail.com --- Summary of changes: server/ctdb_recoverd.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c index 0f8aa91..bffe2be 100644 --- a/server/ctdb_recoverd.c +++ b/server/ctdb_recoverd.c @@ -3699,7 +3699,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, nodemap-nodes[j].pnn, nodemap-nodes[i].pnn, remote_nodemaps[j]-nodes[i].flags, - nodemap-nodes[j].flags)); + nodemap-nodes[i].flags)); if (i == j) { DEBUG(DEBUG_ERR,(Use flags 0x%02x from remote node %d for cluster update of its own flags\n, remote_nodemaps[j]-nodes[i].flags, j)); update_flags_on_all_nodes(ctdb, nodemap, nodemap-nodes[i].pnn, remote_nodemaps[j]-nodes[i].flags); -- CTDB repository