svn commit: samba r26357 - in branches/SAMBA_4_0: . source/auth source/auth/kerberos source/kdc source/param source/rpc_server/netlogon

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-10 04:33:29 +0000 (Mon, 10 Dec 2007)
New Revision: 26357

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26357

Log:
Add separate subsystem for auth_sam_reply parsing.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/config.mk
   branches/SAMBA_4_0/source/auth/kerberos/config.mk
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
   branches/SAMBA_4_0/source/kdc/config.mk
   branches/SAMBA_4_0/source/kdc/pac-glue.c
   branches/SAMBA_4_0/source/param/util.c
   branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/auth/config.mk	2007-12-10 04:33:29 UTC (rev 26357)
@@ -15,10 +15,14 @@
 
 [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 @@
 		auth_util.o \
 		auth_simple.o
 PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM auth
 #######################
 

Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.mk	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.mk	2007-12-10 04:33:29 UTC (rev 26357)
@@ -10,6 +10,6 @@
 			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
 #################################

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c	2007-12-10 04:33:29 UTC (rev 26357)
@@ -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,

Modified: branches/SAMBA_4_0/source/kdc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/kdc/config.mk	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/kdc/config.mk	2007-12-10 04:33:29 UTC (rev 26357)
@@ -22,7 +22,7 @@
 		hdb-ldb.o \
 		pac-glue.o 
 PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam KERBEROS
+		LIBLDB auth_sam auth_sam_reply KERBEROS
 # End SUBSYSTEM KDC
 #######################
 

Modified: branches/SAMBA_4_0/source/kdc/pac-glue.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/pac-glue.c	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/kdc/pac-glue.c	2007-12-10 04:33:29 UTC (rev 26357)
@@ -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;

Modified: branches/SAMBA_4_0/source/param/util.c
===================================================================
--- branches/SAMBA_4_0/source/param/util.c	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/param/util.c	2007-12-10 04:33:29 UTC (rev 26357)
@@ -107,7 +107,7 @@
 	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';

Modified: branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c	2007-12-10 04:33:26 UTC (rev 26356)
+++ branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c	2007-12-10 04:33:29 UTC (rev 26357)
@@ -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"