r26357: Add separate subsystem for auth_sam_reply parsing.

(This used to be commit 2d61e7c96e249d7031b709e9f727626a78e435f1)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 789055408da17d489931200999b40cc30716a470..046ce026d0b65d41d3e37ed46de77a35a57c48e6 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -15,10 +15,14 @@ PRIVATE_DEPENDENCIES = auth_session
 
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h
-OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o 
-PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB
+OBJ_FILES = sam.o ntlm_check.o 
+PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
 PRIVATE_DEPENDENCIES = LDAP_ENCODE
 
+[SUBSYSTEM::auth_sam_reply]
+PRIVATE_PROTO_HEADER = auth_sam_reply.h
+OBJ_FILES = auth_sam_reply.o
+
 #######################
 # Start MODULE auth_sam
 [MODULE::auth_sam_module]
@@ -81,6 +85,7 @@ OBJ_FILES = \
                auth_util.o \
                auth_simple.o
 PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM auth
 #######################
 

diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 87c62fb6edfad91f5ac4b6dc40e59a3231a64243..1c70ef2e63f2cfda55c9dd22cc17c2730e049c94 100644 (file)
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -10,6 +10,6 @@ OBJ_FILES = kerberos.o \
                        gssapi_parse.o \
                        krb5_init_context.o
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
-PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam CREDENTIALS_KRB5
+PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply CREDENTIALS_KRB5
 # End SUBSYSTEM KERBEROS
 #################################

diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 5fefd24cd18ac15f1c0d69b3b0d1399bb2f77ce9..6eea053e2b2ddbaaac6b22a73663b1c03f668455 100644 (file)
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -28,7 +28,7 @@
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "lib/ldb/include/ldb.h"
-#include "auth/auth_sam.h"
+#include "auth/auth_sam_reply.h"
 
 static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, 
                                          DATA_BLOB pac_data,

diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index d129332ba274a7c8a21370d5929fca258ea4a5b0..52a377dbba2d78c0596084f1cd1f1e7f2bdbc866 100644 (file)
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -22,7 +22,7 @@ OBJ_FILES = \
                hdb-ldb.o \
                pac-glue.o 
 PRIVATE_DEPENDENCIES = \
-               LIBLDB auth_sam KERBEROS
+               LIBLDB auth_sam auth_sam_reply KERBEROS
 # End SUBSYSTEM KDC
 #######################
 

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 4ba1023785891bb536702cdcc29e50882ce84c84..32f96ee7ab3c6293e9f6b84b0e132b871f2c3ac2 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "auth/auth_sam.h"
+#include "auth/auth_sam_reply.h"
 #include "param/param.h"
 
 struct krb5_dh_moduli;

diff --git a/source4/param/util.c b/source4/param/util.c
index 1cbae841bcefadc37566dac988640556f6f8f5f8..89498b57a66e4098b5b79828d58e98e4b626f6bb 100644 (file)
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -107,7 +107,7 @@ _PUBLIC_ char *config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
        char *fname, *config_dir, *p;
        config_dir = talloc_strdup(mem_ctx, lp_configfile(lp_ctx));
        p = strrchr(config_dir, '/');
-       if (!p) {
+       if (p == NULL) {
                return NULL;
        }
        p[0] = '\0';

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 15916a81fc0e23a1853bbe34ad163680ad2b6156..25f9939576de02106fd81255292d936585a4e90b 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -25,7 +25,7 @@
 #include "rpc_server/common/common.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
-#include "auth/auth_sam.h"
+#include "auth/auth_sam_reply.h"
 #include "dsdb/samdb/samdb.h"
 #include "rpc_server/samr/proto.h"
 #include "util/util_ldb.h"