r15297: Move create_security_token() to samdb as it requires SAMDB (and the rest of LIBSECURITY doesn't)

Make the ldb password_hash module only depend on some keys manipulation code, not full heimdal
Some other dependency fixes
(This used to be commit 5b3ab728edfc9cdd9eee16ad0fe6dfd4b5ced630)

8 files changed, 16 insertions, 19 deletions

diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 3de2723aee..22e093581c 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -229,7 +229,7 @@ NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
 			DEBUG(10,("sam_account_ok: checking for workstation match '%s' and '%s'\n",
 				  workstations[i], logon_workstation));
 
-			if (strequal(workstations[i], logon_workstation)) {
+			if (strequal(workstations[i], logon_workstation) == 0) {
 				invalid_ws = False;
 				break;
 			}
diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 4c6bf04fcb..2f2a2f0b83 100644
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /* this default function can be used by mostly all backends
  * which don't want to set a challenge
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 3d42da6d61..6586fbfe5d 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -13,7 +13,8 @@ PRIVATE_PROTO_HEADER = auth_sam.h
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = auth
 OBJ_FILES = \
-		auth_sam.o
+		auth_sam.o \
+		auth_sam_reply.o
 PUBLIC_DEPENDENCIES = \
 		SAMDB
 # End MODULE auth_sam
@@ -24,8 +25,7 @@ PUBLIC_DEPENDENCIES = \
 [MODULE::auth_anonymous]
 INIT_FUNCTION = auth_anonymous_init
 SUBSYSTEM = auth
-OBJ_FILES = \
-		auth_anonymous.o
+OBJ_FILES = auth_anonymous.o
 # End MODULE auth_anonymous
 #######################
 
@@ -34,8 +34,7 @@ OBJ_FILES = \
 [MODULE::auth_winbind]
 INIT_FUNCTION = auth_winbind_init
 SUBSYSTEM = auth
-OBJ_FILES = \
-		auth_winbind.o
+OBJ_FILES = auth_winbind.o
 PUBLIC_DEPENDENCIES = \
 		LIBWINBIND-CLIENT \
 		NDR_NETLOGON LIBNDR
@@ -47,8 +46,7 @@ PUBLIC_DEPENDENCIES = \
 [MODULE::auth_developer]
 INIT_FUNCTION = auth_developer_init
 SUBSYSTEM = auth
-OBJ_FILES = \
-		auth_developer.o
+OBJ_FILES = auth_developer.o
 # End MODULE auth_developer
 #######################
 
@@ -57,10 +55,8 @@ OBJ_FILES = \
 [MODULE::auth_unix]
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
-OBJ_FILES = \
-		auth_unix.o
-PUBLIC_DEPENDENCIES = \
-		CRYPT PAM PAM_ERRORS
+OBJ_FILES = auth_unix.o
+PUBLIC_DEPENDENCIES = CRYPT PAM PAM_ERRORS
 # End MODULE auth_unix
 #######################
 
@@ -76,9 +72,8 @@ PUBLIC_PROTO_HEADER = auth_proto.h
 OBJ_FILES = \
 		auth.o \
 		auth_util.o \
-		auth_sam_reply.o \
 		ntlm_check.o \
 		auth_simple.o
-PUBLIC_DEPENDENCIES = LIB_SECURITY process_model
+PUBLIC_DEPENDENCIES = LIBSECURITY process_model SAMDB
 # End SUBSYSTEM auth
 #######################
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index b1212e5963..1f6a07ae01 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = credentials.o \
 		credentials_krb5.o \
 		credentials_ntlm.o
 PUBLIC_DEPENDENCIES = \
-		HEIMDAL LIBCLI_AUTH ldb SECRETS
+		HEIMDAL LIBCLI_AUTH SECRETS
 # End SUBSYSTEM CREDENTIALS
 #################################
 
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index 8f487571f3..4cc067ffde 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -252,7 +252,7 @@ static NTSTATUS gensec_gssapi_client_start(struct gensec_security *gensec_securi
 		DEBUG(2, ("Cannot do GSSAPI to an IP address\n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
-	if (strequal(hostname, "localhost")) {
+	if (strcmp(hostname, "localhost") == 0) {
 		DEBUG(2, ("GSSAPI to 'localhost' does not make sense\n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index f2f3361bf9..c07b5c95e3 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -230,7 +230,7 @@ static NTSTATUS gensec_krb5_client_start(struct gensec_security *gensec_security
 		DEBUG(2, ("Cannot do krb5 to an IP address"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
-	if (strequal(hostname, "localhost")) {
+	if (strcmp(hostname, "localhost") == 0) {
 		DEBUG(2, ("krb5 to 'localhost' does not make sense"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 2a729ef239..9a7ace6ab5 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -9,6 +9,7 @@ OBJ_FILES = kerberos.o \
 			kerberos_pac.o \
 			gssapi_parse.o \
 			krb5_init_context.o
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET HEIMDAL_ROKEN_ADDRINFO
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET
+PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam
 # End SUBSYSTEM KERBEROS
 #################################
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 4712166ea7..673137fd5c 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -28,7 +28,7 @@
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
-#include "auth/auth.h"
+#include "auth/auth_sam.h"
 
 static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, 
 					  DATA_BLOB pac_data,