#!/bin/bash
set -x
set -e
git reset --hard origin/v4-15-test

git cherry-pick -x e0fa3e359f16b26122d49ad79372e3923f5ded77
git cherry-pick -x 84b9f58616e0a4c5b36b1c2d4fee7928fbf9edc4..ee9dfff617ad21d81369d7ef2ea35d7caab82fec
# ENV support in plantestsuite
git cherry-pick -x 7fb741b3b1ac7c2bac355b77cf71cd8881d58d5b..48289b6964d28e153fec885aceca02c6a9b436ef
# More Kerberos testing infrastructure
git cherry-pick -x 4809f4a6ee971bcd9767839c729b636b7582fc02..984a0db00c3f2e38b568a75eb1944f4d7bb7f854
git cherry-pick -x 4f093ae6c9ee5b3e0f98b47fbacb0e37fad62052..104fc3539090ae9e161945ef9d18d897e3b71fed
git cherry-pick -x 2d6cdb5421810b0027cb78307abd8a8c855c5244..78942ad7d17a92cd39d9c46ae1b8348e9673ac30
git cherry-pick -x a41425ebd0f6f2e9e84e2462e7458d04267cd524..9b9fd2a0d9ca81aa16ddfe2f7e219b94e2ac158b
git cherry-pick -x 40b65fcb5830c6168a3032eb12bb4c8acc940bb3..10baaf08523200e47451aa1862430977b0365b59

git-add-bug 14817 origin/v4-15-test..HEAD

git format-patch origin/v4-15-test..HEAD --stdout > samba-4-15-kdc-crash.patch
git diff origin/v4-15-test..HEAD --stat >  samba-4-15-kdc-crash.diffstat