]> granicus.if.org Git - pdns/log
pdns
12 years agosimple tests for ComboAddress
bert hubert [Tue, 7 May 2013 10:31:09 +0000 (12:31 +0200)]
simple tests for ComboAddress

12 years agoMerge pull request #770 from ahupowerdns/master
Peter van Dijk [Tue, 7 May 2013 10:05:52 +0000 (03:05 -0700)]
Merge pull request #770 from ahupowerdns/master

Base64Encode test against openssl, tweak .gitignore

12 years agoadd testrunner to .gitignore, plus ahu's "joe" habit~
bert hubert [Tue, 7 May 2013 10:02:14 +0000 (12:02 +0200)]
add testrunner to .gitignore, plus ahu's "joe" habit~
implement validation of Base64Encode against openssl output

12 years agoadd very basic base64 tests
bert hubert [Tue, 7 May 2013 09:45:09 +0000 (11:45 +0200)]
add very basic base64 tests

12 years agoMerge branch 'master' of github.com:PowerDNS/pdns
Peter van Dijk [Tue, 7 May 2013 09:15:39 +0000 (11:15 +0200)]
Merge branch 'master' of github.com:PowerDNS/pdns

12 years agoupdate tinydns data
Peter van Dijk [Tue, 7 May 2013 09:06:41 +0000 (11:06 +0200)]
update tinydns data

12 years agoMerge pull request #755 from mind04/inception
Peter van Dijk [Tue, 7 May 2013 08:58:17 +0000 (01:58 -0700)]
Merge pull request #755 from mind04/inception

revert d90efbf and add 7 days margin to inception

12 years agofix missing NSEC3 for secure delegation, thanks @mind04, closes #682
Peter van Dijk [Tue, 7 May 2013 08:53:11 +0000 (10:53 +0200)]
fix missing NSEC3 for secure delegation, thanks @mind04, closes #682

12 years agonit
Peter van Dijk [Tue, 7 May 2013 08:13:02 +0000 (10:13 +0200)]
nit

12 years agoset testsdir for nobackend/global tests so jenkins sees diffs
Peter van Dijk [Tue, 7 May 2013 07:45:59 +0000 (09:45 +0200)]
set testsdir for nobackend/global tests so jenkins sees diffs

12 years agowow we had a bunch of .cvsignores around still - spotted by ch
bert hubert [Mon, 6 May 2013 21:56:16 +0000 (23:56 +0200)]
wow we had a bunch of .cvsignores around still - spotted by ch

12 years agoBe explicit about versions
Christian Hofstaedtler [Mon, 6 May 2013 18:42:38 +0000 (20:42 +0200)]
Be explicit about versions

12 years agoadd 5 more simple unit tests
bert hubert [Mon, 6 May 2013 21:04:12 +0000 (23:04 +0200)]
add 5 more simple unit tests

12 years agoturns out that our unit tests test 127.0.0.2 which is different on our CI-server...
bert hubert [Mon, 6 May 2013 19:30:57 +0000 (21:30 +0200)]
turns out that our unit tests test 127.0.0.2 which is different on our CI-server than locally here.

12 years agoand link in polarssl for the regression tests too - oddly we didn't need it locally...
bert hubert [Mon, 6 May 2013 19:15:40 +0000 (21:15 +0200)]
and link in polarssl for the regression tests too - oddly we didn't need it locally, but autotest does

12 years agounittest now links in 75% of PowerDNS, plus actuall tests for AddressIsUs now.
bert hubert [Mon, 6 May 2013 19:06:58 +0000 (21:06 +0200)]
unittest now links in 75% of PowerDNS, plus actuall tests for AddressIsUs now.

12 years agoAddressIsUs did fail for IPv6, as Sten Spans had predicted, but failed differently ;-)
bert hubert [Mon, 6 May 2013 19:06:31 +0000 (21:06 +0200)]
AddressIsUs did fail for IPv6, as Sten Spans had predicted, but failed differently ;-)

12 years agoour regression test caught that we did not add prevent-self-notification to pdns...
bert hubert [Mon, 6 May 2013 18:27:10 +0000 (20:27 +0200)]
our regression test caught that we did not add prevent-self-notification to pdns.conf-dist.
out regression tests.. are the good stuff.

12 years agoMerge pull request #766 from justinclift/update_configure
bert hubert [Mon, 6 May 2013 17:22:37 +0000 (10:22 -0700)]
Merge pull request #766 from justinclift/update_configure

Update bootstrap configure pieces

12 years agoMerge pull request #767 from mind04/travis
Peter van Dijk [Mon, 6 May 2013 07:42:21 +0000 (00:42 -0700)]
Merge pull request #767 from mind04/travis

move make from runtest to start-test-stop

12 years agogitignore for sqlite3 presigned files
Peter van Dijk [Mon, 6 May 2013 07:07:28 +0000 (09:07 +0200)]
gitignore for sqlite3 presigned files

12 years agoMerge branch 'master' of github.com:PowerDNS/pdns
Peter van Dijk [Mon, 6 May 2013 07:06:46 +0000 (09:06 +0200)]
Merge branch 'master' of github.com:PowerDNS/pdns

12 years agonote gsqlite3 presigned in start-test-stop help output
Peter van Dijk [Mon, 6 May 2013 07:06:32 +0000 (09:06 +0200)]
note gsqlite3 presigned in start-test-stop help output

12 years agoMerge pull request #764 from mind04/dbloglevel
Peter van Dijk [Mon, 6 May 2013 07:04:38 +0000 (00:04 -0700)]
Merge pull request #764 from mind04/dbloglevel

reduce log level of successful gpgsql/gsqlite3 connection to Info (like gmysql)

12 years agoMerge pull request #765 from justinclift/update_readme
Peter van Dijk [Mon, 6 May 2013 07:04:01 +0000 (00:04 -0700)]
Merge pull request #765 from justinclift/update_readme

Update README, now in markdown format.  Add OSX.

12 years agoafter a decade+.. finally try to stop notifying ourselves. In convoluted
bert hubert [Sun, 5 May 2013 19:22:03 +0000 (21:22 +0200)]
after a decade+.. finally try to stop notifying ourselves. In convoluted
cases involving REUSE_PORT and binding to 0.0.0.0 and ::, it might be
possible that we guess wrong, in which case we now provide & document
the setting prevent-self-notification which you could then set to off.

12 years agomove make from runtest to start-test-stop
Kees Monshouwer [Sat, 4 May 2013 19:04:34 +0000 (21:04 +0200)]
move make from runtest to start-test-stop

12 years agoCreate soft link from README to README.md
Justin Clift [Sat, 4 May 2013 17:35:09 +0000 (18:35 +0100)]
Create soft link from README to README.md

12 years agoAdded pkg-config to the OSX build dependencies.
Justin Clift [Sat, 4 May 2013 17:10:59 +0000 (18:10 +0100)]
Added pkg-config to the OSX build dependencies.

12 years agoUse dedicated m4 dir, update deprecated macros.
Justin Clift [Sat, 4 May 2013 16:31:13 +0000 (17:31 +0100)]
Use dedicated m4 dir, update deprecated macros.

12 years agoRemove trailing whitespace
Justin Clift [Sat, 4 May 2013 15:58:26 +0000 (16:58 +0100)]
Remove trailing whitespace

12 years agoUpdate README, now in markdown format. Add OSX.
Justin Clift [Sat, 4 May 2013 15:51:38 +0000 (16:51 +0100)]
Update README, now in markdown format.  Add OSX.

12 years agofix up 'make publish' for docs, plus re-add the commit about how backends should...
bert hubert [Fri, 3 May 2013 12:23:58 +0000 (14:23 +0200)]
fix up 'make publish' for docs, plus re-add the commit about how backends should deal with wildcard queries (not)

12 years agoset version to 3.5.1
Peter van Dijk [Mon, 29 Apr 2013 17:53:05 +0000 (19:53 +0200)]
set version to 3.5.1

12 years agouse ustar to avoid 99 char path limit
Peter van Dijk [Thu, 2 May 2013 10:41:44 +0000 (12:41 +0200)]
use ustar to avoid 99 char path limit

12 years agonit
Peter van Dijk [Fri, 3 May 2013 09:36:03 +0000 (11:36 +0200)]
nit

12 years agomake dnsbulktest able to do other queries than just 'A', plus prepare infrastructure...
Bert Hubert [Fri, 3 May 2013 08:45:09 +0000 (10:45 +0200)]
make dnsbulktest able to do other queries than just 'A', plus prepare infrastructure for simultaneous testing of different query types (should we want this)

12 years agotry to base release versioning on PDNS_TAG even harder
Peter van Dijk [Fri, 3 May 2013 07:57:13 +0000 (09:57 +0200)]
try to base release versioning on PDNS_TAG even harder

12 years agotry release versioning whenever PDNS_TAG is set explicitly
Peter van Dijk [Fri, 3 May 2013 07:36:02 +0000 (09:36 +0200)]
try release versioning whenever PDNS_TAG is set explicitly

12 years agos/svn/github/
Peter van Dijk [Thu, 2 May 2013 18:08:43 +0000 (20:08 +0200)]
s/svn/github/

12 years agocircumvent apache
Peter van Dijk [Thu, 2 May 2013 17:56:04 +0000 (19:56 +0200)]
circumvent apache

12 years agodocs gitignore
Peter van Dijk [Thu, 2 May 2013 17:54:16 +0000 (19:54 +0200)]
docs gitignore

12 years agoset Jenkins build display name to something useful
Peter van Dijk [Thu, 2 May 2013 17:53:59 +0000 (19:53 +0200)]
set Jenkins build display name to something useful

12 years agoupdate docs/expand for github
Peter van Dijk [Thu, 2 May 2013 17:12:29 +0000 (19:12 +0200)]
update docs/expand for github

12 years ago3.5.1 docs
Peter van Dijk [Thu, 2 May 2013 14:43:41 +0000 (16:43 +0200)]
3.5.1 docs

12 years agoMerge branch 'f/versioning' of github.com:zeha/pdns
Peter van Dijk [Thu, 2 May 2013 12:49:28 +0000 (14:49 +0200)]
Merge branch 'f/versioning' of github.com:zeha/pdns

12 years agogitignore
Peter van Dijk [Thu, 2 May 2013 11:38:05 +0000 (13:38 +0200)]
gitignore

12 years agoMerge pull request #761 from mind04/700
Peter van Dijk [Thu, 2 May 2013 11:08:30 +0000 (04:08 -0700)]
Merge pull request #761 from mind04/700

add missing context line to gsqlite-presigned test

12 years agoadd missing context line to gsqlite-presigned test
Kees Monshouwer [Wed, 1 May 2013 15:34:37 +0000 (17:34 +0200)]
add missing context line to gsqlite-presigned test

12 years agoMerge pull request #750 from mind04/700
bert hubert [Wed, 1 May 2013 10:48:44 +0000 (03:48 -0700)]
Merge pull request #750 from mind04/700

Metadata update is now in the same transaction as the AXFR. Add sqlite3-...

12 years agoMerge pull request #757 from zeha/f/configure-help
bert hubert [Tue, 30 Apr 2013 15:51:49 +0000 (08:51 -0700)]
Merge pull request #757 from zeha/f/configure-help

cleanup configure

12 years agoMerge pull request #759 from zeha/f/upgrade-boost-m4
bert hubert [Tue, 30 Apr 2013 15:48:36 +0000 (08:48 -0700)]
Merge pull request #759 from zeha/f/upgrade-boost-m4

upgrade boost.m4

12 years agoMerge pull request #760 from zeha/f/inbox-html
bert hubert [Tue, 30 Apr 2013 15:46:33 +0000 (08:46 -0700)]
Merge pull request #760 from zeha/f/inbox-html

restyle builtin webserver page - many thanks to ch and mind04!

12 years agorestyle builtin webserver page
Christian Hofstaedtler [Tue, 30 Apr 2013 13:28:02 +0000 (15:28 +0200)]
restyle builtin webserver page

should closely match the powerdns CI, except for the font.

12 years agomake webserver HTML valid
Kees Monshouwer [Sun, 21 Apr 2013 09:55:32 +0000 (11:55 +0200)]
make webserver HTML valid

12 years agorework automatic build versioning
Christian Hofstaedtler [Mon, 29 Apr 2013 22:58:16 +0000 (00:58 +0200)]
rework automatic build versioning

Only release or preview builds now receive the designated version
as their identifier. Others are now known as 'git-something', or,
for debs/rpms '0.0-something' (or similar).

A new jenkins-driver script is included that moves actually setting
the versions out of the jenkins configuration.
Extending this script to drive the complete build is left for the
future.

12 years agoupgrade boost.m4
Christian Hofstaedtler [Mon, 29 Apr 2013 23:41:55 +0000 (01:41 +0200)]
upgrade boost.m4

fixes scary warning from configure:
    checking for the toolset name used by Boost for g++... configure: WARNING: could not figure out which toolset name to use for g++

12 years agominimal cleanup of configure.ac
Christian Hofstaedtler [Mon, 29 Apr 2013 23:39:59 +0000 (01:39 +0200)]
minimal cleanup of configure.ac

move SQLITE3 conditional definition before needsqlite3 test,
fix unixodbc detection message.

12 years agocleanup configure --help
Christian Hofstaedtler [Mon, 29 Apr 2013 23:28:21 +0000 (01:28 +0200)]
cleanup configure --help

All options should now use AC_HELP_STRING, and help texts should
start with a lowercase letter.

12 years agouse underscore instead of dash to make rpmbuild happy
Peter van Dijk [Mon, 29 Apr 2013 20:23:45 +0000 (22:23 +0200)]
use underscore instead of dash to make rpmbuild happy

12 years agorevert d90efbf48f3b8bad8f29610583f6349b7ae3d802 and add 7 days margin to inception
Kees Monshouwer [Wed, 20 Feb 2013 21:03:03 +0000 (22:03 +0100)]
revert d90efbf48f3b8bad8f29610583f6349b7ae3d802 and add 7 days margin to inception

12 years agotweak
Peter van Dijk [Mon, 29 Apr 2013 18:12:13 +0000 (20:12 +0200)]
tweak

12 years agooops
Peter van Dijk [Mon, 29 Apr 2013 18:06:12 +0000 (20:06 +0200)]
oops

12 years agooops
Peter van Dijk [Mon, 29 Apr 2013 18:04:35 +0000 (20:04 +0200)]
oops

12 years agodrop origin from GIT_BRANCH
Peter van Dijk [Mon, 29 Apr 2013 18:03:39 +0000 (20:03 +0200)]
drop origin from GIT_BRANCH

12 years agocorrect bogus use of poll(2) related constants, improving non-Linux portability....
Peter van Dijk [Mon, 29 Apr 2013 15:10:56 +0000 (17:10 +0200)]
correct bogus use of poll(2) related constants, improving non-Linux portability. Thanks Wouter de Jong

12 years agoadd expected result for NSEC space-name check
Peter van Dijk [Mon, 29 Apr 2013 14:12:21 +0000 (16:12 +0200)]
add expected result for NSEC space-name check

12 years agogitignore recursor test output
Peter van Dijk [Mon, 29 Apr 2013 13:58:42 +0000 (15:58 +0200)]
gitignore recursor test output

12 years agomake sure our NSEC(3)s for names with spaces in them are correct. Reported by Jimmy...
Peter van Dijk [Mon, 29 Apr 2013 13:57:33 +0000 (15:57 +0200)]
make sure our NSEC(3)s for names with spaces in them are correct. Reported by Jimmy Bergman. Includes test. Needs additional recursor verification.

12 years agomake sure cleandig digs whitespace in names
Peter van Dijk [Mon, 29 Apr 2013 09:29:58 +0000 (11:29 +0200)]
make sure cleandig digs whitespace in names

12 years agoMerge pull request #749 from cmouse/master
Peter van Dijk [Mon, 29 Apr 2013 07:14:50 +0000 (00:14 -0700)]
Merge pull request #749 from cmouse/master

Small fixes to remotebackend and .gitignore

12 years agoreduce log level of successful gpgsql/gsqlite3 connection to Info
Kees Monshouwer [Wed, 3 Apr 2013 18:40:21 +0000 (20:40 +0200)]
reduce log level of successful gpgsql/gsqlite3 connection to Info

12 years agoMetadata update is now in the same transaction as the AXFR. Add sqlite3-presigned...
Kees Monshouwer [Mon, 18 Feb 2013 21:02:24 +0000 (22:02 +0100)]
Metadata update is now in the same transaction as the AXFR. Add sqlite3-presigned tests to the regression test suite.

12 years agoAdded zone2json
Aki Tuomi [Sat, 27 Apr 2013 13:46:28 +0000 (16:46 +0300)]
Added zone2json

12 years agoAdded missing file
Aki Tuomi [Sat, 27 Apr 2013 13:36:50 +0000 (16:36 +0300)]
Added missing file

12 years agoRemoved unused variable
Aki Tuomi [Sat, 27 Apr 2013 13:35:49 +0000 (16:35 +0300)]
Removed unused variable

12 years agodocumet trace-regex availability as >= 3.5
bert hubert [Fri, 26 Apr 2013 19:54:07 +0000 (21:54 +0200)]
documet trace-regex availability as >= 3.5

12 years agogit ignore a bunch of stuff
Peter van Dijk [Fri, 26 Apr 2013 19:51:15 +0000 (21:51 +0200)]
git ignore a bunch of stuff

12 years agoMerge pull request #745 from jpmens/congratulations
Peter van Dijk [Fri, 26 Apr 2013 19:25:12 +0000 (12:25 -0700)]
Merge pull request #745 from jpmens/congratulations

Congratulations!

12 years agoCongratulations!
Jan-Piet Mens [Fri, 26 Apr 2013 19:23:47 +0000 (21:23 +0200)]
Congratulations!

12 years agoadd make-jenkins-version script for jenkins/git
Peter van Dijk [Fri, 26 Apr 2013 17:13:00 +0000 (19:13 +0200)]
add make-jenkins-version script for jenkins/git

12 years agosome trivial whitespace patches uncommitted from old svn checkout
bert hubert [Fri, 26 Apr 2013 14:57:14 +0000 (16:57 +0200)]
some trivial whitespace patches uncommitted from old svn checkout

12 years agoinclude expected_result.narrow for uppercase-nsec test
Peter van Dijk [Thu, 25 Apr 2013 09:35:19 +0000 (09:35 +0000)]
include expected_result.narrow for uppercase-nsec test

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3177 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agomake sure mixed-case queries get a correct apex NSEC3 type bitmap
Peter van Dijk [Thu, 25 Apr 2013 09:21:07 +0000 (09:21 +0000)]
make sure mixed-case queries get a correct apex NSEC3 type bitmap

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3176 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoalways lowercase next name in NSEC to avoid interop troubles with validators, thanks...
Peter van Dijk [Thu, 25 Apr 2013 08:30:49 +0000 (08:30 +0000)]
always lowercase next name in NSEC to avoid interop troubles with validators, thanks Marco Davids&Matthijs Mekking

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3175 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agofix set-version-auth after recent autoconf changes
Peter van Dijk [Mon, 22 Apr 2013 18:16:53 +0000 (18:16 +0000)]
fix set-version-auth after recent autoconf changes

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3174 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agolog negindic and aa_bit for NODATA response
Peter van Dijk [Mon, 22 Apr 2013 13:04:21 +0000 (13:04 +0000)]
log negindic and aa_bit for NODATA response

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3173 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoaccept empty NOERROR if it comes with SOA -or- has aa set
Peter van Dijk [Mon, 22 Apr 2013 13:01:16 +0000 (13:01 +0000)]
accept empty NOERROR if it comes with SOA -or- has aa set

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3172 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoadd testbench script for remotebackend development, thanks Aki. Closes #742
Peter van Dijk [Mon, 22 Apr 2013 08:18:31 +0000 (08:18 +0000)]
add testbench script for remotebackend development, thanks Aki. Closes #742

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3171 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoupdate dependencies in debian-pdns/control, thanks Aki. Closes #741
Peter van Dijk [Mon, 22 Apr 2013 05:48:08 +0000 (05:48 +0000)]
update dependencies in debian-pdns/control, thanks Aki. Closes #741

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3170 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoFix remotebackend setdomainmetadata return value handling. Fix by Aki Tuomi, closes...
Peter van Dijk [Mon, 22 Apr 2013 05:45:54 +0000 (05:45 +0000)]
Fix remotebackend setdomainmetadata return value handling. Fix by Aki Tuomi, closes #740

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3169 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agolog control listener abort even more explicitly
Peter van Dijk [Fri, 19 Apr 2013 12:54:50 +0000 (12:54 +0000)]
log control listener abort even more explicitly

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3168 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agosupport automake 1.12
Peter van Dijk [Fri, 19 Apr 2013 10:13:04 +0000 (10:13 +0000)]
support automake 1.12

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3167 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agorename bindparser.hh to avoid automake 1.12 clobbering it
Peter van Dijk [Fri, 19 Apr 2013 08:43:42 +0000 (08:43 +0000)]
rename bindparser.hh to avoid automake 1.12 clobbering it

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3166 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoadd description to recursor deb, thanks Sebastian Posner
Peter van Dijk [Fri, 19 Apr 2013 07:23:03 +0000 (07:23 +0000)]
add description to recursor deb, thanks Sebastian Posner

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3165 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agoupdate autoconf/automake preamble to non-deprecated variant, thanks Morten Stevens
Peter van Dijk [Thu, 18 Apr 2013 16:19:24 +0000 (16:19 +0000)]
update autoconf/automake preamble to non-deprecated variant, thanks Morten Stevens

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3164 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agodrop usage of deprecated automake INCLUDES variable
Peter van Dijk [Thu, 18 Apr 2013 16:05:58 +0000 (16:05 +0000)]
drop usage of deprecated automake INCLUDES variable

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3163 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agodisarm dead code that causes gcc crashes on ARM, thanks Morten Stevens
Peter van Dijk [Thu, 18 Apr 2013 12:57:44 +0000 (12:57 +0000)]
disarm dead code that causes gcc crashes on ARM, thanks Morten Stevens

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3162 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agocorrect log message
Peter van Dijk [Thu, 18 Apr 2013 12:33:52 +0000 (12:33 +0000)]
correct log message

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3161 d19b8d6e-7fed-0310-83ef-9ca221ded41b

12 years agotweak depth limiter
Peter van Dijk [Thu, 18 Apr 2013 11:59:36 +0000 (11:59 +0000)]
tweak depth limiter

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3160 d19b8d6e-7fed-0310-83ef-9ca221ded41b