Some fixes after merge.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3605 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -44,7 +44,11 @@ RCSID("$Id$");
|
|||||||
|
|
||||||
#include <des.h>
|
#include <des.h>
|
||||||
#include <des_locl.h>
|
#include <des_locl.h>
|
||||||
|
#ifdef KRB5
|
||||||
#include <krb5-types.h>
|
#include <krb5-types.h>
|
||||||
|
#elif defined(KRB4)
|
||||||
|
#include <ktypes.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@@ -302,7 +306,7 @@ des_rand_data(unsigned char *data, int size)
|
|||||||
#ifdef HAVE_SIGACTION
|
#ifdef HAVE_SIGACTION
|
||||||
sigaction(SIGALRM, &osa, 0);
|
sigaction(SIGALRM, &osa, 0);
|
||||||
#else
|
#else
|
||||||
signal(SIGALRM, osa < 0 ? SIG_DFL : osa);
|
signal(SIGALRM, osa != SIG_ERR ? osa : SIG_DFL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
Reference in New Issue
Block a user