From 9f751be356f337298c8d55d246f8aa35cafa6346 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 17 Dec 2013 16:59:50 -0500 Subject: Pull in changes to OTP that postdate the backport - backport additional changes to libkrad to make it function more like the version in upstream 1.12, and a few things in the OTP plugin as well (most visibly, that the secret that's shared with the RADIUS server is read from a file rather than used directly) (#1040056) --- persistent_keyring.patch | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'persistent_keyring.patch') diff --git a/persistent_keyring.patch b/persistent_keyring.patch index 863774c..2e625b8 100644 --- a/persistent_keyring.patch +++ b/persistent_keyring.patch @@ -1,5 +1,4 @@ -Pared down from the git commits, with a local copy of k5memdup0() added in -to cc_keyring, and a wrapper 'run' in to k5test.py. +Pared down from the git commits, with a wrapper 'run' added to k5test.py. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 2c17e46..7be77c2 100644 @@ -238,7 +237,7 @@ index fd1bcec..795ccd6 100644 } krb5_krcc_bc; /* Global mutex */ -@@ -258,6 +311,29 @@ static krb5_error_code KRB5_CALLCONV krb5_krcc_lock +@@ -258,6 +311,18 @@ static krb5_error_code KRB5_CALLCONV krb5_krcc_lock static krb5_error_code KRB5_CALLCONV krb5_krcc_unlock (krb5_context context, krb5_ccache id); @@ -253,17 +252,6 @@ index fd1bcec..795ccd6 100644 + +static krb5_error_code KRB5_CALLCONV krb5_krcc_switch_to +(krb5_context context, krb5_ccache cache); -+ -+/* Like k5memdup, but add a final null byte. */ -+static inline void * -+k5memdup0(const void *in, size_t len, krb5_error_code *code) -+{ -+ void *ptr = k5alloc(len + 1, code); -+ -+ if (ptr != NULL && len > 0) -+ memcpy(ptr, in, len); -+ return ptr; -+} + /* * Internal utility functions -- cgit