moving gethexpwd into util.c, because it's used in both smbpass.c and ldap.c

(This used to be commit abe261b2f5ea7036e7be6230876176d134ef4ee4)

2 files changed, 0 insertions, 57 deletions

diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c
index d9387dfcc4..6045534998 100644
--- a/source3/passdb/ldap.c
+++ b/source3/passdb/ldap.c
@@ -401,34 +401,6 @@ static void ldap_get_user(LDAP *ldap_struct,LDAPMessage *entry,
 	}
 }
 
-/*************************************************************
- Routine to get the next 32 hex characters and turn them
- into a 16 byte array.
-**************************************************************/
-
-static int gethexpwd(char *p, char *pwd)
-{
-  int i;
-  unsigned char   lonybble, hinybble;
-  char           *hexchars = "0123456789ABCDEF";
-  char           *p1, *p2;
-
-  for (i = 0; i < 32; i += 2) {
-    hinybble = toupper(p[i]);
-    lonybble = toupper(p[i + 1]);
- 
-    p1 = strchr(hexchars, hinybble);
-    p2 = strchr(hexchars, lonybble);
-    if (!p1 || !p2)
-      return (False);
-    hinybble = PTR_DIFF(p1, hexchars);
-    lonybble = PTR_DIFF(p2, hexchars);
- 
-    pwd[i / 2] = (hinybble << 4) | lonybble;
-  }
-  return (True);
-}
-
 /*******************************************************************
  retrieve the machine's info and contruct a smb_passwd structure.
 ******************************************************************/
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c
index 31567eafd8..3344a22eb5 100644
--- a/source3/passdb/smbpass.c
+++ b/source3/passdb/smbpass.c
@@ -165,41 +165,12 @@ void endsmbpwent(void *vp)
   DEBUG(7, ("endsmbpwent: closed password file.\n"));
 }
 
-/*************************************************************
- Routine to get the next 32 hex characters and turn them
- into a 16 byte array.
-**************************************************************/
-
-static int gethexpwd(char *p, char *pwd)
-{
-  int i;
-  unsigned char   lonybble, hinybble;
-  char           *hexchars = "0123456789ABCDEF";
-  char           *p1, *p2;
-
-  for (i = 0; i < 32; i += 2) {
-    hinybble = toupper(p[i]);
-    lonybble = toupper(p[i + 1]);
- 
-    p1 = strchr(hexchars, hinybble);
-    p2 = strchr(hexchars, lonybble);
-    if (!p1 || !p2)
-      return (False);
-    hinybble = PTR_DIFF(p1, hexchars);
-    lonybble = PTR_DIFF(p2, hexchars);
- 
-    pwd[i / 2] = (hinybble << 4) | lonybble;
-  }
-  return (True);
-}
-
 /*************************************************************************
  Routine to return the next entry in the smbpasswd list.
 
  do not call this function directly.  use passdb.c instead.
 
  *************************************************************************/
-
 struct smb_passwd *getsmbpwent(void *vp)
 {
   /* Static buffers we will return. */