Fix conflicts.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@545 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/des/rnd_keys.c

@@ -111,7 +111,10 @@ sigALRM(int sig)
     SIGRETURN(0);
 }
 
-#if 0				/* Somehow use this when/if neccessary?/bg */
+#if !definded(HAVE_SETITIMER) && defined(HAVE_RANDOM)
+
+/* XXX this is a quick hack, should be fixed */
+
 static
 void
 des_rand_data(unsigned char *data, int size)
@@ -121,7 +124,8 @@ des_rand_data(unsigned char *data, int size)
   for(i = 0; i < size; ++i)
     data[i] = random() % 0x100;
 }
-#endif
+
+#else
 
 /*
  * Generate size bytes of "random" data using timed interrupts.
@@ -176,6 +180,7 @@ des_rand_data(unsigned char *data, int size)
     setitimer(ITIMER_REAL, &otv, 0);
     sigaction(SIGALRM, &osa, 0);
 }
+#endif
 
 void
 des_generate_random_block(des_cblock *block)