--- sourceforge.net/trunk/rdesktop/licence.c 2003/01/21 20:22:44 293 +++ sourceforge.net/trunk/rdesktop/licence.c 2003/02/11 11:31:04 325 @@ -59,7 +59,6 @@ strncpy((char *) (hwid + 4), hostname, LICENCE_HWID_SIZE - 4); } -#ifdef SAVE_LICENCE /* Present an existing licence to the server */ static void licence_present(uint8 * client_random, uint8 * rsa_data, @@ -99,7 +98,6 @@ s_mark_end(s); sec_send(s, sec_flags); } -#endif /* Send a licence request packet */ static void @@ -144,13 +142,11 @@ { uint8 null_data[SEC_MODULUS_SIZE]; uint8 *server_random; -#ifdef SAVE_LICENCE uint8 signature[LICENCE_SIGNATURE_SIZE]; uint8 hwid[LICENCE_HWID_SIZE]; uint8 *licence_data; int licence_size; RC4_KEY crypt_key; -#endif /* Retrieve the server random from the incoming packet */ in_uint8p(s, server_random, SEC_RANDOM_SIZE); @@ -160,7 +156,6 @@ memset(null_data, 0, sizeof(null_data)); licence_generate_keys(null_data, server_random, null_data); -#ifdef SAVE_LICENCE licence_size = load_licence(&licence_data); if (licence_size != -1) { @@ -176,7 +171,6 @@ xfree(licence_data); return; } -#endif licence_send_request(null_data, null_data, username, hostname); } @@ -282,10 +276,7 @@ return; licence_issued = True; - -#ifdef SAVE_LICENCE save_licence(s->p, length - 2); -#endif } /* Process a licence packet */