Adapt to common crypto functions: sam_pwd_hash() -> sam_rid_crypt()

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index fe9fd66fdc24bfca36d81d678734f880b3bfe593..724cc90596a2b9585038216cbd608d0cc377da8a 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "libcli/auth/libcli_auth.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index b4dbe3afde358f7f360e424ac90dbcdb5e74c0d7..b89f4efaf571f2e7c0fcee5c5c8d0a7f7e1a504b 100644 (file)
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "../lib/crypto/crypto.h"
+#include "../libcli/auth/libcli_auth.h"
 
 /**
  * Decrypt and extract the user's passwords.
@@ -51,7 +52,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
         * think this channel is secure enough. */
        if (user->lm_password_present) {
                if (memcmp(user->lmpassword.hash, zero_buf, 16) != 0) {
-                       sam_pwd_hash(rid, user->lmpassword.hash, lm_hash.hash, 0);
+                       sam_rid_crypt(rid, user->lmpassword.hash, lm_hash.hash, 0);
                } else {
                        memset(lm_hash.hash, '\0', sizeof(lm_hash.hash));
                }
@@ -60,7 +61,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
 
        if (user->nt_password_present) {
                if (memcmp(user->ntpassword.hash, zero_buf, 16) != 0) {
-                       sam_pwd_hash(rid, user->ntpassword.hash, nt_hash.hash, 0);
+                       sam_rid_crypt(rid, user->ntpassword.hash, nt_hash.hash, 0);
                } else {
                        memset(nt_hash.hash, '\0', sizeof(nt_hash.hash));
                }
@@ -90,9 +91,9 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
                if (keys.keys.keys2.lmpassword.length == 16) {
                        if (memcmp(keys.keys.keys2.lmpassword.pwd.hash,
                                        zero_buf, 16) != 0) {
-                               sam_pwd_hash(rid,
-                                       keys.keys.keys2.lmpassword.pwd.hash,
-                                       lm_hash.hash, 0);
+                               sam_rid_crypt(rid,
+                                             keys.keys.keys2.lmpassword.pwd.hash,
+                                             lm_hash.hash, 0);
                        } else {
                                memset(lm_hash.hash, '\0', sizeof(lm_hash.hash));
                        }
@@ -102,9 +103,9 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
                if (keys.keys.keys2.ntpassword.length == 16) {
                        if (memcmp(keys.keys.keys2.ntpassword.pwd.hash,
                                                zero_buf, 16) != 0) {
-                               sam_pwd_hash(rid,
-                                       keys.keys.keys2.ntpassword.pwd.hash,
-                                       nt_hash.hash, 0);
+                               sam_rid_crypt(rid,
+                                             keys.keys.keys2.ntpassword.pwd.hash,
+                                             nt_hash.hash, 0);
                        } else {
                                memset(nt_hash.hash, '\0', sizeof(nt_hash.hash));
                        }