modify ldap_dn2ufn() to return completely typeless UFNs

[openldap] / clients / ud / string_to_key.c

diff --git a/clients/ud/string_to_key.c b/clients/ud/string_to_key.c
index 0ed375e92416971719a40b17a5d66e00a484a033..66d2eb664302825d724d7c5600b7065b44eaa8ed 100644 (file)
--- a/clients/ud/string_to_key.c
+++ b/clients/ud/string_to_key.c
@@ -1,7 +1,11 @@
 /* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 #include "portable.h"
 
-#if defined(HAVE_KERBEROS) && !defined(openbsd)
+#if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) && !defined(openbsd)
 /*
  * Copyright 1985, 1986, 1987, 1988, 1989 by the Massachusetts Institute
  * of Technology.
@@ -63,7 +67,7 @@ des_string_to_key( char *str, register des_cblock *key )
     length = strlen(str);
 
     /* init key array for bits */
-    memset(k_char, 0, sizeof(k_char));
+    memset(k_char, '\0', sizeof(k_char));
 
 #ifdef USE_DES_DEBUG
     if (des_debug)
@@ -112,7 +116,7 @@ des_string_to_key( char *str, register des_cblock *key )
     (void) des_key_sched(key,key_sked);
     (void) des_cbc_cksum((des_cblock *)in_str,key,length,key_sked,key);
     /* erase key_sked */
-    memset((char *)key_sked, 0, sizeof(key_sked));
+    memset((char *)key_sked, '\0', sizeof(key_sked));
 
     /* now fix up key parity again */
     des_fixup_key_parity(key);
@@ -156,8 +160,8 @@ Andrew_StringToKey(
     int   i;
     int   passlen;
 
-    memset(key, 0, sizeof(des_cblock));
-    memset(password, 0, sizeof(password));
+    memset(key, '\0', sizeof(des_cblock));
+    memset(password, '\0', sizeof(password));
 
     strncpy (password, cell, 8);
     passlen = strlen (str);
@@ -204,13 +208,13 @@ StringToKey(
         strncat (password, cell, sizeof(password)-passlen);
     if ((passlen = strlen(password)) > sizeof(password)) passlen = sizeof(password);
 
-    memcpy(ivec, "kerberos", 8);
-    memcpy(temp_key, "kerberos", 8);
+    AC_MEMCPY(ivec, "kerberos", 8);
+    AC_MEMCPY(temp_key, "kerberos", 8);
     des_fixup_key_parity (temp_key);
     des_key_sched (temp_key, schedule);
     des_cbc_cksum (password, ivec, passlen, schedule, ivec);
 
-    memcpy(temp_key, ivec, 8);
+    AC_MEMCPY(temp_key, ivec, 8);
     des_fixup_key_parity (temp_key);
     des_key_sched (temp_key, schedule);
     des_cbc_cksum (password, key, passlen, schedule, ivec);