Merge in xonotic/darkplaces.git: zykure/fixes
git-manager created issue #1758 on 2013-08-18T15:46:16Z:
Purpose of the branch:
Fix bug which prevented builtin function crypto_getmyidfp() to correctly return the player hashkey.
Repository: xonotic/darkplaces.git Commit: 107c6338 Branch: zykure/fixes
Merge commands:
cd darkplaces
git fetch && git diff '107c63388a1f7f7f447609a50769b0c16a325dcf'..'origin/zykure/fixes'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git reset --hard 'origin/zykure/fixes'
git rebase -i --onto origin/master origin/div0-stable
# please make sure that this rebase did not cause any conflicts; if it did, fix
# them and repeatedly use git rebase --continue till the rebase is complete
#
# also, THIS is the point to do final pre-merge testing
#
# use git rebase --abort; git reset --hard origin/master to bail out
git svn dcommit --add-author-from && git push --delete origin 'zykure/fixes'
Diffstat:
crypto.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit 107c63388a1f7f7f447609a50769b0c16a325dcf
Author: Jan Behrens
Commit: Jan Behrens
Revert to old semantics, just fix the bug
commit 4282de99515420989d63e2034daa47b95e88188c
Author: Jan Behrens
Commit: Jan Behrens
fix bug in Crypto_RetrieveLocalKey
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/crypto.c b/crypto.c
index 2baa5a9..a3bbb74 100644
— a/crypto.c
**+ b/crypto.c
@ -735,7 +735,7
@ int Crypto\_RetrieveLocalKey;
if
if
- strlcpy;
- strlcpy(idfp, pubkeys_priv_fp64[keyid], idfplen); if(issigned) *issigned = pubkeys_havesig[keyid]; return 1;