From 2c95244f1115c87a8ec3101427680a834d71ceaf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 5 May 2008 13:21:18 +1000 Subject: Add a new implementation of security=server. This is not intended for general use, and will not be easily exposed (if I have anything to do with it), but should allow the CIFS proxy to re-use the connection. A work in progress. Andrew Bartlett (This used to be commit a1e60ebc6d1e794011df5f69f691f4ec8622e991) --- source4/auth/config.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 7d4678b7ac..0acb9e30ba 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -54,6 +54,18 @@ SUBSYSTEM = auth auth_anonymous_OBJ_FILES = $(addprefix auth/, auth_anonymous.o) +####################### +# Start MODULE auth_anonymous +[MODULE::auth_server] +INIT_FUNCTION = auth_server_init +SUBSYSTEM = auth +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_SMB +OUTPUT_TYPE = SHARED_LIBRARY +# End MODULE auth_server +####################### + +auth_server_OBJ_FILES = $(addprefix auth/, auth_server.o) + ####################### # Start MODULE auth_winbind [MODULE::auth_winbind] -- cgit From 7ee76eeae5b3e9e5f5b226039e7276897f5e6764 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 5 May 2008 15:23:57 +1000 Subject: Move NTLM authentication details into auth/ntlm This should help clarify the role of the various files around here (done on Jelmer's request). Andrew Bartlett (This used to be commit efa399037511ced8978f2e7661a71aac7a384883) --- source4/auth/config.mk | 83 ++------------------------------------------------ 1 file changed, 2 insertions(+), 81 deletions(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 0acb9e30ba..87b796288d 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -2,6 +2,7 @@ mkinclude gensec/config.mk mkinclude kerberos/config.mk mkinclude ntlmssp/config.mk +mkinclude ntlm/config.mk mkinclude credentials/config.mk [SUBSYSTEM::auth_session] @@ -24,93 +25,13 @@ PRIVATE_PROTO_HEADER = auth_sam.h PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY PRIVATE_DEPENDENCIES = LDAP_ENCODE -auth_sam_OBJ_FILES = $(addprefix auth/, sam.o ntlm_check.o) +auth_sam_OBJ_FILES = $(addprefix auth/, sam.o) [SUBSYSTEM::auth_sam_reply] PRIVATE_PROTO_HEADER = auth_sam_reply.h auth_sam_reply_OBJ_FILES = $(addprefix auth/, auth_sam_reply.o) -####################### -# Start MODULE auth_sam -[MODULE::auth_sam_module] -# gensec_krb5 and gensec_gssapi depend on it -INIT_FUNCTION = auth_sam_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = \ - SAMDB auth_sam -# End MODULE auth_sam -####################### - -auth_sam_module_OBJ_FILES = $(addprefix auth/, auth_sam.o) - -####################### -# Start MODULE auth_anonymous -[MODULE::auth_anonymous] -INIT_FUNCTION = auth_anonymous_init -SUBSYSTEM = auth -# End MODULE auth_anonymous -####################### - -auth_anonymous_OBJ_FILES = $(addprefix auth/, auth_anonymous.o) - -####################### -# Start MODULE auth_anonymous -[MODULE::auth_server] -INIT_FUNCTION = auth_server_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_SMB -OUTPUT_TYPE = SHARED_LIBRARY -# End MODULE auth_server -####################### - -auth_server_OBJ_FILES = $(addprefix auth/, auth_server.o) - -####################### -# Start MODULE auth_winbind -[MODULE::auth_winbind] -INIT_FUNCTION = auth_winbind_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT -# End MODULE auth_winbind -####################### - -auth_winbind_OBJ_FILES = $(addprefix auth/, auth_winbind.o) - -####################### -# Start MODULE auth_developer -[MODULE::auth_developer] -INIT_FUNCTION = auth_developer_init -SUBSYSTEM = auth -# End MODULE auth_developer -####################### - -auth_developer_OBJ_FILES = $(addprefix auth/, auth_developer.o) - -[MODULE::auth_unix] -INIT_FUNCTION = auth_unix_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER - -auth_unix_OBJ_FILES = $(addprefix auth/, auth_unix.o) - -[SUBSYSTEM::PAM_ERRORS] -PRIVATE_PROTO_HEADER = pam_errors.h - -#VERSION = 0.0.1 -#SO_VERSION = 0 -PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o) - -[MODULE::auth] -INIT_FUNCTION = server_service_auth_init -SUBSYSTEM = service -PRIVATE_PROTO_HEADER = auth_proto.h -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS - -auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o) - -# PUBLIC_HEADERS += auth/auth.h - [PYTHON::swig_auth] PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB -- cgit From c3efee27b6190a7ceb7c0dbe4c526c0f51ddf871 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 8 May 2008 10:53:03 +0200 Subject: Install session.h, required by OpenChange's proxy. (This used to be commit 44d8b70004247729862b194ea66444e0cf296660) --- source4/auth/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 87b796288d..b13b8abf1f 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -9,7 +9,7 @@ mkinclude credentials/config.mk PRIVATE_PROTO_HEADER = session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS -# PUBLIC_HEADERS += auth/session.h +PUBLIC_HEADERS += auth/session.h auth_session_OBJ_FILES = $(addprefix auth/, session.o) -- cgit From 137ec6e340610759ed0653b11eafb3f4243e2728 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 19:46:09 +0200 Subject: Use variables for source directory in a couple more places. (This used to be commit 2860a7db5968c7007522cdb300eba390da929ab8) --- source4/auth/config.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index b13b8abf1f..28992d1dc1 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -1,4 +1,5 @@ # auth server subsystem +gensecsrcdir := $(authsrcdir)/gensec mkinclude gensec/config.mk mkinclude kerberos/config.mk mkinclude ntlmssp/config.mk @@ -9,32 +10,32 @@ mkinclude credentials/config.mk PRIVATE_PROTO_HEADER = session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS -PUBLIC_HEADERS += auth/session.h +PUBLIC_HEADERS += $(authsrcdir)/session.h -auth_session_OBJ_FILES = $(addprefix auth/, session.o) +auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o) [SUBSYSTEM::auth_system_session] PRIVATE_PROTO_HEADER = system_session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY -auth_system_session_OBJ_FILES = $(addprefix auth/, system_session.o) +auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) [SUBSYSTEM::auth_sam] PRIVATE_PROTO_HEADER = auth_sam.h PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY PRIVATE_DEPENDENCIES = LDAP_ENCODE -auth_sam_OBJ_FILES = $(addprefix auth/, sam.o) +auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) [SUBSYSTEM::auth_sam_reply] PRIVATE_PROTO_HEADER = auth_sam_reply.h -auth_sam_reply_OBJ_FILES = $(addprefix auth/, auth_sam_reply.o) +auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) [PYTHON::swig_auth] PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB SWIG_FILE = auth.i -swig_auth_OBJ_FILES = auth/auth_wrap.o +swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o -- cgit From dc114f8c5acbcffe2f7114083f3e058f17fb4fa2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 21:09:04 +0200 Subject: Avoid smb_build for prototype headers in some places. (This used to be commit 4876c4efbbafb4e0afa3554cd9f748ab591a2927) --- source4/auth/config.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 28992d1dc1..1f4f8dfb1d 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -7,32 +7,35 @@ mkinclude ntlm/config.mk mkinclude credentials/config.mk [SUBSYSTEM::auth_session] -PRIVATE_PROTO_HEADER = session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS PUBLIC_HEADERS += $(authsrcdir)/session.h auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o) +$(call proto_header_template,$(authsrcdir)/session_proto.h,$(auth_session_OBJ_FILES:.o=.c)) + [SUBSYSTEM::auth_system_session] -PRIVATE_PROTO_HEADER = system_session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) +$(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES)) [SUBSYSTEM::auth_sam] -PRIVATE_PROTO_HEADER = auth_sam.h PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY PRIVATE_DEPENDENCIES = LDAP_ENCODE auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) +$(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES)) + [SUBSYSTEM::auth_sam_reply] -PRIVATE_PROTO_HEADER = auth_sam_reply.h auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) +$(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES)) + [PYTHON::swig_auth] PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB -- cgit From 4c70cda986c86fe536327321d04c29eca81b6409 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 23:02:47 +0200 Subject: Fix a couple (well, little more than that..) of typos. (This used to be commit a6b52119940a900fb0de3864b8bca94e2965cc24) --- source4/auth/config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 1f4f8dfb1d..89f1f8b980 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -13,14 +13,14 @@ PUBLIC_HEADERS += $(authsrcdir)/session.h auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o) -$(call proto_header_template,$(authsrcdir)/session_proto.h,$(auth_session_OBJ_FILES:.o=.c)) +$(eval $(call proto_header_template,$(authsrcdir)/session_proto.h,$(auth_session_OBJ_FILES:.o=.c))) [SUBSYSTEM::auth_system_session] PUBLIC_DEPENDENCIES = CREDENTIALS PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) -$(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES)) +$(eval $(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES))) [SUBSYSTEM::auth_sam] PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY @@ -28,13 +28,13 @@ PRIVATE_DEPENDENCIES = LDAP_ENCODE auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) -$(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES)) +$(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES))) [SUBSYSTEM::auth_sam_reply] auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) -$(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES)) +$(eval $(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES))) [PYTHON::swig_auth] PUBLIC_DEPENDENCIES = auth_system_session -- cgit From 60ae8f06574c74261643f469e6be2a945fd90880 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 23:40:23 +0200 Subject: Fix a bunch of dependencies. (This used to be commit a63f458462d207d215a6e4ef8e480b0c8daedf6a) --- source4/auth/config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 89f1f8b980..7d31a6a0c0 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -20,7 +20,7 @@ PUBLIC_DEPENDENCIES = CREDENTIALS PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) -$(eval $(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES))) +$(eval $(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES:.o=.c))) [SUBSYSTEM::auth_sam] PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY @@ -28,13 +28,13 @@ PRIVATE_DEPENDENCIES = LDAP_ENCODE auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) -$(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES))) +$(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES:.o=.c))) [SUBSYSTEM::auth_sam_reply] auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) -$(eval $(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES))) +$(eval $(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES:.o=.c))) [PYTHON::swig_auth] PUBLIC_DEPENDENCIES = auth_system_session -- cgit From 2914b0ca04355f6f175b603a1de6030b20ce0830 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 21 May 2008 21:24:48 +0200 Subject: Remove support for .py files from smb_build - deal with it only in the makefiles. (This used to be commit b865249efaa58d0fc87fa25491fda3b970af81c3) --- source4/auth/config.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 7d31a6a0c0..0162653076 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -41,4 +41,6 @@ PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB SWIG_FILE = auth.i +$(eval $(call python_py_module_template,auth.py,$(authsrcdir)/auth.py)) + swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o -- cgit From 82bcf967b79321706cd19c759ea54c4465fe0d96 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 21 May 2008 21:32:53 +0200 Subject: Move CFLAGS overrides for SWIG modules to Makefile. (This used to be commit 58665a8a8e4b10435aebbf2c95b6a8e50db232d6) --- source4/auth/config.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 0162653076..78a267ced1 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -44,3 +44,5 @@ SWIG_FILE = auth.i $(eval $(call python_py_module_template,auth.py,$(authsrcdir)/auth.py)) swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o + +$(swig_auth_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)" -- cgit From b1fc7bab111fcef7f546e821f24c175bdec6865a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 21 May 2008 21:50:56 +0200 Subject: Move some python files into the samba package. (This used to be commit ed38c668cdbe10966e46bad97301122eea8001d0) --- source4/auth/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 78a267ced1..17820ebdd4 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -41,7 +41,7 @@ PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB SWIG_FILE = auth.i -$(eval $(call python_py_module_template,auth.py,$(authsrcdir)/auth.py)) +$(eval $(call python_py_module_template,samba/auth.py,$(authsrcdir)/auth.py)) swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o -- cgit From 49706ab19bd3ffd6125639e6a7753b2350cf54e1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 21 May 2008 23:59:34 +0200 Subject: Move more modules inside of the samba package. (This used to be commit 9b39e99f48266a54ed0b8890c2efde218b4b118a) --- source4/auth/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 17820ebdd4..0f8b23ee8a 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -37,9 +37,9 @@ auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) $(eval $(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES:.o=.c))) [PYTHON::swig_auth] +LIBRARY_REALNAME = samba/_auth.$(SHLIBEXT) PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB -SWIG_FILE = auth.i $(eval $(call python_py_module_template,samba/auth.py,$(authsrcdir)/auth.py)) -- cgit From 5ce59419a07c8e147daf51b77ffe2117f3d6a505 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 22 May 2008 02:13:26 +0200 Subject: Fix CFLAGS for SWIG files. (This used to be commit 8ee4f075046e0b181ec8a4ac1eaf3ea5621a56bf) --- source4/auth/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/auth/config.mk') diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 0f8b23ee8a..f13c2e5758 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -45,4 +45,4 @@ $(eval $(call python_py_module_template,samba/auth.py,$(authsrcdir)/auth.py)) swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o -$(swig_auth_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)" +$(swig_auth_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) -- cgit